svn commit: r1156305 - /axis/axis2/java/core/trunk/modules/scripting/src/org/apache/axis2/scripting/ScriptModule.java

2011-08-10 Thread veithen 
Author: veithen
Date: Wed Aug 10 18:39:50 2011
New Revision: 1156305

URL: http://svn.apache.org/viewvc?rev=1156305&view=rev
Log:
AXIS2-4263: Fixed a timer leak in the scripting module.

Modified:

axis/axis2/java/core/trunk/modules/scripting/src/org/apache/axis2/scripting/ScriptModule.java

Modified: 
axis/axis2/java/core/trunk/modules/scripting/src/org/apache/axis2/scripting/ScriptModule.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/scripting/src/org/apache/axis2/scripting/ScriptModule.java?rev=1156305&r1=1156304&r2=1156305&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/scripting/src/org/apache/axis2/scripting/ScriptModule.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/scripting/src/org/apache/axis2/scripting/ScriptModule.java
 Wed Aug 10 18:39:50 2011
@@ -49,6 +49,8 @@ public class ScriptModule implements Mod
 
 static String defaultEncoding = new 
OutputStreamWriter(System.out).getEncoding();
 
+private ScriptDeploymentEngine deploymentEngine;
+
 /**
  * Init by creating and deploying AxisServices for each script
  */
@@ -61,7 +63,7 @@ public class ScriptModule implements Mod
 log.error("AxisConfiguration getRepository returns null, cannot 
deploy scripts");
 } else {
 File scriptServicesDirectory = 
getScriptServicesDirectory(axisConfig);
-ScriptDeploymentEngine deploymentEngine = new 
ScriptDeploymentEngine(axisConfig);
+deploymentEngine = new ScriptDeploymentEngine(axisConfig);
 deploymentEngine.loadRepository(scriptServicesDirectory);
 deploymentEngine.loadServices();
 }
@@ -104,6 +106,9 @@ public class ScriptModule implements Mod
 }
 
 public void shutdown(ConfigurationContext configurationContext) throws 
AxisFault {
+if (deploymentEngine != null) {
+deploymentEngine.cleanup();
+}
 }
 
 }

svn commit: r1156307 - in /axis/axis2/java/core/branches/1_6: ./ modules/scripting/src/org/apache/axis2/scripting/ScriptModule.java

2011-08-10 Thread veithen 
Author: veithen
Date: Wed Aug 10 18:43:32 2011
New Revision: 1156307

URL: http://svn.apache.org/viewvc?rev=1156307&view=rev
Log:
AXIS2-4263: Merged r1156305 to the 1.6 branch.

Modified:
axis/axis2/java/core/branches/1_6/   (props changed)

axis/axis2/java/core/branches/1_6/modules/scripting/src/org/apache/axis2/scripting/ScriptModule.java

Propchange: axis/axis2/java/core/branches/1_6/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 10 18:43:32 2011
@@ -1 +1 @@
-/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072296,1072499,1072510,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,1099385,1099389,1100628,1101037,1103013,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1137153,1137159,1138144,1138203,1139448,1139484
+/axis/axis2/java/core/trunk:1070439,1072077,1072271,1072296,1072499,1072510,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,1099385,1099389,1100628,1101037,1103013,1103606,1103760,1128580,1128584,1128618,1128645,1130590,1131425,1134438,1134616,1136156,1136159,1137153,1137159,1138144,1138203,1139448,1139484,1156305

Modified: 
axis/axis2/java/core/branches/1_6/modules/scripting/src/org/apache/axis2/scripting/ScriptModule.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/scripting/src/org/apache/axis2/scripting/ScriptModule.java?rev=1156307&r1=1156306&r2=1156307&view=diff
==
--- 
axis/axis2/java/core/branches/1_6/modules/scripting/src/org/apache/axis2/scripting/ScriptModule.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/scripting/src/org/apache/axis2/scripting/ScriptModule.java
 Wed Aug 10 18:43:32 2011
