svn commit: r917723 - /axis/axis2/java/core/trunk/modules/parent/pom.xml

[veithen]

Author: veithen
Date: Mon Mar  1 21:18:05 2010
New Revision: 917723

URL: http://svn.apache.org/viewvc?rev=917723&view=rev
Log:
AXIS2-4290: Configured a more rational updatePolicy for repositories and 
pluginRepositories.

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=917723&r1=917722&r2=917723&view=diff
==
--- axis/axis2/java/core/trunk/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/parent/pom.xml Mon Mar  1 21:18:05 2010
@@ -477,11 +477,12 @@
 
 
 true
-always
+never
 
 
+
 true
-never
+daily
 
 apache-ws-snapshots2
 Apache ws.zones - 2
@@ -492,7 +493,7 @@
 http://tomcat.apache.org/dev/dist/m2-repository
 
 true
-always
+never
 
 
 false
@@ -504,7 +505,7 @@
 http://repo1.maven.org/eclipse
 
 true
-always
+never
 
 
 false
@@ -530,6 +531,7 @@
 
 
 true
+never
 
  

@@ -562,6 +564,7 @@
 
 
 true
+never
 
 
 

svn commit: r922692 - in /axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin: ./ src/main/java/org/apache/axis2/tool/ant/ src/test/java/ src/test/java/test/

[veithen]

Author: veithen
Date: Sat Mar 13 23:40:34 2010
New Revision: 922692

URL: http://svn.apache.org/viewvc?rev=922692&view=rev
Log:
AXIS2-4634: Allow to specify extraClasses on Java2WSDLTask. Based on a 
contribution submitted by Vy Ho. Not updating any documentation because there 
is no existing documentation for this ant task.

Added:
axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/src/test/java/
axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/src/test/java/test/

axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/src/test/java/test/ExtraClass1.java
   (with props)

axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/src/test/java/test/ExtraClass2.java
   (with props)

axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/src/test/java/test/Service.java
   (with props)
Modified:
axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml

axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/src/main/java/org/apache/axis2/tool/ant/Java2WSDLTask.java

Modified: axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml?rev=922692&r1=922691&r2=922692&view=diff
==
--- axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml Sat Mar 13 
23:40:34 2010
@@ -110,6 +110,74 @@
 
 
 
+
+maven-antrun-plugin
+
+
+
+run
+
+test
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+org.codehaus.groovy.maven
+gmaven-plugin
+1.0
+
+
+test
+
+execute
+
+
+
+import groovy.xml.*
+
+def parser = new XmlParser()
+def wsdl = new 
Namespace('http://schemas.xmlsoap.org/wsdl/')
+def xs = new 
Namespace('http://www.w3.org/2001/XMLSchema')
+
+for (i in 1..3) {  
  
+def wsdlDoc = parser.parse(new 
File(project.build.directory, "java2wsdl/extraclasses${i}.wsdl"))
+def complexTypes = 
wsdlDoc[wsdl.types][xs.schema][xs.complexType].'@name'
+assert complexTypes.contains('ExtraClass1')
+assert complexTypes.contains('ExtraClass2')
+}
+
+
+
+
+
 
 
 

Modified: 
axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/src/main/java/org/apache/axis2/tool/ant/Java2WSDLTask.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/src/main/java/org/apache/axis2/tool/ant/Java2WSDLTask.java?rev=922692&r1=922691&r2=922692&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/src/main/java/org/apache/axis2/tool/ant/Java2WSDLTask.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/src/main/java/org/apache/axis2/tool/ant/Java2WSDLTask.java
 Sat Mar 13 23:40:34 2010
