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 19:38:49 UTC
svn commit: r1488333 - in /cxf/branches/dkulp-nowsdl4j:
rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/
rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/ rt/ws/policy/
rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachme...
Author: dkulp
Date: Fri May 31 17:38:49 2013
New Revision: 1488333
URL: http://svn.apache.org/r1488333
Log:
Get the tools building
Modified:
cxf/branches/dkulp-nowsdl4j/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
cxf/branches/dkulp-nowsdl4j/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
cxf/branches/dkulp-nowsdl4j/rt/ws/policy/pom.xml
cxf/branches/dkulp-nowsdl4j/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProvider.java
cxf/branches/dkulp-nowsdl4j/tools/common/pom.xml
cxf/branches/dkulp-nowsdl4j/tools/common/src/main/java/org/apache/cxf/tools/common/ToolTestBase.java
cxf/branches/dkulp-nowsdl4j/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
cxf/branches/dkulp-nowsdl4j/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
cxf/branches/dkulp-nowsdl4j/tools/wsdlto/core/pom.xml
Modified: cxf/branches/dkulp-nowsdl4j/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java?rev=1488333&r1=1488332&r2=1488333&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/databinding/jaxb/src/main/java/org/apache/cxf/endpoint/dynamic/DynamicClientFactory.java Fri May 31 17:38:49 2013
@@ -104,7 +104,6 @@ import org.apache.cxf.service.factory.Se
import org.apache.cxf.service.model.SchemaInfo;
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.staxutils.StaxUtils;
-import org.apache.cxf.wsdl11.WSDLServiceFactory;
import org.apache.ws.commons.schema.XmlSchema;
import org.apache.ws.commons.schema.XmlSchemaSerializer;
import org.apache.ws.commons.schema.XmlSchemaSerializer.XmlSchemaSerializerException;
Modified: cxf/branches/dkulp-nowsdl4j/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java?rev=1488333&r1=1488332&r2=1488333&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java Fri May 31 17:38:49 2013
@@ -87,7 +87,6 @@ import org.apache.cxf.service.factory.Se
import org.apache.cxf.service.model.ServiceInfo;
import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.ws.addressing.ObjectFactory;
-import org.apache.cxf.wsdl.service.factory.ReflectionServiceFactoryBean;
@NoJSR250Annotations
public class JAXBDataBinding extends AbstractDataBinding
@@ -221,11 +220,10 @@ public class JAXBDataBinding extends Abs
contextClasses.addAll(Arrays.asList(classes));
setContext(createJAXBContext(contextClasses)); //NOPMD - specifically allow this
}
- public JAXBDataBinding(ReflectionServiceFactoryBean b) throws JAXBException {
- this(b.isQualifyWrapperSchema());
- Map<String, Object> props = b.getProperties();
+ public JAXBDataBinding(boolean qualified, Map<String, Object> props) throws JAXBException {
+ this(qualified);
if (props != null && props.get("jaxb.additionalContextClasses") != null) {
- Object o = b.getProperties().get("jaxb.additionalContextClasses");
+ Object o = props.get("jaxb.additionalContextClasses");
if (o instanceof Class) {
o = new Class[] {(Class<?>)o};
}
Modified: cxf/branches/dkulp-nowsdl4j/rt/ws/policy/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/ws/policy/pom.xml?rev=1488333&r1=1488332&r2=1488333&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/ws/policy/pom.xml (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/ws/policy/pom.xml Fri May 31 17:38:49 2013
@@ -48,6 +48,10 @@
<artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<scope>provided</scope>
@@ -81,6 +85,12 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-wsdl</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.neethi</groupId>
<artifactId>neethi</artifactId>
</dependency>
Modified: cxf/branches/dkulp-nowsdl4j/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProvider.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProvider.java?rev=1488333&r1=1488332&r2=1488333&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProvider.java (original)
+++ cxf/branches/dkulp-nowsdl4j/rt/ws/policy/src/main/java/org/apache/cxf/ws/policy/attachment/wsdl11/Wsdl11AttachmentPolicyProvider.java Fri May 31 17:38:49 2013
@@ -49,7 +49,6 @@ import org.apache.cxf.ws.policy.PolicyCo
import org.apache.cxf.ws.policy.attachment.AbstractPolicyProvider;
import org.apache.cxf.ws.policy.attachment.reference.LocalServiceModelReferenceResolver;
import org.apache.cxf.ws.policy.attachment.reference.ReferenceResolver;
-import org.apache.cxf.wsdl11.WSDLServiceBuilder;
import org.apache.neethi.Constants;
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyReference;
@@ -302,7 +301,7 @@ public class Wsdl11AttachmentPolicyProvi
if (null == di) {
return null;
}
- Definition def = (Definition)di.getProperty(WSDLServiceBuilder.WSDL_DEFINITION);
+ Definition def = (Definition)di.getProperty("org.apache.cxf.wsdl11.WSDLServiceBuilder.WSDL_DEFINITION");
if (null == def) {
return null;
}
Modified: cxf/branches/dkulp-nowsdl4j/tools/common/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/tools/common/pom.xml?rev=1488333&r1=1488332&r2=1488333&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/tools/common/pom.xml (original)
+++ cxf/branches/dkulp-nowsdl4j/tools/common/pom.xml Fri May 31 17:38:49 2013
@@ -75,5 +75,12 @@
<artifactId>cxf-rt-core</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-wsdl</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ <optional>true</optional>
+ </dependency>
</dependencies>
</project>
Modified: cxf/branches/dkulp-nowsdl4j/tools/common/src/main/java/org/apache/cxf/tools/common/ToolTestBase.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/tools/common/src/main/java/org/apache/cxf/tools/common/ToolTestBase.java?rev=1488333&r1=1488332&r2=1488333&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/tools/common/src/main/java/org/apache/cxf/tools/common/ToolTestBase.java (original)
+++ cxf/branches/dkulp-nowsdl4j/tools/common/src/main/java/org/apache/cxf/tools/common/ToolTestBase.java Fri May 31 17:38:49 2013
@@ -25,6 +25,7 @@ import java.io.PrintStream;
import org.apache.cxf.helpers.FileUtils;
import org.apache.cxf.test.AbstractCXFTest;
+
import org.junit.After;
import org.junit.Before;
Modified: cxf/branches/dkulp-nowsdl4j/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java?rev=1488333&r1=1488332&r2=1488333&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java (original)
+++ cxf/branches/dkulp-nowsdl4j/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java Fri May 31 17:38:49 2013
@@ -35,7 +35,6 @@ import org.w3c.dom.Element;
import org.apache.cxf.common.WSDLConstants;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.helpers.DOMUtils;
-import org.apache.cxf.helpers.WSDLHelper;
import org.apache.cxf.helpers.XMLUtils;
import org.apache.cxf.staxutils.StaxUtils;
import org.apache.cxf.tools.common.ProcessorTestBase;
@@ -46,6 +45,8 @@ import org.apache.cxf.tools.wsdlto.core.
import org.apache.cxf.tools.wsdlto.core.FrontEndProfile;
import org.apache.cxf.tools.wsdlto.core.PluginLoader;
import org.apache.cxf.tools.wsdlto.frontend.jaxws.JAXWSContainer;
+import org.apache.cxf.wsdl.WSDLHelper;
+
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Modified: cxf/branches/dkulp-nowsdl4j/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java?rev=1488333&r1=1488332&r2=1488333&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java (original)
+++ cxf/branches/dkulp-nowsdl4j/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java Fri May 31 17:38:49 2013
@@ -43,8 +43,8 @@ import org.apache.cxf.binding.soap.wsdl.
import org.apache.cxf.common.util.CollectionUtils;
import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.helpers.CastUtils;
-import org.apache.cxf.helpers.WSDLHelper;
import org.apache.cxf.tools.common.ToolException;
+import org.apache.cxf.wsdl.WSDLHelper;
public class WSIBPValidator extends AbstractDefinitionValidator {
private List<String> operationMap = new ArrayList<String>();
Modified: cxf/branches/dkulp-nowsdl4j/tools/wsdlto/core/pom.xml
URL: http://svn.apache.org/viewvc/cxf/branches/dkulp-nowsdl4j/tools/wsdlto/core/pom.xml?rev=1488333&r1=1488332&r2=1488333&view=diff
==============================================================================
--- cxf/branches/dkulp-nowsdl4j/tools/wsdlto/core/pom.xml (original)
+++ cxf/branches/dkulp-nowsdl4j/tools/wsdlto/core/pom.xml Fri May 31 17:38:49 2013
@@ -56,6 +56,11 @@
<artifactId>cxf-api</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-wsdl</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>junit</groupId>