svn commit: r1053054 - in /axis/axis2/java/core/trunk/modules: integration/test/org/apache/axis2/transport/http/ transport/http/src/org/apache/axis2/transport/http/ transport/http/src/org/apache/axis2

2010-12-27 Thread milinda 
Author: milinda
Date: Mon Dec 27 12:31:53 2010
New Revision: 1053054

URL: http://svn.apache.org/viewvc?rev=1053054&view=rev
Log:
Fix for AXIS2-3839 and AXIS2-4050.
This fix uses the same configuration mechanism used in old code.
But there are possible improvements to configuration mechanism and those will 
be added to the Axis2 later.


Added:

axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/util/HTTPProxyConfigurationUtil.java
Removed:

axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/ProxyConfiguration.java
Modified:

axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/transport/http/NonProxyHostTest.java

axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPSender.java

Modified: 
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/transport/http/NonProxyHostTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/transport/http/NonProxyHostTest.java?rev=1053054&r1=1053053&r2=1053054&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/transport/http/NonProxyHostTest.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/integration/test/org/apache/axis2/transport/http/NonProxyHostTest.java
 Mon Dec 27 12:31:53 2010
@@ -20,13 +20,14 @@
 package org.apache.axis2.transport.http;
 
 import junit.framework.TestCase;
+import org.apache.axis2.transport.http.util.HTTPProxyConfigurationUtil;
 
 public class NonProxyHostTest extends TestCase {
 public void testForAxis2_3453() {
 String nonProxyHosts = 
"sealbook.ncl.ac.uk|*.sealbook.ncl.ac.uk|eskdale.ncl.ac.uk|*.eskdale.ncl.ac.uk|giga25.ncl.ac.uk|*.giga25.ncl.ac.uk";
-
assertTrue(ProxyConfiguration.isHostInNonProxyList("sealbook.ncl.ac.uk", 
nonProxyHosts));
-
assertFalse(ProxyConfiguration.isHostInNonProxyList("xsealbook.ncl.ac.uk", 
nonProxyHosts));
-
assertTrue(ProxyConfiguration.isHostInNonProxyList("local","local|*.local|169.254/16|*.169.254/16"));
-
assertFalse(ProxyConfiguration.isHostInNonProxyList("localhost","local|*.local|169.254/16|*.169.254/16"));
+
assertTrue(HTTPProxyConfigurationUtil.isHostInNonProxyList("sealbook.ncl.ac.uk",
 nonProxyHosts));
+
assertFalse(HTTPProxyConfigurationUtil.isHostInNonProxyList("xsealbook.ncl.ac.uk",
 nonProxyHosts));
+
assertTrue(HTTPProxyConfigurationUtil.isHostInNonProxyList("local","local|*.local|169.254/16|*.169.254/16"));
+
assertFalse(HTTPProxyConfigurationUtil.isHostInNonProxyList("localhost","local|*.local|169.254/16|*.169.254/16"));
 }
 }

Modified: 
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPSender.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPSender.java?rev=1053054&r1=1053053&r2=1053054&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPSender.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/AbstractHTTPSender.java
 Mon Dec 27 12:31:53 2010
@@ -31,6 +31,7 @@ import org.apache.axis2.description.Tran
 import org.apache.axis2.i18n.Messages;
 import org.apache.axis2.transport.MessageFormatter;
 import org.apache.axis2.transport.TransportUtils;
+import org.apache.axis2.transport.http.util.HTTPProxyConfigurationUtil;
 import org.apache.axis2.util.JavaUtils;
 import org.apache.axis2.wsdl.WSDLConstants;
 import org.apache.commons.httpclient.Credentials;
@@ -286,10 +287,11 @@ public abstract class AbstractHTTPSender
 }
 // proxy configuration
 