@@ -31,11 +31,25 @@ import org.apache.ws.java2wsdl.Namespace
 import org.apache.ws.java2wsdl.utils.Java2WSDLCommandLineOption;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 
 public class Java2WSDLTask extends Task implements Java2WSDLConstants {
+public 

svn commit: r922805 - in /axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin: pom.xml src/test/java/test/MyClass.java src/test/java/test/Service.java

[veithen]

Author: veithen
Date: Sun Mar 14 10:22:37 2010
New Revision: 922805

URL: http://svn.apache.org/viewvc?rev=922805&view=rev
Log:
Java2WSDL Ant task: added a test for package-namespace mappings.

Added:

axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/src/test/java/test/MyClass.java
   (with props)
Modified:
axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml

axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/src/test/java/test/Service.java

Modified: axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml?rev=922805&r1=922804&r2=922805&view=diff
==
--- axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml Sun Mar 14 
10:22:37 2010
@@ -126,6 +126,8 @@
 
 
 
+
+
 
@@ -144,6 +146,15 @@
extraClasses="test.ExtraClass1">
 
 
+
+
+
+http://www.example.org/schema/test-service";>
+http://www.example.org/schema/test"/>
+
 
 
 
@@ -167,12 +178,21 @@
 def wsdl = new 
Namespace('http://schemas.xmlsoap.org/wsdl/')
 def xs = new 
Namespace('http://www.w3.org/2001/XMLSchema')
 
+println 'Checking extraclasses*.wsdl'
+
 for (i in 1..3) {  
  
 def wsdlDoc = parser.parse(new 
File(project.build.directory, "java2wsdl/extraclasses${i}.wsdl"))
 def complexTypes = 
wsdlDoc[wsdl.types][xs.schema][xs.complexType].'@name'
 assert complexTypes.contains('ExtraClass1')
 assert complexTypes.contains('ExtraClass2')
 }
+
+println 'Checking mappings.wsdl'
+
+def wsdlDoc = parser.parse(new 
File(project.build.directory, "java2wsdl/mappings.wsdl"))
+def namespaces = 
wsdlDoc[wsdl.types][xs.schema].'@targetNamespace'
+assert 
namespaces.contains('http://www.example.org/schema/test-service')
+assert 
namespaces.contains('http://www.example.org/schema/test')
 
 
 

Added: 
axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/src/test/java/test/MyClass.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/src/test/java/test/MyClass.java?rev=922805&view=auto
==
--- 
axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/src/test/java/test/MyClass.java
 (added)
+++ 
axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/src/test/java/test/MyClass.java
 Sun Mar 14 10:22:37 2010
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package test;
+
+public class MyClass {
+private String property;
+
+public String getProperty() {
+return property;
+}
+
+p

svn commit: r922818 - /axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml

[veithen]

Author: veithen
Date: Sun Mar 14 11:46:17 2010
New Revision: 922818

URL: http://svn.apache.org/viewvc?rev=922818&view=rev
Log:
java2wsdl command line tool: added a test for the -p2n option.

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

Modified: axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml?rev=922818&r1=922817&r2=922818&view=diff
==
--- axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml Sun Mar 14 11:46:17 
2010
@@ -71,6 +71,13 @@
 xalan
 test
 
+
+
+org.apache.axis2
+axis2-adb
+${version}
+test
+
 
 
 src
@@ -119,6 +126,64 @@
 
 
 
+
+maven-antrun-plugin
+
+
+
+run
+
+test
+
+
+
+
+
+
+
+
+
+
+
+
+http://www.example.org/calculator]"/>
+
+http://www.example.org/calculator-service"/>
+
+
+
+
+
+
+
+org.codehaus.groovy.maven
+gmaven-plugin
+1.0
+
+
+test
+
+execute
+
+
+
+import groovy.xml.*
+
+def parser = new XmlParser()
+def wsdl = new 
Namespace('http://schemas.xmlsoap.org/wsdl/')
+def xs = new 
Namespace('http://www.w3.org/2001/XMLSchema')
+
+println 'Checking p2n.wsdl'
+
+def wsdlDoc = parser.parse(new 
File(project.build.directory, "java2wsdl/p2n.wsdl"))
+def namespaces = 
wsdlDoc[wsdl.types][xs.schema].'@targetNamespace'
+assert 
namespaces.contains('http://www.example.org/calculator')
+assert 
namespaces.contains('http://www.example.org/calculator-service')
+
+
+
+
+
 
 
 

svn commit: r922828 - /axis/axis2/java/core/trunk/modules/kernel/pom.xml

[veithen]

Author: veithen
Date: Sun Mar 14 12:33:22 2010
New Revision: 922828

URL: http://svn.apache.org/viewvc?rev=922828&view=rev
Log:
Using resources:testResources to copy files to a location outside of 
target/test-classes is a bad practice. Use antrun to copy files instead. With 
this change, eclipse:eclipse will generate an Eclipse project that can be build 
correctly.

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

Modified: axis/axis2/java/core/trunk/modules/kernel/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/pom.xml?rev=922828&r1=922827&r2=922828&view=diff
==
--- axis/axis2/java/core/trunk/modules/kernel/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/kernel/pom.xml Sun Mar 14 12:33:22 2010
@@ -117,13 +117,6 @@
 
 
 
-../test-resources
-test-resources
-
-**/**
-
-
-
 
test-resources/deployment/ClasspathModule
 
 **/**
@@ -198,6 +191,9 @@
 process-test-resources
 
 
+
+
+
 
 

svn commit: r922830 - /axis/axis2/java/core/trunk/modules/kernel/

[veithen]

Author: veithen
Date: Sun Mar 14 12:37:07 2010
New Revision: 922830

URL: http://svn.apache.org/viewvc?rev=922830&view=rev
Log:
Setting up svn:ignore for Eclipse.

Modified:
axis/axis2/java/core/trunk/modules/kernel/   (props changed)

Propchange: axis/axis2/java/core/trunk/modules/kernel/
--
--- svn:ignore (original)
+++ svn:ignore Sun Mar 14 12:37:07 2010
@@ -2,3 +2,6 @@
 target
 bin
 *.iml
+.settings
+.classpath
+.project

svn commit: r922906 - /axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml

[veithen]

Author: veithen
Date: Sun Mar 14 17:35:54 2010
New Revision: 922906

URL: http://svn.apache.org/viewvc?rev=922906&view=rev
Log:
axis2-fastinfoset module: let Maven compile the generated test sources instead 
of using the javac task in antrun. This solves AXIS2-4652 and is necessary to 
import the project into Eclipse with maven-eclipse-plugin.

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

Modified: axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml?rev=922906&r1=922905&r2=922906&view=diff
==
--- axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml Sun Mar 14 17:35:54 
2010
@@ -202,12 +202,6 @@
 
 
 
-
-
-
-
-
-
 
 
 
@@ -217,6 +211,24 @@
 
 
 
+org.codehaus.mojo
+build-helper-maven-plugin
+
+
+add-test-source
+generate-test-sources
+
+add-test-source
+
+
+
+
${project.build.directory}/wsdl/simpleAddService
+
+
+
+
+
+
 maven-surefire-plugin
 true
 

svn commit: r922914 - /axis/axis2/java/core/trunk/modules/soapmonitor/servlet/pom.xml

[veithen]

Author: veithen
Date: Sun Mar 14 17:52:04 2010
New Revision: 922914

URL: http://svn.apache.org/viewvc?rev=922914&view=rev
Log:
Use maven-remote-resources-plugin to copy legal files (see also r777934).

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

Modified: axis/axis2/java/core/trunk/modules/soapmonitor/servlet/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/soapmonitor/servlet/pom.xml?rev=922914&r1=922913&r2=922914&view=diff
==
--- axis/axis2/java/core/trunk/modules/soapmonitor/servlet/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/soapmonitor/servlet/pom.xml Sun Mar 14 
17:52:04 2010
@@ -39,15 +39,23 @@
 
 
 
-
-
-../../..
-
-NOTICE.txt
-LICENSE.txt
-
-false
-
-
+
+
+maven-remote-resources-plugin
+
+
+legal-files
+
+process
+
+
+
+
org.apache.axis2:axis2-resource-bundle:${pom.version}
+
+
+
+
+
+
 
 

svn commit: r922936 - /axis/axis2/java/core/trunk/modules/codegen/pom.xml

[veithen]

Author: veithen
Date: Sun Mar 14 19:56:51 2010
New Revision: 922936

URL: http://svn.apache.org/viewvc?rev=922936&view=rev
Log:
Fixed formatting.

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

Modified: axis/axis2/java/core/trunk/modules/codegen/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/pom.xml?rev=922936&r1=922935&r2=922936&view=diff
==
--- axis/axis2/java/core/trunk/modules/codegen/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/codegen/pom.xml Sun Mar 14 19:56:51 2010
@@ -33,27 +33,27 @@
 Axis2 Code Generation module
 
 
-  ${project.groupId}
-  axis2-kernel
-  ${project.version}
+${project.groupId}
+axis2-kernel
+${project.version}
+
+
+${project.groupId}
+axis2-adb
+${project.version}
+
+
+${project.groupId}
+axis2-transport-local
+${project.version}
+test
+
+
+${project.groupId}
+axis2-transport-http
+${project.version}
+test
 
-  
-${project.groupId}
-axis2-adb
-${project.version}
-  
-  
-${project.groupId}
-axis2-transport-local
-${project.version}
-test
-  
-  
-${project.groupId}
-axis2-transport-http
-${project.version}
-test
-  
 
 
 src
@@ -122,63 +122,63 @@
 
 
 
-  
-org.apache.maven.plugins
-maven-surefire-plugin
-true
-
-  
-**/*Test.java
-  
-
-  
+
+org.apache.maven.plugins
+maven-surefire-plugin
+true
+
+
+**/*Test.java
+
+
+
 
-  
-org.apache.maven.plugins
+
+org.apache.maven.plugins
 maven-antrun-plugin
 
-  
-generate-test-sources
-generate-test-sources
-
-  
-
-
-Building WSDLs...
-
-
-
-  
-
-
-  
-
-
-  run
-
-  
-  
-process-resources
-process-resources
-
-  
-
-  
-
-
-  
-  
-
-
-  
-
-  
-
-
-  run
-
-  
+
+generate-test-sources
+generate-test-sources
+
+
+
+
+Building WSDLs...
+
+
+
+
+
+
+
+
+
+run
+
+
+
+process-resources
+process-resources
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+run
+
+
 
 
 

svn commit: r922941 - in /axis/axis2/java/core/trunk/modules: codegen/pom.xml parent/pom.xml

[veithen]

Author: veithen
Date: Sun Mar 14 20:18:17 2010
New Revision: 922941

URL: http://svn.apache.org/viewvc?rev=922941&view=rev
Log:
Codegen tests: use a staging approach to copy the templates from the other 
projects. This allows the maven-eclipse-plugin to work properly (Eclipse 
doesn't support source folders located outside of the project directory).

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

Modified: axis/axis2/java/core/trunk/modules/codegen/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/pom.xml?rev=922941&r1=922940&r2=922941&view=diff
==
--- axis/axis2/java/core/trunk/modules/codegen/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/codegen/pom.xml Sun Mar 14 20:18:17 2010
@@ -81,28 +81,7 @@
 
 
 
-../adb-codegen/src
-
-**/*.xsl
-
-
-
-../xmlbeans/src
-
-**/*.xsl
-
-
-
-../jaxbri/src
-
-**/*.xsl
-
-
-
-../jibx/src
-
-**/*.xsl
-
+${project.build.directory}/templates
 
 
 
@@ -181,6 +160,53 @@
 
 
 
+
+maven-resources-plugin
+
+
+
+copy-templates
+generate-test-resources
+
+copy-resources
+
+
+
${project.build.directory}/templates
+  
+
+../adb-codegen/src
+
+**/*.xsl
+
+
+
+../xmlbeans/src
+
+**/*.xsl
+
+
+
+../jaxbri/src
+
+**/*.xsl
+
+
+
+../jibx/src
+
+**/*.xsl
+
+
+  
+
+
+
+
 
 
 

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=922941&r1=922940&r2=922941&view=diff
==
--- axis/axis2/java/core/trunk/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/parent/pom.xml Sun Mar 14 20:18:17 2010
@@ -1254,7 +1254,7 @@
 
 
 maven-resources-plugin
-2.2
+2.4.2
 
 
 maven-site-plugin

svn commit: r922967 - in /axis/axis2/java/core/trunk/modules/integration: itest-build.xml pom.xml

[veithen]

Author: veithen
Date: Sun Mar 14 21:29:56 2010
New Revision: 922967

URL: http://svn.apache.org/viewvc?rev=922967&view=rev
Log:
Integration tests: let Maven invoke the compiler (instead of using Ant). This 
allows maven-eclipse-plugin to import the generated sources into the Eclipse 
project.

Modified:
axis/axis2/java/core/trunk/modules/integration/itest-build.xml
axis/axis2/java/core/trunk/modules/integration/pom.xml

Modified: axis/axis2/java/core/trunk/modules/integration/itest-build.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/itest-build.xml?rev=922967&r1=922966&r2=922967&view=diff
==
--- axis/axis2/java/core/trunk/modules/integration/itest-build.xml (original)
+++ axis/axis2/java/core/trunk/modules/integration/itest-build.xml Sun Mar 14 
21:29:56 2010
@@ -47,11 +47,6 @@



-   
-   
-   
-   
-   
 
Compiling DocumentUnwrappingTest.wsdl

@@ -81,16 +76,11 @@



-   
-   
-   
-   
-   
 



-   
+   

 


Modified: axis/axis2/java/core/trunk/modules/integration/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/pom.xml?rev=922967&r1=922966&r2=922967&view=diff
==
--- axis/axis2/java/core/trunk/modules/integration/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/integration/pom.xml Sun Mar 14 21:29:56 
2010
@@ -303,6 +303,9 @@
 **/*.properties
 
 
+
+
${project.build.directory}/xmlbeans/resources
+
 
 
 
@@ -365,6 +368,26 @@
 
 
 
+
+org.codehaus.mojo
+build-helper-maven-plugin
+
+
+add-test-source
+process-test-resources
+
+add-test-source
+
+
+
+
${project.build.directory}/wsdl/complexdatatype/src
+
${project.build.directory}/wsdl/complexdatatypebare/src
+
${project.build.directory}/xmlbeans/java
+
+
+
+
+
 
 
 

svn commit: r922971 - in /axis/axis2/java/core/trunk/modules: adb-codegen/ adb/ addressing/ clustering/ codegen/ corba/ fastinfoset/ integration/ java2wsdl/ jaxbri/ jaxws-integration/ jaxws-mar/ jibx/

[veithen]

Author: veithen
Date: Sun Mar 14 21:52:11 2010
New Revision: 922971

URL: http://svn.apache.org/viewvc?rev=922971&view=rev
Log:
Set up svn:ignore for Eclipse.

Modified:
axis/axis2/java/core/trunk/modules/adb/   (props changed)
axis/axis2/java/core/trunk/modules/adb-codegen/   (props changed)
axis/axis2/java/core/trunk/modules/addressing/   (props changed)
axis/axis2/java/core/trunk/modules/clustering/   (props changed)
axis/axis2/java/core/trunk/modules/codegen/   (props changed)
axis/axis2/java/core/trunk/modules/corba/   (props changed)
axis/axis2/java/core/trunk/modules/fastinfoset/   (props changed)
axis/axis2/java/core/trunk/modules/integration/   (props changed)
axis/axis2/java/core/trunk/modules/java2wsdl/   (props changed)
axis/axis2/java/core/trunk/modules/jaxbri/   (props changed)
axis/axis2/java/core/trunk/modules/jaxws-integration/   (props changed)
axis/axis2/java/core/trunk/modules/jaxws-mar/   (props changed)
axis/axis2/java/core/trunk/modules/jibx/   (props changed)
axis/axis2/java/core/trunk/modules/json/   (props changed)
axis/axis2/java/core/trunk/modules/metadata/   (props changed)
axis/axis2/java/core/trunk/modules/mex/   (props changed)
axis/axis2/java/core/trunk/modules/mtompolicy/   (props changed)
axis/axis2/java/core/trunk/modules/mtompolicy-mar/   (props changed)
axis/axis2/java/core/trunk/modules/osgi/   (props changed)
axis/axis2/java/core/trunk/modules/ping/   (props changed)
axis/axis2/java/core/trunk/modules/resource-bundle/   (props changed)
axis/axis2/java/core/trunk/modules/scripting/   (props changed)
axis/axis2/java/core/trunk/modules/soapmonitor/module/   (props changed)
axis/axis2/java/core/trunk/modules/soapmonitor/servlet/   (props changed)
axis/axis2/java/core/trunk/modules/spring/   (props changed)
axis/axis2/java/core/trunk/modules/tool/axis2-aar-maven-plugin/   (props 
changed)
axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/   (props changed)
axis/axis2/java/core/trunk/modules/tool/axis2-idea-plugin/   (props changed)
axis/axis2/java/core/trunk/modules/tool/axis2-java2wsdl-maven-plugin/   
(props changed)
axis/axis2/java/core/trunk/modules/tool/axis2-mar-maven-plugin/   (props 
changed)
axis/axis2/java/core/trunk/modules/tool/axis2-wsdl2code-maven-plugin/   
(props changed)
axis/axis2/java/core/trunk/modules/webapp/   (props changed)
axis/axis2/java/core/trunk/modules/xmlbeans/   (props changed)

Propchange: axis/axis2/java/core/trunk/modules/adb/
--
--- svn:ignore (original)
+++ svn:ignore Sun Mar 14 21:52:11 2010
@@ -1,2 +1,5 @@
 *.iml
 target
+.settings
+.classpath
+.project

Propchange: axis/axis2/java/core/trunk/modules/adb-codegen/
--
--- svn:ignore (original)
+++ svn:ignore Sun Mar 14 21:52:11 2010
@@ -1,2 +1,5 @@
 *.iml
 target
+.settings
+.classpath
+.project

Propchange: axis/axis2/java/core/trunk/modules/addressing/
--
--- svn:ignore (original)
+++ svn:ignore Sun Mar 14 21:52:11 2010
@@ -1,3 +1,6 @@
 *.log
 target
 *.iml
+.settings
+.classpath
+.project

Propchange: axis/axis2/java/core/trunk/modules/clustering/
--
--- svn:ignore (original)
+++ svn:ignore Sun Mar 14 21:52:11 2010
@@ -1,3 +1,5 @@
 axis2-clustering.iml
 target
-
+.settings
+.classpath
+.project

Propchange: axis/axis2/java/core/trunk/modules/codegen/
--
--- svn:ignore (original)
+++ svn:ignore Sun Mar 14 21:52:11 2010
@@ -1,2 +1,5 @@
 *.iml
 target
+.settings
+.classpath
+.project

Propchange: axis/axis2/java/core/trunk/modules/corba/
--
--- svn:ignore (original)
+++ svn:ignore Sun Mar 14 21:52:11 2010
@@ -1,3 +1,5 @@
 target
 *.iml
-
+.settings
+.classpath
+.project

Propchange: axis/axis2/java/core/trunk/modules/fastinfoset/
--
--- svn:ignore (original)
+++ svn:ignore Sun Mar 14 21:52:11 2010
@@ -2,3 +2,6 @@ test.bin
 output.xml
 target
 axis2-fastinfoset.iml
+.settings
+.classpath
+.project

Propchange: axis/axis2/java/core/trunk/modules/integration/
--
--- svn:ignore (original)
+++ svn:ignore Sun Mar 14 21:52:11 2010
@@ -1,2 +1,5 @@
 target
 axis2-integration.iml
+.settings
+.classpath
+.project

Propchange: axis/axis2/java/core/trunk/modules/java2wsdl/
--
--- svn:ignore (original)
+++ svn:ignore Sun Mar 14 21:52:11 2010
@@ -1,2 +1,5 @@
 *.iml
 target
+.sett

svn commit: r922983 - /axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml

[veithen]

Author: veithen
Date: Sun Mar 14 22:17:47 2010
New Revision: 922983

URL: http://svn.apache.org/viewvc?rev=922983&view=rev
Log:
Use maven-remote-resources-plugin to copy legal files (see also r777934).

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

Modified: axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml?rev=922983&r1=922982&r2=922983&view=diff
==
--- axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml Sun Mar 14 
22:17:47 2010
@@ -45,21 +45,24 @@
 
 
 
-
-
-src/main/resources
-
-
-../../..
-
-NOTICE.txt
-LICENSE.txt
-
-false
-
-
 
 
+maven-remote-resources-plugin
+
+
+legal-files
+
+process
+
+
+
+
org.apache.axis2:axis2-resource-bundle:${pom.version}
+
+
+
+
+
+
 org.apache.axis2
 axis2-mar-maven-plugin
 ${mar.plugin.version}

svn commit: r922997 - /axis/axis2/java/core/trunk/modules/documentation/xdocs/svn.xml

[veithen]

Author: veithen
Date: Sun Mar 14 22:59:46 2010
New Revision: 922997

URL: http://svn.apache.org/viewvc?rev=922997&view=rev
Log:
Made svn.xml a real XDOC document and cleaned up the formatting.

Modified:
axis/axis2/java/core/trunk/modules/documentation/xdocs/svn.xml

Modified: axis/axis2/java/core/trunk/modules/documentation/xdocs/svn.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/documentation/xdocs/svn.xml?rev=922997&r1=922996&r2=922997&view=diff
==
--- axis/axis2/java/core/trunk/modules/documentation/xdocs/svn.xml (original)
+++ axis/axis2/java/core/trunk/modules/documentation/xdocs/svn.xml Sun Mar 14 
22:59:46 2010
@@ -1,3 +1,4 @@
+
 
-
-http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
-http://www.w3.org/1999/xhtml";>
-
-
-
-Developing Apache Axis2
-
-
-
-Developing Apache Axis2
-This document provides information on how to use SVN to get an
-SVN checkout/update, make commits to the repository, etc., in the
-process of contributing to Apache projects (specifically Axis2).
-Instructions on configuring IDEs for development and using Maven to
-build the project is also included here.
-Content
-
-Working with Subversion (SVN)
-Checkout Axis2 from Subversion
-Installing Maven 2
-Configuring your IDE
-
-
-Working with Subversion (SVN)
-The Axis2 development team uses Subversion (SVN) for source
-control. Subversion is a compelling replacement for CVS, developed
-under the auspices of the Tigris community and licensed under an
-Apache compatible license. To learn more about Subversion or to
-download the latest distribution, visit the http:///subversion.tigris.org"; target="_blank">Subversion project
-site. If you are looking for guidance on setting up and
-installing Subversion, please read the ASF http://www.apache.org/dev/version-control.html"; target=
-"_blank">Source Code Repositories page.
-
-Checkout Axis2 from Subversion
-To check out the latest version of Axis2 from the Foundation's
-Subversion repository, you must use one of the following URLs
-depending on your level of access to the Axis2 source code:
-
-If you are not a committer: http://svn.apache.org/repos/asf/webservices/axis2/trunk/java";
-target=
-"_blank">http://svn.apache.org/repos/asf/webservices/axis2/trunk/java
-If you are a committer: https://svn.apache.org/repos/asf/webservices/axis2/trunk/java";
-target=
-"_blank">https://svn.apache.org/repos/asf/webservices/axis2/trunk/java
-
-If you are a committer, make sure that you have selected an
-svnpasswd. To do this, you must log into svn.apache.org. For more
-information, please read the ASF http://www.apache.org/dev/version-control.html"; target=
-"_blank">Source Code Repositories page.
-Once you have successfully installed Subversion, you can check
-out Axis2 trunk by following these steps:
-
-Run svn co <repository URL> axis2 where
-the repository URL is one of the URLs from the previous list.
-This step will check out the latest version of the Axis2 Java
-codebase to a directory named "axis2". The second parameter to the
-svn co selects a directory to create on your local
-machine. If you want to checkout Axis2 to a different directory,
-feel free to change axis2 to any other directory name.
-To update your working copy to the latest version from the
-repository, execute the svn update command.
-If you would like to submit a patch, you can execute
-svn diff to create a unified diff for submission
-to the Axis2 JIRA issue tracker.
-
-
-Installing Maven 2
-Axis2's build is based on Maven 2. Maven is a build system that
-allows for the reuse of common build projects across multiple
-projects. For information about obtaining, installing, and
-configuring Maven 2, please see the http://maven.apache.org"; target="_blank">Maven project page.
-To use Maven to build the Axis2 project, Please install http://maven.apache.org/download.html"; target=
-"_blank">Maven2 and follow instructions here -  Quick Guide to Maven for Axis 2.0.
-
-Configuring your IDE
-The Axis2 development team uses a variety of development tools
-from vi to emacs to eclipse to Intellij/IDEA. The following section
-is not an endorsement of a specific set of tools, it is simply
-meant as a pointer to ease the process of getting started with
-Axis2 development.
-
-Intellij IDEA - type mvn
-idea:idea. Generates the necessary IDEA .ipr, .iml
-and .iws project files
-Eclipse- type mvn eclipse:eclipse. Then 
in Eclipse, setup a Classpath Variable
-for MAVEN_REPO, and select File > Import > Existing Projects
-into Workspace > Select root directory. Selecting the root of
-the Axis source discovers all the modules and allows them to be
-imported as individual projects at once.
-
-
-
+http://maven.apache.org/XDOC/2.0";
+ 

svn commit: r923005 - /axis/axis2/java/core/trunk/modules/documentation/xdocs/svn.xml

[veithen]

Author: veithen
Date: Sun Mar 14 23:24:22 2010
New Revision: 923005

URL: http://svn.apache.org/viewvc?rev=923005&view=rev
Log:
Updated the instructions for import of the Axis2 sources into Eclipse.

Modified:
axis/axis2/java/core/trunk/modules/documentation/xdocs/svn.xml

Modified: axis/axis2/java/core/trunk/modules/documentation/xdocs/svn.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/documentation/xdocs/svn.xml?rev=923005&r1=923004&r2=923005&view=diff
==
--- axis/axis2/java/core/trunk/modules/documentation/xdocs/svn.xml (original)
+++ axis/axis2/java/core/trunk/modules/documentation/xdocs/svn.xml Sun Mar 14 
23:24:22 2010
@@ -99,21 +99,61 @@
 
 
 The Axis2 development team uses a variety of development tools
-from vi to emacs to eclipse to Intellij/IDEA. The following 
section
+from vi to emacs to Eclipse to Intellij/IDEA. The following 
section
 is not an endorsement of a specific set of tools, it is simply
 meant as a pointer to ease the process of getting started with
 Axis2 development.
 
-
-Intellij IDEA - type mvn
-idea:idea. Generates the necessary IDEA .ipr, .iml
-and .iws project files
-Eclipse- type mvn 
eclipse:eclipse. Then in Eclipse, setup a Classpath Variable
-for MAVEN_REPO, and select File > Import > Existing 
Projects
-into Workspace > Select root directory. Selecting the root 
of
-the Axis source discovers all the modules and allows them to be
-imported as individual projects at once.
-
+
+
+Type mvn idea:idea. Generates the 
necessary IDEA .ipr, .iml
+and .iws project files.
+
+
+
+
+We recommend using http://maven.apache.org/plugins/maven-eclipse-plugin/";>maven-eclipse-plugin
+to import the Axis2 sources into Eclipse. This works best 
with the following
+combinations of versions and settings:
+
+
+
+Early versions of Maven 2 have issues with non 
standard packagings
+(bundle, aar and mar in the 
case of Axis2)
+in multi-module builds. While this has no impact on 
the normal Maven
+build, it prevents the Maven Eclipse plugin from 
identifying modules
+with these packagings as Java projects. Therefore it 
is recommended
+to use Maven 2.2.x to execute the Maven Eclipse plugin.
+
+
+By default, the Maven Eclipse plugin only imports 
generated sources
+and resources created during the 
generate-sources and
+generate-resources phases, but fails to 
locate them if they
+are generated during the 
generate-test-sources and
+generate-test-resources phases. This is due 
to a limitation in Maven 2 (see
+http://jira.codehaus.org/browse/MECLIPSE-37";>MECLIPSE-37
+for more information). Therefore it is recommended to 
execute the
+eclipse:eclipse goal after the 
process-test-resources
+phase.
+
+
+There is a bug in the Maven Eclipse plugin version 2.8 
that causes
+it to fail on the Axis2 sources. However, version 2.7 
is known to work.
+
+
+
+To summarize, use the following command to prepare the 
Axis2 sources for
+import into Eclipse:
+
+mvn process-test-resources 
org.apache.maven.plugins:maven-eclipse-plugin:2.7:eclipse
+
+As usual, before importing the projects into Eclipse, 
check that a Classpath Variable
+for M2_REPO is configured in Eclipse. Then select 
File > Import > Existing Projects
+into Workspace > Select root directory. Selecting the 
root of
+the Axis source discovers all the modules and allows them 
to be
+imported as individual projects at once.
+
+
 
 
 

svn commit: r923194 - in /axis/axis2/java/core/trunk/modules: java2wsdl/pom.xml tool/axis2-ant-plugin/pom.xml

[veithen]

Author: veithen
Date: Mon Mar 15 12:37:25 2010
New Revision: 923194

URL: http://svn.apache.org/viewvc?rev=923194&view=rev
Log:
Fixed a build failure with maven.test.skip=true.

Modified:
axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml
axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml

Modified: axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml?rev=923194&r1=923193&r2=923194&view=diff
==
--- axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml Mon Mar 15 12:37:25 
2010
@@ -135,7 +135,7 @@
 
 test
 
-
+
 
 
 
@@ -169,6 +169,11 @@
 
 import groovy.xml.*
 
+if (project.properties['maven.test.skip']) {
+println 'Tests are skipped'
+return
+}
+
 def parser = new XmlParser()
 def wsdl = new 
Namespace('http://schemas.xmlsoap.org/wsdl/')
 def xs = new 
Namespace('http://www.w3.org/2001/XMLSchema')

Modified: axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml?rev=923194&r1=923193&r2=923194&view=diff
==
--- axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml Mon Mar 15 
12:37:25 2010
@@ -119,7 +119,7 @@
 
 test
 
-
+
 
 
 
@@ -174,6 +174,11 @@
 
 import groovy.xml.*
 
+if (project.properties['maven.test.skip']) {
+println 'Tests are skipped'
+return
+}
+
 def parser = new XmlParser()
 def wsdl = new 
Namespace('http://schemas.xmlsoap.org/wsdl/')
 def xs = new 
Namespace('http://www.w3.org/2001/XMLSchema')

svn commit: r923385 - /axis/axis2/java/core/trunk/modules/jaxws-integration/test-resources/log4j.properties

[veithen]

Author: veithen
Date: Mon Mar 15 18:44:17 2010
New Revision: 923385

URL: http://svn.apache.org/viewvc?rev=923385&view=rev
Log:
Temporarily increasing the log level in jaxws-integration in an attempt to 
understand why the execution of a single test sometimes takes up to 500 seconds 
on Hudson.

Modified:

axis/axis2/java/core/trunk/modules/jaxws-integration/test-resources/log4j.properties

Modified: 
axis/axis2/java/core/trunk/modules/jaxws-integration/test-resources/log4j.properties
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/test-resources/log4j.properties?rev=923385&r1=923384&r2=923385&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/jaxws-integration/test-resources/log4j.properties
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws-integration/test-resources/log4j.properties
 Mon Mar 15 18:44:17 2010
@@ -18,10 +18,10 @@
 #
 
 # Set root category priority to INFO and its only appender to CONSOLE.
-#log4j.rootCategory=DEBUG, CONSOLE
+log4j.rootCategory=DEBUG
 #log4j.rootCategory=DEBUG, CONSOLE, LOGFILE
 #log4j.rootCategory=DEBUG, LOGFILE
-log4j.rootCategory=ERROR, CONSOLE
+#log4j.rootCategory=ERROR, CONSOLE
 
 # Set selected logging
 # (You might want to do this to cut down on the size of the file)
@@ -58,4 +58,4 @@ log4j.appender.SMALL=org.apache.log4j.Fi
 log4j.appender.SMALL.File=axis2.small.log
 log4j.appender.SMALL.Append=true
 log4j.appender.SMALL.layout=org.apache.log4j.PatternLayout
-log4j.appender.SMALL.layout.ConversionPattern=%d [%t] %-5p %c %x - %m%n
\ No newline at end of file
+log4j.appender.SMALL.layout.ConversionPattern=%d [%t] %-5p %c %x - %m%n

svn commit: r923427 - /axis/axis2/java/core/trunk/modules/jaxws-integration/test-resources/log4j.properties

[veithen]

Author: veithen
Date: Mon Mar 15 20:43:52 2010
New Revision: 923427

URL: http://svn.apache.org/viewvc?rev=923427&view=rev
Log:
Reverted temporary log level increase. Unable to reproduce the problem for the 
moment.

Modified:

axis/axis2/java/core/trunk/modules/jaxws-integration/test-resources/log4j.properties

Modified: 
axis/axis2/java/core/trunk/modules/jaxws-integration/test-resources/log4j.properties
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/test-resources/log4j.properties?rev=923427&r1=923426&r2=923427&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/jaxws-integration/test-resources/log4j.properties
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws-integration/test-resources/log4j.properties
 Mon Mar 15 20:43:52 2010
@@ -18,10 +18,10 @@
 #
 
 # Set root category priority to INFO and its only appender to CONSOLE.
-log4j.rootCategory=DEBUG
+#log4j.rootCategory=DEBUG, CONSOLE
 #log4j.rootCategory=DEBUG, CONSOLE, LOGFILE
 #log4j.rootCategory=DEBUG, LOGFILE
-#log4j.rootCategory=ERROR, CONSOLE
+log4j.rootCategory=ERROR, CONSOLE
 
 # Set selected logging
 # (You might want to do this to cut down on the size of the file)
@@ -58,4 +58,4 @@ log4j.appender.SMALL=org.apache.log4j.Fi
 log4j.appender.SMALL.File=axis2.small.log
 log4j.appender.SMALL.Append=true
 log4j.appender.SMALL.layout=org.apache.log4j.PatternLayout
-log4j.appender.SMALL.layout.ConversionPattern=%d [%t] %-5p %c %x - %m%n
+log4j.appender.SMALL.layout.ConversionPattern=%d [%t] %-5p %c %x - %m%n
\ No newline at end of file

svn commit: r923502 - in /axis/axis2/java/core/trunk/modules/adb-codegen: ./ test-resources/testsuite/ test/org/apache/axis2/schema/testsuite/

[veithen]

Author: veithen
Date: Mon Mar 15 23:15:50 2010
New Revision: 923502

URL: http://svn.apache.org/viewvc?rev=923502&view=rev
Log:
ADB test cases: Changed the name and target namespace of complete.xsd to match 
the package name where the unit tests are located. This makes it easier to 
navigate the tests and will also allow to write test cases that access 
protected attributes.

Added:

axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/testsuite/testsuite.xsd
  - copied, changed from r923466, 
axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/testsuite/complete.xsd
Removed:

axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/testsuite/complete.xsd
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/sub-build.xml

axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/AbstractTest.java

axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/AnyElementsTest.java

axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/CustomElementsTest.java

axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/IntElementsTest.java

axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/OuterElementsTest.java

axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/StringElementsTest.java

axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/XsdAnyElementsTest.java

Modified: axis/axis2/java/core/trunk/modules/adb-codegen/sub-build.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/sub-build.xml?rev=923502&r1=923501&r2=923502&view=diff
==
--- axis/axis2/java/core/trunk/modules/adb-codegen/sub-build.xml (original)
+++ axis/axis2/java/core/trunk/modules/adb-codegen/sub-build.xml Mon Mar 15 
23:15:50 2010
@@ -54,7 +54,7 @@



-   
+   




Copied: 
axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/testsuite/testsuite.xsd
 (from r923466, 
axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/testsuite/complete.xsd)
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/testsuite/testsuite.xsd?p2=axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/testsuite/testsuite.xsd&p1=axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/testsuite/complete.xsd&r1=923466&r2=923502&rev=923502&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/testsuite/complete.xsd
 (original)
+++ 
axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/testsuite/testsuite.xsd
 Mon Mar 15 23:15:50 2010
@@ -17,9 +17,9 @@
   ~ under the License.
   -->
 
-http://types.echo.services";
+http://apache.org/axis2/schema/testsuite";
 xmlns="http://www.w3.org/2001/XMLSchema";
-xmlns:tns="http://types.echo.services";
+xmlns:tns="http://apache.org/axis2/schema/testsuite";
 xmlns:xsd="http://www.w3.org/2001/XMLSchema";
 elementFormDefault="qualified">
 

Modified: 
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/AbstractTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/AbstractTest.java?rev=923502&r1=923501&r2=923502&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/AbstractTest.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/AbstractTest.java
 Mon Mar 15 23:15:50 2010
@@ -25,9 +25,6 @@ import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.OMNamespace;
 import org.apache.axis2.schema.AbstractTestCase;
 
-import services.echo.types.BookInformation;
-
-
 public class AbstractTest  extends AbstractTestCase {
 
  protected OMElement getOMElement(){

Modified: 
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/AnyElementsTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/AnyElementsTest.java?rev=923502&r1=923501&r2=923502&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsui

svn commit: r923503 - /axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/TrackerTest.java

[veithen]

Author: veithen
Date: Mon Mar 15 23:17:15 2010
New Revision: 923503

URL: http://svn.apache.org/viewvc?rev=923503&view=rev
Log:
Added some test coverage for the things that need to be changed to fix 
AXIS2-4640.

Added:

axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/TrackerTest.java
   (with props)

Added: 
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/TrackerTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/TrackerTest.java?rev=923503&view=auto
==
--- 
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/TrackerTest.java
 (added)
+++ 
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/TrackerTest.java
 Mon Mar 15 23:17:15 2010
@@ -0,0 +1,107 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.axis2.schema.testsuite;
+
+import junit.framework.TestCase;
+
+public class TrackerTest extends TestCase {
+public void testInt1WithNonNullValue() {
+TestInt1 bean = new TestInt1();
+assertFalse(bean.localTestValueTracker);
+bean.setTestValue(new int[] { 123 });
+assertTrue(bean.localTestValueTracker);
+}
+
+public void testInt1WithNullValue() {
+TestInt1 bean = new TestInt1();
+assertFalse(bean.localTestValueTracker);
+bean.setTestValue(null);
+assertTrue(bean.localTestValueTracker);
+}
+
+public void testInt2() {
+TestInt2 bean = new TestInt2();
+assertFalse(bean.localTestValueTracker);
+bean.setTestValue(1234);
+assertTrue(bean.localTestValueTracker);
+}
+
+public void testInt2WithMinValue() {
+TestInt2 bean = new TestInt2();
+assertFalse(bean.localTestValueTracker);
+bean.setTestValue(Integer.MIN_VALUE);
+assertTrue(bean.localTestValueTracker);
+}
+
+public void testInt3WithNonNullValue() {
+TestInt3 bean = new TestInt3();
+assertFalse(bean.localTestValueTracker);
+bean.setTestValue(new int[] { 123 });
+assertTrue(bean.localTestValueTracker);
+}
+
+public void testInt3WithNullValue() {
+TestInt3 bean = new TestInt3();
+assertFalse(bean.localTestValueTracker);
+bean.setTestValue(null);
+assertFalse(bean.localTestValueTracker);
+}
+
+public void testInt4() {
+TestInt4 bean = new TestInt4();
+assertFalse(bean.localTestValueTracker);
+bean.setTestValue(1234);
+assertTrue(bean.localTestValueTracker);
+}
+
+public void testInt4WithMinValue() {
+TestInt4 bean = new TestInt4();
+assertFalse(bean.localTestValueTracker);
+bean.setTestValue(Integer.MIN_VALUE);
+assertFalse(bean.localTestValueTracker);
+}
+
+public void testString2WithNonNullValue() {
+TestString2 bean = new TestString2();
+assertFalse(bean.localTestValueTracker);
+bean.setTestValue("test");
+assertTrue(bean.localTestValueTracker);
+}
+
+public void testString2WithNullValue() {
+TestString2 bean = new TestString2();
+assertFalse(bean.localTestValueTracker);
+bean.setTestValue(null);
+assertTrue(bean.localTestValueTracker);
+}
+
+public void testString4WithNonNullValue() {
+TestString4 bean = new TestString4();
+assertFalse(bean.localTestValueTracker);
+bean.setTestValue("test");
+assertTrue(bean.localTestValueTracker);
+}
+
+public void testString4WithNullValue() {
+TestString4 bean = new TestString4();
+assertFalse(bean.localTestValueTracker);
+bean.setTestValue(null);
+assertFalse(bean.localTestValueTracker);
+}
+}

Propchange: 
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/TrackerTest.java
--
svn:eol-style = native

svn commit: r925617 - /axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl

[veithen]

Author: veithen
Date: Sat Mar 20 14:48:51 2010
New Revision: 925617

URL: http://svn.apache.org/viewvc?rev=925617&view=rev
Log:
Propagated change r822738 from ADBBeanTemplate-bean.xsl to 
ADBBeanTemplate-helpermode.xsl.

Modified:

axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl

Modified: 
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl?rev=925617&r1=925616&r2=925617&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl
 (original)
+++ 
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl
 Sat Mar 20 14:48:51 2010
@@ -888,13 +888,16 @@ public 
 
-if (!=null)
-{
+if (!=null)  {
try {

org.apache.axiom.util.stax.XMLStreamWriterUtils.writeDataHandler(xmlWriter, 
, null, true);
} catch (java.io.IOException ex) {
throw new 
javax.xml.stream.XMLStreamException("Unable to read data handler for 
", ex);
}
+} else {
+ 
+ 
writeAttribute("xsi","http://www.w3.org/2001/XMLSchema-instance","nil","1",xmlWriter);
+ 
 }
  
  
@@ -1971,7 +1974,18 @@ public 
-object.set(org.apache.axiom.util.stax.XMLStreamReaderUtils.getDataHandlerFromElement(reader));
+
+
+nillableValue = 
reader.getAttributeValue("http://www.w3.org/2001/XMLSchema-instance","nil";);
+if ("true".equals(nillableValue) || 
"1".equals(nillableValue)){
+ object.set(null);
+ reader.next();
+} else {
+
+object.set(org.apache.axiom.util.stax.XMLStreamReaderUtils.getDataHandlerFromElement(reader));
+
+}
+
 
   
 reader.next();

svn commit: r925627 - /axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml

[veithen]

Author: veithen
Date: Sat Mar 20 15:21:04 2010
New Revision: 925627

URL: http://svn.apache.org/viewvc?rev=925627&view=rev
Log:
Fixed formatting.

Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml

Modified: axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml?rev=925627&r1=925626&r2=925627&view=diff
==
--- axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml Sat Mar 20 15:21:04 
2010
@@ -107,13 +107,13 @@
 
 

- org.apache.maven.plugins
- maven-compiler-plugin
- 
-   true
-   128m
-   256m
- 
+   org.apache.maven.plugins
+   maven-compiler-plugin
+   
+   true
+   128m
+   256m
+   

 
 org.apache.maven.plugins

svn commit: r925648 - in /axis/axis2/java/core/trunk/modules/adb-codegen: ./ src/org/apache/axis2/schema/template/ test/helper/ test/helper/org/ test/helper/org/apache/ test/helper/org/apache/axis2/ t

[veithen]

Author: veithen
Date: Sat Mar 20 18:19:35 2010
New Revision: 925648

URL: http://svn.apache.org/viewvc?rev=925648&view=rev
Log:
Propagated some old changes from ADBBeanTemplate-bean.xsl to 
ADBBeanTemplate-helpermode.xsl to make sure that tracker attributes are updated 
in the same way. Also added a test case.

Added:
axis/axis2/java/core/trunk/modules/adb-codegen/test/helper/
axis/axis2/java/core/trunk/modules/adb-codegen/test/helper/org/
axis/axis2/java/core/trunk/modules/adb-codegen/test/helper/org/apache/
axis/axis2/java/core/trunk/modules/adb-codegen/test/helper/org/apache/axis2/

axis/axis2/java/core/trunk/modules/adb-codegen/test/helper/org/apache/axis2/schema/

axis/axis2/java/core/trunk/modules/adb-codegen/test/helper/org/apache/axis2/schema/testsuite/

axis/axis2/java/core/trunk/modules/adb-codegen/test/helper/org/apache/axis2/schema/testsuite/TrackerTest.java
   (with props)
Modified:
axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml

axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl
axis/axis2/java/core/trunk/modules/adb-codegen/sub-build.xml

axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/testsuite/TrackerTest.java

Modified: axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml?rev=925648&r1=925647&r2=925648&view=diff
==
--- axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/adb-codegen/pom.xml Sat Mar 20 18:19:35 
2010
@@ -113,6 +113,9 @@
true
128m
256m
+
+
helper/org/apache/axis2/schema/testsuite/TestAnyType*Helper.java
+


 

Modified: 
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl?rev=925648&r1=925647&r2=925648&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl
 (original)
+++ 
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl
 Sat Mar 20 18:19:35 2010
@@ -34,6 +34,7 @@
 
 
 
+
 
 Helper
 
@@ -435,7 +436,43 @@
 

// setting primitive attribute tracker 
to true
-= true;
+   
+   
+  if (false) {
+   
+   
+   if 
(param==java.lang.Integer.MIN_VALUE) {
+   
+   
+   if 
(param==java.lang.Long.MIN_VALUE) {
+   
+   
+   if 
(param==java.lang.Byte.MIN_VALUE) {
+   
+   
+   if 
(java.lang.Double.isNaN(param)) {
+   
+   
+   if 
(java.lang.Float.isNaN(param)) {
+   
+   
+   if 
(param==java.lang.Short.MIN_VALUE) {
+   
+   
+   if (false) {
+   
+   
+
+  
+   = true;
+  
+  
+   = false;
+  
+  
+   } else {
+ 

svn commit: r925662 - in /axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template: ADBBeanTemplate-bean.xsl ADBBeanTemplate-helpermode.xsl

[veithen]

Author: veithen
Date: Sat Mar 20 19:33:19 2010
New Revision: 925662

URL: http://svn.apache.org/viewvc?rev=925662&view=rev
Log:
AXIS2-4640: Optimized code generation for tracker attribute updates in ADB.

Modified:

axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl

axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-helpermode.xsl

Modified: 
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl?rev=925662&r1=925661&r2=925662&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
 (original)
+++ 
axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
 Sat Mar 20 19:33:19 2010
@@ -182,30 +182,19 @@
   clearAllSettingTrackers();
  
  
-
 
-   
-   // setting primitive variable always to true
+   
+   
 = 
true;


-   if (param != null){
-  //update the setting tracker
-   
= true;
-   } else {
-  
-  
-   = true;
-  
-  
-   = false;
-  
-  
-   }
+= 
param != null;

 
  
@@ -358,30 +347,19 @@
clearAllSettingTrackers();


-   
   
-  
-  // setting the primitive attribute 
to true
+   
+  
= true;
   
   
-  if (param != null){
- //update the setting tracker
-  = true;
-  } else {
- 
- 
-  = true;
- 
- 
-  = false;
- 
- 
-  }
+   = param != null;
   

 
@@ -440,60 +418,25 @@
 
 
 
+   
+= true;
+   

// setting primitive attribute tracker 
to true
+=

-   
-  if (false) {
-   
-   
-   if 
(param==java.lang.Integer.MIN_VALUE) {
-   
-   
-   if 
(param==java.lang.Long.MIN_VALUE) {
-   
-   
-   if 
(param==java.lan

svn commit: r926359 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java

[veithen]

Author: veithen
Date: Mon Mar 22 21:44:21 2010
New Revision: 926359

URL: http://svn.apache.org/viewvc?rev=926359&view=rev
Log:
AXIS2-4659: Applied the patch contributed by Sidath Dissanayake to fix an 
obvious typo in ModuleBuilder.

Modified:

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java?rev=926359&r1=926358&r2=926359&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/ModuleBuilder.java
 Mon Mar 22 21:44:21 2010
@@ -177,7 +177,7 @@ public class ModuleBuilder extends Descr
 Iterator policyRefElements =
 moduleElement.getChildrenWithName(new QName(POLICY_NS_URI, 
TAG_POLICY_REF));
 
-if (policyRefElements != null && policyElements.hasNext()) {
+if (policyRefElements != null && policyRefElements.hasNext()) {
 processPolicyRefElements(policyRefElements, 
module.getPolicySubject());
 }
 

svn commit: r926384 - /axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLCodegenEngine.java

[veithen]

Author: veithen
Date: Mon Mar 22 23:04:27 2010
New Revision: 926384

URL: http://svn.apache.org/viewvc?rev=926384&view=rev
Log:
AXIS2-4660: Added a syntax check for the p2n option.

Modified:

axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLCodegenEngine.java

Modified: 
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLCodegenEngine.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLCodegenEngine.java?rev=926384&r1=926383&r2=926384&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLCodegenEngine.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/java2wsdl/src/org/apache/ws/java2wsdl/Java2WSDLCodegenEngine.java
 Mon Mar 22 23:04:27 2010
@@ -263,7 +263,7 @@ public class Java2WSDLCodegenEngine impl
 
 }
 
-protected Map 
loadJavaPkg2NamespaceMap(Java2WSDLCommandLineOption option) 
+protected Map 
loadJavaPkg2NamespaceMap(Java2WSDLCommandLineOption option) throws Exception 
 { 
 Map pkg2nsMap = new Hashtable();
 if (option != null) 
@@ -277,8 +277,14 @@ public class Java2WSDLCodegenEngine impl
 //an option value will be of the form [java package, namespace]
 //hence we take the two substrings starting after '[' and upto 
',' and
 //starting after ',' and upto ']'
-pkg2nsMap.put(anOptionValue.substring(1, 
anOptionValue.indexOf(COMMA)).trim(),
-
anOptionValue.substring(anOptionValue.indexOf(COMMA) + 1, 
anOptionValue.length() - 1).trim()); 
+if (anOptionValue.charAt(0) == '[' && 
anOptionValue.charAt(anOptionValue.length()-1) == ']') {
+pkg2nsMap.put(anOptionValue.substring(1, 
anOptionValue.indexOf(COMMA)).trim(),
+
anOptionValue.substring(anOptionValue.indexOf(COMMA) + 1, 
anOptionValue.length() - 1).trim());
+} else {
+throw new Exception("Invalid syntax for the " + 
Java2WSDLConstants.JAVA_PKG_2_NSMAP_OPTION
++ " (" + 
Java2WSDLConstants.JAVA_PKG_2_NSMAP_OPTION_LONG
++ ") option; must be [package,namespace]");
+}
 }
 }
 return pkg2nsMap;

svn commit: r927168 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java

[veithen]

Author: veithen
Date: Wed Mar 24 19:51:40 2010
New Revision: 927168

URL: http://svn.apache.org/viewvc?rev=927168&view=rev
Log:
AXIS2-4618: Applied fix suggested by Dave Lindquist; populateAxisConfiguration 
is called later on and this causes a stream closed error if the location of 
axis2.xml is specified as URL.

Modified:

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java?rev=927168&r1=927167&r2=927168&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java
 Wed Mar 24 19:51:40 2010
@@ -121,7 +121,6 @@ public class WarBasedAxisConfigurator ex
 String axisurl = 
config.getInitParameter(PARAM_AXIS2_XML_URL);
 if (axisurl != null) {
 axis2Stream = new URL(axisurl).openStream();
-axisConfig = populateAxisConfiguration(axis2Stream);
 log.debug("loading axis2.xml from URL: " + axisurl);
 }
 }

svn commit: r927948 - in /axis/axis2/java/core/trunk/modules: java2wsdl/pom.xml tool/axis2-ant-plugin/pom.xml

[veithen]

Author: veithen
Date: Fri Mar 26 16:19:57 2010
New Revision: 927948

URL: http://svn.apache.org/viewvc?rev=927948&view=rev
Log:
AXIS2-4664: Upgraded gmaven plugin to 1.2 to avoid build failure on IBM JRE. 
Tested with WAS7 runtime.

Modified:
axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml
axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml

Modified: axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml?rev=927948&r1=927947&r2=927948&view=diff
==
--- axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml Fri Mar 26 16:19:57 
2010
@@ -156,9 +156,9 @@
 
 
 
-org.codehaus.groovy.maven
+org.codehaus.gmaven
 gmaven-plugin
-1.0
+1.2
 
 
 test

Modified: axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml?rev=927948&r1=927947&r2=927948&view=diff
==
--- axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/pom.xml Fri Mar 26 
16:19:57 2010
@@ -161,9 +161,9 @@
 
 
 
-org.codehaus.groovy.maven
+org.codehaus.gmaven
 gmaven-plugin
-1.0
+1.2
 
 
 test

svn commit: r928643 - in /axis/axis2/java/core/trunk/modules: jaxbri/pom.xml jibx/pom.xml kernel/pom.xml samples/pom.xml soapmonitor/module/pom.xml soapmonitor/servlet/pom.xml spring/pom.xml

[veithen]

Author: veithen
Date: Mon Mar 29 08:45:04 2010
New Revision: 928643

URL: http://svn.apache.org/viewvc?rev=928643&view=rev
Log:
Fixed some project.description entries in POM files.

Modified:
axis/axis2/java/core/trunk/modules/jaxbri/pom.xml
axis/axis2/java/core/trunk/modules/jibx/pom.xml
axis/axis2/java/core/trunk/modules/kernel/pom.xml
axis/axis2/java/core/trunk/modules/samples/pom.xml
axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml
axis/axis2/java/core/trunk/modules/soapmonitor/servlet/pom.xml
axis/axis2/java/core/trunk/modules/spring/pom.xml

Modified: axis/axis2/java/core/trunk/modules/jaxbri/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxbri/pom.xml?rev=928643&r1=928642&r2=928643&view=diff
==
--- axis/axis2/java/core/trunk/modules/jaxbri/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jaxbri/pom.xml Mon Mar 29 08:45:04 2010
@@ -30,7 +30,7 @@
 
 axis2-jaxbri
 Apache Axis2 - JAXB-RI Data Binding
-JAXB-RI data binding support for Axis 2.0
+JAXB-RI data binding support for Axis2
 
 
 org.apache.axis2

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=928643&r1=928642&r2=928643&view=diff
==
--- axis/axis2/java/core/trunk/modules/jibx/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jibx/pom.xml Mon Mar 29 08:45:04 2010
@@ -30,7 +30,7 @@
 
 axis2-jibx
 Apache Axis2 - JiBX Data Binding
-JiBX data binding support for Axis 2.0
+JiBX data binding support for Axis2
 
 
 org.apache.axis2

Modified: axis/axis2/java/core/trunk/modules/kernel/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/pom.xml?rev=928643&r1=928642&r2=928643&view=diff
==
--- axis/axis2/java/core/trunk/modules/kernel/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/kernel/pom.xml Mon Mar 29 08:45:04 2010
@@ -30,7 +30,7 @@
 
 axis2-kernel
 Apache Axis2 - Kernel
-Core Parts of Axis 2.0. This includes Axis 2.0 engine, Client 
API, Addressing support, etc.,
+Core Parts of Axis2. This includes Axis2 engine, Client API, 
Addressing support, etc.,
 
 
 

Modified: axis/axis2/java/core/trunk/modules/samples/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/pom.xml?rev=928643&r1=928642&r2=928643&view=diff
==
--- axis/axis2/java/core/trunk/modules/samples/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/samples/pom.xml Mon Mar 29 08:45:04 2010
@@ -30,8 +30,7 @@
 
 axis2-samples
 Apache Axis2 - Samples
-Core Parts of Axis 2.0. This includes Axis 2.0 engine, Client 
API, Addressing support, etc.,
-
+Axis2 samples
 
 
 javax.servlet

Modified: axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml?rev=928643&r1=928642&r2=928643&view=diff
==
--- axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/soapmonitor/module/pom.xml Mon Mar 29 
08:45:04 2010
@@ -31,7 +31,7 @@
 soapmonitor
 mar
 Apache Axis2 - SOAP Monitor Module
-soapmonitor module for Axis 2.0
+soapmonitor module for Axis2
 
 
 org.apache.axis2

Modified: axis/axis2/java/core/trunk/modules/soapmonitor/servlet/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/soapmonitor/servlet/pom.xml?rev=928643&r1=928642&r2=928643&view=diff
==
--- axis/axis2/java/core/trunk/modules/soapmonitor/servlet/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/soapmonitor/servlet/pom.xml Mon Mar 29 
08:45:04 2010
@@ -31,7 +31,7 @@
 soapmonitor-servlet
 jar
 Apache Axis2 - SOAP Monitor Servlet
-soapmonitor servlet for Axis 2.0
+soapmonitor servlet for Axis2
 
 
 javax.servlet

Modified: axis/axis2/java/core/trunk/modules/spring/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/spring/pom.xml?rev=928643&r1=928642&r2=928643&view=diff
==
--- axis/axis2/java/core/trunk/modules/spring/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/spring/pom.xml Mon M

svn commit: r928727 - in /axis/axis2/java/core/scratch/java/veithen/spring: ./ axis2-spring-core/ axis2-spring-core/src/ axis2-spring-core/src/main/ axis2-spring-core/src/main/java/ axis2-spring-core/

[veithen]

Author: veithen
Date: Mon Mar 29 11:44:48 2010
New Revision: 928727

URL: http://svn.apache.org/viewvc?rev=928727&view=rev
Log:
AXIS2-4662: Added some Spring related PoC code to my scratch area.

Added:
axis/axis2/java/core/scratch/java/veithen/spring/
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/pom.xml  
 (with props)
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/AxisConfigurationBeanFactoryPostProcessor.java
   (with props)

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/AxisConfigurationFactory.java
   (with props)

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/AxisConfigurationParser.java
   (with props)

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/Constants.java
   (with props)

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/NamespaceHandler.java
   (with props)

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/TransportInDescriptionFactory.java
   (with props)

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/TransportReceiverParser.java
   (with props)

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/resources/

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/resources/META-INF/

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/resources/META-INF/spring.handlers

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/resources/META-INF/spring.schemas

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/resources/schemas/

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/resources/schemas/spring-axis2.xsd
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/test/

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/test/java/

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/test/java/org/

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/test/java/org/apache/

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/test/java/org/apache/axis2/

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/test/java/org/apache/axis2/spring/

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/test/java/org/apache/axis2/spring/DummyTransportListener.java
   (with props)

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/test/java/org/apache/axis2/spring/MultiConfigurationTest.java
   (with props)

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/test/resources/

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/test/resources/multi_configuration.xml
   (with props)

Added: 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/pom.xml?rev=928727&view=auto
==
--- axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/pom.xml 
(added)
+++ axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/pom.xml 
Mon Mar 29 11:44:48 2010
@@ -0,0 +1,86 @@
+
+
+http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+4.0.0
+
+org.apache.axis2
+axis2-parent
+SNAPSHOT
+
+
+axis2-spring-core
+Apache Axis2 - Spring - Core
+Spring support for Axis2
+
+
+org.apache.axis2
+axis2-kernel
+${project.version}
+
+
+org.spri

svn commit: r928819 - in /axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src: main/java/org/apache/axis2/spring/ main/resources/schemas/ test/java/org/apache/axis2/spring/ test/res

[veithen]

Author: veithen
Date: Mon Mar 29 16:05:30 2010
New Revision: 928819

URL: http://svn.apache.org/viewvc?rev=928819&view=rev
Log:
AXIS2-4662: Some refactorings to the PoC code to support the standalone 
scenario, i.e. to create a ListenerManager using Spring.

Added:

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/ConfigurationContextFactoryBean.java
  - copied, changed from r928727, 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/AxisConfigurationFactory.java

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/ConfigurationContextParser.java
  - copied, changed from r928727, 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/AxisConfigurationParser.java

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/ListenerManagerFactoryBean.java
   (with props)

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/ListenerManagerParser.java
   (with props)
Removed:

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/AxisConfigurationFactory.java

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/AxisConfigurationParser.java
Modified:

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/AxisConfigurationBeanFactoryPostProcessor.java

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/Constants.java

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/NamespaceHandler.java

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/TransportReceiverParser.java

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/resources/schemas/spring-axis2.xsd

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/test/java/org/apache/axis2/spring/MultiConfigurationTest.java

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/test/resources/multi_configuration.xml

Modified: 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/AxisConfigurationBeanFactoryPostProcessor.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/AxisConfigurationBeanFactoryPostProcessor.java?rev=928819&r1=928818&r2=928819&view=diff
==
--- 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/AxisConfigurationBeanFactoryPostProcessor.java
 (original)
+++ 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/AxisConfigurationBeanFactoryPostProcessor.java
 Mon Mar 29 16:05:30 2010
@@ -23,8 +23,8 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.description.TransportInDescription;
-import org.apache.axis2.engine.AxisConfiguration;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.PropertyValue;
 import org.springframework.beans.factory.config.BeanDefinition;
@@ -32,46 +32,47 @@ import org.springframework.beans.factory
 import 
org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.config.RuntimeBeanReference;
 import org.springframework.beans.factory.support.ManagedList;
+import org.springframework.util.StringUtils;
 
 public class AxisConfigurationBeanFactoryPostProcessor implements 
BeanFactoryPostProcessor {
 public void postProcessBeanFactory(ConfigurableListableBeanFactory 
beanFactory) throws BeansException {
-Map axisConfigurations = new 
HashMap();
-for (String name : 
beanFactory.getBeanNamesForType(AxisConfiguration.class)) {
-axisConfigurations.put(name, beanFactory.getBeanDefinition(name));
+Map configurationContextMap = new 
HashMap();
+for (String name : 
beanFactory.getBeanNamesForType(ConfigurationContext.class)) {
+configurationContextMap.put(name, 
beanFactory.getBeanDefinition(name));
 }
-processItems(beanFactory, axisConfigurations, 
TransportInDescription.class, "transportInDescriptions");
+processItems(beanFactory, configurationContextMap, 
TransportInDescription.class, "transportInDescriptions");
 }
 
 private void processItems(Configu

svn commit: r928941 - in /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2: deployment/util/Utils.java receivers/AbstractMessageReceiver.java util/Utils.java

[veithen]

Author: veithen
Date: Mon Mar 29 23:43:21 2010
New Revision: 928941

URL: http://svn.apache.org/viewvc?rev=928941&view=rev
Log:
Eliminated some duplicate code originally introduced in r439555 and that has 
grown over time.

Modified:

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/receivers/AbstractMessageReceiver.java

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java?rev=928941&r1=928940&r2=928941&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
 Mon Mar 29 23:43:21 2010
@@ -62,9 +62,7 @@ import javax.xml.namespace.QName;
 import javax.xml.stream.FactoryConfigurationError;
 import javax.xml.stream.XMLStreamException;
 import java.io.*;
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLClassLoader;
@@ -429,60 +427,11 @@ public class Utils {
 public static void fillAxisService(final AxisService axisService,
AxisConfiguration axisConfig, 
ArrayList excludeOperations,
ArrayList nonRpcMethods) throws 
Exception {
-String serviceClass;
-Parameter implInfoParam = axisService
-.getParameter(Constants.SERVICE_CLASS);
-ClassLoader serviceClassLoader = axisService.getClassLoader();
-
-if (implInfoParam != null) {
-serviceClass = (String)implInfoParam.getValue();
-} else {
-// if Service_Class is null, every AbstractMR will look for
-// ServiceObjectSupplier. This is user specific and may contain
-// other looks.
-implInfoParam = axisService
-.getParameter(Constants.SERVICE_OBJECT_SUPPLIER);
-if (implInfoParam != null) {
-String className = ((String)implInfoParam.getValue()).trim();
-final Class serviceObjectMaker = Loader.loadClass(
-serviceClassLoader, className);
-if (serviceObjectMaker.getModifiers() != Modifier.PUBLIC) {
-throw new AxisFault("Service class " + className
-+ " must have public as access 
Modifier");
-}
-
-// Find static getServiceObject() method, call it if there
-final Method method = 
(Method)org.apache.axis2.java.security.AccessController
-.doPrivileged(new PrivilegedExceptionAction() {
-public Object run() throws NoSuchMethodException {
-return serviceObjectMaker.getMethod(
-"getServiceObject",
-AxisService.class);
-}
-});
-Object obj = null;
-if (method != null) {
-obj = org.apache.axis2.java.security.AccessController
-.doPrivileged(new PrivilegedExceptionAction() {
-public Object run()
-throws InstantiationException,
-IllegalAccessException,
-InvocationTargetException {
-return 
method.invoke(serviceObjectMaker.newInstance(),
- axisService);
-}
-});
-}
-if (obj == null) {
-log.warn("ServiceObjectSupplier implmentation Object could 
not be found");
-throw new DeploymentException(
-"ServiceClass or ServiceObjectSupplier 
implmentation Object could not be found");
-}
-serviceClass = obj.getClass().getName();
-} else {
-return;
-}
+Class serviceClass = 
org.apache.axis2.util.Utils.getServiceClass(axisService);
+if (serviceClass == null) {
+return;
 }
+ClassLoader serviceClassLoader = axisService.getClassLoader();
 // adding name space

svn commit: r929077 - in /axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core: ./ src/main/java/org/apache/axis2/spring/ src/main/resources/ src/main/resources/schemas/ src/test/java/or

[veithen]

Author: veithen
Date: Tue Mar 30 10:57:11 2010
New Revision: 929077

URL: http://svn.apache.org/viewvc?rev=929077&view=rev
Log:
AXIS2-4662: Some more PoC code that shows how POJO service deployment with 
Spring could look like.

Added:

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/ParameterUtil.java
   (with props)

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/PojoServiceFactoryBean.java
   (with props)

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/PojoServiceParser.java
   (with props)

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/SpringServiceObjectSupplier.java
   (with props)

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/TransportDescriptionFactoryBean.java
   (with props)

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/TransportInDescriptionFactoryBean.java
  - copied, changed from r928727, 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/TransportInDescriptionFactory.java

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/TransportOutDescriptionFactoryBean.java
   (with props)

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/TransportParser.java
  - copied, changed from r928819, 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/TransportReceiverParser.java

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/resources/axis2_default_spring.xml
   (with props)

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/test/java/org/apache/axis2/spring/WeatherServiceRunner.java
   (with props)

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/test/java/org/apache/axis2/spring/WeatherSpringService.java
   (with props)

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/test/resources/context.xml
   (with props)

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/test/resources/log4j.properties
   (with props)
Removed:

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/TransportInDescriptionFactory.java

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/TransportReceiverParser.java
Modified:
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/pom.xml

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/AxisConfigurationBeanFactoryPostProcessor.java

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/ConfigurationContextFactoryBean.java

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/NamespaceHandler.java

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/resources/schemas/spring-axis2.xsd

Modified: 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/pom.xml?rev=929077&r1=929076&r2=929077&view=diff
==
--- axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/pom.xml 
(original)
+++ axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/pom.xml 
Tue Mar 30 10:57:11 2010
@@ -62,6 +62,17 @@
 ${project.version}
 test
 
+
+org.apache.axis2
+axis2-adb
+${project.version}
+test
+
+
+log4j
+log4j
+test
+
 
 
 

Modified: 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/AxisConfigurationBeanFactoryPostProcessor.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/AxisConfigurationBeanFactoryPostProcessor.java?rev=929077&r1=929076&r2=929077&view=diff
==
--- 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/AxisConfigurationBeanFactoryPostProcessor.java
 (original)
+++ 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/

svn commit: r929120 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java

[veithen]

Author: veithen
Date: Tue Mar 30 12:53:25 2010
New Revision: 929120

URL: http://svn.apache.org/viewvc?rev=929120&view=rev
Log:
Let the message receivers and deployers use the ServiceObjectSupplier interface 
properly.

Detailed explanation:

Prior to r439555 service object suppliers were actually defined by a static 
method with a given signature defined on an arbitrary class. r439555 introduced 
the ServiceObjectSupplier interface, but didn't change the code that invokes 
the supplier, which continues to use reflection. However, if the specified 
class implements the ServiceObjectSupplier, then there is no need to use 
reflection. The code has been changed to call the supplier through the 
ServiceObjectSupplier interface. It still supports the old way of defining the 
supplier, but issues a warning inviting the user to provide a proper 
ServiceObjectSupplier implementation (since that is considered as the 
recommended approach).

Modified:

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java?rev=929120&r1=929119&r2=929120&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java 
(original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/util/Utils.java 
Tue Mar 30 12:53:25 2010
@@ -26,6 +26,7 @@ import org.apache.axiom.soap.SOAPEnvelop
 import org.apache.axiom.soap.SOAPFault;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.Constants;
+import org.apache.axis2.ServiceObjectSupplier;
 import org.apache.axis2.transport.TransportListener;
 import org.apache.axis2.transport.http.HTTPConstants;
 import org.apache.axis2.context.ConfigurationContext;
@@ -681,25 +682,44 @@ public class Utils {
 Parameter serviceObjectSupplierParam =
 service.getParameter(Constants.SERVICE_OBJECT_SUPPLIER);
 if (serviceObjectSupplierParam != null) {
-final Class serviceObjectMaker = 
Loader.loadClass(classLoader, ((String)
+final Class serviceObjectSupplierClass = 
Loader.loadClass(classLoader, ((String)
 serviceObjectSupplierParam.getValue()).trim());
-
-// Find static getServiceObject() method, call it if there
-final Method method = 
org.apache.axis2.java.security.AccessController.doPrivileged(
-new PrivilegedExceptionAction() {
-public Method run() throws NoSuchMethodException {
-return 
serviceObjectMaker.getMethod("getServiceObject",
-AxisService.class);
+if 
(ServiceObjectSupplier.class.isAssignableFrom(serviceObjectSupplierClass)) {
+ServiceObjectSupplier serviceObjectSupplier = 
org.apache.axis2.java.security.AccessController.doPrivileged(
+new 
PrivilegedExceptionAction() {
+public ServiceObjectSupplier run() throws 
InstantiationException, IllegalAccessException {
+return 
(ServiceObjectSupplier)serviceObjectSupplierClass.newInstance();
+}
+}
+);
+return serviceObjectSupplier.getServiceObject(service);
+} else {
+// Prior to r439555 service object suppliers were actually 
defined by a static method
+// with a given signature defined on an arbitrary class. 
The ServiceObjectSupplier
+// interface was only introduced by r439555. We still 
support the old way, but
+// issue a warning inviting the user to provide a proper 
ServiceObjectSupplier
+// implementation.
+
+// Find static getServiceObject() method, call it if there
+final Method method = 
org.apache.axis2.java.security.AccessController.doPrivileged(
+new PrivilegedExceptionAction() {
+public Method run() throws 
NoSuchMethodException {
+return 
serviceObjectSupplierClass.getMethod("getServiceObject",
+AxisService.class);
+}
 }
-}
-);
-return 
org.apache.axis2.java.security.AccessController.doPrivileged(
-new PrivilegedExceptionAction() {
-public Object run() throws 
Invocati

svn commit: r929196 - in /axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src: main/java/org/apache/axis2/spring/ main/java/org/apache/axis2/spring/cfgctx/ main/java/org/apache/axis

[veithen]

Author: veithen
Date: Tue Mar 30 17:26:52 2010
New Revision: 929196

URL: http://svn.apache.org/viewvc?rev=929196&view=rev
Log:
AXIS2-4662: Some package reorganization of the PoC code.

Added:

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/cfgctx/

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/cfgctx/AxisConfigurationBeanFactoryPostProcessor.java
  - copied, changed from r929077, 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/AxisConfigurationBeanFactoryPostProcessor.java

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/cfgctx/ConfigurationContextFactoryBean.java
  - copied, changed from r929077, 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/ConfigurationContextFactoryBean.java

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/cfgctx/ConfigurationContextParser.java
  - copied, changed from r928819, 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/ConfigurationContextParser.java

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/cfgctx/Constants.java
  - copied, changed from r928819, 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/Constants.java

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/cfgctx/ListenerManagerFactoryBean.java
  - copied, changed from r928819, 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/ListenerManagerFactoryBean.java

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/cfgctx/ListenerManagerParser.java
  - copied, changed from r928819, 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/ListenerManagerParser.java

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/cfgctx/TransportDescriptionFactoryBean.java
  - copied, changed from r929077, 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/TransportDescriptionFactoryBean.java

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/cfgctx/TransportInDescriptionFactoryBean.java
  - copied, changed from r929077, 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/TransportInDescriptionFactoryBean.java

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/cfgctx/TransportOutDescriptionFactoryBean.java
  - copied, changed from r929077, 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/TransportOutDescriptionFactoryBean.java

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/cfgctx/TransportParser.java
  - copied, changed from r929077, 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/TransportParser.java

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/service/

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/service/PojoServiceFactoryBean.java
  - copied, changed from r929077, 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/PojoServiceFactoryBean.java

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/service/PojoServiceParser.java
  - copied, changed from r929077, 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/PojoServiceParser.java

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/service/SpringServiceObjectSupplier.java
  - copied, changed from r929077, 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/SpringServiceObjectSupplier.java

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/test/java/org/apache/axis2/spring/cfgctx/

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/test/java/org/apache/axis2/spring/cfgctx/DummyTransportListener.java
  - copied, changed from r928727, 
axis/axis2/java/core/scratch/java/veithen/sp

svn commit: r929250 - in /axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src: main/java/org/apache/axis2/spring/ main/java/org/apache/axis2/spring/cfgctx/ main/java/org/apache/axis

[veithen]

Author: veithen
Date: Tue Mar 30 20:14:50 2010
New Revision: 929250

URL: http://svn.apache.org/viewvc?rev=929250&view=rev
Log:
AXIS2-4662: Added some code to show automatic deployment of JSR-181 annotated 
services. Kudos to Stephan van Hugten for suggesting this feature and showing 
how to implement it.

Added:

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/NamespaceUtil.java
   (with props)

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/service/PojoServiceUtil.java
   (with props)

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/service/WebServiceAnnotationBeanPostProcessor.java
   (with props)

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/service/WebServiceAnnotationBeanPostProcessorParser.java
   (with props)

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/test/java/org/apache/axis2/spring/service/WebServiceAnnotationBeanPostProcessorTest.java
   (with props)

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/test/resources/jsr181.xml
   (with props)
Modified:

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/NamespaceHandler.java

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/cfgctx/ListenerManagerParser.java

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/service/PojoServiceFactoryBean.java

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/service/PojoServiceParser.java

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/resources/schemas/spring-axis2.xsd

Modified: 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/NamespaceHandler.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/NamespaceHandler.java?rev=929250&r1=929249&r2=929250&view=diff
==
--- 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/NamespaceHandler.java
 (original)
+++ 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/NamespaceHandler.java
 Tue Mar 30 20:14:50 2010
@@ -24,6 +24,7 @@ import org.apache.axis2.spring.cfgctx.Tr
 import org.apache.axis2.spring.cfgctx.TransportOutDescriptionFactoryBean;
 import org.apache.axis2.spring.cfgctx.TransportParser;
 import org.apache.axis2.spring.service.PojoServiceParser;
+import 
org.apache.axis2.spring.service.WebServiceAnnotationBeanPostProcessorParser;
 import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
 
 public class NamespaceHandler extends NamespaceHandlerSupport {
@@ -33,5 +34,6 @@ public class NamespaceHandler extends Na
 registerBeanDefinitionParser("transportSender", new 
TransportParser(TransportOutDescriptionFactoryBean.class, "sender"));
 registerBeanDefinitionParser("listenerManager", new 
ListenerManagerParser());
 registerBeanDefinitionParser("pojoService", new PojoServiceParser());
+registerBeanDefinitionParser("webServiceAnnotationBeanPostProcessor", 
new WebServiceAnnotationBeanPostProcessorParser());
 }
 }

Added: 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/NamespaceUtil.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/NamespaceUtil.java?rev=929250&view=auto
======
--- 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/NamespaceUtil.java
 (added)
+++ 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/NamespaceUtil.java
 Tue Mar 30 20:14:50 2010
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+

svn commit: r929441 - in /axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring: cfgctx/ service/ util/

[veithen]

Author: veithen
Date: Wed Mar 31 09:20:31 2010
New Revision: 929441

URL: http://svn.apache.org/viewvc?rev=929441&view=rev
Log:
AXIS2-4662: Some simplifications of the PoC code.

Added:

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/util/

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/util/SingletonFactoryBean.java
   (with props)
Modified:

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/cfgctx/ConfigurationContextFactoryBean.java

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/cfgctx/ListenerManagerFactoryBean.java

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/service/PojoServiceFactoryBean.java

Modified: 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/cfgctx/ConfigurationContextFactoryBean.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/cfgctx/ConfigurationContextFactoryBean.java?rev=929441&r1=929440&r2=929441&view=diff
==
--- 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/cfgctx/ConfigurationContextFactoryBean.java
 (original)
+++ 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/cfgctx/ConfigurationContextFactoryBean.java
 Wed Mar 31 09:20:31 2010
@@ -23,13 +23,11 @@ import org.apache.axis2.context.Configur
 import org.apache.axis2.description.TransportInDescription;
 import org.apache.axis2.description.TransportOutDescription;
 import org.apache.axis2.engine.AxisConfiguration;
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.InitializingBean;
+import org.apache.axis2.spring.util.SingletonFactoryBean;
 
-public class ConfigurationContextFactoryBean implements FactoryBean, 
InitializingBean {
+public class ConfigurationContextFactoryBean extends 
SingletonFactoryBean {
 private TransportInDescription[] transportInDescriptions;
 private TransportOutDescription[] transportOutDescriptions;
-private ConfigurationContext configurationContext;
 
 public void setTransportInDescriptions(TransportInDescription[] 
transportInDescriptions) {
 this.transportInDescriptions = transportInDescriptions;
@@ -39,16 +37,13 @@ public class ConfigurationContextFactory
 this.transportOutDescriptions = transportOutDescriptions;
 }
 
-public Class getObjectType() {
-return ConfigurationContext.class;
+public ConfigurationContextFactoryBean() {
+super(ConfigurationContext.class);
 }
-
-public boolean isSingleton() {
-return true;
-}
-
-public void afterPropertiesSet() throws Exception {
-configurationContext = 
ConfigurationContextFactory.createBasicConfigurationContext("axis2_default_spring.xml");
+
+@Override
+protected ConfigurationContext create() throws Exception {
+ConfigurationContext configurationContext = 
ConfigurationContextFactory.createBasicConfigurationContext("axis2_default_spring.xml");
 //  configurationContext = 
ConfigurationContextFactory.createEmptyConfigurationContext();
 AxisConfiguration config = configurationContext.getAxisConfiguration();
 if (transportInDescriptions != null) {
@@ -61,9 +56,6 @@ public class ConfigurationContextFactory
 config.addTransportOut(description);
 }
 }
-}
-
-public Object getObject() throws Exception {
 return configurationContext;
 }
 }

Modified: 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/cfgctx/ListenerManagerFactoryBean.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/cfgctx/ListenerManagerFactoryBean.java?rev=929441&r1=929440&r2=929441&view=diff
======
--- 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/cfgctx/ListenerManagerFactoryBean.java
 (original)
+++ 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/cfgctx/ListenerManagerFactoryBean.java
 Wed Mar 31 09:20:31 2010
@@ -20,36 +20,28 @@ package org.apache.axis2.spring.cfgctx;
 
 import org.apache.axis2.context.ConfigurationContext;
 import org.apache.axis2.engine.ListenerManager;
-import org.springframework.beans.factory.DisposableBean;
-impo

svn commit: r929538 - /axis/axis2/java/core/trunk/modules/integration/pom.xml

[veithen]

Author: veithen
Date: Wed Mar 31 13:49:05 2010
New Revision: 929538

URL: http://svn.apache.org/viewvc?rev=929538&view=rev
Log:
AXIS2-4666: Switch compiler to fork mode to avoid OutOfMemoryError.

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

Modified: axis/axis2/java/core/trunk/modules/integration/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/pom.xml?rev=929538&r1=929537&r2=929538&view=diff
==
--- axis/axis2/java/core/trunk/modules/integration/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/integration/pom.xml Wed Mar 31 13:49:05 
2010
@@ -314,6 +314,9 @@
 
 1.5
 1.5
+
+true
 
 
 

svn commit: r932872 - /axis/axis2/java/core/scratch/spring/

[veithen]

Author: veithen
Date: Sun Apr 11 12:09:31 2010
New Revision: 932872

URL: http://svn.apache.org/viewvc?rev=932872&view=rev
Log:
Creating a sandbox area for the new Axis2-Spring integration.

Added:
axis/axis2/java/core/scratch/spring/

svn commit: r932907 - in /axis/axis2/java/core/scratch/spring/axis2-spring-x: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/axis2/ src/main/jav

[veithen]

Author: veithen
Date: Sun Apr 11 14:01:10 2010
New Revision: 932907

URL: http://svn.apache.org/viewvc?rev=932907&view=rev
Log:
Initial code for the Axis2-Spring integration.

Added:
axis/axis2/java/core/scratch/spring/axis2-spring-x/
axis/axis2/java/core/scratch/spring/axis2-spring-x/pom.xml   (with props)
axis/axis2/java/core/scratch/spring/axis2-spring-x/src/
axis/axis2/java/core/scratch/spring/axis2-spring-x/src/main/
axis/axis2/java/core/scratch/spring/axis2-spring-x/src/main/java/
axis/axis2/java/core/scratch/spring/axis2-spring-x/src/main/java/org/
axis/axis2/java/core/scratch/spring/axis2-spring-x/src/main/java/org/apache/

axis/axis2/java/core/scratch/spring/axis2-spring-x/src/main/java/org/apache/axis2/

axis/axis2/java/core/scratch/spring/axis2-spring-x/src/main/java/org/apache/axis2/spring/

axis/axis2/java/core/scratch/spring/axis2-spring-x/src/main/java/org/apache/axis2/spring/AxisServiceFactory.java
   (with props)

axis/axis2/java/core/scratch/spring/axis2-spring-x/src/main/java/org/apache/axis2/spring/ConfigurationBeanDefinitionParser.java
   (with props)

axis/axis2/java/core/scratch/spring/axis2-spring-x/src/main/java/org/apache/axis2/spring/ConfigurationContextFactoryBean.java
   (with props)

axis/axis2/java/core/scratch/spring/axis2-spring-x/src/main/java/org/apache/axis2/spring/Constants.java
   (with props)

axis/axis2/java/core/scratch/spring/axis2-spring-x/src/main/java/org/apache/axis2/spring/NamespaceHandler.java
   (with props)

axis/axis2/java/core/scratch/spring/axis2-spring-x/src/main/java/org/apache/axis2/spring/PojoAxisServiceFactory.java
   (with props)

axis/axis2/java/core/scratch/spring/axis2-spring-x/src/main/java/org/apache/axis2/spring/PojoServiceBeanDefinitionParser.java
   (with props)

axis/axis2/java/core/scratch/spring/axis2-spring-x/src/main/java/org/apache/axis2/spring/SpringAxisConfigurator.java
   (with props)

axis/axis2/java/core/scratch/spring/axis2-spring-x/src/main/java/org/apache/axis2/spring/SpringAxisServlet.java
   (with props)

axis/axis2/java/core/scratch/spring/axis2-spring-x/src/main/java/org/apache/axis2/spring/SpringServiceObjectSupplier.java
  - copied, changed from r929196, 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/service/SpringServiceObjectSupplier.java

axis/axis2/java/core/scratch/spring/axis2-spring-x/src/main/java/org/apache/axis2/spring/util/

axis/axis2/java/core/scratch/spring/axis2-spring-x/src/main/java/org/apache/axis2/spring/util/SingletonFactoryBean.java
  - copied unchanged from r929441, 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/main/java/org/apache/axis2/spring/util/SingletonFactoryBean.java
axis/axis2/java/core/scratch/spring/axis2-spring-x/src/main/resources/

axis/axis2/java/core/scratch/spring/axis2-spring-x/src/main/resources/META-INF/

axis/axis2/java/core/scratch/spring/axis2-spring-x/src/main/resources/META-INF/spring.handlers

axis/axis2/java/core/scratch/spring/axis2-spring-x/src/main/resources/META-INF/spring.schemas

axis/axis2/java/core/scratch/spring/axis2-spring-x/src/main/resources/schemas/

axis/axis2/java/core/scratch/spring/axis2-spring-x/src/main/resources/schemas/axis2-spring.xsd
axis/axis2/java/core/scratch/spring/axis2-spring-x/src/test/
axis/axis2/java/core/scratch/spring/axis2-spring-x/src/test/java/
axis/axis2/java/core/scratch/spring/axis2-spring-x/src/test/java/org/
axis/axis2/java/core/scratch/spring/axis2-spring-x/src/test/java/org/apache/

axis/axis2/java/core/scratch/spring/axis2-spring-x/src/test/java/org/apache/axis2/

axis/axis2/java/core/scratch/spring/axis2-spring-x/src/test/java/org/apache/axis2/spring/

axis/axis2/java/core/scratch/spring/axis2-spring-x/src/test/java/org/apache/axis2/spring/PojoTest.java
   (with props)

axis/axis2/java/core/scratch/spring/axis2-spring-x/src/test/java/org/apache/axis2/spring/WeatherServiceServletRunner.java
   (with props)

axis/axis2/java/core/scratch/spring/axis2-spring-x/src/test/java/org/apache/axis2/spring/WeatherSpringService.java
  - copied, changed from r929196, 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/test/java/org/apache/axis2/spring/service/WeatherSpringService.java
axis/axis2/java/core/scratch/spring/axis2-spring-x/src/test/resources/

axis/axis2/java/core/scratch/spring/axis2-spring-x/src/test/resources/log4j.properties
  - copied unchanged from r929077, 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/test/resources/log4j.properties

axis/axis2/java/core/scratch/spring/axis2-spring-x/src/test/resources/pojo_test_context.xml
   (with props)

Added: axis/axis2/java/core/scratch/spring/axis2-spring-x/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/scratch/spring/axis2-spring-x/pom.xml?rev=932907&v

svn commit: r932944 - /axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/

[veithen]

Author: veithen
Date: Sun Apr 11 17:33:19 2010
New Revision: 932944

URL: http://svn.apache.org/viewvc?rev=932944&view=rev
Log:
Set up svn:ignore for Eclipse.

Modified:
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/   
(props changed)

Propchange: axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/
--
--- svn:ignore (added)
+++ svn:ignore Sun Apr 11 17:33:19 2010
@@ -0,0 +1,4 @@
+.settings
+target
+.classpath
+.project

svn commit: r932945 - /axis/axis2/java/core/scratch/spring/axis2-spring-x/

[veithen]

Author: veithen
Date: Sun Apr 11 17:33:33 2010
New Revision: 932945

URL: http://svn.apache.org/viewvc?rev=932945&view=rev
Log:
Set up svn:ignore for Eclipse.

Modified:
axis/axis2/java/core/scratch/spring/axis2-spring-x/   (props changed)

Propchange: axis/axis2/java/core/scratch/spring/axis2-spring-x/
--
--- svn:ignore (added)
+++ svn:ignore Sun Apr 11 17:33:33 2010
@@ -0,0 +1,4 @@
+.settings
+target
+.classpath
+.project

svn commit: r932947 - /axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/test/resources/context.xml

[veithen]

Author: veithen
Date: Sun Apr 11 17:37:29 2010
New Revision: 932947

URL: http://svn.apache.org/viewvc?rev=932947&view=rev
Log:
Fixed a class reference broken by the refactoring in r929196.

Modified:

axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/test/resources/context.xml

Modified: 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/test/resources/context.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/test/resources/context.xml?rev=932947&r1=932946&r2=932947&view=diff
==
--- 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/test/resources/context.xml
 (original)
+++ 
axis/axis2/java/core/scratch/java/veithen/spring/axis2-spring-core/src/test/resources/context.xml
 Sun Apr 11 17:37:29 2010
@@ -32,5 +32,5 @@
 
 
 
-
+
 

svn commit: r935169 - /axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml

[veithen]

Author: veithen
Date: Sat Apr 17 12:46:28 2010
New Revision: 935169

URL: http://svn.apache.org/viewvc?rev=935169&view=rev
Log:
Manage inter-module dependencies properly.

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

Modified: axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml?rev=935169&r1=935168&r2=935169&view=diff
==
--- axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml Sat Apr 17 12:46:28 
2010
@@ -93,6 +93,13 @@
 org.apache.neethi
 neethi
 
+
+org.apache.axis2
+addressing
+${project.version}
+mar
+test
+
 
 
 src
@@ -127,6 +134,9 @@
 **/*.properties
 
 
+
+${project.build.directory}/repo
+
 
 
 
@@ -154,6 +164,22 @@
 
 
 
+maven-dependency-plugin
+
+
+generate-test-resources
+
+copy-dependencies
+
+
+
${project.build.directory}/repo/modules
+mar
+test
+
+
+
+
+
 org.apache.maven.plugins
 maven-antrun-plugin
 
@@ -165,9 +191,7 @@
 
 
 
-
-
+
 
 
 

svn commit: r935174 - /axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml

[veithen]

Author: veithen
Date: Sat Apr 17 13:24:55 2010
New Revision: 935174

URL: http://svn.apache.org/viewvc?rev=935174&view=rev
Log:
Work around a strange behavior in maven-dependency-plugin.

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

Modified: axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml?rev=935174&r1=935173&r2=935174&view=diff
==
--- axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml Sat Apr 17 13:24:55 
2010
@@ -169,13 +169,32 @@
 
 generate-test-resources
 
+copy
+
+
+
+
+org.apache.axis2
+addressing
+${project.version}
+mar
+   
+
+
${project.build.directory}/repo/modules
+
+
+
 
 
 

svn commit: r935338 - /axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml

[veithen]

Author: veithen
Date: Sun Apr 18 13:25:53 2010
New Revision: 935338

URL: http://svn.apache.org/viewvc?rev=935338&view=rev
Log:
Added a comment to link the workaround applied in r935174 to the relevant issue 
in maven-dependency-plugin (MDEP-259).

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

Modified: axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml?rev=935338&r1=935337&r2=935338&view=diff
==
--- axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/fastinfoset/pom.xml Sun Apr 18 13:25:53 
2010
@@ -186,7 +186,8 @@
  is part of the same reactor build. Probably this 
is due to the fact that in
  this case, maven-dependency-plugin tries to 
retrieve the artifact from the
  module (instead of the local repository) but 
fails to do so because it doesn't
- know how to construct a MAR file. -->
+ know how to construct a MAR file. See 
http://jira.codehaus.org/browse/MDEP-259
+ for more details. -->
 

svn commit: r936434 - in /axis/axis2/java/core/trunk/modules: distribution/pom.xml java2wsdl/pom.xml parent/pom.xml tool/axis2-ant-plugin/pom.xml

[veithen]

Author: veithen
Date: Wed Apr 21 18:40:59 2010
New Revision: 936434

URL: http://svn.apache.org/viewvc?rev=936434&view=rev
Log:
Use the same Groovy Maven plugin everywhere.

Modified:
axis/axis2/java/core/trunk/modules/distribution/pom.xml
axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml
axis/axis2/java/core/trunk/modules/parent/pom.xml
axis/axis2/java/core/trunk/modules/tool/axis2-ant-plugin/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=936434&r1=936433&r2=936434&view=diff
==
--- axis/axis2/java/core/trunk/modules/distribution/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/distribution/pom.xml Wed Apr 21 18:40:59 
2010
@@ -224,36 +224,33 @@
 
 
 
-org.apache.geronimo.genesis.plugins
-script-maven-plugin
-1.1
+org.codehaus.gmaven
+gmaven-plugin
 
 
 generate-resources
 
-groovy
+execute
 
 
 
-
-def modulesdir = new 
File(project.build.directory, "tmp-repository/modules");
-def moduleslist = new File(modulesdir, 
"modules.list");
-moduleslist.delete();
-modulesdir.eachFile({
-if (it.name.endsWith(".mar")) {
-moduleslist.append("$it.name\n");
-}
-})
-
-def servicesdir = new 
File(project.build.directory, "tmp-repository/services");
-def serviceslist = new File(servicesdir, 
"services.list");
-serviceslist.delete();
-servicesdir.eachFile({
-if (it.name.endsWith(".aar")) {
-serviceslist.append("$it.name\n");
-}
-})
-
+def modulesdir = new 
File(project.build.directory, "tmp-repository/modules");
+def moduleslist = new File(modulesdir, 
"modules.list");
+moduleslist.delete();
+modulesdir.eachFile({
+if (it.name.endsWith(".mar")) {
+moduleslist.append("$it.name\n");
+}
+})
+
+def servicesdir = new 
File(project.build.directory, "tmp-repository/services");
+def serviceslist = new File(servicesdir, 
"services.list");
+serviceslist.delete();
+servicesdir.eachFile({
+if (it.name.endsWith(".aar")) {
+serviceslist.append("$it.name\n");
+}
+})
 
 
 

Modified: axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml?rev=936434&r1=936433&r2=936434&view=diff
==
--- axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/java2wsdl/pom.xml Wed Apr 21 18:40:59 
2010
@@ -158,7 +158,6 @@
 
 org.codehaus.gmaven
 gmaven-plugin
-1.2
 
 
 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=936434&r1=936433&r2=936434&view=diff
==
--- axis/axis2/java/core/trunk/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/parent/pom.

svn commit: r937004 - /axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl

[veithen]

Author: veithen
Date: Thu Apr 22 18:44:07 2010
New Revision: 937004

URL: http://svn.apache.org/viewvc?rev=937004&view=rev
Log:
AXIS2-4688: Replaced unqualified class name in 
InterfaceImplementationTemplate.xsl. Thanks to Dean Holdren for reporting this.

Modified:

axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl

Modified: 
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl?rev=937004&r1=937003&r2=937004&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
 (original)
+++ 
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceImplementationTemplate.xsl
 Thu Apr 22 18:44:07 2010
@@ -71,7 +71,7 @@
 counter = 0;
 }
 counter = counter + 1; 
-return java.lang.Long.toString(System.currentTimeMillis()) + "_" + 
counter;
+return 
java.lang.Long.toString(java.lang.System.currentTimeMillis()) + "_" + counter;
 }
 
 

svn commit: r937047 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java

[veithen]

Author: veithen
Date: Thu Apr 22 20:30:37 2010
New Revision: 937047

URL: http://svn.apache.org/viewvc?rev=937047&view=rev
Log:
AXIS2-4554: Fixed AxisService2WSDL11 to set the correct value for the 
wsdl:required attribute of the wsaw:UsingAddressing element. Thanks to Dave 
Bryant and Nuwan Bandara for looking at this issue.

Modified:

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java?rev=937047&r1=937046&r2=937047&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
 Thu Apr 22 20:30:37 2010
@@ -770,7 +770,7 @@ public class AxisService2WSDL11 implemen

AddressingConstants.ADDRESSING_OPTIONAL)) {
WSDLSerializationUtil.addExtensionElement(fac, binding,
AddressingConstants.USING_ADDRESSING,
-   DEFAULT_WSDL_NAMESPACE_PREFIX + 
":required", "true", wsaw);
+   DEFAULT_WSDL_NAMESPACE_PREFIX + 
":required", "false", wsaw);
} else if 
(AddressingHelper.getAddressingRequirementParemeterValue(

axisService).equals(AddressingConstants.ADDRESSING_REQUIRED)) {
WSDLSerializationUtil.addExtensionElement(fac, binding,
@@ -911,7 +911,7 @@ public class AxisService2WSDL11 implemen

AddressingConstants.ADDRESSING_OPTIONAL)) {
WSDLSerializationUtil.addExtensionElement(fac, binding,
AddressingConstants.USING_ADDRESSING,
-   DEFAULT_WSDL_NAMESPACE_PREFIX + 
":required", "true", wsaw);
+   DEFAULT_WSDL_NAMESPACE_PREFIX + 
":required", "false", wsaw);
} else if 
(AddressingHelper.getAddressingRequirementParemeterValue(

axisService).equals(AddressingConstants.ADDRESSING_REQUIRED)) {
WSDLSerializationUtil.addExtensionElement(fac, binding,

svn commit: r937049 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java

[veithen]

Author: veithen
Date: Thu Apr 22 20:35:20 2010
New Revision: 937049

URL: http://svn.apache.org/viewvc?rev=937049&view=rev
Log:
AXIS2-4148: Fixed debug message in WarBasedAxisConfigurator. Thanks to Andrei 
Ivanov and Tharindu Mathew for reporting/investigating this issue.

Modified:

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java?rev=937049&r1=937048&r2=937049&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/WarBasedAxisConfigurator.java
 Thu Apr 22 20:35:20 2010
@@ -137,7 +137,7 @@ public class WarBasedAxisConfigurator ex
 // Simple deployment, no need for conf directory either
 axis2Stream = config.getServletContext()
 .getResourceAsStream("/WEB-INF/axis2.xml");
-log.debug("trying to load axis2.xml from module: 
/WEB-INF/conf/axis2.xml");
+log.debug("trying to load axis2.xml from module: 
/WEB-INF/axis2.xml");
 }
 } // try
 catch (Exception e) {

svn commit: r937600 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java

[veithen]

Author: veithen
Date: Sat Apr 24 07:32:05 2010
New Revision: 937600

URL: http://svn.apache.org/viewvc?rev=937600&view=rev
Log:
Reverted r937436 because it causes test failures in the integration module. I 
will add more information to AXIS2-4687.

Modified:

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java?rev=937600&r1=937599&r2=937600&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService2WSDL11.java
 Sat Apr 24 07:32:05 2010
@@ -389,7 +389,8 @@ public class AxisService2WSDL11 implemen
+ ":" + 
inaxisMessage.getName(), null);
addPolicyAsExtAttribute(inaxisMessage, 
input,fac);
 
-   
WSDLSerializationUtil.addWSAWActionAttribute(input,axisOperation.getInputAction(),
 wsaw);  
+   
WSDLSerializationUtil.addWSAWActionAttribute(input,
+   
axisOperation.getInputAction(), wsaw);
operation.addChild(input);
}
}
@@ -1087,9 +1088,9 @@ public class AxisService2WSDL11 implemen
input.addChild(inputelement);
 String inputType=(String) 
