Author: dain Date: Thu Jan 20 22:17:12 2005 New Revision: 125900 URL: http://svn.apache.org/viewcvs?view=rev&rev=125900 Log: Missed this file while updating references
Modified: geronimo/trunk/modules/axis-builder/geronimo-axis-builder.iml geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisBuilder.java Modified: geronimo/trunk/modules/axis-builder/geronimo-axis-builder.iml Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis-builder/geronimo-axis-builder.iml?view=diff&rev=125900&p1=geronimo/trunk/modules/axis-builder/geronimo-axis-builder.iml&r1=125899&p2=geronimo/trunk/modules/axis-builder/geronimo-axis-builder.iml&r2=125900 ============================================================================== --- geronimo/trunk/modules/axis-builder/geronimo-axis-builder.iml (original) +++ geronimo/trunk/modules/axis-builder/geronimo-axis-builder.iml Thu Jan 20 22:17:12 2005 @@ -7,24 +7,30 @@ <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/target/xmlbeans" isTestSource="false" /> - <excludeFolder url="file://$MODULE_DIR$/target/classes" /> - <excludeFolder url="file://$MODULE_DIR$/target/test-classes" /> </content> <orderEntry type="jdk" jdkName="java version "1.4.2_05"" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="geronimo-xmlbeans-plugin" /> - <orderEntry type="module" module-name="openejb-core" /> + <orderEntry type="module-library"> + <library name="openejb-core"> + <CLASSES> + <root url="jar:///Users/dain/.maven/repository/openejb/jars/openejb-core-2.0-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntry type="module-library"> <library name="xbean-apache"> <CLASSES> - <root url="jar:///Users/david/.maven/repository/xmlbeans/jars/xbean-apache-1.0-DEV.jar!/" /> + <root url="jar:///Users/dain/.maven/repository/xmlbeans/jars/xbean-apache-1.0-DEV.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> + <orderEntry type="module" module-name="geronimo-axis" /> <orderEntry type="module" module-name="geronimo-common" /> + <orderEntry type="module" module-name="geronimo-connector-builder" /> <orderEntry type="module" module-name="geronimo-core" /> <orderEntry type="module" module-name="geronimo-deployment" /> <orderEntry type="module" module-name="geronimo-j2ee" /> @@ -36,11 +42,19 @@ <orderEntry type="module" module-name="geronimo-system" /> <orderEntry type="module" module-name="geronimo-service-builder" /> <orderEntry type="module" module-name="geronimo-transaction" /> - <orderEntry type="module" module-name="geronimo-spec-jta" /> + <orderEntry type="module-library"> + <library name="geronimo-spec-jta"> + <CLASSES> + <root url="jar:///Users/dain/.maven/repository/geronimo-spec/jars/geronimo-spec-jta-1.0.1B-rc3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntry type="module-library"> <library name="cglib-full"> <CLASSES> - <root url="jar:///Users/david/.maven/repository/cglib/jars/cglib-full-2.0.jar!/" /> + <root url="jar:///Users/dain/.maven/repository/cglib/jars/cglib-full-2.0.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -49,7 +63,7 @@ <orderEntry type="module-library"> <library name="commons-logging"> <CLASSES> - <root url="jar:///Users/david/.maven/repository/commons-logging/jars/commons-logging-1.0.4.jar!/" /> + <root url="jar:///Users/dain/.maven/repository/commons-logging/jars/commons-logging-1.0.4.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -58,7 +72,7 @@ <orderEntry type="module-library"> <library name="log4j"> <CLASSES> - <root url="jar:///Users/david/.maven/repository/log4j/jars/log4j-1.2.8.jar!/" /> + <root url="jar:///Users/dain/.maven/repository/log4j/jars/log4j-1.2.8.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> @@ -67,46 +81,70 @@ <orderEntry type="module-library"> <library name="mx4j"> <CLASSES> - <root url="jar:///Users/david/.maven/repository/mx4j/jars/mx4j-2.0.1.jar!/" /> + <root url="jar:///Users/dain/.maven/repository/mx4j/jars/mx4j-2.0.1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="junit"> + <library name="axis-jaxrpc"> <CLASSES> - <root url="jar:///Users/david/.maven/repository/junit/jars/junit-3.8.1.jar!/" /> + <root url="jar:///Users/dain/.maven/repository/axis/jars/axis-jaxrpc-1.2-RC1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="axis"> + <CLASSES> + <root url="jar:///Users/dain/.maven/repository/axis/jars/axis-1.2-RC1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> - <orderEntry type="module" module-name="geronimo-axis" /> <orderEntry type="module-library"> - <library> + <library name="commons-discovery"> <CLASSES> - <root url="jar:///Users/david/.maven/repository/axis/jars/axis-1.2-RC1.jar!/" /> + <root url="jar:///Users/dain/.maven/repository/axis/jars/commons-discovery-SNAPSHOT.jar!/" /> </CLASSES> <JAVADOC /> - <SOURCES> - <root url="file:///Users/david/java/axis/axis/ws-axis/java/src" /> - </SOURCES> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="axis-saaj"> + <CLASSES> + <root url="jar:///Users/dain/.maven/repository/axis/jars/axis-saaj-1.2-RC1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="axis-wsdl4j"> + <CLASSES> + <root url="jar:///Users/dain/.maven/repository/axis/jars/axis-wsdl4j-1.2-RC1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library> + <library name="commons-jelly-tags-velocity"> <CLASSES> - <root url="jar:///Users/david/.maven/repository/axis/jars/axis-jaxrpc-1.2-RC1.jar!/" /> + <root url="jar:///Users/dain/.maven/repository/commons-jelly/jars/commons-jelly-tags-velocity-SNAPSHOT.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library> + <library name="velocity"> <CLASSES> - <root url="jar:///Users/david/.maven/repository/axis/jars/axis-wsdl4j-1.2-RC1.jar!/" /> + <root url="jar:///Users/dain/.maven/repository/velocity/jars/velocity-1.4-rc1.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> Modified: geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisBuilder.java Url: http://svn.apache.org/viewcvs/geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisBuilder.java?view=diff&rev=125900&p1=geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisBuilder.java&r1=125899&p2=geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisBuilder.java&r2=125900 ============================================================================== --- geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisBuilder.java (original) +++ geronimo/trunk/modules/axis-builder/src/java/org/apache/geronimo/axis/builder/AxisBuilder.java Thu Jan 20 22:17:12 2005 @@ -72,13 +72,12 @@ import org.apache.geronimo.axis.client.ServiceEndpointMethodInterceptor; import org.apache.geronimo.axis.client.ServiceImpl; import org.apache.geronimo.axis.client.ServiceMethodInterceptor; -import org.apache.geronimo.axis.client.ServiceRefAddr; +import org.apache.geronimo.axis.client.ServiceReference; import org.apache.geronimo.axis.client.SerializableNoOp; import org.apache.geronimo.axis.client.NoOverrideCallbackFilter; import org.apache.geronimo.common.DeploymentException; import org.apache.geronimo.deployment.DeploymentContext; import org.apache.geronimo.j2ee.deployment.ServiceReferenceBuilder; -import org.apache.geronimo.naming.reference.RefAddrContentObjectFactory; import org.apache.geronimo.xbeans.j2ee.JavaWsdlMappingDocument; import org.apache.geronimo.xbeans.j2ee.JavaWsdlMappingType; import org.apache.geronimo.gbean.GBeanInfo; @@ -95,7 +94,7 @@ private static final URI ENHANCED_LOCATION = URI.create("cglib"); private static final SOAPConstants SOAP_VERSION = SOAPConstants.SOAP11_CONSTANTS; - public Reference createServiceReference(Class serviceInterface, URI wsdlURI, URI jaxrpcMappingURI, QName serviceQName, Map portComponentRefMap, List handlers, DeploymentContext deploymentContext, ClassLoader classLoader) throws DeploymentException { + public ServiceReference createServiceReference(Class serviceInterface, URI wsdlURI, URI jaxrpcMappingURI, QName serviceQName, Map portComponentRefMap, List handlers, DeploymentContext deploymentContext, ClassLoader classLoader) throws DeploymentException { Enhancer enhancer = new Enhancer(); enhancer.setClassLoader(classLoader); @@ -109,12 +108,7 @@ Class enhanced = enhancer.createClass(); saveClass(deploymentContext, enhanced.getName(), strategy.getClassBytes()); - ServiceRefAddr refAddr = new ServiceRefAddr(enhanced, null, null); - - Reference ref = new Reference(null, RefAddrContentObjectFactory.class.getName(), null); - ref.add(refAddr); - - return ref; + return new ServiceReference(enhanced, null, null); } public Object createService(Class serviceInterface, URI wsdlURI, URI jaxrpcMappingURI, QName serviceQName, Map portComponentRefMap, List handlers, DeploymentContext deploymentContext, ClassLoader classLoader) throws DeploymentException {