-if (ProxyConfiguration.isProxyEnabled(msgCtx,targetURL)) {
-log.debug("ProxyConfiguration");
-ProxyConfiguration proxyConfiguration = new ProxyConfiguration();
-proxyConfiguration.configure(msgCtx,client,config);
+if (HTTPProxyConfigurationUtil.isProxyEnabled(msgCtx, targetURL)) {
+if(log.isDebugEnabled()){
+log.debug("Configuring HTTP proxy.");
+}
+HTTPProxyConfigurationUtil.configure(msgCtx, client, config);
 }
 
 return config;

Added: 
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/util/HTTPProxyConfigurationUtil.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/transport/http/util/HTTPProxyConfigurationUtil.java?rev=1053054&view=auto
==
--- 
axis/axis2/java/core/trunk/modules/transport/http/src/org/apache/axis2/

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

2010-12-27 Thread amilas 
Author: amilas
Date: Mon Dec 27 15:21:44 2010
New Revision: 1053084

URL: http://svn.apache.org/viewvc?rev=1053084&view=rev
Log:
fixed the issue AXIS2-4533. we need to use the fault part name of the operation 
as the fault name

Modified:

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

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java?rev=1053084&r1=1053083&r2=1053084&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
 Mon Dec 27 15:21:44 2010
@@ -852,7 +852,7 @@ public class WSDL11ToAxisServiceBuilder 
 Message wsdl4jFaultMessge = wsdl4jFault.getMessage();
 
 AxisMessage faultMessage = findFaultMessage(
-wsdl4jFaultMessge.getQName().getLocalPart(),
+wsdl4jFault.getName(),
 axisOperation.getFaultMessages());
 
 AxisBindingMessage axisBindingFaultMessage = new 
AxisBindingMessage();
@@ -1526,7 +1526,7 @@ public class WSDL11ToAxisServiceBuilder 
 Message faultMessage = fault.getMessage();
 if (null != faultMessage) {
 axisFaultMessage
-.setName(faultMessage.getQName().getLocalPart());
+.setName(fault.getName());
 
 copyExtensibleElements(faultMessage.getExtensibilityElements(),
dif, axisFaultMessage, 
PORT_TYPE_OPERATION_FAULT);

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

2010-12-27 Thread amilas 
Author: amilas
Date: Mon Dec 27 15:51:22 2010
New Revision: 1053092

URL: http://svn.apache.org/viewvc?rev=1053092&view=rev
Log:
renaming the localName variable to fix AXIS2-4849

Modified:

axis/axis2/java/core/trunk/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.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=1053092&r1=1053091&r2=1053092&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
 Mon Dec 27 15:51:22 2010
@@ -1302,13 +1302,13 @@
 
 
 java.lang.String namespace = "";
-java.lang.String localName = "";
+java.lang.String _localName = "";
 
 
 java.lang.String namespace = 
parentQName.getNamespaceURI();
-java.lang.String localName = 
parentQName.getLocalPart();
+java.lang.String _localName = 
parentQName.getLocalPart();
 
-writeStartElement(null, namespace, localName, 
xmlWriter);
+writeStartElement(null, namespace, _localName, 
xmlWriter);
 
 // add the type details if this is used in a 
simple type
if (serializeType){

svn commit: r1053240 - /axis/axis2/java/core/trunk/modules/jibx/src/org/apache/axis2/jibx/template/JibXDatabindingTemplate.xsl

2010-12-27 Thread amilas 
Author: amilas
Date: Tue Dec 28 01:55:39 2010
New Revision: 1053240

URL: http://svn.apache.org/viewvc?rev=1053240&view=rev
Log:
appling to the toEnvelope fixe to jibx as well

Modified:

axis/axis2/java/core/trunk/modules/jibx/src/org/apache/axis2/jibx/template/JibXDatabindingTemplate.xsl

Modified: 
axis/axis2/java/core/trunk/modules/jibx/src/org/apache/axis2/jibx/template/JibXDatabindingTemplate.xsl
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jibx/src/org/apache/axis2/jibx/template/JibXDatabindingTemplate.xsl?rev=1053240&r1=1053239&r2=1053240&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/jibx/src/org/apache/axis2/jibx/template/JibXDatabindingTemplate.xsl
 (original)
+++ 
axis/axis2/java/core/trunk/modules/jibx/src/org/apache/axis2/jibx/template/JibXDatabindingTemplate.xsl
 Tue Dec 28 01:55:39 2010
@@ -116,7 +116,7 @@
   
   
 
-private org.apache.axiom.soap.SOAPEnvelope 
toEnvelope(org.apache.axiom.soap.SOAPFactory factory,  param, boolean optimizeContent) {
+private org.apache.axiom.soap.SOAPEnvelope 
toEnvelope(org.apache.axiom.soap.SOAPFactory factory,  param, boolean optimizeContent, javax.xml.namespace.QName 
methodQName) {
 org.apache.axiom.soap.SOAPEnvelope envelope = 
factory.getDefaultEnvelope();
 if (param != null){
 envelope.getBody().addChild(toOM(param, factory, 
optimizeContent));

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

2010-12-27 Thread amilas 
Author: amilas
Date: Tue Dec 28 05:39:46 2010
New Revision: 1053264

URL: http://svn.apache.org/viewvc?rev=1053264&view=rev
Log:
fixing the issue AXIS2-4866 put the fixe to not display , to in only operations 
and at the interface

Modified:

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

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=1053264&r1=1053263&r2=1053264&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 Dec 28 05:39:46 2010
@@ -904,6 +904,8 @@
   */
 public void  (
  
+ 
+
 
 
 
 
 
-   ,
+   ,
 
 , 
 

Modified: 
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceTemplate.xsl
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceTemplate.xsl?rev=1053264&r1=1053263&r2=1053264&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceTemplate.xsl
 (original)
+++ 
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/template/java/InterfaceTemplate.xsl
 Tue Dec 28 05:39:46 2010
@@ -113,6 +113,8 @@
  (
 
 
+
+ 
 
 
 
 
 
-,
+,
 
 , 
 )
@@ -202,11 +205,15 @@
  */
 public void  (
  
+ 
+ 
+
  
+
 
 
-
+
 
 

@@ -221,7 +228,8 @@
 
 
 
-   ,
+   ,
 
 ,

svn commit: r1053267 - /axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/i18n/resource.properties

2010-12-27 Thread amilas 
Author: amilas
Date: Tue Dec 28 05:59:13 2010
New Revision: 1053267

URL: http://svn.apache.org/viewvc?rev=1053267&view=rev
Log:
 fixing issue AXIS2-4208 added more meaning full message

Modified:

axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/i18n/resource.properties

Modified: 
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/i18n/resource.properties
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/i18n/resource.properties?rev=1053267&r1=1053266&r2=1053267&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/i18n/resource.properties
 (original)
+++ 
axis/axis2/java/core/trunk/modules/codegen/src/org/apache/axis2/wsdl/i18n/resource.properties
 Tue Dec 28 05:59:13 2010
@@ -45,7 +45,7 @@ wsdl2code.arg7=  -t 
 wsdl2code.arg8=  -ss  Generate server side code (i.e. 
skeletons) (Default: off).
 wsdl2code.arg9=  -sd  Generate service descriptor (i.e. 
services.xml). (Default: off). Valid with -ss.
 wsdl2code.arg10=  -d  Valid databinding(s) are adb, 
xmlbeans, jibx and jaxbri (Default: adb).
-wsdl2code.arg11=  -g   Generates all the classes. Valid 
only with -ss.
+wsdl2code.arg11=  -g   Generates all the classes. It 
generates clases for both client side and server side including derived classes 
of the schema.
 wsdl2code.arg12=  -pn   Choose a specific port when there 
are multiple ports in the wsdl.
 wsdl2code.arg13=  -snChoose a specific service when 
there are multiple services in the wsdl.
 wsdl2code.arg14=  -u   Unpacks the databinding classes