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

2012-07-07 Thread sagara 
Author: sagara
Date: Sat Jul  7 18:08:21 2012
New Revision: 1358607

URL: http://svn.apache.org/viewvc?rev=1358607&view=rev
Log:
Applying  patch for AXIS2-5191.

Modified:

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

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService.java?rev=1358607&r1=1358606&r2=1358607&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService.java
 Sat Jul  7 18:08:21 2012
@@ -1166,6 +1166,23 @@ public class AxisService extends AxisDes
}
 
}
+   
+public void printUserWSDL2(OutputStream out, String wsdlName, String ip) 
throws AxisFault {
+Description description = null;
+// first find the correct wsdl definition
+Parameter wsdlParameter = 
getParameter(WSDLConstants.WSDL_20_DESCRIPTION);
+if (wsdlParameter != null) {
+description = (Description) wsdlParameter.getValue();
+try {
+org.apache.woden.WSDLFactory factory = 
org.apache.woden.WSDLFactory.newInstance();
+org.apache.woden.WSDLWriter writer = factory.newWSDLWriter();
+writer.writeWSDL(description.toElement(), out);
+} catch (org.apache.woden.WSDLException e) {
+throw AxisFault.makeFault(e);
+}
+}
+
+}
 
/**
 * find the defintion object for given name
@@ -1784,6 +1801,11 @@ public class AxisService extends AxisDes
 * @throws AxisFault
 */
