changeset 2131:9effba129055

Platform code drop, II review-thread: http://icedtea.classpath.org/pipermail/thermostat/2015-December/017117.html reviewed-by: omajid, jerboaa
author Mario Torre <neugens.limasoftware@gmail.com>
date Fri, 08 Jan 2016 12:09:12 +0100
parents 6876a3cbcb8d
children 38574bbedb27
files distribution/pom.xml platform/beans/pom.xml platform/collections/pom.xml platform/core/pom.xml platform/core/src/main/java/com/redhat/thermostat/platform/annotations/processor/PlatformConfigurationProcessor.java platform/distribution/pom.xml platform/pom.xml platform/swing/core/pom.xml platform/swing/distribution/pom.xml platform/swing/pom.xml platform/swing/widgets/pom.xml
diffstat 11 files changed, 14 insertions(+), 61 deletions(-) [+]
line wrap: on
line diff
--- a/distribution/pom.xml	Fri Jan 08 11:28:45 2016 +0100
+++ b/distribution/pom.xml	Fri Jan 08 12:09:12 2016 +0100
@@ -195,6 +195,7 @@
                   <filtering>true</filtering>
                   <includes>
                     <include>shell-command/shell-prompt.conf</include>
+                    <include>platform/*.json</include>
                   </includes>
                 </resource>
                 <resource>
@@ -282,6 +283,8 @@
                       todir="${project.build.directory}/image/libs/native" />
                 <copy file="${main.basedir}/laf-utils/target/libGTKThemeUtils.so"
                       todir="${project.build.directory}/image/libs/native" />
+                <copy file="${main.basedir}/platform/swing/core/target/generated-sources/annotations/template.json"
+                      todir="${project.build.directory}/image/etc/plugins.d/platform" />
               </target>
             </configuration>
             <goals>
--- a/platform/beans/pom.xml	Fri Jan 08 11:28:45 2016 +0100
+++ b/platform/beans/pom.xml	Fri Jan 08 12:09:12 2016 +0100
@@ -42,7 +42,7 @@
   <parent>
     <groupId>com.redhat.thermostat</groupId>
     <artifactId>thermostat-platform</artifactId>
-    <version>1.99.6-SNAPSHOT</version>
+    <version>1.99.8-SNAPSHOT</version>
   </parent>
 
   <artifactId>thermostat-platform-beans</artifactId>
--- a/platform/collections/pom.xml	Fri Jan 08 11:28:45 2016 +0100
+++ b/platform/collections/pom.xml	Fri Jan 08 12:09:12 2016 +0100
@@ -44,7 +44,7 @@
     <parent>
         <groupId>com.redhat.thermostat</groupId>
         <artifactId>thermostat-platform</artifactId>
-        <version>1.99.6-SNAPSHOT</version>
+        <version>1.99.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>thermostat-platform-collections</artifactId>
--- a/platform/core/pom.xml	Fri Jan 08 11:28:45 2016 +0100
+++ b/platform/core/pom.xml	Fri Jan 08 12:09:12 2016 +0100
@@ -44,7 +44,7 @@
     <parent>
         <groupId>com.redhat.thermostat</groupId>
         <artifactId>thermostat-platform</artifactId>
-        <version>1.99.6-SNAPSHOT</version>
+        <version>1.99.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>thermostat-platform-core</artifactId>
--- a/platform/core/src/main/java/com/redhat/thermostat/platform/annotations/processor/PlatformConfigurationProcessor.java	Fri Jan 08 11:28:45 2016 +0100
+++ b/platform/core/src/main/java/com/redhat/thermostat/platform/annotations/processor/PlatformConfigurationProcessor.java	Fri Jan 08 12:09:12 2016 +0100
@@ -134,7 +134,7 @@
         Map<String, String> options = processingEnv.getOptions();
         String jsonFileName = options.get("name");
         if (jsonFileName == null) {
-            jsonFileName = "Application_" + info.applications.get(0).name;
+            jsonFileName = info.applications.get(0).name;
         }
 
         Gson gson = new GsonBuilder().
--- a/platform/distribution/pom.xml	Fri Jan 08 11:28:45 2016 +0100
+++ b/platform/distribution/pom.xml	Fri Jan 08 12:09:12 2016 +0100
@@ -42,7 +42,7 @@
   <parent>
     <groupId>com.redhat.thermostat</groupId>
     <artifactId>thermostat-platform</artifactId>
-    <version>1.99.6-SNAPSHOT</version>
+    <version>1.99.8-SNAPSHOT</version>
   </parent>
 
   <artifactId>thermostat-platform-distribution</artifactId>
--- a/platform/pom.xml	Fri Jan 08 11:28:45 2016 +0100
+++ b/platform/pom.xml	Fri Jan 08 12:09:12 2016 +0100
@@ -42,7 +42,7 @@
   <parent>
     <artifactId>thermostat</artifactId>
     <groupId>com.redhat.thermostat</groupId>
-    <version>1.99.6-SNAPSHOT</version>
+    <version>1.99.8-SNAPSHOT</version>
   </parent>
 
   <artifactId>thermostat-platform</artifactId>
--- a/platform/swing/core/pom.xml	Fri Jan 08 11:28:45 2016 +0100
+++ b/platform/swing/core/pom.xml	Fri Jan 08 12:09:12 2016 +0100
@@ -44,7 +44,7 @@
     <parent>
         <groupId>com.redhat.thermostat</groupId>
         <artifactId>thermostat-platform-swing</artifactId>
-        <version>1.99.6-SNAPSHOT</version>
+        <version>1.99.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>thermostat-platform-swing-core</artifactId>
@@ -125,57 +125,6 @@
         <plugins>
 
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <compilerArgument>-Aname=template
-                        <outputDirectory>${basedir}/target/</outputDirectory>
-                        <processor>com.redhat.thermostat.annotations.internal.SelfAnnotationProcessor</processor>
-                    </compilerArgument>
-
-                </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>com.redhat.thermostat</groupId>
-                        <artifactId>thermostat-platform-core</artifactId>
-                        <version>${parent.version}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-<!--
-            <plugin>
-                <groupId>org.bsc.maven</groupId>
-                <artifactId>maven-processor-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>process</id>
-                        <goals>
-                            <goal>process</goal>
-                        </goals>
-                        <phase>generate-sources</phase>
-                        <configuration>
-                            <compilerArguments>-Aname=template
-                            </compilerArguments>
-                            <outputDirectory>${basedir}/target/
-                            </outputDirectory>
-                            <processors>
-                                <processor>
-                                    com.redhat.thermostat.platform.annotations.processor.PlatformConfigurationProcessor
-                                </processor>
-                            </processors>
-                        </configuration>
-                    </execution>
-                </executions>
-                <dependencies>
-                    <dependency>
-                        <groupId>com.redhat.thermostat</groupId>
-                        <artifactId>thermostat-platform-core</artifactId>
-                        <version>${parent.version}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
--->
-            <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
--- a/platform/swing/distribution/pom.xml	Fri Jan 08 11:28:45 2016 +0100
+++ b/platform/swing/distribution/pom.xml	Fri Jan 08 12:09:12 2016 +0100
@@ -42,7 +42,7 @@
   <parent>
     <groupId>com.redhat.thermostat</groupId>
     <artifactId>thermostat-platform-swing</artifactId>
-    <version>1.99.6-SNAPSHOT</version>
+    <version>1.99.8-SNAPSHOT</version>
   </parent>
 
   <artifactId>thermostat-platform-swing-distribution</artifactId>
--- a/platform/swing/pom.xml	Fri Jan 08 11:28:45 2016 +0100
+++ b/platform/swing/pom.xml	Fri Jan 08 12:09:12 2016 +0100
@@ -42,7 +42,8 @@
   <parent>
     <artifactId>thermostat</artifactId>
     <groupId>com.redhat.thermostat</groupId>
-    <version>1.99.6-SNAPSHOT</version>
+    <version>1.99.8-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
   </parent>
 
   <artifactId>thermostat-platform-swing</artifactId>
--- a/platform/swing/widgets/pom.xml	Fri Jan 08 11:28:45 2016 +0100
+++ b/platform/swing/widgets/pom.xml	Fri Jan 08 12:09:12 2016 +0100
@@ -44,7 +44,7 @@
     <parent>
         <groupId>com.redhat.thermostat</groupId>
         <artifactId>thermostat-platform-swing</artifactId>
-        <version>1.99.6-SNAPSHOT</version>
+        <version>1.99.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>thermostat-platform-swing-widgets</artifactId>