Don't cherry-pick:

- added Java EE 7 API

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

diff --git a/lib/javaee-api-7.0/javaee-api-7.0.jar b/lib/javaee-api-7.0/javaee-api-7.0.jar
new file mode 100644 (file)
index 0000000..9e38d4c
Binary files /dev/null and b/lib/javaee-api-7.0/javaee-api-7.0.jar differ

diff --git a/lib/nblibraries.properties b/lib/nblibraries.properties
index 82f74cca98b0d06e6e77c35ace52542714ed87a0..8a3a891287bc9836263662b916f5dc68fd0bfeea 100644 (file)
--- a/lib/nblibraries.properties
+++ b/lib/nblibraries.properties
@@ -1,3 +1,9 @@
+libs.javaee-api-7.0.classpath=\
+    ${base}/javaee-api-7.0/javaee-api-7.0.jar
+libs.javaee-api-7.0.displayName=Java EE 7 API Library
+libs.javaee-api-7.0.javadoc=\
+    https://docs.oracle.com/javaee/7/api/
+libs.javaee-api-7.0.prop-maven-dependencies=javax:javaee-api:7.0:jar
 libs.velocity.classpath=\
     ${base}/velocity/velocity-1.7-dep.jar:\
     ${base}/velocity/velocity-1.7.jar

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 6f489903a17888ea25324e213e6d8dcf735c52fd..6231cbf241c13e93ca1070edbf25ef1bb3a58f27 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -522,8 +522,7 @@ or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties f
                     <formatter type="brief" usefile="false"/>
                     <formatter type="xml"/>
                     <jvmarg value="-ea"/>
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
+                    <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/>
                     <customize/>
                 </junit>
             </sequential>
@@ -555,8 +554,7 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
                     <formatter type="xml"/>
                     <jvmarg value="-ea"/>
                     <jvmarg line="${run.jvmargs.ide}"/>
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
+                    <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/>
                     <customize/>
                 </junit>
             </sequential>
@@ -707,18 +705,6 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
         </macrodef>
     </target>
     <target name="-init-debug-args">
-        <property name="version-output" value="java version &quot;${ant.java.version}"/>
-        <condition property="have-jdk-older-than-1.4">
-            <or>
-                <contains string="${version-output}" substring="java version &quot;1.0"/>
-                <contains string="${version-output}" substring="java version &quot;1.1"/>
-                <contains string="${version-output}" substring="java version &quot;1.2"/>
-                <contains string="${version-output}" substring="java version &quot;1.3"/>
-            </or>
-        </condition>
-        <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
-            <istrue value="${have-jdk-older-than-1.4}"/>
-        </condition>
         <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
             <os family="windows"/>
         </condition>
@@ -734,8 +720,7 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
             <element name="customize" optional="true"/>
             <sequential>
                 <java classname="@{classname}" fork="true">
-                    <jvmarg line="${debug-args-line}"/>
-                    <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
+                    <jvmarg value="-agentlib:jdwp=transport=${debug-transport},address=${jpda.address}"/>
                     <jvmarg line="${runmain.jvmargs}"/>
                     <classpath>
                         <path path="@{classpath}"/>
@@ -832,6 +817,7 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.cdi-api.jar}" todir="${build.classes.dir}"/>
         <copyfiles files="${libs.velocity.classpath}" todir="${build.classes.dir}"/>
         <copyfiles files="${reference.jfinancials-mailer-lib.jar}" todir="${build.classes.dir}"/>
+        <copyfiles files="${libs.javaee-api-7.0.classpath}" todir="${build.classes.dir}"/>
     </target>
     <target if="is.server.weblogic" name="-library-inclusion-in-archive-weblogic">
         <basename file="${file.reference.jcoreee.jar}" property="manifest.file.reference.jcoreee.jar"/>
@@ -840,14 +826,16 @@ exists or setup the property manually. For example like this:
         <basename file="${file.reference.cdi-api.jar}" property="manifest.file.reference.cdi-api.jar"/>
         <basename file="${libs.velocity.classpath}" property="manifest.libs.velocity.classpath"/>
         <basename file="${reference.jfinancials-mailer-lib.jar}" property="manifest.reference.jfinancials-mailer-lib.jar"/>
+        <basename file="${libs.javaee-api-7.0.classpath}" property="manifest.libs.javaee-api-7.0.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 jar-6 "/>
+            <attribute name="Extension-List" value="jar-1 jar-2 jar-3 jar-4 jar-5 jar-6 jar-7 "/>
             <attribute name="jar-1-Extension-Name" value="${manifest.file.reference.jcoreee.jar}"/>
             <attribute name="jar-2-Extension-Name" value="${manifest.file.reference.jcore-logger-lib.jar}"/>
             <attribute name="jar-3-Extension-Name" value="${manifest.file.reference.jmailer-ee.jar}"/>
             <attribute name="jar-4-Extension-Name" value="${manifest.file.reference.cdi-api.jar}"/>
             <attribute name="jar-5-Extension-Name" value="${manifest.libs.velocity.classpath}"/>
             <attribute name="jar-6-Extension-Name" value="${manifest.reference.jfinancials-mailer-lib.jar}"/>
+            <attribute name="jar-7-Extension-Name" value="${manifest.libs.javaee-api-7.0.classpath}"/>
         </manifest>
     </target>
     <target depends="compile" name="library-inclusion-in-manifest">
@@ -857,6 +845,7 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.cdi-api.jar}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${libs.velocity.classpath}" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${reference.jfinancials-mailer-lib.jar}" todir="${dist.ear.dir}/lib"/>
+        <copyfiles files="${libs.javaee-api-7.0.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/project.properties b/nbproject/project.properties
index b6a9766b7eff3af638a45a88485cefa688ccb393..40c3383c239b52d12d30d06656da16ce366da5d5 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -45,8 +45,10 @@ javac.classpath=\
     ${file.reference.jcore-logger-lib.jar}:\
     ${file.reference.jmailer-ee.jar}:\
     ${file.reference.cdi-api.jar}:\
+    ${reference.jfinancials-mailer-lib.jar}:\
     ${libs.velocity.classpath}:\
-    ${reference.jfinancials-mailer-lib.jar}
+    ${libs.javaee-api-7.0.classpath}
+>>>>>>> e4cc82df... Don't cherry-pick:
 javac.compilerargs=-Xlint:unchecked -Xlint:deprecation
 javac.debug=true
 javac.deprecation=true

diff --git a/nbproject/project.xml b/nbproject/project.xml
index e3684ff98e4ceafb418d1a1c334a3d3bfb2d74f7..c33e06f6ac67cd55b0ac415609e891413910b32d 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -11,6 +11,7 @@
             <included-library dirs="200">file.reference.cdi-api.jar</included-library>
             <included-library dirs="200">libs.velocity.classpath</included-library>
             <included-library dirs="200">reference.jfinancials-mailer-lib.jar</included-library>
+            <included-library dirs="200">libs.javaee-api-7.0.classpath</included-library>
             <source-roots>
                 <root id="src.dir"/>
             </source-roots>