project cleanups + renamed jcontacts -> jcontacts-core

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

diff --git a/lib/jcontacts-core.jar b/lib/jcontacts-core.jar
new file mode 100644 (file)
index 0000000..2248057
Binary files /dev/null and b/lib/jcontacts-core.jar differ

diff --git a/lib/jcontacts.jar b/lib/jcontacts.jar
deleted file mode 100644 (file)
index b2e362b..0000000
Binary files a/lib/jcontacts.jar and /dev/null differ

diff --git a/lib/nblibraries.properties b/lib/nblibraries.properties
index d9714fb2f13bdfd2f38bf14ac4f548a40fb01880..6d0afb59d64978f1c42b37eda93de4d6acaa674c 100644 (file)
--- 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 3887797211c1e800aa2214e3498433d79d1086fa..8672aa8106655f06d773b0c9ba1e4ad963ee6055 100644 (file)
--- 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 9523a9d35ad2fee5a6cb737b3d7eea2008a6590a..bb9588530887cb0c3f2053474211234581274df2 100644 (file)
--- 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 5312cd33d335168386ead09bc440df0106d67eb6..70447d6590cbce606c82dfc84be7c927ca3f0e72 100644 (file)
--- 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 5b1d5addbb038ca0a68b232f10da54319692339f..d8749ee168ee02cabb2072bd0899da29594445ed 100644 (file)
--- 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">