You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2005/04/26 04:46:12 UTC
svn commit: r164724 - in /geronimo/trunk: etc/project.properties
modules/assembly/project.xml
modules/axis/src/java/org/apache/geronimo/axis/client/ServiceImpl.java
Author: djencks
Date: Mon Apr 25 19:46:11 2005
New Revision: 164724
URL: http://svn.apache.org/viewcvs?rev=164724&view=rev
Log:
use axis with patches 1949 and 1950 applied. Fix client setup
Modified:
geronimo/trunk/etc/project.properties
geronimo/trunk/modules/assembly/project.xml
geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/client/ServiceImpl.java
Modified: geronimo/trunk/etc/project.properties
URL: http://svn.apache.org/viewcvs/geronimo/trunk/etc/project.properties?rev=164724&r1=164723&r2=164724&view=diff
==============================================================================
--- geronimo/trunk/etc/project.properties (original)
+++ geronimo/trunk/etc/project.properties Mon Apr 25 19:46:11 2005
@@ -99,10 +99,7 @@
ant_version=1.5
antlr_version=2.7.2
axion_version=1.0-M3-dev
-axis_version=SNAPSHOT
-axis_jaxrpc_version=1.2-RC3
-axis_saaj_version=1.2-RC3
-#axis_wsdl4j_version=1.2-RC3
+axis_version=PATCH-JIRA1950
axis_commons_discovery_version=SNAPSHOT
avalon_framework_version=4.1.4
avalon_logkit_version=1.2.2
Modified: geronimo/trunk/modules/assembly/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/assembly/project.xml?rev=164724&r1=164723&r2=164724&view=diff
==============================================================================
--- geronimo/trunk/modules/assembly/project.xml (original)
+++ geronimo/trunk/modules/assembly/project.xml Mon Apr 25 19:46:11 2005
@@ -302,17 +302,6 @@
</properties>
</dependency>
- <!--
-<dependency>
-<groupId>geronimo</groupId>
-<artifactId>geronimo-remoting</artifactId>
-<version>${pom.currentVersion}</version>
-<properties>
-<repository>true</repository>
-</properties>
-</dependency>
- -->
-
<dependency>
<groupId>geronimo</groupId>
<artifactId>geronimo-security</artifactId>
@@ -1023,25 +1012,6 @@
</properties>
</dependency>
-<!--
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis-jaxrpc</artifactId>
- <version>${axis_jaxrpc_version}</version>
- <properties>
- <repository>true</repository>
- </properties>
- </dependency>
--->
- <dependency>
- <groupId>axis</groupId>
- <artifactId>axis-saaj</artifactId>
- <version>${axis_saaj_version}</version>
- <properties>
- <repository>true</repository>
- </properties>
- </dependency>
-
<dependency>
<groupId>axis</groupId>
<artifactId>commons-discovery</artifactId>
@@ -1052,15 +1022,6 @@
</dependency>
<dependency>
- <groupId>ews</groupId>
- <artifactId>ews</artifactId>
- <version>${ews_version}</version>
- <properties>
- <repository>true</repository>
- </properties>
- </dependency>
-
- <dependency>
<groupId>xfire</groupId>
<artifactId>xfire</artifactId>
<version>${xfire_version}</version>
@@ -1105,7 +1066,7 @@
</properties>
</dependency>
- <!--corba support -->
+<!-- corba support -->
<dependency>
<groupId>tmporb</groupId>
<artifactId>tmporb-orb</artifactId>
Modified: geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/client/ServiceImpl.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/client/ServiceImpl.java?rev=164724&r1=164723&r2=164724&view=diff
==============================================================================
--- geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/client/ServiceImpl.java (original)
+++ geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/client/ServiceImpl.java Mon Apr 25 19:46:11 2005
@@ -31,9 +31,15 @@
import javax.xml.rpc.handler.HandlerRegistry;
import org.apache.axis.EngineConfiguration;
+import org.apache.axis.SimpleTargetedChain;
+import org.apache.axis.transport.http.HTTPSender;
+import org.apache.axis.constants.Use;
+import org.apache.axis.encoding.TypeMappingRegistryImpl;
+import org.apache.axis.encoding.TypeMapping;
import org.apache.axis.client.AxisClient;
import org.apache.axis.client.Service;
import org.apache.axis.configuration.FileProvider;
+import org.apache.axis.configuration.SimpleProvider;
/**
@@ -44,7 +50,7 @@
private transient Service delegate;
private final Map seiClassNameToFactoryMap;
private final Map portToImplementationMap;
-
+
public ServiceImpl(Map portToImplementationMap, Map seiClassNameToFactoryMap) {
this.portToImplementationMap = portToImplementationMap;
this.seiClassNameToFactoryMap = seiClassNameToFactoryMap;
@@ -52,14 +58,15 @@
}
private void buildDelegateService() {
- delegate = new Service();
+ TypeMappingRegistryImpl typeMappingRegistry = new TypeMappingRegistryImpl();
+ typeMappingRegistry.doRegisterFromVersion("1.3");
+
+ SimpleProvider engineConfiguration = new SimpleProvider(typeMappingRegistry);
+ engineConfiguration.deployTransport("http", new SimpleTargetedChain(new HTTPSender()));
- EngineConfiguration engineConfiguration = delegate.getEngine().getConfig();
- //there must be a better way
- ((FileProvider)engineConfiguration).setInputStream(AxisClient.class.getResourceAsStream("client-config.wsdd"));
GeronimoAxisClient engine = new GeronimoAxisClient(engineConfiguration, portToImplementationMap);
- delegate.setEngine(engine);
- delegate.setEngineConfiguration(engineConfiguration);
+
+ delegate = new Service(engineConfiguration, engine);
}
public Remote getPort(QName qName, Class portClass) throws ServiceException {
@@ -78,15 +85,15 @@
}
public Call[] getCalls(QName portName) throws ServiceException {
-
+
if (portName == null)
throw new ServiceException("Portname cannot be null");
-
+
SEIFactory factory = (SEIFactory) portToImplementationMap.get(portName.getLocalPart());
if( factory == null )
throw new ServiceException("No port for portname: " + portName);
- OperationInfo[] operationInfos = factory.getOperationInfos();
+ OperationInfo[] operationInfos = factory.getOperationInfos();
javax.xml.rpc.Call[] array = new javax.xml.rpc.Call[operationInfos.length];
for (int i = 0; i < operationInfos.length; i++) {
OperationInfo operation = operationInfos[i];
@@ -115,7 +122,7 @@
Iterator iterator = portToImplementationMap.values().iterator();
if( !iterator.hasNext() )
return null;
- SEIFactory factory = (SEIFactory)iterator.next();
+ SEIFactory factory = (SEIFactory)iterator.next();
return factory.getServiceName();
}
@@ -127,7 +134,7 @@
Iterator iterator = portToImplementationMap.values().iterator();
if( !iterator.hasNext() )
return null;
- SEIFactory factory = (SEIFactory)iterator.next();
+ SEIFactory factory = (SEIFactory)iterator.next();
return factory.getWSDLDocumentLocation();
}