axisBindingOperation.getProperty(WSDL2Constants.ATTR_WHTTP_INPUT_SERIALIZATION);
 inputelement.addAttribute("type", (inputType!=null? 
inputType:"text/xml"), null);
-   
inputelement.addAttribute("part", inaxisMessage.getPartName(), null);
-
-   
operation.addChild(input);
+   
inputelement.addAttribute("part", axisOperation
+   
.getName().getLocalPart(), null);
+   operation.addChild(input);
}
}
}
@@ -1113,7 +1114,8 @@ public class AxisService2WSDL11 implemen
outElement.addChild(outElement);
 String outputType=(String) 
axisBindingOperation.getProperty(WSDL2Constants.ATTR_WHTTP_OUTPUT_SERIALIZATION);
 outElement.addAttribute("type", (outputType!=null? 
outputType:"text/xml"), null);
-   outElement.addAttribute("part", 
outAxisMessage.getPartName(), null);
+   outElement.addAttribute("part", 
axisOperation.getName()
+   
.getLocalPart(), null);
output.addChild(outElement);
operation.addChild(output);
}

svn commit: r937604 - /axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml

[veithen]

Author: veithen
Date: Sat Apr 24 08:27:00 2010
New Revision: 937604

URL: http://svn.apache.org/viewvc?rev=937604&view=rev
Log:
Fixed the change in r937071 so that the build works again on Java 1.5.

Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml

