You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ff...@apache.org on 2011/07/06 09:03:19 UTC
svn commit: r1143270 - in /cxf/trunk:
api/src/main/java/org/apache/cxf/tools/common/
distribution/src/main/assembly/ rt/core/src/main/java/org/apache/cxf/wsdl11/
tools/common/src/test/resources/schemas/wsdl/
Author: ffang
Date: Wed Jul 6 07:03:19 2011
New Revision: 1143270
URL: http://svn.apache.org/viewvc?rev=1143270&view=rev
Log:
[CXF-3599]some cleanup
Modified:
cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java
cxf/trunk/distribution/src/main/assembly/bin.xml
cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
cxf/trunk/tools/common/src/test/resources/schemas/wsdl/test.xsd
Modified: cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java
URL: http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java?rev=1143270&r1=1143269&r2=1143270&view=diff
==============================================================================
--- cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java (original)
+++ cxf/trunk/api/src/main/java/org/apache/cxf/tools/common/ToolConstants.java Wed Jul 6 07:03:19 2011
@@ -182,11 +182,6 @@ public final class ToolConstants {
public static final String NS_JMS_ADDRESS = "http://cxf.apache.org/transports/jms";
public static final QName JMS_ADDRESS = new QName(NS_JMS_ADDRESS, "address");
- // JBI address
- public static final String NS_JBI_ADDRESS = "http://cxf.apache.org/transports/jbi";
- public static final QName JBI_ADDRESS = new QName(NS_JBI_ADDRESS, "address");
-
-
public static final String JMS_ADDR_DEST_STYLE = "destinationStyle";
public static final String JMS_ADDR_JNDI_URL = "jndiProviderURL";
public static final String JMS_ADDR_JNDI_FAC = "jndiConnectionFactoryName";
Modified: cxf/trunk/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/assembly/bin.xml?rev=1143270&r1=1143269&r2=1143270&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/assembly/bin.xml (original)
+++ cxf/trunk/distribution/src/main/assembly/bin.xml Wed Jul 6 07:03:19 2011
@@ -78,7 +78,6 @@
<exclude>**/target</exclude>
<exclude>**/build/**/*</exclude>
<exclude>**/target/**/*</exclude>
- <exclude>integration/JBI/**/build.properties</exclude>
</excludes>
</fileSet>
<fileSet>
Modified: cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java?rev=1143270&r1=1143269&r2=1143270&view=diff
==============================================================================
--- cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java (original)
+++ cxf/trunk/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java Wed Jul 6 07:03:19 2011
@@ -430,10 +430,6 @@ public class WSDLServiceBuilder {
break;
// TODO: this is really ugly, but how to link between
// this binding and this transport ?
- } else if ("http://cxf.apache.org/bindings/jbi".equals(el.getElementType()
- .getNamespaceURI())) {
- ns = "http://cxf.apache.org/transports/jbi";
- break;
}
}
}
Modified: cxf/trunk/tools/common/src/test/resources/schemas/wsdl/test.xsd
URL: http://svn.apache.org/viewvc/cxf/trunk/tools/common/src/test/resources/schemas/wsdl/test.xsd?rev=1143270&r1=1143269&r2=1143270&view=diff
==============================================================================
--- cxf/trunk/tools/common/src/test/resources/schemas/wsdl/test.xsd (original)
+++ cxf/trunk/tools/common/src/test/resources/schemas/wsdl/test.xsd Wed Jul 6 07:03:19 2011
@@ -17,23 +17,25 @@
specific language governing permissions and limitations
under the License.
-->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:jbi="http://cxf.apache.org/bindings/jbi"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- targetNamespace="http://cxf.apache.org/bindings/jbi"
- elementFormDefault="qualified"
- xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" jaxb:version="2.0">
-
- <xs:import namespace="http://schemas.xmlsoap.org/wsdl/" schemaLocation="http://schemas.xmlsoap.org/wsdl/" />
-
- <xs:complexType name="JBIFormatBinding">
- <xs:complexContent>
- <xs:extension base="wsdl:tExtensibilityElement">
- <xs:sequence />
- </xs:extension>
- </xs:complexContent>
- </xs:complexType>
-
- <xs:element name="binding" type="jbi:JBIFormatBinding"/>
-
-</xs:schema>
+<schema xmlns:tns="http://cxf.apache.org/person/"
+ xmlns="http://www.w3.org/2001/XMLSchema"
+ xmlns:xmime="http://www.w3.org/2005/05/xmlmime"
+ targetNamespace="http://cxf.apache.org/person/"
+ elementFormDefault="qualified">
+ <element name="Person">
+ <complexType>
+ <sequence>
+ <element name="Name" type="string" />
+ <element name="Photo" type="base64Binary"
+ xmime:expectedContentTypes="application/octet-stream" />
+ </sequence>
+ </complexType>
+ </element>
+ <element name="People">
+ <complexType>
+ <sequence>
+ <element ref="tns:Person" maxOccurs="unbounded" />
+ </sequence>
+ </complexType>
+ </element>
+</schema>