updated/added jar(s)

[addressbook-mailer-ejb.git] / nbproject / build-impl.xml

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index b2ad187873fac0288417be1f68ca15587f6225d5..aab9fd5accecc584eba69f46e20e180d8e483e27 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -15,7 +15,7 @@ is divided into following sections:
   - cleanup
 
         -->
-<project xmlns:ejbjarproject1="http://www.netbeans.org/ns/j2ee-ejbjarproject/1" xmlns:ejbjarproject2="http://www.netbeans.org/ns/j2ee-ejbjarproject/2" xmlns:ejbjarproject3="http://www.netbeans.org/ns/j2ee-ejbjarproject/3" basedir=".." default="default" name="addressbook-ejb-impl">
+<project xmlns:ejbjarproject1="http://www.netbeans.org/ns/j2ee-ejbjarproject/1" xmlns:ejbjarproject2="http://www.netbeans.org/ns/j2ee-ejbjarproject/2" xmlns:ejbjarproject3="http://www.netbeans.org/ns/j2ee-ejbjarproject/3" basedir=".." default="default" name="addressbook-mailer-ejb-impl">
     <import file="ant-deploy.xml"/>
     <fail message="Please build using Ant 1.7.1 or higher.">
         <condition>
@@ -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}"/>
@@ -433,7 +433,7 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
                     </fileset>
                 </union>
                 <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
-                <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="addressbook-ejb" testname="TestNG tests" workingDir="${basedir}">
+                <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="addressbook-mailer-ejb" testname="TestNG tests" workingDir="${basedir}">
                     <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
                     <propertyset>
                         <propertyref prefix="test-sys-prop."/>
@@ -585,7 +585,7 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
                 <condition else="-testclass @{testClass}" property="test.class.or.method" value="-methods @{testClass}.@{testMethod}">
                     <isset property="test.method"/>
                 </condition>
-                <condition else="-suitename addressbook-ejb -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
+                <condition else="-suitename addressbook-mailer-ejb -testname @{testClass} ${test.class.or.method}" property="testng.cmd.args" value="@{testClass}">
                     <matches pattern=".*\.xml" string="@{testClass}"/>
                 </condition>
                 <delete dir="${build.test.results.dir}" quiet="true"/>
@@ -806,18 +806,12 @@ 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.addressbook-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">
+        <ant antfile="${project.addressbook-mailer-lib}/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.addressbook-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">
+        <ant antfile="${project.addressbook-mailer-lib}/build.xml" inheritall="false" target="jar">
             <property name="deploy.on.save" value="false"/>
         </ant>
     </target>
@@ -832,81 +826,37 @@ exists or setup the property manually. For example like this:
     </target>
     <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.jcore.jar}" todir="${build.classes.dir}"/>
         <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.jphone-core.jar}" todir="${build.classes.dir}"/>
-        <copyfiles files="${file.reference.jphone-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.jcontacts-business-core.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.jaddressbook-core.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.jmailer-ee.jar}" todir="${build.classes.dir}"/>
-        <copyfiles files="${file.reference.addressbook-mailer.jar}" todir="${build.classes.dir}"/>
-        <copyfiles files="${reference.addressbook-lib.jar}" todir="${build.classes.dir}"/>
-        <copyfiles files="${reference.juser-core.jar}" todir="${build.classes.dir}"/>
+        <copyfiles files="${file.reference.cdi-api.jar}" todir="${build.classes.dir}"/>
+        <copyfiles files="${reference.addressbook-mailer-lib.jar}" todir="${build.classes.dir}"/>
+        <copyfiles files="${libs.velocity.classpath}" todir="${build.classes.dir}"/>
     </target>
     <target if="is.server.weblogic" name="-library-inclusion-in-archive-weblogic">
-        <basename file="${file.reference.jcore.jar}" property="manifest.file.reference.jcore.jar"/>
         <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.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.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.jcontacts-business-core.jar}" property="manifest.file.reference.jcontacts-business-core.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.jaddressbook-core.jar}" property="manifest.file.reference.jaddressbook-core.jar"/>
         <basename file="${file.reference.jmailer-ee.jar}" property="manifest.file.reference.jmailer-ee.jar"/>
