From: Bojnourdi <kavoos.bojnourdi@edf.fr>
Date: Tue, 18 Aug 2015 07:26:44 +0000 (+0200)
Subject: Compilation fixes
X-Git-Tag: gde-v0.1~8^2~31
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=5e2bf967fcbba2ef69a81b0eaec0c9a28cf6ee0c;p=modules%2Fgde.git

Compilation fixes
---

diff --git a/projects/GDE_App/nbproject/build-impl.xml b/projects/GDE_App/nbproject/build-impl.xml
index 2f01711..c759bdf 100644
--- a/projects/GDE_App/nbproject/build-impl.xml
+++ b/projects/GDE_App/nbproject/build-impl.xml
@@ -194,6 +194,10 @@ exists or setup the property manually. For example like this:
                 <isset property="build.deploy.on.save"/>
             </not>
         </condition>
+        <ant antfile="${project.GDE-transferables}/build.xml" inheritall="false" target="jar">
+            <property location="${build.dir}" name="dist.ear.dir"/>
+            <property name="deploy.on.save" value="false"/>
+        </ant>
     </target>
     <target depends="init" name="deps-j2ee-archive" unless="no.deps">
         <condition property="build.deploy.on.save" value="false">
@@ -223,6 +227,7 @@ exists or setup the property manually. For example like this:
     <target depends="init,deps-jar,pre-pre-compile,pre-compile" name="-do-compile-deps">
         <copyfiles files="${reference.GDE-ejb.dist-ear}" todir="${build.dir}//"/>
         <copyfiles files="${reference.GDE-war.dist-ear}" todir="${build.dir}//"/>
+        <copyfiles files="${reference.GDE-transferables.jar}" todir="${build.dir}//"/>
     </target>
     <target name="post-compile">
         <!-- Empty placeholder for easier customization. -->
@@ -629,6 +634,10 @@ exists or setup the property manually. For example like this:
             <property location="${build.dir}" name="dist.ear.dir"/>
             <property name="deploy.on.save" value="${build.deploy.on.save}"/>
         </ant>
+        <ant antfile="${project.GDE-transferables}/build.xml" inheritall="false" target="clean">
+            <property location="${build.dir}" name="dist.ear.dir"/>
+            <property name="deploy.on.save" value="${build.deploy.on.save}"/>
+        </ant>
         <ant antfile="${project.GDE-war}/build.xml" inheritall="false" target="clean-ear">
             <property location="${build.dir}" name="dist.ear.dir"/>
             <property name="deploy.on.save" value="${build.deploy.on.save}"/>
diff --git a/projects/GDE_App/nbproject/genfiles.properties b/projects/GDE_App/nbproject/genfiles.properties
index 2001d69..39df7db 100644
--- a/projects/GDE_App/nbproject/genfiles.properties
+++ b/projects/GDE_App/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=9a7a77a3
+build.xml.data.CRC32=a5c5f858
 build.xml.script.CRC32=2e99ef2e
 build.xml.stylesheet.CRC32=a5d15b16@1.49.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=9a7a77a3
-nbproject/build-impl.xml.script.CRC32=acc3d7fc
+nbproject/build-impl.xml.data.CRC32=a5c5f858
+nbproject/build-impl.xml.script.CRC32=6d65d538
 nbproject/build-impl.xml.stylesheet.CRC32=5eea63a6@1.49.1
diff --git a/projects/GDE_App/nbproject/project.properties b/projects/GDE_App/nbproject/project.properties
index cd4eff4..9c7a8a8 100644
--- a/projects/GDE_App/nbproject/project.properties
+++ b/projects/GDE_App/nbproject/project.properties
@@ -23,7 +23,8 @@ j2ee.server.type=gfv3ee6
 jar.compress=false
 jar.content.additional=\
     ${reference.GDE-ejb.dist-ear}:\
-    ${reference.GDE-war.dist-ear}
+    ${reference.GDE-war.dist-ear}:\
+    ${reference.GDE-transferables.jar}
 jar.name=GDE_App.ear
 javac.debug=true
 javac.deprecation=false
@@ -33,8 +34,10 @@ meta.inf=src/conf
 no.dependencies=false
 platform.active=default_platform
 project.GDE-ejb=GDE-ejb
+project.GDE-transferables=../GDE-transferables
 project.GDE-war=GDE-war
 reference.GDE-ejb.dist-ear=${project.GDE-ejb}/dist/GDE-ejb.jar
+reference.GDE-transferables.jar=${project.GDE-transferables}/dist/GDE-transferables.jar
 reference.GDE-war.dist-ear=${project.GDE-war}/dist/GDE-war.war
 resource.dir=setup
 run.classpath=
diff --git a/projects/GDE_App/nbproject/project.xml b/projects/GDE_App/nbproject/project.xml
index 397674a..4098ee6 100644
--- a/projects/GDE_App/nbproject/project.xml
+++ b/projects/GDE_App/nbproject/project.xml
@@ -15,6 +15,10 @@
                     <file>${reference.GDE-war.dist-ear}</file>
                     <path-in-war>/</path-in-war>
                 </library>
+                <library>
+                    <file>${reference.GDE-transferables.jar}</file>
+                    <path-in-war>/</path-in-war>
+                </library>
             </web-module-additional-libraries>
         </data>
         <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
@@ -26,6 +30,14 @@
                 <clean-target>clean-ear</clean-target>
                 <id>dist-ear</id>
             </reference>
+            <reference>
+                <foreign-project>GDE-transferables</foreign-project>
+                <artifact-type>jar</artifact-type>
+                <script>build.xml</script>
+                <target>jar</target>
+                <clean-target>clean</clean-target>
+                <id>jar</id>
+            </reference>
             <reference>
                 <foreign-project>GDE-war</foreign-project>
                 <artifact-type>j2ee_ear_archive</artifact-type>