svn commit: r982758 - in /axis/axis2/java/core/branches/java/1_5: ./ modules/distribution/ modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/ modules/kernel/src/org/apache/axis2/transp

2010-08-05 Thread veithen 
Author: veithen
Date: Thu Aug  5 20:09:29 2010
New Revision: 982758

URL: http://svn.apache.org/viewvc?rev=982758&view=rev
Log:
Merged r982387 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/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/
   (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/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 Thu Aug  5 20:09:29 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
+/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
 
/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 Thu Aug  5 20:09:29 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
+/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
 
/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

Propchange: 
axis/axis2/java/core/branches/java/1_5/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/
('svn:ignore' removed)

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 Thu Aug  5 20:09:29 2010
@@ -1,2 +1,2 @@
-/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java: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
+/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/transport/http/util/QueryStringParser.java:922914,922983,935169,935174,935338,944347,944915,951385,960693,960976,960978,96

svn commit: r982764 - 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

2010-08-05 Thread veithen 
Author: veithen
Date: Thu Aug  5 20:17:53 2010
New Revision: 982764

URL: http://svn.apache.org/viewvc?rev=982764&view=rev
Log:
Merged r982393 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 Thu Aug  5 20:17:53 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
+/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
 
/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 Thu Aug  5 20:17:53 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
+/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
 
/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=982764&r1=982763&r2=982764&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
 Thu Aug  5 20:17:53 2010
@@ -22,7 +22,7 @@
 true 
 axis2-${version}
 
-   
+
 zip
 
 
@@ -35,29 +35,29 @@
 modules/**
 
 
-   
-   ../../SameServiceAddingTest.java
-   **/target/**
-   ../../modules/samples/eventing/**
-   ../../modules/samples/security/**
-   xdocs/**
-   
-   **/.svn/**
-   **/bin/**
-   **/*.log
-

svn commit: r982795 - in /axis/axis2/java/core/trunk/modules: distribution/src/main/assembly/bin-assembly.xml jibx/pom.xml parent/pom.xml

2010-08-05 Thread veithen 
Author: veithen
Date: Thu Aug  5 21:40:04 2010
New Revision: 982795

URL: http://svn.apache.org/viewvc?rev=982795&view=rev
Log:
AXIS2-4788: Removed the extra dependency on org.apache.bcel:bcel and keep 
whatever transitive dependency is introduced by jibx.

Modified:

axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
axis/axis2/java/core/trunk/modules/jibx/pom.xml
axis/axis2/java/core/trunk/modules/parent/pom.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=982795&r1=982794&r2=982795&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
 Thu Aug  5 21:40:04 2010
@@ -212,8 +212,6 @@
  org.springframework:spring-context:jar 
  org.springframework:spring-core:jar
  org.springframework:spring-web:jar 
- jakarta-regexp:jakarta-regexp:jar
- org.apache.bcel:bcel:jar   
  org.apache.ant:ant:jar
  org.apache.ant:ant-launcher:jar
  aopalliance:aopalliance:jar

Modified: axis/axis2/java/core/trunk/modules/jibx/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jibx/pom.xml?rev=982795&r1=982794&r2=982795&view=diff
==
--- axis/axis2/java/core/trunk/modules/jibx/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jibx/pom.xml Thu Aug  5 21:40:04 2010
@@ -62,10 +62,6 @@
 jibx-run
 
 
-org.apache.bcel
-bcel
-
-
 org.apache.ant
 ant
 test

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=982795&r1=982794&r2=982795&view=diff
==
--- axis/axis2/java/core/trunk/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/parent/pom.xml Thu Aug  5 21:40:04 2010
@@ -79,7 +79,6 @@

 1.7.0
 2.7.7
-5.2
 2.4.0
 1.3
 1.2
@@ -713,11 +712,6 @@
 ${ant.version}
 
 
-org.apache.bcel
-bcel
-${bcel.version}
-
-
 commons-logging
 commons-logging
 ${commons.logging.version}

svn commit: r982798 - /axis/axis2/java/core/trunk/modules/distribution/pom.xml

2010-08-05 Thread veithen 
Author: veithen
Date: Thu Aug  5 21:48:23 2010
New Revision: 982798

URL: http://svn.apache.org/viewvc?rev=982798&view=rev
Log:
Reenabled the source distribution.

Modified:
axis/axis2/java/core/trunk/modules/distribution/pom.xml

Modified: axis/axis2/java/core/trunk/modules/distribution/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/distribution/pom.xml?rev=982798&r1=982797&r2=982798&view=diff
==
--- axis/axis2/java/core/trunk/modules/distribution/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/distribution/pom.xml Thu Aug  5 21:48:23 
2010
@@ -220,7 +220,7 @@
 axis2-${project.version}
 
 
src/main/assembly/war-assembly.xml
-
+
src/main/assembly/src-assembly.xml
 
src/main/assembly/bin-assembly.xml

svn commit: r982800 - /axis/axis2/java/core/trunk/modules/distribution/src/main/assembly/src-assembly.xml

2010-08-05 Thread veithen 
Author: veithen
Date: Thu Aug  5 22:01:14 2010
New Revision: 982800

URL: http://svn.apache.org/viewvc?rev=982800&view=rev
Log:
Fixed the excludes for the source distribution.

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=982800&r1=982799&r2=982800&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
 Thu Aug  5 22:01:14 2010
@@ -30,6 +30,7 @@
 
 ../..
 
+true
 
 ../../etc/**
 modules/adb/**
@@ -68,27 +69,27 @@
 
 
 
+
 ../../SameServiceAddingTest.java
-**/target/**
 ../../modules/samples/eventing/**
 ../../modules/samples/security/**
 xdocs/**
-
-**/.svn/**
-**/bin/**
-**/*.log
-
-**/.settings/**
-**/*.license
-**/*.iml
+
+
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*]
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?maven-eclipse\.xml]
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.project]
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.classpath]
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iws]
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.ipr]
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?[^/]*\.iml]
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.settings(/.*)?]
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.externalToolBuilders(/.*)?]
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.deployables(/.*)?]
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?\.wtpmodules(/.*)?]
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?cobertura\.ser]
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?pom\.xml\.releaseBackup]
+
%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/)(.*/)?release\.properties]