You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2004/06/11 15:26:11 UTC
cvs commit: ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/wrapperWs/jonas RemoteInterfacedBasedWrapperClassWriter4JOnAS.java
dims 2004/06/11 06:26:11
Modified: contrib/ews maven.xml
contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/dd/jonas
JOnASDDWriter.java
contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/wrapperWs/jonas
RemoteInterfacedBasedWrapperClassWriter4JOnAS.java
Log:
Fix for AXIS-1388 from Guillaume Sauthier
Revision Changes Path
1.7 +10 -5 ws-axis/contrib/ews/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/maven.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- maven.xml 19 Feb 2004 10:35:47 -0000 1.6
+++ maven.xml 11 Jun 2004 13:26:11 -0000 1.7
@@ -35,8 +35,9 @@
<j:jelly xmlns="jelly:ant">
- <j:set var="src.dir" value="${basedir}/src/java"/>
+ <j:set var="src.dir" value="${basedir}/src"/>
<j:set var="dir" value="${basedir}/target/src"/>
+ <j:set var="schema.dir" value="${basedir}/schema"/>
<taskdef name="xjc" classname="com.sun.tools.xjc.XJCTask">
<classpath refid="maven.dependency.classpath"/>
@@ -44,23 +45,27 @@
<ant:mkdir dir="${dir}"/>
+ <!-- Generate EjbJar files from schema -->
<xjc target="${dir}"
package="org.apache.geronimo.ews.ws4j2ee.parsers.ejbdd"
- schema="${basedir}/src/schema/ejb-jar.xsd"
+ schema="${schema.dir}/ejb-jar.xsd"
extension="true" >
<produces dir="${dir}/org/apache/geronimo/ews/ws4j2ee/parsers/ejbdd"
name="* impl/*"/>
</xjc>
+ <!-- Generate JaxRpcMappingFile files from schema -->
<xjc target="${dir}"
- schema="${basedir}/src/schema/j2ee_jaxrpc_mapping_1_1.xsd"
+ schema="${schema.dir}/j2ee_jaxrpc_mapping_1_1.xsd"
package="org.apache.geronimo.ews.jaxrpcmapping.descriptor"
extension="true" >
<produces dir="${dir}/org/apache/geronimo/ews/jaxrpcmapping/descriptor"
name="* impl/*"/>
</xjc>
+
+ <!-- Generate Webservices files from schema -->
<xjc target="${dir}"
- schema="${basedir}/src/schema/webservices.xsd"
+ schema="${schema.dir}/webservices.xsd"
package="org.apache.geronimo.ews.ws4j2ee.context.webservices.server.jaxb"
extension="true" >
<produces dir="${dir}/org/apache/geronimo/ews/ws4j2ee/context/webservices/server/jaxb"
1.5 +3 -4 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/dd/jonas/JOnASDDWriter.java
Index: JOnASDDWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/dd/jonas/JOnASDDWriter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JOnASDDWriter.java 23 May 2004 15:53:27 -0000 1.4
+++ JOnASDDWriter.java 11 Jun 2004 13:26:11 -0000 1.5
@@ -69,7 +69,7 @@
public String getFileName() {
return j2eewscontext.getMiscInfo().getOutPutPath() +
- "/ejb/META-INF/JonAs.xml";
+ "/ejb/META-INF/jonas-ejb-jar.xml";
}
/* (non-Javadoc)
@@ -86,7 +86,7 @@
out.write("<jonas-ejb-jar xmlns=\"http://www.objectweb.org/jonas/ns\"\n");
out.write(" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n");
out.write(" xsi:schemaLocation=\"http://www.objectweb.org/jonas/ns\"\n");
- out.write(" http://www.objectweb.org/jonas/ns/jonas-ejb-jar_4_0.xsd\">\n");
+ out.write(" http://www.objectweb.org/jonas/ns/jonas-ejb-jar_4_1.xsd\">\n");
out.write(" <jonas-session>\n");
out.write(" <ejb-name>" + j2eewscontext.getMiscInfo().getEjbName() + "</ejb-name>\n");
String implStyle = j2eewscontext.getMiscInfo().getImplStyle();
@@ -96,8 +96,7 @@
}
if(GenerationConstants.USE_LOCAL_AND_REMOTE.equals(implStyle)
|| GenerationConstants.USE_LOCAL.equals(implStyle)){
- //TODO fill this what is the correct tag for JonAs
- //out.write(" <local-jndi-name>" + "ejb/" +ejbname+ "Local"+"</local-jndi-name>\n");
+ out.write(" <jndi-local-name>" + "ejb/" +ejbname+ "Local"+"</jndi-local-name>\n");
}
out.write(" </jonas-session>\n");
out.write("</jonas-ejb-jar>\n");
1.3 +2 -1 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/wrapperWs/jonas/RemoteInterfacedBasedWrapperClassWriter4JOnAS.java
Index: RemoteInterfacedBasedWrapperClassWriter4JOnAS.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/wrapperWs/jonas/RemoteInterfacedBasedWrapperClassWriter4JOnAS.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RemoteInterfacedBasedWrapperClassWriter4JOnAS.java 23 May 2004 15:53:29 -0000 1.2
+++ RemoteInterfacedBasedWrapperClassWriter4JOnAS.java 11 Jun 2004 13:26:11 -0000 1.3
@@ -73,11 +73,12 @@
}
protected String getJNDIHostAndPort() {
+ // TODO using carol MultiOrb, port number can change from protocol to protocol (jrmp, iiop, jeremie)
return "127.0.0.1:1099";
}
protected String getJNDIInitialContextFactory() {
- return "org.jnp.interfaces.NamingContextFactory";
+ return "org.objectweb.carol.jndi.spi.MultiOrbInitialContextFactory";
}
}