updated jars + added logger-lib + removed log4j

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..ca19891
Binary files /dev/null and b/lib/jcore-logger-lib.jar differ

diff --git a/lib/jcoreee.jar b/lib/jcoreee.jar
index 6061f285cd719c267ee2f1a5e8a526abc4202328..1918a13e890c23895fbce5fad0b6f70489ea7319 100644 (file)
Binary files a/lib/jcoreee.jar and b/lib/jcoreee.jar differ

diff --git a/lib/log4j-api-2.3.jar b/lib/log4j-api-2.3.jar
deleted file mode 100644 (file)
index 2a61bbe..0000000
Binary files a/lib/log4j-api-2.3.jar and /dev/null differ

diff --git a/lib/log4j-core-2.3.jar b/lib/log4j-core-2.3.jar
deleted file mode 100644 (file)
index 5438b0b..0000000
Binary files a/lib/log4j-core-2.3.jar and /dev/null differ

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 429fd41d214c31ba25b7d114f4f4f3d22ca310b3..8b76c5361ba146fafb622b97979db4afdfa167e4 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>
-        <antcall target="-maybe-call-dep">
-            <param name="call.built.properties" value="${built-jar.properties}"/>
-            <param location="${project.jcore-ee-logger}" name="call.subproject"/>
-            <param location="${project.jcore-ee-logger}/build.xml" name="call.script"/>
-            <param name="call.target" value="dist"/>
-            <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">
@@ -1414,14 +1406,6 @@ is divided into following sections:
         <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-ee-logger}" name="call.subproject"/>
-            <param location="${project.jcore-ee-logger}/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}"/>

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index 30545a823dfea3a65e048cefa4878e7e42269168..4bd1615f0612b92b29f9c2d9e5d8ca07313b87e2 100644 (file)
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=a95e50ef
+build.xml.data.CRC32=427cb994
 build.xml.script.CRC32=c005ff3b
 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=a95e50ef
-nbproject/build-impl.xml.script.CRC32=97d8becd
+nbproject/build-impl.xml.data.CRC32=427cb994
+nbproject/build-impl.xml.script.CRC32=ba48679e
 nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 8921b65cf277af8deac7c915cfe011ef1e2562ec..4962ef6e9fe788d6bf8291ace3f5705d5fb68ecf 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -31,6 +31,7 @@ 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
 file.reference.jcoreee.jar=lib/jcoreee.jar
 file.reference.jshop-core.jar=lib/jshop-core.jar
 file.reference.jshop-ee-lib.jar=lib/jshop-ee-lib.jar
@@ -39,8 +40,8 @@ jar.archive.disabled=${jnlp.enabled}
 jar.compress=false
 jar.index=${jnlp.enabled}
 javac.classpath=\
-    ${reference.jcore-ee-logger.dist}:\
     ${file.reference.jcoreee.jar}:\
+    ${file.reference.jcore-logger-lib.jar}:\
     ${file.reference.jshop-core.jar}:\
     ${file.reference.jshop-ee-lib.jar}:\
     ${file.reference.cdi-api.jar}:\
@@ -84,9 +85,7 @@ manifest.custom.permissions=
 meta.inf.dir=${src.dir}/META-INF
 mkdist.disabled=true
 platform.active=default_platform
-project.jcore-ee-logger=../jcore-ee-logger
 project.license=gpl30
-reference.jcore-ee-logger.dist=${project.jcore-ee-logger}/dist/jcore-ee-logger.jar
 run.classpath=\
     ${javac.classpath}:\
     ${build.classes.dir}
@@ -98,6 +97,7 @@ run.test.classpath=\
     ${javac.test.classpath}:\
     ${build.test.classes.dir}
 source.encoding=UTF-8
+source.reference.jcore-logger-lib.jar=../jcore-logger-lib/src/
 source.reference.jcoreee.jar=../jcoreee/src/
 source.reference.jshop-core.jar=../jshop-core/src/
 source.reference.jshop-ee-lib.jar=../jshop-ee-lib/src/

diff --git a/nbproject/project.xml b/nbproject/project.xml
index de0ac3bbcedffa52adbaac583c3d83c23deb2084..c3424af7a97f857732c5bdcebb421059ce4750bf 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>
-        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
-            <reference>
-                <foreign-project>jcore-ee-logger</foreign-project>
-                <artifact-type>jar</artifact-type>
-                <script>build.xml</script>
-                <target>dist</target>
-                <clean-target>clean</clean-target>
-                <id>dist</id>
-            </reference>
-        </references>
+        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1"/>
     </configuration>
 </project>