date:20120717

svn commit: r1362379 - in /axis/axis2/java/core/branches/1_6/modules/adb-codegen: src/org/apache/axis2/schema/ src/org/apache/axis2/schema/writer/ test-resources/testsuite/ test/org/apache/axis2/schem

2012-07-17 Thread sagara

Author: sagara
Date: Tue Jul 17 07:04:32 2012
New Revision: 1362379

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

Modified:

axis/axis2/java/core/branches/1_6/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java

axis/axis2/java/core/branches/1_6/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java

axis/axis2/java/core/branches/1_6/modules/adb-codegen/test-resources/testsuite/extensions.xsd

axis/axis2/java/core/branches/1_6/modules/adb-codegen/test/org/apache/axis2/schema/extension/SimpleExtensionTest.java

Modified: 
axis/axis2/java/core/branches/1_6/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java?rev=1362379&r1=1362378&r2=1362379&view=diff
==
--- 
axis/axis2/java/core/branches/1_6/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/adb-codegen/src/org/apache/axis2/schema/SchemaCompiler.java
 Tue Jul 17 07:04:32 2012
@@ -1618,13 +1618,16 @@ public class SchemaCompiler {
 copyMetaInfoHierarchy(metaInfHolder, extBaseType, 
resolvedSchema);
 } else if (type instanceof XmlSchemaComplexType) {
 XmlSchemaComplexType complexType = (XmlSchemaComplexType) 
type;
-if (complexType.getContentModel() == null) {
 // do not set as a simple type since we want to
 // print the element names
 metaInfHolder.setExtension(true);
 metaInfHolder.setExtensionClassName(className);
 copyMetaInfoHierarchy(metaInfHolder, extBaseType, 
resolvedSchema);
-}
+XmlSchemaContentModel typeContent 
=complexType.getContentModel();
+if(typeContent != null && typeContent instanceof 
XmlSchemaSimpleContent){
+metaInfHolder.setSimple(true); 
   
+} 
+
 }
 }
 

Modified: 
axis/axis2/java/core/branches/1_6/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java?rev=1362379&r1=1362378&r2=1362379&view=diff
==
--- 
axis/axis2/java/core/branches/1_6/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/adb-codegen/src/org/apache/axis2/schema/writer/JavaBeanWriter.java
 Tue Jul 17 07:04:32 2012
@@ -702,7 +702,9 @@ public class JavaBeanWriter implements B
  * current and parent BeanWriterMetaInfoHolders.Decide best 
approach
  * ?
  */
