X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=nbproject%2Fbuild-impl.xml;h=65dc4ab41c3331f1b17f8b0ad12e0bf624b6a6a5;hb=6efbaed3c0641b210b01fd9bf20eedfa8b58c745;hp=44a91f0f9457d897fe7a52f6e39d85bb77f155cf;hpb=5cce886c2ac770d4ad0e0004ba4c0cfac8907a61;p=pizzaservice-ejb.git

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 44a91f0..65dc4ab 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -36,7 +36,7 @@ is divided into following sections:
         <property file="nbproject/private/private.properties"/>
     </target>
     <target name="-pre-init-libraries">
-        <property location="lib/nblibraries.properties" name="libraries.path"/>
+        <property location="./lib/nblibraries.properties" name="libraries.path"/>
         <dirname file="${libraries.path}" property="libraries.dir.nativedirsep"/>
         <pathconvert dirsep="/" property="libraries.dir">
             <path path="${libraries.dir.nativedirsep}"/>
@@ -806,18 +806,30 @@ exists or setup the property manually. For example like this:
                 COMPILATION SECTION
             -->
     <target depends="init" if="no.dist.ear.dir" name="-deps-module-jar" unless="no.deps">
+        <ant antfile="${project.pizzaservice-core}/build.xml" inheritall="false" target="jar">
+            <property name="deploy.on.save" value="false"/>
+        </ant>
         <ant antfile="${project.pizzaservice-lib}/build.xml" inheritall="false" target="jar">
             <property name="deploy.on.save" value="false"/>
         </ant>
-        <ant antfile="${project.pizzaservice-mailer}/build.xml" inheritall="false" target="jar">
+        <ant antfile="${project.pizzaservice-mailer-lib}/build.xml" inheritall="false" target="jar">
+            <property name="deploy.on.save" value="false"/>
+        </ant>
+        <ant antfile="${project.juser-core}/build.xml" inheritall="false" target="jar">
             <property name="deploy.on.save" value="false"/>
         </ant>
     </target>
     <target depends="init" if="dist.ear.dir" name="-deps-ear-jar" unless="no.deps">
+        <ant antfile="${project.pizzaservice-core}/build.xml" inheritall="false" target="jar">
+            <property name="deploy.on.save" value="false"/>
+        </ant>
         <ant antfile="${project.pizzaservice-lib}/build.xml" inheritall="false" target="jar">
             <property name="deploy.on.save" value="false"/>
         </ant>
-        <ant antfile="${project.pizzaservice-mailer}/build.xml" inheritall="false" target="jar">
+        <ant antfile="${project.pizzaservice-mailer-lib}/build.xml" inheritall="false" target="jar">
+            <property name="deploy.on.save" value="false"/>
+        </ant>
+        <ant antfile="${project.juser-core}/build.xml" inheritall="false" target="jar">
             <property name="deploy.on.save" value="false"/>
         </ant>
     </target>
@@ -833,84 +845,116 @@ exists or setup the property manually. For example like this:
     <target depends="compile,-library-inclusion-in-archive-weblogic,-library-inclusion-in-archive-by-user" name="library-inclusion-in-archive"/>
     <target if="is.jars.in.ejbjar" name="-library-inclusion-in-archive-by-user">
         <copyfiles files="${file.reference.jcoreee.jar}" todir="${build.classes.dir}"/>
