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 2007/11/02 04:11:02 UTC
svn commit: r591206 - in /incubator/cxf/branches/2.0.x-fixes: ./
common/common/src/main/java/org/apache/cxf/helpers/ distribution/ parent/
systests/src/test/java/org/apache/cxf/systest/jaxws/
tools/validator/src/main/java/org/apache/cxf/tools/validator...
Author: dkulp
Date: Thu Nov 1 20:11:01 2007
New Revision: 591206
URL: http://svn.apache.org/viewvc?rev=591206&view=rev
Log:
Merged revisions 591117 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r591117 | dkulp | 2007-11-01 14:48:22 -0400 (Thu, 01 Nov 2007) | 4 lines
[CXF-1158, CXF-1146] Add ability to turn off address rewriting in servlet
Fix issues with validator not being able to determine if op is rpc or doc
Fix distribution of wrong commons logging jars
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/WSDLHelper.java
incubator/cxf/branches/2.0.x-fixes/distribution/pom.xml
incubator/cxf/branches/2.0.x-fixes/parent/pom.xml
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstService.java
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java
incubator/cxf/branches/2.0.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/WSDLHelper.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/WSDLHelper.java?rev=591206&r1=591205&r2=591206&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/WSDLHelper.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/common/common/src/main/java/org/apache/cxf/helpers/WSDLHelper.java Thu Nov 1 20:11:01 2007
@@ -170,7 +170,7 @@
Binding binding = (Binding)ite.next();
for (Iterator ite2 = binding.getBindingOperations().iterator(); ite2.hasNext();) {
BindingOperation bindingOperation = (BindingOperation)ite2.next();
- if (bindingOperation.getName().equals(bop)) {
+ if (bindingOperation.getName().equals(bop.getName())) {
return binding;
}
}
Modified: incubator/cxf/branches/2.0.x-fixes/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/distribution/pom.xml?rev=591206&r1=591205&r2=591206&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/distribution/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/distribution/pom.xml Thu Nov 1 20:11:01 2007
@@ -175,7 +175,7 @@
<artifactId>cxf-rt-databinding-aegis</artifactId>
<version>${pom.version}</version>
</dependency>
-
+
<dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-ws-addr</artifactId>
@@ -191,7 +191,7 @@
<artifactId>cxf-rt-ws-policy</artifactId>
<version>${pom.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
<version>${pom.version}</version>
@@ -231,6 +231,10 @@
<groupId>${pom.groupId}</groupId>
<artifactId>cxf-bundle</artifactId>
<version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</dependency>
</dependencies>
Modified: incubator/cxf/branches/2.0.x-fixes/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/parent/pom.xml?rev=591206&r1=591205&r2=591206&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/parent/pom.xml (original)
+++ incubator/cxf/branches/2.0.x-fixes/parent/pom.xml Thu Nov 1 20:11:01 2007
@@ -597,6 +597,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.1</version>
+ </dependency>
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1</version>
Modified: incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstService.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstService.java?rev=591206&r1=591205&r2=591206&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstService.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstService.java Thu Nov 1 20:11:01 2007
@@ -81,7 +81,7 @@
List<Foo[]> listObjectArrayOutput();
@WebMethod
- int throwException(int i) throws ServiceTestFault;
+ int throwException(int i) throws ServiceTestFault, CustomException;
@RequestWrapper(localName = "echoIntX")
@ResponseWrapper(localName = "echoIntXResponse")
Modified: incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java?rev=591206&r1=591205&r2=591206&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/jaxws/DocLitWrappedCodeFirstServiceImpl.java Thu Nov 1 20:11:01 2007
@@ -118,11 +118,15 @@
return Arrays.asList(new Foo[] {a, b}, new Foo[] {c, d});
}
- public int throwException(int i) throws ServiceTestFault {
- if (i == -1) {
+ public int throwException(int i) throws ServiceTestFault, CustomException {
+ switch (i) {
+ case -1:
throw new ServiceTestFault("Hello!");
+ case -2:
+ throw new CustomException("CE: " + i);
+ default:
+ throw new ServiceTestFault(new ServiceTestFault.ServiceTestDetails(i));
}
- throw new ServiceTestFault(new ServiceTestFault.ServiceTestDetails(i));
}
public String echo(String msg) {
Modified: incubator/cxf/branches/2.0.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java?rev=591206&r1=591205&r2=591206&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/tools/validator/src/main/java/org/apache/cxf/tools/validator/internal/WSIBPValidator.java Thu Nov 1 20:11:01 2007
@@ -248,9 +248,9 @@
BindingOperation bop = wsdlHelper.getBindingOperation(def, operation.getName());
Binding binding = wsdlHelper.getBinding(bop, def);
String bindingStyle = binding != null ? SOAPBindingUtil.getBindingStyle(binding) : "";
- String style = "".equals(SOAPBindingUtil.getSOAPOperationStyle(bop))
+ String style = StringUtils.isEmpty(SOAPBindingUtil.getSOAPOperationStyle(bop))
? bindingStyle : SOAPBindingUtil.getSOAPOperationStyle(bop);
- if ("DOCUMENT".equalsIgnoreCase(style) || "".equals(style)) {
+ if ("DOCUMENT".equalsIgnoreCase(style) || StringUtils.isEmpty(style)) {
boolean passed = checkR2201Input(operation, bop)
&& checkR2201Output(operation, bop)
&& checkR2716(bop);
@@ -258,6 +258,7 @@
return false;
}
} else {
+ System.out.println("Style: " + style);
if (!checkR2717AndR2726(bop)) {
return false;
}