svn commit: r1065629 - /axis/axis2/java/core/trunk/modules/samples/jaxws-calculator/resources/META-INF/CalculatorService.wsdl

[isurues]

Author: isurues
Date: Mon Jan 31 14:46:25 2011
New Revision: 1065629

URL: http://svn.apache.org/viewvc?rev=1065629&view=rev
Log:
fixing https://issues.apache.org/jira/browse/AXIS2-4613

Modified:

axis/axis2/java/core/trunk/modules/samples/jaxws-calculator/resources/META-INF/CalculatorService.wsdl

Modified: 
axis/axis2/java/core/trunk/modules/samples/jaxws-calculator/resources/META-INF/CalculatorService.wsdl
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/jaxws-calculator/resources/META-INF/CalculatorService.wsdl?rev=1065629&r1=1065628&r2=1065629&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/samples/jaxws-calculator/resources/META-INF/CalculatorService.wsdl
 (original)
+++ 
axis/axis2/java/core/trunk/modules/samples/jaxws-calculator/resources/META-INF/CalculatorService.wsdl
 Mon Jan 31 14:46:25 2011
@@ -63,7 +63,7 @@
 
 
 
-
+http://localhost:8080/CalculatorService"/>
 
 
 

svn commit: r1065907 - in /axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl: codegen/emitter/ template/java/

[ruwan]

Author: ruwan
Date: Tue Feb  1 04:50:46 2011
New Revision: 1065907

URL: http://svn.apache.org/viewvc?rev=1065907&view=rev
Log:
Committing the fix for AXIS2-4914, patch from Pradeep

Modified:

axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java

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

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

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

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

Modified: 
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java?rev=1065907&r1=1065906&r2=1065907&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/codegen/emitter/AxisServiceBasedMultiLanguageEmitter.java
 Tue Feb  1 04:50:46 2011
@@ -2279,11 +2279,20 @@ public class AxisServiceBasedMultiLangua
 String localPart = axisOperation.getName().getLocalPart();
 
 if (this.codeGenConfiguration.isUseOperationName()) {
-addAttribute(doc, "name", JavaUtils.xmlNameToJava(localPart), 
methodElement);
+String temp = JavaUtils.xmlNameToJava(localPart);
+addAttribute(doc, "name", temp, methodElement);
+// we need first character capitalized version at times,
+// to preserve the CamelCase name generation
+addAttribute(doc,"firstCharCapitalizedName",
+JavaUtils.capitalizeFirstChar(temp), methodElement);
 } else {
-addAttribute(doc, "name", 
JavaUtils.xmlNameToJavaIdentifier(localPart), methodElement);
+String temp =  JavaUtils.xmlNameToJavaIdentifier(localPart);
+addAttribute(doc, "name", temp , methodElement);
+// we need first character capitalized version at times,
+// to preserve the CamelCase name generation
+addAttribute(doc,"firstCharCapitalizedName",
+JavaUtils.capitalizeFirstChar(temp), methodElement);
 }
-
 addAttribute(doc, "originalName", localPart, methodElement);
 addAttribute(doc, "namespace", 
axisOperation.getName().getNamespaceURI(), methodElement);
 addAttribute(doc, "style", (String) getBindingPropertyFromOperation(

Modified: 
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/CallbackHandlerTemplate.xsl
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/CallbackHandlerTemplate.xsl?rev=1065907&r1=1065906&r2=1065907&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/CallbackHandlerTemplate.xsl
 (original)
+++ 
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/CallbackHandlerTemplate.xsl
 Tue Feb  1 04:50:46 2011
@@ -79,7 +79,7 @@
 * auto generated Axis2 call back method for  method
 * override this method for handling normal response from 
 operation
 */
-   public void receiveResult(
+   public void receiveResult(
 
 
   
result
@@ -99,7 +99,7 @@
* auto generated Axis2 Error handler
* override this method for handling error response from 
 operation
*/
-public void receiveError(java.lang.Exception e) {
+public void receiveError(java.lang.Exception e) {
 }
 
 

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=1065907&r1=1065906&r2=1065907&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
 Tue Feb  1 04:50:46 2

svn commit: r1065927 - /axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java

[isurues]

Author: isurues
Date: Tue Feb  1 06:59:27 2011
New Revision: 1065927

URL: http://svn.apache.org/viewvc?rev=1065927&view=rev
Log:
Minor improvement. adding an instance of check before casting.

Modified:

axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java

Modified: 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java?rev=1065927&r1=1065926&r2=1065927&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/server/JAXWSMessageReceiver.java
 Tue Feb  1 06:59:27 2011
@@ -269,11 +269,13 @@ public class JAXWSMessageReceiver implem
  */
 private void mergeDeploymentCL(AxisService service) {
 ClassLoader deploymentClassLoader = service.getClassLoader();
-// get URLs from deployment class loader
-URL[] deploymentClassLoaderUrls = ((URLClassLoader) 
deploymentClassLoader).getURLs();
-// create a new class loader by setting the current TCCL as the parent
-setContextClassLoader(new URLClassLoader(deploymentClassLoaderUrls,
-getContextClassLoader()));
+if (deploymentClassLoader instanceof URLClassLoader) {
+// get URLs from deployment class loader
+URL[] deploymentClassLoaderUrls = ((URLClassLoader) 
deploymentClassLoader).getURLs();
+// create a new class loader by setting the current TCCL as the 
parent
+setContextClassLoader(new URLClassLoader(deploymentClassLoaderUrls,
+getContextClassLoader()));
+}
 }
 
 /**