-mergeBeanWriterMetaInfoHolderForRestriction(metainf, parent);
+if(metainf.isRestriction()){
+mergeBeanWriterMetaInfoHolderForRestriction(metainf, parent);  
  
+}
 populateInfo(parent, model, rootElt, propertyNames, typeMap, 
groupTypeMap, true);
 }
 addPropertyEntries(metainf, model, rootElt, propertyNames, typeMap, 
groupTypeMap,

Modified: 
axis/axis2/java/core/branches/1_6/modules/adb-codegen/test-resources/testsuite/extensions.xsd
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb-codegen/test-resources/testsuite/extensions.xsd?rev=1362379&r1=1362378&r2=1362379&view=diff
==
--- 
axis/axis2/java/core/branches/1_6/modules/adb-codegen/test-resources/testsuite/extensions.xsd
 (original)
+++ 
axis/axis2/java/core/branches/1_6/modules/adb-codegen/test-resources/testsuite/extensions.xsd
 Tue Jul 17 07:04:32 2012
@@ -85,6 +85,51 @@
 
 
 
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
\ No newline at end of file

Modified: 
axis/axis2/java/core/branches/1_6/modules/adb-codegen/test/org/apache/axis2/schema/extension/SimpleExtensionTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/adb-codegen/test/org/apache/axi

svn commit: r1362388 - in /axis/axis2/java/core/trunk/modules/adb: src/org/apache/axis2/databinding/utils/ConverterUtil.java test/org/apache/axis2/databinding/utils/ConverterUtilTest.java

2012-07-17 Thread sagara

Author: sagara
Date: Tue Jul 17 07:22:26 2012
New Revision: 1362388

URL: http://svn.apache.org/viewvc?rev=1362388&view=rev
Log:
Fixed AXIS2-5170- Can't find such constrain on 
http://www.w3.org/TR/2001/REC-xmlschema-2-20010502/#normalizedString.

Modified:

axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java

axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java

Modified: 
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java?rev=1362388&r1=1362387&r2=1362388&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/ConverterUtil.java
 Tue Jul 17 07:22:26 2012
@@ -676,7 +676,7 @@ public class ConverterUtil {
 
 
 public static NormalizedString convertToNormalizedString(String s) {
-if ((s == null) || s.equals("")){
+if ((s == null)){
 return null;
 }
 return new NormalizedString(s);

Modified: 
axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java?rev=1362388&r1=1362387&r2=1362388&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/ConverterUtilTest.java
 Tue Jul 17 07:22:26 2012
@@ -35,6 +35,7 @@ import javax.activation.DataSource;
 
 import org.apache.axiom.attachments.ByteArrayDataSource;
 import org.apache.axiom.om.util.Base64;
+import org.apache.axis2.databinding.types.NormalizedString;
 
 public class ConverterUtilTest extends TestCase {
 
@@ -548,6 +549,16 @@ public class ConverterUtilTest extends T
  0,
  
calendar.get(Calendar.ZONE_OFFSET)+calendar.get(Calendar.DST_OFFSET));
 }
+
+public void testConvertToNormalizedString() {
+NormalizedString str = ConverterUtil.convertToNormalizedString("abc");
+assertNotNull(str);  
+str = ConverterUtil.convertToNormalizedString("");
+assertNotNull(str);
+str = ConverterUtil.convertToNormalizedString(null);
+assertNull(str);  
+
+}
 
 
 }

svn commit: r1362406 - in /axis/axis2/java/core/trunk/modules/adb-codegen: test-resources/testsuite/extensions.xsd test/org/apache/axis2/schema/extension/SimpleExtensionTest.java

2012-07-17 Thread sagara

Author: sagara
Date: Tue Jul 17 08:32:17 2012
New Revision: 1362406

URL: http://svn.apache.org/viewvc?rev=1362406&view=rev
Log:
Added test case for AXIS2-4023. 

Modified:

axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/testsuite/extensions.xsd

axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/extension/SimpleExtensionTest.java

Modified: 
axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/testsuite/extensions.xsd
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/testsuite/extensions.xsd?rev=1362406&r1=1362405&r2=1362406&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/testsuite/extensions.xsd
 (original)
+++ 
axis/axis2/java/core/trunk/modules/adb-codegen/test-resources/testsuite/extensions.xsd
 Tue Jul 17 08:32:17 2012
@@ -132,4 +132,20 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
\ No newline at end of file

Modified: 
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/extension/SimpleExtensionTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/extension/SimpleExtensionTest.java?rev=1362406&r1=1362405&r2=1362406&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/extension/SimpleExtensionTest.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/adb-codegen/test/org/apache/axis2/schema/extension/SimpleExtensionTest.java
 Tue Jul 17 08:32:17 2012
@@ -138,4 +138,34 @@ public class SimpleExtensionTest extends
 assertEquals("Sri Lanka", 
fullpersoninfoElement.getFullpersoninfoElement().getCountry());
 
 }
+
+public void testReproStringTypeElementGetOMElement() throws Exception {
+ReproStringTypeElement reproStringTypeElement = new 
ReproStringTypeElement();   
+Language lang = new Language();
+lang.setValue("EN");
+reproStringTypeElement.setLang(lang );
+reproStringTypeElement.setReproStringType("Value");
+OMElement omElement = 
reproStringTypeElement.getOMElement(ReproStringTypeElement.MY_QNAME,
+OMAbstractFactory.getSOAP11Factory());
+omElement.serialize(System.out);
+}
+
+public void testReproStringTypeElementParse() throws Exception {
+OMFactory factory = OMAbstractFactory.getOMFactory();
+OMElement element = factory.createOMElement(new QName(
+"http://apache.org/axis2/schema/extension";, 
"ReproStringTypeElement"));
+element.addAttribute("lang", "EN", null);
+element.setText("Value");
+   
+ReproStringTypeElement reproStringTypeElement = 
ReproStringTypeElement.Factory.parse(element
+.getXMLStreamReader());
+assertNotNull(reproStringTypeElement);
+assertEquals("EN", reproStringTypeElement.getLang().toString());
+assertEquals("Value", reproStringTypeElement.getReproStringType());
+   
+
+}
+
+
+
 }

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

