You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by pr...@apache.org on 2008/01/27 12:17:40 UTC
svn commit: r615575 - in /webservices/axis2/branches/java/jaxws21/modules:
jaxws/src/org/apache/axis2/datasource/jaxb/
jaxws/src/org/apache/axis2/jaxws/client/async/
jaxws/test/org/apache/axis2/jaxws/client/dispatch/
jaxws/test/org/apache/axis2/jaxws/c...
Author: pradine
Date: Sun Jan 27 03:17:34 2008
New Revision: 615575
URL: http://svn.apache.org/viewvc?rev=615575&view=rev
Log:
Sync with trunk to revision 615471.
Added:
webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/client/dispatch/DispatchMTOMFeatureTest.java
- copied unchanged from r615431, webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/client/dispatch/DispatchMTOMFeatureTest.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/client/proxy/
- copied from r615431, webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/client/proxy/
webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/client/proxy/ProxyMTOMFeatureTest.java
- copied unchanged from r615431, webservices/axis2/trunk/java/modules/jaxws/test/org/apache/axis2/jaxws/client/proxy/ProxyMTOMFeatureTest.java
Modified:
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBXMLStreamWriterFilter.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/client/async/CallbackFuture.java
webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/client/dispatch/InvocationControllerTest.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/Utils.java
webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java
webservices/axis2/branches/java/jaxws21/modules/parent/pom.xml
Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBXMLStreamWriterFilter.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBXMLStreamWriterFilter.java?rev=615575&r1=615574&r2=615575&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBXMLStreamWriterFilter.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBXMLStreamWriterFilter.java Sun Jan 27 03:17:34 2008
@@ -70,8 +70,10 @@
if (numDefaultNS > 1) {
// Sometimes JAXB writes out the default namespace twice
// This seems to be related to writing out xmlns...see below
- log.info(" WHY IS THE DEFAULT NAMESPACE WRITTEN TWICE?");
- log.info(JavaUtils.stackToString());
+ if (log.isDebugEnabled()) {
+ log.debug(" WHY IS THE DEFAULT NAMESPACE WRITTEN TWICE?");
+ log.debug(JavaUtils.stackToString());
+ }
return;
}
}
@@ -172,8 +174,10 @@
}
if ("xmlns".equals(prefix)) {
// Sometimes JAXB writes out the XMLNS attribute...need to find out why
- log.info(" INVALID XMLNS attribute is removed prefix=");
- log.info(JavaUtils.stackToString());
+ if (log.isDebugEnabled()) {
+ log.debug(" INVALID XMLNS attribute is removed prefix=");
+ log.debug(JavaUtils.stackToString());
+ }
return;
}
Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/client/async/CallbackFuture.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/client/async/CallbackFuture.java?rev=615575&r1=615574&r2=615575&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/client/async/CallbackFuture.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/src/org/apache/axis2/jaxws/client/async/CallbackFuture.java Sun Jan 27 03:17:34 2008
@@ -203,7 +203,7 @@
} else {
if (log.isDebugEnabled()) {
- log.info(
+ log.debug(
"Executor task was not sumbitted as Async Future task was cancelled by clients");
}
}
Modified: webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/client/dispatch/InvocationControllerTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/client/dispatch/InvocationControllerTest.java?rev=615575&r1=615574&r2=615575&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/client/dispatch/InvocationControllerTest.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/jaxws/test/org/apache/axis2/jaxws/client/dispatch/InvocationControllerTest.java Sun Jan 27 03:17:34 2008
@@ -4,6 +4,7 @@
import org.apache.axis2.jaxws.core.controller.InvocationController;
import org.apache.axis2.jaxws.core.controller.InvocationControllerFactory;
import org.apache.axis2.jaxws.core.controller.impl.AxisInvocationController;
+import org.apache.axis2.jaxws.core.controller.impl.InvocationControllerFactoryImpl;
import org.apache.axis2.jaxws.registry.FactoryRegistry;
import javax.xml.namespace.QName;
@@ -43,6 +44,9 @@
Dispatch d = svc.createDispatch(portQname, Source.class, Service.Mode.PAYLOAD);
BaseDispatch bd = (BaseDispatch) d;
+
+ // Set it back to the default so we don't break other tests.
+ FactoryRegistry.setFactory(InvocationControllerFactory.class, new InvocationControllerFactoryImpl());
assertTrue("An InvocationController instance was not created", bd.ic != null);
assertTrue("The default InvocationController type was incorrect.",
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java?rev=615575&r1=615574&r2=615575&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/deployment/util/Utils.java Sun Jan 27 03:17:34 2008
@@ -182,7 +182,7 @@
f = File.createTempFile("axis2", suffix, tmpDir);
}
if (log.isDebugEnabled()) {
- log.info("Created temporary file : " + f.getAbsolutePath());
+ log.debug("Created temporary file : " + f.getAbsolutePath());
}
f.deleteOnExit();
FileOutputStream out = new FileOutputStream(f);
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java?rev=615575&r1=615574&r2=615575&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/description/WSDL11ToAxisServiceBuilder.java Sun Jan 27 03:17:34 2008
@@ -18,12 +18,7 @@
*/
package org.apache.axis2.description;
-import com.ibm.wsdl.util.xml.DOM2Writer;
-
-import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
-import org.apache.axiom.om.util.StAXUtils;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axis2.AxisFault;
@@ -95,22 +90,21 @@
import javax.wsdl.xml.WSDLReader;
import javax.xml.namespace.QName;
import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamWriter;
-import javax.xml.transform.Result;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.Vector;
+
+import com.ibm.wsdl.util.xml.DOM2Writer;
public class WSDL11ToAxisServiceBuilder extends WSDLToAxisServiceBuilder {
@@ -1818,7 +1812,14 @@
List partsList = null;
ExtensibilityElement extElement;
for (Iterator iter = extensibilityElements.iterator(); iter.hasNext();) {
+
+
extElement = (ExtensibilityElement) iter.next();
+
+ if (log.isDebugEnabled()) {
+ log.debug("Extensibility Element type is:" + extElement.getElementType());
+ log.debug("Extensibility Element class is:" + extElement.getClass().getName());
+ }
// SOAP 1.1 body element found!
if (extElement instanceof SOAPBody) {
SOAPBody soapBody = (SOAPBody) extElement;
@@ -1851,7 +1852,7 @@
}
}
}
- }
+ }
}
if (partsList == null) {
log.debug("SOAP body parts have not been set. All the parts in the message were added to the message.");
Modified: webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/Utils.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/Utils.java?rev=615575&r1=615574&r2=615575&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/Utils.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/kernel/src/org/apache/axis2/util/Utils.java Sun Jan 27 03:17:34 2008
@@ -218,7 +218,9 @@
}
}
} else {
- log.info("Unable to parse request URL [" + path + "][" + servicePath + "]");
+ if (log.isDebugEnabled()) {
+ log.debug("Unable to parse request URL [" + path + "][" + servicePath + "]");
+ }
}
return values;
Modified: webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java?rev=615575&r1=615574&r2=615575&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java (original)
+++ webservices/axis2/branches/java/jaxws21/modules/metadata/src/org/apache/axis2/jaxws/description/impl/EndpointDescriptionImpl.java Sun Jan 27 03:17:34 2008
@@ -18,45 +18,10 @@
*/
package org.apache.axis2.jaxws.description.impl;
-import java.io.InputStream;
-import java.lang.annotation.Annotation;
-import java.net.URL;
-import java.security.PrivilegedAction;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeSet;
-
-import javax.jws.HandlerChain;
-import javax.jws.WebService;
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.http.HTTPBinding;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.wsdl.extensions.soap12.SOAP12Address;
-import javax.wsdl.extensions.soap12.SOAP12Binding;
-import javax.xml.namespace.QName;
-import javax.xml.ws.BindingType;
-import javax.xml.ws.RespectBindingFeature;
-import javax.xml.ws.Service;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.WebServiceProvider;
-import javax.xml.ws.handler.PortInfo;
-import javax.xml.ws.soap.AddressingFeature;
-import javax.xml.ws.soap.MTOM;
-import javax.xml.ws.soap.MTOMFeature;
-import javax.xml.ws.soap.SOAPBinding;
-import javax.xml.ws.spi.WebServiceFeatureAnnotation;
-
import org.apache.axis2.AxisFault;
import org.apache.axis2.Constants.Configuration;
import org.apache.axis2.client.ServiceClient;
import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.deployment.DeploymentException;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.description.OutInAxisOperation;
import org.apache.axis2.description.OutOnlyAxisOperation;
@@ -90,6 +55,38 @@
import org.apache.axis2.wsdl.util.WSDLDefinitionWrapper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
+import javax.jws.HandlerChain;
+import javax.jws.WebService;
+import javax.wsdl.Binding;
+import javax.wsdl.Definition;
+import javax.wsdl.Port;
+import javax.wsdl.extensions.ExtensibilityElement;
+import javax.wsdl.extensions.http.HTTPBinding;
+import javax.wsdl.extensions.soap.SOAPAddress;
+import javax.wsdl.extensions.soap12.SOAP12Address;
+import javax.wsdl.extensions.soap12.SOAP12Binding;
+import javax.xml.namespace.QName;
+import javax.xml.ws.BindingType;
+import javax.xml.ws.RespectBindingFeature;
+import javax.xml.ws.Service;
+import javax.xml.ws.ServiceMode;
+import javax.xml.ws.WebServiceProvider;
+import javax.xml.ws.handler.PortInfo;
+import javax.xml.ws.soap.AddressingFeature;
+import javax.xml.ws.soap.MTOMFeature;
+import javax.xml.ws.soap.SOAPBinding;
+
+import java.io.InputStream;
+import java.lang.annotation.Annotation;
+import java.net.URL;
+import java.security.PrivilegedAction;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeSet;
/** @see ../EndpointDescription */
/*
Modified: webservices/axis2/branches/java/jaxws21/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/branches/java/jaxws21/modules/parent/pom.xml?rev=615575&r1=615574&r2=615575&view=diff
==============================================================================
--- webservices/axis2/branches/java/jaxws21/modules/parent/pom.xml (original)
+++ webservices/axis2/branches/java/jaxws21/modules/parent/pom.xml Sun Jan 27 03:17:34 2008
@@ -142,6 +142,9 @@
<xml_apis.version>1.3.03</xml_apis.version>
<xmlschema.version>SNAPSHOT</xmlschema.version>
<xmlunit.version>1.0</xmlunit.version>
+
+ <!-- The build failing if tests are skipped is very annoying -->
+ <failIfNoTests>false</failIfNoTests>
</properties>
<mailingLists>
<mailingList>
@@ -184,6 +187,7 @@
<id>azeez</id>
<email>azeez AT wso2.com</email>
<organization>WSO2</organization>
+ <url>http://www.apache.org/~azeez</url>
</developer>
<developer>
<name>Jeff Barrett</name>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org