Author: dkulp
Date: Fri Jun 13 09:46:39 2008
New Revision: 667591
URL: http://svn.apache.org/viewvc?rev=667591&view=rev
Log:
Move last of stuff not in org.apache.cxf package into it
Added:
cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/http.xjb (with
props)
Modified:
cxf/trunk/api/pom.xml
cxf/trunk/distribution/bundle/pom.xml
cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/HttpAddressPlugin.java
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPTransportFactory.java
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/extensions.xml
cxf/trunk/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalTransportFactoryTest.java
Modified: cxf/trunk/api/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/api/pom.xml?rev=667591&r1=667590&r2=667591&view=diff
==============================================================================
--- cxf/trunk/api/pom.xml (original)
+++ cxf/trunk/api/pom.xml Fri Jun 13 09:46:39 2008
@@ -132,7 +132,7 @@
<xsdOptions>
<xsdOption>
<xsd>${basedir}/target/schemas/schemas/wsdl/http.xsd</xsd>
-
<bindingFile>${basedir}/target/schemas/schemas/wsdl/wsdl.xjb</bindingFile>
+
<bindingFile>${basedir}/target/schemas/schemas/wsdl/http.xjb</bindingFile>
<catalog>${basedir}/src/main/build-resources/catalog.cat</catalog>
<dependencies>
<dependency>${basedir}/target/schemas/schemas/wsdl/wsdl.xsd</dependency>
Added: cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/http.xjb
URL:
http://svn.apache.org/viewvc/cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/http.xjb?rev=667591&view=auto
==============================================================================
--- cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/http.xjb (added)
+++ cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/http.xjb Fri Jun
13 09:46:39 2008
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ 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.
+-->
+<jaxb:bindings version="1.0"
+ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb";
+ xmlns:xs="http://www.w3.org/2001/XMLSchema";
+ xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc";
+ jaxb:extensionBindingPrefixes="xjc">
+ <jaxb:bindings
schemaLocation="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd";
node="/xs:schema">
+ <jaxb:schemaBindings>
+ <jaxb:package name="org.apache.cxf.wsdl"/>
+ </jaxb:schemaBindings>
+ <jaxb:globalBindings generateIsSetMethod="true"/>
+ </jaxb:bindings>
+ <jaxb:bindings
schemaLocation="http://schemas.xmlsoap.org/wsdl/2003-02-11.xsd";
node="/xs:schema/xs:[EMAIL PROTECTED]'tExtensibilityElement']">
+ <jaxb:class implClass="org.apache.cxf.wsdl.TExtensibilityElementImpl"/>
+ </jaxb:bindings>
+ <jaxb:bindings schemaLocation="http.xsd" node="/xs:schema">
+ <jaxb:schemaBindings>
+ <jaxb:package name="org.apache.cxf.wsdl.http"/>
+ </jaxb:schemaBindings>
+ </jaxb:bindings>
+</jaxb:bindings>
Propchange: cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/http.xjb
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/http.xjb
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/trunk/common/schemas/src/main/resources/schemas/wsdl/http.xjb
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: cxf/trunk/distribution/bundle/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/distribution/bundle/pom.xml?rev=667591&r1=667590&r2=667591&view=diff
==============================================================================
--- cxf/trunk/distribution/bundle/pom.xml (original)
+++ cxf/trunk/distribution/bundle/pom.xml Fri Jun 13 09:46:39 2008
@@ -306,7 +306,6 @@
</Import-Package>
<Export-Package>
org.apache.cxf.*;version=${pom.version};-split-package:=merge-first,
-
org.xmlsoap.schemas*;version=${pom.version};-split-package:=merge-first,
org.codehaus.xfire.aegis.type.java5.*,
'=META-INF.cxf'
</Export-Package>
Modified:
cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/HttpAddressPlugin.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/HttpAddressPlugin.java?rev=667591&r1=667590&r2=667591&view=diff
==============================================================================
---
cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/HttpAddressPlugin.java
(original)
+++
cxf/trunk/rt/bindings/xml/src/main/java/org/apache/cxf/binding/xml/wsdl11/HttpAddressPlugin.java
Fri Jun 13 09:46:39 2008
@@ -28,7 +28,7 @@
import org.apache.cxf.tools.common.ToolConstants;
import org.apache.cxf.wsdl.AbstractWSDLPlugin;
import org.apache.cxf.wsdl.WSDLConstants;
-import org.xmlsoap.schemas.wsdl.http.AddressType;
+import org.apache.cxf.wsdl.http.AddressType;
public final class HttpAddressPlugin extends AbstractWSDLPlugin {
Modified:
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPTransportFactory.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPTransportFactory.java?rev=667591&r1=667590&r2=667591&view=diff
==============================================================================
---
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPTransportFactory.java
(original)
+++
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPTransportFactory.java
Fri Jun 13 09:46:39 2008
@@ -48,8 +48,8 @@
import org.apache.cxf.transport.ConduitInitiatorManager;
import org.apache.cxf.transport.https.HttpsURLConnectionFactory;
import org.apache.cxf.ws.addressing.EndpointReferenceType;
+import org.apache.cxf.wsdl.http.AddressType;
import org.apache.cxf.wsdl11.WSDLEndpointFactory;
-import org.xmlsoap.schemas.wsdl.http.AddressType;
/**
Modified:
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java?rev=667591&r1=667590&r2=667591&view=diff
==============================================================================
---
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
(original)
+++
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletController.java
Fri Jun 13 09:46:39 2008
@@ -41,7 +41,7 @@
import org.apache.cxf.service.model.OperationInfo;
import org.apache.cxf.transports.http.QueryHandler;
import org.apache.cxf.transports.http.QueryHandlerRegistry;
-import org.xmlsoap.schemas.wsdl.http.AddressType;
+import org.apache.cxf.wsdl.http.AddressType;
public class ServletController {
Modified:
cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/extensions.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/extensions.xml?rev=667591&r1=667590&r2=667591&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/extensions.xml
(original)
+++ cxf/trunk/rt/transports/http/src/main/resources/META-INF/cxf/extensions.xml
Fri Jun 13 09:46:39 2008
@@ -21,5 +21,5 @@
<properties>
<entry
key="org.apache.cxf.transports.http-1">javax.wsdl.Port=org.apache.cxf.transports.http.configuration.HTTPClientPolicy</entry>
<entry
key="org.apache.cxf.transports.http-2">javax.wsdl.Port=org.apache.cxf.transports.http.configuration.HTTPServerPolicy</entry>
- <entry
key="org.apache.cxf.transports.http-3">javax.wsdl.Port=org.xmlsoap.schemas.wsdl.http.AddressType</entry>
+ <entry
key="org.apache.cxf.transports.http-3">javax.wsdl.Port=org.apache.cxf.wsdl.http.AddressType</entry>
</properties>
Modified:
cxf/trunk/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalTransportFactoryTest.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalTransportFactoryTest.java?rev=667591&r1=667590&r2=667591&view=diff
==============================================================================
---
cxf/trunk/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalTransportFactoryTest.java
(original)
+++
cxf/trunk/rt/transports/local/src/test/java/org/apache/cxf/transport/local/LocalTransportFactoryTest.java
Fri Jun 13 09:46:39 2008
@@ -31,9 +31,9 @@
import org.apache.cxf.transport.Conduit;
import org.apache.cxf.transport.MessageObserver;
+import org.apache.cxf.wsdl.http.AddressType;
import org.junit.Assert;
import org.junit.Test;
-import org.xmlsoap.schemas.wsdl.http.AddressType;
public class LocalTransportFactoryTest extends Assert {
@Test
