Support for Windows

sumantapakira · Aug 29, 2020 · 2d7baa2 · 2d7baa2
1 parent b237a51
commit 2d7baa2
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 7 deletions.
diff --git a/all/pom.xml b/all/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>com.aem.component.generator</groupId>
         <artifactId>component-generator</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/core/pom.xml b/core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.aem.component.generator</groupId>
         <artifactId>component-generator</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>component-generator.core</artifactId>

diff --git a/core/src/main/java/com/aem/component/generator/core/commons/Constants.java b/core/src/main/java/com/aem/component/generator/core/commons/Constants.java
@@ -20,6 +20,7 @@ public class Constants {
     public static final String DEFAULT_LOCAL_ADMIN_USER_NAME = "admin";
     public static final String DEFAULT_LOCAL_ADMIN_USER_PASSWORD = "admin";
     public static final String FORWARD_SLASH = "/";
+    public static final String BACK_SLASH = "\\";
     public static final String UNDERSCORE = "_";
     public static final String VAR_SETTING_NODE = "/var/component-generator/settings";
     public static final String DOT = ".";

diff --git a/core/src/main/java/com/aem/component/generator/core/commons/Utils.java b/core/src/main/java/com/aem/component/generator/core/commons/Utils.java
@@ -166,7 +166,14 @@ private static void writeToFile(Path file, String template) {
      * @return
      */
     private static String getPackageName(String folderPath) {
-        return StringUtils.substringAfter(folderPath, "main/java/").replaceAll(Constants.FORWARD_SLASH, Constants.DOT);
+        String osName= whichOS();
+        if((osName.indexOf("win") >= 0)){
+            return StringUtils.substringAfter(folderPath, "\\main\\java\\").replace(Constants.BACK_SLASH, Constants.DOT);
+        }else if((osName.indexOf("mac") >= 0)){
+            return StringUtils.substringAfter(folderPath, "main/java/").replaceAll(Constants.FORWARD_SLASH, Constants.DOT);
+        }else{
+            return StringUtils.EMPTY;
+        }
     }
 
     /**
@@ -524,4 +531,8 @@ private String getCoreModelPath(String coreModelDirPath) {
 
     }
 
+    private static String whichOS(){
+        return System.getProperty("os.name").toLowerCase();
+    }
+
 }
diff --git a/pom.xml b/pom.xml
@@ -21,7 +21,7 @@
     <groupId>com.aem.component.generator</groupId>
     <artifactId>component-generator</artifactId>
     <packaging>pom</packaging>
-    <version>1.4-SNAPSHOT</version>
+    <version>1.5-SNAPSHOT</version>
     <description>AEM component generator</description>
 
     <modules>
@@ -45,6 +45,7 @@
         <bnd.version>5.0.0</bnd.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <componentGroupName>sumanta.component.generator</componentGroupName>
     </properties>
 
     <build>

diff --git a/ui.apps.structure/pom.xml b/ui.apps.structure/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>com.aem.component.generator</groupId>
         <artifactId>component-generator</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/ui.apps/pom.xml b/ui.apps/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.aem.component.generator</groupId>
         <artifactId>component-generator</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/ui.content/pom.xml b/ui.content/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>com.aem.component.generator</groupId>
         <artifactId>component-generator</artifactId>
-        <version>1.4-SNAPSHOT</version>
+        <version>1.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>