Author: sagara
Date: Wed Apr 18 11:22:34 2012
New Revision: 1327446
URL: http://svn.apache.org/viewvc?rev=1327446&view=rev
Log:
AXIS2-5292 - Fixed compilation issues and updated according to Axis2 and Axiom
APIs.
Modified:
axis/axis2/java/core/trunk/modules/rmi/pom.xml
axis/axis2/java/core/trunk/modules/rmi/src/org/apache/axis2/rmi/client/RMIClient.java
axis/axis2/java/core/trunk/modules/rmi/src/org/apache/axis2/rmi/databind/OMElementCreator.java
axis/axis2/java/core/trunk/modules/rmi/src/org/apache/axis2/rmi/databind/RMIDataSource.java
axis/axis2/java/core/trunk/modules/rmi/src/org/apache/axis2/rmi/deploy/RMIServiceDeployer.java
axis/axis2/java/core/trunk/modules/rmi/src/org/apache/axis2/rmi/receiver/RMIMessageReciever.java
axis/axis2/java/core/trunk/modules/rmi/test/org/apache/axis2/rmi/server/ServerTest.java
Modified: axis/axis2/java/core/trunk/modules/rmi/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/rmi/pom.xml?rev=1327446&r1=1327445&r2=1327446&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/rmi/pom.xml (original)
+++ axis/axis2/java/core/trunk/modules/rmi/pom.xml Wed Apr 18 11:22:34 2012
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-parent</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -54,6 +54,12 @@
<artifactId>axis2-adb</artifactId>
<version>${version}</version>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis2-transport-http</artifactId>
+ <version>${version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<sourceDirectory>src</sourceDirectory>
Modified:
axis/axis2/java/core/trunk/modules/rmi/src/org/apache/axis2/rmi/client/RMIClient.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/rmi/src/org/apache/axis2/rmi/client/RMIClient.java?rev=1327446&r1=1327445&r2=1327446&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/rmi/src/org/apache/axis2/rmi/client/RMIClient.java
(original)
+++
axis/axis2/java/core/trunk/modules/rmi/src/org/apache/axis2/rmi/client/RMIClient.java
Wed Apr 18 11:22:34 2012
@@ -23,12 +23,10 @@ import org.apache.axiom.om.OMAbstractFac
import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.impl.llom.OMSourcedElementImpl;
import org.apache.axis2.AxisFault;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.ServiceClient;
import org.apache.axis2.context.ConfigurationContext;
-import org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter;
import org.apache.axis2.description.AxisService;
import org.apache.axis2.rmi.Configurator;
import org.apache.axis2.rmi.databind.JavaObjectSerializer;
@@ -46,6 +44,8 @@ import org.apache.axis2.rmi.metadata.xml
import javax.wsdl.Definition;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+
import java.net.URL;
@@ -149,7 +149,7 @@ public class RMIClient extends ServiceCl
OMFactory omFactory) {
OMDataSource omDataSource = new RMIDataSource() {
- public void serialize(MTOMAwareXMLStreamWriter xmlWriter) throws
XMLStreamException {
+ public void serialize(XMLStreamWriter xmlWriter) throws
XMLStreamException {
try {
javaObjectSerializer.serializeInputElement(inputObjects,
operation.getInputElement(),
@@ -162,7 +162,7 @@ public class RMIClient extends ServiceCl
};
XmlElement inputXmlElement = operation.getInputElement();
QName inputElementQName = new QName(inputXmlElement.getNamespace(),
inputXmlElement.getName());
- return new OMSourcedElementImpl(inputElementQName, omFactory,
omDataSource);
+ return omFactory.createOMElement(omDataSource, inputElementQName);
}
}
Modified:
axis/axis2/java/core/trunk/modules/rmi/src/org/apache/axis2/rmi/databind/OMElementCreator.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/rmi/src/org/apache/axis2/rmi/databind/OMElementCreator.java?rev=1327446&r1=1327445&r2=1327446&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/rmi/src/org/apache/axis2/rmi/databind/OMElementCreator.java
(original)
+++
axis/axis2/java/core/trunk/modules/rmi/src/org/apache/axis2/rmi/databind/OMElementCreator.java
Wed Apr 18 11:22:34 2012
@@ -22,8 +22,6 @@ package org.apache.axis2.rmi.databind;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.llom.OMSourcedElementImpl;
-import org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter;
import org.apache.axis2.rmi.Configurator;
import org.apache.axis2.rmi.exception.MetaDataPopulateException;
import org.apache.axis2.rmi.exception.OMElementCreationException;
@@ -34,6 +32,8 @@ import org.apache.axis2.rmi.util.Namespa
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+
import java.util.HashMap;
import java.util.Map;
@@ -60,7 +60,7 @@ public class OMElementCreator {
OMDataSource omDataSource = new RMIDataSource() {
- public void serialize(MTOMAwareXMLStreamWriter xmlWriter)
throws XMLStreamException {
+ public void serialize(XMLStreamWriter xmlWriter) throws
XMLStreamException {
try {
javaObjectSerializer.serializeParameter(value,
parameter, xmlWriter, new NamespacePrefix());
} catch (XmlSerializingException e) {
@@ -70,7 +70,7 @@ public class OMElementCreator {
};
QName qname = new QName(parameter.getNamespace(),
parameter.getName());
- returnOMElement = new OMSourcedElementImpl(qname,
OMAbstractFactory.getOMFactory(), omDataSource);
+ returnOMElement =
OMAbstractFactory.getOMFactory().createOMElement(omDataSource, qname);
} catch (MetaDataPopulateException e) {
throw new OMElementCreationException("Problem in meta data
population", e);
Modified:
axis/axis2/java/core/trunk/modules/rmi/src/org/apache/axis2/rmi/databind/RMIDataSource.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/rmi/src/org/apache/axis2/rmi/databind/RMIDataSource.java?rev=1327446&r1=1327445&r2=1327446&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/rmi/src/org/apache/axis2/rmi/databind/RMIDataSource.java
(original)
+++
axis/axis2/java/core/trunk/modules/rmi/src/org/apache/axis2/rmi/databind/RMIDataSource.java
Wed Apr 18 11:22:34 2012
@@ -23,8 +23,7 @@ import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.om.util.StAXUtils;
import org.apache.axis2.databinding.utils.writer.MTOMAwareOMBuilder;
-import org.apache.axis2.databinding.utils.writer.MTOMAwareXMLSerializer;
-import org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter;
+
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
@@ -44,12 +43,7 @@ public abstract class RMIDataSource impl
public void serialize(Writer writer,
OMOutputFormat omOutputFormat) throws
XMLStreamException {
serialize(StAXUtils.createXMLStreamWriter(writer));
- }
-
- public void serialize(XMLStreamWriter xmlStreamWriter) throws
XMLStreamException {
- MTOMAwareXMLStreamWriter mtomAwareXMLStreamWriter = new
MTOMAwareXMLSerializer(xmlStreamWriter);
- serialize(mtomAwareXMLStreamWriter);
- }
+ }
public XMLStreamReader getReader() throws XMLStreamException {
// since only ADBBeans related to elements can be serialized
@@ -59,5 +53,5 @@ public abstract class RMIDataSource impl
return mtomAwareOMBuilder.getOMElement().getXMLStreamReader();
}
- public abstract void serialize(MTOMAwareXMLStreamWriter xmlWriter) throws
XMLStreamException;
+ public abstract void serialize(XMLStreamWriter xmlWriter) throws
XMLStreamException;
}
Modified:
axis/axis2/java/core/trunk/modules/rmi/src/org/apache/axis2/rmi/deploy/RMIServiceDeployer.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/rmi/src/org/apache/axis2/rmi/deploy/RMIServiceDeployer.java?rev=1327446&r1=1327445&r2=1327446&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/rmi/src/org/apache/axis2/rmi/deploy/RMIServiceDeployer.java
(original)
+++
axis/axis2/java/core/trunk/modules/rmi/src/org/apache/axis2/rmi/deploy/RMIServiceDeployer.java
Wed Apr 18 11:22:34 2012
@@ -25,6 +25,7 @@ import org.apache.axis2.Constants;
import org.apache.axis2.context.ConfigurationContext;
import org.apache.axis2.deployment.Deployer;
import org.apache.axis2.deployment.DeploymentException;
+import org.apache.axis2.deployment.AbstractDeployer;
import org.apache.axis2.deployment.repository.util.DeploymentFileData;
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.rmi.Configurator;
@@ -59,7 +60,7 @@ import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;
-public class RMIServiceDeployer implements Deployer {
+public class RMIServiceDeployer extends AbstractDeployer {
private static Log log = LogFactory.getLog(RMIServiceDeployer.class);
private ConfigurationContext configurationContext;
@@ -74,9 +75,10 @@ public class RMIServiceDeployer implemen
public void deploy(DeploymentFileData deploymentFileData) throws
DeploymentException {
boolean isDirectory = deploymentFileData.getFile().isDirectory();
try {
- deploymentFileData.setClassLoader(isDirectory,
-
this.axisConfiguration.getServiceClassLoader(),
-
(File)this.axisConfiguration.getParameterValue(Constants.Configuration.ARTIFACTS_TEMP_DIR));
+ deploymentFileData.setClassLoader(isDirectory,
this.axisConfiguration
+ .getServiceClassLoader(), (File) this.axisConfiguration
+
.getParameterValue(Constants.Configuration.ARTIFACTS_TEMP_DIR),
+
configurationContext.getAxisConfiguration().isChildFirstClassLoading());
ClassLoader deploymentClassLoader =
deploymentFileData.getClassLoader();
String absolutePath =
deploymentFileData.getFile().getAbsolutePath();
@@ -241,15 +243,11 @@ public class RMIServiceDeployer implemen
return new ByteArrayInputStream(byteArrayOutputStream.toByteArray());
}
- public void setDirectory(String directory) {
-
+ public void setDirectory(String arg0) {
}
- public void setExtension(String extension) {
-
+ public void setExtension(String arg0) {
}
- public void unDeploy(String fileName) throws DeploymentException {
- //TODO: implement undeploy
- }
+
}
Modified:
axis/axis2/java/core/trunk/modules/rmi/src/org/apache/axis2/rmi/receiver/RMIMessageReciever.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/rmi/src/org/apache/axis2/rmi/receiver/RMIMessageReciever.java?rev=1327446&r1=1327445&r2=1327446&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/rmi/src/org/apache/axis2/rmi/receiver/RMIMessageReciever.java
(original)
+++
axis/axis2/java/core/trunk/modules/rmi/src/org/apache/axis2/rmi/receiver/RMIMessageReciever.java
Wed Apr 18 11:22:34 2012
@@ -21,12 +21,10 @@ package org.apache.axis2.rmi.receiver;
import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.llom.OMSourcedElementImpl;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
-import org.apache.axis2.databinding.utils.writer.MTOMAwareXMLStreamWriter;
import org.apache.axis2.receivers.AbstractInOutMessageReceiver;
import org.apache.axis2.rmi.databind.JavaObjectSerializer;
import org.apache.axis2.rmi.databind.RMIDataSource;
@@ -42,6 +40,8 @@ import org.apache.axis2.rmi.util.Namespa
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -121,7 +121,7 @@ public class RMIMessageReciever extends
SOAPFactory soapFactory) {
OMDataSource omDataSource = new RMIDataSource() {
- public void serialize(MTOMAwareXMLStreamWriter xmlWriter) throws
XMLStreamException {
+ public void serialize(XMLStreamWriter xmlWriter) throws
XMLStreamException {
try {
javaObjectSerializer.serializeOutputElement(returnObject,
operation.getOutPutElement(),
@@ -134,7 +134,7 @@ public class RMIMessageReciever extends
};
XmlElement outXmlElement = operation.getOutPutElement();
QName outElementQName = new QName(outXmlElement.getNamespace(),
outXmlElement.getName());
- return new OMSourcedElementImpl(outElementQName, soapFactory,
omDataSource);
+ return soapFactory.createOMElement(omDataSource, outElementQName);
}
public OMElement getParameterOMElement(final Object exceptionObject,
@@ -143,7 +143,7 @@ public class RMIMessageReciever extends
SOAPFactory soapFactory){
OMDataSource omDataSource = new RMIDataSource(){
- public void serialize(MTOMAwareXMLStreamWriter xmlWriter) throws
XMLStreamException {
+ public void serialize(XMLStreamWriter xmlWriter) throws
XMLStreamException {
try {
javaObjectSerializer.serializeParameter(exceptionObject,parameter,xmlWriter,
new NamespacePrefix());
} catch (XmlSerializingException e) {
@@ -152,8 +152,8 @@ public class RMIMessageReciever extends
}
};
XmlElement exceptionElement = parameter.getElement();
- QName outElementQName = new QName(exceptionElement.getNamespace(),
exceptionElement.getName());
- OMElement omElement = new OMSourcedElementImpl(outElementQName,
soapFactory, omDataSource);
+ QName outElementQName = new QName(exceptionElement.getNamespace(),
exceptionElement.getName());
+ OMElement omElement = soapFactory.createOMElement(omDataSource,
outElementQName);
return omElement;
}
Modified:
axis/axis2/java/core/trunk/modules/rmi/test/org/apache/axis2/rmi/server/ServerTest.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/rmi/test/org/apache/axis2/rmi/server/ServerTest.java?rev=1327446&r1=1327445&r2=1327446&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/rmi/test/org/apache/axis2/rmi/server/ServerTest.java
(original)
+++
axis/axis2/java/core/trunk/modules/rmi/test/org/apache/axis2/rmi/server/ServerTest.java
Wed Apr 18 11:22:34 2012
@@ -28,7 +28,8 @@ import org.apache.axis2.rmi.exception.Sc
import org.apache.axis2.rmi.metadata.Service;
import org.apache.axis2.rmi.server.services.Service1;
import org.apache.axis2.rmi.wsdl.WSDL11DefinitionBuilder;
-import org.apache.axis2.transport.http.SimpleHTTPServer;
+import org.apache.axis2.transport.http.server.HttpFactory;
+import org.apache.axis2.transport.http.server.SimpleHttpServer;
import javax.wsdl.Definition;
import javax.wsdl.WSDLException;
@@ -52,9 +53,9 @@ public class ServerTest {
// Configurator configurator = new Configurator();
// ClassDeployer classDeployer = new ClassDeployer(confContext,
configurator);
// classDeployer.deployClass(Service2.class);
-
- SimpleHTTPServer simpleHttpServer = new
SimpleHTTPServer(confContext, 5555);
- simpleHttpServer.start();
+ HttpFactory httpFactory = new HttpFactory(confContext, 5555);
+ SimpleHttpServer simpleHttpServer = new
SimpleHttpServer(httpFactory, 5555);
+ simpleHttpServer.start();
System.out.println("Server started on port 5555 ");
try {
@@ -63,6 +64,8 @@ public class ServerTest {
}
} catch (AxisFault axisFault) {
axisFault.printStackTrace(); //To change body of catch statement
use File | Settings | File Templates.
+ } catch (IOException e) {
+ e.printStackTrace();
}
}
