You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2007/03/08 18:15:05 UTC
svn commit: r516103 [5/11] - in /incubator/cxf/trunk: ./
common/common/src/test/java/org/apache/cxf/common/annotation/
common/common/src/test/java/org/apache/cxf/common/classloader/
common/common/src/test/java/org/apache/cxf/common/commands/ common/com...
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XmlParamTypeTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XmlParamTypeTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XmlParamTypeTest.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/XmlParamTypeTest.java Thu Mar 8 09:14:44 2007
@@ -1,3 +1,21 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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 org.apache.cxf.aegis.type.java5;
import java.lang.reflect.Method;
@@ -11,17 +29,17 @@
import org.apache.cxf.aegis.type.CustomTypeMapping;
import org.apache.cxf.aegis.type.DefaultTypeCreator;
import org.apache.cxf.aegis.type.Type;
+import org.junit.Before;
+import org.junit.Test;
-public class XmlParamTypeTest
- extends AbstractAegisTest
-{
+public class XmlParamTypeTest extends AbstractAegisTest {
private CustomTypeMapping tm;
private Java5TypeCreator creator;
- public void setUp() throws Exception
- {
+ @Before
+ public void setUp() throws Exception {
super.setUp();
-
+
tm = new CustomTypeMapping();
creator = new Java5TypeCreator();
creator.setNextCreator(new DefaultTypeCreator());
@@ -29,39 +47,37 @@
tm.setTypeCreator(creator);
}
- public void testType() throws Exception
- {
- Method m = CustomTypeService.class.getMethod("doFoo", new Class[] { String.class });
-
+ @Test
+ public void testType() throws Exception {
+ Method m = CustomTypeService.class.getMethod("doFoo", new Class[] {String.class});
+
Type type = creator.createType(m, 0);
tm.register(type);
- assertTrue( type instanceof CustomStringType );
- assertEquals( new QName("urn:xfire:foo", "custom"), type.getSchemaType());
-
+ assertTrue(type instanceof CustomStringType);
+ assertEquals(new QName("urn:xfire:foo", "custom"), type.getSchemaType());
+
type = creator.createType(m, -1);
tm.register(type);
- assertTrue( type instanceof CustomStringType );
- assertEquals( new QName("urn:xfire:foo", "custom"), type.getSchemaType());
+ assertTrue(type instanceof CustomStringType);
+ assertEquals(new QName("urn:xfire:foo", "custom"), type.getSchemaType());
}
-
- public void testMapServiceWSDL() throws Exception
- {
+
+ @Test
+ public void testMapServiceWSDL() throws Exception {
createService(CustomTypeService.class, null);
-
+
Document wsdl = getWSDLDocument("CustomTypeService");
assertValid("//xsd:element[@name='s'][@type='ns0:custom']", wsdl);
}
-
- public class CustomTypeService
- {
-
- @XmlReturnType(type=CustomStringType.class,
- namespace="urn:xfire:foo",
- name="custom")
- public String doFoo(@XmlParamType(type=CustomStringType.class,
- namespace="urn:xfire:foo",
- name="custom") String s) {
- return null;
+
+ public class CustomTypeService {
+
+ @XmlReturnType(type = CustomStringType.class, namespace = "urn:xfire:foo", name = "custom")
+ public String doFoo(
+ @XmlParamType(type = CustomStringType.class,
+ namespace = "urn:xfire:foo", name = "custom")
+ String s) {
+ return null;
}
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/dto/CollectionDTO.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/dto/CollectionDTO.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/dto/CollectionDTO.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/dto/CollectionDTO.java Thu Mar 8 09:14:44 2007
@@ -1,18 +1,33 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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 org.apache.cxf.aegis.type.java5.dto;
import java.util.List;
-public class CollectionDTO
-{
+public class CollectionDTO {
List<String> strings;
- public List<String> getStrings()
- {
+ public List<String> getStrings() {
return strings;
}
- public void setStrings(List<String> strings)
- {
+ public void setStrings(List<String> strings) {
this.strings = strings;
}
-}
\ No newline at end of file
+}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/dto/DTOService.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/dto/DTOService.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/dto/DTOService.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/dto/DTOService.java Thu Mar 8 09:14:44 2007
@@ -1,17 +1,34 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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 org.apache.cxf.aegis.type.java5.dto;
import java.util.ArrayList;
+import java.util.List;
-public class DTOService
-{
- public CollectionDTO getDTO()
- {
+public class DTOService {
+ public CollectionDTO getDTO() {
CollectionDTO dto = new CollectionDTO();
-
- ArrayList<String> strings = new ArrayList<String>();
+
+ List<String> strings = new ArrayList<String>();
strings.add("hi");
dto.setStrings(strings);
-
+
return dto;
}
-}
\ No newline at end of file
+}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/dto/MapDTO.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/dto/MapDTO.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/dto/MapDTO.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/dto/MapDTO.java Thu Mar 8 09:14:44 2007
@@ -1,18 +1,33 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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 org.apache.cxf.aegis.type.java5.dto;
import java.util.Map;
-public class MapDTO
-{
- Map<String,Integer> strings;
+public class MapDTO {
+ Map<String, Integer> strings;
- public Map<String,Integer> getStrings()
- {
+ public Map<String, Integer> getStrings() {
return strings;
}
- public void setStrings(Map<String,Integer> strings)
- {
+ public void setStrings(Map<String, Integer> strings) {
this.strings = strings;
}
-}
\ No newline at end of file
+}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/dto/MapDTOService.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/dto/MapDTOService.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/dto/MapDTOService.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/dto/MapDTOService.java Thu Mar 8 09:14:44 2007
@@ -1,17 +1,34 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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 org.apache.cxf.aegis.type.java5.dto;
import java.util.HashMap;
+import java.util.Map;
-public class MapDTOService
-{
- public MapDTO getDTO()
- {
- MapDTO dto = new MapDTO();
-
- HashMap<String,Integer> strings = new HashMap<String,Integer>();
+public class MapDTOService {
+ public MapDTO getDTO() {
+ MapDTO dto = new MapDTO();
+
+ Map<String, Integer> strings = new HashMap<String, Integer>();
strings.put("hi", 4);
dto.setStrings(strings);
-
+
return dto;
}
-}
\ No newline at end of file
+}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/dto/ObjectDTO.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/dto/ObjectDTO.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/dto/ObjectDTO.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/dto/ObjectDTO.java Thu Mar 8 09:14:44 2007
@@ -1,18 +1,33 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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 org.apache.cxf.aegis.type.java5.dto;
import java.util.List;
-public class ObjectDTO
-{
+public class ObjectDTO {
List<? extends Object> objects;
- public List<? extends Object> getObjects()
- {
+ public List<? extends Object> getObjects() {
return objects;
}
- public void setObjects(List<? extends Object> objects)
- {
+ public void setObjects(List<? extends Object> objects) {
this.objects = objects;
}
-}
\ No newline at end of file
+}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/ReaderTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/ReaderTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/ReaderTest.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/ReaderTest.java Thu Mar 8 09:14:44 2007
@@ -26,53 +26,50 @@
import org.apache.cxf.aegis.util.jdom.StaxBuilder;
import org.apache.cxf.aegis.xml.MessageReader;
import org.apache.cxf.aegis.xml.jdom.JDOMReader;
-import org.apache.cxf.aegis.xml.stax.ElementReader;
import org.apache.cxf.binding.soap.Soap11;
import org.apache.cxf.test.AbstractCXFTest;
import org.jdom.Document;
+import org.junit.Test;
/**
* @author <a href="mailto:dan@envoisolutions.com">Dan Diephouse</a>
* @since Nov 4, 2004
*/
-public class ReaderTest
- extends AbstractCXFTest
-{
- public void testLiteralReader()
- throws Exception
- {
+public class ReaderTest extends AbstractCXFTest {
+ @Test
+ public void testLiteralReader() throws Exception {
ElementReader lr = getStreamReader("bean11.xml");
testReading(lr);
-
+
lr = getStreamReader("read1.xml");
testReading2(lr);
}
- private ElementReader getStreamReader(String resource)
- throws FactoryConfigurationError, XMLStreamException
- {
- /*XMLInputFactory factory = XMLInputFactory.newInstance();
- XMLStreamReader reader = factory.createXMLStreamReader(
- getResourceAsStream(resource));*/
- XMLStreamReader reader = STAXUtils.createXMLStreamReader(getResourceAsStream(resource),null,null);
-
- while ( reader.getEventType() != XMLStreamReader.START_ELEMENT )
+ private ElementReader getStreamReader(String resource) throws FactoryConfigurationError,
+ XMLStreamException {
+ /*
+ * XMLInputFactory factory = XMLInputFactory.newInstance();
+ * XMLStreamReader reader = factory.createXMLStreamReader(
+ * getResourceAsStream(resource));
+ */
+ XMLStreamReader reader = STAXUtils.createXMLStreamReader(getResourceAsStream(resource), null, null);
+
+ while (reader.getEventType() != XMLStreamReader.START_ELEMENT) {
reader.next();
-
+ }
+
return new ElementReader(reader);
}
-
- public void testJDOMReader()
- throws Exception
- {
+
+ @Test
+ public void testJDOMReader() throws Exception {
StaxBuilder builder = new StaxBuilder();
Document doc = builder.build(getResourceAsReader("bean11.xml"));
testReading(new JDOMReader(doc.getRootElement()));
}
-
- public void testReading(MessageReader reader)
- {
+
+ public void testReading(MessageReader reader) {
assertTrue(reader.getLocalName().equals("Envelope"));
// make sure we can repeat this
@@ -89,10 +86,8 @@
assertEquals("Body", body.getLocalName());
assertFalse(body.hasMoreElementReaders());
}
-
- public void testReading2(MessageReader reader)
- throws Exception
- {
+
+ public void testReading2(MessageReader reader) throws Exception {
assertEquals("test", reader.getLocalName());
assertEquals("urn:test", reader.getNamespace());
@@ -103,16 +98,16 @@
MessageReader one = reader.getNextAttributeReader();
assertEquals("one", one.getValue());
-
+
MessageReader two = reader.getNextAttributeReader();
assertEquals("two", two.getValue());
assertFalse(reader.hasMoreAttributeReaders());
-
+
assertTrue(reader.hasMoreElementReaders());
assertTrue(reader.hasMoreElementReaders());
assertTrue(reader.hasMoreElementReaders());
-
+
MessageReader child = reader.getNextElementReader();
assertEquals("child", child.getLocalName());
assertTrue(child.hasMoreElementReaders());
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/WriterTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/WriterTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/WriterTest.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/xml/stax/WriterTest.java Thu Mar 8 09:14:44 2007
@@ -25,40 +25,37 @@
import org.apache.cxf.aegis.util.jdom.StaxBuilder;
import org.apache.cxf.aegis.xml.MessageWriter;
import org.apache.cxf.aegis.xml.jdom.JDOMWriter;
-import org.apache.cxf.aegis.xml.stax.ElementWriter;
import org.apache.cxf.test.AbstractCXFTest;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.output.DOMOutputter;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
/**
* @author <a href="mailto:dan@envoisolutions.com">Dan Diephouse</a>
* @since Nov 4, 2004
*/
-public class WriterTest
- extends AbstractCXFTest
-{
+public class WriterTest extends AbstractCXFTest {
File output;
-
- public void setUp()
- throws Exception
- {
- super.setUp();
-
+
+ @Before
+ public void setUp() throws Exception {
+ super.setUpBus();
+
output = File.createTempFile("writetest", ".xml");
}
- public void tearDown()
- {
- if (output.exists())
+ @After
+ public void tearDown() {
+ if (output.exists()) {
output.delete();
-
- super.tearDown();
+ }
}
- public void testLiteral()
- throws Exception
- {
+ @Test
+ public void testLiteral() throws Exception {
ByteArrayOutputStream bos = new ByteArrayOutputStream();
ElementWriter writer = new ElementWriter(bos, "root", "urn:test");
@@ -66,30 +63,28 @@
writer.flush();
bos.close();
-
- System.out.println(bos.toString());
+
+ // System.out.println(bos.toString());
StaxBuilder builder = new StaxBuilder();
Document doc = builder.build(new StringReader(bos.toString()));
-
+
testWrite(doc);
}
-
- public void testJDOM()
- throws Exception
- {
+
+ @Test
+ public void testJDOM() throws Exception {
Document doc = new Document(new Element("root", "urn:test"));
-
+
write(new JDOMWriter(doc.getRootElement()));
-
+
testWrite(doc);
}
-
- public void write(MessageWriter writer)
- {
+
+ public void write(MessageWriter writer) {
MessageWriter nons = writer.getElementWriter("nons");
nons.writeValue("nons");
nons.close();
-
+
MessageWriter intval = writer.getElementWriter("int");
intval.writeValueAsInt(new Integer(10000));
intval.close();
@@ -107,19 +102,18 @@
MessageWriter att4 = child1.getAttributeWriter("att4", null);
att4.writeValue("att4");
att4.close();
-
+
child1.close();
-
+
writer.close();
}
-
- public void testWrite(Document jdoc) throws Exception
- {
+
+ public void testWrite(Document jdoc) throws Exception {
org.w3c.dom.Document doc = new DOMOutputter().output(jdoc);
addNamespace("t", "urn:test");
addNamespace("c", "urn:child1");
addNamespace("a", "urn:att3");
-
+
assertValid("/t:root/t:nons[text()='nons']", doc);
assertValid("/t:root/t:int[text()='10000']", doc);
assertValid("/t:root/c:child1", doc);
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/BaseUser.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/BaseUser.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/BaseUser.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/BaseUser.java Thu Mar 8 09:14:44 2007
@@ -22,17 +22,14 @@
package org.codehaus.xfire.aegis.inheritance;
// @XmlType(namespace="urn:xfire:inheritance")
-public abstract class BaseUser
-{
+public abstract class BaseUser {
private String name;
- public String getName()
- {
+ public String getName() {
return name;
}
- public void setName(String name)
- {
+ public void setName(String name) {
this.name = name;
}
-}
\ No newline at end of file
+}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/Employee.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/Employee.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/Employee.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/Employee.java Thu Mar 8 09:14:44 2007
@@ -22,19 +22,15 @@
package org.codehaus.xfire.aegis.inheritance;
// @XmlType(namespace="urn:xfire:inheritance")
-public class Employee
- extends BaseUser
-{
+public class Employee extends BaseUser {
private String division;
- public String getDivision()
- {
+ public String getDivision() {
return division;
}
- public void setDivision(String division)
- {
+ public void setDivision(String division) {
this.division = division;
}
-}
\ No newline at end of file
+}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ExceptionInheritanceTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ExceptionInheritanceTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ExceptionInheritanceTest.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ExceptionInheritanceTest.java Thu Mar 8 09:14:44 2007
@@ -19,46 +19,48 @@
package org.codehaus.xfire.aegis.inheritance;
import org.apache.cxf.aegis.AbstractAegisTest;
+import org.junit.Test;
-public class ExceptionInheritanceTest extends AbstractAegisTest
-{
-// private Service service;
-//
-// public void setUp() throws Exception
-// {
-// super.setUp();
-//
-// HashMap props = new HashMap();
-// props.put(AegisBindingProvider.WRITE_XSI_TYPE_KEY, Boolean.TRUE);
-// ArrayList l = new ArrayList();
-// l.add(SimpleBean.class.getName());
-// l.add(WS1ExtendedException.class.getName());
-//
-// props.put(AegisBindingProvider.OVERRIDE_TYPES_KEY, l);
-//
-// createService(WS1.class, null);
-//
-// service = getServiceFactory().create(WS1.class, props);
-// service.setInvoker(new BeanInvoker(new WS1Impl()));
-// getServiceRegistry().register(service);
-// }
-//
-// public void testClient() throws Exception
-// {
-// WS1 client = (WS1) new XFireProxyFactory(getXFire()).create(service, "xfire.local://WS1");
-//
-// try
-// {
-// client.throwException(true);
-// }
-// catch (WS1ExtendedException ex)
-// {
-// Object sb = ex.getSimpleBean();
-// assertTrue(sb instanceof SimpleBean);
-// }
-// }
-
+public class ExceptionInheritanceTest extends AbstractAegisTest {
+ // private Service service;
+ //
+ // public void setUp() throws Exception
+ // {
+ // super.setUp();
+ //
+ // HashMap props = new HashMap();
+ // props.put(AegisBindingProvider.WRITE_XSI_TYPE_KEY, Boolean.TRUE);
+ // ArrayList l = new ArrayList();
+ // l.add(SimpleBean.class.getName());
+ // l.add(WS1ExtendedException.class.getName());
+ //
+ // props.put(AegisBindingProvider.OVERRIDE_TYPES_KEY, l);
+ //
+ // createService(WS1.class, null);
+ //
+ // service = getServiceFactory().create(WS1.class, props);
+ // service.setInvoker(new BeanInvoker(new WS1Impl()));
+ // getServiceRegistry().register(service);
+ // }
+ //
+ // public void testClient() throws Exception
+ // {
+ // WS1 client = (WS1) new XFireProxyFactory(getXFire()).create(service,
+ // "xfire.local://WS1");
+ //
+ // try
+ // {
+ // client.throwException(true);
+ // }
+ // catch (WS1ExtendedException ex)
+ // {
+ // Object sb = ex.getSimpleBean();
+ // assertTrue(sb instanceof SimpleBean);
+ // }
+ // }
+
+ @Test
public void testNothing() {
-
+
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/InheritancePOJOTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/InheritancePOJOTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/InheritancePOJOTest.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/InheritancePOJOTest.java Thu Mar 8 09:14:44 2007
@@ -33,39 +33,35 @@
import org.apache.cxf.aegis.util.XmlConstants;
import org.apache.cxf.frontend.ServerFactoryBean;
import org.apache.cxf.transport.local.LocalTransportFactory;
+import org.junit.Before;
+import org.junit.Test;
/**
* @author <a href="mailto:dan@envoisolutions.com">Dan Diephouse</a>
*/
-public class InheritancePOJOTest
- extends AbstractAegisTest
-{
-
- public void setUp()
- throws Exception
- {
+public class InheritancePOJOTest extends AbstractAegisTest {
+
+ @Before
+ public void setUp() throws Exception {
super.setUp();
- ServerFactoryBean sf = createServiceFactory(InheritanceService.class,
- "InheritanceService",
- new QName("urn:xfire:inheritance",
- "InheritanceService"));
-
+ ServerFactoryBean sf = createServiceFactory(InheritanceService.class, "InheritanceService",
+ new QName("urn:xfire:inheritance", "InheritanceService"));
+
Map<String, Object> props = new HashMap<String, Object>();
props.put(Aegis.WRITE_XSI_TYPE_KEY, "true");
-
+
List<String> l = new ArrayList<String>();
l.add(Employee.class.getName());
props.put(Aegis.OVERRIDE_TYPES_KEY, l);
-
+
sf.getServiceFactory().setProperties(props);
sf.create();
}
- public void testGenerateWsdl()
- throws Exception
- {
+ @Test
+ public void testGenerateWsdl() throws Exception {
Document d = getWSDLDocument("InheritanceService");
String types = "//wsdl:types/xsd:schema/";
@@ -76,7 +72,8 @@
String extension = "/xsd:complexContent/xsd:extension[@base='ns1:BaseUser']";
assertValid(employeeType + extension, d);
assertValid(employeeType + extension + "/xsd:sequence/xsd:element[@name='division']", d);
- //assertValid("count(" + employeeType + extension + "/xsd:sequence/*)=1", d);
+ // assertValid("count(" + employeeType + extension +
+ // "/xsd:sequence/*)=1", d);
// check for BaseUser as abstract
String baseUserType = types + "xsd:complexType[(@name='BaseUser') and (@abstract='true')]";
@@ -85,22 +82,17 @@
// assertValid("count(" + baseUserType + "/xsd:sequence/*)=1", d);
}
- public void testLocalReceiveEmployee()
- throws Exception
- {
- Node response = invoke("InheritanceService",
- LocalTransportFactory.TRANSPORT_ID,
- "ReceiveEmployee.xml");
+ @Test
+ public void testLocalReceiveEmployee() throws Exception {
+ Node response = invoke("InheritanceService", LocalTransportFactory.TRANSPORT_ID,
+ "ReceiveEmployee.xml");
addNamespace("w", "urn:xfire:inheritance");
assertValid("//s:Body/w:receiveUserResponse", response);
}
- public void testLocalGetEmployee()
- throws Exception
- {
- Node response = invoke("InheritanceService",
- LocalTransportFactory.TRANSPORT_ID,
- "GetEmployee.xml");
+ @Test
+ public void testLocalGetEmployee() throws Exception {
+ Node response = invoke("InheritanceService", LocalTransportFactory.TRANSPORT_ID, "GetEmployee.xml");
addNamespace("xsi", XmlConstants.XSI_NS);
addNamespace("w", "urn:xfire:inheritance");
addNamespace("p", "http://inheritance.aegis.xfire.codehaus.org");
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/InheritanceService.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/InheritanceService.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/InheritanceService.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/InheritanceService.java Thu Mar 8 09:14:44 2007
@@ -21,18 +21,15 @@
*/
package org.codehaus.xfire.aegis.inheritance;
-public class InheritanceService
-{
- public BaseUser getEmployee()
- {
+public class InheritanceService {
+ public BaseUser getEmployee() {
Employee e = new Employee();
e.setDivision("foo");
e.setName("Dan D. Man");
return e;
}
- public void receiveUser(BaseUser user)
- {
+ public void receiveUser(BaseUser user) {
InheritancePOJOTest.assertTrue(user instanceof Employee);
}
-}
\ No newline at end of file
+}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/intf/GrandChildImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/intf/GrandChildImpl.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/intf/GrandChildImpl.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/intf/GrandChildImpl.java Thu Mar 8 09:14:44 2007
@@ -18,22 +18,17 @@
*/
package org.codehaus.xfire.aegis.inheritance.intf;
-public class GrandChildImpl
- implements IGrandChild
-{
+public class GrandChildImpl implements IGrandChild {
- public String getChildName()
- {
+ public String getChildName() {
return "child";
}
- public String getParentName()
- {
+ public String getParentName() {
return "parent";
}
- public String getGrandChildName()
- {
+ public String getGrandChildName() {
return "grandchild";
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/intf/InterfaceInheritanceTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/intf/InterfaceInheritanceTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/intf/InterfaceInheritanceTest.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/intf/InterfaceInheritanceTest.java Thu Mar 8 09:14:44 2007
@@ -21,57 +21,52 @@
import org.w3c.dom.Document;
import org.apache.cxf.aegis.AbstractAegisTest;
-import org.apache.cxf.endpoint.ClientImpl;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.frontend.ClientProxyFactoryBean;
-import org.apache.cxf.interceptor.LoggingInInterceptor;
-import org.apache.cxf.interceptor.LoggingOutInterceptor;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.invoker.BeanInvoker;
+import org.junit.Before;
+import org.junit.Test;
/**
- * This test ensures that we're handling inheritance of itnerfaces
- * correctly. Since we can't do multiple parent inheritance in XML
- * schema, which interfaces require, we just don't allow interface
- * inheritance period.
+ * This test ensures that we're handling inheritance of itnerfaces correctly.
+ * Since we can't do multiple parent inheritance in XML schema, which interfaces
+ * require, we just don't allow interface inheritance period.
*
* @author Dan Diephouse
*/
-public class InterfaceInheritanceTest
- extends AbstractAegisTest
-{
-
- public void setUp()
- throws Exception
- {
+public class InterfaceInheritanceTest extends AbstractAegisTest {
+
+ @Before
+ public void setUp() throws Exception {
super.setUp();
Server server = createService(IInterfaceService.class, null);
Service service = server.getEndpoint().getService();
service.setInvoker(new BeanInvoker(new InterfaceService()));
}
- public void testClient() throws Exception
- {
+ @Test
+ public void testClient() throws Exception {
ClientProxyFactoryBean proxyFac = new ClientProxyFactoryBean();
proxyFac.setAddress("IInterfaceService");
proxyFac.setServiceClass(IInterfaceService.class);
proxyFac.setBus(getBus());
setupAegis(proxyFac.getClientFactoryBean());
-
- IInterfaceService client = (IInterfaceService) proxyFac.create();
-
+
+ IInterfaceService client = (IInterfaceService)proxyFac.create();
+
IChild child = client.getChild();
assertNotNull(child);
assertEquals("child", child.getChildName());
assertEquals("parent", child.getParentName());
-
+
IParent parent = client.getChildViaParent();
assertEquals("parent", parent.getParentName());
assertFalse(parent instanceof IChild);
IGrandChild grandChild = client.getGrandChild();
assertEquals("parent", grandChild.getParentName());
-
+
Document wsdl = getWSDLDocument("IInterfaceService");
assertValid("//xsd:complexType[@name='IGrandChild']", wsdl);
assertValid("//xsd:complexType[@name='IGrandChild']//xsd:element[@name='grandChildName']", wsdl);
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/intf/InterfaceService.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/intf/InterfaceService.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/intf/InterfaceService.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/intf/InterfaceService.java Thu Mar 8 09:14:44 2007
@@ -18,21 +18,16 @@
*/
package org.codehaus.xfire.aegis.inheritance.intf;
-public class InterfaceService
- implements IInterfaceService
-{
- public IChild getChild()
- {
+public class InterfaceService implements IInterfaceService {
+ public IChild getChild() {
return new ChildImpl();
}
- public IParent getChildViaParent()
- {
+ public IParent getChildViaParent() {
return getChild();
}
- public IGrandChild getGrandChild()
- {
+ public IGrandChild getGrandChild() {
return new GrandChildImpl();
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/BeanA.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/BeanA.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/BeanA.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/BeanA.java Thu Mar 8 09:14:44 2007
@@ -23,49 +23,39 @@
*
* @author xfournet
*/
-public class BeanA
- implements java.io.Serializable
-{
- private String m_propA;
-
- public String getPropA()
- {
- return m_propA;
+public class BeanA implements java.io.Serializable {
+ private String propA;
+
+ public String getPropA() {
+ return propA;
}
- public void setPropA(String propA)
- {
- m_propA = propA;
+ public void setPropA(String propA) {
+ this.propA = propA;
}
- public String toString()
- {
- return "[" + getClass().getName() + "] propA=" + m_propA;
+ public String toString() {
+ return "[" + getClass().getName() + "] propA=" + propA;
}
- public boolean equals(Object o)
- {
- if (this == o)
- {
+ public boolean equals(Object o) {
+ if (this == o) {
return true;
}
- if (o == null || getClass() != o.getClass())
- {
+ if (o == null || getClass() != o.getClass()) {
return false;
}
- final BeanA beanA = (BeanA) o;
+ final BeanA beanA = (BeanA)o;
- if ((m_propA != null) ? (!m_propA.equals(beanA.m_propA)) : (beanA.m_propA != null))
- {
+ if ((propA != null) ? (!propA.equals(beanA.propA)) : (beanA.propA != null)) {
return false;
}
return true;
}
- public int hashCode()
- {
- return (m_propA != null ? m_propA.hashCode() : 0);
+ public int hashCode() {
+ return propA != null ? propA.hashCode() : 0;
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/BeanB.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/BeanB.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/BeanB.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/BeanB.java Thu Mar 8 09:14:44 2007
@@ -23,55 +23,44 @@
*
* @author xfournet
*/
-public class BeanB
- extends BeanA
-{
- private String m_propB;
-
- public String getPropB()
- {
- return m_propB;
+public class BeanB extends BeanA {
+ private String propB;
+
+ public String getPropB() {
+ return propB;
}
- public void setPropB(String propB)
- {
- m_propB = propB;
+ public void setPropB(String propB) {
+ this.propB = propB;
}
- public String toString()
- {
- return super.toString() + " ; propB=" + m_propB;
+ public String toString() {
+ return super.toString() + " ; propB=" + propB;
}
- public boolean equals(Object o)
- {
- if (this == o)
- {
+ public boolean equals(Object o) {
+ if (this == o) {
return true;
}
- if (o == null || getClass() != o.getClass())
- {
+ if (o == null || getClass() != o.getClass()) {
return false;
}
- if (!super.equals(o))
- {
+ if (!super.equals(o)) {
return false;
}
- final BeanB beanB = (BeanB) o;
+ final BeanB beanB = (BeanB)o;
- if ((m_propB != null) ? (!m_propB.equals(beanB.m_propB)) : (beanB.m_propB != null))
- {
+ if ((propB != null) ? (!propB.equals(beanB.propB)) : (beanB.propB != null)) {
return false;
}
return true;
}
- public int hashCode()
- {
+ public int hashCode() {
int result = super.hashCode();
- result = 29 * result + (m_propB != null ? m_propB.hashCode() : 0);
+ result = 29 * result + (propB != null ? propB.hashCode() : 0);
return result;
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/BeanC.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/BeanC.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/BeanC.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/BeanC.java Thu Mar 8 09:14:44 2007
@@ -23,66 +23,53 @@
*
* @author xfournet
*/
-public class BeanC
- extends BeanB
-{
- private String m_propC;
- private BeanD[] m_tabC;
+public class BeanC extends BeanB {
+ private String propC;
+ private BeanD[] tabC;
- public String getPropC()
- {
- return m_propC;
+ public String getPropC() {
+ return propC;
}
- public void setPropC(String propC)
- {
- m_propC = propC;
+ public void setPropC(String propC) {
+ this.propC = propC;
}
- public BeanD[] getTabC()
- {
- return m_tabC;
+ public BeanD[] getTabC() {
+ return tabC;
}
- public void setTabC(BeanD[] tabC)
- {
- this.m_tabC = tabC;
+ public void setTabC(BeanD[] tabC) {
+ this.tabC = tabC;
}
- public String toString()
- {
- return super.toString() + " ; propC=" + m_propC;
+ public String toString() {
+ return super.toString() + " ; propC=" + propC;
}
- public boolean equals(Object o)
- {
- if (this == o)
- {
+ public boolean equals(Object o) {
+ if (this == o) {
return true;
}
- if (o == null || getClass() != o.getClass())
- {
+ if (o == null || getClass() != o.getClass()) {
return false;
}
- if (!super.equals(o))
- {
+ if (!super.equals(o)) {
return false;
}
- final BeanC beanC = (BeanC) o;
+ final BeanC beanC = (BeanC)o;
- if ((m_propC != null) ? (!m_propC.equals(beanC.m_propC)) : (beanC.m_propC != null))
- {
+ if ((propC != null) ? (!propC.equals(beanC.propC)) : (beanC.propC != null)) {
return false;
}
return true;
}
- public int hashCode()
- {
+ public int hashCode() {
int result = super.hashCode();
- result = 29 * result + (m_propC != null ? m_propC.hashCode() : 0);
+ result = 29 * result + (propC != null ? propC.hashCode() : 0);
return result;
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/BeanD.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/BeanD.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/BeanD.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/BeanD.java Thu Mar 8 09:14:44 2007
@@ -23,18 +23,14 @@
/**
* @author jdavias
*/
-public class BeanD
- implements Serializable
-{
+public class BeanD implements Serializable {
private String m_propD;
- public String getM_propD()
- {
+ public String getM_propD() {
return m_propD;
}
- public void setM_propD(String m_propD)
- {
+ public void setM_propD(String m_propD) {
this.m_propD = m_propD;
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/ResultBean.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/ResultBean.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/ResultBean.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/ResultBean.java Thu Mar 8 09:14:44 2007
@@ -25,59 +25,48 @@
*
* @author xfournet
*/
-public class ResultBean
-{
+public class ResultBean {
private BeanA[] m_result1;
private RootBean[] m_result2;
- public BeanA[] getResult1()
- {
+ public BeanA[] getResult1() {
return m_result1;
}
- public void setResult1(BeanA[] result1)
- {
+ public void setResult1(BeanA[] result1) {
m_result1 = result1;
}
- public RootBean[] getResult2()
- {
+ public RootBean[] getResult2() {
return m_result2;
}
- public void setResult2(RootBean[] result2)
- {
+ public void setResult2(RootBean[] result2) {
m_result2 = result2;
}
- public boolean equals(Object o)
- {
- if (this == o)
- {
+ public boolean equals(Object o) {
+ if (this == o) {
return true;
}
- if (o == null || getClass() != o.getClass())
- {
+ if (o == null || getClass() != o.getClass()) {
return false;
}
- final ResultBean that = (ResultBean) o;
+ final ResultBean that = (ResultBean)o;
- if (!Arrays.equals(m_result1, that.m_result1))
- {
+ if (!Arrays.equals(m_result1, that.m_result1)) {
return false;
}
- if (!Arrays.equals(m_result2, that.m_result2))
- {
+ if (!Arrays.equals(m_result2, that.m_result2)) {
return false;
}
return true;
}
- public int hashCode()
- {
+ public int hashCode() {
return 0;
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/RootBean.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/RootBean.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/RootBean.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/RootBean.java Thu Mar 8 09:14:44 2007
@@ -23,64 +23,52 @@
*
* @author xfournet
*/
-public class RootBean
-{
+public class RootBean {
private String m_id;
private BeanA m_child;
- public String getId()
- {
+ public String getId() {
return m_id;
}
- public void setId(String id)
- {
+ public void setId(String id) {
m_id = id;
}
- public BeanA getChild()
- {
+ public BeanA getChild() {
return m_child;
}
- public void setChild(BeanA child)
- {
+ public void setChild(BeanA child) {
m_child = child;
}
- public String toString()
- {
+ public String toString() {
return "[" + getClass().getName() + "] id=" + m_id + "; child={" + m_child + "}";
}
- public boolean equals(Object o)
- {
- if (this == o)
- {
+ public boolean equals(Object o) {
+ if (this == o) {
return true;
}
- if (o == null || getClass() != o.getClass())
- {
+ if (o == null || getClass() != o.getClass()) {
return false;
}
- final RootBean rootBean = (RootBean) o;
+ final RootBean rootBean = (RootBean)o;
- if (m_child != null ? !m_child.equals(rootBean.m_child) : rootBean.m_child != null)
- {
+ if (m_child != null ? !m_child.equals(rootBean.m_child) : rootBean.m_child != null) {
return false;
}
- if (m_id != null ? !m_id.equals(rootBean.m_id) : rootBean.m_id != null)
- {
+ if (m_id != null ? !m_id.equals(rootBean.m_id) : rootBean.m_id != null) {
return false;
}
return true;
}
- public int hashCode()
- {
+ public int hashCode() {
int result;
result = (m_id != null ? m_id.hashCode() : 0);
result = 29 * result + (m_child != null ? m_child.hashCode() : 0);
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/WS1.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/WS1.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/WS1.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/WS1.java Thu Mar 8 09:14:44 2007
@@ -25,24 +25,22 @@
*
* @author xfournet
*/
-public interface WS1
-{
- public BeanA getBeanA();
+public interface WS1 {
+ BeanA getBeanA();
- public BeanB getBeanB();
+ BeanB getBeanB();
- public BeanA getBean(String id);
+ BeanA getBean(String id);
- public BeanA[] listBeans();
+ BeanA[] listBeans();
- public RootBean getRootBean(String id);
+ RootBean getRootBean(String id);
- public RootBean[] listRootBeans();
+ RootBean[] listRootBeans();
- public ResultBean getResultBean();
+ ResultBean getResultBean();
- public Map echoMap(Map beans);
-
- public void throwException(boolean extendedOne)
- throws WS1Exception;
+ Map echoMap(Map beans);
+
+ void throwException(boolean extendedOne) throws WS1Exception;
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/WS1Exception.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/WS1Exception.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/WS1Exception.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/WS1Exception.java Thu Mar 8 09:14:44 2007
@@ -23,81 +23,64 @@
*
* @author xfournet
*/
-public class WS1Exception
- extends Exception
-{
- private int m_errorCode;
+public class WS1Exception extends Exception {
+ private int errorCode;
private Object simpleBean;
-
- public WS1Exception()
- {
+
+ public WS1Exception() {
}
- public WS1Exception(String message)
- {
+ public WS1Exception(String message) {
super(message);
}
- public WS1Exception(String message, int errorCode1)
- {
+ public WS1Exception(String message, int errorCode1) {
super(message);
- m_errorCode = errorCode1;
+ errorCode = errorCode1;
}
- public int getErrorCode()
- {
- return m_errorCode;
+ public int getErrorCode() {
+ return errorCode;
}
- public void setErrorCode(int errorCode)
- {
- m_errorCode = errorCode;
+ public void setErrorCode(int errorCode) {
+ this.errorCode = errorCode;
}
- public Object getSimpleBean()
- {
+ public Object getSimpleBean() {
return simpleBean;
}
- public void setSimpleBean(Object simpleBean)
- {
+ public void setSimpleBean(Object simpleBean) {
this.simpleBean = simpleBean;
}
- public String toString()
- {
- return "[" + getClass().getName() + "] msg=" + getMessage() + "; errorCode=" + m_errorCode;
+ public String toString() {
+ return "[" + getClass().getName() + "] msg=" + getMessage() + "; errorCode=" + errorCode;
}
- public boolean equals(Object o)
- {
- if (this == o)
- {
+ public boolean equals(Object o) {
+ if (this == o) {
return true;
}
- if (o == null || getClass() != o.getClass())
- {
+ if (o == null || getClass() != o.getClass()) {
return false;
}
- final WS1Exception that = (WS1Exception) o;
+ final WS1Exception that = (WS1Exception)o;
- if (getMessage() != null ? !getMessage().equals(that.getMessage())
- : that.getMessage() != null)
- {
+ if (getMessage() != null ? !getMessage().equals(that.getMessage()) : that.getMessage() != null) {
return false;
}
- if (m_errorCode != that.m_errorCode)
- {
+ if (errorCode != that.errorCode) {
return false;
}
return true;
}
- public int hashCode()
- {
- return m_errorCode;
+ public int hashCode() {
+ return errorCode;
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/WS1ExtendedException.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/WS1ExtendedException.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/WS1ExtendedException.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/WS1ExtendedException.java Thu Mar 8 09:14:44 2007
@@ -23,70 +23,56 @@
*
* @author xfournet
*/
-public class WS1ExtendedException
- extends WS1Exception
-{
- private int m_extendedCode;
+public class WS1ExtendedException extends WS1Exception {
+ private int extendedCode;
- public WS1ExtendedException()
- {
+ public WS1ExtendedException() {
}
- public WS1ExtendedException(String message)
- {
+ public WS1ExtendedException(String message) {
super(message);
}
- public WS1ExtendedException(String message, int errorCode1, int extendedCode)
- {
+ public WS1ExtendedException(String message, int errorCode1, int extendedCode) {
super(message, errorCode1);
- m_extendedCode = extendedCode;
+ this.extendedCode = extendedCode;
}
- public int getExtendedCode()
- {
- return m_extendedCode;
+ public int getExtendedCode() {
+ return extendedCode;
}
- public void setExtendedCode(int extendedCode)
- {
- m_extendedCode = extendedCode;
+ public void setExtendedCode(int extendedCode) {
+ this.extendedCode = extendedCode;
}
- public String toString()
- {
- return super.toString() + "; extendedCode=" + m_extendedCode;
+ public String toString() {
+ return super.toString() + "; extendedCode=" + extendedCode;
}
- public boolean equals(Object o)
- {
- if (this == o)
- {
+ public boolean equals(Object o) {
+ if (this == o) {
return true;
}
- if (o == null || getClass() != o.getClass())
- {
+ if (o == null || getClass() != o.getClass()) {
return false;
}
- if (!super.equals(o))
- {
+ if (!super.equals(o)) {
return false;
}
- final WS1ExtendedException that = (WS1ExtendedException) o;
+ final WS1ExtendedException that = (WS1ExtendedException)o;
- if (m_extendedCode != that.m_extendedCode)
- {
+ if (extendedCode != that.extendedCode) {
return false;
}
return true;
}
- public int hashCode()
- {
+ public int hashCode() {
int result = super.hashCode();
- result = 29 * result + m_extendedCode;
+ result = 29 * result + extendedCode;
return result;
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/impl/WS1Impl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/impl/WS1Impl.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/impl/WS1Impl.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/impl/WS1Impl.java Thu Mar 8 09:14:44 2007
@@ -35,18 +35,14 @@
*
* @author xfournet
*/
-public class WS1Impl
- implements WS1
-{
- public BeanA getBeanA()
- {
+public class WS1Impl implements WS1 {
+ public BeanA getBeanA() {
BeanA a = new BeanA();
a.setPropA("valueA");
return a;
}
- public BeanB getBeanB()
- {
+ public BeanB getBeanB() {
BeanB b = new BeanB();
b.setPropA("valueA");
b.setPropB("valueB");
@@ -54,8 +50,7 @@
}
// not exported to interface to "hide" BeanC from interface introspection
- public BeanC getBeanC()
- {
+ public BeanC getBeanC() {
BeanC c = new BeanC();
c.setPropA("valueA");
c.setPropB("valueB");
@@ -63,28 +58,19 @@
return c;
}
- public BeanA getBean(String id)
- {
- if ("b".equalsIgnoreCase(id))
- {
+ public BeanA getBean(String id) {
+ if ("b".equalsIgnoreCase(id)) {
return getBeanB();
- }
- else if ("c".equalsIgnoreCase(id))
- {
+ } else if ("c".equalsIgnoreCase(id)) {
return getBeanC();
- }
- else if ("a".equalsIgnoreCase(id))
- {
+ } else if ("a".equalsIgnoreCase(id)) {
return getBeanA();
- }
- else
- {
+ } else {
return null;
}
}
- public BeanA[] listBeans()
- {
+ public BeanA[] listBeans() {
BeanA[] result = new BeanA[4];
result[0] = getBean("b");
@@ -95,8 +81,7 @@
return result;
}
- public RootBean getRootBean(String id)
- {
+ public RootBean getRootBean(String id) {
RootBean rootBean = new RootBean();
rootBean.setId(id);
rootBean.setChild(getBean(id));
@@ -104,8 +89,7 @@
return rootBean;
}
- public RootBean[] listRootBeans()
- {
+ public RootBean[] listRootBeans() {
RootBean[] result = new RootBean[4];
result[0] = getRootBean("b");
@@ -116,8 +100,7 @@
return result;
}
- public ResultBean getResultBean()
- {
+ public ResultBean getResultBean() {
ResultBean resultBean = new ResultBean();
resultBean.setResult1(listBeans());
resultBean.setResult2(listRootBeans());
@@ -125,22 +108,16 @@
return resultBean;
}
- public Map echoMap(Map beans)
- {
+ public Map echoMap(Map beans) {
return beans;
}
- public void throwException(boolean extendedOne)
- throws WS1Exception
- {
- if (extendedOne)
- {
+ public void throwException(boolean extendedOne) throws WS1Exception {
+ if (extendedOne) {
WS1Exception ex = new WS1ExtendedException("WS1 extended exception", 20, 30);
ex.setSimpleBean(new SimpleBean());
throw ex;
- }
- else
- {
+ } else {
throw new WS1Exception("WS1 base exception", 10);
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/WS2.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/WS2.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/WS2.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/WS2.java Thu Mar 8 09:14:44 2007
@@ -27,11 +27,10 @@
*
* @author xfournet
*/
-public interface WS2
-{
- public void putParentBean(ParentBean parentBean)
+public interface WS2 {
+ void putParentBean(ParentBean parentBean)
throws AlreadyExistsException;
- public ParentBean getParentBean(String id)
+ ParentBean getParentBean(String id)
throws NotFoundException;
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/ParentBean.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/ParentBean.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/ParentBean.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/ParentBean.java Thu Mar 8 09:14:44 2007
@@ -25,77 +25,63 @@
*
* @author xfournet
*/
-public class ParentBean
-{
- private String m_id;
+public class ParentBean {
+ private String id;
- private ContentBean1 m_content;
+ private ContentBean1 content;
- public ParentBean()
- {
+ public ParentBean() {
}
- public ParentBean(String id, ContentBean1 content)
- {
- m_id = id;
- m_content = content;
+ public ParentBean(String id, ContentBean1 content) {
+ this.id = id;
+ this.content = content;
}
- public String getId()
- {
- return m_id;
+ public String getId() {
+ return id;
}
- public void setId(String id)
- {
- m_id = id;
+ public void setId(String id) {
+ this.id = id;
}
- public ContentBean1 getContent()
- {
- return m_content;
+ public ContentBean1 getContent() {
+ return content;
}
- public void setContent(ContentBean1 content)
- {
- m_content = content;
+ public void setContent(ContentBean1 content) {
+ this.content = content;
}
- public String toString()
- {
- return "[" + getClass().getName() + "] id=" + m_id + "; content={" + m_content + "}";
+ public String toString() {
+ return "[" + getClass().getName() + "] id=" + id + "; content={" + content + "}";
}
- public boolean equals(Object o)
- {
- if (this == o)
- {
+ public boolean equals(Object o) {
+ if (this == o) {
return true;
}
- if (o == null || getClass() != o.getClass())
- {
+ if (o == null || getClass() != o.getClass()) {
return false;
}
- final ParentBean that = (ParentBean) o;
+ final ParentBean that = (ParentBean)o;
- if (m_content != null ? !m_content.equals(that.m_content) : that.m_content != null)
- {
+ if (content != null ? !content.equals(that.content) : that.content != null) {
return false;
}
- if (m_id != null ? !m_id.equals(that.m_id) : that.m_id != null)
- {
+ if (id != null ? !id.equals(that.id) : that.id != null) {
return false;
}
return true;
}
- public int hashCode()
- {
+ public int hashCode() {
int result;
- result = (m_id != null ? m_id.hashCode() : 0);
- result = 29 * result + (m_content != null ? m_content.hashCode() : 0);
+ result = id != null ? id.hashCode() : 0;
+ result = 29 * result + (content != null ? content.hashCode() : 0);
return result;
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/exception/AlreadyExistsException.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/exception/AlreadyExistsException.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/exception/AlreadyExistsException.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/exception/AlreadyExistsException.java Thu Mar 8 09:14:44 2007
@@ -23,64 +23,50 @@
*
* @author xfournet
*/
-public class AlreadyExistsException
- extends Exception
-{
+public class AlreadyExistsException extends Exception {
private String m_id;
- public AlreadyExistsException()
- {
+ public AlreadyExistsException() {
}
- public AlreadyExistsException(String id)
- {
+ public AlreadyExistsException(String id) {
m_id = id;
}
- public String getId()
- {
+ public String getId() {
return m_id;
}
- public void setId(String id)
- {
+ public void setId(String id) {
m_id = id;
}
- public String toString()
- {
+ public String toString() {
return "[" + getClass().getName() + "] id=" + m_id;
}
- public boolean equals(Object o)
- {
- if (this == o)
- {
+ public boolean equals(Object o) {
+ if (this == o) {
return true;
}
- if (o == null || getClass() != o.getClass())
- {
+ if (o == null || getClass() != o.getClass()) {
return false;
}
- final AlreadyExistsException that = (AlreadyExistsException) o;
+ final AlreadyExistsException that = (AlreadyExistsException)o;
- if (getMessage() != null ? !getMessage().equals(that.getMessage())
- : that.getMessage() != null)
- {
+ if (getMessage() != null ? !getMessage().equals(that.getMessage()) : that.getMessage() != null) {
return false;
}
- if (m_id != null ? !m_id.equals(that.m_id) : that.m_id != null)
- {
+ if (m_id != null ? !m_id.equals(that.m_id) : that.m_id != null) {
return false;
}
return true;
}
- public int hashCode()
- {
+ public int hashCode() {
return (m_id != null ? m_id.hashCode() : 0);
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/exception/NotFoundException.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/exception/NotFoundException.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/exception/NotFoundException.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/exception/NotFoundException.java Thu Mar 8 09:14:44 2007
@@ -23,64 +23,50 @@
*
* @author xfournet
*/
-public class NotFoundException
- extends Exception
-{
+public class NotFoundException extends Exception {
private String m_id;
- public NotFoundException()
- {
+ public NotFoundException() {
}
- public NotFoundException(String id)
- {
+ public NotFoundException(String id) {
m_id = id;
}
- public String getId()
- {
+ public String getId() {
return m_id;
}
- public void setId(String id)
- {
+ public void setId(String id) {
m_id = id;
}
- public String toString()
- {
+ public String toString() {
return "[" + getClass().getName() + "] id=" + m_id;
}
- public boolean equals(Object o)
- {
- if (this == o)
- {
+ public boolean equals(Object o) {
+ if (this == o) {
return true;
}
- if (o == null || getClass() != o.getClass())
- {
+ if (o == null || getClass() != o.getClass()) {
return false;
}
- final NotFoundException that = (NotFoundException) o;
+ final NotFoundException that = (NotFoundException)o;
- if (getMessage() != null ? !getMessage().equals(that.getMessage())
- : that.getMessage() != null)
- {
+ if (getMessage() != null ? !getMessage().equals(that.getMessage()) : that.getMessage() != null) {
return false;
}
- if (m_id != null ? !m_id.equals(that.m_id) : that.m_id != null)
- {
+ if (m_id != null ? !m_id.equals(that.m_id) : that.m_id != null) {
return false;
}
return true;
}
- public int hashCode()
- {
+ public int hashCode() {
return (m_id != null ? m_id.hashCode() : 0);
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/pack1/ContentBean1.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/pack1/ContentBean1.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/pack1/ContentBean1.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/pack1/ContentBean1.java Thu Mar 8 09:14:44 2007
@@ -23,57 +23,46 @@
*
* @author xfournet
*/
-public class ContentBean1
-{
- private String m_data1;
+public class ContentBean1 {
+ private String data1;
- public ContentBean1()
- {
+ public ContentBean1() {
}
- public ContentBean1(String data1)
- {
- m_data1 = data1;
+ public ContentBean1(String data1) {
+ this.data1 = data1;
}
- public String getData1()
- {
- return m_data1;
+ public String getData1() {
+ return data1;
}
- public void setData1(String data1)
- {
- m_data1 = data1;
+ public void setData1(String data1) {
+ this.data1 = data1;
}
- public String toString()
- {
- return "[" + getClass().getName() + "] data1=" + m_data1;
+ public String toString() {
+ return "[" + getClass().getName() + "] data1=" + data1;
}
- public boolean equals(Object o)
- {
- if (this == o)
- {
+ public boolean equals(Object o) {
+ if (this == o) {
return true;
}
- if (o == null || getClass() != o.getClass())
- {
+ if (o == null || getClass() != o.getClass()) {
return false;
}
- final ContentBean1 that = (ContentBean1) o;
+ final ContentBean1 that = (ContentBean1)o;
- if (m_data1 != null ? !m_data1.equals(that.m_data1) : that.m_data1 != null)
- {
+ if (data1 != null ? !data1.equals(that.data1) : that.data1 != null) {
return false;
}
return true;
}
- public int hashCode()
- {
- return (m_data1 != null ? m_data1.hashCode() : 0);
+ public int hashCode() {
+ return data1 != null ? data1.hashCode() : 0;
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/pack2/ContentBean2.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/pack2/ContentBean2.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/pack2/ContentBean2.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/pack2/ContentBean2.java Thu Mar 8 09:14:44 2007
@@ -25,65 +25,52 @@
*
* @author xfournet
*/
-public class ContentBean2
- extends ContentBean1
-{
- private String m_content2;
+public class ContentBean2 extends ContentBean1 {
+ private String content2;
- public ContentBean2()
- {
+ public ContentBean2() {
}
- public ContentBean2(String data1, String content2)
- {
+ public ContentBean2(String data1, String content2) {
super(data1);
- m_content2 = content2;
+ this.content2 = content2;
}
- public String getContent2()
- {
- return m_content2;
+ public String getContent2() {
+ return content2;
}
- public void setContent2(String content2)
- {
- m_content2 = content2;
+ public void setContent2(String content2) {
+ this.content2 = content2;
}
- public String toString()
- {
- return super.toString() + "; content2=" + m_content2;
+ public String toString() {
+ return super.toString() + "; content2=" + content2;
}
- public boolean equals(Object o)
- {
- if (this == o)
- {
+ public boolean equals(Object o) {
+ if (this == o) {
return true;
}
- if (o == null || getClass() != o.getClass())
- {
+ if (o == null || getClass() != o.getClass()) {
return false;
}
- if (!super.equals(o))
- {
+ if (!super.equals(o)) {
return false;
}
- final ContentBean2 that = (ContentBean2) o;
+ final ContentBean2 that = (ContentBean2)o;
- if (m_content2 != null ? !m_content2.equals(that.m_content2) : that.m_content2 != null)
- {
+ if (content2 != null ? !content2.equals(that.content2) : that.content2 != null) {
return false;
}
return true;
}
- public int hashCode()
- {
+ public int hashCode() {
int result = super.hashCode();
- result = 29 * result + (m_content2 != null ? m_content2.hashCode() : 0);
+ result = 29 * result + (content2 != null ? content2.hashCode() : 0);
return result;
}
}
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/impl/WS2Impl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/impl/WS2Impl.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/impl/WS2Impl.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/impl/WS2Impl.java Thu Mar 8 09:14:44 2007
@@ -33,36 +33,27 @@
*
* @author xfournet
*/
-public class WS2Impl
- implements WS2
-{
- private Map<String, ParentBean> m_map = new HashMap<String, ParentBean>();
+public class WS2Impl implements WS2 {
+ private Map<String, ParentBean> map = new HashMap<String, ParentBean>();
- public WS2Impl()
- {
+ public WS2Impl() {
ParentBean x = new ParentBean("X", new ContentBean1("data1-X"));
ParentBean y = new ParentBean("Y", new ContentBean2("data1-Y", "content2-Y"));
- m_map.put(x.getId(), x);
- m_map.put(y.getId(), y);
+ map.put(x.getId(), x);
+ map.put(y.getId(), y);
}
- public synchronized void putParentBean(ParentBean parentBean)
- throws AlreadyExistsException
- {
+ public synchronized void putParentBean(ParentBean parentBean) throws AlreadyExistsException {
String id = parentBean.getId();
- if (m_map.containsKey(id))
- {
+ if (map.containsKey(id)) {
throw new AlreadyExistsException(id);
}
- m_map.put(id, parentBean);
+ map.put(id, parentBean);
}
- public synchronized ParentBean getParentBean(String id)
- throws NotFoundException
- {
- ParentBean result = m_map.get(id);
- if (result == null)
- {
+ public synchronized ParentBean getParentBean(String id) throws NotFoundException {
+ ParentBean result = map.get(id);
+ if (result == null) {
throw new NotFoundException(id);
}
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/AbstractJaxWsTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/AbstractJaxWsTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/AbstractJaxWsTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/AbstractJaxWsTest.java Thu Mar 8 09:14:44 2007
@@ -18,7 +18,6 @@
*/
package org.apache.cxf.jaxws;
-import org.apache.cxf.Bus;
import org.apache.cxf.binding.BindingFactoryManager;
import org.apache.cxf.binding.soap.SoapBindingFactory;
import org.apache.cxf.binding.soap.SoapTransportFactory;
@@ -28,6 +27,7 @@
import org.apache.cxf.transport.local.LocalTransportFactory;
import org.apache.cxf.wsdl.WSDLManager;
import org.apache.cxf.wsdl11.WSDLManagerImpl;
+import org.junit.Before;
/**
* Abstract test which sets up the local transport and soap binding.
@@ -36,13 +36,10 @@
protected LocalTransportFactory localTransport;
- private Bus bus;
- @Override
- public void setUp() throws Exception {
- super.setUp();
-
- bus = getBus();
+ @Before
+ public void setUpBus() throws Exception {
+ super.setUpBus();
SoapBindingFactory bindingFactory = new SoapBindingFactory();
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstTest.java Thu Mar 8 09:14:44 2007
@@ -39,10 +39,12 @@
import org.apache.cxf.service.model.InterfaceInfo;
import org.apache.cxf.transport.local.LocalTransportFactory;
import org.apache.cxf.wsdl11.ServiceWSDLBuilder;
+import org.junit.Test;
public class CodeFirstTest extends AbstractJaxWsTest {
String address = "local://localhost:9000/Hello";
+ @Test
public void testDocLitModel() throws Exception {
Definition d = createService(false);
@@ -57,6 +59,7 @@
wsdl);
}
+ @Test
public void testWrappedModel() throws Exception {
Definition d = createService(true);
@@ -106,6 +109,7 @@
}
+ @Test
public void testEndpoint() throws Exception {
Hello service = new Hello();
@@ -131,6 +135,7 @@
assertValid("//s:Body/h:getGreetingsResponse/h:return/item", res);
}
+ @Test
public void testClient() throws Exception {
Hello serviceImpl = new Hello();
EndpointImpl ep = new EndpointImpl(getBus(), serviceImpl, (String) null);
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstWSDLTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstWSDLTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstWSDLTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/CodeFirstWSDLTest.java Thu Mar 8 09:14:44 2007
@@ -35,6 +35,7 @@
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.InterfaceInfo;
import org.apache.cxf.wsdl11.ServiceWSDLBuilder;
+import org.junit.Test;
public class CodeFirstWSDLTest extends AbstractJaxWsTest {
String address = "local://localhost:9000/Hello";
@@ -66,6 +67,7 @@
return wsdlBuilder.build();
}
+ @Test
public void testWSDL1() throws Exception {
Definition d = createService(Hello2.class);
@@ -89,6 +91,7 @@
assertEquals(2, portType.getOperations().size());
}
+ @Test
public void testWSDL2() throws Exception {
Definition d = createService(Hello3.class);
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java?view=diff&rev=516103&r1=516102&r2=516103
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/ConfiguredEndpointTest.java Thu Mar 8 09:14:44 2007
@@ -26,8 +26,6 @@
import javax.xml.namespace.QName;
-import junit.framework.TestCase;
-
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
import org.apache.cxf.binding.BindingFactoryManager;
@@ -47,8 +45,12 @@
import org.apache.hello_world_soap_http.Greeter;
import org.apache.hello_world_soap_http.GreeterImpl;
import org.apache.hello_world_soap_http.SOAPService;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
-public class ConfiguredEndpointTest extends TestCase {
+public class ConfiguredEndpointTest extends Assert {
private static final QName SERVICE_NAME =
new QName("http://apache.org/hello_world_soap_http", "SOAPService");
private static final QName PORT_NAME =
@@ -56,6 +58,7 @@
private BusFactory factory;
+ @After
public void tearDown() {
Bus bus = BusFactory.getDefaultBus();
if (null != bus) {
@@ -65,6 +68,7 @@
System.clearProperty(BusFactory.BUS_FACTORY_PROPERTY_NAME);
}
+ @Test
public void testCXFDefaultClientEndpoint() {
factory = new CXFBusFactory();
BusFactory.setDefaultBus(null);
@@ -73,6 +77,7 @@
doTestDefaultClientEndpoint();
}
+ @Test
public void testSpringDefaultClientEndpoint() {
factory = new SpringBusFactory();
BusFactory.setDefaultBus(null);
@@ -123,7 +128,9 @@
assertNull("Unexpected test interceptor", findTestInterceptor(interceptors));
}
- public void xtestCXFConfiguredClientEndpoint() {
+ @Test
+ @Ignore
+ public void testCXFConfiguredClientEndpoint() {
CXFBusFactory cf = new CXFBusFactory();
factory = cf;
BusFactory.setDefaultBus(null);
@@ -135,6 +142,7 @@
doTestConfiguredClientEndpoint();
}
+ @Test
public void testSpringConfiguredClientEndpoint() {
SpringBusFactory sf = new SpringBusFactory();
factory = sf;
@@ -191,6 +199,7 @@
findTestInterceptor(interceptors).getId());
}
+ @Test
public void testCXFDefaultServerEndpoint() {
factory = new CXFBusFactory();
BusFactory.setDefaultBus(null);
@@ -200,6 +209,7 @@
doTestDefaultServerEndpoint();
}
+ @Test
public void testSpringDefaultServerEndpoint() {
factory = new SpringBusFactory();
BusFactory.setDefaultBus(null);
@@ -240,6 +250,8 @@
assertNull("Unexpected test interceptor", findTestInterceptor(interceptors));
}
+ @Test
+ @Ignore
public void xtestCXFConfiguredServerEndpoint() {
CXFBusFactory cf = new CXFBusFactory();
factory = cf;
@@ -253,6 +265,7 @@
doTestConfiguredServerEndpoint();
}
+ @Test
public void testSpringConfiguredServerEndpoint() {
SpringBusFactory sf = new SpringBusFactory();
factory = sf;