+        <copyfiles files="${file.reference.jcore-logger-lib.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jcountry-core.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jcountry-lib.jar}" todir="${build.classes.dir}"/>
-        <copyfiles files="${file.reference.jcore-logger-lib.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jcontacts-core.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jcontacts-lib.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.juser-core.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.juser-lib.jar}" todir="${build.classes.dir}"/>
+        <copyfiles files="${file.reference.juser-login-core.jar}" todir="${build.classes.dir}"/>
+        <copyfiles files="${file.reference.juser-login-lib.jar}" todir="${build.classes.dir}"/>
+        <copyfiles files="${file.reference.juser-activity-core.jar}" todir="${build.classes.dir}"/>
+        <copyfiles files="${file.reference.juser-activity-lib.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jcustomer-core.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jcustomer-lib.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jphone-core.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jphone-lib.jar}" todir="${build.classes.dir}"/>
+        <copyfiles files="${file.reference.jproduct-core.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jshop-core.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jshop-ee-lib.jar}" todir="${build.classes.dir}"/>
+        <copyfiles files="${file.reference.jshop-receipt-lib.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jmailer-ee.jar}" todir="${build.classes.dir}"/>
-        <copyfiles files="${file.reference.pizzaservice-core.jar}" todir="${build.classes.dir}"/>
+        <copyfiles files="${libs.GNU_JPDF_1.7.0.classpath}" todir="${build.classes.dir}"/>
+        <copyfiles files="${reference.pizzaservice-core.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${reference.pizzaservice-lib.jar}" todir="${build.classes.dir}"/>
-        <copyfiles files="${reference.pizzaservice-mailer.jar}" todir="${build.classes.dir}"/>
+        <copyfiles files="${reference.pizzaservice-mailer-lib.jar}" todir="${build.classes.dir}"/>
+        <copyfiles files="${file.reference.cdi-api.jar}" todir="${build.classes.dir}"/>
     </target>
     <target if="is.server.weblogic" name="-library-inclusion-in-archive-weblogic">
         <basename file="${file.reference.jcoreee.jar}" property="manifest.file.reference.jcoreee.jar"/>
+        <basename file="${file.reference.jcore-logger-lib.jar}" property="manifest.file.reference.jcore-logger-lib.jar"/>
         <basename file="${file.reference.jcountry-core.jar}" property="manifest.file.reference.jcountry-core.jar"/>
         <basename file="${file.reference.jcountry-lib.jar}" property="manifest.file.reference.jcountry-lib.jar"/>
-        <basename file="${file.reference.jcore-logger-lib.jar}" property="manifest.file.reference.jcore-logger-lib.jar"/>
         <basename file="${file.reference.jcontacts-core.jar}" property="manifest.file.reference.jcontacts-core.jar"/>
         <basename file="${file.reference.jcontacts-lib.jar}" property="manifest.file.reference.jcontacts-lib.jar"/>
         <basename file="${file.reference.juser-core.jar}" property="manifest.file.reference.juser-core.jar"/>
         <basename file="${file.reference.juser-lib.jar}" property="manifest.file.reference.juser-lib.jar"/>
+        <basename file="${file.reference.juser-login-core.jar}" property="manifest.file.reference.juser-login-core.jar"/>
+        <basename file="${file.reference.juser-login-lib.jar}" property="manifest.file.reference.juser-login-lib.jar"/>
+        <basename file="${file.reference.juser-activity-core.jar}" property="manifest.file.reference.juser-activity-core.jar"/>
+        <basename file="${file.reference.juser-activity-lib.jar}" property="manifest.file.reference.juser-activity-lib.jar"/>
         <basename file="${file.reference.jcustomer-core.jar}" property="manifest.file.reference.jcustomer-core.jar"/>
         <basename file="${file.reference.jcustomer-lib.jar}" property="manifest.file.reference.jcustomer-lib.jar"/>
         <basename file="${file.reference.jphone-core.jar}" property="manifest.file.reference.jphone-core.jar"/>
         <basename file="${file.reference.jphone-lib.jar}" property="manifest.file.reference.jphone-lib.jar"/>
+        <basename file="${file.reference.jproduct-core.jar}" property="manifest.file.reference.jproduct-core.jar"/>
         <basename file="${file.reference.jshop-core.jar}" property="manifest.file.reference.jshop-core.jar"/>
         <basename file="${file.reference.jshop-ee-lib.jar}" property="manifest.file.reference.jshop-ee-lib.jar"/>
+        <basename file="${file.reference.jshop-receipt-lib.jar}" property="manifest.file.reference.jshop-receipt-lib.jar"/>
         <basename file="${file.reference.jmailer-ee.jar}" property="manifest.file.reference.jmailer-ee.jar"/>
