svn commit: r1103301 - in /axis/axis2/java/core/trunk/modules: kernel/test/org/apache/axis2/client/ServiceClientTest.java parent/pom.xml
Author: veithen
Date: Sun May 15 09:41:45 2011
New Revision: 1103301
URL: http://svn.apache.org/viewvc?rev=1103301&view=rev
Log:
AXIS2-4353: XmlSchema 1.4.8-SNAPSHOT now correctly resolves imports relative to
JAR style URLs. Finalized and enabled the test case.
Modified:
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/client/ServiceClientTest.java
axis/axis2/java/core/trunk/modules/parent/pom.xml
Modified:
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/client/ServiceClientTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/client/ServiceClientTest.java?rev=1103301&r1=1103300&r2=1103301&view=diff
==
---
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/client/ServiceClientTest.java
(original)
+++
axis/axis2/java/core/trunk/modules/kernel/test/org/apache/axis2/client/ServiceClientTest.java
Sun May 15 09:41:45 2011
@@ -20,15 +20,17 @@ package org.apache.axis2.client;
import java.io.File;
import java.net.URL;
+import java.util.List;
import javax.xml.namespace.QName;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.ConfigurationContextFactory;
-import org.junit.Ignore;
+import org.apache.ws.commons.schema.XmlSchema;
+import org.junit.Assert;
import org.junit.Test;
-public class ServiceClientTest {
+public class ServiceClientTest extends Assert {
/**
* Tests that imported schemas are correctly resolved if the WSDL is
loaded from a ZIP file.
* This is a regression test for AXIS2-4353 and checks that WSDLs (with
imports) can be loaded
@@ -36,7 +38,7 @@ public class ServiceClientTest {
*
* @throws Exception
*/
-@Test @Ignore
+@Test
public void testWSDLWithImportsFromZIP() throws Exception {
ConfigurationContext configContext =
ConfigurationContextFactory.createEmptyConfigurationContext();
String basedir = System.getProperty("basedir");
@@ -45,6 +47,10 @@ public class ServiceClientTest {
}
URL zipUrl = new File(basedir, "target/test-zip.zip").toURL();
URL wsdlUrl = new URL("jar:" + zipUrl + "!/test.wsdl");
-new ServiceClient(configContext, wsdlUrl, new QName("urn:test",
"EchoService"), "EchoPort");
+ServiceClient serviceClient = new ServiceClient(configContext,
wsdlUrl, new QName("urn:test", "EchoService"), "EchoPort");
+List schemas = serviceClient.getAxisService().getSchema();
+assertEquals(1, schemas.size());
+XmlSchema schema = schemas.get(0);
+assertNotNull(schema.getTypeByName(new QName("urn:test",
"echoResponse")));
}
}
Modified: axis/axis2/java/core/trunk/modules/parent/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/parent/pom.xml?rev=1103301&r1=1103300&r2=1103301&view=diff
==
--- axis/axis2/java/core/trunk/modules/parent/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/parent/pom.xml Sun May 15 09:41:45 2011
@@ -70,9 +70,9 @@
1.2.12-SNAPSHOT
3.0.1-SNAPSHOT
1.0-SNAPSHOT
+1.4.8-SNAPSHOT
-1.4.7
1.7.0
2.7.7
2.4.0
svn commit: r1103312 - in /axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local: LocalResponder.java LocalTransportReceiver.java LocalTransportSender.java
Author: sagara
Date: Sun May 15 10:46:20 2011
New Revision: 1103312
URL: http://svn.apache.org/viewvc?rev=1103312&view=rev
Log:
Temperately revert changes from Heshan for 1.6.0 release.
Modified:
axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java
axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportSender.java
Modified:
axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java?rev=1103312&r1=1103311&r2=1103312&view=diff
==
---
axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java
Sun May 15 10:46:20 2011
@@ -20,40 +20,32 @@
package org.apache.axis2.transport.local;
-import org.apache.axiom.om.OMXMLParserWrapper;
-import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axis2.AxisFault;
-import org.apache.axis2.Constants;
import org.apache.axis2.addressing.EndpointReference;
-import org.apache.axis2.addressing.RelatesTo;
-import org.apache.axis2.builder.BuilderUtil;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
import org.apache.axis2.description.TransportOutDescription;
-import org.apache.axis2.description.WSDL2Constants;
-import org.apache.axis2.engine.AxisEngine;
import org.apache.axis2.handlers.AbstractHandler;
import org.apache.axis2.transport.TransportSender;
import org.apache.axis2.transport.TransportUtils;
-import org.apache.axis2.wsdl.WSDLConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import javax.xml.stream.XMLStreamException;
-import java.io.*;
-import java.util.Map;
+import java.io.ByteArrayOutputStream;
+import java.io.OutputStream;
/**
* LocalResponder
*/
public class LocalResponder extends AbstractHandler implements TransportSender
{
protected static final Log log = LogFactory.getLog(LocalResponder.class);
-
+
+
// fixed for Executing LocalTransport in MulthThread.
private OutputStream out;
public LocalResponder(OutputStream response) {
-this.out = response;
+this.out = response;
}
public void init(ConfigurationContext confContext, TransportOutDescription
transportOut)
@@ -95,38 +87,13 @@ public class LocalResponder extends Abst
TransportUtils.writeMessage(msgContext, out);
}
} else {
-if (/*(msgContext != null) &&*/
(msgContext.getOperationContext() != null) &&
-(msgContext.getOperationContext().getMessageContexts()
!= null)) {
-MessageContext proxyInMessageContext = msgContext.
-
getOperationContext().getMessageContext(WSDL2Constants.MESSAGE_LABEL_IN);
-
-if (proxyInMessageContext != null) {
-MessageContext initialMessageContext =
(MessageContext) proxyInMessageContext.
-
getProperty(LocalTransportReceiver.IN_MESSAGE_CONTEXT);
-
-if (initialMessageContext != null) {
-handleResponse(msgContext, initialMessageContext);
-} else {
-out = (OutputStream)
msgContext.getProperty(MessageContext.TRANSPORT_OUT);
-
-if (out != null) {
-TransportUtils.writeMessage(msgContext, out);
-} else {
-throw new AxisFault(
-"Both the TO and Property
MessageContext.TRANSPORT_OUT is Null, No where to send");
-}
+out = (OutputStream)
msgContext.getProperty(MessageContext.TRANSPORT_OUT);
-}
-}
+if (out != null) {
+TransportUtils.writeMessage(msgContext, out);
} else {
-out = (OutputStream)
msgContext.getProperty(MessageContext.TRANSPORT_OUT);
-
-if (out != null) {
-TransportUtils.writeMessage(msgContext, out);
-} else {
-throw new AxisFault(
-"Both the TO and Property
MessageContext.TRANSPORT_OUT is Null, No where to send");
-
svn commit: r1103313 - /axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/NonBlockingLocalTransportSender.java
Author: sagara Date: Sun May 15 10:51:02 2011 New Revision: 1103313 URL: http://svn.apache.org/viewvc?rev=1103313&view=rev Log: Temperately revert changes from Heshan for 1.6.0 release. Removed: axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/NonBlockingLocalTransportSender.java
svn commit: r1103336 - in /axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws: BindingProvider.java context/WebServiceContextImpl.java
Author: veithen
Date: Sun May 15 12:20:32 2011
New Revision: 1103336
URL: http://svn.apache.org/viewvc?rev=1103336&view=rev
Log:
AXIS2-5021: Committed patch provided by Ivan (xuhaihong).
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/BindingProvider.java
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/context/WebServiceContextImpl.java
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/BindingProvider.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/BindingProvider.java?rev=1103336&r1=1103335&r2=1103336&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/BindingProvider.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/BindingProvider.java
Sun May 15 12:20:32 2011
@@ -408,7 +408,7 @@ public class BindingProvider implements
address = endpointDesc.getEndpointAddress();
QName service = endpointDesc.getServiceQName();
QName port = endpointDesc.getPortQName();
-String wsdlLocation = "/?wsdl"; // let the webcontainer
redirect us to the real WSDL URL; it knows where it is
+String wsdlLocation = "?wsdl"; // let the webcontainer
redirect us to the real WSDL URL; it knows where it is
epr =
EndpointReferenceUtils.createAxis2EndpointReference(address, service, port,
wsdlLocation, addressingNamespace);
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/context/WebServiceContextImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/context/WebServiceContextImpl.java?rev=1103336&r1=1103335&r2=1103336&view=diff
==
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/context/WebServiceContextImpl.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/context/WebServiceContextImpl.java
Sun May 15 12:20:32 2011
@@ -143,7 +143,7 @@ public class WebServiceContextImpl imple
if (soapMessageContext != null) {
QName service = (QName)
soapMessageContext.get(MessageContext.WSDL_SERVICE);
QName endpoint = (QName)
soapMessageContext.get(MessageContext.WSDL_PORT);
-String wsdlLocation = "/?wsdl"; // let the webcontainer redirect
us to the real WSDL URL; it knows where it is
+String wsdlLocation = "?wsdl"; // let the webcontainer redirect
us to the real WSDL URL; it knows where it is
org.apache.axis2.addressing.EndpointReference axis2EPR =
EndpointReferenceUtils.createAxis2EndpointReference(null,
service, endpoint, wsdlLocation, addressingNamespace);
svn commit: r1103399 - /axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
Author: veithen
Date: Sun May 15 14:34:37 2011
New Revision: 1103399
URL: http://svn.apache.org/viewvc?rev=1103399&view=rev
Log:
Cleanly rolled back the changes in the local transport to the version before
2011-05-10 (so that we can later reapply them properly by merging from the
branch):
$ svn merge -c -1103313,-1103312,-1101884,-1101493,-1101488,-1101328 . .
--- Reverse-merging r1103313 into '.':
A
modules/transport/local/src/org/apache/axis2/transport/local/NonBlockingLocalTransportSender.java
--- Reverse-merging r1103312 into '.':
U
modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportSender.java
U
modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java
U
modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
--- Reverse-merging r1101884 into '.':
D
modules/transport/local/src/org/apache/axis2/transport/local/NonBlockingLocalTransportSender.java
--- Reverse-merging r1101493 into '.':
G
modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportSender.java
G
modules/transport/local/src/org/apache/axis2/transport/local/LocalResponder.java
G
modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
--- Reverse-merging r1101488 into '.':
U
modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
--- Reverse-merging r1101328 into '.':
G
modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
Modified:
axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
Modified:
axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java?rev=1103399&r1=1103398&r2=1103399&view=diff
==
---
axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
(original)
+++
axis/axis2/java/core/branches/1_6/modules/transport/local/src/org/apache/axis2/transport/local/LocalTransportReceiver.java
Sun May 15 14:34:37 2011
@@ -28,11 +28,9 @@ import org.apache.axis2.addressing.Endpo
import org.apache.axis2.builder.BuilderUtil;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.context.SessionContext;
import org.apache.axis2.description.TransportInDescription;
import org.apache.axis2.description.TransportOutDescription;
import org.apache.axis2.engine.AxisEngine;
-import org.apache.axis2.transport.TransportListener;
import org.apache.axis2.transport.http.HTTPConstants;
import org.apache.axis2.util.MessageContextBuilder;
@@ -106,11 +104,6 @@ public class LocalTransportReceiver {
msgCtx.setTransportOut(localTransportResOut);
msgCtx.setProperty(MessageContext.TRANSPORT_OUT, response);
-Object headers =
inMessageContext.getProperty(MessageContext.TRANSPORT_HEADERS);
-if (headers != null) {
-msgCtx.setProperty(MessageContext.TRANSPORT_HEADERS, headers);
-}
-
msgCtx.setTo(to);
msgCtx.setWSAAction(action);
msgCtx.setServerSide(true);
@@ -142,28 +135,4 @@ public class LocalTransportReceiver {
}
}
}
-
-public void init(ConfigurationContext axisConf, TransportInDescription
transprtIn) throws AxisFault {
-}
-
-public void start() throws AxisFault {
-}
-
-public void stop() throws AxisFault {
-}
-
-public EndpointReference getEPRForService(String serviceName, String ip)
throws AxisFault {
-return null;
-}
-
-public EndpointReference[] getEPRsForService(String serviceName, String
ip) throws AxisFault {
-return new EndpointReference[0];
-}
-
-public SessionContext getSessionContext(MessageContext messageContext) {
-return null;
-}
-
-public void destroy() {
-}
}
svn commit: r1103606 - /axis/axis2/java/core/trunk/pom.xml
Author: sagara Date: Mon May 16 04:37:21 2011 New Revision: 1103606 URL: http://svn.apache.org/viewvc?rev=1103606&view=rev Log: Added my details as a developer. Modified: axis/axis2/java/core/trunk/pom.xml Modified: axis/axis2/java/core/trunk/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/pom.xml?rev=1103606&r1=1103605&r2=1103606&view=diff == --- axis/axis2/java/core/trunk/pom.xml (original) +++ axis/axis2/java/core/trunk/pom.xml Mon May 16 04:37:21 2011 @@ -494,6 +494,12 @@ ruwan AT apache.org http://www.linkedin.com/in/ruwanlinton + +Sagara Gunathunga +sagara +sagara AT apache.org +WSO2 +
svn commit: r1103607 - /axis/axis2/java/core/branches/1_6/pom.xml
Author: sagara Date: Mon May 16 04:38:50 2011 New Revision: 1103607 URL: http://svn.apache.org/viewvc?rev=1103607&view=rev Log: Added my details as a developer. Modified: axis/axis2/java/core/branches/1_6/pom.xml Modified: axis/axis2/java/core/branches/1_6/pom.xml URL: http://svn.apache.org/viewvc/axis/axis2/java/core/branches/1_6/pom.xml?rev=1103607&r1=1103606&r2=1103607&view=diff == --- axis/axis2/java/core/branches/1_6/pom.xml (original) +++ axis/axis2/java/core/branches/1_6/pom.xml Mon May 16 04:38:50 2011 @@ -494,6 +494,12 @@ ruwan AT apache.org http://www.linkedin.com/in/ruwanlinton + +Sagara Gunathunga +sagara +sagara AT apache.org +WSO2 +