2012-07-17 Thread sagara

Author: sagara
Date: Tue Jul 17 12:39:21 2012
New Revision: 1362472

URL: http://svn.apache.org/viewvc?rev=1362472&view=rev
Log:
Upgrade HTTPClient and HTTPCore versions in to 4.2.1

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=1362472&r1=1362471&r2=1362472&view=diff
==
--- axis/axis2/java/core/trunk/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/parent/pom.xml Tue Jul 17 12:39:21 2012
@@ -90,8 +90,8 @@
 1.0.1
 1.0
 2.1
-4.2
-4.2
+4.2.1
+4.2.1
 5.0
 1.5rc3
 2.2.4

svn commit: r1362479 - in /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description: AxisBinding.java AxisBindingMessage.java AxisBindingOperation.java AxisEndpoint.java

2012-07-17 Thread sagara

Author: sagara
Date: Tue Jul 17 13:12:49 2012
New Revision: 1362479

URL: http://svn.apache.org/viewvc?rev=1362479&view=rev
Log:
Manually adding patch for AXIS2-4162. 

Modified:

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

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

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

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

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisBinding.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisBinding.java?rev=1362479&r1=1362478&r2=1362479&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisBinding.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisBinding.java
 Tue Jul 17 13:12:49 2012
@@ -276,4 +276,9 @@ public class AxisBinding extends AxisDes
 public Iterator getChildren(){
return (Iterator) super.getChildren();
 }
+
+@Override
+public void applyPolicy() throws AxisFault {
+getAxisEndpoint().getAxisService().applyPolicy();
+}
 }

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java?rev=1362479&r1=1362478&r2=1362479&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisBindingMessage.java
 Tue Jul 17 13:12:49 2012
@@ -356,4 +356,9 @@ public class AxisBindingMessage extends 
}
return false;
}
+   
+@Override
+public void applyPolicy() throws AxisFault {
+getAxisMessage().applyPolicy();
+}
 }

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java?rev=1362479&r1=1362478&r2=1362479&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisBindingOperation.java
 Tue Jul 17 13:12:49 2012
@@ -298,4 +298,9 @@ public class AxisBindingOperation extend
public AxisBinding getAxisBinding() {
return (AxisBinding) parent;
}
+   
+   @Override
+public void applyPolicy() throws AxisFault {
+   getAxisOperation().applyPolicy();
+}
 }

Modified: 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java?rev=1362479&r1=1362478&r2=1362479&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description/AxisEndpoint.java
 Tue Jul 17 13:12:49 2012
@@ -225,4 +225,9 @@ public class AxisEndpoint extends AxisDe
 }
 return false;
 }
+
+@Override
+public void applyPolicy() throws AxisFault {
+getAxisService().applyPolicy();
+}
 }

svn commit: r1362599 - in /axis/axis2/java/core/trunk/modules/json: pom.xml src/org/apache/axis2/json/impl/

2012-07-17 Thread sagara

Author: sagara
Date: Tue Jul 17 18:40:06 2012
New Revision: 1362599

URL: http://svn.apache.org/viewvc?rev=1362599&view=rev
Log:
revert r1358712, r1358530 to fix build issues on JDK5

Removed:
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/
Modified:
axis/axis2/java/core/trunk/modules/json/pom.xml