@@ -49,6 +49,8 @@ public class ScriptModule implements Mod
 
 static String defaultEncoding = new 
OutputStreamWriter(System.out).getEncoding();
 
+private ScriptDeploymentEngine deploymentEngine;
+
 /**
  * Init by creating and deploying AxisServices for each script
  */
@@ -61,7 +63,7 @@ public class ScriptModule implements Mod
 log.error("AxisConfiguration getRepository returns null, cannot 
deploy scripts");
 } else {
 File scriptServicesDirectory = 
getScriptServicesDirectory(axisConfig);
-ScriptDeploymentEngine deploymentEngine = new 
ScriptDeploymentEngine(axisConfig);
+deploymentEngine = new ScriptDeploymentEngine(axisConfig);
 deploymentEngine.loadRepository(scriptServicesDirectory);
 deploymentEngine.loadServices();
 }
@@ -104,6 +106,9 @@ public class ScriptModule implements Mod
 }
 
 public void shutdown(ConfigurationContext configurationContext) throws 
AxisFault {
+if (deploymentEngine != null) {
+deploymentEngine.cleanup();
+}
 }
 
 }

svn commit: r1156372 [2/2] - in /axis/axis2/java/core/branches/1_6: ./ modules/addressing/src/org/apache/axis2/handlers/addressing/ modules/jaxws-integration/test-resources/wsdl/ modules/jaxws-integra

2011-08-10 Thread veithen 
Modified: 
axis/axis2/java/core/branches/1_6/modules/jaxws/test/org/apache/axis2/jaxws/client/dispatch/DynamicPortCachingTests.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/jaxws/test/org/apache/axis2/jaxws/client/dispatch/DynamicPortCachingTests.java?rev=1156372&r1=1156371&r2=1156372&view=diff
==
--- 
axis/axis2/java/core/branches/1_6/modules/jaxws/test/org/apache/axis2/jaxws/client/dispatch/DynamicPortCachingTests.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/jaxws/test/org/apache/axis2/jaxws/client/dispatch/DynamicPortCachingTests.java
 Wed Aug 10 21:17:15 2011
@@ -19,26 +19,41 @@
 package org.apache.axis2.jaxws.client.dispatch;
 
 import junit.framework.TestCase;
+
+import org.apache.axis2.AxisFault;
+import org.apache.axis2.description.Parameter;
+import org.apache.axis2.engine.AxisConfiguration;
+import org.apache.axis2.jaxws.Constants;
 import org.apache.axis2.jaxws.description.DescriptionTestUtils2;
+import org.apache.axis2.jaxws.description.EndpointDescription;
 import org.apache.axis2.jaxws.description.ServiceDescription;
