You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by pe...@apache.org on 2007/03/30 23:15:55 UTC
svn commit: r524274 - in /incubator/cxf/trunk:
api/src/main/java/org/apache/cxf/phase/
common/common/src/main/java/org/apache/cxf/staxutils/
rt/core/src/main/java/org/apache/cxf/endpoint/
rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/jav...
Author: peterjones
Date: Fri Mar 30 14:15:53 2007
New Revision: 524274
URL: http://svn.apache.org/viewvc?view=rev&rev=524274
Log:
Minor test fix for ibmjdk.
Corrected couple of typos.
Modified:
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java
incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java
incubator/cxf/trunk/rt/frontend/simple/pom.xml
incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java
incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessorTest.java
Modified: incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java?view=diff&rev=524274&r1=524273&r2=524274
==============================================================================
--- incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java (original)
+++ incubator/cxf/trunk/api/src/main/java/org/apache/cxf/phase/PhaseInterceptorChain.java Fri Mar 30 14:15:53 2007
@@ -40,13 +40,13 @@
import org.apache.cxf.transport.MessageObserver;
/**
- * A PhaseInterceptorChain orders Interceptors according to the phase the
- * particpate in and also according to the before & after properties on an
+ * A PhaseInterceptorChain orders Interceptors according to the phase they
+ * participate in and also according to the before & after properties on an
* Interceptor.
* <p>
* A List of phases is supplied to the PhaseInterceptorChain in the constructor.
- * Interceptors that are added to the chain are ordered by phase. Within that
- * phases interceptors can order themselves. Each PhaseInterceptor has an ID.
+ * Interceptors that are added to the chain are ordered by phase. Within a
+ * phase, interceptors can order themselves. Each PhaseInterceptor has an ID.
* PhaseInterceptors can supply a Collection of IDs which they should run before
* or after, supplying fine grained ordering.
* <p>
Modified: incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java?view=diff&rev=524274&r1=524273&r2=524274
==============================================================================
--- incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java (original)
+++ incubator/cxf/trunk/common/common/src/main/java/org/apache/cxf/staxutils/StaxUtils.java Fri Mar 30 14:15:53 2007
@@ -374,7 +374,7 @@
/**
* Writes an Element to an XMLStreamWriter. The writer must already have
- * started the doucment (via writeStartDocument()). Also, this probably
+ * started the document (via writeStartDocument()). Also, this probably
* won't work with just a fragment of a document. The Element should be the
* root element of the document.
*
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java?view=diff&rev=524274&r1=524273&r2=524274
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/EndpointImpl.java Fri Mar 30 14:15:53 2007
@@ -27,6 +27,7 @@
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
+import org.apache.cxf.BusFactory;
import org.apache.cxf.binding.Binding;
import org.apache.cxf.binding.BindingFactory;
import org.apache.cxf.binding.BindingFactoryManager;
@@ -66,7 +67,11 @@
throw new NullPointerException("EndpointInfo can not be null!");
}
- this.bus = bus;
+ if (bus == null) {
+ this.bus = BusFactory.getDefaultBus();
+ } else {
+ this.bus = bus;
+ }
service = s;
endpointInfo = ei;
Modified: incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java?view=diff&rev=524274&r1=524273&r2=524274
==============================================================================
--- incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java (original)
+++ incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/endpoint/ServerImpl.java Fri Mar 30 14:15:53 2007
@@ -102,7 +102,7 @@
public void start() {
getDestination().setMessageObserver(messageObserver);
- //regist the active server to run
+ // register the active server to run
if (null != serverRegistry) {
LOG.fine("register the server to serverRegistry ");
serverRegistry.register(this);
Modified: incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java?view=diff&rev=524274&r1=524273&r2=524274
==============================================================================
--- incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java (original)
+++ incubator/cxf/trunk/rt/databinding/aegis/src/test/java/org/apache/cxf/aegis/type/java5/AnnotatedTypeTest.java Fri Mar 30 14:15:53 2007
@@ -29,6 +29,7 @@
import org.apache.cxf.aegis.type.TypeMapping;
import org.apache.cxf.aegis.type.XMLTypeCreator;
import org.apache.cxf.aegis.type.basic.BeanType;
+import org.apache.cxf.aegis.type.basic.StringType;
import org.apache.cxf.aegis.util.XmlConstants;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.service.Service;
@@ -63,12 +64,27 @@
QName element = (QName)elements.next();
assertTrue(elements.hasNext());
+ Type custom = info.getType(element);
+
+ if ("bogusProperty".equals(element.getLocalPart())) {
+ assertTrue(custom instanceof StringType);
+ } else if ("elementProperty".equals(element.getLocalPart())) {
+ assertTrue(custom instanceof CustomStringType);
+ } else {
+ fail("Unexpected element name: " + element.getLocalPart());
+ }
element = (QName)elements.next();
assertFalse(elements.hasNext());
- Type custom = info.getType(element);
+ custom = info.getType(element);
- assertTrue(custom instanceof CustomStringType);
+ if ("bogusProperty".equals(element.getLocalPart())) {
+ assertTrue(custom instanceof StringType);
+ } else if ("elementProperty".equals(element.getLocalPart())) {
+ assertTrue(custom instanceof CustomStringType);
+ } else {
+ fail("Unexpected element name: " + element.getLocalPart());
+ }
Iterator atts = info.getAttributes();
assertTrue(atts.hasNext());
Modified: incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java?view=diff&rev=524274&r1=524273&r2=524274
==============================================================================
--- incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java (original)
+++ incubator/cxf/trunk/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsImplementorInfo.java Fri Mar 30 14:15:53 2007
@@ -239,7 +239,7 @@
}
public Class<?> getProviderParameterType() {
- //The Provider Implementor inherits out of Provier<T>
+ // The Provider Implementor inherits out of Provider<T>
Type intfTypes[] = implementorClass.getGenericInterfaces();
for (Type t : intfTypes) {
Class<?> clazz = JAXBEncoderDecoder.getClassFromType(t);
Modified: incubator/cxf/trunk/rt/frontend/simple/pom.xml
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/pom.xml?view=diff&rev=524274&r1=524273&r2=524274
==============================================================================
--- incubator/cxf/trunk/rt/frontend/simple/pom.xml (original)
+++ incubator/cxf/trunk/rt/frontend/simple/pom.xml Fri Mar 30 14:15:53 2007
@@ -80,10 +80,6 @@
<groupId>javax.xml.soap</groupId>
<artifactId>saaj-api</artifactId>
</dependency>
- <dependency>
- <groupId>javax.xml.soap</groupId>
- <artifactId>saaj-api</artifactId>
- </dependency>
</dependencies>
Modified: incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java?view=diff&rev=524274&r1=524273&r2=524274
==============================================================================
--- incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java (original)
+++ incubator/cxf/trunk/rt/frontend/simple/src/main/java/org/apache/cxf/frontend/ServerFactoryBean.java Fri Mar 30 14:15:53 2007
@@ -148,7 +148,7 @@
/**
* Set the backing service bean. If this is set a BeanInvoker is created for
- * the provide bean.
+ * the provided bean.
*
* @return
*/
@@ -156,4 +156,4 @@
this.serviceBean = serviceBean;
}
-}
\ No newline at end of file
+}
Modified: incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessorTest.java
URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessorTest.java?view=diff&rev=524274&r1=524273&r2=524274
==============================================================================
--- incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessorTest.java (original)
+++ incubator/cxf/trunk/tools/javato/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToWSDLProcessorTest.java Fri Mar 30 14:15:53 2007
@@ -401,15 +401,33 @@
root,
XPathConstants.NODE));
- assertNotNull(xpather.getValue("//wsdl:output[@name='inoutHeaderResponse']"
- + "//soap:header[@message='tns:inoutHeaderResponse']",
+ // The generated namespace prefix of the message attribute
+ // can differ between the ibm and sun jdks, so only check
+ // the local name part.
+ Object obj = xpather.getValue("//wsdl:output[@name='inoutHeaderResponse']"
+ + "//soap:header[@message]",
root,
- XPathConstants.NODE));
- assertNotNull(xpather.getValue("//wsdl:output[@name='outHeaderResponse']"
- + "//soap:header[@message='tns:outHeaderResponse']",
+ XPathConstants.NODE);
+ assertNotNull(obj);
+ if (obj instanceof org.w3c.dom.Element) {
+ org.w3c.dom.Attr attr = ((org.w3c.dom.Element)obj).getAttributeNode("message");
+ assertNotNull(attr);
+ assertTrue("Failed to find output message", attr.getValue().endsWith(":inoutHeaderResponse"));
+ } else {
+ fail("Expected Element type");
+ }
+ obj = xpather.getValue("//wsdl:output[@name='outHeaderResponse']"
+ + "//soap:header[@message]",
root,
- XPathConstants.NODE));
-
+ XPathConstants.NODE);
+ assertNotNull(obj);
+ if (obj instanceof org.w3c.dom.Element) {
+ org.w3c.dom.Attr attr = ((org.w3c.dom.Element)obj).getAttributeNode("message");
+ assertNotNull(attr);
+ assertTrue("Failed to find output message", attr.getValue().endsWith(":outHeaderResponse"));
+ } else {
+ fail("Expected Element type");
+ }
} catch (Exception e) {
e.printStackTrace();
fail("Should not happen other exception " + e.getMessage());