From e28b7581515a8966c2c5a80221f3c966affb36ce Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 11 Aug 2016 11:14:54 +0200
Subject: [PATCH] Converted file-reference to libraray-reference for log4j
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Roland Häder <roland@haeder.net>
---
 lib/{ => log4j}/log4j-LICENSE.txt    |   0
 lib/{ => log4j}/log4j-api-2.6.2.jar  | Bin
 lib/{ => log4j}/log4j-core-2.6.2.jar | Bin
 lib/{ => log4j}/log4j-web-2.6.2.jar  | Bin
 lib/nblibraries.properties           |   7 ++++
 nbproject/build-impl.xml             |  18 +++-------
 nbproject/genfiles.properties        |   4 +--
 nbproject/project.properties         |   7 +---
 nbproject/project.xml                |  48 +++++++++++++--------------
 9 files changed, 38 insertions(+), 46 deletions(-)
 rename lib/{ => log4j}/log4j-LICENSE.txt (100%)
 rename lib/{ => log4j}/log4j-api-2.6.2.jar (100%)
 rename lib/{ => log4j}/log4j-core-2.6.2.jar (100%)
 rename lib/{ => log4j}/log4j-web-2.6.2.jar (100%)

diff --git a/lib/log4j-LICENSE.txt b/lib/log4j/log4j-LICENSE.txt
similarity index 100%
rename from lib/log4j-LICENSE.txt
rename to lib/log4j/log4j-LICENSE.txt
diff --git a/lib/log4j-api-2.6.2.jar b/lib/log4j/log4j-api-2.6.2.jar
similarity index 100%
rename from lib/log4j-api-2.6.2.jar
rename to lib/log4j/log4j-api-2.6.2.jar
diff --git a/lib/log4j-core-2.6.2.jar b/lib/log4j/log4j-core-2.6.2.jar
similarity index 100%
rename from lib/log4j-core-2.6.2.jar
rename to lib/log4j/log4j-core-2.6.2.jar
diff --git a/lib/log4j-web-2.6.2.jar b/lib/log4j/log4j-web-2.6.2.jar
similarity index 100%
rename from lib/log4j-web-2.6.2.jar
rename to lib/log4j/log4j-web-2.6.2.jar
diff --git a/lib/nblibraries.properties b/lib/nblibraries.properties
index 6d0afb5..c153d19 100644
--- a/lib/nblibraries.properties
+++ b/lib/nblibraries.properties
@@ -1,3 +1,10 @@
+libs.Apache_Log4J.classpath=\
+    ${base}/log4j/log4j-api-2.6.2.jar;\
+    ${base}/log4j/log4j-core-2.6.2.jar;\
+    ${base}/log4j/log4j-web-2.6.2.jar
+libs.Apache_Log4J.displayName=Apache Log4J 2.x
+libs.Apache_Log4J.javadoc=\
+    https://logging.apache.org/log4j/2.x/log4j-api/apidocs/
 libs.CopyLibs.classpath=\
     ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
 libs.CopyLibs.displayName=CopyLibs Task
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 5026953..00448e3 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -820,31 +820,23 @@ exists or setup the property manually. For example like this:
     <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="${file.reference.cdi-api.jar}" todir="${build.classes.dir}"/>
-        <copyfiles files="${file.reference.log4j-api-2.6.2.jar}" todir="${build.classes.dir}"/>
-        <copyfiles files="${file.reference.log4j-core-2.6.2.jar}" todir="${build.classes.dir}"/>
-        <copyfiles files="${file.reference.log4j-web-2.6.2.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="${file.reference.cdi-api.jar}" property="manifest.file.reference.cdi-api.jar"/>
-        <basename file="${file.reference.log4j-api-2.6.2.jar}" property="manifest.file.reference.log4j-api-2.6.2.jar"/>
-        <basename file="${file.reference.log4j-core-2.6.2.jar}" property="manifest.file.reference.log4j-core-2.6.2.jar"/>
-        <basename file="${file.reference.log4j-web-2.6.2.jar}" property="manifest.file.reference.log4j-web-2.6.2.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 jar-4 jar-5 "/>
+            <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-2-Extension-Name" value="${manifest.file.reference.cdi-api.jar}"/>
-            <attribute name="jar-3-Extension-Name" value="${manifest.file.reference.log4j-api-2.6.2.jar}"/>
-            <attribute name="jar-4-Extension-Name" value="${manifest.file.reference.log4j-core-2.6.2.jar}"/>
-            <attribute name="jar-5-Extension-Name" value="${manifest.file.reference.log4j-web-2.6.2.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="${file.reference.cdi-api.jar}" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.log4j-api-2.6.2.jar}" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.log4j-core-2.6.2.jar}" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.log4j-web-2.6.2.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"/>
     </target>
     <target name="-copy-meta-inf">
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index 062b2fb..33a9e35 100644
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -3,6 +3,6 @@ build.xml.script.CRC32=366c4288
 build.xml.stylesheet.CRC32=5910fda3@1.51.1
 # 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=dc25fcbb
-nbproject/build-impl.xml.script.CRC32=8b43720b
+nbproject/build-impl.xml.data.CRC32=ab00af05
+nbproject/build-impl.xml.script.CRC32=081658f4
 nbproject/build-impl.xml.stylesheet.CRC32=6096d939@1.55.1
diff --git a/nbproject/project.properties b/nbproject/project.properties
index aff447b..7b5ed99 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -22,9 +22,6 @@ 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.log4j-api-2.6.2.jar=lib/log4j-api-2.6.2.jar
-file.reference.log4j-core-2.6.2.jar=lib/log4j-core-2.6.2.jar
-file.reference.log4j-web-2.6.2.jar=lib/log4j-web-2.6.2.jar
 includes=**
 j2ee.compile.on.save=true
 j2ee.deploy.on.save=true
@@ -42,9 +39,7 @@ jars.in.ejbjar=false
 javac.classpath=\
     ${file.reference.jcore-logger-lib.jar}:\
     ${file.reference.cdi-api.jar}:\
-    ${file.reference.log4j-api-2.6.2.jar}:\
-    ${file.reference.log4j-core-2.6.2.jar}:\
-    ${file.reference.log4j-web-2.6.2.jar}
+    ${libs.Apache_Log4J.classpath}
 javac.compilerargs=-Xlint:unchecked -Xlint:deprecation
 javac.debug=true
 javac.deprecation=true
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 07e5941..c3ea2f1 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -1,25 +1,23 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.j2ee.ejbjarproject</type>
-    <configuration>
-        <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">file.reference.cdi-api.jar</included-library>
-            <included-library dirs="200">file.reference.log4j-api-2.6.2.jar</included-library>
-            <included-library dirs="200">file.reference.log4j-core-2.6.2.jar</included-library>
-            <included-library dirs="200">file.reference.log4j-web-2.6.2.jar</included-library>
-            <source-roots>
-                <root id="src.dir"/>
-            </source-roots>
-            <test-roots>
-                <root id="test.src.dir"/>
-            </test-roots>
-        </data>
-        <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"/>
-    </configuration>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.j2ee.ejbjarproject</type>
+    <configuration>
+        <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">file.reference.cdi-api.jar</included-library>
+            <included-library dirs="200">libs.Apache_Log4J.classpath</included-library>
+            <source-roots>
+                <root id="src.dir"/>
+            </source-roots>
+            <test-roots>
+                <root id="test.src.dir"/>
+            </test-roots>
+        </data>
+        <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"/>
+    </configuration>
+</project>
-- 
2.39.5