+import org.apache.axis2.jaxws.description.builder.MDQConstants;
+import org.apache.axis2.jaxws.description.impl.ServiceDescriptionImpl;
 import org.apache.axis2.jaxws.spi.ClientMetadataTest;
 import org.apache.axis2.jaxws.spi.ServiceDelegate;
 
 import javax.xml.namespace.QName;
 import javax.xml.ws.Service;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 
 /**
  * Tests the caching and isolation of dynamic ports,i.e. those created with
  * Service.addPort(...).  Dynamic ports should
- * 1) Only be visible to services on which an addPort was done
+ * 1) Only be visible to the service instances on which an addPort was done
  * 2) Share instances of the description objects (e.g. AxisService) for ports
- * added to different instances of the same service that use the same client
- * configuration
- * 3) Identical ports on services using different client configuration should
- * not be shared 
+ * added to the same instance of a service
+ * 3) Different service instances of the same-named service should not share 
the 
+ * the list of added dynamic ports.  Even if the same named port is added to 
each
+ * service, they should not share metadata objects (e.g. EndpointDescription, 
AxisService) 
+ * 
+ * Also validate the property that enables the previous behavior that allowed
+ * sharing of dyamic ports across services on the same AxisConfiguration.  With
+ * that property enabled, Dynamic ports should
+ * 1) Be shared across all services on the AxisConfiguration based on the key
+ * (PortQName, BindingId, EndpointAddress).
  */
 public class DynamicPortCachingTests extends TestCase {
 static final String namespaceURI = 
"http://dispatch.client.jaxws.axis2.apache.org";;
@@ -49,11 +64,149 @@ public class DynamicPortCachingTests ext
 static final String epr1 = null;
 
 /**
- * Two different instances of the same service should share the same
- * description information (e.g. AxisService) if the same port is added
- * to both 
+ * Validate setting the property enables the old behavior, which is that 
dynamic ports are 
+ * shared across all services on an AxisConfiguration based on the key
+ * (PortQName, BindingId, EndpointAddress).  This test validates that two 
ports that share the
+ * same Service QName will be share the same dynamic port objects.
+ * 
+ * NOTE!!! This test exists for validating backwards compatability.  This 
behavior was NOT
+ * intended in the runtime, but since it existed that way, customers could 
be depending on it.
+ */
+public void testSamePortsSameServiceName_AxisConfig_PropertyTrue() {
+try {
+ClientMetadataTest.installCachingFactory();
+QName svcQN = new QName(namespaceURI, svcLocalPart);
+
+Service svc1 = Service.create(svcQN);
+assertNotNull(svc1);
+ServiceDelegate svcDlg1 = 
DescriptionTestUtils2.getServiceDelegate(svc1);
+assertNotNull(svcDlg1);
+ServiceDescription svcDesc1 = svcDlg1.getServiceDescription();
+assertNotNull(svcDesc1);
+
+// Set the property to revert the behavior.  Note that although we 
are passing ni 
+// a particular service, the property is set on the AxisConfig 
shared by all 
+// services.
+setAxisConfigParameter(svc1, 
MDQConstants.SHARE_DYNAMIC_PORTS_ACROSS_SERVICES, "true");
+
+Service svc2 = Service.create(svcQN);
+assertNotNull(svc2);
+ServiceDelegate svcDlg2 = 
DescriptionTestUtils2.getServiceDelegate(svc2);
+assertNotNull(svcDlg2);
+ServiceDescription svcDesc2 = svcDlg2.getServiceDescription();
+assertNotNull(svcDesc2);
+
+

svn commit: r1156382 - in /axis/axis2/java/core/trunk/modules/jaxws/test-resources/catalog: basic-catalog.xml child-catalog.xml dir2/imported1.xsd dir3/imported2.xsd fail/firstImportFail.xml fail/seco

2011-08-10 Thread veithen 
Author: veithen
Date: Wed Aug 10 21:50:39 2011
New Revision: 1156382

URL: http://svn.apache.org/viewvc?rev=1156382&view=rev
Log:
Avoid connections to hosts on the internet (example.com) in the unit tests.

Modified:

axis/axis2/java/core/trunk/modules/jaxws/test-resources/catalog/basic-catalog.xml

axis/axis2/java/core/trunk/modules/jaxws/test-resources/catalog/child-catalog.xml

axis/axis2/java/core/trunk/modules/jaxws/test-resources/catalog/dir2/imported1.xsd

axis/axis2/java/core/trunk/modules/jaxws/test-resources/catalog/dir3/imported2.xsd

axis/axis2/java/core/trunk/modules/jaxws/test-resources/catalog/fail/firstImportFail.xml

axis/axis2/java/core/trunk/modules/jaxws/test-resources/catalog/fail/secondImportFail.xml

axis/axis2/java/core/trunk/modules/jaxws/test-resources/catalog/fail/thirdImportFail.xml
axis/axis2/java/core/trunk/modules/jaxws/test-resources/catalog/root.wsdl

Modified: 
axis/axis2/java/core/trunk/modules/jaxws/test-resources/catalog/basic-catalog.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/test-resources/catalog/basic-catalog.xml?rev=1156382&r1=1156381&r2=1156382&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/jaxws/test-resources/catalog/basic-catalog.xml
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws/test-resources/catalog/basic-catalog.xml
 Wed Aug 10 21:50:39 2011
@@ -25,13 +25,13 @@
systemId="http://soapinterop.org/xsd2";
uri="importAux.xsd" />
http://example.com/test/doesnotexist.wsdl";
+   systemId="http://localhost:12345/test/doesnotexist.wsdl";
uri="dir1/abstract.wsdl" />

http://example.com/neverExisted.xsd";
+   systemId="http://localhost:12345/neverExisted.xsd";
uri="dir3/imported2.xsd" />
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/test-resources/catalog/child-catalog.xml?rev=1156382&r1=1156381&r2=1156382&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/jaxws/test-resources/catalog/child-catalog.xml
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws/test-resources/catalog/child-catalog.xml
 Wed Aug 10 21:50:39 2011
@@ -19,13 +19,13 @@
 
 
http://example.com/test/doesnotexist.wsdl";
+   systemId="http://localhost:12345/test/doesnotexist.wsdl";
uri="dir1/abstract.wsdl" />

http://example.com/neverExisted.xsd";
+   systemId="http://localhost:12345/neverExisted.xsd";
uri="dir3/imported2.xsd" />
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/test-resources/catalog/dir2/imported1.xsd?rev=1156382&r1=1156381&r2=1156382&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/jaxws/test-resources/catalog/dir2/imported1.xsd
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws/test-resources/catalog/dir2/imported1.xsd
 Wed Aug 10 21:50:39 2011
@@ -21,7 +21,7 @@
 http://www.w3.org/2001/XMLSchema";
 elementFormDefault="qualified">
-  http://example.com/neverExisted.xsd"/>
+  http://localhost:12345/neverExisted.xsd"/>
   
 
   
@@ -65,4 +65,4 @@
 
   
   
-  
\ No newline at end of file
+  

Modified: 
axis/axis2/java/core/trunk/modules/jaxws/test-resources/catalog/dir3/imported2.xsd
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/test-resources/catalog/dir3/imported2.xsd?rev=1156382&r1=1156381&r2=1156382&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/jaxws/test-resources/catalog/dir3/imported2.xsd
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws/test-resources/catalog/dir3/imported2.xsd
 Wed Aug 10 21:50:39 2011
@@ -39,4 +39,4 @@
 
   
   
-  
\ No newline at end of file
+  

Modified: 
axis/axis2/java/core/trunk/modules/jaxws/test-resources/catalog/fail/firstImportFail.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/test-resources/catalog/fail/firstImportFail.xml?rev=1156382&r1=1156381&r2=1156382&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/jaxws/test-resources/catalog/fail/firstImportFail.xml
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws/test-resources/catalog/fail/firstImportFail.xml
 Wed Aug 10 21:50:39 2011
@@ -25,13 +25,13 @@
systemId="http://soapinterop.org/xsd2";
uri="importAux.xsd" />


http://example.com/neverExisted.xsd";
+   systemId="http://localhost:12345/neverExisted.xsd";
uri="dir3/imported2.xsd" />
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/test-resources/catalog/fail/secondImportFail.xml?rev=1156382&r1=1156381&r2=1156382&view=diff
==

svn commit: r1156389 [2/2] - in /axis/axis2/java/core/branches/1_5: ./ modules/distribution/ modules/kernel/src/org/apache/axis2/transport/http/util/ modules/kernel/test/org/apache/axis2/transport/htt

2011-08-10 Thread veithen 
Propchange: 
axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 10 22:12:59 2011
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:922914,922941,922971,922983,935122,935169,935174,935338,937004,937237,939924,944074,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,966536,979882-979883,979886,980242,981036,981038,981055-981056,981058,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,981992,982008,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990445,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651
 
,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1064552,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1085927,1088239,1088249,1088251,1088268,1088904,1091191,1099385,1099389,1100628,1101037,1128584,1128618,1128645,1134438,1136156,1136159,1137153,1139448,1139484,1156305
+/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:922914,922941,922971,922983,935122,935169,935174,935338,937004,937237,939924,944074,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,966536,979882-979883,979886,980242,981036,981038,981055-981056,981058,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,981992,982008,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270,983276,983280,983316,983363,983370,983372,985458,985464,985626,985634,985661,985715,985717,985744,985748,985752,985763,985791,985796,985851,986844,986889,987313,987712-987715,987783,987832,987873,987883,987913,987935,990350,990369,990377,990384,990394,990398,990404,990434,990445,990449,1001279,1001452-1001466,1001673,1029034,1029153,1029308,1029372,1029377,1029610-1029651
 
,1030008,1030538,1031350,1031352,1031799,1032001,1032390,1032401,1032681,1032694,1033898,1033942,1033956,1034010,1034015,1034142,1034173,1034213,1034254,1035545,1036624,1036659,1036675,1037144,1037210,1037617,1038024,1038070,1039635,1039712-1039729,1039862,1039881,1042118,1042416,1042442,1042527,1050589,1050632,1050793,1050819,1050823,1050836,1050916,1050923,1052223,1054463,1055120,1056933,1062170,1064552,1081563,1082316,1082702,1083180,1083379,1083381,1083433,1083446,1085927,1088239,1088249,1088251,1088268,1088904,1091191,1099385,1099389,1100628,1101037,1128584,1128618,1128645,1134438,1136156,1136159,1136177,1137153,1139448,1139484,1156305
 
/webservices/axis2/trunk/java/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java:728674,729037,731798,732539,732541,732873,732877,733293,733295,733304,733306,733348,733354,733394,733399,733463-733464,733533,733539-733540,733676,733900,733910,734227,734237,734261,738057,738067,738071,738086,738110,738113,738117,738158,740332,740357,740360,741300,741784,741878,741881,751958,752906,761068,761709,771051,776555,776612,777648,777882,777897,777934,778060,780546,783479,783869,783873,787379,788202,795431,797969,801630,802447,803725,804541,805530,805578,805981,805999,806085,806331,807160,807487,807512,816740,816804,816812,816891,817965,821686,821689,823125,823960,834058,834175,889783,896320,902271,904660,904780,905783,905980,908318

Propchange: 
axis/axis2/java/core/branches/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 10 22:12:59 2011
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java:922914,922941,922971,922983,935122,935169,935174,935338,937004,937237,939924,944074,944347,944915,951385,960693,960976,960978,960984,960995,961012,961964,962844,963081,963147,965032,965036,965056,965068,965074,965213,965268,965277,965302,965454,966371,966401,966428,966536,979882-979883,979886,980242,9

svn commit: r1156494 - in /axis/axis2/java/core/branches/1_6: ./ modules/jaxws/test-resources/catalog/ modules/jaxws/test-resources/catalog/dir2/ modules/jaxws/test-resources/catalog/dir3/ modules/jax

2011-08-10 Thread veithen 
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" />
http://example.com/test/doesnotexist.wsdl";
+   systemId="http://localhost:12345/test/doesnotexist.wsdl";
uri="dir1/abstract.wsdl" />

http://example.com/neverExisted.xsd";
+   systemId="http://localhost:12345/neverExisted.xsd";
uri="dir3/imported2.xsd" />
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 @@
 
 
http://example.com/test/doesnotexist.wsdl";
+   systemId="http://localhost:12345/test/doesnotexist.wsdl";
uri="dir1/abstract.wsdl" />

http://example.com/neverExisted.xsd";
+   systemId="http://localhost:12345/neverExisted.xsd";
uri="dir3/imported2.xsd" />
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 @@
 http://www.w3.org/2001/XMLSchema";
 elementFormDefault="qualified">
-  http://example.com/neverExisted.xsd"/>
+  http://localhost:12345/neverExisted.xsd"/>
   
 
   
@@ -65,4 +65,4