Fixed bug involving template paths

forge · Mar 23, 2014 · c8050ad · c8050ad
1 parent fba0453
commit c8050ad
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 20 deletions.
diff --git a/src/main/java/org/jboss/forge/addon/angularjs/AngularScaffoldProvider.java b/src/main/java/org/jboss/forge/addon/angularjs/AngularScaffoldProvider.java
@@ -70,7 +70,9 @@
 public class AngularScaffoldProvider implements ScaffoldProvider
 {
 
-   public static final String SCAFFOLD_DIR = "/scaffold";
+   private static final String BASE_PACKAGE = AngularScaffoldProvider.class.getPackage().getName();
+
+   public static final String SCAFFOLD_DIR = "/" + BASE_PACKAGE.replace('.', '/');
 
    Project project;
 

diff --git a/src/main/java/org/jboss/forge/addon/angularjs/ProcessWithFreemarkerCommand.java b/src/main/java/org/jboss/forge/addon/angularjs/ProcessWithFreemarkerCommand.java
@@ -26,6 +26,8 @@
 import org.jboss.forge.addon.templates.facets.TemplateFacet;
 import org.jboss.forge.addon.templates.freemarker.FreemarkerTemplate;
 
+import static org.jboss.forge.addon.angularjs.AngularScaffoldProvider.SCAFFOLD_DIR;
+
 /**
  * An observer for the {@link ProcessWithFreemarkerEvent} CDI event. This observer generates dynamic content based on the
  * inspection results for a JPA entity. The content is generated by Freemarker with templates serving as the basis for the
@@ -66,7 +68,7 @@ public void execute(@Observes ProcessWithFreemarkerEvent event) {
         for (ScaffoldResource projectGlobalTemplate : event.getResources()) {
             WebResourcesFacet web = project.getFacet(WebResourcesFacet.class);
 
-            Resource<?> resource = resourceFactory.create(getClass().getResource("/scaffold/" + projectGlobalTemplate.getSource()));
+            Resource<?> resource = resourceFactory.create(getClass().getResource(SCAFFOLD_DIR + projectGlobalTemplate.getSource()));
             if (project.hasFacet(TemplateFacet.class)) {
                 TemplateFacet templates = project.getFacet(TemplateFacet.class);
                 Resource<?> templateResource = templates.getResource(projectGlobalTemplate.getSource());

diff --git a/src/main/java/org/jboss/forge/addon/angularjs/ResourceProvider.java b/src/main/java/org/jboss/forge/addon/angularjs/ResourceProvider.java
@@ -91,20 +91,20 @@ public static List<ScaffoldResource> getStatics(String targetDir) {
      */
     public static List<ScaffoldResource> getGlobalTemplates(String targetDir) {
         List<ScaffoldResource> resources = new ArrayList<ScaffoldResource>();
-        resources.add(new ScaffoldResource("index.html.ftl", targetDir+ INDEX_HTML));
-        resources.add(new ScaffoldResource("app.html.ftl", targetDir + "/app.html"));
-        resources.add(new ScaffoldResource("scripts/app.js.ftl", targetDir + "/scripts/app.js"));
-        resources.add(new ScaffoldResource("scripts/directives/datepicker.js.ftl", targetDir
+        resources.add(new ScaffoldResource("/index.html.ftl", targetDir+ INDEX_HTML));
+        resources.add(new ScaffoldResource("/app.html.ftl", targetDir + "/app.html"));
+        resources.add(new ScaffoldResource("/scripts/app.js.ftl", targetDir + "/scripts/app.js"));
+        resources.add(new ScaffoldResource("/scripts/directives/datepicker.js.ftl", targetDir
                 + "/scripts/directives/datepicker.js"));
-        resources.add(new ScaffoldResource("scripts/directives/timepicker.js.ftl", targetDir
+        resources.add(new ScaffoldResource("/scripts/directives/timepicker.js.ftl", targetDir
                 + "/scripts/directives/timepicker.js"));
-        resources.add(new ScaffoldResource("scripts/directives/datetimepicker.js.ftl", targetDir
+        resources.add(new ScaffoldResource("/scripts/directives/datetimepicker.js.ftl", targetDir
                 + "/scripts/directives/datetimepicker.js"));
-        resources.add(new ScaffoldResource("scripts/services/locationParser.js.ftl", targetDir
+        resources.add(new ScaffoldResource("/scripts/services/locationParser.js.ftl", targetDir
                 + "/scripts/services/locationParser.js"));
-        resources.add(new ScaffoldResource("scripts/filters/genericSearchFilter.js.ftl", targetDir
+        resources.add(new ScaffoldResource("/scripts/filters/genericSearchFilter.js.ftl", targetDir
                 + "/scripts/filters/genericSearchFilter.js"));
-        resources.add(new ScaffoldResource("scripts/filters/startFromFilter.js.ftl", targetDir
+        resources.add(new ScaffoldResource("/scripts/filters/startFromFilter.js.ftl", targetDir
                 + "/scripts/filters/startFromFilter.js"));
         return resources;
     }
@@ -121,17 +121,17 @@ public static List<ScaffoldResource> getGlobalTemplates(String targetDir) {
      */
     public static List<ScaffoldResource> getEntityTemplates(String targetDir, String entityName) {
         List<ScaffoldResource> resources = new ArrayList<ScaffoldResource>();
-        resources.add(new ScaffoldResource("views/detail.html.ftl", targetDir + "/views/" + entityName
+        resources.add(new ScaffoldResource("/views/detail.html.ftl", targetDir + "/views/" + entityName
                 + "/detail.html"));
-        resources.add(new ScaffoldResource("views/search.html.ftl", targetDir + "/views/" + entityName
+        resources.add(new ScaffoldResource("/views/search.html.ftl", targetDir + "/views/" + entityName
                 + "/search.html"));
-        resources.add(new ScaffoldResource("scripts/services/entityFactory.js.ftl", targetDir + "/scripts/services/"
+        resources.add(new ScaffoldResource("/scripts/services/entityFactory.js.ftl", targetDir + "/scripts/services/"
                 + entityName + "Factory.js"));
-        resources.add(new ScaffoldResource("scripts/controllers/newEntityController.js.ftl", targetDir
+        resources.add(new ScaffoldResource("/scripts/controllers/newEntityController.js.ftl", targetDir
                 + "/scripts/controllers/new" + entityName + "Controller.js"));
-        resources.add(new ScaffoldResource("scripts/controllers/searchEntityController.js.ftl", targetDir
+        resources.add(new ScaffoldResource("/scripts/controllers/searchEntityController.js.ftl", targetDir
                 + "/scripts/controllers/search" + entityName + "Controller.js"));
-        resources.add(new ScaffoldResource("scripts/controllers/editEntityController.js.ftl", targetDir
+        resources.add(new ScaffoldResource("/scripts/controllers/editEntityController.js.ftl", targetDir
                 + "/scripts/controllers/edit" + entityName + "Controller.js"));
         return resources;
     }

diff --git a/src/test/java/org/jboss/forge/addon/angularjs/tests/freemarker/Deployments.java b/src/test/java/org/jboss/forge/addon/angularjs/tests/freemarker/Deployments.java
@@ -53,9 +53,7 @@ public static ForgeArchive getDeployment() {
 
 	public static final Package BASE_PACKAGE = AngularScaffoldProvider.class
 			.getPackage();
-	public static final String BASE_PACKAGE_PATH = File.separator
-			+ BASE_PACKAGE.getName().replace('.', File.separatorChar)
-			+ File.separator;
+	public static final String BASE_PACKAGE_PATH = "/" + BASE_PACKAGE.getName().replace('.', '/') + File.separator;
 	public static final String NEW_ENTITY_CONTROLLER_JS = "scripts/controllers/newEntityController.js.ftl";
 	public static final String EDIT_ENTITY_CONTROLLER_JS = "scripts/controllers/editEntityController.js.ftl";
 	public static final String SEARCH_ENTITY_CONTROLLER_JS = "scripts/controllers/searchEntityController.js.ftl";