Modified: axis/axis2/java/core/trunk/modules/json/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/pom.xml?rev=1362599&r1=1362598&r2=1362599&view=diff
==
--- axis/axis2/java/core/trunk/modules/json/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/json/pom.xml Tue Jul 17 18:40:06 2012
@@ -65,10 +65,7 @@
 ${project.groupId}
 axis2-adb
 ${project.version}
-
-
-com.google.code.gson
-gson
+test
 
 
 http://axis.apache.org/axis2/java/core/

svn commit: r1362604 - /axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/WSDLSupplierTest.java

2012-07-17 Thread sagara

Author: sagara
Date: Tue Jul 17 18:45:10 2012
New Revision: 1362604

URL: http://svn.apache.org/viewvc?rev=1362604&view=rev
Log:
For the moment commented two test methods  to fix build issues. 

Modified:

axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/WSDLSupplierTest.java

Modified: 
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/WSDLSupplierTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/WSDLSupplierTest.java?rev=1362604&r1=1362603&r2=1362604&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/WSDLSupplierTest.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/WSDLSupplierTest.java
 Tue Jul 17 18:45:10 2012
@@ -99,46 +99,46 @@ public class WSDLSupplierTest extends Te
 assertTrue(wsdl.contains(""));
 }
 
-public void testWSDL11SupplierTemplate() throws Exception {
-WSDL11SupplierTemplate value = new TestWSDL11SupplierTemplate();
-axisService.addParameter(Constants.WSDL_SUPPLIER_PARAM, value);
-ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-axisService.printWSDL(outputStream);
-String wsdl = outputStream.toString();
-assertTrue(wsdl
-.contains("http://schemas.xmlsoap.org/wsdl/\"; 
xmlns:wsaw=\"http://www.w3.org/2006/05/";
-+ "addressing/wsdl\" 
xmlns:http=\"http://schemas.xmlsoap.org/wsdl/http/\"; "
-+ "xmlns:tns=\"http://ws.apache.org/axis2\"; 
xmlns:soap=\"http://schemas.xmlsoap.org/wsdl/soap/\"; "
-+ 
"xmlns:mime=\"http://schemas.xmlsoap.org/wsdl/mime/\"; 
xmlns:soap12=\"http://schemas.xmlsoap.org/wsdl/soap12/\"; "
-+ "targetNamespace=\"http://ws.apache.org/axis2\";>"));
-assertTrue(wsdl.contains(""));
-assertTrue(wsdl.contains("http://axis.apache.org\";>"));
-assertTrue(wsdl.contains("Apache Axis2"));
-assertTrue(wsdl.contains("u...@axis.apache.org"));
-assertTrue(wsdl.contains(" "));
-assertTrue(wsdl.contains(""));
-assertFalse(wsdl.contains(""));
-}
+//public void testWSDL11SupplierTemplate() throws Exception {
+//WSDL11SupplierTemplate value = new TestWSDL11SupplierTemplate();
+//axisService.addParameter(Constants.WSDL_SUPPLIER_PARAM, value);
+//ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+//axisService.printWSDL(outputStream);
+//String wsdl = outputStream.toString();
+//assertTrue(wsdl
+//.contains("http://schemas.xmlsoap.org/wsdl/\"; 
xmlns:wsaw=\"http://www.w3.org/2006/05/";
+//+ "addressing/wsdl\" 
xmlns:http=\"http://schemas.xmlsoap.org/wsdl/http/\"; "
+//+ "xmlns:tns=\"http://ws.apache.org/axis2\"; 
xmlns:soap=\"http://schemas.xmlsoap.org/wsdl/soap/\"; "
+//+ 
"xmlns:mime=\"http://schemas.xmlsoap.org/wsdl/mime/\"; 
xmlns:soap12=\"http://schemas.xmlsoap.org/wsdl/soap12/\"; "
+//+ 
"targetNamespace=\"http://ws.apache.org/axis2\";>"));
+//assertTrue(wsdl.contains(""));
+//assertTrue(wsdl.contains("http://axis.apache.org\";>"));
+//assertTrue(wsdl.contains("Apache Axis2"));
+//
assertTrue(wsdl.contains("u...@axis.apache.org"));
+//assertTrue(wsdl.contains(" "));
+//assertTrue(wsdl.contains(""));
+//assertFalse(wsdl.contains(""));
+//}
 