-        <basename file="${file.reference.pizzaservice-core.jar}" property="manifest.file.reference.pizzaservice-core.jar"/>
+        <basename file="${libs.GNU_JPDF_1.7.0.classpath}" property="manifest.libs.GNU_JPDF_1.7.0.classpath"/>
+        <basename file="${reference.pizzaservice-core.jar}" property="manifest.reference.pizzaservice-core.jar"/>
         <basename file="${reference.pizzaservice-lib.jar}" property="manifest.reference.pizzaservice-lib.jar"/>
-        <basename file="${reference.pizzaservice-mailer.jar}" property="manifest.reference.pizzaservice-mailer.jar"/>
+        <basename file="${reference.pizzaservice-mailer-lib.jar}" property="manifest.reference.pizzaservice-mailer-lib.jar"/>
+        <basename file="${file.reference.cdi-api.jar}" property="manifest.file.reference.cdi-api.jar"/>
         <manifest file="${build.ear.classes.dir}/META-INF/MANIFEST.MF" mode="update">
-            <attribute name="Extension-List" value="jar-1 jar-2 jar-3 jar-4 jar-5 jar-6 jar-7 jar-8 jar-9 jar-10 jar-11 jar-12 jar-13 jar-14 jar-15 jar-16 jar-17 jar-18 "/>
+            <attribute name="Extension-List" value="jar-1 jar-2 jar-3 jar-4 jar-5 jar-6 jar-7 jar-8 jar-9 jar-10 jar-11 jar-12 jar-13 jar-14 jar-15 jar-16 jar-17 jar-18 jar-19 jar-20 jar-21 jar-22 jar-23 jar-24 jar-25 jar-26 "/>
             <attribute name="jar-1-Extension-Name" value="${manifest.file.reference.jcoreee.jar}"/>
-            <attribute name="jar-2-Extension-Name" value="${manifest.file.reference.jcountry-core.jar}"/>
-            <attribute name="jar-3-Extension-Name" value="${manifest.file.reference.jcountry-lib.jar}"/>
-            <attribute name="jar-4-Extension-Name" value="${manifest.file.reference.jcore-logger-lib.jar}"/>
+            <attribute name="jar-2-Extension-Name" value="${manifest.file.reference.jcore-logger-lib.jar}"/>
+            <attribute name="jar-3-Extension-Name" value="${manifest.file.reference.jcountry-core.jar}"/>
+            <attribute name="jar-4-Extension-Name" value="${manifest.file.reference.jcountry-lib.jar}"/>
             <attribute name="jar-5-Extension-Name" value="${manifest.file.reference.jcontacts-core.jar}"/>
             <attribute name="jar-6-Extension-Name" value="${manifest.file.reference.jcontacts-lib.jar}"/>
             <attribute name="jar-7-Extension-Name" value="${manifest.file.reference.juser-core.jar}"/>
             <attribute name="jar-8-Extension-Name" value="${manifest.file.reference.juser-lib.jar}"/>
