svn commit: r1349636 - /axis/axis2/java/transports/trunk/modules/sms/repository/services/SampleService/META-INF/services.xml
Author: sagara Date: Wed Jun 13 05:27:15 2012 New Revision: 1349636 URL: http://svn.apache.org/viewvc?rev=1349636&view=rev Log: Changes introduced by AXIS2-5315 in r1349635 [1] [1] - http://svn.apache.org/viewvc?view=revision&revision=1349635 Modified: axis/axis2/java/transports/trunk/modules/sms/repository/services/SampleService/META-INF/services.xml Modified: axis/axis2/java/transports/trunk/modules/sms/repository/services/SampleService/META-INF/services.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/transports/trunk/modules/sms/repository/services/SampleService/META-INF/services.xml?rev=1349636&r1=1349635&r2=1349636&view=diff == --- axis/axis2/java/transports/trunk/modules/sms/repository/services/SampleService/META-INF/services.xml (original) +++ axis/axis2/java/transports/trunk/modules/sms/repository/services/SampleService/META-INF/services.xml Wed Jun 13 05:27:15 2012 @@ -4,7 +4,7 @@ http://www.w3.org/2004/08/wsdl/in-out"; +mep="http://www.w3.org/ns/wsdl/in-out"; class="org.apache.axis2.transport.sms.SimpleInOutMessageReceiver"/> @@ -19,7 +19,7 @@ http://www.w3.org/2004/08/wsdl/in-out"; +mep="http://www.w3.org/ns/wsdl/in-out"; class="org.apache.axis2.transport.sms.SimpleInOutMessageReceiver"/>
svn commit: r1349637 - in /axis/axis2/java/rampart/trunk/modules: documentation/src/site/xdoc/setting-up-sts.xml rampart-trust-mar/module.xml
Author: sagara Date: Wed Jun 13 05:27:54 2012 New Revision: 1349637 URL: http://svn.apache.org/viewvc?rev=1349637&view=rev Log: Changes introduced by AXIS2-5315 in r1349635 [1] [1] - http://svn.apache.org/viewvc?view=revision&revision=1349635 Modified: axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/setting-up-sts.xml axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/module.xml Modified: axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/setting-up-sts.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/setting-up-sts.xml?rev=1349637&r1=1349636&r2=1349637&view=diff == --- axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/setting-up-sts.xml (original) +++ axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/setting-up-sts.xml Wed Jun 13 05:27:54 2012 @@ -34,7 +34,7 @@; +mep="http://www.w3.org/ns/wsdl/in-out">; Modified: axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/module.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/module.xml?rev=1349637&r1=1349636&r2=1349637&view=diff == --- axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/module.xml (original) +++ axis/axis2/java/rampart/trunk/modules/rampart-trust-mar/module.xml Wed Jun 13 05:27:54 2012 @@ -5,7 +5,7 @@ http://schemas.xmlsoap.org/ws/2005/07/securitypolicy, http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702 "/> -http://www.w3.org/2006/01/wsdl/in-out";> +http://www.w3.org/ns/wsdl/in-out";>
svn commit: r1349638 - in /axis/axis2/java/sandesha/trunk: modules/interop/src/resources/conf/ modules/mar/ modules/persistence/test-resources/ modules/samples/src/main/resources/userguide/ modules/te
Author: sagara Date: Wed Jun 13 05:29:38 2012 New Revision: 1349638 URL: http://svn.apache.org/viewvc?rev=1349638&view=rev Log: Changes introduced by AXIS2-5315 in r1349635 [1] [1] - http://svn.apache.org/viewvc?view=revision&revision=1349635 Modified: axis/axis2/java/sandesha/trunk/modules/interop/src/resources/conf/sec-client-axis2.xml axis/axis2/java/sandesha/trunk/modules/interop/src/resources/conf/sec-services.xml axis/axis2/java/sandesha/trunk/modules/interop/src/resources/conf/services.xml axis/axis2/java/sandesha/trunk/modules/mar/module.xml axis/axis2/java/sandesha/trunk/modules/persistence/test-resources/client_axis2.xml axis/axis2/java/sandesha/trunk/modules/persistence/test-resources/server_axis2.xml axis/axis2/java/sandesha/trunk/modules/samples/src/main/resources/userguide/services.xml axis/axis2/java/sandesha/trunk/modules/tests/test-resources/client_axis2.xml axis/axis2/java/sandesha/trunk/modules/tests/test-resources/client_mtom_axis2.xml axis/axis2/java/sandesha/trunk/modules/tests/test-resources/server_axis2.xml axis/axis2/java/sandesha/trunk/modules/tests/test-resources/server_mtom_axis2.xml axis/axis2/java/sandesha/trunk/src/site/xdoc/userGuide.xml Modified: axis/axis2/java/sandesha/trunk/modules/interop/src/resources/conf/sec-client-axis2.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/interop/src/resources/conf/sec-client-axis2.xml?rev=1349638&r1=1349637&r2=1349638&view=diff == --- axis/axis2/java/sandesha/trunk/modules/interop/src/resources/conf/sec-client-axis2.xml (original) +++ axis/axis2/java/sandesha/trunk/modules/interop/src/resources/conf/sec-client-axis2.xml Wed Jun 13 05:29:38 2012 @@ -75,9 +75,9 @@ -http://www.w3.org/2006/01/wsdl/in-only"; +http://www.w3.org/ns/wsdl/in-only"; class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver"/> -http://www.w3.org/2006/01/wsdl/in-out"; +http://www.w3.org/ns/wsdl/in-out"; class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/> Modified: axis/axis2/java/sandesha/trunk/modules/interop/src/resources/conf/sec-services.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/interop/src/resources/conf/sec-services.xml?rev=1349638&r1=1349637&r2=1349638&view=diff == --- axis/axis2/java/sandesha/trunk/modules/interop/src/resources/conf/sec-services.xml (original) +++ axis/axis2/java/sandesha/trunk/modules/interop/src/resources/conf/sec-services.xml Wed Jun 13 05:29:38 2012 @@ -25,10 +25,10 @@ - http://www.w3.org/2006/01/wsdl/in-out"; + http://www.w3.org/ns/wsdl/in-out"; class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver" /> http://www.w3.org/2006/01/wsdl/in-only"; + mep="http://www.w3.org/ns/wsdl/in-only"; class="org.apache.axis2.receivers.RawXMLINOnlyMessageReceiver" /> @@ -37,7 +37,7 @@ http://www.w3.org/2006/01/wsdl/in-out";> + mep="http://www.w3.org/ns/wsdl/in-out";> urn:wsrm:EchoString urn:wsrm:EchoStringResponse @@ -45,7 +45,7 @@ http://www.w3.org/2006/01/wsdl/in-only";> + mep="http://www.w3.org/ns/wsdl/in-only";> urn:wsrm:Ping Modified: axis/axis2/java/sandesha/trunk/modules/interop/src/resources/conf/services.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/sandesha/trunk/modules/interop/src/resources/conf/services.xml?rev=1349638&r1=1349637&r2=1349638&view=diff == --- axis/axis2/java/sandesha/trunk/modules/interop/src/resources/conf/services.xml (original) +++ axis/axis2/java/sandesha/trunk/modules/interop/src/resources/conf/services.xml Wed Jun 13 05:29:38 2012 @@ -21,23 +21,23 @@ - http://www.w3.org/2006/01/wsdl/in-out"; + http://www.w3.org/ns/wsdl/in-out"; class="org.apache.sandesha2.interop.RMInteropServiceMessageReceiverInOut" /> - http://www.w3.org/2006/01/wsdl/in-only"; + http://www.w3.org/ns/wsdl/in-only"; class="org.apache.sandesha2.interop.RMInteropServiceMessageReceiverInOnly" /> org.apache.sandesha2.interop.RMInteropServiceSkeletonImpl http://www.w3.org/2006/01/wsdl/in-out";> + mep="http://www.w3.org/ns/wsdl/in-out";> urn:wsrm:EchoString
svn commit: r1349648 - in /axis/axis2/java/core/trunk/modules/codegen: ./ test-resources/schemas/custom_schemas/ test/org/apache/axis2/wsdl/codegen/ test/org/apache/axis2/wsdl/codegen/schema/ test/org
Author: sagara Date: Wed Jun 13 06:08:14 2012 New Revision: 1349648 URL: http://svn.apache.org/viewvc?rev=1349648&view=rev Log: AXIS2-5335 - applying patch for codegen module. Added: axis/axis2/java/core/trunk/modules/codegen/test-resources/schemas/custom_schemas/ axis/axis2/java/core/trunk/modules/codegen/test-resources/schemas/custom_schemas/generated.xsd (with props) axis/axis2/java/core/trunk/modules/codegen/test-resources/schemas/custom_schemas/generatedSchema1.xsd (with props) axis/axis2/java/core/trunk/modules/codegen/test-resources/schemas/custom_schemas/generatedSchema2.xsd (with props) axis/axis2/java/core/trunk/modules/codegen/test-resources/schemas/custom_schemas/generatedSchema3.xsd (with props) axis/axis2/java/core/trunk/modules/codegen/test-resources/schemas/custom_schemas/sampleSchema1.xsd (with props) axis/axis2/java/core/trunk/modules/codegen/test-resources/schemas/custom_schemas/schemaIncludes.xsd (with props) axis/axis2/java/core/trunk/modules/codegen/test/org/apache/axis2/wsdl/codegen/CodeGenConfigurationTest.java (with props) axis/axis2/java/core/trunk/modules/codegen/test/org/apache/axis2/wsdl/codegen/XMLSchemaTest.java (with props) axis/axis2/java/core/trunk/modules/codegen/test/org/apache/axis2/wsdl/codegen/writer/ axis/axis2/java/core/trunk/modules/codegen/test/org/apache/axis2/wsdl/codegen/writer/SchemaWriterTest.java (with props) Modified: axis/axis2/java/core/trunk/modules/codegen/pom.xml axis/axis2/java/core/trunk/modules/codegen/test/org/apache/axis2/wsdl/codegen/schema/AxisServiceTopElementSchemaGeneratorTest.java Modified: axis/axis2/java/core/trunk/modules/codegen/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/pom.xml?rev=1349648&r1=1349647&r2=1349648&view=diff == --- axis/axis2/java/core/trunk/modules/codegen/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/codegen/pom.xml Wed Jun 13 06:08:14 2012 @@ -77,6 +77,11 @@ jaxws-rt test + +xmlunit +xmlunit + test + http://axis.apache.org/axis2/java/core/ Added: axis/axis2/java/core/trunk/modules/codegen/test-resources/schemas/custom_schemas/generated.xsd URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/test-resources/schemas/custom_schemas/generated.xsd?rev=1349648&view=auto == --- axis/axis2/java/core/trunk/modules/codegen/test-resources/schemas/custom_schemas/generated.xsd (added) +++ axis/axis2/java/core/trunk/modules/codegen/test-resources/schemas/custom_schemas/generated.xsd Wed Jun 13 06:08:14 2012 @@ -0,0 +1,33 @@ + + + + +http://www.w3.org/2001/XMLSchema"; xmlns="http://www.w3schools.com"; attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://www.w3schools.com";> + + + + + + + + + + + Propchange: axis/axis2/java/core/trunk/modules/codegen/test-resources/schemas/custom_schemas/generated.xsd -- svn:eol-style = native Added: axis/axis2/java/core/trunk/modules/codegen/test-resources/schemas/custom_schemas/generatedSchema1.xsd URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/test-resources/schemas/custom_schemas/generatedSchema1.xsd?rev=1349648&view=auto == --- axis/axis2/java/core/trunk/modules/codegen/test-resources/schemas/custom_schemas/generatedSchema1.xsd (added) +++ axis/axis2/java/core/trunk/modules/codegen/test-resources/schemas/custom_schemas/generatedSchema1.xsd Wed Jun 13 06:08:14 2012 @@ -0,0 +1,62 @@ + + +http://www.w3.org/2001/XMLSchema"; xmlns:ns0="http://test2.com"; xmlns:tns="http://test.com"; attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://test.com";> +http://test2.com"/> + + + + + + + + + + + + +http://www.w3.org/2001/XMLSchema"; xmlns:ns0="http://test2.com"; xmlns:tns="http://test.com"; attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://test.com";> +http://test2.com"/> + + + + + + + + + + Propchange: axis/axis2/java/core/trunk/modules/codegen/test-resources/schemas/custom_schemas/generatedSchema1.xsd -- svn:eol-style = native Added: axis/axis2/java/core/trunk/modules/codegen/test-resources/schemas/custom_schemas/generatedSch
svn commit: r1349653 - in /axis/axis2/java/core/trunk/modules/codegen: ./ test-resources/schemas/custom_schemas/ test/org/apache/axis2/wsdl/codegen/ test/org/apache/axis2/wsdl/codegen/schema/ test/org
Author: sagara Date: Wed Jun 13 06:19:17 2012 New Revision: 1349653 URL: http://svn.apache.org/viewvc?rev=1349653&view=rev Log: reverting r1349648 due to build issues. Removed: axis/axis2/java/core/trunk/modules/codegen/test-resources/schemas/custom_schemas/ axis/axis2/java/core/trunk/modules/codegen/test/org/apache/axis2/wsdl/codegen/CodeGenConfigurationTest.java axis/axis2/java/core/trunk/modules/codegen/test/org/apache/axis2/wsdl/codegen/XMLSchemaTest.java axis/axis2/java/core/trunk/modules/codegen/test/org/apache/axis2/wsdl/codegen/writer/ Modified: axis/axis2/java/core/trunk/modules/codegen/pom.xml axis/axis2/java/core/trunk/modules/codegen/test/org/apache/axis2/wsdl/codegen/schema/AxisServiceTopElementSchemaGeneratorTest.java Modified: axis/axis2/java/core/trunk/modules/codegen/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/pom.xml?rev=1349653&r1=1349652&r2=1349653&view=diff == --- axis/axis2/java/core/trunk/modules/codegen/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/codegen/pom.xml Wed Jun 13 06:19:17 2012 @@ -77,11 +77,6 @@ jaxws-rt test - -xmlunit -xmlunit - test - http://axis.apache.org/axis2/java/core/ Modified: axis/axis2/java/core/trunk/modules/codegen/test/org/apache/axis2/wsdl/codegen/schema/AxisServiceTopElementSchemaGeneratorTest.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/test/org/apache/axis2/wsdl/codegen/schema/AxisServiceTopElementSchemaGeneratorTest.java?rev=1349653&r1=1349652&r2=1349653&view=diff == --- axis/axis2/java/core/trunk/modules/codegen/test/org/apache/axis2/wsdl/codegen/schema/AxisServiceTopElementSchemaGeneratorTest.java (original) +++ axis/axis2/java/core/trunk/modules/codegen/test/org/apache/axis2/wsdl/codegen/schema/AxisServiceTopElementSchemaGeneratorTest.java Wed Jun 13 06:19:17 2012 @@ -19,85 +19,16 @@ package org.apache.axis2.wsdl.codegen.schema; -import java.util.ArrayList; +import junit.framework.TestCase; +import org.apache.axis2.namespace.Constants; + +import javax.xml.namespace.QName; import java.util.HashSet; -import java.util.List; import java.util.Map; import java.util.Set; -import javax.xml.namespace.QName; - -import org.apache.axis2.AxisFault; -import org.apache.axis2.client.OperationClient; -import org.apache.axis2.client.Options; -import org.apache.axis2.context.MessageContext; -import org.apache.axis2.context.OperationContext; -import org.apache.axis2.context.ServiceContext; -import org.apache.axis2.description.AxisMessage; -import org.apache.axis2.description.AxisOperation; -import org.apache.axis2.description.AxisService; -import org.apache.axis2.namespace.Constants; -import org.apache.axis2.wsdl.codegen.XMLSchemaTest; -import org.apache.ws.commons.schema.XmlSchema; -import org.apache.ws.commons.schema.XmlSchemaElement; -import org.junit.Test; - -public class AxisServiceTopElementSchemaGeneratorTest extends XMLSchemaTest { - - -private AxisService service; -private ArrayList schemas; -private AxisServiceTopElementSchemaGenerator generator; -private Map schemaMap; -private Set topElements; - -@Override -protected void setUp() throws Exception { -service = new AxisService(); -schemas = new ArrayList(); -loadSampleSchemaFile(schemas); -service.addSchema(schemas); -generator = new AxisServiceTopElementSchemaGenerator(null); - -topElements = new HashSet(); - -TopElement topElement; - -topElement = new TopElement(new QName("http://test.com";, "testElement1")); -topElements.add(topElement); -topElement = new TopElement(new QName("http://test1.com";, "testElement2")); -topElements.add(topElement); -topElement = new TopElement(new QName("http://test1.com";, "testElement3")); -topElement.setTypeQName(new QName(Constants.URI_2001_SCHEMA_XSD, "string")); -topElements.add(topElement); - -topElement = new TopElement(new QName("http://test1.com";, "testElement4")); -topElement.setTypeQName(new QName("http://test1.com";, "testComplexType1")); -topElements.add(topElement); - -topElement = new TopElement(new QName("http://test1.com";, "testElement5")); -topElement.setTypeQName(new QName("http://test.com";, "testComplexType2")); -topElements.add(topElement); - -topElement = new TopElement(new QName("http://test.com";, "testElement6")); -topElement.setTypeQName(new QName("http://test2.com";, "testComplexType2")); -topElements.add(topElement); - -schemaMap = generator.getSchemaMap(topElements); -generator.getXmlSche
svn commit: r1349654 - in /axis/axis2/java/core/trunk/modules/codegen: ./ test-resources/schemas/custom_schemas/ test/org/apache/axis2/wsdl/codegen/ test/org/apache/axis2/wsdl/codegen/extension/ test/
Author: sagara Date: Wed Jun 13 06:32:40 2012 New Revision: 1349654 URL: http://svn.apache.org/viewvc?rev=1349654&view=rev Log: AXIS2-5335 - applying test cases patch for codegen module. Added: axis/axis2/java/core/trunk/modules/codegen/test-resources/schemas/custom_schemas/ axis/axis2/java/core/trunk/modules/codegen/test-resources/schemas/custom_schemas/generated.xsd (with props) axis/axis2/java/core/trunk/modules/codegen/test-resources/schemas/custom_schemas/generatedSchema1.xsd (with props) axis/axis2/java/core/trunk/modules/codegen/test-resources/schemas/custom_schemas/generatedSchema2.xsd (with props) axis/axis2/java/core/trunk/modules/codegen/test-resources/schemas/custom_schemas/generatedSchema3.xsd (with props) axis/axis2/java/core/trunk/modules/codegen/test-resources/schemas/custom_schemas/sampleSchema1.xsd (with props) axis/axis2/java/core/trunk/modules/codegen/test-resources/schemas/custom_schemas/schemaIncludes.xsd (with props) axis/axis2/java/core/trunk/modules/codegen/test/org/apache/axis2/wsdl/codegen/CodeGenConfigurationTest.java (with props) axis/axis2/java/core/trunk/modules/codegen/test/org/apache/axis2/wsdl/codegen/XMLSchemaTest.java (with props) axis/axis2/java/core/trunk/modules/codegen/test/org/apache/axis2/wsdl/codegen/extension/JAXWSWapperExtensionTest.java (with props) axis/axis2/java/core/trunk/modules/codegen/test/org/apache/axis2/wsdl/codegen/extension/WSDLValidatorExtensionTest.java (with props) axis/axis2/java/core/trunk/modules/codegen/test/org/apache/axis2/wsdl/codegen/writer/ axis/axis2/java/core/trunk/modules/codegen/test/org/apache/axis2/wsdl/codegen/writer/SchemaWriterTest.java (with props) Modified: axis/axis2/java/core/trunk/modules/codegen/pom.xml axis/axis2/java/core/trunk/modules/codegen/test/org/apache/axis2/wsdl/codegen/schema/AxisServiceTopElementSchemaGeneratorTest.java Modified: axis/axis2/java/core/trunk/modules/codegen/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/pom.xml?rev=1349654&r1=1349653&r2=1349654&view=diff == --- axis/axis2/java/core/trunk/modules/codegen/pom.xml (original) +++ axis/axis2/java/core/trunk/modules/codegen/pom.xml Wed Jun 13 06:32:40 2012 @@ -77,6 +77,11 @@ jaxws-rt test + + xmlunit + xmlunit +test + http://axis.apache.org/axis2/java/core/ Added: axis/axis2/java/core/trunk/modules/codegen/test-resources/schemas/custom_schemas/generated.xsd URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/test-resources/schemas/custom_schemas/generated.xsd?rev=1349654&view=auto == --- axis/axis2/java/core/trunk/modules/codegen/test-resources/schemas/custom_schemas/generated.xsd (added) +++ axis/axis2/java/core/trunk/modules/codegen/test-resources/schemas/custom_schemas/generated.xsd Wed Jun 13 06:32:40 2012 @@ -0,0 +1,13 @@ + +http://www.w3.org/2001/XMLSchema"; xmlns="http://www.w3schools.com"; attributeFormDefault="unqualified" elementFormDefault="qualified" targetNamespace="http://www.w3schools.com";> + + + + + + + + + + + Propchange: axis/axis2/java/core/trunk/modules/codegen/test-resources/schemas/custom_schemas/generated.xsd -- svn:eol-style = native Added: axis/axis2/java/core/trunk/modules/codegen/test-resources/schemas/custom_schemas/generatedSchema1.xsd URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/codegen/test-resources/schemas/custom_schemas/generatedSchema1.xsd?rev=1349654&view=auto == --- axis/axis2/java/core/trunk/modules/codegen/test-resources/schemas/custom_schemas/generatedSchema1.xsd (added) +++ axis/axis2/java/core/trunk/modules/codegen/test-resources/schemas/custom_schemas/generatedSchema1.xsd Wed Jun 13 06:32:40 2012 @@ -0,0 +1,31 @@ + + +http://www.w3.org/2001/XMLSchema"; xmlns:ns0="http://test2.com"; xmlns:tns="http://test.com"; attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://test.com";> +http://test2.com"/> + + + + + + + + + + Propchange: axis/axis2/java/core/trunk/modules/codegen/test-resources/schemas/custom_schemas/generatedSchema1.xsd -- svn:eol-style = native Added: axis/axis2/java/core/trunk/modules/codegen/test-resources/schemas/custom_schemas/generatedSchema2.xsd URL: http://svn.apache.o