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

2010-04-22 Thread 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

2010-04-22 Thread 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

2010-04-22 Thread 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: r937071 - in /axis/axis2/java/core/trunk/modules: jaxws-integration/ metadata/ metadata/src/org/apache/axis2/jaxws/server/config/ metadata/test/org/apache/axis2/jaxws/description/feature/

2010-04-22 Thread barrettj
Author: barrettj
Date: Thu Apr 22 21:24:25 2010
New Revision: 937071

URL: http://svn.apache.org/viewvc?rev=937071&view=rev
Log:
Add support for JAXWS 2.2 Addressing.responses annotation attribute.  Add 
associated TDD tests.  Modify pom.xml to pickup annotations from JAXWS 2.2 jar 
instead of the JAXWS 2.1 classes in the JDK.

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

axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/server/config/AddressingConfigurator.java

axis/axis2/java/core/trunk/modules/metadata/test/org/apache/axis2/jaxws/description/feature/AddressingFeatureTests.java

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=937071&r1=937070&r2=937071&view=diff
==
--- axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/jaxws-integration/pom.xml Thu Apr 22 
21:24:25 2010
@@ -34,6 +34,10 @@
 
 
 org.apache.geronimo.specs
+geronimo-jaxws_2.2_spec
+
+
+org.apache.geronimo.specs
 geronimo-annotation_1.0_spec
 
 
@@ -114,6 +118,28 @@
 
 
 
+maven-dependency-plugin
+
+
+generate-sources
+
+copy
+
+
+
+
+
org.apache.geronimo.specs
+
geronimo-jaxws_2.2_spec
+jar
+true
+
target/endorsed
+ 
+
+
+
+
+
+
 maven-compiler-plugin
 true
 
@@ -1360,7 +1386,7 @@
 true
 
 pertest
--Xms256m -Xmx512m
+-Xms256m -Xmx512m 
-Xbootclasspath/p:${basedir}/target/endorsed/geronimo-jaxws_2.2_spec-1.0-SNAPSHOT.jar
 
 

Modified: axis/axis2/java/core/trunk/modules/metadata/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/pom.xml?rev=937071&r1=937070&r2=937071&view=diff
==
--- axis/axis2/java/core/trunk/modules/metadata/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/metadata/pom.xml Thu Apr 22 21:24:25 2010
@@ -143,15 +143,15 @@
 copy
 
 
- 
-   
- org.apache.geronimo.specs
- geronimo-jaxws_2.2_spec
- jar
- true
- target/endorsed
-   
- 
+
+
+
org.apache.geronimo.specs
+
geronimo-jaxws_2.2_spec
+jar
+true
+
target/endorsed
+ 
+
 
 
 
@@ -257,6 +257,9 @@
 maven-surefire-plugin
 true
 
+
+
-Xbootclasspath/p:${basedir}/target/endorsed/geronimo-jaxws_2.2_spec-1.0-SNAPSHOT.jar
   
+
 
 **/*Tests.java
 

Modified: 
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/server/config/AddressingConfigurator.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/server/config/AddressingConfigurator.java?rev=937071&r1=937070&r2=937071&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/server/config/AddressingConfigurator.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/metadata/src/org/apache/axis2/jaxws/server/config/AddressingConfigurator.java
 Thu Apr 22 21:24:25 2010
@@ -38,6 +38,7 @@ import org.apache.axis2.util.Utils;
 
 import javax.xml.ws.soap.Addressing;
 import javax.xml.ws.soap.Ad