-            <attribute name="jar-9-Extension-Name" value="${manifest.file.reference.jcustomer-core.jar}"/>
-            <attribute name="jar-10-Extension-Name" value="${manifest.file.reference.jcustomer-lib.jar}"/>
-            <attribute name="jar-11-Extension-Name" value="${manifest.file.reference.jphone-core.jar}"/>
-            <attribute name="jar-12-Extension-Name" value="${manifest.file.reference.jphone-lib.jar}"/>
-            <attribute name="jar-13-Extension-Name" value="${manifest.file.reference.jshop-core.jar}"/>
-            <attribute name="jar-14-Extension-Name" value="${manifest.file.reference.jshop-ee-lib.jar}"/>
-            <attribute name="jar-15-Extension-Name" value="${manifest.file.reference.jmailer-ee.jar}"/>
-            <attribute name="jar-16-Extension-Name" value="${manifest.file.reference.pizzaservice-core.jar}"/>
-            <attribute name="jar-17-Extension-Name" value="${manifest.reference.pizzaservice-lib.jar}"/>
-            <attribute name="jar-18-Extension-Name" value="${manifest.reference.pizzaservice-mailer.jar}"/>
+            <attribute name="jar-9-Extension-Name" value="${manifest.file.reference.juser-login-core.jar}"/>
+            <attribute name="jar-10-Extension-Name" value="${manifest.file.reference.juser-login-lib.jar}"/>
+            <attribute name="jar-11-Extension-Name" value="${manifest.file.reference.juser-activity-core.jar}"/>
+            <attribute name="jar-12-Extension-Name" value="${manifest.file.reference.juser-activity-lib.jar}"/>
+            <attribute name="jar-13-Extension-Name" value="${manifest.file.reference.jcustomer-core.jar}"/>
+            <attribute name="jar-14-Extension-Name" value="${manifest.file.reference.jcustomer-lib.jar}"/>
+            <attribute name="jar-15-Extension-Name" value="${manifest.file.reference.jphone-core.jar}"/>
+            <attribute name="jar-16-Extension-Name" value="${manifest.file.reference.jphone-lib.jar}"/>
+            <attribute name="jar-17-Extension-Name" value="${manifest.file.reference.jproduct-core.jar}"/>
+            <attribute name="jar-18-Extension-Name" value="${manifest.file.reference.jshop-core.jar}"/>
+            <attribute name="jar-19-Extension-Name" value="${manifest.file.reference.jshop-ee-lib.jar}"/>
+            <attribute name="jar-20-Extension-Name" value="${manifest.file.reference.jshop-receipt-lib.jar}"/>
+            <attribute name="jar-21-Extension-Name" value="${manifest.file.reference.jmailer-ee.jar}"/>
+            <attribute name="jar-22-Extension-Name" value="${manifest.libs.GNU_JPDF_1.7.0.classpath}"/>
+            <attribute name="jar-23-Extension-Name" value="${manifest.reference.pizzaservice-core.jar}"/>
+            <attribute name="jar-24-Extension-Name" value="${manifest.reference.pizzaservice-lib.jar}"/>
+            <attribute name="jar-25-Extension-Name" value="${manifest.reference.pizzaservice-mailer-lib.jar}"/>
+            <attribute name="jar-26-Extension-Name" value="${manifest.file.reference.cdi-api.jar}"/>
         </manifest>
     </target>
     <target depends="compile" name="library-inclusion-in-manifest">
         <copyfiles files="${file.reference.jcoreee.jar}" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jcore-logger-lib.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jcountry-core.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jcountry-lib.jar}" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.jcore-logger-lib.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jcontacts-core.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jcontacts-lib.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.juser-core.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.juser-lib.jar}" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.juser-login-core.jar}" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.juser-login-lib.jar}" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.juser-activity-core.jar}" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.juser-activity-lib.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jcustomer-core.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jcustomer-lib.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jphone-core.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jphone-lib.jar}" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jproduct-core.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jshop-core.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jshop-ee-lib.jar}" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jshop-receipt-lib.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jmailer-ee.jar}" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.pizzaservice-core.jar}" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${libs.GNU_JPDF_1.7.0.classpath}" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${reference.pizzaservice-core.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${reference.pizzaservice-lib.jar}" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${reference.pizzaservice-mailer.jar}" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${reference.pizzaservice-mailer-lib.jar}" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.cdi-api.jar}" todir="${dist.ear.dir}/lib"/>
         <manifest file="${build.ear.classes.dir}/META-INF/MANIFEST.MF" mode="update"/>
     </target>
     <target name="-copy-meta-inf">
@@ -1294,8 +1338,10 @@ exists or setup the property manually. For example like this:
                 CLEANUP SECTION
             -->
     <target depends="init" name="deps-clean" unless="no.deps">
+        <ant antfile="${project.pizzaservice-core}/build.xml" inheritall="false" target="clean"/>
         <ant antfile="${project.pizzaservice-lib}/build.xml" inheritall="false" target="clean"/>
-        <ant antfile="${project.pizzaservice-mailer}/build.xml" inheritall="false" target="clean"/>
+        <ant antfile="${project.pizzaservice-mailer-lib}/build.xml" inheritall="false" target="clean"/>
+        <ant antfile="${project.juser-core}/build.xml" inheritall="false" target="clean"/>
     </target>
     <target depends="init" name="-do-clean">
         <delete dir="${build.dir}"/>