[ggc-cvs] SF.net SVN: ggc:[1453] trunk

[<and...@us...>]

Revision: 1453
          http://sourceforge.net/p/ggc/code/1453
Author:   andyrozman
Date:     2016-12-25 20:52:08 +0000 (Sun, 25 Dec 2016)
Log Message:
-----------
ggc
- moving files arround

Modified Paths:
--------------
    trunk/ggc-plugins/ggc-connect/pom.xml
    trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/FoodGroup.java

Property Changed:
----------------
    trunk/

Index: trunk
===================================================================
--- trunk	2016-12-25 20:36:22 UTC (rev 1452)
+++ trunk	2016-12-25 20:52:08 UTC (rev 1453)

Property changes on: trunk
___________________________________________________________________
Modified: svn:ignore
## -5,3 +5,5 ##
 ggc-device-minimed-decode
 
 ggc-device-minimed
+
+\*.iml
Modified: trunk/ggc-plugins/ggc-connect/pom.xml
===================================================================
--- trunk/ggc-plugins/ggc-connect/pom.xml	2016-12-25 20:36:22 UTC (rev 1452)
+++ trunk/ggc-plugins/ggc-connect/pom.xml	2016-12-25 20:52:08 UTC (rev 1453)
@@ -3,53 +3,24 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>net.sf.ggc</groupId>
-        <artifactId>ggc-parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
-        <relativePath>../ggc-master-pom/pom.xml</relativePath>
+        <artifactId>ggc-plugins</artifactId>
+        <version>0.8-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>net.sf.ggc</groupId>
-    <name>GGC Connect Tool Project</name>
-
+    <name>GGC Plugins - Connect Tool</name>
     <description>Plugin to connect to other software (import/export) of our data into foreign systems.</description>
-
     <artifactId>ggc-connect-tool</artifactId>
     <version>${ggc-connect-tool.version}</version>
 
 
-    <build>
-        <directory>target</directory>
-        <outputDirectory>target/classes</outputDirectory>
-        <finalName>${project.artifactId}-${project.version}</finalName>
-        <testOutputDirectory>target/test-classes</testOutputDirectory>
-        <sourceDirectory>src/main/java</sourceDirectory>
-        <!-- <scriptSourceDirectory>src/main/scripts</scriptSourceDirectory> -->
 
-
-        <testSourceDirectory>src/test/java</testSourceDirectory>
-        <resources>
-            <resource>
-                <directory>src</directory>
-                <filtering>true</filtering>
-                <excludes>
-                    <exclude>**/*.java</exclude>
-                </excludes>
-            </resource>
-        </resources>
-        <testResources>
-            <testResource>
-                <directory>src/test/resources</directory>
-            </testResource>
-        </testResources>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>net.sf.ggc</groupId>
             <artifactId>ggc-core</artifactId>
         </dependency>
 
-
         <dependency>
             <groupId>com.atech-software</groupId>
             <artifactId>atech-tools</artifactId>
@@ -57,10 +28,9 @@
 
         <dependency>
             <groupId>net.sf.ggc</groupId>
-            <artifactId>ggc-plugin-base</artifactId>
+            <artifactId>ggc-plugins-base</artifactId>
         </dependency>
 
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
@@ -75,7 +45,6 @@
             <version>8.4-702.jdbc3</version>
         </dependency>
 
-
     </dependencies>
 
     <properties>

Modified: trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/FoodGroup.java
===================================================================
--- trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/FoodGroup.java	2016-12-25 20:36:22 UTC (rev 1452)
+++ trunk/ggc-plugins/ggc-nutrition/src/main/java/ggc/nutri/db/datalayer/FoodGroup.java	2016-12-25 20:52:08 UTC (rev 1453)
@@ -637,7 +637,7 @@
 
         tx.commit();
 
-        return "" + _id.longValue();
+        return "" + _id;
     }
 
 
@@ -724,7 +724,7 @@
     {
         if (this.group_type == 1)
         {
-            this.group_db1 = (FoodGroupH) sess.get(FoodGroupH.class, new Long(this.getId()));
+            this.group_db1 = (FoodGroupH) sess.get(FoodGroupH.class, this.getId());
             sess.update(this.group_db1);
         }
         else

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.