Modified: axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml?rev=937604&r1=937603&r2=937604&view=diff
==
--- axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml Sat Apr 24 
08:27:00 2010
@@ -128,13 +128,24 @@
 
 
 
+javax.xml.bind
+jaxb-api
+jar
+
+
+
org.apache.geronimo.specs
+
geronimo-saaj_1.3_spec
+jar
+
+
 
org.apache.geronimo.specs
 
geronimo-jaxws_2.2_spec
 jar
-true
-
target/endorsed
- 
+
 
+true
+
${project.build.directory}/endorsed
+true
 
 
 
@@ -1386,7 +1397,7 @@
 true
 
 pertest
--Xms256m -Xmx512m 
-Xbootclasspath/p:${basedir}/target/endorsed/geronimo-jaxws_2.2_spec-1.0-SNAPSHOT.jar
+-Xms256m -Xmx512m 
-Xbootclasspath/p:${project.build.directory}/endorsed/jaxb-api.jar:${project.build.directory}/endorsed/geronimo-saaj_1.3_spec.jar:${project.build.directory}/endorsed/geronimo-jaxws_2.2_spec.jar
 
 

svn commit: r937619 - /axis/axis2/java/core/trunk/modules/documentation/xdocs/svn.xml

[veithen]

Author: veithen
Date: Sat Apr 24 10:51:25 2010
New Revision: 937619