public void printWSDL2(OutputStream out, String requestIP) throws 
AxisFault {
+// If we're looking for pre-existing WSDL, use that.
+if (isUseUserWSDL()) {
+printUserWSDL2(out, null, requestIP);
+return;
+}
AxisService2WSDL20 axisService2WSDL2 = new 
AxisService2WSDL20(this);

// If we find a WSDLSupplier with WSDL 2.0 content, use that

svn commit: r1358608 - /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java

2012-07-07 Thread sagara 
Author: sagara
Date: Sat Jul  7 18:17:41 2012
New Revision: 1358608

URL: http://svn.apache.org/viewvc?rev=1358608&view=rev
Log:
Applying  patch for AXIS2-5361.


Modified:

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

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java?rev=1358608&r1=1358607&r2=1358608&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/deployment/repository/util/ArchiveReader.java
 Sat Jul  7 18:17:41 2012
@@ -223,7 +223,7 @@ public class ArchiveReader implements De
 }
 }
 if (serviceMetaData != null) {
-if(extractService){
+if(!extractService){
 axisServiceGroup.setServiceGroupName(
 
DescriptionBuilder.getShortFileName(currentFile.getName()));
 } else {

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

2012-07-07 Thread sagara 
Author: sagara
Date: Sat Jul  7 18:27:53 2012
New Revision: 1358611

URL: http://svn.apache.org/viewvc?rev=1358611&view=rev
Log:
Removed unwanted and * imports.  

Modified:

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

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService.java?rev=1358611&r1=1358610&r2=1358611&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisService.java
 Sat Jul  7 18:27:53 2012
@@ -22,7 +22,6 @@ package org.apache.axis2.description;
 import org.apache.axiom.om.OMElement;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.Constants;
-import org.apache.axis2.addressing.AddressingHelper;
 import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.addressing.AddressingConstants;
 import org.apache.axis2.client.Options;
@@ -107,13 +106,22 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 import java.net.SocketException;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.security.PrivilegedAction;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Hashtable;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Vector;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 /**

svn commit: r1358614 - in /axis/axis2/java/core/trunk/modules/samples: quickstartadb/README.txt quickstartaxiom/README.txt quickstartjibx/README.txt quickstartxmlbeans/README.txt

2012-07-07 Thread sagara 
Author: sagara
Date: Sat Jul  7 18:38:24 2012
New Revision: 1358614

URL: http://svn.apache.org/viewvc?rev=1358614&view=rev
Log:
Applying  patch for AXIS2-5359.

Modified:
axis/axis2/java/core/trunk/modules/samples/quickstartadb/README.txt
axis/axis2/java/core/trunk/modules/samples/quickstartaxiom/README.txt
axis/axis2/java/core/trunk/modules/samples/quickstartjibx/README.txt
axis/axis2/java/core/trunk/modules/samples/quickstartxmlbeans/README.txt

Modified: axis/axis2/java/core/trunk/modules/samples/quickstartadb/README.txt
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/quickstartadb/README.txt?rev=1358614&r1=1358613&r2=1358614&view=diff
==
--- axis/axis2/java/core/trunk/modules/samples/quickstartadb/README.txt 
(original)
+++ axis/axis2/java/core/trunk/modules/samples/quickstartadb/README.txt Sat Jul 
 7 18:38:24 2012
@@ -28,6 +28,12 @@ Running the Client
 
 type ant run.client in the Axis2_HOME/samples/quickstartadb directory
 
+You will get the following response
+[java] 42.0
+[java] price updated
+[java] 42.35
+
+
 Help
 
 Please contact axis-user list (axis-u...@ws.apache.org) if you

Modified: axis/axis2/java/core/trunk/modules/samples/quickstartaxiom/README.txt
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/quickstartaxiom/README.txt?rev=1358614&r1=1358613&r2=1358614&view=diff
==
--- axis/axis2/java/core/trunk/modules/samples/quickstartaxiom/README.txt 
(original)
+++ axis/axis2/java/core/trunk/modules/samples/quickstartaxiom/README.txt Sat 
Jul  7 18:38:24 2012
@@ -31,6 +31,10 @@ Running the Client
 
 Type ant run.client in the AXIS2_HOME/samples/quickstartaxiom directory
 
+You will get following response
+[java] price updated
+[java] Current price of WSO: 123.42
+
 Help
 
 Please contact axis-user list (axis-u...@ws.apache.org) if you have

Modified: axis/axis2/java/core/trunk/modules/samples/quickstartjibx/README.txt
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/quickstartjibx/README.txt?rev=1358614&r1=1358613&r2=1358614&view=diff
==
--- axis/axis2/java/core/trunk/modules/samples/quickstartjibx/README.txt 
(original)
+++ axis/axis2/java/core/trunk/modules/samples/quickstartjibx/README.txt Sat 
Jul  7 18:38:24 2012
@@ -1,5 +1,8 @@
 Axis2 Quick Start Guide- (JiBX)
 ==
+This sample contains source code for the xdocs/1_1/quickstartguide.html 
document found in 
+the extracted Axis2 Documents Distribution. For a more detailed description on 
the 
+source code kindly see this 'Axis2 Quick Start Guide' document.
 
 Introduction
 
@@ -23,7 +26,13 @@ Running the Client
 
 type ant run.client in the Axis2_HOME/samples/quickstartadb directory
 
+You will get following response
+[java] 42.0
+[java] price updated
+[java] 42.35
+
+
 Help
 
 Please contact axis-user list (axis-u...@ws.apache.org) if you
-have any trouble running the sample.
\ No newline at end of file
+have any trouble running the sample.

Modified: 
axis/axis2/java/core/trunk/modules/samples/quickstartxmlbeans/README.txt
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/samples/quickstartxmlbeans/README.txt?rev=1358614&r1=1358613&r2=1358614&view=diff
==
--- axis/axis2/java/core/trunk/modules/samples/quickstartxmlbeans/README.txt 
(original)
+++ axis/axis2/java/core/trunk/modules/samples/quickstartxmlbeans/README.txt 
Sat Jul  7 18:38:24 2012
@@ -29,6 +29,12 @@ Running the Client
 
 type ant run.client in the AXIS2_HOME/samples/quickstartxmlbeans directory
 
+You will get following response
+[java] 42.0
+[java] price updated
+[java] 42.32
+
+
 Help
 
 Please contact axis-user list (axis-u...@ws.apache.org) if you have

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

2012-07-07 Thread sagara 
Author: sagara
Date: Sun Jul  8 03:52:06 2012
New Revision: 1358691

URL: http://svn.apache.org/viewvc?rev=1358691&view=rev
Log:
Applying  patch for AXIS2-4190.

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=1358691&r1=1358690&r2=1358691&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
 Sun Jul  8 03:52:06 2012
@@ -490,8 +490,8 @@
 }
 
 
-java.lang.String 
totalDigitsDecimal = 
org.apache.axis2.databinding.utils.ConverterUtil.convertToStandardDecimalNotation("").toString();
-if 
(org.apache.axis2.databinding.utils.ConverterUtil.compare(param, 
totalDigitsDecimal) > 0){
+java.lang.String 
totalDigitsDecimal = 
org.apache.axis2.databinding.utils.ConverterUtil.convertToStandardDecimalNotation("").toPlainString();
+if 
(org.apache.axis2.databinding.utils.ConverterUtil.compare(param, 
totalDigitsDecimal) < 0){
 this.=param;
 }
 else {

svn commit: r1358692 - in /axis/axis2/java/core/branches/1_6: ./ modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl

2012-07-07 Thread sagara 
Author: sagara
Date: Sun Jul  8 04:00:38 2012
New Revision: 1358692

URL: http://svn.apache.org/viewvc?rev=1358692&view=rev
Log:
 Merged r1358691 to 1.6  branch.

Modified:
axis/axis2/java/core/branches/1_6/   (props changed)

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

Propchange: axis/axis2/java/core/branches/1_6/
--
  Merged /axis/axis2/java/core/trunk:r1358691

Modified: 
axis/axis2/java/core/branches/1_6/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl?rev=1358692&r1=1358691&r2=1358692&view=diff
==
--- 
axis/axis2/java/core/branches/1_6/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/adb-codegen/src/org/apache/axis2/schema/template/ADBBeanTemplate-bean.xsl
 Sun Jul  8 04:00:38 2012
@@ -477,8 +477,8 @@
 }
 
 
-java.lang.String 
totalDigitsDecimal = 
org.apache.axis2.databinding.utils.ConverterUtil.convertToStandardDecimalNotation("").toString();
-if 
(org.apache.axis2.databinding.utils.ConverterUtil.compare(param, 
totalDigitsDecimal) > 0){
+java.lang.String 
totalDigitsDecimal = 
org.apache.axis2.databinding.utils.ConverterUtil.convertToStandardDecimalNotation("").toPlainString();
+if 
(org.apache.axis2.databinding.utils.ConverterUtil.compare(param, 
totalDigitsDecimal) < 0){
 this.=param;
 }
 else {