svn commit: r965454 - in /axis/axis2/java/core/trunk/modules: parent/pom.xml tool/conf/
Author: veithen Date: Mon Jul 19 12:32:56 2010 New Revision: 965454 URL: http://svn.apache.org/viewvc?rev=965454&view=rev Log: Clean up after the refactoring of the Eclipse plugin builds. Note that removing the eclipse.plugins.version property eliminates another obstacle to the automation of the release process. Removed: axis/axis2/java/core/trunk/modules/tool/conf/ Modified: axis/axis2/java/core/trunk/modules/parent/pom.xml Modified: axis/axis2/java/core/trunk/modules/parent/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/parent/pom.xml?rev=965454&r1=965453&r2=965454&view=diff == --- axis/axis2/java/core/trunk/modules/parent/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/parent/pom.xml Mon Jul 19 12:32:56 2010 @@ -99,7 +99,6 @@ 3.1 1.4 1.1.1 -1.4.0 3.2.0 1.1.8 1.0.2
svn commit: r965526 - /axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/runtime/description/marshal/MarshalServiceRuntimeDescriptionFactory.java
Author: scheu Date: Mon Jul 19 15:08:47 2010 New Revision: 965526 URL: http://svn.apache.org/viewvc?rev=965526&view=rev Log: AXIS2-4708 Contributor:Rich Scheuerle Small synchronization change found while testing the AXIS2-4708 fix. Modified: axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/runtime/description/marshal/MarshalServiceRuntimeDescriptionFactory.java Modified: axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/runtime/description/marshal/MarshalServiceRuntimeDescriptionFactory.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/runtime/description/marshal/MarshalServiceRuntimeDescriptionFactory.java?rev=965526&r1=965525&r2=965526&view=diff == --- axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/runtime/description/marshal/MarshalServiceRuntimeDescriptionFactory.java (original) +++ axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/runtime/description/marshal/MarshalServiceRuntimeDescriptionFactory.java Mon Jul 19 15:08:47 2010 @@ -42,8 +42,18 @@ public class MarshalServiceRuntimeDescri serviceDesc.getServiceRuntimeDesc(key); if (desc == null) { -desc = MarshalServiceRuntimeDescriptionBuilder.create(serviceDesc); -serviceDesc.setServiceRuntimeDesc(desc); +// There is only one MSRD per serviceDesc. Lock +// on the serviceDesc while creating the MSRD +synchronized(serviceDesc) { +desc = +(MarshalServiceRuntimeDescription) +serviceDesc.getServiceRuntimeDesc(key); +if (desc == null) { + +desc = MarshalServiceRuntimeDescriptionBuilder.create(serviceDesc); +serviceDesc.setServiceRuntimeDesc(desc); +} +} } return desc; }
svn commit: r965574 - in /axis/axis2/java/core/branches/java/1_5: ./ modules/distribution/ modules/kernel/src/org/apache/axis2/transport/http/util/ modules/kernel/test/org/apache/axis2/transport/http/
Author: veithen Date: Mon Jul 19 18:22:59 2010 New Revision: 965574 URL: http://svn.apache.org/viewvc?rev=965574&view=rev Log: Merged r733539 to the 1.5 branch to fix an unpredictable test case in the SAAJ module. Modified: axis/axis2/java/core/branches/java/1_5/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/distribution/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java (props changed) axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java (props changed) axis/axis2/java/core/branches/java/1_5/modules/parent/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/saaj/test/org/apache/axis2/saaj/integration/IntegrationTest.java axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml (props changed) axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/transport/local/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java (props changed) axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java (props changed) Propchange: axis/axis2/java/core/branches/java/1_5/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jul 19 18:22:59 2010 @@ -1,2 +1,2 @@ /axis/axis2/java/core/trunk:922914,922983,944347,944915,951385,960978,960995,961012,963081,963147,965032,965036,965056,965068,965074 -/webservices/axis2/trunk/java:732924,732927,732939,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,834058,834175,904780,905980 +/webservices/axis2/trunk/java:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,834058,834175,904780,905980 Propchange: axis/axis2/java/core/branches/java/1_5/modules/distribution/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jul 19 18:22:59 2010 @@ -1,2 +1,2 @@ /axis/axis2/java/core/trunk/modules/distribution:922914,922983,936434,944347,944915,951385,960978,960995,961012,963081,963147,965032,965036,965056,965068,965074 -/webservices/axis2/trunk/java/modules/distribution:732924,732927,732939,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,834058,834175,904780,905980 +/webservices/axis2/trunk/java/modules/distribution:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,834058,834175,904780,905980 Propchange: axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jul 19 18:22:59 2010 @@ -1,2 +1,2 @@ /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:922914,922983,944347,944915,951385,960978,960995,961012,963081,963147,965032,965036,965056,965068,965074 -/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:761709,771051,777897,777934,801630,803725,834058,834175,904780,905980 +/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:733539,761709,771051,777897,777934,801630,803725,834058,834175,904780,905980 Propchange: axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jul 19 18:22:59 2010 @@ -1,2 +1,2 @@ /axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:922914,922983,944347,944915,951385,960978,960995,961012,963081,963147,965032,965036,965056,965068,965074 -/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:761709,771051,777897,777934,801630,803725,834058,834175,904780,905980 +/webservices/axis2/trunk/java/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java:733539,761709,771051,777897,777934,801630,803725,834058,834175,904780,905980 Propchange: axi
svn commit: r965607 - in /axis/axis2/java/core/branches/java/1_5: ./ modules/adb-codegen/ modules/adb/ modules/addressing/ modules/distribution/ modules/fastinfoset/ modules/integration/ modules/jaxbr
Author: veithen Date: Mon Jul 19 19:54:35 2010 New Revision: 965607 URL: http://svn.apache.org/viewvc?rev=965607&view=rev Log: Merged r965213 to the 1.5 branch. This is a precondition to merge the Eclipse plugin build refactoring. Modified: axis/axis2/java/core/branches/java/1_5/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/adb-codegen/pom.xml axis/axis2/java/core/branches/java/1_5/modules/adb/pom.xml axis/axis2/java/core/branches/java/1_5/modules/addressing/pom.xml axis/axis2/java/core/branches/java/1_5/modules/distribution/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/fastinfoset/pom.xml axis/axis2/java/core/branches/java/1_5/modules/integration/pom.xml axis/axis2/java/core/branches/java/1_5/modules/jaxbri/pom.xml axis/axis2/java/core/branches/java/1_5/modules/jaxws/pom.xml axis/axis2/java/core/branches/java/1_5/modules/json/pom.xml axis/axis2/java/core/branches/java/1_5/modules/kernel/pom.xml axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java (props changed) axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java (props changed) axis/axis2/java/core/branches/java/1_5/modules/parent/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/parent/pom.xml axis/axis2/java/core/branches/java/1_5/modules/saaj/pom.xml axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml (props changed) axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/transport/local/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java (props changed) axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java (props changed) Propchange: axis/axis2/java/core/branches/java/1_5/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jul 19 19:54:35 2010 @@ -1,2 +1,2 @@ -/axis/axis2/java/core/trunk:922914,922983,944347,944915,951385,960978,960995,961012,963081,963147,965032,965036,965056,965068,965074 +/axis/axis2/java/core/trunk:922914,922983,944347,944915,951385,960978,960995,961012,963081,963147,965032,965036,965056,965068,965074,965213 /webservices/axis2/trunk/java:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,834058,834175,904780,905980 Modified: axis/axis2/java/core/branches/java/1_5/modules/adb-codegen/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/adb-codegen/pom.xml?rev=965607&r1=965606&r2=965607&view=diff == --- axis/axis2/java/core/branches/java/1_5/modules/adb-codegen/pom.xml (original) +++ axis/axis2/java/core/branches/java/1_5/modules/adb-codegen/pom.xml Mon Jul 19 19:54:35 2010 @@ -51,6 +51,11 @@ org.apache.ws.commons.schema XmlSchema + +xmlunit +xmlunit +test + src Modified: axis/axis2/java/core/branches/java/1_5/modules/adb/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/adb/pom.xml?rev=965607&r1=965606&r2=965607&view=diff == --- axis/axis2/java/core/branches/java/1_5/modules/adb/pom.xml (original) +++ axis/axis2/java/core/branches/java/1_5/modules/adb/pom.xml Mon Jul 19 19:54:35 2010 @@ -53,6 +53,11 @@ org.apache.geronimo.specs geronimo-activation_1.1_spec + +xmlunit +xmlunit +test + Modified: axis/axis2/java/core/branches/java/1_5/modules/addressing/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/addressing/pom.xml?rev=965607&r1=965606&r2=965607&view=diff == --- axis/axis2/java/core/branches/java/1_5/modules/addressing/pom.xml (original) +++ axis/axis2/java/core/branches/java/1_5/modules/addressing/pom.xml Mon Jul 19 19:54:35 2010 @@ -38,6 +38,11 @@ axis2-kernel ${project.version} + +xmlunit +xmlunit +test + src Propchange: axis/axis2/java/core/branches/java/1_5/modules/distribution/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jul 19 19:54:3
svn commit: r965641 - in /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/wsdl/util: WSDLDefinitionWrapper.java WSDLWrapperReloadImpl.java
Author: scheu Date: Mon Jul 19 21:22:58 2010 New Revision: 965641 URL: http://svn.apache.org/viewvc?rev=965641&view=rev Log: AXIS2-4782 Contributor:Rich Scheuerle Small change to the algorithm to determine if a reloadable WSDL implementation should be used. Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/wsdl/util/WSDLDefinitionWrapper.java axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/wsdl/util/WSDLWrapperReloadImpl.java Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/wsdl/util/WSDLDefinitionWrapper.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/wsdl/util/WSDLDefinitionWrapper.java?rev=965641&r1=965640&r2=965641&view=diff == --- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/wsdl/util/WSDLDefinitionWrapper.java (original) +++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/wsdl/util/WSDLDefinitionWrapper.java Mon Jul 19 21:22:58 2010 @@ -267,11 +267,22 @@ public class WSDLDefinitionWrapper imple // otherwise, default to the serialization technique if (reduceWSDLMemoryType == 2) { -// a wrapper implementation that uses release & reload on the -// underlying WSDL4J object -// this would be desirable for those environments where -// many of the WSDL definitions are not serializable -wrapperImpl = new WSDLWrapperReloadImpl(def, wURL); + +// See if the definition is reloadable +if (WSDLWrapperReloadImpl.isReloadable(def, wURL)) { +// a wrapper implementation that uses release & reload on the +// underlying WSDL4J object +// this would be desirable for those environments where +// many of the WSDL definitions are not serializable +wrapperImpl = new WSDLWrapperReloadImpl(def, wURL); +} else { +// a wrapper implementation that is just a passthrough to the +// underlying WSDL4J object +if (log.isDebugEnabled() ) { +log.debug("WSDLDefinitionWrapper could not create a reloadable WSDL wrapper object."); +} +wrapperImpl = new WSDLWrapperBasicImpl(def, wURL); +} } else { // a wrapper implementation that uses serialization to save the Modified: axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/wsdl/util/WSDLWrapperReloadImpl.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/wsdl/util/WSDLWrapperReloadImpl.java?rev=965641&r1=965640&r2=965641&view=diff == --- axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/wsdl/util/WSDLWrapperReloadImpl.java (original) +++ axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/wsdl/util/WSDLWrapperReloadImpl.java Mon Jul 19 21:22:58 2010 @@ -133,6 +133,49 @@ public class WSDLWrapperReloadImpl imple } prepare(def, wURL); } + +public static boolean isReloadable(Definition def, URL wURL) { +if (isDebugEnabled) { +log.debug("Enter " + myClassName + ".isReloadable(): " + wURL); +} +String explicitURI = null; +if (def != null) { +try { +String documentBaseURI = def.getDocumentBaseURI(); + +// build up the wURL if possible +if ((wURL == null) && (documentBaseURI != null)) { +wURL = new URL(documentBaseURI); +} + +// get the explicit location of the wsdl if possible +if (wURL != null) { +explicitURI = getExplicitURI(wURL); +} + + +} catch (Exception e) { +if (isDebugEnabled) { +log.debug(myClassName + ".isReloaded(): [" ++ e.getClass().getName() + "] error [" + e.getMessage() + "]", e); +log.debug("Processing continues."); +} +} +} + +// Return true if explicitURI is available +if (isDebugEnabled) { +log.debug(" explicitURI=" + explicitURI); +} +boolean rc = explicitURI != null && explicitURI.length() > 0; + +if (isDebugEnabled) { +log.debug("Exit " + myClassName + ".isReloadable(): " + rc); +} + +return rc; + +} /** @@ -1222,7 +1265,7 @@ public class WSDLWrapperReloadImpl imple //---
svn commit: r965653 - in /axis/axis2/java/core/branches/java/1_5: ./ modules/distribution/ modules/java2wsdl/ modules/kernel/src/org/apache/axis2/transport/http/util/ modules/kernel/test/org/apache/ax
Author: veithen Date: Mon Jul 19 21:54:47 2010 New Revision: 965653 URL: http://svn.apache.org/viewvc?rev=965653&view=rev Log: Merged r805999 to the 1.5 branch to avoid an unnecessary dependency on icu4j.jar, which contains an invalid class file (com/ibm/icu/impl/data/LocaleElements_zh__PINYIN.class). Modified: axis/axis2/java/core/branches/java/1_5/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/distribution/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/java2wsdl/pom.xml axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java (props changed) axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java (props changed) axis/axis2/java/core/branches/java/1_5/modules/parent/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/transport/http/pom.xml (props changed) axis/axis2/java/core/branches/java/1_5/modules/transport/http/src/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/transport/local/ (props changed) axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AdminAgent.java (props changed) axis/axis2/java/core/branches/java/1_5/modules/webapp/src/main/java/org/apache/axis2/webapp/AxisAdminServlet.java (props changed) Propchange: axis/axis2/java/core/branches/java/1_5/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jul 19 21:54:47 2010 @@ -1,2 +1,2 @@ /axis/axis2/java/core/trunk:922914,922983,944347,944915,951385,960978,960995,961012,963081,963147,965032,965036,965056,965068,965074,965213 -/webservices/axis2/trunk/java:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,834058,834175,904780,905980 +/webservices/axis2/trunk/java:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,805999,834058,834175,904780,905980 Propchange: axis/axis2/java/core/branches/java/1_5/modules/distribution/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jul 19 21:54:47 2010 @@ -1,2 +1,2 @@ /axis/axis2/java/core/trunk/modules/distribution:922914,922983,936434,944347,944915,951385,960978,960995,961012,963081,963147,965032,965036,965056,965068,965074,965213 -/webservices/axis2/trunk/java/modules/distribution:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,834058,834175,904780,905980 +/webservices/axis2/trunk/java/modules/distribution:732924,732927,732939,733539,733776,741873,748761,754458,754467,754503,757151-757153,759488,759507,759878,759968,761025,761044,761709,761770,761952,763148,765102,771051,777897,777934,801630,803725,805999,834058,834175,904780,905980 Modified: axis/axis2/java/core/branches/java/1_5/modules/java2wsdl/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/java2wsdl/pom.xml?rev=965653&r1=965652&r2=965653&view=diff == --- axis/axis2/java/core/branches/java/1_5/modules/java2wsdl/pom.xml (original) +++ axis/axis2/java/core/branches/java/1_5/modules/java2wsdl/pom.xml Mon Jul 19 21:54:47 2010 @@ -67,10 +67,6 @@ geronimo-javamail_1.4_spec -jaxen -jaxen - - xalan xalan test Propchange: axis/axis2/java/core/branches/java/1_5/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java -- --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jul 19 21:54:47 2010 @@ -1,2 +1,2 @@ /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:922914,922983,944347,944915,951385,960978,960995,961012,963081,963147,965032,965036,965056,965068,965074,965213 -/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:733539,761709,771051,777897,777934,801630,803725,834058,834175,904780,905980 +/webservices/axis2/trunk/java/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:733539,761709,771051,777897,777934,801630,803725,805999,834058,834175,904780,905980 Propchange: axis/axis2/java/core/branches/java/1_5/modules/kernel/test/org/apache/axis2/transport/http/util/QueryStringParserTest.java --