use logger-lib, not EJB

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

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

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 8d5accb304db9c49f41b857101ed11ef8a76b88f..5ba63b12f25e57e1ddadcc4dcf3d9be20541cc1a 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -921,14 +921,6 @@ is divided into following sections:
         <propertyfile file="${built-jar.properties}">
             <entry key="${basedir}" value=""/>
         </propertyfile>
         <propertyfile file="${built-jar.properties}">
             <entry key="${basedir}" value=""/>
         </propertyfile>

-        <antcall target="-maybe-call-dep">
-            <param name="call.built.properties" value="${built-jar.properties}"/>
-            <param location="${project.jcore-logger-lib}" name="call.subproject"/>
-            <param location="${project.jcore-logger-lib}/build.xml" name="call.script"/>
-            <param name="call.target" value="jar"/>
-            <param name="transfer.built-jar.properties" value="${built-jar.properties}"/>
-            <param name="transfer.not.archive.disabled" value="true"/>
-        </antcall>

     </target>
     <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
     <target depends="init" name="-check-automatic-build">
     </target>
     <target depends="init,-check-automatic-build,-clean-after-automatic-build" name="-verify-automatic-build"/>
     <target depends="init" name="-check-automatic-build">


@@ -1414,14 +1406,6 @@ is divided into following sections:
         <propertyfile file="${built-clean.properties}">
             <entry key="${basedir}" value=""/>
         </propertyfile>
         <propertyfile file="${built-clean.properties}">
             <entry key="${basedir}" value=""/>
         </propertyfile>

-        <antcall target="-maybe-call-dep">
-            <param name="call.built.properties" value="${built-clean.properties}"/>
-            <param location="${project.jcore-logger-lib}" name="call.subproject"/>
-            <param location="${project.jcore-logger-lib}/build.xml" name="call.script"/>
-            <param name="call.target" value="clean"/>
-            <param name="transfer.built-clean.properties" value="${built-clean.properties}"/>
-            <param name="transfer.not.archive.disabled" value="true"/>
-        </antcall>

     </target>
     <target depends="init" name="-do-clean">
         <delete dir="${build.dir}"/>
     </target>
     <target depends="init" name="-do-clean">
         <delete dir="${build.dir}"/>

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index eb737a759adb0b39d0af5159b7f9d2144f70eeee..e5db16500fc38dc46a57189b3a98691243f0accc 100644 (file)
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=e5496d61
+build.xml.data.CRC32=0de902ac

 build.xml.script.CRC32=3357aa22
 build.xml.stylesheet.CRC32=8064a381@1.75.2.48
 # 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.
 build.xml.script.CRC32=3357aa22
 build.xml.stylesheet.CRC32=8064a381@1.75.2.48
 # 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=e5496d61
-nbproject/build-impl.xml.script.CRC32=e3a3cc9e
+nbproject/build-impl.xml.data.CRC32=0de902ac
+nbproject/build-impl.xml.script.CRC32=29041c33

 nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48
 nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 1f94eed31f91e79bfc112d86fcdf33fd9d422e82..d6d42c4714cdb60474080f3db1fe2658c63981aa 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -30,12 +30,13 @@ dist.jar=${dist.dir}/jcoreee.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=
 dist.javadoc.dir=${dist.dir}/javadoc
 endorsed.classpath=
 excludes=

+file.reference.jcore-logger-lib.jar=lib\\jcore-logger-lib.jar

 includes=**
 jar.archive.disabled=${jnlp.enabled}
 jar.compress=false
 jar.index=${jnlp.enabled}
 javac.classpath=\
 includes=**
 jar.archive.disabled=${jnlp.enabled}
 jar.compress=false
 jar.index=${jnlp.enabled}
 javac.classpath=\

-    ${reference.jcore-logger-lib.jar}:\
+    ${file.reference.jcore-logger-lib.jar}:\

     ${libs.javaee-api-7.0.classpath}
 # Space-separated list of extra javac options
 javac.compilerargs=-Xlint:unchecked -Xlint:deprecation
     ${libs.javaee-api-7.0.classpath}
 # Space-separated list of extra javac options
 javac.compilerargs=-Xlint:unchecked -Xlint:deprecation


@@ -76,9 +77,7 @@ manifest.custom.permissions=
 meta.inf.dir=${src.dir}/META-INF
 mkdist.disabled=true
 platform.active=default_platform
 meta.inf.dir=${src.dir}/META-INF
 mkdist.disabled=true
 platform.active=default_platform

-project.jcore-logger-lib=../jcore-logger-lib

 project.license=gpl30
 project.license=gpl30

-reference.jcore-logger-lib.jar=${project.jcore-logger-lib}/dist/jcore-logger-lib.jar

 run.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
 run.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}


@@ -90,5 +89,6 @@ run.test.classpath=\
     ${javac.test.classpath}:\
     ${build.test.classes.dir}
 source.encoding=UTF-8
     ${javac.test.classpath}:\
     ${build.test.classes.dir}
 source.encoding=UTF-8

+source.reference.jcore-logger-lib.jar=../jcore-logger-lib/src/

 src.dir=src
 test.src.dir=test
 src.dir=src
 test.src.dir=test

diff --git a/nbproject/project.xml b/nbproject/project.xml
index 2acdd90528e10dd68a61f8af7d848b67524df1d2..d9fcfaaf2b0806ffde000ef5e819234618e562d9 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -14,15 +14,6 @@
         <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">
             <definitions>./lib/nblibraries.properties</definitions>
         </libraries>
         <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">
-            <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>
+        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1"/>

     </configuration>
 </project>
     </configuration>
 </project>