Author: veithen
Date: Thu Aug 11 05:49:37 2011
New Revision: 1156494
URL: http://svn.apache.org/viewvc?rev=1156494&view=rev
Log:
Merged r1156382 to the 1.6 branch to reduce the build time.
Modified:
axis/axis2/java/core/branches/1_6/ (props changed)
axis/axis2/java/core/branches/1_6/modules/jaxws/test-resources/catalog/basic-catalog.xml
axis/axis2/java/core/branches/1_6/modules/jaxws/test-resources/catalog/child-catalog.xml
axis/axis2/java/core/branches/1_6/modules/jaxws/test-resources/catalog/dir2/imported1.xsd
axis/axis2/java/core/branches/1_6/modules/jaxws/test-resources/catalog/dir3/imported2.xsd
axis/axis2/java/core/branches/1_6/modules/jaxws/test-resources/catalog/fail/firstImportFail.xml
axis/axis2/java/core/branches/1_6/modules/jaxws/test-resources/catalog/fail/secondImportFail.xml
axis/axis2/java/core/branches/1_6/modules/jaxws/test-resources/catalog/fail/thirdImportFail.xml
axis/axis2/java/core/branches/1_6/modules/jaxws/test-resources/catalog/root.wsdl
Propchange: axis/axis2/java/core/branches/1_6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 11 05:49:37 2011
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1156305
+/axis/axis2/java/core/trunk:1068985,1069659,1069898,1070439,1072077,1072271,1072296,1072499,1072510,1075057,1078242,1081563,1081587,1081590,1082316,1082322,1082600,1082702,1082726,1082738,1083180,1083192,1083379,1083381,1083425,1083433,1083446,1084753,1085157,1085173,1085514,1085889,1085927,1085931,1087073,1088239,1088248-1088249,1088251,1088268,1088730,1088904,1089225,1089989,1090429,1090457,1091178,1091191,1094117,1096530,1096557,1099385,1099389,1100628,1101037,1103013,1103336,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1136177,1137153,1137159,1138144,1138203,1139448,1139484,1156305,1156382
Modified:
axis/axis2/java/core/branches/1_6/modules/jaxws/test-resources/catalog/basic-catalog.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/jaxws/test-resources/catalog/basic-catalog.xml?rev=1156494&r1=1156493&r2=1156494&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/jaxws/test-resources/catalog/basic-catalog.xml
(original)
+++
axis/axis2/java/core/branches/1_6/modules/jaxws/test-resources/catalog/basic-catalog.xml
Thu Aug 11 05:49:37 2011
@@ -25,13 +25,13 @@
systemId="http://soapinterop.org/xsd2";
uri="importAux.xsd" />
<system
- systemId="http://example.com/test/doesnotexist.wsdl";
+ systemId="http://localhost:12345/test/doesnotexist.wsdl";
uri="dir1/abstract.wsdl" />
<system
systemId="doesnotexist.xsd"
uri="dir2/imported1.xsd" />
<system
- systemId="http://example.com/neverExisted.xsd";
+ systemId="http://localhost:12345/neverExisted.xsd";
uri="dir3/imported2.xsd" />
<public
publicId="-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN"
Modified:
axis/axis2/java/core/branches/1_6/modules/jaxws/test-resources/catalog/child-catalog.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/jaxws/test-resources/catalog/child-catalog.xml?rev=1156494&r1=1156493&r2=1156494&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/jaxws/test-resources/catalog/child-catalog.xml
(original)
+++
axis/axis2/java/core/branches/1_6/modules/jaxws/test-resources/catalog/child-catalog.xml
Thu Aug 11 05:49:37 2011
@@ -19,13 +19,13 @@
<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
<system
- systemId="http://example.com/test/doesnotexist.wsdl";
+ systemId="http://localhost:12345/test/doesnotexist.wsdl";
uri="dir1/abstract.wsdl" />
<system
systemId="doesnotexist.xsd"
uri="dir2/imported1.xsd" />
<system
- systemId="http://example.com/neverExisted.xsd";
+ systemId="http://localhost:12345/neverExisted.xsd";
uri="dir3/imported2.xsd" />
<public
publicId="-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN"
Modified:
axis/axis2/java/core/branches/1_6/modules/jaxws/test-resources/catalog/dir2/imported1.xsd
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/jaxws/test-resources/catalog/dir2/imported1.xsd?rev=1156494&r1=1156493&r2=1156494&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/jaxws/test-resources/catalog/dir2/imported1.xsd
(original)
+++
axis/axis2/java/core/branches/1_6/modules/jaxws/test-resources/catalog/dir2/imported1.xsd
Thu Aug 11 05:49:37 2011
@@ -21,7 +21,7 @@
<xsd:schema targetNamespace="urn:types1"
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
elementFormDefault="qualified">
- <xsd:import namespace="urn:types2"
schemaLocation="http://example.com/neverExisted.xsd"/>
+ <xsd:import namespace="urn:types2"
schemaLocation="http://localhost:12345/neverExisted.xsd"/>
<xsd:element name="add">
<xsd:complexType>
<xsd:sequence>
@@ -65,4 +65,4 @@
</xsd:complexType>
</xsd:element>
</xsd:schema>
-
\ No newline at end of file
+
Modified:
axis/axis2/java/core/branches/1_6/modules/jaxws/test-resources/catalog/dir3/imported2.xsd
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/jaxws/test-resources/catalog/dir3/imported2.xsd?rev=1156494&r1=1156493&r2=1156494&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/jaxws/test-resources/catalog/dir3/imported2.xsd
(original)
+++
axis/axis2/java/core/branches/1_6/modules/jaxws/test-resources/catalog/dir3/imported2.xsd
Thu Aug 11 05:49:37 2011
@@ -39,4 +39,4 @@
</xsd:complexType>
</xsd:element>
</xsd:schema>
-
\ No newline at end of file
+
Modified:
axis/axis2/java/core/branches/1_6/modules/jaxws/test-resources/catalog/fail/firstImportFail.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/jaxws/test-resources/catalog/fail/firstImportFail.xml?rev=1156494&r1=1156493&r2=1156494&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/jaxws/test-resources/catalog/fail/firstImportFail.xml
(original)
+++
axis/axis2/java/core/branches/1_6/modules/jaxws/test-resources/catalog/fail/firstImportFail.xml
Thu Aug 11 05:49:37 2011
@@ -25,13 +25,13 @@
systemId="http://soapinterop.org/xsd2";
uri="importAux.xsd" />
<!--system
- systemId="http://example.com/test/doesnotexist.wsdl";
+ systemId="http://localhost:12345/test/doesnotexist.wsdl";
uri="dir1/abstract.wsdl" /-->
<system
systemId="doesnotexist.xsd"
uri="dir2/imported1.xsd" />
<system
- systemId="http://example.com/neverExisted.xsd";
+ systemId="http://localhost:12345/neverExisted.xsd";
uri="dir3/imported2.xsd" />
<public
publicId="-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN"
Modified:
axis/axis2/java/core/branches/1_6/modules/jaxws/test-resources/catalog/fail/secondImportFail.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/jaxws/test-resources/catalog/fail/secondImportFail.xml?rev=1156494&r1=1156493&r2=1156494&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/jaxws/test-resources/catalog/fail/secondImportFail.xml
(original)
+++
axis/axis2/java/core/branches/1_6/modules/jaxws/test-resources/catalog/fail/secondImportFail.xml
Thu Aug 11 05:49:37 2011
@@ -25,13 +25,13 @@
systemId="http://soapinterop.org/xsd2";
uri="importAux.xsd" />
<system
- systemId="http://example.com/test/doesnotexist.wsdl";
+ systemId="http://localhost:12345/test/doesnotexist.wsdl";
uri="dir1/abstract.wsdl" />
<!--system
systemId="doesnotexist.xsd"
uri="dir2/imported1.xsd" /-->
<system
- systemId="http://example.com/neverExisted.xsd";
+ systemId="http://localhost:12345/neverExisted.xsd";
uri="dir3/imported2.xsd" />
<public
publicId="-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN"
Modified:
axis/axis2/java/core/branches/1_6/modules/jaxws/test-resources/catalog/fail/thirdImportFail.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/jaxws/test-resources/catalog/fail/thirdImportFail.xml?rev=1156494&r1=1156493&r2=1156494&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/jaxws/test-resources/catalog/fail/thirdImportFail.xml
(original)
+++
axis/axis2/java/core/branches/1_6/modules/jaxws/test-resources/catalog/fail/thirdImportFail.xml
Thu Aug 11 05:49:37 2011
@@ -25,13 +25,13 @@
systemId="http://soapinterop.org/xsd2";
uri="importAux.xsd" />
<system
- systemId="http://example.com/test/doesnotexist.wsdl";
+ systemId="http://localhost:12345/test/doesnotexist.wsdl";
uri="dir1/abstract.wsdl" />
<system
systemId="doesnotexist.xsd"
uri="dir2/imported1.xsd" />
<!-- system
- systemId="http://example.com/neverExisted.xsd";
+ systemId="http://localhost:12345/neverExisted.xsd";
uri="dir3/imported2.xsd" /-->
<public
publicId="-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN"
Modified:
axis/axis2/java/core/branches/1_6/modules/jaxws/test-resources/catalog/root.wsdl
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/jaxws/test-resources/catalog/root.wsdl?rev=1156494&r1=1156493&r2=1156494&view=diff
==============================================================================
---
axis/axis2/java/core/branches/1_6/modules/jaxws/test-resources/catalog/root.wsdl
(original)
+++
axis/axis2/java/core/branches/1_6/modules/jaxws/test-resources/catalog/root.wsdl
Thu Aug 11 05:49:37 2011
@@ -28,7 +28,7 @@
xmlns:ns2="urn:types2"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";>
- <wsdl:import namespace="http://www.example.com/test/messageTypes";
location="http://example.com/test/doesnotexist.wsdl"/>
+ <wsdl:import namespace="http://www.example.com/test/messageTypes";
location="http://localhost:12345/test/doesnotexist.wsdl"/>
<!-- Importing does not actually bring in the messages, just the ability to
refer to them.
Without the following (duplicated) messages the wsdl definition would
not have any messages.
