cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dand...@apache.org
Subject svn commit: r515734 [11/11] - in /incubator/cxf/trunk/rt: ./ core/src/main/java/org/apache/cxf/endpoint/ databinding/aegis/ databinding/aegis/src/ databinding/aegis/src/main/ databinding/aegis/src/main/java/ databinding/aegis/src/main/java/org/ databin...
Date Wed, 07 Mar 2007 20:20:15 GMT
Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/intf/IGrandChild.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/intf/IGrandChild.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/intf/IInterfaceService.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/intf/IInterfaceService.java?view=auto&rev=515734
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/intf/IInterfaceService.java (added)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/intf/IInterfaceService.java Wed Mar  7 12:20:07 2007
@@ -0,0 +1,27 @@
+/**
+ * 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.codehaus.xfire.aegis.inheritance.intf;
+
+public interface IInterfaceService {
+    IChild getChild();
+    
+    IParent getChildViaParent();
+    
+    IGrandChild getGrandChild();
+}

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/intf/IInterfaceService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/intf/IInterfaceService.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/intf/IParent.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/intf/IParent.java?view=auto&rev=515734
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/intf/IParent.java (added)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/intf/IParent.java Wed Mar  7 12:20:07 2007
@@ -0,0 +1,23 @@
+/**
+ * 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.codehaus.xfire.aegis.inheritance.intf;
+
+public interface IParent  {
+    String getParentName();
+}

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/intf/IParent.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/intf/IParent.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: 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=auto&rev=515734
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/intf/InterfaceInheritanceTest.java (added)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/intf/InterfaceInheritanceTest.java Wed Mar  7 12:20:07 2007
@@ -0,0 +1,84 @@
+/**
+ * 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.codehaus.xfire.aegis.inheritance.intf;
+
+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;
+
+/**
+ * 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
+    {
+        super.setUp();
+        Server server = createService(IInterfaceService.class, null);
+        Service service = server.getEndpoint().getService();
+        service.setInvoker(new BeanInvoker(new InterfaceService()));
+    }
+
+    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();
+        
+        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);
+        assertValid("//xsd:complexType[@name='IGrandChild']//xsd:element[@name='childName'][1]", wsdl);
+        assertInvalid("//xsd:complexType[@name='IGrandChild']//xsd:element[@name='childName'][2]", wsdl);
+        assertValid("//xsd:complexType[@name='IChild']", wsdl);
+        assertValid("//xsd:complexType[@name='IParent']", wsdl);
+        assertInvalid("//xsd:complexType[@name='IChild'][@abstract='true']", wsdl);
+    }
+}

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/intf/InterfaceInheritanceTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/intf/InterfaceInheritanceTest.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: 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=auto&rev=515734
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/intf/InterfaceService.java (added)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/intf/InterfaceService.java Wed Mar  7 12:20:07 2007
@@ -0,0 +1,38 @@
+/**
+ * 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.codehaus.xfire.aegis.inheritance.intf;
+
+public class InterfaceService
+    implements IInterfaceService
+{
+    public IChild getChild()
+    {
+        return new ChildImpl();
+    }
+
+    public IParent getChildViaParent()
+    {
+        return getChild();
+    }
+
+    public IGrandChild getGrandChild()
+    {
+        return new GrandChildImpl();
+    }
+}

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/intf/InterfaceService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/intf/InterfaceService.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: 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=auto&rev=515734
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/BeanA.java (added)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/BeanA.java Wed Mar  7 12:20:07 2007
@@ -0,0 +1,71 @@
+/**
+ * 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.codehaus.xfire.aegis.inheritance.ws1;
+
+/**
+ * <br/>
+ * 
+ * @author xfournet
+ */
+public class BeanA
+    implements java.io.Serializable
+{
+    private String m_propA;
+
+    public String getPropA()
+    {
+        return m_propA;
+    }
+
+    public void setPropA(String propA)
+    {
+        m_propA = propA;
+    }
+
+    public String toString()
+    {
+        return "[" + getClass().getName() + "] propA=" + m_propA;
+    }
+
+    public boolean equals(Object o)
+    {
+        if (this == o)
+        {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass())
+        {
+            return false;
+        }
+
+        final BeanA beanA = (BeanA) o;
+
+        if ((m_propA != null) ? (!m_propA.equals(beanA.m_propA)) : (beanA.m_propA != null))
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    public int hashCode()
+    {
+        return (m_propA != null ? m_propA.hashCode() : 0);
+    }
+}

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/BeanA.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/BeanA.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: 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=auto&rev=515734
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/BeanB.java (added)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/BeanB.java Wed Mar  7 12:20:07 2007
@@ -0,0 +1,77 @@
+/**
+ * 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.codehaus.xfire.aegis.inheritance.ws1;
+
+/**
+ * <br/>
+ * 
+ * @author xfournet
+ */
+public class BeanB
+    extends BeanA
+{
+    private String m_propB;
+
+    public String getPropB()
+    {
+        return m_propB;
+    }
+
+    public void setPropB(String propB)
+    {
+        m_propB = propB;
+    }
+
+    public String toString()
+    {
+        return super.toString() + " ; propB=" + m_propB;
+    }
+
+    public boolean equals(Object o)
+    {
+        if (this == o)
+        {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass())
+        {
+            return false;
+        }
+        if (!super.equals(o))
+        {
+            return false;
+        }
+
+        final BeanB beanB = (BeanB) o;
+
+        if ((m_propB != null) ? (!m_propB.equals(beanB.m_propB)) : (beanB.m_propB != null))
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    public int hashCode()
+    {
+        int result = super.hashCode();
+        result = 29 * result + (m_propB != null ? m_propB.hashCode() : 0);
+        return result;
+    }
+}

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/BeanB.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/BeanB.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: 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=auto&rev=515734
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/BeanC.java (added)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/BeanC.java Wed Mar  7 12:20:07 2007
@@ -0,0 +1,88 @@
+/**
+ * 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.codehaus.xfire.aegis.inheritance.ws1;
+
+/**
+ * <br/>
+ * 
+ * @author xfournet
+ */
+public class BeanC
+    extends BeanB
+{
+    private String m_propC;
+    private BeanD[] m_tabC;
+
+    public String getPropC()
+    {
+        return m_propC;
+    }
+
+    public void setPropC(String propC)
+    {
+        m_propC = propC;
+    }
+
+    public BeanD[] getTabC()
+    {
+        return m_tabC;
+    }
+
+    public void setTabC(BeanD[] tabC)
+    {
+        this.m_tabC = tabC;
+    }
+
+    public String toString()
+    {
+        return super.toString() + " ; propC=" + m_propC;
+    }
+
+    public boolean equals(Object o)
+    {
+        if (this == o)
+        {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass())
+        {
+            return false;
+        }
+        if (!super.equals(o))
+        {
+            return false;
+        }
+
+        final BeanC beanC = (BeanC) o;
+
+        if ((m_propC != null) ? (!m_propC.equals(beanC.m_propC)) : (beanC.m_propC != null))
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    public int hashCode()
+    {
+        int result = super.hashCode();
+        result = 29 * result + (m_propC != null ? m_propC.hashCode() : 0);
+        return result;
+    }
+}

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/BeanC.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/BeanC.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: 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=auto&rev=515734
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/BeanD.java (added)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/BeanD.java Wed Mar  7 12:20:07 2007
@@ -0,0 +1,40 @@
+/**
+ * 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.codehaus.xfire.aegis.inheritance.ws1;
+
+import java.io.Serializable;
+
+/**
+ * @author jdavias
+ */
+public class BeanD
+    implements Serializable
+{
+    private String m_propD;
+
+    public String getM_propD()
+    {
+        return m_propD;
+    }
+
+    public void setM_propD(String m_propD)
+    {
+        this.m_propD = m_propD;
+    }
+}

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/BeanD.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/BeanD.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: 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=auto&rev=515734
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/ResultBean.java (added)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/ResultBean.java Wed Mar  7 12:20:07 2007
@@ -0,0 +1,83 @@
+/**
+ * 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.codehaus.xfire.aegis.inheritance.ws1;
+
+import java.util.Arrays;
+
+/**
+ * <br/>
+ * 
+ * @author xfournet
+ */
+public class ResultBean
+{
+    private BeanA[] m_result1;
+
+    private RootBean[] m_result2;
+
+    public BeanA[] getResult1()
+    {
+        return m_result1;
+    }
+
+    public void setResult1(BeanA[] result1)
+    {
+        m_result1 = result1;
+    }
+
+    public RootBean[] getResult2()
+    {
+        return m_result2;
+    }
+
+    public void setResult2(RootBean[] result2)
+    {
+        m_result2 = result2;
+    }
+
+    public boolean equals(Object o)
+    {
+        if (this == o)
+        {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass())
+        {
+            return false;
+        }
+
+        final ResultBean that = (ResultBean) o;
+
+        if (!Arrays.equals(m_result1, that.m_result1))
+        {
+            return false;
+        }
+        if (!Arrays.equals(m_result2, that.m_result2))
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    public int hashCode()
+    {
+        return 0;
+    }
+}

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/ResultBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/ResultBean.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: 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=auto&rev=515734
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/RootBean.java (added)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/RootBean.java Wed Mar  7 12:20:07 2007
@@ -0,0 +1,89 @@
+/**
+ * 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.codehaus.xfire.aegis.inheritance.ws1;
+
+/**
+ * <br/>
+ * 
+ * @author xfournet
+ */
+public class RootBean
+{
+    private String m_id;
+
+    private BeanA m_child;
+
+    public String getId()
+    {
+        return m_id;
+    }
+
+    public void setId(String id)
+    {
+        m_id = id;
+    }
+
+    public BeanA getChild()
+    {
+        return m_child;
+    }
+
+    public void setChild(BeanA child)
+    {
+        m_child = child;
+    }
+
+    public String toString()
+    {
+        return "[" + getClass().getName() + "] id=" + m_id + "; child={" + m_child + "}";
+    }
+
+    public boolean equals(Object o)
+    {
+        if (this == o)
+        {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass())
+        {
+            return false;
+        }
+
+        final RootBean rootBean = (RootBean) o;
+
+        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)
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    public int hashCode()
+    {
+        int result;
+        result = (m_id != null ? m_id.hashCode() : 0);
+        result = 29 * result + (m_child != null ? m_child.hashCode() : 0);
+        return result;
+    }
+}

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/RootBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/RootBean.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: 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=auto&rev=515734
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/WS1.java (added)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/WS1.java Wed Mar  7 12:20:07 2007
@@ -0,0 +1,48 @@
+/**
+ * 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.codehaus.xfire.aegis.inheritance.ws1;
+
+import java.util.Map;
+
+/**
+ * <br/>
+ * 
+ * @author xfournet
+ */
+public interface WS1
+{
+    public BeanA getBeanA();
+
+    public BeanB getBeanB();
+
+    public BeanA getBean(String id);
+
+    public BeanA[] listBeans();
+
+    public RootBean getRootBean(String id);
+
+    public RootBean[] listRootBeans();
+
+    public ResultBean getResultBean();
+
+    public Map echoMap(Map beans);
+    
+    public void throwException(boolean extendedOne)
+        throws WS1Exception;
+}

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/WS1.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/WS1.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: 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=auto&rev=515734
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/WS1Exception.java (added)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/WS1Exception.java Wed Mar  7 12:20:07 2007
@@ -0,0 +1,103 @@
+/**
+ * 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.codehaus.xfire.aegis.inheritance.ws1;
+
+/**
+ * <br/>
+ * 
+ * @author xfournet
+ */
+public class WS1Exception
+    extends Exception
+{
+    private int m_errorCode;
+    private Object simpleBean;
+    
+    public WS1Exception()
+    {
+    }
+
+    public WS1Exception(String message)
+    {
+        super(message);
+    }
+
+    public WS1Exception(String message, int errorCode1)
+    {
+        super(message);
+        m_errorCode = errorCode1;
+    }
+
+    public int getErrorCode()
+    {
+        return m_errorCode;
+    }
+
+    public void setErrorCode(int errorCode)
+    {
+        m_errorCode = errorCode;
+    }
+
+    public Object getSimpleBean()
+    {
+        return simpleBean;
+    }
+
+    public void setSimpleBean(Object simpleBean)
+    {
+        this.simpleBean = simpleBean;
+    }
+
+    public String toString()
+    {
+        return "[" + getClass().getName() + "] msg=" + getMessage() + "; errorCode=" + m_errorCode;
+    }
+
+    public boolean equals(Object o)
+    {
+        if (this == o)
+        {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass())
+        {
+            return false;
+        }
+
+        final WS1Exception that = (WS1Exception) o;
+
+        if (getMessage() != null ? !getMessage().equals(that.getMessage())
+                : that.getMessage() != null)
+        {
+            return false;
+        }
+
+        if (m_errorCode != that.m_errorCode)
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    public int hashCode()
+    {
+        return m_errorCode;
+    }
+}

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/WS1Exception.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/WS1Exception.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: 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=auto&rev=515734
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/WS1ExtendedException.java (added)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/WS1ExtendedException.java Wed Mar  7 12:20:07 2007
@@ -0,0 +1,92 @@
+/**
+ * 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.codehaus.xfire.aegis.inheritance.ws1;
+
+/**
+ * <br/>
+ * 
+ * @author xfournet
+ */
+public class WS1ExtendedException
+    extends WS1Exception
+{
+    private int m_extendedCode;
+
+    public WS1ExtendedException()
+    {
+    }
+
+    public WS1ExtendedException(String message)
+    {
+        super(message);
+    }
+
+    public WS1ExtendedException(String message, int errorCode1, int extendedCode)
+    {
+        super(message, errorCode1);
+        m_extendedCode = extendedCode;
+    }
+
+    public int getExtendedCode()
+    {
+        return m_extendedCode;
+    }
+
+    public void setExtendedCode(int extendedCode)
+    {
+        m_extendedCode = extendedCode;
+    }
+
+    public String toString()
+    {
+        return super.toString() + "; extendedCode=" + m_extendedCode;
+    }
+
+    public boolean equals(Object o)
+    {
+        if (this == o)
+        {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass())
+        {
+            return false;
+        }
+        if (!super.equals(o))
+        {
+            return false;
+        }
+
+        final WS1ExtendedException that = (WS1ExtendedException) o;
+
+        if (m_extendedCode != that.m_extendedCode)
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    public int hashCode()
+    {
+        int result = super.hashCode();
+        result = 29 * result + m_extendedCode;
+        return result;
+    }
+}

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/WS1ExtendedException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/WS1ExtendedException.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: 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=auto&rev=515734
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/impl/WS1Impl.java (added)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/impl/WS1Impl.java Wed Mar  7 12:20:07 2007
@@ -0,0 +1,147 @@
+/**
+ * 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.codehaus.xfire.aegis.inheritance.ws1.impl;
+
+import java.util.Map;
+
+import org.apache.cxf.aegis.services.SimpleBean;
+import org.codehaus.xfire.aegis.inheritance.ws1.BeanA;
+import org.codehaus.xfire.aegis.inheritance.ws1.BeanB;
+import org.codehaus.xfire.aegis.inheritance.ws1.BeanC;
+import org.codehaus.xfire.aegis.inheritance.ws1.ResultBean;
+import org.codehaus.xfire.aegis.inheritance.ws1.RootBean;
+import org.codehaus.xfire.aegis.inheritance.ws1.WS1;
+import org.codehaus.xfire.aegis.inheritance.ws1.WS1Exception;
+import org.codehaus.xfire.aegis.inheritance.ws1.WS1ExtendedException;
+
+/**
+ * <br/>
+ * 
+ * @author xfournet
+ */
+public class WS1Impl
+    implements WS1
+{
+    public BeanA getBeanA()
+    {
+        BeanA a = new BeanA();
+        a.setPropA("valueA");
+        return a;
+    }
+
+    public BeanB getBeanB()
+    {
+        BeanB b = new BeanB();
+        b.setPropA("valueA");
+        b.setPropB("valueB");
+        return b;
+    }
+
+    // not exported to interface to "hide" BeanC from interface introspection
+    public BeanC getBeanC()
+    {
+        BeanC c = new BeanC();
+        c.setPropA("valueA");
+        c.setPropB("valueB");
+        c.setPropC("valueC");
+        return c;
+    }
+
+    public BeanA getBean(String id)
+    {
+        if ("b".equalsIgnoreCase(id))
+        {
+            return getBeanB();
+        }
+        else if ("c".equalsIgnoreCase(id))
+        {
+            return getBeanC();
+        }
+        else if ("a".equalsIgnoreCase(id))
+        {
+            return getBeanA();
+        }
+        else
+        {
+            return null;
+        }
+    }
+
+    public BeanA[] listBeans()
+    {
+        BeanA[] result = new BeanA[4];
+
+        result[0] = getBean("b");
+        result[1] = null;
+        result[2] = getBean("a");
+        result[3] = getBean("c");
+
+        return result;
+    }
+
+    public RootBean getRootBean(String id)
+    {
+        RootBean rootBean = new RootBean();
+        rootBean.setId(id);
+        rootBean.setChild(getBean(id));
+
+        return rootBean;
+    }
+
+    public RootBean[] listRootBeans()
+    {
+        RootBean[] result = new RootBean[4];
+
+        result[0] = getRootBean("b");
+        result[1] = null;
+        result[2] = getRootBean("a");
+        result[3] = getRootBean("c");
+
+        return result;
+    }
+
+    public ResultBean getResultBean()
+    {
+        ResultBean resultBean = new ResultBean();
+        resultBean.setResult1(listBeans());
+        resultBean.setResult2(listRootBeans());
+
+        return resultBean;
+    }
+
+    public Map echoMap(Map beans)
+    {
+        return beans;
+    }
+
+    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
+        {
+            throw new WS1Exception("WS1 base exception", 10);
+        }
+    }
+}

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/impl/WS1Impl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws1/impl/WS1Impl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: 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=auto&rev=515734
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/WS2.java (added)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/WS2.java Wed Mar  7 12:20:07 2007
@@ -0,0 +1,37 @@
+/**
+ * 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.codehaus.xfire.aegis.inheritance.ws2;
+
+import org.codehaus.xfire.aegis.inheritance.ws2.common.ParentBean;
+import org.codehaus.xfire.aegis.inheritance.ws2.common.exception.AlreadyExistsException;
+import org.codehaus.xfire.aegis.inheritance.ws2.common.exception.NotFoundException;
+
+/**
+ * <br/>
+ * 
+ * @author xfournet
+ */
+public interface WS2
+{
+    public void putParentBean(ParentBean parentBean)
+        throws AlreadyExistsException;
+
+    public ParentBean getParentBean(String id)
+        throws NotFoundException;
+}

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/WS2.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/WS2.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: 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=auto&rev=515734
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/ParentBean.java (added)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/ParentBean.java Wed Mar  7 12:20:07 2007
@@ -0,0 +1,101 @@
+/**
+ * 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.codehaus.xfire.aegis.inheritance.ws2.common;
+
+import org.codehaus.xfire.aegis.inheritance.ws2.common.pack1.ContentBean1;
+
+/**
+ * <br/>
+ * 
+ * @author xfournet
+ */
+public class ParentBean
+{
+    private String m_id;
+
+    private ContentBean1 m_content;
+
+    public ParentBean()
+    {
+    }
+
+    public ParentBean(String id, ContentBean1 content)
+    {
+        m_id = id;
+        m_content = content;
+    }
+
+    public String getId()
+    {
+        return m_id;
+    }
+
+    public void setId(String id)
+    {
+        m_id = id;
+    }
+
+    public ContentBean1 getContent()
+    {
+        return m_content;
+    }
+
+    public void setContent(ContentBean1 content)
+    {
+        m_content = content;
+    }
+
+    public String toString()
+    {
+        return "[" + getClass().getName() + "] id=" + m_id + "; content={" + m_content + "}";
+    }
+
+    public boolean equals(Object o)
+    {
+        if (this == o)
+        {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass())
+        {
+            return false;
+        }
+
+        final ParentBean that = (ParentBean) o;
+
+        if (m_content != null ? !m_content.equals(that.m_content) : that.m_content != null)
+        {
+            return false;
+        }
+        if (m_id != null ? !m_id.equals(that.m_id) : that.m_id != null)
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    public int hashCode()
+    {
+        int result;
+        result = (m_id != null ? m_id.hashCode() : 0);
+        result = 29 * result + (m_content != null ? m_content.hashCode() : 0);
+        return result;
+    }
+}

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/ParentBean.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/ParentBean.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: 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=auto&rev=515734
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/exception/AlreadyExistsException.java (added)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/exception/AlreadyExistsException.java Wed Mar  7 12:20:07 2007
@@ -0,0 +1,86 @@
+/**
+ * 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.codehaus.xfire.aegis.inheritance.ws2.common.exception;
+
+/**
+ * <br/>
+ * 
+ * @author xfournet
+ */
+public class AlreadyExistsException
+    extends Exception
+{
+    private String m_id;
+
+    public AlreadyExistsException()
+    {
+    }
+
+    public AlreadyExistsException(String id)
+    {
+        m_id = id;
+    }
+
+    public String getId()
+    {
+        return m_id;
+    }
+
+    public void setId(String id)
+    {
+        m_id = id;
+    }
+
+    public String toString()
+    {
+        return "[" + getClass().getName() + "] id=" + m_id;
+    }
+
+    public boolean equals(Object o)
+    {
+        if (this == o)
+        {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass())
+        {
+            return false;
+        }
+
+        final AlreadyExistsException that = (AlreadyExistsException) o;
+
+        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)
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    public int hashCode()
+    {
+        return (m_id != null ? m_id.hashCode() : 0);
+    }
+}

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/exception/AlreadyExistsException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/exception/AlreadyExistsException.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: 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=auto&rev=515734
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/exception/NotFoundException.java (added)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/exception/NotFoundException.java Wed Mar  7 12:20:07 2007
@@ -0,0 +1,86 @@
+/**
+ * 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.codehaus.xfire.aegis.inheritance.ws2.common.exception;
+
+/**
+ * <br/>
+ * 
+ * @author xfournet
+ */
+public class NotFoundException
+    extends Exception
+{
+    private String m_id;
+
+    public NotFoundException()
+    {
+    }
+
+    public NotFoundException(String id)
+    {
+        m_id = id;
+    }
+
+    public String getId()
+    {
+        return m_id;
+    }
+
+    public void setId(String id)
+    {
+        m_id = id;
+    }
+
+    public String toString()
+    {
+        return "[" + getClass().getName() + "] id=" + m_id;
+    }
+
+    public boolean equals(Object o)
+    {
+        if (this == o)
+        {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass())
+        {
+            return false;
+        }
+
+        final NotFoundException that = (NotFoundException) o;
+
+        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)
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    public int hashCode()
+    {
+        return (m_id != null ? m_id.hashCode() : 0);
+    }
+}

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/exception/NotFoundException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/exception/NotFoundException.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: 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=auto&rev=515734
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/pack1/ContentBean1.java (added)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/pack1/ContentBean1.java Wed Mar  7 12:20:07 2007
@@ -0,0 +1,79 @@
+/**
+ * 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.codehaus.xfire.aegis.inheritance.ws2.common.pack1;
+
+/**
+ * <br/>
+ * 
+ * @author xfournet
+ */
+public class ContentBean1
+{
+    private String m_data1;
+
+    public ContentBean1()
+    {
+    }
+
+    public ContentBean1(String data1)
+    {
+        m_data1 = data1;
+    }
+
+    public String getData1()
+    {
+        return m_data1;
+    }
+
+    public void setData1(String data1)
+    {
+        m_data1 = data1;
+    }
+
+    public String toString()
+    {
+        return "[" + getClass().getName() + "] data1=" + m_data1;
+    }
+
+    public boolean equals(Object o)
+    {
+        if (this == o)
+        {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass())
+        {
+            return false;
+        }
+
+        final ContentBean1 that = (ContentBean1) o;
+
+        if (m_data1 != null ? !m_data1.equals(that.m_data1) : that.m_data1 != null)
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    public int hashCode()
+    {
+        return (m_data1 != null ? m_data1.hashCode() : 0);
+    }
+}

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/pack1/ContentBean1.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/pack1/ContentBean1.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: 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=auto&rev=515734
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/pack2/ContentBean2.java (added)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/pack2/ContentBean2.java Wed Mar  7 12:20:07 2007
@@ -0,0 +1,89 @@
+/**
+ * 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.codehaus.xfire.aegis.inheritance.ws2.common.pack2;
+
+import org.codehaus.xfire.aegis.inheritance.ws2.common.pack1.ContentBean1;
+
+/**
+ * <br/>
+ * 
+ * @author xfournet
+ */
+public class ContentBean2
+    extends ContentBean1
+{
+    private String m_content2;
+
+    public ContentBean2()
+    {
+    }
+
+    public ContentBean2(String data1, String content2)
+    {
+        super(data1);
+        m_content2 = content2;
+    }
+
+    public String getContent2()
+    {
+        return m_content2;
+    }
+
+    public void setContent2(String content2)
+    {
+        m_content2 = content2;
+    }
+
+    public String toString()
+    {
+        return super.toString() + "; content2=" + m_content2;
+    }
+
+    public boolean equals(Object o)
+    {
+        if (this == o)
+        {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass())
+        {
+            return false;
+        }
+        if (!super.equals(o))
+        {
+            return false;
+        }
+
+        final ContentBean2 that = (ContentBean2) o;
+
+        if (m_content2 != null ? !m_content2.equals(that.m_content2) : that.m_content2 != null)
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    public int hashCode()
+    {
+        int result = super.hashCode();
+        result = 29 * result + (m_content2 != null ? m_content2.hashCode() : 0);
+        return result;
+    }
+}

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/pack2/ContentBean2.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/common/pack2/ContentBean2.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: 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=auto&rev=515734
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/impl/WS2Impl.java (added)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/impl/WS2Impl.java Wed Mar  7 12:20:07 2007
@@ -0,0 +1,71 @@
+/**
+ * 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.codehaus.xfire.aegis.inheritance.ws2.impl;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.codehaus.xfire.aegis.inheritance.ws2.WS2;
+import org.codehaus.xfire.aegis.inheritance.ws2.common.ParentBean;
+import org.codehaus.xfire.aegis.inheritance.ws2.common.exception.AlreadyExistsException;
+import org.codehaus.xfire.aegis.inheritance.ws2.common.exception.NotFoundException;
+import org.codehaus.xfire.aegis.inheritance.ws2.common.pack1.ContentBean1;
+import org.codehaus.xfire.aegis.inheritance.ws2.common.pack2.ContentBean2;
+
+/**
+ * <br/>
+ * 
+ * @author xfournet
+ */
+public class WS2Impl
+    implements WS2
+{
+    private Map<String, ParentBean> m_map = new HashMap<String, ParentBean>();
+
+    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);
+    }
+
+    public synchronized void putParentBean(ParentBean parentBean)
+        throws AlreadyExistsException
+    {
+        String id = parentBean.getId();
+        if (m_map.containsKey(id))
+        {
+            throw new AlreadyExistsException(id);
+        }
+        m_map.put(id, parentBean);
+    }
+
+    public synchronized ParentBean getParentBean(String id)
+        throws NotFoundException
+    {
+        ParentBean result = m_map.get(id);
+        if (result == null)
+        {
+            throw new NotFoundException(id);
+        }
+
+        return result;
+    }
+}

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/impl/WS2Impl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/codehaus/xfire/aegis/inheritance/ws2/impl/WS2Impl.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java?view=diff&rev=515734&r1=515733&r2=515734
==============================================================================
--- incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java (original)
+++ incubator/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java Wed Mar  7 12:20:07 2007
@@ -39,7 +39,6 @@
 import org.xml.sax.SAXException;
 import org.xml.sax.SAXParseException;
 
-import com.ibm.wsdl.extensions.soap.SOAPBindingImpl;
 import com.sun.codemodel.JCodeModel;
 import com.sun.codemodel.JPackage;
 import com.sun.codemodel.writer.FileCodeWriter;
@@ -53,17 +52,12 @@
 import org.apache.cxf.common.i18n.Message;
 import org.apache.cxf.endpoint.Client;
 import org.apache.cxf.endpoint.ClientImpl;
-import org.apache.cxf.endpoint.EndpointException;
-import org.apache.cxf.endpoint.EndpointImpl;
 import org.apache.cxf.jaxb.JAXBDataBinding;
 import org.apache.cxf.resource.URIResolver;
 import org.apache.cxf.service.Service;
 import org.apache.cxf.service.factory.ServiceConstructionException;
-import org.apache.cxf.service.model.BindingInfo;
-import org.apache.cxf.service.model.EndpointInfo;
 import org.apache.cxf.service.model.SchemaInfo;
 import org.apache.cxf.service.model.ServiceInfo;
-import org.apache.cxf.wsdl11.WSDLServiceFactory;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.taskdefs.Javac;
 import org.apache.tools.ant.types.DirSet;
@@ -76,7 +70,7 @@
 public final class DynamicClientFactory {
 
     private static final Logger LOG = Logger.getLogger(DynamicClientFactory.class.getName());
-    
+
     private Bus bus;
 
     private String tmpdir = System.getProperty("java.io.tmpdir");
@@ -145,13 +139,10 @@
 
     public Client createClient(String wsdlUrl, QName wsdlEndpoint, ClassLoader classLoader, QName port) {
         URL u = composeUrl(wsdlUrl);
-        // <<null>> could be passed, but that exploits knowledge of the way that
-        // constructors
-        // on WSDLServiceFactory are implemented, which we don't really know.
-        // Wink wink.
-        WSDLServiceFactory sf = (wsdlEndpoint == null)
-            ? (new WSDLServiceFactory(bus, u)) : (new WSDLServiceFactory(bus, u, wsdlEndpoint));
-        Service svc = sf.create();
+
+        ClientImpl client = new ClientImpl(bus, u, port);
+
+        Service svc = client.getEndpoint().getService();
         Collection<SchemaInfo> schemas = svc.getServiceInfo().getSchemas();
 
         SchemaCompiler compiler = XJC.createSchemaCompiler();
@@ -162,12 +153,12 @@
             Element el = schema.getElement();
             compiler.parseSchema(wsdlUrl, el);
         }
-        
+
         S2JJAXBModel intermediateModel = compiler.bind();
         JCodeModel codeModel = intermediateModel.generateCode(null, elForRun);
         StringBuilder sb = new StringBuilder();
         boolean firstnt = false;
-        
+
         for (Iterator<JPackage> packages = codeModel.packages(); packages.hasNext();) {
             JPackage packadge = packages.next();
             String name = packadge.name();
@@ -181,7 +172,7 @@
             }
             sb.append(packadge.name());
         }
-        
+
         String packageList = sb.toString();
 
         // our hashcode + timestamp ought to be enough.
@@ -249,57 +240,13 @@
         TypeClassInitializer visitor = new TypeClassInitializer(svcfo, intermediateModel);
         visitor.walk();
 
-        EndpointInfo epfo = findEndpoint(svcfo, port);
-
-        EndpointImpl ep;
-        try {
-            ep = new EndpointImpl(bus, svc, epfo);
-        } catch (EndpointException epex) {
-            throw new IllegalStateException("Unable to create endpoint: " + epex.getMessage(), epex);
-        }
-
-        return new ClientImpl(bus, ep);
-    }
-
-    private EndpointInfo findEndpoint(ServiceInfo svcfo, QName port) {
-        EndpointInfo epfo;
-        if (port != null) {
-            epfo = svcfo.getEndpoint(port);
-            if (epfo == null) {
-                throw new IllegalArgumentException("The service " + svcfo.getName()
-                                                   + " does not have an endpoint " + port + ".");
-            }
-        } else {
-            epfo = null;
-            for (EndpointInfo e : svcfo.getEndpoints()) {
-                BindingInfo bfo = e.getBinding();
-
-                if (bfo.getBindingId().equals("http://schemas.xmlsoap.org/wsdl/soap/")) {
-                    for (Object o : bfo.getExtensors().get()) {
-                        if (o instanceof SOAPBindingImpl) {
-                            SOAPBindingImpl soapB = (SOAPBindingImpl)o;
-                            if (soapB.getTransportURI().equals("http://schemas.xmlsoap.org/soap/http")) {
-                                epfo = e;
-                                break;
-                            }
-                        }
-                    }
-
-                }
-            }
-            if (epfo == null) {
-                throw new UnsupportedOperationException(
-                     "Only document-style SOAP 1.1 http are supported "
-                     + "for auto-selection of endpoint; none were found.");
-            }
-        }
-        return epfo;
+        return client;
     }
 
     private URL composeUrl(String s) {
         try {
             URIResolver resolver = new URIResolver(null, s, getClass());
-            
+
             if (resolver.isResolved()) {
                 return resolver.getURI().toURL();
             } else {

Modified: incubator/cxf/trunk/rt/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/pom.xml?view=diff&rev=515734&r1=515733&r2=515734
==============================================================================
--- incubator/cxf/trunk/rt/pom.xml (original)
+++ incubator/cxf/trunk/rt/pom.xml Wed Mar  7 12:20:07 2007
@@ -36,6 +36,7 @@
         <module>management</module>
         <module>transports/local</module>
         <module>databinding/jaxb</module>
+        <module>databinding/aegis</module>
         <module>bindings</module>
         <module>frontend/simple</module>
         <module>frontend/jaxws</module>



Mime
View raw message