From 49758c5bfc608702de7da18f919874f7f784d5b6 Mon Sep 17 00:00:00 2001
From: Roland Haeder <roland@mxchange.org>
Date: Fri, 2 Oct 2015 09:35:40 +0200
Subject: [PATCH] =?utf8?q?project=20cleanups=20+=20renamed=20jcontacts=20-?=
 =?utf8?q?>=20jcontacts-core=20Signed-off-by:Roland=20H=C3=A4der=20<roland?=
 =?utf8?q?@mxchange.org>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 lib/{jcontacts.jar => jcontacts-core.jar} | Bin 17047 -> 17047 bytes
 lib/nblibraries.properties                |   7 -------
 nbproject/build-impl.xml                  |   4 ++--
 nbproject/genfiles.properties             |   4 ++--
 nbproject/project.properties              |   8 +++-----
 nbproject/project.xml                     |   2 +-
 6 files changed, 8 insertions(+), 17 deletions(-)
 rename lib/{jcontacts.jar => jcontacts-core.jar} (92%)

diff --git a/lib/jcontacts.jar b/lib/jcontacts-core.jar
similarity index 92%
rename from lib/jcontacts.jar
rename to lib/jcontacts-core.jar
index b2e362bd0913bfa98eeb20445af9445c08d9e6ee..2248057388fbe510565b411e67b98b6b9bc87b77 100644
GIT binary patch
delta 192
zcmbQ<$~e81kvG7bnT3mifrEiT-_vO#uLiRokg}M@4B}ms2UDLlK-6S8Mk6pC%xDFs
zConpK=*?FcS=qphJM8jGV8%bqVs0>_#Pkd&h%wpO-U4Ls<T`tMF#mwPKA8Rl6bH%c
jIyiypA_p%pz26}aOba`PgXvtyXfS=+F&0c~JLLcXGl(^F

delta 192
zcmbQ<$~e81kvG7bnT3mifrEj;v)XYYuLiRRkg}KtrY_2Zsn1}+$#RTF%s@4hgBh*B
z^aMsnko4v&jI3-Rfz5Z=<(0r9|1^ua!6GH5XE?!Xo$W0^GL!4<?ZNZ`dwnqd2`aAZ
j-~?7z<lqIS_d5iF<%J!?!TemuXfXe@V=S1j?UVxmexp0v

diff --git a/lib/nblibraries.properties b/lib/nblibraries.properties
index d9714fb2..6d0afb59 100644
--- a/lib/nblibraries.properties
+++ b/lib/nblibraries.properties
@@ -2,10 +2,3 @@ libs.CopyLibs.classpath=\
     ${base}/CopyLibs/org-netbeans-modules-java-j2seproject-copylibstask.jar
 libs.CopyLibs.displayName=CopyLibs Task
 libs.CopyLibs.prop-version=2.0
-libs.javaee-endorsed-api-6.0.classpath=\
-    ${base}/javaee-endorsed-api-6.0/javax.annotation.jar;\
-    ${base}/javaee-endorsed-api-6.0/jaxb-api-osgi.jar;\
-    ${base}/javaee-endorsed-api-6.0/webservices-api-osgi.jar
-libs.javaee-endorsed-api-6.0.displayName=Java EE 6 Endorsed API Library
-libs.javaee-endorsed-api-6.0.javadoc=\
-    ${base}/javaee-endorsed-api-6.0/javaee-doc-api.jar
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 38877972..8672aa81 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -1033,7 +1033,7 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.jcore.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jcore-logger-lib.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jcoreee.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${file.reference.jcontacts.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${file.reference.jcontacts-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jshop-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.jshop-ee-lib.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${reference.PizzaService-lib.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
@@ -1046,7 +1046,7 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.jcore.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jcore-logger-lib.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jcoreee.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.jcontacts.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.jcontacts-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jshop-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.jshop-ee-lib.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${reference.PizzaService-lib.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index 9523a9d3..bb958853 100644
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -3,6 +3,6 @@ build.xml.script.CRC32=82213886
 build.xml.stylesheet.CRC32=651128d4@1.68.1.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=8939cb27
-nbproject/build-impl.xml.script.CRC32=1d4cdc13
+nbproject/build-impl.xml.data.CRC32=656c188b
+nbproject/build-impl.xml.script.CRC32=3f1a63d0
 nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.68.1.1
diff --git a/nbproject/project.properties b/nbproject/project.properties
index 5312cd33..70447d65 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -33,12 +33,10 @@ dist.dir=dist
 dist.ear.war=${dist.dir}/${war.ear.name}
 dist.javadoc.dir=${dist.dir}/javadoc
 dist.war=${dist.dir}/${war.name}
-endorsed.classpath=\
-    ${libs.javaee-endorsed-api-6.0.classpath}
 excludes=
 file.reference.cdi-api.jar=lib/cdi-api.jar
 file.reference.gf-client.jar=lib/gf-client.jar
-file.reference.jcontacts.jar=lib/jcontacts.jar
+file.reference.jcontacts-core.jar=lib/jcontacts-core.jar
 file.reference.jcore-logger-lib.jar=lib/jcore-logger-lib.jar
 file.reference.jcore.jar=lib/jcore.jar
 file.reference.jcoreee.jar=lib/jcoreee.jar
@@ -61,7 +59,7 @@ javac.classpath=\
     ${file.reference.jcore.jar}:\
     ${file.reference.jcore-logger-lib.jar}:\
     ${file.reference.jcoreee.jar}:\
-    ${file.reference.jcontacts.jar}:\
+    ${file.reference.jcontacts-core.jar}:\
     ${file.reference.jshop-core.jar}:\
     ${file.reference.jshop-ee-lib.jar}:\
     ${reference.PizzaService-lib.jar}:\
@@ -106,7 +104,7 @@ 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.jcontacts.jar=../jcontacts/src/
+source.reference.jcontacts-core.jar=../jcontacts-core/src/
 source.reference.jcore-logger-lib.jar=../jcore-logger-lib/src/
 source.reference.jcore.jar=../jcore/src/
 source.reference.jcoreee.jar=../jcoreee/src/
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 5b1d5add..d8749ee1 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -19,7 +19,7 @@
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
-                    <file>${file.reference.jcontacts.jar}</file>
+                    <file>${file.reference.jcontacts-core.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
                 <library dirs="200">
-- 
2.39.5