Revision: 20313
http://sourceforge.net/p/gate/code/20313
Author: ian_roberts
Date: 2018-10-26 11:45:55 +0000 (Fri, 26 Oct 2018)
Log Message:
-----------
Changes to allow Annotator GUI and friends to run on Java 9 and later - a
number of "EE" apis that have been part of Java SE since v6 are no longer
accessible by default in Java 9+, so need to be supplied by us, and CXF's use
of JAXB fails on 9+ without an additional --add-opens option.
Modified Paths:
--------------
teamware/trunk/annic-gui/build.xml
teamware/trunk/annotation-diff-gui/build.xml
teamware/trunk/annotator-gui/build.xml
teamware/trunk/executive/web/pages/annicGUIInvoker.jsp
teamware/trunk/executive/web/pages/annotationDiffJnlpInvoker.jsp
teamware/trunk/executive/web/pages/jnlpInvoker.jsp
teamware/trunk/lib/lib.xml
Added Paths:
-----------
teamware/trunk/lib/javax.annotation-api-1.3.2/
teamware/trunk/lib/javax.annotation-api-1.3.2/javax.annotation-api-1.3.2.jar
teamware/trunk/lib/jaxb-api-2.1/
teamware/trunk/lib/jaxb-api-2.1/jaxb-api-2.1.jar
teamware/trunk/lib/jaxws-api-2.1/
teamware/trunk/lib/jaxws-api-2.1/geronimo-jaxws_2.1_spec-1.0.jar
teamware/trunk/lib/jsr181-api-1.0-MR1/
teamware/trunk/lib/jsr181-api-1.0-MR1/jsr181-api-1.0-MR1.jar
teamware/trunk/lib/saaj-api-1.3/
teamware/trunk/lib/saaj-api-1.3/saaj-api-1.3.jar
Modified: teamware/trunk/annic-gui/build.xml
===================================================================
--- teamware/trunk/annic-gui/build.xml 2018-10-12 08:46:38 UTC (rev 20312)
+++ teamware/trunk/annic-gui/build.xml 2018-10-26 11:45:55 UTC (rev 20313)
@@ -51,6 +51,8 @@
<patternset id="run.required.libs">
<patternset refid="pattern.executive-proxy" />
<patternset refid="pattern.docservice-proxy" />
+ <patternset refid="pattern.jaxb-api" />
+ <patternset refid="pattern.jaxws-api" />
</patternset>
<!-- The CLASSPATH -->
Modified: teamware/trunk/annotation-diff-gui/build.xml
===================================================================
--- teamware/trunk/annotation-diff-gui/build.xml 2018-10-12 08:46:38 UTC
(rev 20312)
+++ teamware/trunk/annotation-diff-gui/build.xml 2018-10-26 11:45:55 UTC
(rev 20313)
@@ -51,6 +51,8 @@
<patternset id="run.required.libs">
<patternset refid="pattern.executive-proxy" />
<patternset refid="pattern.docservice-proxy" />
+ <patternset refid="pattern.jaxb-api" />
+ <patternset refid="pattern.jaxws-api" />
</patternset>
<!-- The CLASSPATH -->
Modified: teamware/trunk/annotator-gui/build.xml
===================================================================
--- teamware/trunk/annotator-gui/build.xml 2018-10-12 08:46:38 UTC (rev
20312)
+++ teamware/trunk/annotator-gui/build.xml 2018-10-26 11:45:55 UTC (rev
20313)
@@ -55,6 +55,8 @@
<patternset refid="pattern.executive-proxy" />
<patternset refid="pattern.commons-httpclient" />
<patternset refid="pattern.commons-codec" />
+ <patternset refid="pattern.jaxb-api" />
+ <patternset refid="pattern.jaxws-api" />
</patternset>
<fileset id="plugin.base-plugin" dir="${plugins.dir}"
includes="base-plugin/**/*" />
Modified: teamware/trunk/executive/web/pages/annicGUIInvoker.jsp
===================================================================
--- teamware/trunk/executive/web/pages/annicGUIInvoker.jsp 2018-10-12
08:46:38 UTC (rev 20312)
+++ teamware/trunk/executive/web/pages/annicGUIInvoker.jsp 2018-10-26
11:45:55 UTC (rev 20313)
@@ -69,10 +69,16 @@
<all-permissions />
</security>
<resources>
+<j2se version="9+" java-vm-args="--add-opens=java.base/java.lang=ALL-UNNAMED"
max-heap-size="768m"/>
<j2se version="1.6+" java-vm-args="-Xmx1024M" max-heap-size="768m" />
<extension name="Activation" href="activation.jnlp" />
<extension name="Mail" href="mail.jnlp" />
<jar href="annicgui.jar" />
+<jar href="geronimo-jaxws_2.1_spec-1.0.jar" />
+<jar href="jsr181-api-1.0-MR1.jar" />
+<jar href="javax.annotation-api-1.3.2.jar" />
+<jar href="saaj-api-1.3.jar" />
+<jar href="jaxb-api-2.1.jar" />
<jar href="docservice-proxy-api.jar" />
<jar href="docservice-proxy-impl.jar" />
<jar href="docservice-api.jar" />
Modified: teamware/trunk/executive/web/pages/annotationDiffJnlpInvoker.jsp
===================================================================
--- teamware/trunk/executive/web/pages/annotationDiffJnlpInvoker.jsp
2018-10-12 08:46:38 UTC (rev 20312)
+++ teamware/trunk/executive/web/pages/annotationDiffJnlpInvoker.jsp
2018-10-26 11:45:55 UTC (rev 20313)
@@ -93,6 +93,7 @@
<all-permissions />
</security>
<resources>
+<j2se version="9+" java-vm-args="--add-opens=java.base/java.lang=ALL-UNNAMED"
max-heap-size="768m"/>
<j2se version="1.6+" java-vm-args="-Xmx1024M" max-heap-size="768m" />
<extension name="Activation" href="activation.jnlp" />
<extension name="Mail" href="mail.jnlp" />
@@ -100,6 +101,11 @@
<jar href="docservice-proxy-api.jar" />
<jar href="docservice-proxy-impl.jar" />
<jar href="docservice-api.jar" />
+<jar href="jaxb-api-2.1.jar" />
+<jar href="jsr181-api-1.0-MR1.jar" />
+<jar href="javax.annotation-api-1.3.2.jar" />
+<jar href="saaj-api-1.3.jar" />
+<jar href="geronimo-jaxws_2.1_spec-1.0.jar" />
<jar href="safe-common.jar" />
<jar href="commons-logging-1.1.jar"/>
<jar href="commons-lang.jar"/>
Modified: teamware/trunk/executive/web/pages/jnlpInvoker.jsp
===================================================================
--- teamware/trunk/executive/web/pages/jnlpInvoker.jsp 2018-10-12 08:46:38 UTC
(rev 20312)
+++ teamware/trunk/executive/web/pages/jnlpInvoker.jsp 2018-10-26 11:45:55 UTC
(rev 20313)
@@ -259,6 +259,7 @@
<all-permissions/>
</security>
<resources>
+ <j2se version="9+"
java-vm-args="--add-opens=java.base/java.lang=ALL-UNNAMED"
max-heap-size="768m"/>
<j2se version="1.6+" java-vm-args="-Xmx1024M" max-heap-size="768m"/>
<extension name="Activation" href="activation.jnlp"/>
<extension name="Mail" href="mail.jnlp"/>
@@ -269,6 +270,11 @@
<jar href="docservice-proxy-api.jar"/>
<jar href="docservice-proxy-impl.jar"/>
<jar href="docservice-api.jar"/>
+ <jar href="jaxb-api-2.1.jar" />
+ <jar href="javax.annotation-api-1.3.2.jar" />
+ <jar href="jsr181-api-1.0-MR1.jar" />
+ <jar href="geronimo-jaxws_2.1_spec-1.0.jar" />
+ <jar href="saaj-api-1.3.jar" />
<jar href="safe-common.jar"/>
<jar href="commons-logging-1.1.jar"/>
<jar href="commons-lang.jar"/>
Added:
teamware/trunk/lib/javax.annotation-api-1.3.2/javax.annotation-api-1.3.2.jar
===================================================================
(Binary files differ)
Index:
teamware/trunk/lib/javax.annotation-api-1.3.2/javax.annotation-api-1.3.2.jar
===================================================================
---
teamware/trunk/lib/javax.annotation-api-1.3.2/javax.annotation-api-1.3.2.jar
2018-10-12 08:46:38 UTC (rev 20312)
+++
teamware/trunk/lib/javax.annotation-api-1.3.2/javax.annotation-api-1.3.2.jar
2018-10-26 11:45:55 UTC (rev 20313)
Property changes on:
teamware/trunk/lib/javax.annotation-api-1.3.2/javax.annotation-api-1.3.2.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/zip
\ No newline at end of property
Added: teamware/trunk/lib/jaxb-api-2.1/jaxb-api-2.1.jar
===================================================================
(Binary files differ)
Index: teamware/trunk/lib/jaxb-api-2.1/jaxb-api-2.1.jar
===================================================================
--- teamware/trunk/lib/jaxb-api-2.1/jaxb-api-2.1.jar 2018-10-12 08:46:38 UTC
(rev 20312)
+++ teamware/trunk/lib/jaxb-api-2.1/jaxb-api-2.1.jar 2018-10-26 11:45:55 UTC
(rev 20313)
Property changes on: teamware/trunk/lib/jaxb-api-2.1/jaxb-api-2.1.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/java-archive
\ No newline at end of property
Added: teamware/trunk/lib/jaxws-api-2.1/geronimo-jaxws_2.1_spec-1.0.jar
===================================================================
(Binary files differ)
Index: teamware/trunk/lib/jaxws-api-2.1/geronimo-jaxws_2.1_spec-1.0.jar
===================================================================
--- teamware/trunk/lib/jaxws-api-2.1/geronimo-jaxws_2.1_spec-1.0.jar
2018-10-12 08:46:38 UTC (rev 20312)
+++ teamware/trunk/lib/jaxws-api-2.1/geronimo-jaxws_2.1_spec-1.0.jar
2018-10-26 11:45:55 UTC (rev 20313)
Property changes on:
teamware/trunk/lib/jaxws-api-2.1/geronimo-jaxws_2.1_spec-1.0.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/zip
\ No newline at end of property
Added: teamware/trunk/lib/jsr181-api-1.0-MR1/jsr181-api-1.0-MR1.jar
===================================================================
(Binary files differ)
Index: teamware/trunk/lib/jsr181-api-1.0-MR1/jsr181-api-1.0-MR1.jar
===================================================================
--- teamware/trunk/lib/jsr181-api-1.0-MR1/jsr181-api-1.0-MR1.jar
2018-10-12 08:46:38 UTC (rev 20312)
+++ teamware/trunk/lib/jsr181-api-1.0-MR1/jsr181-api-1.0-MR1.jar
2018-10-26 11:45:55 UTC (rev 20313)
Property changes on:
teamware/trunk/lib/jsr181-api-1.0-MR1/jsr181-api-1.0-MR1.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/java-archive
\ No newline at end of property
Modified: teamware/trunk/lib/lib.xml
===================================================================
--- teamware/trunk/lib/lib.xml 2018-10-12 08:46:38 UTC (rev 20312)
+++ teamware/trunk/lib/lib.xml 2018-10-26 11:45:55 UTC (rev 20313)
@@ -507,6 +507,13 @@
<include name="jaxb-${jaxb.version}/*.jar" />
</patternset>
+ <!-- JAXB API 2.1 -->
+ <property name="jaxb-api.version" value="2.1" />
+ <property name="jaxb-api.dir" location="${lib.dir}/jaxb-api-${jaxb.version}"
/>
+ <patternset id="pattern.jaxb-api">
+ <include name="jaxb-api-${jaxb-api.version}/*.jar" />
+ </patternset>
+
<!-- Tika - http://tika.apache.org -->
<property name="tika.version" value="0.7" />
<property name="tika.dir" location="${lib.dir}/tika-${tika.version}" />
@@ -521,6 +528,34 @@
<patternset refid="pattern.commons-io" />
</patternset>
+ <!-- JAX-WS API -->
+ <property name="jsr181-api.version" value="1.0-MR1" />
+ <property name="jsr181-api.dir"
location="${lib.dir}/jsr181-api-${jsr181-api.version}" />
+ <patternset id="pattern.jsr181-api">
+ <include name="jsr181-api-${jsr181-api.version}/*.jar" />
+ </patternset>
+
+ <property name="saaj-api.version" value="1.3" />
+ <property name="saaj-api.dir"
location="${lib.dir}/saaj-api-${saaj-api.version}" />
+ <patternset id="pattern.saaj-api">
+ <include name="saaj-api-${saaj-api.version}/*.jar" />
+ </patternset>
+
+ <property name="javax.annotation-api.version" value="1.3.2" />
+ <property name="javax.annotation-api.dir"
location="${lib.dir}/javax.annotation-api-${javax.annotation-api.version}" />
+ <patternset id="pattern.javax.annotation-api">
+ <include name="javax.annotation-api-${javax.annotation-api.version}/*.jar"
/>
+ </patternset>
+
+ <property name="jaxws-api.version" value="2.1" />
+ <property name="jaxws-api.dir"
location="${lib.dir}/jaxws-api-${jaxws-api.version}" />
+ <patternset id="pattern.jaxws-api">
+ <patternset refid="pattern.jsr181-api" />
+ <patternset refid="pattern.saaj-api" />
+ <patternset refid="pattern.javax.annotation-api" />
+ <include name="jaxws-api-${jaxws-api.version}/*.jar" />
+ </patternset>
+
<!-- CXF (http://incubator.apache.org/cxf/) -->
<property name="cxf.version" value="2.2.4" />
<property name="cxf.dir" location="${lib.dir}/cxf-${cxf.version}" />
Added: teamware/trunk/lib/saaj-api-1.3/saaj-api-1.3.jar
===================================================================
(Binary files differ)
Index: teamware/trunk/lib/saaj-api-1.3/saaj-api-1.3.jar
===================================================================
--- teamware/trunk/lib/saaj-api-1.3/saaj-api-1.3.jar 2018-10-12 08:46:38 UTC
(rev 20312)
+++ teamware/trunk/lib/saaj-api-1.3/saaj-api-1.3.jar 2018-10-26 11:45:55 UTC
(rev 20313)
Property changes on: teamware/trunk/lib/saaj-api-1.3/saaj-api-1.3.jar
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/zip
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
GATE-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gate-cvs