-        <basename file="${file.reference.addressbook-mailer.jar}" property="manifest.file.reference.addressbook-mailer.jar"/>
-        <basename file="${reference.addressbook-lib.jar}" property="manifest.reference.addressbook-lib.jar"/>
-        <basename file="${reference.juser-core.jar}" property="manifest.reference.juser-core.jar"/>
+        <basename file="${file.reference.cdi-api.jar}" property="manifest.file.reference.cdi-api.jar"/>
+        <basename file="${reference.addressbook-mailer-lib.jar}" property="manifest.reference.addressbook-mailer-lib.jar"/>
+        <basename file="${libs.velocity.classpath}" property="manifest.libs.velocity.classpath"/>
         <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 "/>
-            <attribute name="jar-1-Extension-Name" value="${manifest.file.reference.jcore.jar}"/>
-            <attribute name="jar-2-Extension-Name" value="${manifest.file.reference.jcoreee.jar}"/>
-            <attribute name="jar-3-Extension-Name" value="${manifest.file.reference.jcore-logger-lib.jar}"/>
-            <attribute name="jar-4-Extension-Name" value="${manifest.file.reference.jcountry-core.jar}"/>
-            <attribute name="jar-5-Extension-Name" value="${manifest.file.reference.jcountry-lib.jar}"/>
-            <attribute name="jar-6-Extension-Name" value="${manifest.file.reference.jphone-core.jar}"/>
-            <attribute name="jar-7-Extension-Name" value="${manifest.file.reference.jphone-lib.jar}"/>
-            <attribute name="jar-8-Extension-Name" value="${manifest.file.reference.jcontacts-core.jar}"/>
-            <attribute name="jar-9-Extension-Name" value="${manifest.file.reference.jcontacts-lib.jar}"/>
-            <attribute name="jar-10-Extension-Name" value="${manifest.file.reference.jcontacts-business-core.jar}"/>
-            <attribute name="jar-11-Extension-Name" value="${manifest.file.reference.juser-core.jar}"/>
-            <attribute name="jar-12-Extension-Name" value="${manifest.file.reference.juser-lib.jar}"/>
-            <attribute name="jar-13-Extension-Name" value="${manifest.file.reference.jaddressbook-core.jar}"/>
-            <attribute name="jar-14-Extension-Name" value="${manifest.file.reference.jmailer-ee.jar}"/>
-            <attribute name="jar-15-Extension-Name" value="${manifest.file.reference.addressbook-mailer.jar}"/>
-            <attribute name="jar-16-Extension-Name" value="${manifest.reference.addressbook-lib.jar}"/>
-            <attribute name="jar-17-Extension-Name" value="${manifest.reference.juser-core.jar}"/>
+            <attribute name="Extension-List" value="jar-1 jar-2 jar-3 jar-4 jar-5 jar-6 "/>
+            <attribute name="jar-1-Extension-Name" value="${manifest.file.reference.jcoreee.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.jmailer-ee.jar}"/>
+            <attribute name="jar-4-Extension-Name" value="${manifest.file.reference.cdi-api.jar}"/>
+            <attribute name="jar-5-Extension-Name" value="${manifest.reference.addressbook-mailer-lib.jar}"/>
+            <attribute name="jar-6-Extension-Name" value="${manifest.libs.velocity.classpath}"/>
         </manifest>
     </target>
     <target depends="compile" name="library-inclusion-in-manifest">
-        <copyfiles files="${file.reference.jcore.jar}" todir="${dist.ear.dir}/lib"/>
         <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.jphone-core.jar}" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.jphone-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.jcontacts-business-core.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.jaddressbook-core.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jmailer-ee.jar}" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.addressbook-mailer.jar}" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${reference.addressbook-lib.jar}" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${reference.juser-core.jar}" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.cdi-api.jar}" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${reference.addressbook-mailer-lib.jar}" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${libs.velocity.classpath}" todir="${dist.ear.dir}/lib"/>
         <manifest file="${build.ear.classes.dir}/META-INF/MANIFEST.MF" mode="update"/>
     </target>
     <target name="-copy-meta-inf">
@@ -1290,8 +1240,7 @@ exists or setup the property manually. For example like this:
                 CLEANUP SECTION
             -->
     <target depends="init" name="deps-clean" unless="no.deps">
-        <ant antfile="${project.addressbook-lib}/build.xml" inheritall="false" target="clean"/>
-        <ant antfile="${project.juser-core}/build.xml" inheritall="false" target="clean"/>
+        <ant antfile="${project.addressbook-mailer-lib}/build.xml" inheritall="false" target="clean"/>
     </target>
     <target depends="init" name="-do-clean">
         <delete dir="${build.dir}"/>