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

2010-09-20 Thread isurues 
Author: isurues
Date: Mon Sep 20 09:50:07 2010
New Revision: 998857

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

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=998857&r1=998856&r2=998857&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
 Mon Sep 20 09:50:07 2010
@@ -154,7 +154,11 @@ public class AxisService2WSDL11 implemen
String prefix = 
WSDLSerializationUtil.getPrefix(axisService.getTargetNamespace(),
 namespaceMap);
if (prefix == null || "".equals(prefix)) {
-   prefix = DEFAULT_TARGET_NAMESPACE_PREFIX;
+if (axisService.getTargetNamespacePrefix() != null) {
+prefix = axisService.getTargetNamespacePrefix();
+} else {
+prefix = DEFAULT_TARGET_NAMESPACE_PREFIX;
+}
}
 
namespaceMap.put(prefix, axisService.getTargetNamespace());

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

2010-09-20 Thread veithen 
Author: veithen
Date: Mon Sep 20 21:00:27 2010
New Revision: 999118

URL: http://svn.apache.org/viewvc?rev=999118&view=rev
Log:
Updated XmlSchema version to 1.4.7-SNAPSHOT to validate the integration with 
the upcoming 1.4.7 release.

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=999118&r1=999117&r2=999118&view=diff
==
--- axis/axis2/java/core/trunk/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/parent/pom.xml Mon Sep 20 21:00:27 2010
@@ -69,7 +69,7 @@

 1.2.10-SNAPSHOT
 3.0.0-SNAPSHOT
-1.4.6
+1.4.7-SNAPSHOT
 1.0-SNAPSHOT

svn commit: r999132 - /axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java

2010-09-20 Thread nthaker 
Author: nthaker
Date: Mon Sep 20 22:00:50 2010
New Revision: 999132

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

Performance improvement patch for addressing, code contributed by Katherine 
Sanders.

Modified:

axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java

Modified: 
axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java?rev=999132&r1=999131&r2=999132&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/addressing/src/org/apache/axis2/handlers/addressing/AddressingOutHandler.java
 Mon Sep 20 22:00:50 2010
@@ -64,13 +64,21 @@ public class AddressingOutHandler extend
 private static final String MODULE_NAME = "addressing";
 
 public InvocationResponse invoke(MessageContext msgContext) throws 
AxisFault {
-//determine whether outbound addressing has been disabled or not.
-// Get default value from module.xml or axis2.xml files
-Parameter param = msgContext.getModuleParameter(
-DISABLE_ADDRESSING_FOR_OUT_MESSAGES, MODULE_NAME, handlerDesc);
-boolean disableAddressing =
-msgContext.isPropertyTrue(DISABLE_ADDRESSING_FOR_OUT_MESSAGES,
+Parameter param = null;
+boolean disableAddressing = false;
+
+Object o = msgContext.getProperty(DISABLE_ADDRESSING_FOR_OUT_MESSAGES);
+if (o == null || !(o instanceof Boolean)) {
+//determine whether outbound addressing has been disabled or not.
+// Get default value from module.xml or axis2.xml files
+param = 
msgContext.getModuleParameter(DISABLE_ADDRESSING_FOR_OUT_MESSAGES, MODULE_NAME, 
handlerDesc);
+disableAddressing =
+msgContext.isPropertyTrue(DISABLE_ADDRESSING_FOR_OUT_MESSAGES,
 
JavaUtils.isTrueExplicitly(Utils.getParameterValue(param)));
+} else {
+   Boolean bool = (Boolean)o;
+   disableAddressing = bool.booleanValue();
+}
 
 if (disableAddressing) {
 if (LoggingControl.debugLoggingAllowed && log.isTraceEnabled()) {