From: Roland Haeder <roland@mxchange.org>
Date: Sun, 11 Oct 2015 19:24:33 +0000 (+0200)
Subject: add jcountry-core and jcountry-lib
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=869beb2215a35ddaf23c71374285f4ba201c4952;p=jjobs-war.git
add jcountry-core and jcountry-lib
---
diff --git a/lib/jcountry-core.jar b/lib/jcountry-core.jar
new file mode 100644
index 00000000..666cd17d
Binary files /dev/null and b/lib/jcountry-core.jar differ
diff --git a/lib/jcountry-lib.jar b/lib/jcountry-lib.jar
new file mode 100644
index 00000000..7f61f695
Binary files /dev/null and b/lib/jcountry-lib.jar differ
diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index c076a7ca..33e72bea 100644
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -208,6 +208,13 @@
<property name="includes" value="**"/>
<property name="excludes" value=""/>
<property name="runmain.jvmargs" value=""/>
+ <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
+ <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
+ <and>
+ <isset property="endorsed.classpath"/>
+ <length length="0" string="${endorsed.classpath}" when="greater"/>
+ </and>
+ </condition>
<condition else="false" property="jdkBug6558476">
<and>
<matches pattern="1\.[56]" string="${java.specification.version}"/>
@@ -320,6 +327,7 @@ or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties f
<classpath>
<path path="@{classpath}"/>
</classpath>
+ <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
<compilerarg line="${javac.compilerargs}"/>
<compilerarg value="-processorpath"/>
<compilerarg path="@{processorpath}:${empty.dir}"/>
@@ -356,6 +364,7 @@ or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties f
<classpath>
<path path="@{classpath}"/>
</classpath>
+ <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
<compilerarg line="${javac.compilerargs}"/>
<customize/>
</javac>
@@ -549,6 +558,7 @@ or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties f
<classpath>
<path path="${run.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}"/>
</classpath>
+ <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
<jvmarg line="${runmain.jvmargs}"/>
</customize>
</webproject2:test-impl>
@@ -678,6 +688,7 @@ or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties f
<classpath>
<path path="${run.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}"/>
</classpath>
+ <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
<jvmarg line="${runmain.jvmargs}"/>
</customize>
</webproject2:test-debug-impl>
@@ -712,6 +723,7 @@ or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties f
<element name="customize" optional="true"/>
<sequential>
<java classname="@{classname}" fork="true">
+ <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
<jvmarg line="${runmain.jvmargs}"/>
<classpath>
<path path="@{classpath}:${j2ee.platform.classpath}"/>
@@ -789,6 +801,7 @@ or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties f
<element name="customize" optional="true"/>
<sequential>
<java classname="@{classname}" fork="true">
+ <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
<jvmarg line="${debug-args-line}"/>
<jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
<jvmarg line="${runmain.jvmargs}"/>
@@ -1017,11 +1030,15 @@ exists or setup the property manually. For example like this:
</target>
<target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
<target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
+ <copyfiles files="${file.reference.jcountry-core.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
+ <copyfiles files="${file.reference.jcountry-lib.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<copyfiles files="${reference.jjobs-lib.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
<mkdir dir="${build.web.dir}/META-INF"/>
<manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
</target>
<target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
+ <copyfiles files="${file.reference.jcountry-core.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+ <copyfiles files="${file.reference.jcountry-lib.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
<copyfiles files="${reference.jjobs-lib.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
</target>
<target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index 798b61d0..1b2bbeaf 100644
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=441d24ab
+build.xml.data.CRC32=4018faed
build.xml.script.CRC32=fae72669
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=441d24ab
-nbproject/build-impl.xml.script.CRC32=3328e7f8
+nbproject/build-impl.xml.data.CRC32=4018faed
+nbproject/build-impl.xml.script.CRC32=73413a39
nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.68.1.1
diff --git a/nbproject/project.properties b/nbproject/project.properties
index b51a62c4..fd477be7 100644
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -33,7 +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=
excludes=
+file.reference.jcountry-core.jar=lib/jcountry-core.jar
+file.reference.jcountry-lib.jar=lib/jcountry-lib.jar
includes=**
j2ee.compile.on.save=true
j2ee.copy.static.files.on.save=true
@@ -48,6 +51,8 @@ j2ee.platform.wsit.classpath=
j2ee.server.type=gfv3ee6
jar.compress=false
javac.classpath=\
+ ${file.reference.jcountry-core.jar}:\
+ ${file.reference.jcountry-lib.jar}:\
${reference.jjobs-lib.jar}
# Space-separated list of extra javac options
javac.compilerargs=-Xlint:unchecked -Xlint:deprecation
@@ -88,6 +93,8 @@ 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.jcountry-core.jar=../jcountry-core/src/
+source.reference.jcountry-lib.jar=../jcountry-lib/src/
source.root=src
src.dir=${source.root}/java
test.src.dir=test
diff --git a/nbproject/project.xml b/nbproject/project.xml
index 6e638e7b..acf850f8 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -6,6 +6,14 @@
<name>jjobs-war</name>
<minimum-ant-version>1.6.5</minimum-ant-version>
<web-module-libraries>
+ <library dirs="200">
+ <file>${file.reference.jcountry-core.jar}</file>
+ <path-in-war>WEB-INF/lib</path-in-war>
+ </library>
+ <library dirs="200">
+ <file>${file.reference.jcountry-lib.jar}</file>
+ <path-in-war>WEB-INF/lib</path-in-war>
+ </library>
<library dirs="200">
<file>${reference.jjobs-lib.jar}</file>
<path-in-war>WEB-INF/lib</path-in-war>