URL: http://svn.apache.org/viewvc?rev=937619&view=rev
Log:
AXIS2-4694: Fixed SVN links as suggested by Keheliya Gallaba.

Modified:
axis/axis2/java/core/trunk/modules/documentation/xdocs/svn.xml

Modified: axis/axis2/java/core/trunk/modules/documentation/xdocs/svn.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/documentation/xdocs/svn.xml?rev=937619&r1=937618&r2=937619&view=diff
==
--- axis/axis2/java/core/trunk/modules/documentation/xdocs/svn.xml (original)
+++ axis/axis2/java/core/trunk/modules/documentation/xdocs/svn.xml Sat Apr 24 
10:51:25 2010
@@ -55,9 +55,9 @@
 
 
 If you are not a committer: http://svn.apache.org/repos/asf/webservices/axis2/trunk/java";>http://svn.apache.org/repos/asf/webservices/axis2/trunk/java
+
"http://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/";>http://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/
 If you are a committer: https://svn.apache.org/repos/asf/webservices/axis2/trunk/java";>https://svn.apache.org/repos/asf/webservices/axis2/trunk/java
+
"https://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/";>https://svn.apache.org/repos/asf/axis/axis2/java/core/trunk/
 
 
 If you are a committer, make sure that you have selected an

svn commit: r937620 - /axis/axis2/java/core/trunk/modules/samples/pojoguidespring/build.xml

[veithen]

Author: veithen
Date: Sat Apr 24 11:02:10 2010
New Revision: 937620

URL: http://svn.apache.org/viewvc?rev=937620&view=rev
Log:
AXIS2-4690: Fixed a failure when running ant rpc.client in the POJO/Spring 
sample.

Modified:
axis/axis2/java/core/trunk/modules/samples/pojoguidespring/build.xml

Modified: axis/axis2/java/core/trunk/modules/samples/pojoguidespring/build.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/pojoguidespring/build.xml?rev=937620&r1=937619&r2=937620&view=diff
==
--- axis/axis2/java/core/trunk/modules/samples/pojoguidespring/build.xml 
(original)
+++ axis/axis2/java/core/trunk/modules/samples/pojoguidespring/build.xml Sat 
Apr 24 11:02:10 2010
@@ -99,7 +99,7 @@
 


-   
+   

svn commit: r937624 - in /axis/axis2/java/core/trunk/modules/samples: pojo/build.xml pojoguide/build.xml

[veithen]

Author: veithen
Date: Sat Apr 24 11:11:08 2010
New Revision: 937624

URL: http://svn.apache.org/viewvc?rev=937624&view=rev
Log:
AXIS2-4690: Fixed two other instances where fork mode is required.

Modified:
axis/axis2/java/core/trunk/modules/samples/pojo/build.xml
axis/axis2/java/core/trunk/modules/samples/pojoguide/build.xml

Modified: axis/axis2/java/core/trunk/modules/samples/pojo/build.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/pojo/build.xml?rev=937624&r1=937623&r2=937624&view=diff
==
--- axis/axis2/java/core/trunk/modules/samples/pojo/build.xml (original)
+++ axis/axis2/java/core/trunk/modules/samples/pojo/build.xml Sat Apr 24 
11:11:08 2010
@@ -98,7 +98,7 @@

 

-   
+   




Modified: axis/axis2/java/core/trunk/modules/samples/pojoguide/build.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/pojoguide/build.xml?rev=937624&r1=937623&r2=937624&view=diff
==
--- axis/axis2/java/core/trunk/modules/samples/pojoguide/build.xml (original)
+++ axis/axis2/java/core/trunk/modules/samples/pojoguide/build.xml Sat Apr 24 
11:11:08 2010
@@ -88,7 +88,7 @@

 

-   
+   

svn commit: r937857 - in /axis/axis2/java/transports/trunk: ./ modules/base/src/main/java/org/apache/axis2/format/ modules/base/src/test/java/org/apache/axis2/format/

[veithen]

Author: veithen
Date: Sun Apr 25 19:07:04 2010
New Revision: 937857

URL: http://svn.apache.org/viewvc?rev=937857&view=rev
Log:
WSCOMMONS-452: Moved some code that was intended for inclusion into Axiom.

Removed:

axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/ElementHelper.java

axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/TextFromElementReader.java

axis/axis2/java/transports/trunk/modules/base/src/test/java/org/apache/axis2/format/TextFromElementReaderTest.java
Modified:

axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/PlainTextFormatter.java

axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/TextFromElementDataSource.java

axis/axis2/java/transports/trunk/modules/base/src/test/java/org/apache/axis2/format/ElementHelperTest.java
axis/axis2/java/transports/trunk/pom.xml

Modified: 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/PlainTextFormatter.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/PlainTextFormatter.java?rev=937857&r1=937856&r2=937857&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/PlainTextFormatter.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/PlainTextFormatter.java
 Sun Apr 25 19:07:04 2010
@@ -24,6 +24,7 @@ import org.apache.axis2.context.MessageC
 import org.apache.axis2.AxisFault;
 import org.apache.axiom.om.OMOutputFormat;
 import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.util.ElementHelper;
 import org.apache.axis2.transport.base.BaseConstants;
 
 import java.io.ByteArrayOutputStream;

Modified: 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/TextFromElementDataSource.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/TextFromElementDataSource.java?rev=937857&r1=937856&r2=937857&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/TextFromElementDataSource.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/TextFromElementDataSource.java
 Sun Apr 25 19:07:04 2010
@@ -25,6 +25,7 @@ import java.io.OutputStream;
 import javax.activation.DataSource;
 
 import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.util.ElementHelper;
 import org.apache.axis2.transport.base.streams.ReaderInputStream;
 
 /**

Modified: 
axis/axis2/java/transports/trunk/modules/base/src/test/java/org/apache/axis2/format/ElementHelperTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/src/test/java/org/apache/axis2/format/ElementHelperTest.java?rev=937857&r1=937856&r2=937857&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/base/src/test/java/org/apache/axis2/format/ElementHelperTest.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/base/src/test/java/org/apache/axis2/format/ElementHelperTest.java
 Sun Apr 25 19:07:04 2010
@@ -45,6 +45,8 @@ import org.apache.axiom.om.OMSourcedElem
 import org.apache.axiom.om.impl.builder.StAXOMBuilder;
 import org.apache.axiom.om.impl.llom.OMSourcedElementImpl;
 import org.apache.axiom.om.impl.llom.util.AXIOMUtil;
+import org.apache.axiom.om.util.ElementHelper;
+import org.apache.axiom.util.stax.TextFromElementReader;
 import org.apache.commons.io.IOUtils;
 
 public class ElementHelperTest extends TestCase {

Modified: axis/axis2/java/transports/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/pom.xml?rev=937857&r1=937856&r2=937857&view=diff
==
--- axis/axis2/java/transports/trunk/pom.xml (original)
+++ axis/axis2/java/transports/trunk/pom.xml Sun Apr 25 19:07:04 2010
@@ -495,7 +495,7 @@
 
 
 
-1.2.8
+1.2.9-SNAPSHOT
 1.5
 false
 

svn commit: r939033 - /axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/WrappedTextNodeStreamReader.java

[veithen]

Author: veithen
Date: Wed Apr 28 18:00:58 2010
New Revision: 939033

URL: http://svn.apache.org/viewvc?rev=939033&view=rev
Log:
Moved EmptyOMLocation to org.apache.axiom.util.stax and renamed it to 
DummyLocation. Also made it a singleton: no need to create a new instance on 
every call of XMLStreamReader#getLocation().

Modified:

axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/WrappedTextNodeStreamReader.java

Modified: 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/WrappedTextNodeStreamReader.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/WrappedTextNodeStreamReader.java?rev=939033&r1=939032&r2=939033&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/WrappedTextNodeStreamReader.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/WrappedTextNodeStreamReader.java
 Wed Apr 28 18:00:58 2010
@@ -30,8 +30,8 @@ import javax.xml.stream.Location;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
-import org.apache.axiom.om.impl.EmptyOMLocation;
 import org.apache.axiom.om.impl.llom.util.NamespaceContextImpl;
+import org.apache.axiom.util.stax.DummyLocation;
 import org.apache.commons.io.IOUtils;
 
 /**
@@ -70,12 +70,6 @@ import org.apache.commons.io.IOUtils;
 //   Once it has been moved to Axis2 or Axiom, remove the duplicate from 
Synapse.
 public class WrappedTextNodeStreamReader implements XMLStreamReader {
 /**
- * Location object returned by {...@link #getLocation()}.
- * It always returns -1 for the location and null for the publicId and 
systemId. 
- */
-private final static Location EMPTY_LOCATION = new EmptyOMLocation();
-
-/**
  * The qualified name of the wrapper element.
  */
 private final QName wrapperElementName;
