templatesを一元管理するように修正。

Author: TakayukiHoshi1984

assembly.xml

@@ -2,7 +2,7 @@
 <assembly>
     <id>dist</id>
     <formats>
-    	<format>zip</format>
+        <format>zip</format>
     </formats>
     <fileSets>
         <fileSet>
@@ -14,13 +14,13 @@
                 <include>RELEASENOTE.TXT</include>
             </includes>
         </fileSet>
-    	<fileSet>
+        <fileSet>
             <directory>samples</directory>
             <outputDirectory>samples</outputDirectory>
-    		<includes>
+            <includes>
                <include>android-plugin-kotlin.sh</include>
                 <include>android-plugin-kotlin.bat</include>
-    			      <include>android-plugin.sh</include>
+                <include>android-plugin.sh</include>
                 <include>android-plugin.bat</include>
                 <include>ios-plugin.sh</include>
                 <include>ios-plugin.bat</include>
@@ -32,22 +32,22 @@
                 <include>emulator.bat</include>
                 <include>html-docs.sh</include>
                 <include>html-docs.bat</include>
-    		</includes>
+            </includes>
             <fileMode>0744</fileMode>
-    	</fileSet>
+        </fileSet>
         <fileSet>
-            <directory>samples/sample-profile-specs</directory>
-            <outputDirectory>samples/sample-profile-specs</outputDirectory>
+            <directory>modules/deviceconnect-codegen/src/main/resources</directory>
+            <outputDirectory>samples/templates</outputDirectory>
             <includes>
-                <include>*.json</include>
-                <include>*.yaml</include>
+                <include>deviceConnect*/**</include>
             </includes>
         </fileSet>
         <fileSet>
-            <directory>samples/templates</directory>
-            <outputDirectory>samples/templates</outputDirectory>
+            <directory>samples/sample-profile-specs</directory>
+            <outputDirectory>samples/sample-profile-specs</outputDirectory>
             <includes>
-                <include>**/</include>
+                <include>*.json</include>
+                <include>*.yaml</include>
             </includes>
         </fileSet>
         <fileSet>

modules/deviceconnect-codegen/src/main/java/org/deviceconnect/codegen/plugin/AndroidPluginCodegenConfig.java

@@ -299,10 +299,10 @@ public void processOpts() {
 
         // 実装ファイル (全プラグイン共通)
         final String packageFolder = getPluginPackageRootDir();
-        supportingFiles.add(new SupportingFile("java/MessageServiceProvider.kt.mustache", packageFolder, messageServiceProviderClass + ".java"));
+        supportingFiles.add(new SupportingFile("java/MessageServiceProvider.java.mustache", packageFolder, messageServiceProviderClass + ".java"));
         supportingFiles.add(new SupportingFile("java/MessageService.java.mustache", packageFolder, messageServiceClass + ".java"));
-        supportingFiles.add(new SupportingFile("java/SystemProfile.kt.mustache", packageFolder + File.separator + "profiles", classPrefix + "SystemProfile.java"));
-        supportingFiles.add(new SupportingFile("java/SettingActivity.kt.mustache", packageFolder, classPrefix + "SettingActivity.java"));
+        supportingFiles.add(new SupportingFile("java/SystemProfile.java.mustache", packageFolder + File.separator + "profiles", classPrefix + "SystemProfile.java"));
+        supportingFiles.add(new SupportingFile("java/SettingActivity.java.mustache", packageFolder, classPrefix + "SettingActivity.java"));
         if (connectionType == ConnectionType.BROADCAST) {
             additionalProperties.put("launchServiceClass", classPrefix + "LaunchService");
             supportingFiles.add(new SupportingFile("java/LaunchService.java.mustache", packageFolder, classPrefix + "LaunchService.java"));

samples/templates

@@ -0,0 +1 @@
+../modules/deviceconnect-codegen/src/main/resources