Continued:

- converted jcore-logger-lib.jar into project reference

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/lib/jcore-logger-lib.jar b/lib/jcore-logger-lib.jar
deleted file mode 100644 (file)
index 63aaafd..0000000
Binary files a/lib/jcore-logger-lib.jar and /dev/null differ

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 2bfccaac251e2f2fcd2c87e847973936be3cfc8e..87248343dfff3e138a917712354d3369af41af99 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -805,8 +805,16 @@ 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"/>
-    <target depends="init" if="dist.ear.dir" name="-deps-ear-jar" unless="no.deps"/>
+    <target depends="init" if="no.dist.ear.dir" name="-deps-module-jar" unless="no.deps">
+        <ant antfile="${project.jcore-logger-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.jcore-logger-lib}/build.xml" inheritall="false" target="jar">
+            <property name="deploy.on.save" value="false"/>
+        </ant>
+    </target>
     <target depends="init, -deps-module-jar, -deps-ear-jar" name="deps-jar"/>
     <target depends="init,deps-jar" name="-pre-pre-compile">
         <mkdir dir="${build.classes.dir}"/>
@@ -818,23 +826,23 @@ 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-logger-lib.jar}" todir="${build.classes.dir}"/>
+        <copyfiles files="${reference.jcore-logger-lib.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${file.reference.cdi-api.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${libs.Apache_Log4J.classpath}" todir="${build.classes.dir}"/>
     </target>
     <target if="is.server.weblogic" name="-library-inclusion-in-archive-weblogic">
-        <basename file="${file.reference.jcore-logger-lib.jar}" property="manifest.file.reference.jcore-logger-lib.jar"/>
+        <basename file="${reference.jcore-logger-lib.jar}" property="manifest.reference.jcore-logger-lib.jar"/>
         <basename file="${file.reference.cdi-api.jar}" property="manifest.file.reference.cdi-api.jar"/>
         <basename file="${libs.Apache_Log4J.classpath}" property="manifest.libs.Apache_Log4J.classpath"/>
         <manifest file="${build.ear.classes.dir}/META-INF/MANIFEST.MF" mode="update">
             <attribute name="Extension-List" value="jar-1 jar-2 jar-3 "/>
-            <attribute name="jar-1-Extension-Name" value="${manifest.file.reference.jcore-logger-lib.jar}"/>
+            <attribute name="jar-1-Extension-Name" value="${manifest.reference.jcore-logger-lib.jar}"/>
             <attribute name="jar-2-Extension-Name" value="${manifest.file.reference.cdi-api.jar}"/>
             <attribute name="jar-3-Extension-Name" value="${manifest.libs.Apache_Log4J.classpath}"/>
         </manifest>
     </target>
     <target depends="compile" name="library-inclusion-in-manifest">
-        <copyfiles files="${file.reference.jcore-logger-lib.jar}" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${reference.jcore-logger-lib.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.cdi-api.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${libs.Apache_Log4J.classpath}" todir="${dist.ear.dir}/lib"/>
         <manifest file="${build.ear.classes.dir}/META-INF/MANIFEST.MF" mode="update"/>
@@ -1219,7 +1227,9 @@ exists or setup the property manually. For example like this:
     <!--
                 CLEANUP SECTION
             -->
-    <target depends="init" name="deps-clean" unless="no.deps"/>
+    <target depends="init" name="deps-clean" unless="no.deps">
+        <ant antfile="${project.jcore-logger-lib}/build.xml" inheritall="false" target="clean"/>
+    </target>
     <target depends="init" name="-do-clean">
         <delete dir="${build.dir}"/>
         <delete dir="${dist.dir}"/>

diff --git a/nbproject/project.properties b/nbproject/project.properties
index e33c189640acad71c1162cd1d2c991c39811559c..f63a7d14555f5950bf190e11666ff25cc037b67d 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -21,7 +21,6 @@ dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
 file.reference.cdi-api.jar=lib/cdi-api.jar
-file.reference.jcore-logger-lib.jar=lib/jcore-logger-lib.jar
 includes=**
 j2ee.compile.on.save=true
 j2ee.deploy.on.save=true
@@ -37,7 +36,7 @@ jar.compress=false
 jar.name=jcore-logger-ejb.jar
 jars.in.ejbjar=false
 javac.classpath=\
-    ${file.reference.jcore-logger-lib.jar}:\
+    ${reference.jcore-logger-lib.jar}:\
     ${file.reference.cdi-api.jar}:\
     ${libs.Apache_Log4J.classpath}
 javac.compilerargs=-Xlint:unchecked -Xlint:deprecation
@@ -66,7 +65,9 @@ javadoc.windowtitle=Core EE Logger
 meta.inf=${source.root}/conf
 meta.inf.excludes=sun-cmp-mappings.xml
 platform.active=default_platform
+project.jcore-logger-lib=../jcore-logger-lib
 project.license=agpl30
+reference.jcore-logger-lib.jar=${project.jcore-logger-lib}/dist/jcore-logger-lib.jar
 resource.dir=setup
 run.test.classpath=\
     ${javac.test.classpath}:\
@@ -75,7 +76,6 @@ run.test.classpath=\
 # (you may also define separate properties like run-sys-prop.name=value instead of -Dname=value):
 runmain.jvmargs=
 source.encoding=UTF-8
-source.reference.jcore-logger-lib.jar=../jcore-logger-lib/src/
 source.root=src
 src.dir=${source.root}/java
 test.src.dir=test

diff --git a/nbproject/project.xml b/nbproject/project.xml
index 862fbe71f97d4b28f838ef259101b409d368cbc3..f5f436222e2f0e0f0471ac779345539e644bcd0b 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -5,7 +5,7 @@
         <data xmlns="http://www.netbeans.org/ns/j2ee-ejbjarproject/3">
             <name>jcore-logger-ejb</name>
             <minimum-ant-version>1.6.5</minimum-ant-version>
-            <included-library dirs="200">file.reference.jcore-logger-lib.jar</included-library>
+            <included-library dirs="200">reference.jcore-logger-lib.jar</included-library>
             <included-library dirs="200">file.reference.cdi-api.jar</included-library>
             <included-library dirs="200">libs.Apache_Log4J.classpath</included-library>
             <source-roots>
@@ -18,6 +18,15 @@
         <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">
             <definitions>./lib/nblibraries.properties</definitions>
         </libraries>
-        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1"/>
+        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
+            <reference>
+                <foreign-project>jcore-logger-lib</foreign-project>
+                <artifact-type>jar</artifact-type>
+                <script>build.xml</script>
+                <target>jar</target>
+                <clean-target>clean</clean-target>
+                <id>jar</id>
+            </reference>
+        </references>
     </configuration>
 </project>