You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ve...@apache.org on 2009/07/04 23:25:18 UTC
svn commit: r791179 - in /webservices/axis2/trunk/java/modules/adb-codegen:
./ test-resources/testsuite/ test/org/apache/axis2/schema/innerChoice/
test/org/apache/axis2/schema/innerchoice/
test/org/apache/axis2/schema/references/ test/org/apache/axis2/...
Author: veithen
Date: Sat Jul 4 21:25:11 2009
New Revision: 791179
URL: http://svn.apache.org/viewvc?rev=791179&view=rev
Log:
ADB tests: uniform naming of packages, namespaces and files.
Added:
webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/innerchoice.xsd
- copied, changed from r791176, webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/innersequence_choice.xsd
webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/references.xsd
- copied, changed from r791176, webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/element_references.xsd
webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/innerchoice/
- copied from r791176, webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/innerChoice/
webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/references/ReferenceTest.java
- copied, changed from r791176, webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/references/ElementReferenceTest.java
Removed:
webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/element_references.xsd
webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/innersequence_choice.xsd
webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/innerChoice/
webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/references/ElementReferenceTest.java
Modified:
webservices/axis2/trunk/java/modules/adb-codegen/sub-build.xml
webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/soapencoding.xsd
webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/innerchoice/InnerChoiceTest.java
webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/soapencoding/SoapEncodingTest.java
Modified: webservices/axis2/trunk/java/modules/adb-codegen/sub-build.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/sub-build.xml?rev=791179&r1=791178&r2=791179&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/sub-build.xml (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/sub-build.xml Sat Jul 4 21:25:11 2009
@@ -62,8 +62,8 @@
<arg file="${testsuite.source.dir}/restrictions.xsd"/>
<arg file="${testsuite.source.dir}/choice.xsd"/>
<arg file="${testsuite.source.dir}/list.xsd"/>
- <arg file="${testsuite.source.dir}/element_references.xsd"/>
- <arg file="${testsuite.source.dir}/innersequence_choice.xsd"/>
+ <arg file="${testsuite.source.dir}/references.xsd"/>
+ <arg file="${testsuite.source.dir}/innerchoice.xsd"/>
<arg file="${testsuite.source.dir}/attribute.xsd"/>
<arg file="${testsuite.source.dir}/boolean.xsd"/>
<arg file="${testsuite.source.dir}/particlemaxoccurs.xsd"/>
Copied: webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/innerchoice.xsd (from r791176, webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/innersequence_choice.xsd)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/innerchoice.xsd?p2=webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/innerchoice.xsd&p1=webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/innersequence_choice.xsd&r1=791176&r2=791179&rev=791179&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/innersequence_choice.xsd (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/innerchoice.xsd Sat Jul 4 21:25:11 2009
@@ -21,9 +21,9 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns="http://www.w3.org/2001/XMLSchema"
- xmlns:tns="org.apache.axis2.test"
- xmlns:test1="org.apache.axis2.test"
- targetNamespace="org.apache.axis2.test">
+ xmlns:tns="http://apache.org/axis2/schema/innerchoice"
+ xmlns:test1="http://apache.org/axis2/schema/innerchoice"
+ targetNamespace="http://apache.org/axis2/schema/innerchoice">
<xs:element name="TestInnerSequence1">
<xs:complexType>
Copied: webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/references.xsd (from r791176, webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/element_references.xsd)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/references.xsd?p2=webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/references.xsd&p1=webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/element_references.xsd&r1=791176&r2=791179&rev=791179&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/element_references.xsd (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/references.xsd Sat Jul 4 21:25:11 2009
@@ -18,10 +18,9 @@
-->
<schema elementFormDefault="qualified"
- targetNamespace="http://www.americanexpress.com/wsdl/ctn/utilities/atb"
- xmlns:tns="http://www.americanexpress.com/wsdl/ctn/utilities/atb"
+ targetNamespace="http://apache.org/axis2/schema/references"
+ xmlns:tns="http://apache.org/axis2/schema/references"
xmlns="http://www.w3.org/2001/XMLSchema">
- <import namespace="http://www.americanexpress.com/schemas/ctn/utilities/atb"/>
<element name="checkEligibility1">
<complexType>
Modified: webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/soapencoding.xsd
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/soapencoding.xsd?rev=791179&r1=791178&r2=791179&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/soapencoding.xsd (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/test-resources/testsuite/soapencoding.xsd Sat Jul 4 21:25:11 2009
@@ -21,8 +21,8 @@
xmlns:s="http://www.w3.org/2001/XMLSchema"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
- xmlns:s0="http://tempuri.org/soapencoding"
- targetNamespace="http://tempuri.org/soapencoding">
+ xmlns:s0="http://apache.org/axis2/schema/soapencoding"
+ targetNamespace="http://apache.org/axis2/schema/soapencoding">
<s:element name="TestSoapElement1" type="soapenc:Array"/>
<s:element name="TestSoapElement2">
Modified: webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/innerchoice/InnerChoiceTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/innerchoice/InnerChoiceTest.java?rev=791179&r1=791176&r2=791179&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/innerchoice/InnerChoiceTest.java (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/innerchoice/InnerChoiceTest.java Sat Jul 4 21:25:11 2009
@@ -17,12 +17,10 @@
* under the License.
*/
-package org.apache.axis2.schema.innerChoice;
+package org.apache.axis2.schema.innerchoice;
import org.apache.axis2.schema.AbstractTestCase;
-import test.axis2.apache.org.*;
-
public class InnerChoiceTest extends AbstractTestCase {
public void testInnerChoice1() throws Exception {
Copied: webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/references/ReferenceTest.java (from r791176, webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/references/ElementReferenceTest.java)
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/references/ReferenceTest.java?p2=webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/references/ReferenceTest.java&p1=webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/references/ElementReferenceTest.java&r1=791176&r2=791179&rev=791179&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/references/ElementReferenceTest.java (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/references/ReferenceTest.java Sat Jul 4 21:25:11 2009
@@ -19,10 +19,9 @@
package org.apache.axis2.schema.references;
-import com.americanexpress.www.wsdl.ctn.utilities.atb.*;
import org.apache.axis2.schema.AbstractTestCase;
-public class ElementReferenceTest extends AbstractTestCase {
+public class ReferenceTest extends AbstractTestCase {
public void testSingleElementReference() throws Exception {
CheckEligibility1 echCheckEligibility1 = new CheckEligibility1();
Modified: webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/soapencoding/SoapEncodingTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/soapencoding/SoapEncodingTest.java?rev=791179&r1=791178&r2=791179&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/soapencoding/SoapEncodingTest.java (original)
+++ webservices/axis2/trunk/java/modules/adb-codegen/test/org/apache/axis2/schema/soapencoding/SoapEncodingTest.java Sat Jul 4 21:25:11 2009
@@ -26,9 +26,6 @@
import org.apache.axis2.databinding.ADBException;
import org.apache.axis2.databinding.types.soapencoding.Array;
import org.apache.axis2.databinding.types.soapencoding._double;
-import org.tempuri.soapencoding.TestComplexType;
-import org.tempuri.soapencoding.TestSoapElement1;
-import org.tempuri.soapencoding.TestSoapElement2;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
@@ -95,7 +92,7 @@
public void testSoapElement15() {
Array array = new Array();
- array.setArrayTypeQName(new QName("http://tempuri.org/soapencoding", "TestComplexType"));
+ array.setArrayTypeQName(new QName("http://apache.org/axis2/schema/soapencoding", "TestComplexType"));
TestComplexType testComplexType;
for (int i = 0; i < 10; i++) {
testComplexType = new TestComplexType();