You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ga...@apache.org on 2005/01/05 07:25:07 UTC
cvs commit: ws-axis/java/test/typedesc ComplexBean.java ComplexBean2.java ComplexBean3.java PackageTests.java SimpleBean.java SimpleBean2.java TestTypeDescSynch.java TestTypesNonBeanCompatible.java build.xml
gawor 2005/01/04 22:25:07
Modified: java/test/typedesc ComplexBean.java ComplexBean2.java
ComplexBean3.java PackageTests.java SimpleBean.java
SimpleBean2.java TestTypeDescSynch.java
TestTypesNonBeanCompatible.java build.xml
Log:
just cleanup: untabify + added copyright statment
Revision Changes Path
1.2 +23 -8 ws-axis/java/test/typedesc/ComplexBean.java
Index: ComplexBean.java
===================================================================
RCS file: /home/cvs/ws-axis/java/test/typedesc/ComplexBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ComplexBean.java 30 Aug 2003 05:20:58 -0000 1.1
+++ ComplexBean.java 5 Jan 2005 06:25:07 -0000 1.2
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2002-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package test.typedesc;
import org.apache.axis.description.AttributeDesc;
@@ -21,18 +36,18 @@
fd.setXmlName(new QName("foo", "c"));
typeDesc.addFieldDesc(fd);
- fd = new AttributeDesc();
+ fd = new AttributeDesc();
fd.setFieldName("d");
fd.setXmlName(new QName("foo", "d"));
typeDesc.addFieldDesc(fd);
- fd = new AttributeDesc();
+ fd = new AttributeDesc();
fd.setFieldName("e");
- ((AttributeDesc)fd).setAttributeName("ffffff");
+ ((AttributeDesc)fd).setAttributeName("ffffff");
fd.setXmlName(new QName("foo", "e"));
typeDesc.addFieldDesc(fd);
- fd = new AttributeDesc();
+ fd = new AttributeDesc();
fd.setFieldName("f");
fd.setXmlName(new QName("foo", "f"));
typeDesc.addFieldDesc(fd);
@@ -45,27 +60,27 @@
}
public String getC() {
- return null;
+ return null;
}
public void setD(String value) {
}
public String getD() {
- return null;
+ return null;
}
public void setE(String value) {
}
public String getE() {
- return null;
+ return null;
}
public void setF(String value) {
}
public String getF() {
- return null;
+ return null;
}
}
1.2 +21 -6 ws-axis/java/test/typedesc/ComplexBean2.java
Index: ComplexBean2.java
===================================================================
RCS file: /home/cvs/ws-axis/java/test/typedesc/ComplexBean2.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ComplexBean2.java 30 Aug 2003 05:20:58 -0000 1.1
+++ ComplexBean2.java 5 Jan 2005 06:25:07 -0000 1.2
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2002-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package test.typedesc;
import org.apache.axis.description.AttributeDesc;
@@ -20,14 +35,14 @@
fd.setXmlName(new QName("foo", "c"));
typeDesc.addFieldDesc(fd);
- fd = new AttributeDesc();
+ fd = new AttributeDesc();
fd.setFieldName("d");
fd.setXmlName(new QName("foo", "d"));
typeDesc.addFieldDesc(fd);
- fd = new AttributeDesc();
+ fd = new AttributeDesc();
fd.setFieldName("e");
- ((AttributeDesc)fd).setAttributeName("ffffff");
+ ((AttributeDesc)fd).setAttributeName("ffffff");
fd.setXmlName(new QName("foo", "e"));
typeDesc.addFieldDesc(fd);
}
@@ -39,21 +54,21 @@
}
public String getC() {
- return null;
+ return null;
}
public void setD(String value) {
}
public String getD() {
- return null;
+ return null;
}
public void setE(String value) {
}
public String getE() {
- return null;
+ return null;
}
}
1.2 +18 -3 ws-axis/java/test/typedesc/ComplexBean3.java
Index: ComplexBean3.java
===================================================================
RCS file: /home/cvs/ws-axis/java/test/typedesc/ComplexBean3.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ComplexBean3.java 30 Aug 2003 05:20:58 -0000 1.1
+++ ComplexBean3.java 5 Jan 2005 06:25:07 -0000 1.2
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2002-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package test.typedesc;
import org.apache.axis.description.AttributeDesc;
@@ -19,7 +34,7 @@
fd.setXmlName(new QName("foo", "c"));
typeDesc.addFieldDesc(fd);
- fd = new AttributeDesc();
+ fd = new AttributeDesc();
fd.setFieldName("d");
fd.setXmlName(new QName("foo", "d"));
typeDesc.addFieldDesc(fd);
@@ -32,14 +47,14 @@
}
public String getC() {
- return null;
+ return null;
}
public void setD(String value) {
}
public String getD() {
- return null;
+ return null;
}
}
1.3 +15 -0 ws-axis/java/test/typedesc/PackageTests.java
Index: PackageTests.java
===================================================================
RCS file: /home/cvs/ws-axis/java/test/typedesc/PackageTests.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PackageTests.java 14 Dec 2004 15:14:38 -0000 1.2
+++ PackageTests.java 5 Jan 2005 06:25:07 -0000 1.3
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2002-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package test.typedesc;
import junit.framework.Test;
1.2 +18 -3 ws-axis/java/test/typedesc/SimpleBean.java
Index: SimpleBean.java
===================================================================
RCS file: /home/cvs/ws-axis/java/test/typedesc/SimpleBean.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimpleBean.java 30 Aug 2003 05:20:58 -0000 1.1
+++ SimpleBean.java 5 Jan 2005 06:25:07 -0000 1.2
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2002-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package test.typedesc;
import org.apache.axis.description.AttributeDesc;
@@ -19,7 +34,7 @@
fd.setXmlName(new QName("foo", "a"));
typeDesc.addFieldDesc(fd);
- fd = new AttributeDesc();
+ fd = new AttributeDesc();
fd.setFieldName("b");
fd.setXmlName(new QName("foo", "b"));
typeDesc.addFieldDesc(fd);
@@ -32,13 +47,13 @@
}
public String getA() {
- return null;
+ return null;
}
public void setB(String value) {
}
public String getB() {
- return null;
+ return null;
}
}
1.2 +18 -3 ws-axis/java/test/typedesc/SimpleBean2.java
Index: SimpleBean2.java
===================================================================
RCS file: /home/cvs/ws-axis/java/test/typedesc/SimpleBean2.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimpleBean2.java 30 Aug 2003 05:20:58 -0000 1.1
+++ SimpleBean2.java 5 Jan 2005 06:25:07 -0000 1.2
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2002-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package test.typedesc;
import org.apache.axis.description.AttributeDesc;
@@ -19,7 +34,7 @@
fd.setXmlName(new QName("foo", "a"));
typeDesc.addFieldDesc(fd);
- fd = new AttributeDesc();
+ fd = new AttributeDesc();
fd.setFieldName("b");
fd.setXmlName(new QName("foo", "b"));
typeDesc.addFieldDesc(fd);
@@ -32,13 +47,13 @@
}
public String getA() {
- return null;
+ return null;
}
public void setB(String value) {
}
public String getB() {
- return null;
+ return null;
}
}
1.2 +15 -0 ws-axis/java/test/typedesc/TestTypeDescSynch.java
Index: TestTypeDescSynch.java
===================================================================
RCS file: /home/cvs/ws-axis/java/test/typedesc/TestTypeDescSynch.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestTypeDescSynch.java 30 Aug 2003 05:20:58 -0000 1.1
+++ TestTypeDescSynch.java 5 Jan 2005 06:25:07 -0000 1.2
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2002-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package test.typedesc;
import junit.framework.TestCase;
1.3 +43 -27 ws-axis/java/test/typedesc/TestTypesNonBeanCompatible.java
Index: TestTypesNonBeanCompatible.java
===================================================================
RCS file: /home/cvs/ws-axis/java/test/typedesc/TestTypesNonBeanCompatible.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestTypesNonBeanCompatible.java 16 Dec 2004 18:54:57 -0000 1.2
+++ TestTypesNonBeanCompatible.java 5 Jan 2005 06:25:07 -0000 1.3
@@ -1,4 +1,20 @@
+/*
+ * Copyright 2002-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package test.typedesc;
+
import java.util.ArrayList;
import java.util.Locale;
@@ -16,45 +32,45 @@
public class TestTypesNonBeanCompatible extends TestCase {
- private Types types;
+ private Types types;
- protected void setUp() throws Exception {
+ protected void setUp() throws Exception {
- Definition def = WSDLFactory.newInstance().newDefinition();
- TypeMapping tm = DefaultTypeMappingImpl.getSingleton();
- Namespaces namespaces = new Namespaces();
- ServiceDesc serviceDesc = new JavaServiceDesc();
-
- types = new Types(def, tm, tm, namespaces, "any:name.space", new ArrayList(), serviceDesc);
- }
-
+ Definition def = WSDLFactory.newInstance().newDefinition();
+ TypeMapping tm = DefaultTypeMappingImpl.getSingleton();
+ Namespaces namespaces = new Namespaces();
+ ServiceDesc serviceDesc = new JavaServiceDesc();
+
+ types = new Types(def, tm, tm, namespaces, "any:name.space", new ArrayList(), serviceDesc);
+ }
+
/*
Commented out for now because the suggested patch breaks Object arrays
// Tests for Axis-1720 - http://nagoya.apache.org/jira/browse/AXIS-1720
- public void testWriteTypeNonBeanCompatibleOnce() throws Exception {
+ public void testWriteTypeNonBeanCompatibleOnce() throws Exception {
- String schema = types.writeType(Locale.class);
- assertEquals("Schema should be null for non-bean-compatible types", null, schema);
- }
+ String schema = types.writeType(Locale.class);
+ assertEquals("Schema should be null for non-bean-compatible types", null, schema);
+ }
- public void testWriteTypeNonBeanCompatibleTwice() throws Exception {
+ public void testWriteTypeNonBeanCompatibleTwice() throws Exception {
- String schema = types.writeType(Locale.class);
- assertEquals("Schema should be null for non-bean-compatible types", null, schema);
+ String schema = types.writeType(Locale.class);
+ assertEquals("Schema should be null for non-bean-compatible types", null, schema);
- schema = types.writeType(Locale.class);
- assertEquals("Schema should be null for non-bean-compatible types", null, schema);
- }
+ schema = types.writeType(Locale.class);
+ assertEquals("Schema should be null for non-bean-compatible types", null, schema);
+ }
- public void testWriteTypeNonBeanCompatibleDifferent() throws Exception {
+ public void testWriteTypeNonBeanCompatibleDifferent() throws Exception {
- String schema = types.writeType(Locale.class);
- assertEquals("Schema should be null for non-bean-compatible types", null, schema);
+ String schema = types.writeType(Locale.class);
+ assertEquals("Schema should be null for non-bean-compatible types", null, schema);
- schema = types.writeType(Locale.class);
- assertEquals("Schema should be null for non-bean-compatible types", null, schema);
- }
+ schema = types.writeType(Locale.class);
+ assertEquals("Schema should be null for non-bean-compatible types", null, schema);
+ }
*/
public void testWriteObjectType() throws Exception {
@@ -66,4 +82,4 @@
assertNotNull("Schema should NOT be be null for Object[] class", schema);
}
-}
\ No newline at end of file
+}
1.4 +1 -1 ws-axis/java/test/typedesc/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/ws-axis/java/test/typedesc/build.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- build.xml 2 Jun 2004 17:05:17 -0000 1.3
+++ build.xml 5 Jan 2005 06:25:07 -0000 1.4
@@ -63,7 +63,7 @@
</target>
<target name="run">
- <antcall target="execute-Component" />
+ <antcall target="execute-Component-noServer" />
</target>
</project>