Author: shameera
Date: Tue Jul 7 04:39:15 2015
New Revision: 1689567
URL: http://svn.apache.org/r1689567
Log:
Fixed AXIS2-5703, code generation issues with jdk 1.8
Modified:
axis/axis2/java/core/trunk/modules/codegen/build-wsdls.xml
axis/axis2/java/core/trunk/modules/codegen/test/org/apache/axis2/wsdl/codegen/jaxws/JAXWSCodeGenerationEngineTest.java
axis/axis2/java/core/trunk/modules/jaxbri/pom.xml
axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml
axis/axis2/java/core/trunk/modules/jaxws/pom.xml
Modified: axis/axis2/java/core/trunk/modules/codegen/build-wsdls.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/build-wsdls.xml?rev=1689567&r1=1689566&r2=1689567&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/codegen/build-wsdls.xml (original)
+++ axis/axis2/java/core/trunk/modules/codegen/build-wsdls.xml Tue Jul 7
04:39:15 2015
@@ -40,6 +40,7 @@
<mkdir dir="target/test-classes"/>
<java fork="yes" classname="org.apache.axis2.wsdl.WSDL2Java"
failonerror="yes">
+ <jvmarg value="-Djavax.xml.accessExternalSchema=all" />
<classpath refid="maven.test.classpath" />
<classpath location="${compiled.classes.dir}" />
<arg line="-ap -o ${wsdl.output.base.dir}/version -d
none -s -u -uri test-resources/wsdls/Version.wsdl" />
Modified:
axis/axis2/java/core/trunk/modules/codegen/test/org/apache/axis2/wsdl/codegen/jaxws/JAXWSCodeGenerationEngineTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/test/org/apache/axis2/wsdl/codegen/jaxws/JAXWSCodeGenerationEngineTest.java?rev=1689567&r1=1689566&r2=1689567&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/codegen/test/org/apache/axis2/wsdl/codegen/jaxws/JAXWSCodeGenerationEngineTest.java
(original)
+++
axis/axis2/java/core/trunk/modules/codegen/test/org/apache/axis2/wsdl/codegen/jaxws/JAXWSCodeGenerationEngineTest.java
Tue Jul 7 04:39:15 2015
@@ -36,6 +36,7 @@ public class JAXWSCodeGenerationEngineTe
@Override
protected void setUp() throws Exception {
super.setUp();
+ System.setProperty("javax.xml.accessExternalSchema", "all");
File dir = new File(filePath);
assertEquals("Generated directory dtill exists ", false, dir.exists());
}
Modified: axis/axis2/java/core/trunk/modules/jaxbri/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxbri/pom.xml?rev=1689567&r1=1689566&r2=1689567&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxbri/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jaxbri/pom.xml Tue Jul 7 04:39:15 2015
@@ -158,18 +158,22 @@
<arg line="-d jaxbri -o
${project.build.directory}/gen/Test01 -u -uri src/test/wsdl/Test01.wsdl" />
</java>
<java
classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+ <jvmarg
value="-Djavax.xml.accessExternalSchema=all" />
<classpath refid="maven.test.classpath" />
<arg line="-d jaxbri -ss -ssi -sd -o
${project.build.directory}/gen/processor -u -uri src/test/wsdl/processor.wsdl
-ns2p
http://www.example.org/data=org.apache.axis2.jaxbri.processor.data,http://www.example.org/ws=org.apache.axis2.jaxbri.processor.service";
/>
</java>
<java
classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+ <jvmarg
value="-Djavax.xml.accessExternalSchema=all" />
<classpath refid="maven.test.classpath" />
<arg line="-d jaxbri -o
${project.build.directory}/gen/processor -u -uri src/test/wsdl/processor.wsdl
-ns2p
http://www.example.org/data=org.apache.axis2.jaxbri.processor.data,http://www.example.org/ws=org.apache.axis2.jaxbri.processor.client";
/>
</java>
<java
classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+ <jvmarg
value="-Djavax.xml.accessExternalSchema=all" />
<classpath refid="maven.test.classpath" />
<arg line="-d jaxbri -ss -ssi -sd -g -o
${project.build.directory}/gen/identityservice -u -uri
src/test/wsdl/identityService.wsdl -p org.apache.axis2.jaxbri.identityservice
-ns2p http://www.example.org/identity=org.apache.axis2.jaxbri.identityservice";
/>
</java>
<java
classname="org.apache.axis2.wsdl.WSDL2Java" fork="true">
+ <jvmarg
value="-Djavax.xml.accessExternalSchema=all" />
<classpath refid="maven.test.classpath" />
<arg line="-d jaxbri -ss -ssi -sd -g -o
${project.build.directory}/gen/mtom -u -uri src/test/wsdl/mtom.wsdl -p
org.apache.axis2.jaxbri.mtom -ns2p
http://www.example.org/mtom/=org.apache.axis2.jaxbri.mtom -EbindingFileName " />
</java>
Modified: axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml?rev=1689567&r1=1689566&r2=1689567&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml Tue Jul 7
04:39:15 2015
@@ -278,6 +278,7 @@
</java>
<echo>Generating java from
samplemtom.xsd</echo>
<java classname="com.sun.tools.xjc.Driver"
fork="true">
+ <jvmarg
value="-Djavax.xml.accessExternalSchema=all" />
<classpath refid="maven.runtime.classpath"
/>
<classpath
location="${compiled.classes.dir}" />
<arg line="-d ${schema.generated.src.dir}
-quiet ${schema.source.dir}/samplemtom.xsd" />
@@ -326,6 +327,7 @@
</java>
<echo>Generating java from
gorilla_dlw.wsdl</echo>
<java classname="com.sun.tools.xjc.Driver"
fork="true">
+ <jvmarg
value="-Djavax.xml.accessExternalSchema=all" />
<classpath refid="maven.runtime.classpath"
/>
<classpath
location="${compiled.classes.dir}" />
<arg line="-d ${schema.generated.src.dir}
-quiet -wsdl ${wsdl.source.dir}/gorilla_dlw.wsdl" />
@@ -1377,6 +1379,10 @@
</includes>
<systemProperties>
<property>
+ <name>javax.xml.accessExternalSchema</name>
+ <value>all</value>
+ </property>
+ <property>
<name>OASISCatalogManager.catalog.debug.level</name>
<value>0</value>
</property>
Modified: axis/axis2/java/core/trunk/modules/jaxws/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/pom.xml?rev=1689567&r1=1689566&r2=1689567&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jaxws/pom.xml Tue Jul 7 04:39:15 2015
@@ -273,6 +273,7 @@
<echo>Generating java from
samplemtom.xsd</echo>
<java classname="com.sun.tools.xjc.Driver"
fork="true">
+ <jvmarg
value="-Djavax.xml.accessExternalSchema=all" />
<classpath refid="maven.runtime.classpath"
/>
<classpath
location="${compiled.classes.dir}" />
<arg line="-d ${schema.generated.src.dir}
-quiet ${schema.source.dir}/samplemtom.xsd" />
