svn commit: r983363 - in /axis/axis2/java/core/trunk/modules/distribution/src/main/assembly: bin-assembly.xml src-assembly.xml
Author: veithen Date: Sun Aug 8 08:47:23 2010 New Revision: 983363 URL: http://svn.apache.org/viewvc?rev=983363&view=rev Log: Properly add NOTICE.txt, LICENSE.txt, README.txt and release-notes.html to the binary and source distributions. Note that the first three files don't require variable substitution and that the last file should not require variable substitution (although it does for the moment). Modified: axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/src-assembly.xml Modified: axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml?rev=983363&r1=983362&r2=983363&view=diff == --- axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml (original) +++ axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml Sun Aug 8 08:47:23 2010 @@ -153,7 +153,7 @@ -target/tmp-doc-distro/docs +../.. LICENSE.txt Modified: axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/src-assembly.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/src-assembly.xml?rev=983363&r1=983362&r2=983363&view=diff == --- axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/src-assembly.xml (original) +++ axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/src-assembly.xml Sun Aug 8 08:47:23 2010 @@ -37,6 +37,10 @@ modules/** legal/** release-docs/** +NOTICE.txt +LICENSE.txt +README.txt +release-notes.html @@ -85,23 +89,6 @@ - - -target/tmp-doc-distro/docs - - -NOTICE.txt - - - - -target/tmp-doc-distro/docs - - -LICENSE.txt - - - ../../xdocs
svn commit: r983370 - /axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/src-assembly.xml
Author: veithen Date: Sun Aug 8 09:32:51 2010 New Revision: 983370 URL: http://svn.apache.org/viewvc?rev=983370&view=rev Log: Also include the src directory in the source distribution. Now the source distribution is buildable again. Modified: axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/src-assembly.xml Modified: axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/src-assembly.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/src-assembly.xml?rev=983370&r1=983369&r2=983370&view=diff == --- axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/src-assembly.xml (original) +++ axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/src-assembly.xml Sun Aug 8 09:32:51 2010 @@ -41,6 +41,7 @@ LICENSE.txt README.txt release-notes.html +src/**
svn commit: r983372 - /axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/src-assembly.xml
Author: veithen Date: Sun Aug 8 09:46:59 2010 New Revision: 983372 URL: http://svn.apache.org/viewvc?rev=983372&view=rev Log: Removed unnecessary exclusion from the source distribution. Because of the "../..", it was actually not excluding anything. It seems that the original reason for the exclusion was a failing test case in SameServiceAddingTest, but this has been fixed long ago. Modified: axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/src-assembly.xml Modified: axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/src-assembly.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/src-assembly.xml?rev=983372&r1=983371&r2=983372&view=diff == --- axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/src-assembly.xml (original) +++ axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/src-assembly.xml Sun Aug 8 09:46:59 2010 @@ -63,7 +63,6 @@ modules/tool/axis2-java2wsdl-maven-plugin/src/test/test1/target/** -../../SameServiceAddingTest.java ../../modules/samples/eventing/** ../../modules/samples/security/** xdocs/**
svn commit: r983399 - in /axis/axis2/java/core/branches/java/1_5: ./ modules/distribution/ modules/distribution/src/main/assembly/ modules/kernel/src/org/apache/axis2/transport/http/util/ modules/kern
Author: veithen Date: Sun Aug 8 12:20:57 2010 New Revision: 983399 URL: http://svn.apache.org/viewvc?rev=983399&view=rev Log: Merged r983236 to the 1.5 branch. 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/distribution/src/main/assembly/src-assembly.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 Sun Aug 8 12:20:57 2010 @@ -1,2 +1,2 @@ -/axis/axis2/java/core/trunk:922914,922983,935169,935174,935338,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,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185 +/axis/axis2/java/core/trunk:922914,922983,935169,935174,935338,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,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236 /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,777882,777897,777934,801630,803725,805999,807160,807487,816740,834058,834175,904780,905980 Propchange: axis/axis2/java/core/branches/java/1_5/modules/distribution/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 8 12:20:57 2010 @@ -1,2 +1,2 @@ -/axis/axis2/java/core/trunk/modules/distribution:922914,922983,935169,935174,935338,936434,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,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185 +/axis/axis2/java/core/trunk/modules/distribution:922914,922983,935169,935174,935338,936434,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,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236 /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,777882,777897,777934,801630,803725,805999,807160,807487,816740,834058,834175,904780,905980 Modified: axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/src-assembly.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/src-assembly.xml?rev=983399&r1=983398&r2=983399&view=diff == --- axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/src-assembly.xml (original) +++ axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/src-assembly.xml Sun Aug 8 12:20:57 2010 @@ -37,6 +37,9 @@ + +modules/rmi/** + Propchange: axis/axis2/java/core/branches/java/1_5/modules/kernel/src
svn commit: r983407 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/client/ServiceClient.java
Author: scheu
Date: Sun Aug 8 12:50:02 2010
New Revision: 983407
URL: http://svn.apache.org/viewvc?rev=983407&view=rev
Log:
Simple NPE avoidance check
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/client/ServiceClient.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/client/ServiceClient.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/client/ServiceClient.java?rev=983407&r1=983406&r2=983407&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/client/ServiceClient.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/client/ServiceClient.java
Sun Aug 8 12:50:02 2010
@@ -857,7 +857,10 @@ public class ServiceClient {
lastOperationContext
.getMessageContext(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
if (outMessageContext != null) {
-
outMessageContext.getTransportOut().getSender().cleanup(outMessageContext);
+if (outMessageContext.getTransportOut() != null &&
+outMessageContext.getTransportOut().getSender() !=
null) {
+
outMessageContext.getTransportOut().getSender().cleanup(outMessageContext);
+}
}
}
}
svn commit: r983468 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
Author: nthaker
Date: Sun Aug 8 18:34:43 2010
New Revision: 983468
URL: http://svn.apache.org/viewvc?rev=983468&view=rev
Log:
Axis2-4793
Fix for NPE When invoking Shutdown Modules in ConfigurationContext.
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
Modified:
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java?rev=983468&r1=983467&r2=983468&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/context/ConfigurationContext.java
Sun Aug 8 18:34:43 2010
@@ -741,14 +741,16 @@ public class ConfigurationContext extend
if(log.isDebugEnabled()){
log.debug("Invoke modules shutdown.");
}
-HashMap modules = axisConfiguration.getModules();
-if (modules != null) {
-Iterator moduleitr = modules.values().iterator();
-while (moduleitr.hasNext()) {
-AxisModule axisModule = (AxisModule) moduleitr.next();
-Module module = axisModule.getModule();
-if (module != null) {
-module.shutdown(this);
+if(axisConfiguration!=null){
+HashMap modules = axisConfiguration.getModules();
+if (modules != null) {
+Iterator moduleitr = modules.values().iterator();
+while (moduleitr.hasNext()) {
+AxisModule axisModule = (AxisModule) moduleitr.next();
+Module module = axisModule.getModule();
+if (module != null) {
+module.shutdown(this);
+}
}
}
}
@@ -757,12 +759,14 @@ public class ConfigurationContext extend
if(log.isDebugEnabled()){
log.debug("Invoke services shutdown.");
}
-for (Iterator services =
axisConfiguration.getServices().values().iterator();
-services.hasNext();) {
-AxisService axisService = (AxisService) services.next();
-ServiceLifeCycle serviceLifeCycle =
axisService.getServiceLifeCycle();
-if (serviceLifeCycle != null) {
-serviceLifeCycle.shutDown(this, axisService);
+if(axisConfiguration!=null){
+for (Iterator services =
axisConfiguration.getServices().values().iterator();
+services.hasNext();) {
+AxisService axisService = (AxisService) services.next();
+ServiceLifeCycle serviceLifeCycle =
axisService.getServiceLifeCycle();
+if (serviceLifeCycle != null) {
+serviceLifeCycle.shutDown(this, axisService);
+}
}
}
stopped = true;
svn commit: r983478 - in /axis/axis2/java/core/branches/java/1_5: ./ modules/distribution/ modules/distribution/src/main/assembly/ modules/kernel/src/org/apache/axis2/transport/http/util/ modules/kern
Author: veithen Date: Sun Aug 8 20:08:01 2010 New Revision: 983478 URL: http://svn.apache.org/viewvc?rev=983478&view=rev Log: Merged r983270 to the 1.5 branch. 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/distribution/src/main/assembly/src-assembly.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 Sun Aug 8 20:08:01 2010 @@ -1,2 +1,2 @@ -/axis/axis2/java/core/trunk:922914,922983,935169,935174,935338,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,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236 +/axis/axis2/java/core/trunk:922914,922983,935169,935174,935338,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,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270 /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,777882,777897,777934,801630,803725,805999,807160,807487,816740,834058,834175,904780,905980 Propchange: axis/axis2/java/core/branches/java/1_5/modules/distribution/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Aug 8 20:08:01 2010 @@ -1,2 +1,2 @@ -/axis/axis2/java/core/trunk/modules/distribution:922914,922983,935169,935174,935338,936434,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,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236 +/axis/axis2/java/core/trunk/modules/distribution:922914,922983,935169,935174,935338,936434,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,979882-979883,979886,981036,981038,981095,981188,981220-981221,981237,981262,981278,981293,981306,981311,981985,982387,982393,982795,982800,983101,983110,983114,983119-983120,983128,983185,983236,983270 /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,777882,777897,777934,801630,803725,805999,807160,807487,816740,834058,834175,904780,905980 Modified: axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/src-assembly.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/src-assembly.xml?rev=983478&r1=983477&r2=983478&view=diff == --- axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/src-assembly.xml (original) +++ axis/axis2/java/core/branches/java/1_5/modules/distribution/src/main/assembly/src-assembly.xml Sun Aug 8 20:08:01 2010 @@ -32,8 +32,11 @@ true -../../etc/** +pom.xml +etc/** modules/** +