@@ -210,7 +204,7 @@ public class WrappedTextNodeStreamReader
 
 public Location getLocation() {
 // We do not support location information
-return EMPTY_LOCATION;
+return DummyLocation.INSTANCE;
 }
 
 public void close() throws XMLStreamException {

svn commit: r939039 - in /axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format: BinaryFormatter.java WrappedTextNodeStreamReader.java

[veithen]

Author: veithen
Date: Wed Apr 28 18:23:27 2010
New Revision: 939039

URL: http://svn.apache.org/viewvc?rev=939039&view=rev
Log:
Fixed some compiler warnings.

Modified:

axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/BinaryFormatter.java

axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/WrappedTextNodeStreamReader.java

Modified: 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/BinaryFormatter.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/BinaryFormatter.java?rev=939039&r1=939038&r2=939039&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/BinaryFormatter.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/BinaryFormatter.java
 Wed Apr 28 18:23:27 2010
@@ -61,7 +61,7 @@ public class BinaryFormatter implements 
 DataHandler dh = getDataHandler(messageContext);
 if (dh != null) {
 try {
-((DataHandler)dh).writeTo(outputStream);
+dh.writeTo(outputStream);
 } catch (IOException e) {
 throw new AxisFault("Error serializing binary content of 
element : " +
 BaseConstants.DEFAULT_BINARY_WRAPPER, e);

Modified: 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/WrappedTextNodeStreamReader.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/WrappedTextNodeStreamReader.java?rev=939039&r1=939038&r2=939039&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/WrappedTextNodeStreamReader.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/WrappedTextNodeStreamReader.java
 Wed Apr 28 18:23:27 2010
@@ -30,7 +30,7 @@ import javax.xml.stream.Location;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
-import org.apache.axiom.om.impl.llom.util.NamespaceContextImpl;
+import org.apache.axiom.util.namespace.MapBasedNamespaceContext;
 import org.apache.axiom.util.stax.DummyLocation;
 import org.apache.commons.io.IOUtils;
 
@@ -251,7 +251,7 @@ public class WrappedTextNodeStreamReader
 
 public NamespaceContext getNamespaceContext() {
 if (namespaceContext == null) {
-namespaceContext = new 
NamespaceContextImpl(Collections.singletonMap(wrapperElementName.getPrefix(), 
wrapperElementName.getNamespaceURI()));
+namespaceContext = new 
MapBasedNamespaceContext(Collections.singletonMap(wrapperElementName.getPrefix(),
 wrapperElementName.getNamespaceURI()));
 }
 return namespaceContext;
 }

svn commit: r939086 - in /axis/axis2/java/transports/trunk/modules/base/src: main/java/org/apache/axis2/format/ test/java/org/apache/axis2/format/

[veithen]

Author: veithen
Date: Wed Apr 28 21:00:32 2010
New Revision: 939086

URL: http://svn.apache.org/viewvc?rev=939086&view=rev
Log:
WSCOMMONS-452: Moved another piece of code that was intended for inclusion into 
Axiom.

Removed:

axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/WrappedTextNodeStreamReader.java
Modified:

axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/WrappedTextNodeOMDataSourceFromDataSource.java

axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/WrappedTextNodeOMDataSourceFromReader.java

axis/axis2/java/transports/trunk/modules/base/src/test/java/org/apache/axis2/format/WrappedTextNodeStreamReaderTest.java

Modified: 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/WrappedTextNodeOMDataSourceFromDataSource.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/WrappedTextNodeOMDataSourceFromDataSource.java?rev=939086&r1=939085&r2=939086&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/WrappedTextNodeOMDataSourceFromDataSource.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/WrappedTextNodeOMDataSourceFromDataSource.java
 Wed Apr 28 21:00:32 2010
@@ -39,6 +39,7 @@ import org.apache.axiom.om.ds.OMDataSour
 import org.apache.axiom.om.impl.MTOMXMLStreamWriter;
 import org.apache.axiom.om.impl.serialize.StreamingOMSerializer;
 import org.apache.axiom.om.util.StAXUtils;
+import org.apache.axiom.util.stax.WrappedTextNodeStreamReader;
 
 /**
  * {...@link org.apache.axiom.om.OMDataSource} implementation that represents 
a text node wrapped

Modified: 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/WrappedTextNodeOMDataSourceFromReader.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/WrappedTextNodeOMDataSourceFromReader.java?rev=939086&r1=939085&r2=939086&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/WrappedTextNodeOMDataSourceFromReader.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/WrappedTextNodeOMDataSourceFromReader.java
 Wed Apr 28 21:00:32 2010
@@ -35,6 +35,7 @@ import org.apache.axiom.om.ds.OMDataSour
 import org.apache.axiom.om.impl.MTOMXMLStreamWriter;
 import org.apache.axiom.om.impl.serialize.StreamingOMSerializer;
 import org.apache.axiom.om.util.StAXUtils;
+import org.apache.axiom.util.stax.WrappedTextNodeStreamReader;
 
 /**
  * {...@link org.apache.axiom.om.OMDataSource} implementation that represents 
a text node wrapped

Modified: 
axis/axis2/java/transports/trunk/modules/base/src/test/java/org/apache/axis2/format/WrappedTextNodeStreamReaderTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/src/test/java/org/apache/axis2/format/WrappedTextNodeStreamReaderTest.java?rev=939086&r1=939085&r2=939086&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/base/src/test/java/org/apache/axis2/format/WrappedTextNodeStreamReaderTest.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/base/src/test/java/org/apache/axis2/format/WrappedTextNodeStreamReaderTest.java
 Wed Apr 28 21:00:32 2010
@@ -30,6 +30,7 @@ import javax.xml.stream.XMLStreamWriter;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.impl.builder.StAXOMBuilder;
 import org.apache.axiom.om.impl.serialize.StreamingOMSerializer;
+import org.apache.axiom.util.stax.WrappedTextNodeStreamReader;
 import org.custommonkey.xmlunit.XMLTestCase;
 
 public class WrappedTextNodeStreamReaderTest extends XMLTestCase {

svn commit: r939098 - /axis/axis2/java/transports/trunk/modules/sms/

[veithen]

Author: veithen
Date: Wed Apr 28 21:21:04 2010
New Revision: 939098

URL: http://svn.apache.org/viewvc?rev=939098&view=rev
Log:
Correctly set svn:ignore for Eclipse.

Modified:
axis/axis2/java/transports/trunk/modules/sms/   (props changed)

Propchange: axis/axis2/java/transports/trunk/modules/sms/
--
--- svn:ignore (original)
+++ svn:ignore Wed Apr 28 21:21:04 2010
@@ -1,4 +1,5 @@
 target
 .classpath
 .project
+.settings
 *.iml

svn commit: r939407 - /axis/axis2/java/transports/trunk/modules/base/src/test/java/org/apache/axis2/format/WrappedTextNodeStreamReaderTest.java

[veithen]

Author: veithen
Date: Thu Apr 29 18:02:36 2010
New Revision: 939407

URL: http://svn.apache.org/viewvc?rev=939407&view=rev
Log:
WSCOMMONS-452: Moved the test case for WrappedTextNodeStreamReader to Axiom.

Removed:

axis/axis2/java/transports/trunk/modules/base/src/test/java/org/apache/axis2/format/WrappedTextNodeStreamReaderTest.java

svn commit: r939424 - /axis/axis2/java/transports/trunk/modules/base/src/test/java/org/apache/axis2/format/ElementHelperTest.java

[veithen]

Author: veithen
Date: Thu Apr 29 18:20:01 2010
New Revision: 939424

URL: http://svn.apache.org/viewvc?rev=939424&view=rev
Log: (empty)

Modified:

axis/axis2/java/transports/trunk/modules/base/src/test/java/org/apache/axis2/format/ElementHelperTest.java

Modified: 
axis/axis2/java/transports/trunk/modules/base/src/test/java/org/apache/axis2/format/ElementHelperTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/src/test/java/org/apache/axis2/format/ElementHelperTest.java?rev=939424&r1=939423&r2=939424&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/base/src/test/java/org/apache/axis2/format/ElementHelperTest.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/base/src/test/java/org/apache/axis2/format/ElementHelperTest.java
 Thu Apr 29 18:20:01 2010
@@ -44,7 +44,7 @@ import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.OMSourcedElement;
 import org.apache.axiom.om.impl.builder.StAXOMBuilder;
 import org.apache.axiom.om.impl.llom.OMSourcedElementImpl;
-import org.apache.axiom.om.impl.llom.util.AXIOMUtil;
+import org.apache.axiom.om.util.AXIOMUtil;
 import org.apache.axiom.om.util.ElementHelper;
 import org.apache.axiom.util.stax.TextFromElementReader;
 import org.apache.commons.io.IOUtils;

svn propchange: r939424 - svn:log

[veithen]

Author: veithen
Revision: 939424
Modified property: svn:log

Modified: svn:log at Thu Apr 29 18:23:11 2010
--
--- svn:log (original)
+++ svn:log Thu Apr 29 18:23:11 2010
@@ -0,0 +1 @@
+Fixed deprecation warning.

svn commit: r939459 - in /axis/axis2/java/transports/trunk/modules/base/src: main/java/org/apache/axis2/format/ test/java/org/apache/axis2/format/

[veithen]

Author: veithen
Date: Thu Apr 29 19:04:18 2010
New Revision: 939459

URL: http://svn.apache.org/viewvc?rev=939459&view=rev
Log:
WSCOMMONS-452: Moved the remaining code to Axiom.

Removed:

axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/WrappedTextNodeOMDataSourceFromDataSource.java

axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/WrappedTextNodeOMDataSourceFromReader.java

axis/axis2/java/transports/trunk/modules/base/src/test/java/org/apache/axis2/format/CharacterStreamComparator.java

axis/axis2/java/transports/trunk/modules/base/src/test/java/org/apache/axis2/format/ElementHelperTest.java

axis/axis2/java/transports/trunk/modules/base/src/test/java/org/apache/axis2/format/RandomDataSource.java

axis/axis2/java/transports/trunk/modules/base/src/test/java/org/apache/axis2/format/WrappedTextNodeOMDataSourceTest.java
Modified:

axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/PlainTextBuilder.java

Modified: 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/PlainTextBuilder.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/PlainTextBuilder.java?rev=939459&r1=939458&r2=939459&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/PlainTextBuilder.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/format/PlainTextBuilder.java
 Thu Apr 29 19:04:18 2010
@@ -30,6 +30,8 @@ import javax.xml.namespace.QName;
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.ds.WrappedTextNodeOMDataSourceFromDataSource;
+import org.apache.axiom.om.ds.WrappedTextNodeOMDataSourceFromReader;
 import org.apache.axiom.om.impl.llom.OMSourcedElementImpl;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.builder.BuilderUtil;

svn commit: r944191 - /axis/axis2/java/transports/trunk/pom.xml

[veithen]

Author: veithen
Date: Fri May 14 10:16:01 2010
New Revision: 944191

URL: http://svn.apache.org/viewvc?rev=944191&view=rev
Log:
Changed Axis2 version to SNAPSHOT. Since we now have a Hudson build, this 
allows us to continuously monitor the integration between Axis2 and the 
transports.

Modified:
axis/axis2/java/transports/trunk/pom.xml

Modified: axis/axis2/java/transports/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/pom.xml?rev=944191&r1=944190&r2=944191&view=diff
==
--- axis/axis2/java/transports/trunk/pom.xml (original)
+++ axis/axis2/java/transports/trunk/pom.xml Fri May 14 10:16:01 2010
@@ -496,7 +496,7 @@
 
 
 1.2.9-SNAPSHOT
-1.5
+SNAPSHOT
 false
 
 

svn commit: r944250 - /axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml

[veithen]

Author: veithen
Date: Fri May 14 13:24:02 2010
New Revision: 944250

URL: http://svn.apache.org/viewvc?rev=944250&view=rev
Log:
Removed some unnecessary exclusions. The services.xml files are no longer there.

Modified:
axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml

Modified: axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml?rev=944250&r1=944249&r2=944250&view=diff
==
--- axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml Fri May 14 
13:24:02 2010
@@ -470,7 +470,6 @@
 
 
 
-
 
 
 
@@ -482,11 +481,9 @@
 
 
 
-
 
 
 
-
 
 
 
@@ -498,11 +495,9 @@
 
 
 
-
 
 
 
-
 
 
 
@@ -514,12 +509,9 @@
 
 
 
-
 
 
 
-
 
 
 
@@ -531,11 +523,9 @@
 
 
 
-
 
 
 
-
 
 
 
@@ -547,12 +537,9 @@
 
 
 
-
 
 
 
-
 
 
 
@@ -564,11 +551,9 @@
 
 
 
-
 
 
 
-
 
 
 
@@ -580,11 +565,9 @@
 
 
 
-
 
 
 
-
 
 
 
@@ -596,12 +579,9 @@
 
 
 
-
 
 
 
-
 
 
 
@@ -613,11 +593,9 @@
 
 
 
-
 
 
 
-
 
 
 
@

svn commit: r944347 - /axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/SAAJConverterImpl.java

[veithen]

Author: veithen
Date: Fri May 14 17:29:45 2010
New Revision: 944347

URL: http://svn.apache.org/viewvc?rev=944347&view=rev
Log:
Prepared Axis2 for application of patch for WSCOMMONS-111. RuntimeExceptions 
will no longer be caught (and transformed to OMExceptions) in 
StAXOMBuilder#next(). Therefore, they need to be caught by Axis2 if there is a 
requirement to react to RuntimeExceptions thrown by the Axiom code.

Modified:

axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/SAAJConverterImpl.java

Modified: 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/SAAJConverterImpl.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/SAAJConverterImpl.java?rev=944347&r1=944346&r2=944347&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/SAAJConverterImpl.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/util/impl/SAAJConverterImpl.java
 Fri May 14 17:29:45 2010
@@ -158,7 +158,7 @@ public class SAAJConverterImpl implement
 //   d) possibly add an optimization to use OMSE for the body 
elements...to flatten the tree.
 try {
 omEnvelope.build();
-} catch (OMException ex){
+} catch (Exception ex){
 try {
 // Let's try to see if we can save the envelope as a string
 // and then make it into axiom SOAPEnvelope

svn commit: r944449 - in /axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2: datasource/jaxb/JAXBAttachmentUnmarshaller.java jaxws/message/attachments/JAXBAttachmentUnmarshaller.java

[veithen]

Author: veithen
Date: Fri May 14 20:28:10 2010
New Revision: 99

URL: http://svn.apache.org/viewvc?rev=99&view=rev
Log:
WSCOMMONS-518: Generalized the getOMAttachmentAccessorXMLStreamReader method so 
that XMLStreamReader wrappers of arbitrary type can be looked up; this also 
removes the dependency on the core Axiom API and breaks cyclic package 
dependencies.

Modified:

axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentUnmarshaller.java

axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/attachments/JAXBAttachmentUnmarshaller.java

Modified: 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentUnmarshaller.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentUnmarshaller.java?rev=99&r1=98&r2=99&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentUnmarshaller.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentUnmarshaller.java
 Fri May 14 20:28:10 2010
@@ -170,7 +170,7 @@ public class JAXBAttachmentUnmarshaller 
 return dh;
 }
 XMLStreamReader attachmentAccessor = 
-
XMLStreamReaderUtils.getOMAttachmentAccessorXMLStreamReader(xmlStreamReader);
+XMLStreamReaderUtils.getWrappedXMLStreamReader(xmlStreamReader, 
OMAttachmentAccessor.class);
 
 if (attachmentAccessor != null &&
 attachmentAccessor instanceof OMAttachmentAccessor) {

Modified: 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/attachments/JAXBAttachmentUnmarshaller.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/attachments/JAXBAttachmentUnmarshaller.java?rev=99&r1=98&r2=99&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/attachments/JAXBAttachmentUnmarshaller.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/attachments/JAXBAttachmentUnmarshaller.java
 Fri May 14 20:28:10 2010
@@ -55,7 +55,7 @@ public class JAXBAttachmentUnmarshaller 
 }
 
 XMLStreamReader attachmentAccessor = 
-
XMLStreamReaderUtils.getOMAttachmentAccessorXMLStreamReader(xmlStreamReader);
+XMLStreamReaderUtils.getWrappedXMLStreamReader(xmlStreamReader, 
OMAttachmentAccessor.class);
 
 if (attachmentAccessor != null &&
 attachmentAccessor instanceof OMAttachmentAccessor) {

svn commit: r944603 - /axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JavaNetClient.java

[veithen]

Author: veithen
Date: Sat May 15 09:34:18 2010
New Revision: 944603

URL: http://svn.apache.org/viewvc?rev=944603&view=rev
Log:
Added some more logging in order to understand the random build failures in 
Hudson.

Modified:

axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JavaNetClient.java

Modified: 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JavaNetClient.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JavaNetClient.java?rev=944603&r1=944602&r2=944603&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JavaNetClient.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JavaNetClient.java
 Sat May 15 09:34:18 2010
@@ -19,6 +19,7 @@
 
 package org.apache.axis2.transport.testkit.http;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URL;
@@ -32,9 +33,13 @@ import org.apache.axis2.transport.testki
 import org.apache.axis2.transport.testkit.tests.Setup;
 import org.apache.axis2.transport.testkit.tests.Transient;
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 @Name("java.net")
 public class JavaNetClient implements AsyncTestClient {
+private static final Log log = LogFactory.getLog(JavaNetClient.class);
+
 private @Transient HttpChannel channel;
 
 @Setup @SuppressWarnings("unused")
@@ -47,15 +52,22 @@ public class JavaNetClient implements As
 }
 
 public void sendMessage(ClientOptions options, ContentType contentType, 
byte[] message) throws Exception {
-URLConnection connection = new 
URL(channel.getEndpointReference().getAddress()).openConnection();
-connection.setDoOutput(true);
-connection.setDoInput(true);
-connection.setRequestProperty("Content-Type", contentType.toString());
-OutputStream out = connection.getOutputStream();
-out.write(message);
-out.close();
-InputStream in = connection.getInputStream();
-IOUtils.copy(in, System.out);
-in.close();
+URL url = new URL(channel.getEndpointReference().getAddress());
+log.debug("Opening connection to " + url + " using " + 
URLConnection.class.getName());
+try {
+URLConnection connection = url.openConnection();
+connection.setDoOutput(true);
+connection.setDoInput(true);
+connection.setRequestProperty("Content-Type", 
contentType.toString());
+OutputStream out = connection.getOutputStream();
+out.write(message);
+out.close();
+InputStream in = connection.getInputStream();
+IOUtils.copy(in, System.out);
+in.close();
+} catch (IOException ex) {
+log.debug("Got exception", ex);
+throw ex;
+}
 }
 }
\ No newline at end of file

svn commit: r944604 - /axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JavaNetClient.java

[veithen]

Author: veithen
Date: Sat May 15 09:53:53 2010
New Revision: 944604

URL: http://svn.apache.org/viewvc?rev=944604&view=rev
Log:
Still adding more logging in order to understand the random build failures in 
Hudson.

Modified:

axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JavaNetClient.java

Modified: 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JavaNetClient.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JavaNetClient.java?rev=944604&r1=944603&r2=944604&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JavaNetClient.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JavaNetClient.java
 Sat May 15 09:53:53 2010
@@ -22,6 +22,7 @@ package org.apache.axis2.transport.testk
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
 
@@ -62,6 +63,22 @@ public class JavaNetClient implements As
 OutputStream out = connection.getOutputStream();
 out.write(message);
 out.close();
+if (connection instanceof HttpURLConnection) {
+HttpURLConnection httpConnection = 
(HttpURLConnection)connection;
+log.debug("Response code: " + 
httpConnection.getResponseCode());
+log.debug("Response message: " + 
httpConnection.getResponseMessage());
+int i = 0;
+String headerValue;
+while ((headerValue = httpConnection.getHeaderField(i)) != 
null) {
+String headerName = httpConnection.getHeaderFieldKey(i);
+if (headerName != null) {
+log.debug(headerName + ": " + headerValue);
+} else {
+log.debug(headerValue);
+}
+i++;
+}
+}
 InputStream in = connection.getInputStream();
 IOUtils.copy(in, System.out);
 in.close();

svn commit: r944609 - in /axis/axis2/java/transports/trunk/modules: http/test/org/apache/axis2/transport/http/ testkit/src/main/java/org/apache/axis2/transport/testkit/http/

[veithen]

Author: veithen
Date: Sat May 15 10:32:42 2010
New Revision: 944609

URL: http://svn.apache.org/viewvc?rev=944609&view=rev
Log:
Use dynamic port allocation in HTTP tests (instead of hardcoded port 8280).

Added:

axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/HttpTestEnvironment.java
   (with props)
Modified:

axis/axis2/java/transports/trunk/modules/http/test/org/apache/axis2/transport/http/HttpTransportDescriptionFactory.java

axis/axis2/java/transports/trunk/modules/http/test/org/apache/axis2/transport/http/SimpleHTTPServerTest.java

axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/HttpChannel.java

axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/JettyServer.java

Modified: 
axis/axis2/java/transports/trunk/modules/http/test/org/apache/axis2/transport/http/HttpTransportDescriptionFactory.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/http/test/org/apache/axis2/transport/http/HttpTransportDescriptionFactory.java?rev=944609&r1=944608&r2=944609&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/http/test/org/apache/axis2/transport/http/HttpTransportDescriptionFactory.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/http/test/org/apache/axis2/transport/http/HttpTransportDescriptionFactory.java
 Sat May 15 10:32:42 2010
@@ -23,13 +23,16 @@ import org.apache.axis2.description.Para
 import org.apache.axis2.description.TransportInDescription;
 import org.apache.axis2.description.TransportOutDescription;
 import org.apache.axis2.transport.testkit.axis2.TransportDescriptionFactory;
+import org.apache.axis2.transport.testkit.http.HttpTestEnvironment;
+import org.apache.axis2.transport.testkit.tests.Setup;
 import 
org.apache.axis2.transport.testkit.util.LifecycleFixTransportListenerProxy;
 
 public class HttpTransportDescriptionFactory implements 
TransportDescriptionFactory {
-private final int port;
+private int port;
 
-public HttpTransportDescriptionFactory(int port) {
-this.port = port;
+@Setup @SuppressWarnings("unused")
+private void setUp(HttpTestEnvironment env) {
+port = env.getServerPort();
 }
 
 public TransportInDescription createTransportInDescription() throws 
Exception {

Modified: 
axis/axis2/java/transports/trunk/modules/http/test/org/apache/axis2/transport/http/SimpleHTTPServerTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/http/test/org/apache/axis2/transport/http/SimpleHTTPServerTest.java?rev=944609&r1=944608&r2=944609&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/http/test/org/apache/axis2/transport/http/SimpleHTTPServerTest.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/http/test/org/apache/axis2/transport/http/SimpleHTTPServerTest.java
 Sat May 15 10:32:42 2010
@@ -30,7 +30,7 @@ public class SimpleHTTPServerTest extend
 public static TestSuite suite() throws Exception {
 ManagedTestSuite suite = new 
ManagedTestSuite(SimpleHTTPServerTest.class);
 
-TransportDescriptionFactory tdf = new 
HttpTransportDescriptionFactory(8280);
+TransportDescriptionFactory tdf = new 
HttpTransportDescriptionFactory();
 
 new HttpTransportTestSuiteBuilder(suite, tdf).build();
 

Modified: 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/HttpChannel.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/HttpChannel.java?rev=944609&r1=944608&r2=944609&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/HttpChannel.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/HttpChannel.java
 Sat May 15 10:32:42 2010
@@ -19,7 +19,6 @@
 
 package org.apache.axis2.transport.testkit.http;
 
-import java.net.InetSocketAddress;
 import java.util.UUID;
 
 import org.apache.axis2.addressing.EndpointReference;
@@ -28,14 +27,15 @@ import org.apache.axis2.transport.testki
 import org.apache.axis2.transport.testkit.tests.Setup;
 import org.apache.axis2.transport.testkit.tests.TearDown;
 import org.apache.axis2.transport.testkit.tests.Transient;
-import org.apache.axis2.transport.testkit.util.tcpmon.Tunnel;
 
 public class HttpChannel implements AsyncChannel, RequestResponseChannel {
+private int serverPort;
 private @Transient String serviceName;
 //p

svn commit: r944617 - in /axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit: axis2/client/AxisTestClient.java tests/MessageTestCase.java tests/async/Asy

[veithen]

Author: veithen
Date: Sat May 15 11:57:56 2010
New Revision: 944617

URL: http://svn.apache.org/viewvc?rev=944617&view=rev
Log:
Added some more logging to investigate Synapse build problem.

Modified:

axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java

axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/MessageTestCase.java

axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/AsyncMessageTestCase.java

Modified: 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java?rev=944617&r1=944616&r2=944617&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java
 Sat May 15 11:57:56 2010
@@ -152,6 +152,7 @@ public class AxisTestClient implements T
 }
 }
 }
+log.debug("Message level metrics check OK");
 }
 }
 }

Modified: 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/MessageTestCase.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/MessageTestCase.java?rev=944617&r1=944616&r2=944617&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/MessageTestCase.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/MessageTestCase.java
 Sat May 15 11:57:56 2010
@@ -25,8 +25,12 @@ import org.apache.axis2.transport.testki
 import org.apache.axis2.transport.testkit.MessageExchangeValidator;
 import org.apache.axis2.transport.testkit.client.ClientOptions;
 import org.apache.axis2.transport.testkit.client.TestClient;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 public abstract class MessageTestCase extends ManagedTestCase {
+private static final Log log = LogFactory.getLog(MessageTestCase.class);
+
 protected final ContentType contentType;
 protected final ClientOptions options;
 private @Transient MessageExchangeValidator[] validators;
@@ -61,6 +65,7 @@ public abstract class MessageTestCase ex
 }
 doRunTest();
 for (MessageExchangeValidator validator : validators) {
+log.debug("Invoking message exchange validator " + 
validator.getClass().getName());
 validator.afterReceive();
 }
 }

Modified: 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/AsyncMessageTestCase.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/AsyncMessageTestCase.java?rev=944617&r1=944616&r2=944617&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/AsyncMessageTestCase.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/AsyncMessageTestCase.java
 Sat May 15 11:57:56 2010
@@ -26,8 +26,12 @@ import org.apache.axis2.transport.testki
 import org.apache.axis2.transport.testkit.endpoint.AsyncEndpoint;
 import org.apache.axis2.transport.testkit.message.IncomingMessage;
 import org.apache.axis2.transport.testkit.tests.MessageTestCase;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 public abstract class AsyncMessageTestCase extends MessageTestCase {
+private static final Log log = 
LogFactory.getLog(AsyncMessageTestCase.class);
+
 private final AsyncTestClient client;
 private final AsyncEndpoint endpoint;
 
@@ -43,17 +47,23 @@ public abstract class AsyncMessageTestCa
 @Override
 protected void doRunTest() throws Throwable {
 endpoint.clear();
+log.debug("Preparing message");
 M expected = prepareMessage();
 
 // Run the test.
 //contentTypeMode == ContentTypeMode

svn commit: r944626 - /axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/AsyncMessageTestCase.java

[veithen]

Author: veithen
Date: Sat May 15 12:27:18 2010
New Revision: 944626

URL: http://svn.apache.org/viewvc?rev=944626&view=rev
Log:
Fixed some incorrect log statements.

Modified:

axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/AsyncMessageTestCase.java

Modified: 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/AsyncMessageTestCase.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/AsyncMessageTestCase.java?rev=944626&r1=944625&r2=944626&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/AsyncMessageTestCase.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/AsyncMessageTestCase.java
 Sat May 15 12:27:18 2010
@@ -54,16 +54,16 @@ public abstract class AsyncMessageTestCa
 //contentTypeMode == ContentTypeMode.TRANSPORT ? 
contentType : null);
 log.debug("Sending message");
 client.sendMessage(options, contentType, expected);
-log.debug("Message sent; waiting for response");
+log.debug("Message sent; waiting for endpoint to receive message");
 IncomingMessage actual = endpoint.waitForMessage(8000);
 if (actual == null) {
-log.debug("No response received");
+log.debug("Message NOT received by endpoint; failing test");
 fail("Failed to get message");
 }
 
-log.debug("Response received; checking message data");
+log.debug("Message received by endpoint; checking message data");
 checkMessageData(expected, actual.getData());
-log.debug("Response has expected content");
+log.debug("Message received by endpoint has expected content");
 }
 
 protected abstract M prepareMessage() throws Exception;

svn commit: r944631 - /axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/util/MessageLevelMetricsCollectorImpl.java

[veithen]

Author: veithen
Date: Sat May 15 12:54:16 2010
New Revision: 944631

URL: http://svn.apache.org/viewvc?rev=944631&view=rev
Log:
Added some more logging to investigate Synapse build problem.

Modified:

axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/util/MessageLevelMetricsCollectorImpl.java

Modified: 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/util/MessageLevelMetricsCollectorImpl.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/util/MessageLevelMetricsCollectorImpl.java?rev=944631&r1=944630&r2=944631&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/util/MessageLevelMetricsCollectorImpl.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/util/MessageLevelMetricsCollectorImpl.java
 Sat May 15 12:54:16 2010
@@ -20,6 +20,8 @@
 package org.apache.axis2.transport.testkit.axis2.util;
 
 import org.apache.axis2.transport.base.MessageLevelMetricsCollector;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * Message level metrics collector implementation used during the tests to 
check that
@@ -28,6 +30,8 @@ import org.apache.axis2.transport.base.M
  * On any update, all threads waiting for an instance of this class are 
notified.
  */
 public class MessageLevelMetricsCollectorImpl implements 
MessageLevelMetricsCollector {
+private static final Log log = 
LogFactory.getLog(MessageLevelMetricsCollectorImpl.class);
+
 private long messagesSent;
 private long bytesSent;
 
@@ -35,6 +39,7 @@ public class MessageLevelMetricsCollecto
 }
 
 public synchronized void incrementBytesSent(long size) {
+log.debug("incrementBytesSent called with size = " + size);
 bytesSent += size;
 notifyAll();
 }
@@ -49,6 +54,7 @@ public class MessageLevelMetricsCollecto
 }
 
 public synchronized void incrementMessagesSent() {
+log.debug("incrementMessagesSent called");
 messagesSent++;
 notifyAll();
 }

svn commit: r944645 - /axis/axis2/java/transports/trunk/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailRequestResponseClient.java

[veithen]

Author: veithen
Date: Sat May 15 13:44:34 2010
New Revision: 944645

URL: http://svn.apache.org/viewvc?rev=944645&view=rev
Log:
Cleaned up some old code in the mail transport tests and make sure that mail 
folders are always properly closed.

Modified:

axis/axis2/java/transports/trunk/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailRequestResponseClient.java

Modified: 
axis/axis2/java/transports/trunk/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailRequestResponseClient.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailRequestResponseClient.java?rev=944645&r1=944644&r2=944645&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailRequestResponseClient.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailRequestResponseClient.java
 Sat May 15 13:44:34 2010
@@ -30,6 +30,7 @@ import javax.mail.Session;
 import javax.mail.Store;
 import javax.mail.internet.ContentType;
 import javax.mail.internet.InternetAddress;
+import javax.mail.internet.MimeMessage;
 
 import junit.framework.Assert;
 
@@ -103,29 +104,31 @@ public class MailRequestResponseClient e
 return reply;
 }
 
-private Message getMessage(String requestMsgId) {
-try {
-Folder folder = store.getFolder(MailConstants.DEFAULT_FOLDER);
-folder.open(Folder.READ_WRITE);
-Message[] msgs = folder.getMessages();
-log.debug(msgs.length + " replies in reply mailbox");
-for (Message m:msgs) {
-String[] inReplyTo = 
m.getHeader(MailConstants.MAIL_HEADER_IN_REPLY_TO);
-log.debug("Got reply to : " + Arrays.toString(inReplyTo));
-if (inReplyTo != null && inReplyTo.length > 0) {
-for (int j=0; j 0) {
+for (int j=0; j

svn commit: r944668 - in /axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms: JMSListener.java ServiceTaskManager.java

[veithen]

Author: veithen
Date: Sat May 15 15:41:30 2010
New Revision: 944668

URL: http://svn.apache.org/viewvc?rev=944668&view=rev
Log:
Attempt to fix the random build failure seen on Hudson. It appears that it 
sometimes happens that a test sends a message before the JMS transport is 
listening on the destination. This works fine for queues, but not for topics. 
Slightly modified the JMS transport to track the number of JMS message 
consumers and to wait for at least one to be ready.

Modified:

axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSListener.java

axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java

Modified: 
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSListener.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSListener.java?rev=944668&r1=944667&r2=944668&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSListener.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSListener.java
 Sat May 15 15:41:30 2010
@@ -87,7 +87,11 @@ public class JMSListener extends Abstrac
 stm.start();
 
 for (int i=0; i<3; i++) {
-if (stm.getActiveTaskCount() > 0) {
+// Check the consumer count rather than the active task count. 
Reason: if the
+// destination is of type topic, then the transport is only ready 
to receive
+// messages if at least one consumer exists. This is of not much 
importance,
+// except for automated tests.
+if (stm.getConsumerCount() > 0) {
 log.info("Started to listen on destination : " + 
stm.getDestinationJNDIName() +
 " of type " + 
JMSUtils.getDestinationTypeAsString(stm.getDestinationType()) +
 " for service " + stm.getServiceName());

Modified: 
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java?rev=944668&r1=944667&r2=944668&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/ServiceTaskManager.java
 Sat May 15 15:41:30 2010
@@ -34,6 +34,7 @@ import javax.transaction.NotSupportedExc
 import javax.transaction.SystemException;
 import javax.transaction.Status;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * Each service will have one ServiceTaskManager instance that will create, 
manage and also destroy
@@ -135,6 +136,8 @@ public class ServiceTaskManager {
 private volatile int serviceTaskManagerState = STATE_STOPPED;
 /** Number of invoker tasks active */
 private volatile int activeTaskCount = 0;
+/** The number of existing JMS message consumers. */
+private final AtomicInteger consumerCount = new AtomicInteger();
 /** The shared thread pool from the Listener */
 private WorkerPool workerPool = null;
 
@@ -763,6 +766,7 @@ public class ServiceTaskManager {
 if (log.isDebugEnabled()) {
 log.debug("Closing non-shared JMS consumer for service 
: " + serviceName);
 }
+consumerCount.decrementAndGet();
 consumer.close();
 } catch (JMSException e) {
 logError("Error closing JMS consumer", e);
@@ -836,11 +840,13 @@ public class ServiceTaskManager {
 log.debug("Creating a new JMS MessageConsumer for service 
: " + serviceName);
 }
 
-return JMSUtils.createConsumer(
+MessageConsumer consumer = JMSUtils.createConsumer(
 session, getDestination(session), isQueue(),
 (isSubscriptionDurable() && getDurableSubscriberName() == 
null ?
 getDurableSubscriberName() : serviceName),
 getMessageSelector(), isPubSubNoLocal(), 
isSubscriptionDurable(), isJmsSpec11());
+consumerCount.incrementAndGet();
+return consumer;
 
 } catch (JMSException e) {
 handleException("Error creating JMS consumer for service : " + 
serviceName,e);
@@ -1207,7 +

svn commit: r944687 - /axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/HttpChannel.java

[veithen]

Author: veithen
Date: Sat May 15 17:48:27 2010
New Revision: 944687

URL: http://svn.apache.org/viewvc?rev=944687&view=rev
Log:
Reenabled the connection monitoring in the HTTP tests (revert of r778520).

Modified:

axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/HttpChannel.java

Modified: 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/HttpChannel.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/HttpChannel.java?rev=944687&r1=944686&r2=944687&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/HttpChannel.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/http/HttpChannel.java
 Sat May 15 17:48:27 2010
@@ -19,6 +19,7 @@
 
 package org.apache.axis2.transport.testkit.http;
 
+import java.net.InetSocketAddress;
 import java.util.UUID;
 
 import org.apache.axis2.addressing.EndpointReference;
@@ -27,23 +28,22 @@ import org.apache.axis2.transport.testki
 import org.apache.axis2.transport.testkit.tests.Setup;
 import org.apache.axis2.transport.testkit.tests.TearDown;
 import org.apache.axis2.transport.testkit.tests.Transient;
+import org.apache.axis2.transport.testkit.util.tcpmon.Tunnel;
 
 public class HttpChannel implements AsyncChannel, RequestResponseChannel {
-private int serverPort;
 private @Transient String serviceName;
-//private @Transient Tunnel tunnel;
+private @Transient Tunnel tunnel;
 
 @Setup @SuppressWarnings("unused")
 private void setUp(HttpTestEnvironment env) throws Exception {
-serverPort = env.getServerPort();
 serviceName = "TestService-" + UUID.randomUUID();
-//tunnel = new Tunnel(new InetSocketAddress("127.0.0.1", 8280));
-//tunnel.start();
+tunnel = new Tunnel(new InetSocketAddress("127.0.0.1", 
env.getServerPort()));
+tunnel.start();
 }
 
 @TearDown @SuppressWarnings("unused")
 private void tearDown() throws Exception {
-//tunnel.stop();
+tunnel.stop();
 }
 
 public String getServiceName() {
@@ -51,6 +51,6 @@ public class HttpChannel implements Asyn
 }
 
 public EndpointReference getEndpointReference() throws Exception {
-return new EndpointReference("http://localhost:"; + /* tunnel.getPort() 
*/ serverPort + CONTEXT_PATH + "/" + serviceName);
+return new EndpointReference("http://localhost:"; + tunnel.getPort() + 
CONTEXT_PATH + "/" + serviceName);
 }
 }
\ No newline at end of file

svn commit: r944695 - /axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java

[veithen]

Author: veithen
Date: Sat May 15 18:34:07 2010
New Revision: 944695

URL: http://svn.apache.org/viewvc?rev=944695&view=rev
Log:
Fixed an issue that may cause the tests to hang (for a long time): in some 
cases, AxisTestClient may call Object#wait(0) which is the same as 
Object#wait().

Modified:

axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java

Modified: 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java?rev=944695&r1=944694&r2=944695&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java
 Sat May 15 18:34:07 2010
@@ -142,7 +142,7 @@ public class AxisTestClient implements T
 // SYNAPSE-491: Maybe the transport sender didn't 
finish updating the
 // metrics yet. We give it a couple of seconds to do 
so.
 long remaining = start + 5000 - 
System.currentTimeMillis();
-if (remaining < 0) {
+if (remaining <= 0) {
 throw ex;
 } else {
 log.debug("The transport sender didn't update the 
metrics yet ("

svn commit: r944704 - /axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/MetricsCollector.java

[veithen]

Author: veithen
Date: Sat May 15 19:33:15 2010
New Revision: 944704

URL: http://svn.apache.org/viewvc?rev=944704&view=rev
Log:
Clarify the messagesSent metric.

Modified:

axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/MetricsCollector.java

Modified: 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/MetricsCollector.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/MetricsCollector.java?rev=944704&r1=944703&r2=944704&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/MetricsCollector.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/MetricsCollector.java
 Sat May 15 19:33:15 2010
@@ -107,6 +107,12 @@ public class MetricsCollector {
 return bytesReceived;
 }
 
+/**
+ * Get the number of messages sent. This metrics is incremented after a
+ * message has been completely and successfully put on the wire.
+ * 
+ * @return the number of messages sent
+ */
 public long getMessagesSent() {
 return messagesSent;
 }

svn commit: r944719 - /axis/axis2/java/transports/trunk/modules/sms/src/test/java/org/apache/axis2/transport/sms/smpp/SimpleSMSC.java

[veithen]

Author: veithen
Date: Sat May 15 21:06:34 2010
New Revision: 944719

URL: http://svn.apache.org/viewvc?rev=944719&view=rev
Log:
Attempt to fix unstable Hudson build of the SMS transport.

Modified:

axis/axis2/java/transports/trunk/modules/sms/src/test/java/org/apache/axis2/transport/sms/smpp/SimpleSMSC.java

Modified: 
axis/axis2/java/transports/trunk/modules/sms/src/test/java/org/apache/axis2/transport/sms/smpp/SimpleSMSC.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/sms/src/test/java/org/apache/axis2/transport/sms/smpp/SimpleSMSC.java?rev=944719&r1=944718&r2=944719&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/sms/src/test/java/org/apache/axis2/transport/sms/smpp/SimpleSMSC.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/sms/src/test/java/org/apache/axis2/transport/sms/smpp/SimpleSMSC.java
 Sat May 15 21:06:34 2010
@@ -91,6 +91,12 @@ public class SimpleSMSC  extends ServerR
 serverSession = sessionListener.accept();
 serverSession.setMessageReceiverListener(this);
 serverSession.setResponseDeliveryListener(this);
+
+// TODO: quick fix for build instability; if not set, the 
Hudson build
+//   may fail with a message such as "No response after 
waiting for 2000 millis
+//   when executing deliver_sm with sessionId 8cc2b5f5 and 
sequenceNumber 1"
+serverSession.setTransactionTimer(1);
+
 execService.execute(new WaitBindTask(serverSession));
 Thread.sleep(1000);
 

svn commit: r944915 - in /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder: BuilderUtil.java SOAPBuilder.java

[veithen]

Author: veithen
Date: Sun May 16 21:17:02 2010
New Revision: 944915

URL: http://svn.apache.org/viewvc?rev=944915&view=rev
Log:
AXIS2-4450: Strictly forbid document type declarations in both SOAP and plain 
XML requests.

Modified:

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java

axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/SOAPBuilder.java

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java?rev=944915&r1=944914&r2=944915&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/BuilderUtil.java
 Sun May 16 21:17:02 2010
@@ -32,6 +32,7 @@ import org.apache.axiom.om.impl.MTOMCons
 import org.apache.axiom.om.impl.builder.StAXBuilder;
 import org.apache.axiom.om.impl.builder.StAXOMBuilder;
 import org.apache.axiom.om.impl.builder.XOPAwareStAXOMBuilder;
+import org.apache.axiom.om.util.StAXParserConfiguration;
 import org.apache.axiom.om.util.StAXUtils;
 import org.apache.axiom.soap.SOAP11Constants;
 import org.apache.axiom.soap.SOAP12Constants;
@@ -227,8 +228,11 @@ public class BuilderUtil {
 public static StAXBuilder getPOXBuilder(InputStream inStream, String 
charSetEnc)
 throws XMLStreamException {
 StAXBuilder builder;
+// We use the StAXParserConfiguration.SOAP here as well because we 
don't want to allow
+// document type declarations (that potentially reference external 
entities), even
+// in plain XML messages.
 XMLStreamReader xmlreader =
-StAXUtils.createXMLStreamReader(inStream, charSetEnc);
+StAXUtils.createXMLStreamReader(StAXParserConfiguration.SOAP, 
inStream, charSetEnc);
 builder = new StAXOMBuilder(xmlreader);
 return builder;
 }

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/SOAPBuilder.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/SOAPBuilder.java?rev=944915&r1=944914&r2=944915&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/SOAPBuilder.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/builder/SOAPBuilder.java
 Sun May 16 21:17:02 2010
@@ -21,6 +21,7 @@ package org.apache.axis2.builder;
 
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.impl.builder.StAXBuilder;
+import org.apache.axiom.om.util.StAXParserConfiguration;
 import org.apache.axiom.om.util.StAXUtils;
 import org.apache.axiom.om.util.DetachableInputStream;
 import org.apache.axiom.soap.SOAPEnvelope;
@@ -54,8 +55,14 @@ public class SOAPBuilder implements Buil
 PushbackInputStream pis = BuilderUtil.getPushbackInputStream(is);
 String actualCharSetEncoding = BuilderUtil.getCharSetEncoding(pis, 
charSetEncoding);
 
-// Get the XMLStreamReader for this input stream
-streamReader = StAXUtils.createXMLStreamReader(pis, 
actualCharSetEncoding);
+// Get the XMLStreamReader for this input stream.
+// Note: StAXSOAPModelBuilder will trigger an exception when it 
encounters a DTD event.
+//   However, with StAX implementations other than Woodstox, 
this may already be
+//   too late. For these parsers, additional settings may be 
required. We let
+//   the StAX dialect detector in Axiom apply the necessary 
configuration.
+//   See also AXIS2-4450.
+streamReader = 
StAXUtils.createXMLStreamReader(StAXParserConfiguration.SOAP, pis,
+actualCharSetEncoding);
 
 StAXBuilder builder = new StAXSOAPModelBuilder(streamReader);
 SOAPEnvelope envelope = (SOAPEnvelope) 
builder.getDocumentElement();

svn commit: r946742 - /axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/ProtocolEndpoint.java

[veithen]

Author: veithen
Date: Thu May 20 18:21:47 2010
New Revision: 946742

URL: http://svn.apache.org/viewvc?rev=946742&view=rev
Log:
Fixed outdated Javadoc.

Modified:

axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/ProtocolEndpoint.java

Modified: 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/ProtocolEndpoint.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/ProtocolEndpoint.java?rev=946742&r1=946741&r2=946742&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/ProtocolEndpoint.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/ProtocolEndpoint.java
 Thu May 20 18:21:47 2010
@@ -63,8 +63,8 @@ public abstract class ProtocolEndpoint {
  * return false. An exception should only be thrown if there 
is an
  * error or inconsistency in the parameters.
  * 
- * @param params The source of the parameters to construct the
- *   poll table entry. If the parameters are defined on
+ * @param params The source of the parameters to configure the
+ *   endpoint. If the parameters are defined on
  *   a service, this will be an {...@link AxisService}
  *   instance.
  * @return true if the parameters contained the required 
configuration

svn commit: r947421 - /axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/datagram/AbstractDatagramTransportListener.java

[veithen]

Author: veithen
Date: Sun May 23 14:51:02 2010
New Revision: 947421

URL: http://svn.apache.org/viewvc?rev=947421&view=rev
Log:
Removed unused import.

Modified:

axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/datagram/AbstractDatagramTransportListener.java

Modified: 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/datagram/AbstractDatagramTransportListener.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/datagram/AbstractDatagramTransportListener.java?rev=947421&r1=947420&r2=947421&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/datagram/AbstractDatagramTransportListener.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/datagram/AbstractDatagramTransportListener.java
 Sun May 23 14:51:02 2010
@@ -21,7 +21,6 @@ package org.apache.axis2.transport.base.
 import java.io.IOException;
 import java.net.SocketException;
 import java.net.SocketAddress;
-import java.nio.channels.DatagramChannel;
 
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.ConfigurationContext;

svn commit: r947423 - /axis/axis2/java/transports/trunk/modules/udp/pom.xml

[veithen]

Author: veithen
Date: Sun May 23 15:02:14 2010
New Revision: 947423

URL: http://svn.apache.org/viewvc?rev=947423&view=rev
Log:
Fixed formatting.

Modified:
axis/axis2/java/transports/trunk/modules/udp/pom.xml

Modified: axis/axis2/java/transports/trunk/modules/udp/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/udp/pom.xml?rev=947423&r1=947422&r2=947423&view=diff
==
--- axis/axis2/java/transports/trunk/modules/udp/pom.xml (original)
+++ axis/axis2/java/transports/trunk/modules/udp/pom.xml Sun May 23 15:02:14 
2010
@@ -34,7 +34,7 @@
 bundle
 
 
-  test
+test
 
 
 org.apache.felix
@@ -63,13 +63,12 @@
 axis2-transport-base
 ${version}
 
-  
-org.apache.axis2
-axis2-transport-testkit
-${pom.version}
-test
-  
-  
+
+org.apache.axis2
+axis2-transport-testkit
+${pom.version}
+test
+
 
 commons-logging
 commons-logging

svn commit: r947425 - in /axis/axis2/java/transports/trunk/modules/udp: pom.xml src/test/ src/test/java/ src/test/java/org/ test/

[veithen]

Author: veithen
Date: Sun May 23 15:11:40 2010
New Revision: 947425

URL: http://svn.apache.org/viewvc?rev=947425&view=rev
Log:
Guys, I can understand that there are fans of the src & test naming convention, 
but please don't use two different conventions (src/main/java & test) in the 
same project...

Added:
axis/axis2/java/transports/trunk/modules/udp/src/test/
axis/axis2/java/transports/trunk/modules/udp/src/test/java/
axis/axis2/java/transports/trunk/modules/udp/src/test/java/org/
  - copied from r947423, 
axis/axis2/java/transports/trunk/modules/udp/test/org/
Removed:
axis/axis2/java/transports/trunk/modules/udp/test/
Modified:
axis/axis2/java/transports/trunk/modules/udp/pom.xml

Modified: axis/axis2/java/transports/trunk/modules/udp/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/udp/pom.xml?rev=947425&r1=947424&r2=947425&view=diff
==
--- axis/axis2/java/transports/trunk/modules/udp/pom.xml (original)
+++ axis/axis2/java/transports/trunk/modules/udp/pom.xml Sun May 23 15:11:40 
2010
@@ -34,7 +34,6 @@
 bundle
 
 
-test
 
 
 org.apache.felix

svn commit: r947435 - in /axis/axis2/java/transports/trunk/modules/udp/src/test/java/org/apache/axis2/transport/udp: UDPChannel.java UDPTransportTest.java

[veithen]

Author: veithen
Date: Sun May 23 15:51:48 2010
New Revision: 947435

URL: http://svn.apache.org/viewvc?rev=947435&view=rev
Log:
Enabled some basic tests from the testkit in the UDP transport.

Added:

axis/axis2/java/transports/trunk/modules/udp/src/test/java/org/apache/axis2/transport/udp/UDPChannel.java
   (with props)

axis/axis2/java/transports/trunk/modules/udp/src/test/java/org/apache/axis2/transport/udp/UDPTransportTest.java
   (with props)

Added: 
axis/axis2/java/transports/trunk/modules/udp/src/test/java/org/apache/axis2/transport/udp/UDPChannel.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/udp/src/test/java/org/apache/axis2/transport/udp/UDPChannel.java?rev=947435&view=auto
==
--- 
axis/axis2/java/transports/trunk/modules/udp/src/test/java/org/apache/axis2/transport/udp/UDPChannel.java
 (added)
+++ 
axis/axis2/java/transports/trunk/modules/udp/src/test/java/org/apache/axis2/transport/udp/UDPChannel.java
 Sun May 23 15:51:48 2010
@@ -0,0 +1,41 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *   * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.axis2.transport.udp;
+
+import org.apache.axis2.addressing.EndpointReference;
+import org.apache.axis2.description.AxisService;
+import org.apache.axis2.transport.testkit.axis2.AxisServiceConfigurator;
+import org.apache.axis2.transport.testkit.channel.AsyncChannel;
+import org.apache.axis2.transport.testkit.channel.RequestResponseChannel;
+
+// TODO: need to find a way to get the content type (which differs from one 
test case to another) at this level
+public class UDPChannel implements AsyncChannel, RequestResponseChannel, 
AxisServiceConfigurator {
+private final int port = ; // TODO: should use port allocator here
+
+public EndpointReference getEndpointReference() throws Exception {
+return new EndpointReference("udp://127.0.0.1:" + port + 
"?contentType=text/xml");
+}
+
+public void setupService(AxisService service, boolean isClientSide) throws 
Exception {
+if (!isClientSide) {
+service.addParameter(UDPConstants.PORT_KEY, String.valueOf(port));
+service.addParameter(UDPConstants.CONTENT_TYPE_KEY, "text/xml");
+}
+}
+}

Propchange: 
axis/axis2/java/transports/trunk/modules/udp/src/test/java/org/apache/axis2/transport/udp/UDPChannel.java
--
svn:eol-style = native

Added: 
axis/axis2/java/transports/trunk/modules/udp/src/test/java/org/apache/axis2/transport/udp/UDPTransportTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/udp/src/test/java/org/apache/axis2/transport/udp/UDPTransportTest.java?rev=947435&view=auto
==
--- 
axis/axis2/java/transports/trunk/modules/udp/src/test/java/org/apache/axis2/transport/udp/UDPTransportTest.java
 (added)
+++ 
axis/axis2/java/transports/trunk/modules/udp/src/test/java/org/apache/axis2/transport/udp/UDPTransportTest.java
 Sun May 23 15:51:48 2010
@@ -0,0 +1,57 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *   * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.axis2.transport.udp;
+
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+im

svn commit: r947440 - /axis/axis2/java/transports/trunk/modules/udp/src/main/java/org/apache/axis2/transport/udp/UDPSender.java

[veithen]

Author: veithen
Date: Sun May 23 16:17:42 2010
New Revision: 947440

URL: http://svn.apache.org/viewvc?rev=947440&view=rev
Log:
Fixed an issue in the UDP transport that prevents it from correctly indicating 
the end of the message to the StAX parser. Regression test will follow 
(reproducing this bug with the testkit also reveals related problems in other 
transports).

Modified:

axis/axis2/java/transports/trunk/modules/udp/src/main/java/org/apache/axis2/transport/udp/UDPSender.java

Modified: 
axis/axis2/java/transports/trunk/modules/udp/src/main/java/org/apache/axis2/transport/udp/UDPSender.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/udp/src/main/java/org/apache/axis2/transport/udp/UDPSender.java?rev=947440&r1=947439&r2=947440&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/udp/src/main/java/org/apache/axis2/transport/udp/UDPSender.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/udp/src/main/java/org/apache/axis2/transport/udp/UDPSender.java
 Sun May 23 16:17:42 2010
@@ -124,7 +124,7 @@ public class UDPSender extends AbstractT
 // create the soap envelope
 try {
 MessageContext respMessageContext = 
messageContext.getOperationContext().getMessageContext(WSDL2Constants.MESSAGE_LABEL_IN);
-InputStream inputStream = new ByteArrayInputStream(inputBuffer, 0, 
inputBuffer.length);
+InputStream inputStream = new ByteArrayInputStream(inputBuffer, 0, 
packet.getLength());
 SOAPEnvelope envelope = 
TransportUtils.createSOAPMessage(respMessageContext, inputStream, contentType);
 respMessageContext.setEnvelope(envelope);
 } catch (XMLStreamException e) {

svn commit: r947447 - in /axis/axis2/java/transports/trunk/modules: mail/src/test/java/org/apache/axis2/transport/mail/ testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/ testkit/s

[veithen]

Author: veithen
Date: Sun May 23 17:21:24 2010
New Revision: 947447

URL: http://svn.apache.org/viewvc?rev=947447&view=rev
Log:
Added a regression test for the issue fixed in r947440 and temporarily disabled 
the test cases that reproduce the issue described in WSCOMMONS-544.

Modified:

axis/axis2/java/transports/trunk/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailTransportTest.java

axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java

axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/message/AxisMessage.java

Modified: 
axis/axis2/java/transports/trunk/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailTransportTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailTransportTest.java?rev=947447&r1=947446&r2=947447&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailTransportTest.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailTransportTest.java
 Sun May 23 17:21:24 2010
@@ -61,7 +61,8 @@ public class MailTransportTest extends T
 
 builder.addRequestResponseChannel(channel);
 
-builder.addAxisRequestResponseTestClient(new 
AxisRequestResponseTestClient(), new ResponseListenerConfigurator());
+// TODO: this doesn't work because of WSCOMMONS-544
+//builder.addAxisRequestResponseTestClient(new 
AxisRequestResponseTestClient(), new ResponseListenerConfigurator());
 builder.addByteArrayRequestResponseTestClient(new 
MailRequestResponseClient(new FlatLayout()));
 builder.addByteArrayRequestResponseTestClient(new 
MailRequestResponseClient(new MultipartLayout()));
 

Modified: 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java?rev=947447&r1=947446&r2=947447&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/axis2/client/AxisTestClient.java
 Sun May 23 17:21:24 2010
@@ -119,7 +119,7 @@ public class AxisTestClient implements T
 }
 mepClient.addMessageContext(mc);
 mepClient.execute(block);
-mepClient.complete(mc);
+//mepClient.complete(mc);
 return resultMessageLabel == null ? null : 
mepClient.getMessageContext(resultMessageLabel);
 }
 

Modified: 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/message/AxisMessage.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/message/AxisMessage.java?rev=947447&r1=947446&r2=947447&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/message/AxisMessage.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/message/AxisMessage.java
 Sun May 23 17:21:24 2010
@@ -20,6 +20,7 @@
 package org.apache.axis2.transport.testkit.message;
 
 import org.apache.axiom.attachments.Attachments;
+import org.apache.axiom.om.OMDocument;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMSourcedElement;
 import org.apache.axiom.soap.SOAPEnvelope;
@@ -41,7 +42,15 @@ public class AxisMessage {
 
 public AxisMessage(MessageContext msgContext) throws Exception {
 envelope = msgContext.getEnvelope();
-envelope.build();
+// If possible, build the parent (i.e. the OMDocument) to make sure 
that the entire message is read.
+// If the transport doesn't handle the end of the message properly, 
then this problem
+// will show up here.
+OMDocument document = (OMDocument)envelope.getParent();
+if (document != null) {
+document.build();
+} else {
+envelope.build();
+}
 
 // TODO: quick & dirty hack to force expansion of OMSourceElement 
payloads
 OMElement content = envelope.getBody().getFirstElement();

svn commit: r947453 - in /axis/axis2/java/transports/trunk/modules: base/src/main/java/org/apache/axis2/transport/base/ base/src/main/java/org/apache/axis2/transport/base/datagram/ udp/src/main/java/o

[veithen]

Author: veithen
Date: Sun May 23 18:05:46 2010
New Revision: 947453

URL: http://svn.apache.org/viewvc?rev=947453&view=rev
Log:
Applied Hiranya's patch for AXIS2-4722 (AXIS2-4722-update2.patch) without 
changes.

Modified:

axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListener.java

axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListenerEx.java

axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/datagram/AbstractDatagramTransportListener.java

axis/axis2/java/transports/trunk/modules/udp/src/main/java/org/apache/axis2/transport/udp/IODispatcher.java

axis/axis2/java/transports/trunk/modules/udp/src/main/java/org/apache/axis2/transport/udp/UDPListener.java

axis/axis2/java/transports/trunk/modules/udp/src/main/java/org/apache/axis2/transport/udp/UDPSender.java

Modified: 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListener.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListener.java?rev=947453&r1=947452&r2=947453&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListener.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListener.java
 Sun May 23 18:05:46 2010
@@ -173,7 +173,7 @@ public abstract class AbstractTransportL
 state = BaseConstants.STARTED;
 // register to receive updates on services for lifetime management
 // cfgCtx.getAxisConfiguration().addObservers(axisObserver);
-log.info(getTransportName().toUpperCase() + " Listener started");
+log.info(getTransportName().toUpperCase() + " listener started");
 // iterate through deployed services and start
 serviceTracker.start();
 }

Modified: 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListenerEx.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListenerEx.java?rev=947453&r1=947452&r2=947453&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListenerEx.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListenerEx.java
 Sun May 23 18:05:46 2010
@@ -45,6 +45,8 @@ public abstract class AbstractTransportL
 /** A Map of service name to the protocol endpoints */
 private List endpoints = new ArrayList();
 
+protected boolean useGlobalListener = false;
+
 @Override
 public void init(ConfigurationContext cfgCtx,
 TransportInDescription transportIn) throws AxisFault {
@@ -112,6 +114,8 @@ public abstract class AbstractTransportL
 if (endpoint.loadConfiguration(service)) {
 startEndpoint(endpoint);
 endpoints.add(endpoint);
+} else if (useGlobalListener) {
+return;
 } else {
 throw new AxisFault("Service doesn't have configuration 
information for transport " +
 getTransportName());

Modified: 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/datagram/AbstractDatagramTransportListener.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/datagram/AbstractDatagramTransportListener.java?rev=947453&r1=947452&r2=947453&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/datagram/AbstractDatagramTransportListener.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/datagram/AbstractDatagramTransportListener.java
 Sun May 23 18:05:46 2010
@@ -38,6 +38,14 @@ public abstract class AbstractDatagramTr
 throws AxisFault {
 
 super.init(cfgCtx, transportIn);
+initDispatcher();
+}
+
+private void initDispatcher() throws AxisFault {
+if (dispatcher != null) {
+return;
+}
+
 DatagramDispatcherCallback callback = new DatagramDispatcherCallback() 
{
 
 public void receive(SocketAddress address,
@@ -47,11 +55,13 @@ 

svn commit: r947458 - in /axis/axis2/java/transports/trunk/modules: base/src/main/java/org/apache/axis2/transport/base/ base/src/main/java/org/apache/axis2/transport/base/datagram/ jms/src/main/java/o

[veithen]

Author: veithen
Date: Sun May 23 18:22:58 2010
New Revision: 947458

URL: http://svn.apache.org/viewvc?rev=947458&view=rev
Log:
AXIS2-4722: Introduced an abstract doInit method in AbstractTransportListenerEx 
so that derived classes can properly do their initialization stuff before the 
first endpoint is created.

Modified:

axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractPollingTransportListener.java

axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListener.java

axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListenerEx.java

axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/datagram/AbstractDatagramTransportListener.java

axis/axis2/java/transports/trunk/modules/jms/src/main/java/org/apache/axis2/transport/jms/JMSListener.java

axis/axis2/java/transports/trunk/modules/mail/src/main/java/org/apache/axis2/transport/mail/MailTransportListener.java

Modified: 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractPollingTransportListener.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractPollingTransportListener.java?rev=947458&r1=947457&r2=947458&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractPollingTransportListener.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractPollingTransportListener.java
 Sun May 23 18:22:58 2010
@@ -18,8 +18,6 @@
 */
 package org.apache.axis2.transport.base;
 
-import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.description.TransportInDescription;
 import org.apache.axis2.AxisFault;
 
 import java.util.ArrayList;
@@ -36,11 +34,8 @@ public abstract class AbstractPollingTra
 private final List endpoints = new ArrayList();
 
 @Override
-public void init(ConfigurationContext cfgCtx,
-TransportInDescription transportIn) throws AxisFault {
-
+protected void doInit() throws AxisFault {
 timer = new Timer("PollTimer");
-super.init(cfgCtx, transportIn);
 }
 
 @Override

Modified: 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListener.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListener.java?rev=947458&r1=947457&r2=947458&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListener.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListener.java
 Sun May 23 18:22:58 2010
@@ -347,6 +347,10 @@ public abstract class AbstractTransportL
 log.error(msg, e);
 }
 
+public TransportInDescription getTransportInDescription() {
+return transportIn;
+}
+
 public String getTransportName() {
 return transportIn.getName();
 }

Modified: 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListenerEx.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListenerEx.java?rev=947458&r1=947457&r2=947458&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListenerEx.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListenerEx.java
 Sun May 23 18:22:58 2010
@@ -48,11 +48,13 @@ public abstract class AbstractTransportL
 protected boolean useGlobalListener = false;
 
 @Override
-public void init(ConfigurationContext cfgCtx,
+public final void init(ConfigurationContext cfgCtx,
 TransportInDescription transportIn) throws AxisFault {
 
 super.init(cfgCtx, transportIn);
 
+doInit();
+
 // Create endpoint configured at transport level (if available)
 E endpoint = createEndpoint();
 endpoint.init(this, null);
@@ -62,6 +64,15 @@ public abstract class AbstractTransportL
 }
 }
 
+/**
+ * Initialize the transport. This method will be called after the 
initialization work in
+ * {...@link Abstra

svn commit: r947460 - /axis/axis2/java/transports/trunk/modules/udp/src/main/java/org/apache/axis2/transport/udp/UDPSender.java

[veithen]

Author: veithen
Date: Sun May 23 18:29:01 2010
New Revision: 947460

URL: http://svn.apache.org/viewvc?rev=947460&view=rev
Log:
Two unsaved changes that were missing in r947453.

Modified:

axis/axis2/java/transports/trunk/modules/udp/src/main/java/org/apache/axis2/transport/udp/UDPSender.java

Modified: 
axis/axis2/java/transports/trunk/modules/udp/src/main/java/org/apache/axis2/transport/udp/UDPSender.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/udp/src/main/java/org/apache/axis2/transport/udp/UDPSender.java?rev=947460&r1=947459&r2=947460&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/udp/src/main/java/org/apache/axis2/transport/udp/UDPSender.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/udp/src/main/java/org/apache/axis2/transport/udp/UDPSender.java
 Sun May 23 18:29:01 2010
@@ -130,9 +130,11 @@ public class UDPSender extends AbstractT
 
 // create the soap envelope
 try {
-MessageContext respMessageContext = 
messageContext.getOperationContext().getMessageContext(WSDL2Constants.MESSAGE_LABEL_IN);
+MessageContext respMessageContext = 
messageContext.getOperationContext().
+getMessageContext(WSDL2Constants.MESSAGE_LABEL_IN);
 InputStream inputStream = new ByteArrayInputStream(inputBuffer, 0, 
packet.getLength());
-SOAPEnvelope envelope = 
TransportUtils.createSOAPMessage(respMessageContext, inputStream, contentType);
+SOAPEnvelope envelope = 
TransportUtils.createSOAPMessage(respMessageContext,
+inputStream, contentType);
 respMessageContext.setEnvelope(envelope);
 } catch (XMLStreamException e) {
 throw new AxisFault("Can not build the soap message ", e);

svn commit: r947461 - /axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractPollingTransportListener.java

[veithen]

Author: veithen
Date: Sun May 23 18:29:56 2010
New Revision: 947461

URL: http://svn.apache.org/viewvc?rev=947461&view=rev
Log:
Removed unused attribute (left over from a previous refactoring).

Modified:

axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractPollingTransportListener.java

Modified: 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractPollingTransportListener.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractPollingTransportListener.java?rev=947461&r1=947460&r2=947461&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractPollingTransportListener.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractPollingTransportListener.java
 Sun May 23 18:29:56 2010
@@ -20,8 +20,6 @@ package org.apache.axis2.transport.base;
 
 import org.apache.axis2.AxisFault;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.TimerTask;
 import java.util.Timer;
 
@@ -30,8 +28,6 @@ public abstract class AbstractPollingTra
 
 /** The main timer. */
 private Timer timer;
-/** Keep the list of endpoints and poll durations */
-private final List endpoints = new ArrayList();
 
 @Override
 protected void doInit() throws AxisFault {

svn commit: r947463 - in /axis/axis2/java/transports/trunk/modules: base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListenerEx.java udp/src/main/java/org/apache/axis2/transport/udp

[veithen]

Author: veithen
Date: Sun May 23 18:39:33 2010
New Revision: 947463

URL: http://svn.apache.org/viewvc?rev=947463&view=rev
Log:
AXIS2-4722: Set the useGlobalListener attribute automatically based on the 
configuration of the transport.

Modified:

axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListenerEx.java

axis/axis2/java/transports/trunk/modules/udp/src/main/java/org/apache/axis2/transport/udp/UDPListener.java

Modified: 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListenerEx.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListenerEx.java?rev=947463&r1=947462&r2=947463&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListenerEx.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListenerEx.java
 Sun May 23 18:39:33 2010
@@ -45,7 +45,7 @@ public abstract class AbstractTransportL
 /** A Map of service name to the protocol endpoints */
 private List endpoints = new ArrayList();
 
-protected boolean useGlobalListener = false;
+private boolean useGlobalListener;
 
 @Override
 public final void init(ConfigurationContext cfgCtx,
@@ -61,6 +61,7 @@ public abstract class AbstractTransportL
 if (endpoint.loadConfiguration(transportIn)) {
 startEndpoint(endpoint);
 endpoints.add(endpoint);
+useGlobalListener = true;
 }
 }
 
@@ -144,8 +145,10 @@ public abstract class AbstractTransportL
 return;
 }
 }
-log.error("Unable to stop service : " + service.getName() +
-" - unable to find the corresponding protocol endpoint");
+if (!useGlobalListener) {
+log.error("Unable to stop service : " + service.getName() +
+" - unable to find the corresponding protocol endpoint");
+}
 }
 
 protected abstract void stopEndpoint(E endpoint);

Modified: 
axis/axis2/java/transports/trunk/modules/udp/src/main/java/org/apache/axis2/transport/udp/UDPListener.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/udp/src/main/java/org/apache/axis2/transport/udp/UDPListener.java?rev=947463&r1=947462&r2=947463&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/udp/src/main/java/org/apache/axis2/transport/udp/UDPListener.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/udp/src/main/java/org/apache/axis2/transport/udp/UDPListener.java
 Sun May 23 18:39:33 2010
@@ -44,10 +44,6 @@ import org.apache.axis2.transport.base.d
 public class UDPListener extends AbstractDatagramTransportListener
 implements ManagementSupport {
 
-public UDPListener() {
-this.useGlobalListener = true;
-}
-
 @Override
 protected IODispatcher createDispatcher(DatagramDispatcherCallback 
callback)
 throws IOException {

svn commit: r947503 - in /axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit: client/ClientOptions.java tests/async/SwATestCase.java

[veithen]

Author: veithen
Date: Sun May 23 21:59:22 2010
New Revision: 947503

URL: http://svn.apache.org/viewvc?rev=947503&view=rev
Log:
Replaced some usages of UUIDGenerator by UIDGenerator.

Modified:

axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/client/ClientOptions.java

axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/SwATestCase.java

Modified: 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/client/ClientOptions.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/client/ClientOptions.java?rev=947503&r1=947502&r2=947503&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/client/ClientOptions.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/client/ClientOptions.java
 Sun May 23 21:59:22 2010
@@ -21,7 +21,7 @@ package org.apache.axis2.transport.testk
 
 import javax.mail.internet.ContentType;
 
-import org.apache.axiom.om.util.UUIDGenerator;
+import org.apache.axiom.util.UIDGenerator;
 
 public class ClientOptions {
 private final ContentType transportContentType;
@@ -45,20 +45,14 @@ public class ClientOptions {
 
 public String getMimeBoundary() {
 if (mimeBoundary == null) {
-mimeBoundary =
-"MIMEBoundary"
-+ UUIDGenerator.getUUID().replace(':', '_');
-
+mimeBoundary = UIDGenerator.generateMimeBoundary();
 }
 return mimeBoundary;
 }
 
 public String getRootContentId() {
 if (rootContentId == null) {
-rootContentId =
-"0."
-+ UUIDGenerator.getUUID()
-+ "@apache.org";
+rootContentId = UIDGenerator.generateContentId();
 }
 return rootContentId;
 }

Modified: 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/SwATestCase.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/SwATestCase.java?rev=947503&r1=947502&r2=947503&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/SwATestCase.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/testkit/src/main/java/org/apache/axis2/transport/testkit/tests/async/SwATestCase.java
 Sun May 23 21:59:22 2010
@@ -32,6 +32,7 @@ import org.apache.axiom.om.OMAbstractFac
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
 import org.apache.axiom.om.util.UUIDGenerator;
+import org.apache.axiom.util.UIDGenerator;
 import org.apache.axis2.transport.testkit.channel.AsyncChannel;
 import org.apache.axis2.transport.testkit.client.AsyncTestClient;
 import org.apache.axis2.transport.testkit.endpoint.AsyncEndpoint;
@@ -54,7 +55,7 @@ public class SwATestCase extends AsyncMe
 super.setUp();
 attachmentContent = new byte[8192];
 random.nextBytes(attachmentContent);
-contentID = UUIDGenerator.getUUID();
+contentID = UIDGenerator.generateContentId();
 }
 
 @Override

svn commit: r947509 - /axis/axis2/java/transports/trunk/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailTransportTest.java

[veithen]

Author: veithen
Date: Sun May 23 22:19:46 2010
New Revision: 947509

URL: http://svn.apache.org/viewvc?rev=947509&view=rev
Log:
Reenabled some test cases that actually work.

Modified:

axis/axis2/java/transports/trunk/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailTransportTest.java

Modified: 
axis/axis2/java/transports/trunk/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailTransportTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailTransportTest.java?rev=947509&r1=947508&r2=947509&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailTransportTest.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/mail/src/test/java/org/apache/axis2/transport/mail/MailTransportTest.java
 Sun May 23 22:19:46 2010
@@ -39,7 +39,7 @@ public class MailTransportTest extends T
 suite.addExclude("(&(test=AsyncSwA)(client=javamail))");
 // There seems to be a problem with Sun's IMAP client or GreenMail's 
IMAP server
 // in this particular case:
-
suite.addExclude("(&(protocol=imap)(|(test=AsyncSwA)(&(test=EchoXML)(messageType=SOAP12");
+suite.addExclude("(&(protocol=imap)(test=AsyncSwA))");
 // SYNAPSE-434
 suite.addExclude("(test=MinConcurrency)");
 

svn commit: r947696 - in /axis/axis2/java/transports/trunk/modules: base/src/main/java/org/apache/axis2/transport/base/datagram/ udp/src/main/java/org/apache/axis2/transport/udp/

[veithen]

Author: veithen
Date: Mon May 24 16:08:04 2010
New Revision: 947696

URL: http://svn.apache.org/viewvc?rev=947696&view=rev
Log:
WSCOMMONS-543: Decouple org.apache.axis2.transport.base.datagram from 
SocketAddress so that it's initial design is preserved.

Modified:

axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/datagram/AbstractDatagramTransportListener.java

axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/datagram/DatagramDispatcherCallback.java

axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/datagram/DatagramOutTransportInfo.java

axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/datagram/ProcessPacketTask.java

axis/axis2/java/transports/trunk/modules/udp/src/main/java/org/apache/axis2/transport/udp/IODispatcher.java

axis/axis2/java/transports/trunk/modules/udp/src/main/java/org/apache/axis2/transport/udp/UDPOutTransportInfo.java

axis/axis2/java/transports/trunk/modules/udp/src/main/java/org/apache/axis2/transport/udp/UDPSender.java

Modified: 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/datagram/AbstractDatagramTransportListener.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/datagram/AbstractDatagramTransportListener.java?rev=947696&r1=947695&r2=947696&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/datagram/AbstractDatagramTransportListener.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/datagram/AbstractDatagramTransportListener.java
 Mon May 24 16:08:04 2010
@@ -20,7 +20,6 @@ package org.apache.axis2.transport.base.
 
 import java.io.IOException;
 import java.net.SocketException;
-import java.net.SocketAddress;
 
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.transport.base.AbstractTransportListenerEx;
@@ -35,11 +34,11 @@ public abstract class AbstractDatagramTr
 protected void doInit() throws AxisFault {
 DatagramDispatcherCallback callback = new DatagramDispatcherCallback() 
{
 
-public void receive(SocketAddress address,
-DatagramEndpoint endpoint,
+public void receive(DatagramEndpoint endpoint,
 byte[] data,
-int length) {
-workerPool.execute(new ProcessPacketTask(address, endpoint, 
data, length));
+int length,
+DatagramOutTransportInfo outInfo) {
+workerPool.execute(new ProcessPacketTask(endpoint, data, 
length, outInfo));
 }
 };
 

Modified: 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/datagram/DatagramDispatcherCallback.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/datagram/DatagramDispatcherCallback.java?rev=947696&r1=947695&r2=947696&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/datagram/DatagramDispatcherCallback.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/datagram/DatagramDispatcherCallback.java
 Mon May 24 16:08:04 2010
@@ -18,12 +18,22 @@
  */
 package org.apache.axis2.transport.base.datagram;
 
-import java.nio.channels.DatagramChannel;
-import java.net.SocketAddress;
-
 public interface DatagramDispatcherCallback {
-void receive(SocketAddress address,
- DatagramEndpoint endpoint,
+/**
+ * Receive a message and inject it into the Axis2 engine.
+ * 
+ * @param endpoint
+ *the endpoint that received the message
+ * @param data
+ *the data of the message
+ * @param length
+ *the length of the message
+ * @param outInfo
+ *The out transport information that should be used to send 
back a response. This
+ *should only be set by transports that support an explicit 
back channel.
+ */
+void receive(DatagramEndpoint endpoint,
  byte[] data,
- int length);
+ int length,
+ DatagramOutTransportInfo outInfo);
 }

Modified: 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/datagram/DatagramOutTransportInfo.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/src/mai

svn commit: r947789 - /axis/axis2/java/transports/trunk/pom.xml

[veithen]

Author: veithen
Date: Mon May 24 20:23:32 2010
New Revision: 947789

URL: http://svn.apache.org/viewvc?rev=947789&view=rev
Log:
Updated the version of the org.apache:apache super-POM to 7. This solves two 
issues:
* It adds http://repository.apache.org to the repository list, so that Axis2 
snapshots are downloaded from the right repository.
* It makes sure that all JAR artifacts contain the LICENSE file (and related 
files).

Modified:
axis/axis2/java/transports/trunk/pom.xml

Modified: axis/axis2/java/transports/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/pom.xml?rev=947789&r1=947788&r2=947789&view=diff
==
--- axis/axis2/java/transports/trunk/pom.xml (original)
+++ axis/axis2/java/transports/trunk/pom.xml Mon May 24 20:23:32 2010
@@ -25,7 +25,7 @@
 
 org.apache
 apache
-3
+7
 
 4.0.0
 org.apache.axis2

svn commit: r947805 - in /axis/axis2/java/transports/trunk/src/site: ./ apt/ resources/ resources/css/ resources/images/ xdoc/

[veithen]

Author: veithen
Date: Mon May 24 20:48:02 2010
New Revision: 947805

URL: http://svn.apache.org/viewvc?rev=947805&view=rev
Log:
Merged Ruwan's work on the Maven site from the 1.0.0 branch back to the trunk.

Added:
axis/axis2/java/transports/trunk/src/site/resources/
  - copied from r909732, 
webservices/commons/branches/modules/transport/1.0.0/src/site/resources/
axis/axis2/java/transports/trunk/src/site/resources/css/
  - copied from r909732, 
webservices/commons/branches/modules/transport/1.0.0/src/site/resources/css/
axis/axis2/java/transports/trunk/src/site/resources/css/site.css
  - copied unchanged from r909732, 
webservices/commons/branches/modules/transport/1.0.0/src/site/resources/css/site.css
axis/axis2/java/transports/trunk/src/site/resources/download.cgi
  - copied unchanged from r909732, 
webservices/commons/branches/modules/transport/1.0.0/src/site/resources/download.cgi
axis/axis2/java/transports/trunk/src/site/resources/images/
  - copied from r909732, 
webservices/commons/branches/modules/transport/1.0.0/src/site/resources/images/
axis/axis2/java/transports/trunk/src/site/resources/images/asfLogo.jpg
  - copied unchanged from r909732, 
webservices/commons/branches/modules/transport/1.0.0/src/site/resources/images/asfLogo.jpg

axis/axis2/java/transports/trunk/src/site/resources/images/axis2TransportsLogo.gif
  - copied unchanged from r909732, 
webservices/commons/branches/modules/transport/1.0.0/src/site/resources/images/axis2TransportsLogo.gif
axis/axis2/java/transports/trunk/src/site/resources/images/headerBg.jpg
  - copied unchanged from r909732, 
webservices/commons/branches/modules/transport/1.0.0/src/site/resources/images/headerBg.jpg
axis/axis2/java/transports/trunk/src/site/resources/images/menuBg.jpg
  - copied unchanged from r909732, 
webservices/commons/branches/modules/transport/1.0.0/src/site/resources/images/menuBg.jpg
axis/axis2/java/transports/trunk/src/site/resources/images/spacer.gif
  - copied unchanged from r909732, 
webservices/commons/branches/modules/transport/1.0.0/src/site/resources/images/spacer.gif
axis/axis2/java/transports/trunk/src/site/xdoc/building.xml
  - copied unchanged from r909732, 
webservices/commons/branches/modules/transport/1.0.0/src/site/xdoc/building.xml
axis/axis2/java/transports/trunk/src/site/xdoc/docs_index.xml
  - copied unchanged from r909732, 
webservices/commons/branches/modules/transport/1.0.0/src/site/xdoc/docs_index.xml
axis/axis2/java/transports/trunk/src/site/xdoc/download.xml
  - copied unchanged from r909732, 
webservices/commons/branches/modules/transport/1.0.0/src/site/xdoc/download.xml
axis/axis2/java/transports/trunk/src/site/xdoc/download_index.xml
  - copied unchanged from r909732, 
webservices/commons/branches/modules/transport/1.0.0/src/site/xdoc/download_index.xml
axis/axis2/java/transports/trunk/src/site/xdoc/index.xml
  - copied unchanged from r909732, 
webservices/commons/branches/modules/transport/1.0.0/src/site/xdoc/index.xml
Modified:
axis/axis2/java/transports/trunk/src/site/   (props changed)
axis/axis2/java/transports/trunk/src/site/apt/jms.apt
axis/axis2/java/transports/trunk/src/site/site.xml

Propchange: axis/axis2/java/transports/trunk/src/site/
--
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon May 24 20:48:02 2010
@@ -0,0 +1,2 @@
+/axis/axis2/java/transports/branches/transport/1.0.0/src/site:909733-947799
+/webservices/commons/branches/modules/transport/1.0.0/src/site:817563-909732

Modified: axis/axis2/java/transports/trunk/src/site/apt/jms.apt
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/src/site/apt/jms.apt?rev=947805&r1=947804&r2=947805&view=diff
==
--- axis/axis2/java/transports/trunk/src/site/apt/jms.apt (original)
+++ axis/axis2/java/transports/trunk/src/site/apt/jms.apt Mon May 24 20:48:02 
2010
@@ -67,19 +67,91 @@ JMS Transport
   The parameters that may appear in a connection factory configuration are 
defined as follows:
   
 [<<>>]
-TODO
+REQUIRED - JNDI initial context factory class. The class must implement 
the java.naming.spi.InitialContextFactory interface. 
 
 [<<>>]
-TODO
+REQUIRED - URL of the JNDI provider
 
 [<<>>]
-TODO
+REQUIRED - The JNDI name of the connection factory
+
+[<<>>]
+JNDI Username
+
+[<<>>]
+JNDI password
+
+[<<>>]
+Desired mode of transactionality. possible values are 'none', 'local' or 
'jta', while it defaults to 'none'
+
+[<<>>]
+JNDI name to be used to require user transaction
+
+[<<>>]
+Whether caching for user transactions 

svn commit: r947822 - in /axis/axis2/java/transports/trunk/src/site: apt/udp.apt site.xml

[veithen]

Author: veithen
Date: Mon May 24 21:43:42 2010
New Revision: 947822

URL: http://svn.apache.org/viewvc?rev=947822&view=rev
Log:
Added some initial documentation for the UDP transport.

Added:
axis/axis2/java/transports/trunk/src/site/apt/udp.apt   (with props)
Modified:
axis/axis2/java/transports/trunk/src/site/site.xml

Added: axis/axis2/java/transports/trunk/src/site/apt/udp.apt
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/src/site/apt/udp.apt?rev=947822&view=auto
==
--- axis/axis2/java/transports/trunk/src/site/apt/udp.apt (added)
+++ axis/axis2/java/transports/trunk/src/site/apt/udp.apt Mon May 24 21:43:42 
2010
@@ -0,0 +1,81 @@
+~~ Licensed to the Apache Software Foundation (ASF) under one
+~~ or more contributor license agreements. See the NOTICE file
+~~ distributed with this work for additional information
+~~ regarding copyright ownership. The ASF licenses this file
+~~ to you under the Apache License, Version 2.0 (the
+~~ "License"); you may not use this file except in compliance
+~~ with the License. You may obtain a copy of the License at
+~~
+~~ http://www.apache.org/licenses/LICENSE-2.0
+~~
+~~ Unless required by applicable law or agreed to in writing,
+~~ software distributed under the License is distributed on an
+~~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~~ KIND, either express or implied. See the License for the
+~~ specific language governing permissions and limitations
+~~ under the License.
+
+JMS Transport
+
+* {Content}
+
+%{toc|section=1|fromDepth=1}
+
+* {Transport listener}
+
+** {Listener configuration}
+
+  The UDP transport listener is configured in <<>> using the 
following declaration:
+
+++
+
+++
+
+  Depending on how the UDP transport is set up, additional parameters may be 
required inside the
+  <<>> element (see next section).
+
+** {Endpoint configuration}
+
+  Endpoints can be configured both at the transport level and at the service 
level. Each endpoint
+  opens a local UDP port for listening. UDP packets received on a port that is 
configured on a
+  service will be pre-dispatched to that service. Packets received by a port 
that is configured
+  at the transport level need to be dispatched using WS-Addressing or some 
other mechanism
+  implemented by a dispatcher configured in Axis2.
+  
+  Endpoints are configured by adding <<>> elements to the 
<<>>
+  element in <<>> or to a <<>> element in an 
<<>> file. The
+  set of parameters is the same for both scenarios:
+  
+  [<<>> (required)]
+  Specifies the UDP port to bind to.
+  
+  [<<>> (required)]
+  Specifies the content type of the messages received on the endpoint. This 
parameter is
+  necessary because in contrast to HTTP, the content type information is not 
part of the
+  information exchanged on the wire.
+  
+  [<<>> (optional, defaults to 1024)]
+  The maximum UDP packet size.
+
+** {Examples}
+
+*** {Enabling SOAP over UDP at the transport level}
+
+  The following declaration in <<>> enables SOAP over UDP on port 
 and
+  allows all services (for which UDP is in the list of exposed transports) to 
receive
+  messages over that port:
+  
+++
+
+  
+  text/xml
+  4096
+
+++
+
+  For this to work, WS-Addressing must be enabled, and messages sent to port 
 must
+  have the relevant WS-Addressing headers.
+  
+++
+
+++

Propchange: axis/axis2/java/transports/trunk/src/site/apt/udp.apt
--
svn:eol-style = native

Modified: axis/axis2/java/transports/trunk/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/src/site/site.xml?rev=947822&r1=947821&r2=947822&view=diff
==
--- axis/axis2/java/transports/trunk/src/site/site.xml (original)
+++ axis/axis2/java/transports/trunk/src/site/site.xml Mon May 24 21:43:42 2010
@@ -56,6 +56,7 @@
 
 
 
+
 
 
 

svn commit: r947823 - /axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListenerEx.java

[veithen]

Author: veithen
Date: Mon May 24 21:47:33 2010
New Revision: 947823

URL: http://svn.apache.org/viewvc?rev=947823&view=rev
Log:
Fixed inaccurate Javadoc.

Modified:

axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListenerEx.java

Modified: 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListenerEx.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListenerEx.java?rev=947823&r1=947822&r2=947823&view=diff
==
--- 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListenerEx.java
 (original)
+++ 
axis/axis2/java/transports/trunk/modules/base/src/main/java/org/apache/axis2/transport/base/AbstractTransportListenerEx.java
 Mon May 24 21:47:33 2010
@@ -42,7 +42,9 @@ import org.apache.axis2.description.Tran
 public abstract class AbstractTransportListenerEx
 extends AbstractTransportListener {
 
-/** A Map of service name to the protocol endpoints */
+/**
+ * The collection of protocol specific endpoints managed by this transport.
+ */
 private List endpoints = new ArrayList();
 
 private boolean useGlobalListener;