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 2013/05/31 18:07:02 UTC
svn commit: r1488289 - in /cxf/branches/dkulp-nowsdl4j/rt/wsdl: ./
src/main/java/org/apache/cxf/wsdl/binding/
src/main/java/org/apache/cxf/wsdl/service/factory/
src/test/java/org/apache/cxf/wsdl/service/factory/
src/test/java/org/apache/cxf/wsdl11/
Author: dkulp
Date: Fri May 31 16:07:01 2013
New Revision: 1488289
URL: http://svn.apache.org/r1488289
Log:
Get rt/wsdl compiling and tests passing
Added:
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/binding/AbstractWSDLBindingFactory.java
- copied, changed from r1488288, cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/binding/AbstractBindingFactory.java
Removed:
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/binding/AbstractBindingFactory.java
Modified:
cxf/branches/dkulp-nowsdl4j/rt/wsdl/pom.xml
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactorBeanTest.java
cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
Modified: cxf/branches/dkulp-nowsdl4j/rt/wsdl/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/pom.xml?rev=1488289&r1=1488288&r2=1488289&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/wsdl/pom.xml (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/wsdl/pom.xml Fri May 31 16:07:01 2013
@@ -59,18 +59,56 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <scope>test</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <scope>test</scope>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <scope>test</scope>
+ <scope>provided</scope>
</dependency>
</dependencies>
-
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-xjc-plugin</artifactId>
+ <version>${cxf.xjc-utils.version}</version>
+ <executions>
+ <execution>
+ <id>generate-test-sources</id>
+ <phase>generate-test-sources</phase>
+ <goals>
+ <goal>xsdtojava-tests</goal>
+ </goals>
+ <configuration>
+ <testSourceRoot>${basedir}/target/generated/src/test/java</testSourceRoot>
+ <xsdOptions>
+ <xsdOption>
+ <xsd>${basedir}/src/test/resources/schemas/wsdl/test-conf.xsd</xsd>
+ <bindingFile>${basedir}/src/test/resources/schemas/wsdl/test-conf.xjb</bindingFile>
+ <catalog>${basedir}/src/main/build-resources/catalog.cat</catalog>
+ <deleteDirs>
+ <deleteDir>${basedir}/target/generated/src/test/java/org/apache/cxf/wsdl</deleteDir>
+ </deleteDirs>
+ </xsdOption>
+ </xsdOptions>
+ </configuration>
+ </execution>
+
+ </executions>
+
+ <configuration>
+ <extensions>
+ <extension>org.apache.cxf.xjcplugins:cxf-xjc-dv:${cxf.xjc-utils.version}</extension>
+ </extensions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Copied: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/binding/AbstractWSDLBindingFactory.java (from r1488288, cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/binding/AbstractBindingFactory.java)
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/binding/AbstractWSDLBindingFactory.java?p2=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/binding/AbstractWSDLBindingFactory.java&p1=cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/binding/AbstractBindingFactory.java&r1=1488288&r2=1488289&rev=1488289&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/binding/AbstractBindingFactory.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/binding/AbstractWSDLBindingFactory.java Fri May 31 16:07:01 2013
@@ -31,6 +31,7 @@ import javax.wsdl.extensions.Extensibili
import javax.xml.namespace.QName;
import org.apache.cxf.Bus;
+import org.apache.cxf.binding.AbstractBindingFactory;
import org.apache.cxf.service.model.AbstractPropertiesHolder;
import org.apache.cxf.service.model.BindingInfo;
import org.apache.cxf.service.model.BindingOperationInfo;
@@ -38,21 +39,21 @@ import org.apache.cxf.service.model.Serv
import static org.apache.cxf.helpers.CastUtils.cast;
-public abstract class AbstractBindingFactory extends AbstractBindingFactory
+public abstract class AbstractWSDLBindingFactory extends AbstractBindingFactory
implements WSDLBindingFactory {
- public AbstractBindingFactory() {
+ public AbstractWSDLBindingFactory() {
}
- public AbstractBindingFactory(Collection<String> ns) {
+ public AbstractWSDLBindingFactory(Collection<String> ns) {
super(ns);
}
- public AbstractBindingFactory(Bus b) {
+ public AbstractWSDLBindingFactory(Bus b) {
super(b);
}
- public AbstractBindingFactory(Bus b, Collection<String> ns) {
+ public AbstractWSDLBindingFactory(Bus b, Collection<String> ns) {
super(b, ns);
}
Modified: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java?rev=1488289&r1=1488288&r2=1488289&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/main/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactoryBean.java Fri May 31 16:07:01 2013
@@ -90,6 +90,7 @@ import org.apache.cxf.resource.ResourceM
import org.apache.cxf.service.Service;
import org.apache.cxf.service.ServiceImpl;
import org.apache.cxf.service.ServiceModelSchemaValidator;
+import org.apache.cxf.service.factory.FactoryBeanListener.Event;
import org.apache.cxf.service.factory.ServiceConstructionException;
import org.apache.cxf.service.factory.SimpleMethodDispatcher;
import org.apache.cxf.service.invoker.FactoryInvoker;
Modified: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactorBeanTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactorBeanTest.java?rev=1488289&r1=1488288&r2=1488289&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactorBeanTest.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/wsdl/service/factory/ReflectionServiceFactorBeanTest.java Fri May 31 16:07:01 2013
@@ -23,6 +23,8 @@ import javax.wsdl.WSDLException;
import javax.xml.namespace.QName;
import org.apache.cxf.Bus;
+import org.apache.cxf.service.factory.FactoryBeanListenerManager;
+import org.apache.cxf.service.factory.ServiceConstructionException;
import org.apache.cxf.wsdl.WSDLManager;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;
Modified: cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java?rev=1488289&r1=1488288&r2=1488289&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/wsdl/src/test/java/org/apache/cxf/wsdl11/WSDLServiceBuilderTest.java Fri May 31 16:07:01 2013
@@ -64,7 +64,7 @@ import org.apache.cxf.service.model.Sche
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.transport.DestinationFactory;
import org.apache.cxf.transport.DestinationFactoryManager;
-import org.apache.cxf.wsdl.EndpointReferenceUtils;
+import org.apache.cxf.ws.addressing.EndpointReferenceUtils;
import org.apache.ws.commons.schema.XmlSchemaElement;
import org.easymock.EasyMock;
import org.easymock.IMocksControl;