-public void testWSDL11SupplierTemplateWSDL1SupplierClass() throws 
Exception {
-String value = TestWSDL11SupplierTemplate.class.getName();
-axisService.addParameter(Constants.WSDL_11_SUPPLIER_CLASS_PARAM, 
value);
-ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-axisService.printWSDL(outputStream);
-String wsdl = outputStream.toString();
-assertTrue(wsdl
-.contains("http://schemas.xmlsoap.org/wsdl/\"; 
xmlns:wsaw=\"http://www.w3.org/2006/05/";
-+ "addressing/wsdl\" 
xmlns:http=\"http://schemas.xmlsoap.org/wsdl/http/\"; "
-+ "xmlns:tns=\"http://ws.apache.org/axis2\"; 
xmlns:soap=\"http://schemas.xmlsoap.org/wsdl/soap/\"; "
-+ 
"xmlns:mime=\"http://schemas.xmlsoap.org/wsdl/mime/\"; 
xmlns:soap12=\"http://schemas.xmlsoap.org/wsdl/soap12/\"; "
-+ "targetNamespace=\"http://ws.apache.org/axis2\";>"));
-assertTrue(wsdl.contains(""));
-assertTrue(wsdl.contains("http://axis.apache.org\";>"));
-assertTrue(wsdl.contains("Apache Axis2"));
-assertTrue(wsdl.contains("u...@axis.apache.org"));
-assertTrue(wsdl.contains(" "));
-assertTrue(wsdl.contains(""));
-

svn commit: r1362770 - in /axis/axis2/java/core/trunk/modules/json: ./ src/org/apache/axis2/json/impl/ src/org/apache/axis2/json/impl/rpc/ src/org/apache/axis2/json/impl/utils/

2012-07-17 Thread sagara

Author: sagara
Date: Wed Jul 18 05:26:51 2012
New Revision: 1362770

URL: http://svn.apache.org/viewvc?rev=1362770&view=rev
Log:
Reverted r1362599 and reapplied  r1358712, r1358530 with build fixes.   

Added:
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/
  - copied from r1362598, 
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/

axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JsonBuilder.java
  - copied, changed from r1362598, 
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JsonBuilder.java

axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JsonFormatter.java
  - copied, changed from r1362598, 
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JsonFormatter.java
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/rpc/
  - copied from r1362598, 
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/rpc/

axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/rpc/JsonInOnlyRPCMessageReceiver.java
  - copied unchanged from r1362598, 
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/rpc/JsonInOnlyRPCMessageReceiver.java

axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/rpc/JsonRpcMessageReceiver.java
  - copied unchanged from r1362598, 
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/rpc/JsonRpcMessageReceiver.java

axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/utils/
  - copied from r1362598, 
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/utils/

axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/utils/JsonConstant.java
  - copied unchanged from r1362598, 
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/utils/JsonConstant.java

axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/utils/JsonUtils.java
  - copied unchanged from r1362598, 
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/utils/JsonUtils.java
Modified:
axis/axis2/java/core/trunk/modules/json/pom.xml

Modified: axis/axis2/java/core/trunk/modules/json/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/pom.xml?rev=1362770&r1=1362769&r2=1362770&view=diff
==
--- axis/axis2/java/core/trunk/modules/json/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/json/pom.xml Wed Jul 18 05:26:51 2012
@@ -65,7 +65,10 @@
 ${project.groupId}
 axis2-adb
 ${project.version}
-test
+
+
+com.google.code.gson
+gson
 
 
 http://axis.apache.org/axis2/java/core/

Copied: 
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JsonBuilder.java
 (from r1362598, 
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JsonBuilder.java)
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JsonBuilder.java?p2=axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JsonBuilder.java&p1=axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JsonBuilder.java&r1=1362598&r2=1362770&rev=1362770&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JsonBuilder.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JsonBuilder.java
 Wed Jul 18 05:26:51 2012
@@ -31,7 +31,6 @@ import org.apache.axis2.json.impl.utils.
 import java.io.InputStream;
 
 public class JsonBuilder implements Builder {
-@Override
 public OMElement processDocument(InputStream inputStream, String s, 
MessageContext messageContext) throws AxisFault {
 messageContext.setProperty(JsonConstant.INPUT_STREAM ,inputStream);
 messageContext.setProperty(JsonConstant.IS_JSON_STREAM , true);

Copied: 
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JsonFormatter.java
 (from r1362598, 
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JsonFormatter.java)
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JsonFormatter.java?p2=axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JsonFormatter.java&p1=axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JsonFormatter.java&r1=1362598&r2=1362770&rev=1362770&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/json/src/org/apache/axis2/json/impl/JsonFormatter.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/json/s

svn commit: r1362781 - /axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/WSDLSupplierTest.java

2012-07-17 Thread sagara

Author: sagara
Date: Wed Jul 18 06:35:21 2012
New Revision: 1362781

URL: http://svn.apache.org/viewvc?rev=1362781&view=rev
Log:
Fix the test cases.  It would be better to use XML level comparison framework 
such as XMLUnit instead of String based comparisons.  

Modified:

axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/WSDLSupplierTest.java

Modified: 
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/WSDLSupplierTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/WSDLSupplierTest.java?rev=1362781&r1=1362780&r2=1362781&view=diff
==
--- 
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/WSDLSupplierTest.java
 (original)
+++ 
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/WSDLSupplierTest.java
 Wed Jul 18 06:35:21 2012
@@ -99,46 +99,44 @@ public class WSDLSupplierTest extends Te
 assertTrue(wsdl.contains(""));
 }
 
-//public void testWSDL11SupplierTemplate() throws Exception {
-//WSDL11SupplierTemplate value = new TestWSDL11SupplierTemplate();
-//axisService.addParameter(Constants.WSDL_SUPPLIER_PARAM, value);
-//ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-//axisService.printWSDL(outputStream);
-//String wsdl = outputStream.toString();
-//assertTrue(wsdl
-//.contains("http://schemas.xmlsoap.org/wsdl/\"; 
xmlns:wsaw=\"http://www.w3.org/2006/05/";
-//+ "addressing/wsdl\" 
xmlns:http=\"http://schemas.xmlsoap.org/wsdl/http/\"; "
-//+ "xmlns:tns=\"http://ws.apache.org/axis2\"; 
xmlns:soap=\"http://schemas.xmlsoap.org/wsdl/soap/\"; "
-//+ 
"xmlns:mime=\"http://schemas.xmlsoap.org/wsdl/mime/\"; 
xmlns:soap12=\"http://schemas.xmlsoap.org/wsdl/soap12/\"; "
-//+ 
"targetNamespace=\"http://ws.apache.org/axis2\";>"));
-//assertTrue(wsdl.contains(""));
-//assertTrue(wsdl.contains("http://axis.apache.org\";>"));
-//assertTrue(wsdl.contains("Apache Axis2"));
-//
assertTrue(wsdl.contains("u...@axis.apache.org"));
-//assertTrue(wsdl.contains(" "));
-//assertTrue(wsdl.contains(""));
-//assertFalse(wsdl.contains(""));
-//}
+public void testWSDL11SupplierTemplate() throws Exception {
+WSDL11SupplierTemplate value = new TestWSDL11SupplierTemplate();
+axisService.addParameter(Constants.WSDL_SUPPLIER_PARAM, value);
+ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+axisService.printWSDL(outputStream);
+String wsdl = outputStream.toString();
+assertTrue(wsdl.contains("http://schemas.xmlsoap.org/wsdl/\"; "));
+assertTrue(wsdl.contains("xmlns:wsaw=\"http://www.w3.org/2006/05/";));
+assertTrue(wsdl.contains("xmlns:tns=\"http://ws.apache.org/axis2\"";));
+
assertTrue(wsdl.contains("xmlns:soap=\"http://schemas.xmlsoap.org/wsdl/soap/\"; 
"));
+assertTrue(wsdl.contains(""));
+assertTrue(wsdl.contains("http://axis.apache.org\";>"));
+assertTrue(wsdl.contains("Apache Axis2"));
+assertTrue(wsdl.contains("u...@axis.apache.org"));
+assertTrue(wsdl.contains(" "));
+assertTrue(wsdl.contains(""));
+assertFalse(wsdl.contains(""));
+}
 
-//public void testWSDL11SupplierTemplateWSDL1SupplierClass() throws 
Exception {
-//String value = TestWSDL11SupplierTemplate.class.getName();
-//axisService.addParameter(Constants.WSDL_11_SUPPLIER_CLASS_PARAM, 
value);
-//ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-//axisService.printWSDL(outputStream);
-//String wsdl = outputStream.toString();
-//assertTrue(wsdl
-//.contains("http://schemas.xmlsoap.org/wsdl/\"; 
xmlns:wsaw=\"http://www.w3.org/2006/05/";
-//+ "addressing/wsdl\" 
xmlns:http=\"http://schemas.xmlsoap.org/wsdl/http/\"; "
-//+ "xmlns:tns=\"http://ws.apache.org/axis2\"; 
xmlns:soap=\"http://schemas.xmlsoap.org/wsdl/soap/\"; "
-//+ 
"xmlns:mime=\"http://schemas.xmlsoap.org/wsdl/mime/\"; 
xmlns:soap12=\"http://schemas.xmlsoap.org/wsdl/soap12/\"; "
-//+ 
"targetNamespace=\"http://ws.apache.org/axis2\";>"));
-//assertTrue(wsdl.contains(""));
-//assertTrue(wsdl.contains("http://axis.apache.org\";>"));
-//assertTrue(wsdl.contains("Apache Axis2"));
-//
assertTrue(wsdl.contains("u...@axis.apache.org"));
-//assertTrue(wsdl.contains(" "));
-//assertTrue(wsdl.contains(""));
-//assertFalse(wsdl.contains(""));
-//}
+public void testWSDL11SupplierTemplateWSDL1SupplierClass() throws 
Exception {
+String va

svn commit: r1362379 - in /axis/axis2/java/core/branches/1_6/modules/adb-codegen: src/org/apache/axis2/schema/ src/org/apache/axis2/schema/writer/ test-resources/testsuite/ test/org/apache/axis2/schem

svn commit: r1362388 - in /axis/axis2/java/core/trunk/modules/adb: src/org/apache/axis2/databinding/utils/ConverterUtil.java test/org/apache/axis2/databinding/utils/ConverterUtilTest.java

svn commit: r1362406 - in /axis/axis2/java/core/trunk/modules/adb-codegen: test-resources/testsuite/extensions.xsd test/org/apache/axis2/schema/extension/SimpleExtensionTest.java

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

svn commit: r1362479 - in /axis/axis2/java/core/trunk/modules/kernel/src/org/apache/axis2/description: AxisBinding.java AxisBindingMessage.java AxisBindingOperation.java AxisEndpoint.java

svn commit: r1362599 - in /axis/axis2/java/core/trunk/modules/json: pom.xml src/org/apache/axis2/json/impl/

svn commit: r1362604 - /axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/WSDLSupplierTest.java

svn commit: r1362770 - in /axis/axis2/java/core/trunk/modules/json: ./ src/org/apache/axis2/json/impl/ src/org/apache/axis2/json/impl/rpc/ src/org/apache/axis2/json/impl/utils/

svn commit: r1362781 - /axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/description/WSDLSupplierTest.java

9 matches

Site Navigation

Mail list logo

Footer information