You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by he...@apache.org on 2004/06/14 14:10:54 UTC
cvs commit: ws-axis/contrib/ews/conf ws4j2ee.properties
hemapani 2004/06/14 05:10:54
Modified: contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/ws
J2eeDeployWriter.java ServerSideWsGenerator.java
contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs
Ws4J2EEwithWSDL.java Ws4J2EEClientwithWSDL.java
Ws4J2EEwithoutWSDL.java
contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/context
ContextFactory.java
contrib/ews/src/org/apache/geronimo/ews/jaxrpcmapping
J2eeGeneratorFactory.java
contrib/ews/conf ws4j2ee.properties
Removed: contrib/ews/src/org/apache/geronimo/ews/jaxrpcmapping
J2eeDeployWriter.java
Log:
change the deploy.wsdd writer for ews such that the jaxrpc mapping file
can compile standalone
Revision Changes Path
1.2 +3 -20 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/ws/J2eeDeployWriter.java
Index: J2eeDeployWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/ws/J2eeDeployWriter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- J2eeDeployWriter.java 14 Jun 2004 08:30:03 -0000 1.1
+++ J2eeDeployWriter.java 14 Jun 2004 12:10:54 -0000 1.2
@@ -98,6 +98,7 @@
import org.apache.axis.wsdl.toJava.Emitter;
import org.apache.axis.wsdl.toJava.JavaWriter;
import org.apache.axis.wsdl.toJava.Utils;
+import org.apache.geronimo.ews.ws4j2ee.context.ContextFactory;
import org.apache.geronimo.ews.ws4j2ee.context.J2EEWebServiceContext;
import org.apache.geronimo.ews.ws4j2ee.context.webservices.server.interfaces.WSCFHandler;
import org.apache.geronimo.ews.ws4j2ee.context.webservices.server.interfaces.WSCFInitParam;
@@ -113,7 +114,6 @@
/** Field symbolTable */
protected SymbolTable symbolTable;
-
protected J2EEWebServiceContext wscontext;
/**
@@ -123,25 +123,13 @@
* @param definition
* @param symbolTable
*/
- public J2eeDeployWriter(Emitter emitter, J2EEWebServiceContext wscontext) {
- this(emitter,emitter.getSymbolTable().getDefinition(),emitter.getSymbolTable());
- this.wscontext = wscontext;
- }
-
- /**
- * Constructor.
- *
- * @param emitter
- * @param definition
- * @param symbolTable
- */
public J2eeDeployWriter(Emitter emitter, Definition definition,
SymbolTable symbolTable) {
super(emitter, "deploy");
-
this.definition = definition;
this.symbolTable = symbolTable;
+ this.wscontext = ContextFactory.getCurrentJ2EEWsContext();
} // ctor
/**
@@ -168,12 +156,7 @@
String dir =
emitter.getNamespaces().getAsDir(definition.getTargetNamespace());
- String filename = wscontext.getMiscInfo().getOutPutPath()+ "/deploy.wsdd";
- File file = new File(dir + "deploy.wsdd");
- if(file.exists()){
- file.delete();
- }
- return filename;
+ return dir + "deploy.wsdd";
} // getFileName
/**
1.3 +2 -2 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/ws/ServerSideWsGenerator.java
Index: ServerSideWsGenerator.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/ws/ServerSideWsGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ServerSideWsGenerator.java 14 Jun 2004 08:30:03 -0000 1.2
+++ ServerSideWsGenerator.java 14 Jun 2004 12:10:54 -0000 1.3
@@ -117,8 +117,8 @@
j2ee.setHelperWanted(true);
j2ee.runServerSide(wsdlfile);
- J2eeDeployWriter deploywriter = new J2eeDeployWriter(j2ee,j2eewscontext);
- deploywriter.generate();
+// J2eeDeployWriter deploywriter = new J2eeDeployWriter(j2ee,j2eewscontext);
+// deploywriter.generate();
SymbolTable axisSymboltable = j2ee.getSymbolTable();
j2eewscontext.setWSDLContext(ContextFactory.createWSDLContext(axisSymboltable));
1.11 +1 -2 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2EEwithWSDL.java
Index: Ws4J2EEwithWSDL.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2EEwithWSDL.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Ws4J2EEwithWSDL.java 14 Jun 2004 08:30:03 -0000 1.10
+++ Ws4J2EEwithWSDL.java 14 Jun 2004 12:10:54 -0000 1.11
@@ -64,7 +64,6 @@
import org.apache.geronimo.ews.ws4j2ee.context.ContextValidator;
import org.apache.geronimo.ews.ws4j2ee.context.J2EEWebServiceContext;
import org.apache.geronimo.ews.ws4j2ee.context.MiscInfo;
-import org.apache.geronimo.ews.ws4j2ee.context.impl.J2EEWebServiceContextImpl;
import org.apache.geronimo.ews.ws4j2ee.context.webservices.server.interfaces.WSCFContext;
import org.apache.geronimo.ews.ws4j2ee.context.webservices.server.interfaces.WSCFPortComponent;
import org.apache.geronimo.ews.ws4j2ee.context.webservices.server.interfaces.WSCFWebserviceDescription;
@@ -99,7 +98,7 @@
misc.setWsconffile(wscffile);
misc.setOutputPath(clparser.getOutputDirectory());
misc.setWsConfFileLocation(Utils.getRootDirOfFile(wscffile));
- wscontext = new J2EEWebServiceContextImpl(true);
+ wscontext = ContextFactory.getJ2EEWsContext(true);
wscontext.setMiscInfo(misc);
//parsing of the webservice.xml happen here
WSCFContext wscfcontext = ContextFactory.createWSCFContext(new FileInputStream(wscffile));
1.3 +1 -2 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2EEClientwithWSDL.java
Index: Ws4J2EEClientwithWSDL.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2EEClientwithWSDL.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Ws4J2EEClientwithWSDL.java 14 Jun 2004 08:30:03 -0000 1.2
+++ Ws4J2EEClientwithWSDL.java 14 Jun 2004 12:10:54 -0000 1.3
@@ -63,7 +63,6 @@
import org.apache.geronimo.ews.ws4j2ee.context.ContextValidator;
import org.apache.geronimo.ews.ws4j2ee.context.J2EEWebServiceContext;
import org.apache.geronimo.ews.ws4j2ee.context.MiscInfo;
-import org.apache.geronimo.ews.ws4j2ee.context.impl.J2EEWebServiceContextImpl;
import org.apache.geronimo.ews.ws4j2ee.context.webservices.client.interfaces.ServiceReferance;
import org.apache.geronimo.ews.ws4j2ee.parsers.ServiceReferanceParser;
import org.apache.geronimo.ews.ws4j2ee.utils.Utils;
@@ -92,7 +91,7 @@
*/
public void generate() throws GenerationFault {
try {
- J2EEWebServiceContext wscontext = new J2EEWebServiceContextImpl(true);
+ J2EEWebServiceContext wscontext = ContextFactory.getJ2EEWsContext(true);
wscontext.setMiscInfo(misc);
String wscfClientfile = clparser.getWscffile();
1.10 +2 -4 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2EEwithoutWSDL.java
Index: Ws4J2EEwithoutWSDL.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2EEwithoutWSDL.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Ws4J2EEwithoutWSDL.java 14 Jun 2004 08:30:03 -0000 1.9
+++ Ws4J2EEwithoutWSDL.java 14 Jun 2004 12:10:54 -0000 1.10
@@ -69,7 +69,6 @@
import org.apache.geronimo.ews.ws4j2ee.context.ContextValidator;
import org.apache.geronimo.ews.ws4j2ee.context.J2EEWebServiceContext;
import org.apache.geronimo.ews.ws4j2ee.context.impl.AxisEmitterBasedJaxRpcMapperContext;
-import org.apache.geronimo.ews.ws4j2ee.context.impl.J2EEWebServiceContextImpl;
import org.apache.geronimo.ews.ws4j2ee.context.webservices.server.AxisEmitterBasedWSCFContext;
import org.apache.geronimo.ews.ws4j2ee.context.webservices.server.interfaces.WSCFContext;
import org.apache.geronimo.ews.ws4j2ee.context.webservices.server.interfaces.WSCFPortComponent;
@@ -78,7 +77,6 @@
import org.apache.geronimo.ews.ws4j2ee.parsers.EJBDDParser;
import org.apache.geronimo.ews.ws4j2ee.parsers.WebDDParser;
import org.apache.geronimo.ews.ws4j2ee.toWs.wsdl.WSDLGenerator;
-//import org.apache.geronimo.ews.ws4j2ee.utils.AntExecuter;
import org.apache.geronimo.ews.ws4j2ee.utils.JarFileLoader;
import org.apache.geronimo.ews.ws4j2ee.utils.Utils;
@@ -116,7 +114,7 @@
//create the context
- this.wscontext = new J2EEWebServiceContextImpl(false);
+ this.wscontext = ContextFactory.getJ2EEWsContext(false);
this.wscontext.setMiscInfo(ContextFactory.createMiscInfo());
wscontext.getMiscInfo().setVerbose(verbose);
@@ -147,7 +145,7 @@
webddin = jarfileLoader.getWebddfile();
//create the context
- this.wscontext = new J2EEWebServiceContextImpl(false);
+ this.wscontext = ContextFactory.getJ2EEWsContext(false);
this.wscontext.setMiscInfo(ContextFactory.createMiscInfo());
wscontext.getMiscInfo().setVerbose(verbose);
wscontext.getMiscInfo().setJarFileName(jarfile.getAbsolutePath());
1.7 +11 -0 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/context/ContextFactory.java
Index: ContextFactory.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/context/ContextFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ContextFactory.java 10 Jun 2004 11:35:19 -0000 1.6
+++ ContextFactory.java 14 Jun 2004 12:10:54 -0000 1.7
@@ -60,6 +60,7 @@
import org.apache.axis.wsdl.symbolTable.SymbolTable;
import org.apache.geronimo.ews.jaxrpcmapping.J2eeEmitter;
import org.apache.geronimo.ews.jaxrpcmapping.JaxRpcMapper;
+import org.apache.geronimo.ews.ws4j2ee.context.impl.J2EEWebServiceContextImpl;
import org.apache.geronimo.ews.ws4j2ee.context.impl.JaxRpcMapperImpl;
import org.apache.geronimo.ews.ws4j2ee.context.impl.MiscInfoImpl;
import org.apache.geronimo.ews.ws4j2ee.context.webservices.server.WSCFContextImpl;
@@ -76,6 +77,7 @@
* @author Srinath Perera(hemapani@opensource.lk)
*/
public class ContextFactory {
+ private static J2EEWebServiceContext currentContext;
public static WSDLContext createWSDLContext(Object info) {
if (info instanceof SymbolTable)
return new AxisWSDLContext((SymbolTable) info);
@@ -100,4 +102,13 @@
public static MiscInfo createMiscInfo() {
return new MiscInfoImpl();
}
+
+ public static J2EEWebServiceContext getCurrentJ2EEWsContext(){
+ return currentContext;
+ }
+ public static J2EEWebServiceContext getJ2EEWsContext(boolean hasWSDL){
+ currentContext = new J2EEWebServiceContextImpl(hasWSDL);
+ return currentContext;
+ }
+
}
1.7 +32 -2 ws-axis/contrib/ews/src/org/apache/geronimo/ews/jaxrpcmapping/J2eeGeneratorFactory.java
Index: J2eeGeneratorFactory.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/jaxrpcmapping/J2eeGeneratorFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- J2eeGeneratorFactory.java 26 May 2004 15:04:59 -0000 1.6
+++ J2eeGeneratorFactory.java 14 Jun 2004 12:10:54 -0000 1.7
@@ -59,13 +59,16 @@
*
*/
+import java.io.FileInputStream;
import java.io.IOException;
+import java.io.InputStream;
import java.lang.reflect.Constructor;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
+import java.util.Properties;
import java.util.Vector;
import javax.wsdl.Binding;
@@ -109,6 +112,7 @@
import org.apache.axis.wsdl.toJava.JavaTypeWriter;
import org.apache.axis.wsdl.toJava.JavaUndeployWriter;
import org.apache.axis.wsdl.toJava.Utils;
+import org.apache.geronimo.ews.ws4j2ee.toWs.GenerationConstants;
/**
* This is WsdlToJ2ee's implementation of the GeneratorFactory
@@ -177,8 +181,7 @@
protected void addDefinitionGenerators() {
addGenerator(Definition.class, JavaDefinitionWriter.class); // for faults
- //addGenerator(Definition.class, JavaDeployWriter.class); // for deploy.wsdd
- addGenerator(Definition.class, J2eeDeployWriter.class); // for deploy.wsdd
+ addGenerator(Definition.class, getDeployerWriterClass()); // for deploy.wsdd
addGenerator(Definition.class, JavaUndeployWriter.class); // for undeploy.wsdd
} // addDefinitionGenerators
@@ -1119,5 +1122,32 @@
};
}
return btm;
+ }
+ private Class getDeployerWriterClass(){
+ try {
+ Properties properties = new Properties();
+ InputStream proIn = GenerationConstants.class.getResourceAsStream("ws4j2ee.properties");
+ if(proIn == null){
+ proIn = GenerationConstants.class.getResourceAsStream("META-INF/ws4j2ee.properties");
+ }
+ if(proIn == null){
+ proIn = new FileInputStream("conf/ws4j2ee.properties");
+ }
+ if(proIn == null){
+ proIn = new FileInputStream("ws4j2ee.properties");
+ }
+ if(proIn != null){
+ properties.load(proIn);
+ }
+
+ String provider = properties.getProperty("ws4j2ee-provider");
+ if(provider != null && provider.equals("j2ee")){
+ return Class.forName("org.apache.geronimo.ews.ws4j2ee.toWs.ws.J2eeDeployWriter");
+ }else
+ return J2eeDeployWriter.class;
+
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
}
}
1.2 +2 -1 ws-axis/contrib/ews/conf/ws4j2ee.properties
Index: ws4j2ee.properties
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/conf/ws4j2ee.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ws4j2ee.properties 2 Feb 2004 15:27:06 -0000 1.1
+++ ws4j2ee.properties 14 Jun 2004 12:10:54 -0000 1.2
@@ -1 +1,2 @@
-j2ee-container-dd=geronimo.xml
\ No newline at end of file
+j2ee-container-dd=geronimo.xml
+ws4j2ee-provider=j2ee
\ No newline at end of file