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/07/26 14:21:52 UTC
cvs commit: ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/context/impl MiscInfoImpl.java
hemapani 2004/07/26 05:21:51
Modified: contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs
Ws4J2ee.java Ws4J2eeServerCLOptionParser.java
AbstractWriter.java Ws4J2eeEmitter.java
Ws4J2eeDeployContext.java
contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/ws
ClientSideWsGenerator.java
WSDLOnlyClientSideWsGenerator.java
ServerSideWsGenerator.java
contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/wrapperWs
EJBBasedWrapperClassWriter.java
WebEndpointWrapperClassWriter.java
WrapperWsGenerator.java
contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/utils
UncompressingJarClassLoader.java AntExecuter.java
contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/wrapperWs/geronimo
InternalBasedWrapperClassWriter.java
contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/utils/packager
JARFile.java Packager.java
contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/context/webservices/server
WSCFDocumentImpl.java WSCFContextImpl.java
contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/utils/packager/load
WARPackageModule.java JarPackageModule.java
EARPackageModule.java AbstractPackageModule.java
DirPackageModule.java PackageModuleFactory.java
contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/dd
JaxrpcMapperGenerator.java
J2EEContainerSpecificDDGenerator.java
WebContainerDDGenerator.java
contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/context/wsdl/impl
AxisWSDLContext.java
contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/wsdl
WSDLGenerator.java
contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/parsers/impl
ParserFactoryImpl.java
contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/misc
BuildFileGenerator.java
contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/context
MiscInfo.java
contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/context/impl
MiscInfoImpl.java
Added: contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/utils
EWSTask.java AntDeployContext.java
Log:
add the EWS task
Revision Changes Path
1.3 +3 -2 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2ee.java
Index: Ws4J2ee.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2ee.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Ws4J2ee.java 19 Jul 2004 15:40:47 -0000 1.2
+++ Ws4J2ee.java 26 Jul 2004 12:21:48 -0000 1.3
@@ -61,9 +61,10 @@
import java.io.InputStream;
import java.io.OutputStream;
-import org.apache.axis.components.logger.LogFactory;
+
import org.apache.axis.wsdl.fromJava.Emitter;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.ews.ws4j2ee.context.J2EEWebServiceContext;
import org.apache.geronimo.ews.ws4j2ee.context.j2eeDD.EJBContext;
import org.apache.geronimo.ews.ws4j2ee.context.j2eeDD.WebContext;
@@ -143,11 +144,11 @@
private void parseCLargs()throws GenerationFault{
module = clparser.getModule();
classloader = module.getClassLoaderWithPackageLoaded();
-
wscontext.getMiscInfo().setClassloader(classloader);
wscontext.getMiscInfo().setOutputPath(clparser.getOutPutLocation());
wscontext.getMiscInfo().setImplStyle(clparser.getImplStyle());
wscontext.getMiscInfo().setTargetJ2EEContainer(clparser.getContanier());
+ wscontext.getMiscInfo().setCompile(clparser.isCompile());
wsdlImplFilename = clparser.getWsdlImplFilename();
this.wscffile = module.getWscfFile();
1.3 +4 -0 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2eeServerCLOptionParser.java
Index: Ws4J2eeServerCLOptionParser.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2eeServerCLOptionParser.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Ws4J2eeServerCLOptionParser.java 19 Jul 2004 15:40:47 -0000 1.2
+++ Ws4J2eeServerCLOptionParser.java 26 Jul 2004 12:21:48 -0000 1.3
@@ -778,5 +778,9 @@
public void setImplStyle(String string) {
implStyle = string;
}
+
+ public boolean isCompile(){
+ return true;
+ }
}
1.8 +2 -1 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/AbstractWriter.java
Index: AbstractWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/AbstractWriter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractWriter.java 12 Jul 2004 04:14:27 -0000 1.7
+++ AbstractWriter.java 26 Jul 2004 12:21:48 -0000 1.8
@@ -60,8 +60,9 @@
import java.io.IOException;
import java.io.PrintWriter;
-import org.apache.axis.components.logger.LogFactory;
+
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.ews.ws4j2ee.context.J2EEWebServiceContext;
/**
1.2 +6 -4 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2eeEmitter.java
Index: Ws4J2eeEmitter.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2eeEmitter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Ws4J2eeEmitter.java 12 Jul 2004 04:14:27 -0000 1.1
+++ Ws4J2eeEmitter.java 26 Jul 2004 12:21:48 -0000 1.2
@@ -18,8 +18,8 @@
import java.io.File;
-import org.apache.axis.components.logger.LogFactory;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.ews.ws4j2ee.context.ContextValidator;
import org.apache.geronimo.ews.ws4j2ee.context.J2EEWebServiceContext;
@@ -94,9 +94,11 @@
}
public void executeAnt()throws GenerationFault{
- org.apache.geronimo.ews.ws4j2ee.utils.AntExecuter executer
- = new org.apache.geronimo.ews.ws4j2ee.utils.AntExecuter();
- executer.execute(wscontext.getMiscInfo().getOutPutPath() + "/build.xml");
+ if(wscontext.getMiscInfo().isCompile()){
+ org.apache.geronimo.ews.ws4j2ee.utils.AntExecuter executer
+ = new org.apache.geronimo.ews.ws4j2ee.utils.AntExecuter();
+ executer.execute(wscontext.getMiscInfo().getOutPutPath() + "/build.xml");
+ }
}
public void emmit()throws GenerationFault{
1.2 +1 -0 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2eeDeployContext.java
Index: Ws4J2eeDeployContext.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/Ws4J2eeDeployContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Ws4J2eeDeployContext.java 19 Jul 2004 15:40:47 -0000 1.1
+++ Ws4J2eeDeployContext.java 26 Jul 2004 12:21:48 -0000 1.2
@@ -29,4 +29,5 @@
public String getContanier();
public String getImplStyle();
public String getOutPutLocation();
+ public boolean isCompile();
}
1.5 +1 -2 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/ws/ClientSideWsGenerator.java
Index: ClientSideWsGenerator.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/ws/ClientSideWsGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ClientSideWsGenerator.java 12 Jul 2004 04:14:28 -0000 1.4
+++ ClientSideWsGenerator.java 26 Jul 2004 12:21:49 -0000 1.5
@@ -55,13 +55,12 @@
package org.apache.geronimo.ews.ws4j2ee.toWs.ws;
-import org.apache.axis.components.logger.LogFactory;
import org.apache.axis.wsdl.symbolTable.SymbolTable;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.ews.jaxrpcmapping.J2eeEmitter;
import org.apache.geronimo.ews.jaxrpcmapping.JaxRpcMapper;
import org.apache.geronimo.ews.ws4j2ee.context.J2EEWebServiceContext;
-import org.apache.geronimo.ews.ws4j2ee.context.webservices.server.interfaces.WSCFWebserviceDescription;
import org.apache.geronimo.ews.ws4j2ee.toWs.GenerationFault;
import org.apache.geronimo.ews.ws4j2ee.toWs.Generator;
import org.apache.geronimo.ews.ws4j2ee.toWs.Ws4J2eeFactory;
1.2 +1 -1 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/ws/WSDLOnlyClientSideWsGenerator.java
Index: WSDLOnlyClientSideWsGenerator.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/ws/WSDLOnlyClientSideWsGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WSDLOnlyClientSideWsGenerator.java 12 Jul 2004 04:14:28 -0000 1.1
+++ WSDLOnlyClientSideWsGenerator.java 26 Jul 2004 12:21:49 -0000 1.2
@@ -55,10 +55,10 @@
package org.apache.geronimo.ews.ws4j2ee.toWs.ws;
-import org.apache.axis.components.logger.LogFactory;
import org.apache.axis.wsdl.symbolTable.SymbolTable;
import org.apache.axis.wsdl.toJava.Emitter;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.ews.ws4j2ee.context.J2EEWebServiceContext;
import org.apache.geronimo.ews.ws4j2ee.toWs.GenerationFault;
import org.apache.geronimo.ews.ws4j2ee.toWs.Generator;
1.6 +1 -1 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ServerSideWsGenerator.java 12 Jul 2004 04:14:28 -0000 1.5
+++ ServerSideWsGenerator.java 26 Jul 2004 12:21:49 -0000 1.6
@@ -54,9 +54,9 @@
*/
package org.apache.geronimo.ews.ws4j2ee.toWs.ws;
-import org.apache.axis.components.logger.LogFactory;
import org.apache.axis.wsdl.symbolTable.SymbolTable;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.ews.jaxrpcmapping.J2eeEmitter;
import org.apache.geronimo.ews.jaxrpcmapping.JaxRpcMapper;
import org.apache.geronimo.ews.ws4j2ee.context.J2EEWebServiceContext;
1.2 +1 -1 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/wrapperWs/EJBBasedWrapperClassWriter.java
Index: EJBBasedWrapperClassWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/wrapperWs/EJBBasedWrapperClassWriter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- EJBBasedWrapperClassWriter.java 12 Jul 2004 04:14:29 -0000 1.1
+++ EJBBasedWrapperClassWriter.java 26 Jul 2004 12:21:49 -0000 1.2
@@ -54,8 +54,8 @@
*/
package org.apache.geronimo.ews.ws4j2ee.toWs.wrapperWs;
-import org.apache.axis.components.logger.LogFactory;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.ews.ws4j2ee.context.J2EEWebServiceContext;
import org.apache.geronimo.ews.ws4j2ee.context.j2eeDD.EJBContext;
import org.apache.geronimo.ews.ws4j2ee.toWs.GenerationFault;
1.9 +1 -1 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/wrapperWs/WebEndpointWrapperClassWriter.java
Index: WebEndpointWrapperClassWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/wrapperWs/WebEndpointWrapperClassWriter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- WebEndpointWrapperClassWriter.java 12 Jul 2004 04:14:29 -0000 1.8
+++ WebEndpointWrapperClassWriter.java 26 Jul 2004 12:21:49 -0000 1.9
@@ -57,8 +57,8 @@
import java.util.ArrayList;
import java.util.Iterator;
-import org.apache.axis.components.logger.LogFactory;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.ews.ws4j2ee.context.J2EEWebServiceContext;
import org.apache.geronimo.ews.ws4j2ee.context.SEIOperation;
import org.apache.geronimo.ews.ws4j2ee.context.j2eeDD.WebContext;
1.4 +1 -1 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/wrapperWs/WrapperWsGenerator.java
Index: WrapperWsGenerator.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/wrapperWs/WrapperWsGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WrapperWsGenerator.java 12 Jul 2004 04:14:29 -0000 1.3
+++ WrapperWsGenerator.java 26 Jul 2004 12:21:49 -0000 1.4
@@ -55,8 +55,8 @@
package org.apache.geronimo.ews.ws4j2ee.toWs.wrapperWs;
-import org.apache.axis.components.logger.LogFactory;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.ews.ws4j2ee.context.J2EEWebServiceContext;
import org.apache.geronimo.ews.ws4j2ee.toWs.GenerationFault;
import org.apache.geronimo.ews.ws4j2ee.toWs.Generator;
1.4 +5 -2 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/utils/UncompressingJarClassLoader.java
Index: UncompressingJarClassLoader.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/utils/UncompressingJarClassLoader.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- UncompressingJarClassLoader.java 12 Jul 2004 04:14:29 -0000 1.3
+++ UncompressingJarClassLoader.java 26 Jul 2004 12:21:49 -0000 1.4
@@ -38,13 +38,16 @@
private byte[] data = new byte[10 * 1024];
private Vector urls = new Vector();
private String dir;
+ private ClassLoader parentCL;
public UncompressingJarClassLoader(
String dir,
File jarFile,
String classpath,
- String jarpath) {
+ String jarpath,
+ ClassLoader parentCL) {
try {
+ this.parentCL = parentCL;
dir = dir + "/config"+configCount+"/";
this.dir = dir;
configCount++;
@@ -62,7 +65,7 @@
aurls[i] = ((File) urls.get(i)).toURL();
System.out.println(aurls[i]);
}
- return new URLClassLoader(aurls,ClassLoader.getSystemClassLoader());
+ return new URLClassLoader(aurls,parentCL);
} catch (Exception e) {
throw GenerationFault.createGenerationFault(e);
}
1.9 +1 -1 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/utils/AntExecuter.java
Index: AntExecuter.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/utils/AntExecuter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AntExecuter.java 19 Jul 2004 15:40:47 -0000 1.8
+++ AntExecuter.java 26 Jul 2004 12:21:49 -0000 1.9
@@ -34,8 +34,8 @@
try{
Class.forName("com.sun.tools.javac.Main");
Project project = new Project();
+ project.setCoreLoader(Thread.currentThread().getContextClassLoader());
project.init();
- project.setCoreLoader(null);
Ant ant = new Ant();
ant.setProject(project);
ant.init();
1.1 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/utils/EWSTask.java
Index: EWSTask.java
===================================================================
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.geronimo.ews.ws4j2ee.utils;
import java.io.File;
import java.io.FileWriter;
import java.io.IOException;
import java.io.PrintWriter;
import org.apache.geronimo.ews.ws4j2ee.toWs.GenerationFault;
import org.apache.geronimo.ews.ws4j2ee.toWs.Ws4J2ee;
import org.apache.tools.ant.AntClassLoader;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.Location;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.Path;
/**
* @author hemapani@opensource.lk
*/
public class EWSTask extends Task{
private String outDir = ".";
private String module = null;
private Path classpath;
private File root;
private boolean compile = false;
public void execute() throws BuildException {
try{
if(module == null){
throw new BuildException("the module name not specifed");
}
root = project.getBaseDir();
File moduleFile = new File(root,module);
File outDirFile = new File(root,outDir);
AntClassLoader cl = new AntClassLoader(
getClass().getClassLoader(),
project,
classpath,
true);
Thread.currentThread().setContextClassLoader(cl);
if(null == cl.getResourceAsStream("org/apache/geronimo/ews/ws4j2ee/context/webservices/server/jaxb/jaxb.properties"))
throw new Exception("error loding properties");
AntDeployContext deployContext
= new AntDeployContext(moduleFile.getAbsolutePath(),
outDirFile.getAbsolutePath(),cl);
Ws4J2ee ws4j2ee = new Ws4J2ee(deployContext,null);
ws4j2ee.generate();
}catch(Throwable e){
try {
File errorDump = new File(root,"ews.log");
PrintWriter pw = new PrintWriter(new FileWriter(errorDump));
e.printStackTrace(pw);
pw.close();
System.out.println(classpath);
System.out.println("ERROR .. dump to "+errorDump.getAbsolutePath());
} catch (IOException e1) {
}
throw new BuildException(e);
}
}
public Location getLocation() {
return super.getLocation();
}
public String getTaskName() {
return super.getTaskName();
}
public void init() throws BuildException {
super.init();
}
public void setLocation(Location arg0) {
super.setLocation(arg0);
}
public void setTaskName(String arg0) {
super.setTaskName(arg0);
}
/**
* @return
*/
public Path getClasspath() {
return classpath;
}
/**
* @return
*/
public String getModule() {
return module;
}
/**
* @return
*/
public String getOutDir() {
return outDir;
}
/**
* @param path
*/
public void setClasspath(Path path) {
classpath = path;
}
/**
* @param string
*/
public void setModule(String string) {
module = string;
}
/**
* @param string
*/
public void setOutDir(String string) {
outDir = string;
}
public Path createClasspath() {
if (classpath == null) {
classpath = new Path(project);
}
return classpath.createPath();
}
/**
* @return
*/
public boolean isCompile() {
return compile;
}
/**
* @param b
*/
public void setCompile(boolean b) {
compile = b;
}
}
1.1 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/utils/AntDeployContext.java
Index: AntDeployContext.java
===================================================================
/*
* Copyright 2001-2004 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.geronimo.ews.ws4j2ee.utils;
import org.apache.axis.wsdl.fromJava.Emitter;
import org.apache.geronimo.ews.ws4j2ee.toWs.GenerationConstants;
import org.apache.geronimo.ews.ws4j2ee.toWs.Ws4J2eeDeployContext;
import org.apache.geronimo.ews.ws4j2ee.utils.packager.load.PackageModule;
import org.apache.geronimo.ews.ws4j2ee.utils.packager.load.PackageModuleFactory;
/**
* @author hemapani@opensource.lk
*/
public class AntDeployContext implements Ws4J2eeDeployContext{
private boolean compile = false;
/**
* Field module
*/
private PackageModule module;
/**
* Field moduleLocation
*/
private String moduleLocation;
/**
* Field outputLocation
*/
private String outputLocation;
/**
* Constructor GeronimoWsDeployContext
*
* @param moduleLocation
* @param outputLocation
*/
public AntDeployContext(String moduleLocation,
String outputLocation,ClassLoader parentCL) {
module =
PackageModuleFactory.createPackageModule(moduleLocation,parentCL, true);
this.moduleLocation = moduleLocation;
this.outputLocation = outputLocation;
}
/**
* Method getMode
*
* @return
*/
public int getMode() {
return Emitter.MODE_ALL;
}
/**
* Method getWsdlImplFilename
*
* @return
*/
public String getWsdlImplFilename() {
return null;
}
/**
* Method getModule
*
* @return
*/
public PackageModule getModule() {
return module;
}
/**
* Method getModuleLocation
*
* @return
*/
public String getModuleLocation() {
return moduleLocation;
}
/**
* Method getContanier
*
* @return
*/
public String getContanier() {
return GenerationConstants.GERONIMO_CONTAINER;
}
/**
* Method getImplStyle
*
* @return
*/
public String getImplStyle() {
return GenerationConstants.USE_INTERNALS;
}
/**
* Method getOutPutLocation
*
* @return
*/
public String getOutPutLocation() {
return outputLocation;
}
/**
* @return
*/
public boolean isCompile() {
return compile;
}
}
1.7 +1 -2 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/wrapperWs/geronimo/InternalBasedWrapperClassWriter.java
Index: InternalBasedWrapperClassWriter.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/wrapperWs/geronimo/InternalBasedWrapperClassWriter.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- InternalBasedWrapperClassWriter.java 19 Jul 2004 15:40:47 -0000 1.6
+++ InternalBasedWrapperClassWriter.java 26 Jul 2004 12:21:49 -0000 1.7
@@ -54,12 +54,11 @@
*/
package org.apache.geronimo.ews.ws4j2ee.toWs.wrapperWs.geronimo;
-import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.Iterator;
-import org.apache.axis.components.logger.LogFactory;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.ews.ws4j2ee.context.J2EEWebServiceContext;
import org.apache.geronimo.ews.ws4j2ee.context.SEIOperation;
import org.apache.geronimo.ews.ws4j2ee.toWs.GenerationFault;
1.10 +1 -1 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/utils/packager/JARFile.java
Index: JARFile.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/utils/packager/JARFile.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- JARFile.java 19 Jul 2004 15:40:48 -0000 1.9
+++ JARFile.java 26 Jul 2004 12:21:50 -0000 1.10
@@ -69,8 +69,8 @@
import java.util.jar.JarOutputStream;
import java.util.zip.ZipEntry;
-import org.apache.axis.components.logger.LogFactory;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.ews.ws4j2ee.toWs.GenerationFault;
/**
1.7 +1 -1 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/utils/packager/Packager.java
Index: Packager.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/utils/packager/Packager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Packager.java 19 Jul 2004 15:40:48 -0000 1.6
+++ Packager.java 26 Jul 2004 12:21:50 -0000 1.7
@@ -60,8 +60,8 @@
import java.io.IOException;
import java.util.ArrayList;
-import org.apache.axis.components.logger.LogFactory;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.ews.ws4j2ee.toWs.GenerationFault;
public class Packager {
1.5 +5 -2 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/context/webservices/server/WSCFDocumentImpl.java
Index: WSCFDocumentImpl.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/context/webservices/server/WSCFDocumentImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WSCFDocumentImpl.java 27 May 2004 15:30:48 -0000 1.4
+++ WSCFDocumentImpl.java 26 Jul 2004 12:21:50 -0000 1.5
@@ -60,6 +60,7 @@
import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
+import org.apache.geronimo.ews.ws4j2ee.context.J2EEWebServiceContext;
import org.apache.geronimo.ews.ws4j2ee.context.webservices.server.interfaces.WSCFConstants;
import org.apache.geronimo.ews.ws4j2ee.context.webservices.server.interfaces.WSCFDocument;
import org.apache.geronimo.ews.ws4j2ee.context.webservices.server.interfaces.WSCFWebservices;
@@ -81,6 +82,7 @@
*/
private WSCFWebservices webservices;
+
/////////////////////////////////The jaxb delegation block////////////////////////////////////////////////
//This is kept basically to meet the future demands of the serialising.
@@ -88,8 +90,9 @@
public WSCFDocumentImpl(InputStream in)throws WSCFException{
try{
-
- JAXBContext jc = JAXBContext.newInstance( "org.apache.geronimo.ews.ws4j2ee.context.webservices.server.jaxb" );
+ JAXBContext jc
+ = JAXBContext.newInstance(
+ "org.apache.geronimo.ews.ws4j2ee.context.webservices.server.jaxb");
// create an Unmarshaller
Unmarshaller unmarshaller = jc.createUnmarshaller();
1.6 +2 -1 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/context/webservices/server/WSCFContextImpl.java
Index: WSCFContextImpl.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/context/webservices/server/WSCFContextImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WSCFContextImpl.java 12 Jul 2004 04:14:27 -0000 1.5
+++ WSCFContextImpl.java 26 Jul 2004 12:21:50 -0000 1.6
@@ -56,6 +56,7 @@
import java.io.InputStream;
+import org.apache.geronimo.ews.ws4j2ee.context.J2EEWebServiceContext;
import org.apache.geronimo.ews.ws4j2ee.context.webservices.server.interfaces.WSCFContext;
import org.apache.geronimo.ews.ws4j2ee.context.webservices.server.interfaces.WSCFDocument;
import org.apache.geronimo.ews.ws4j2ee.context.webservices.server.interfaces.WSCFWebserviceDescription;
@@ -81,7 +82,7 @@
* @param document The document object to the webservices.xml
* @throws WSCFException
*/
- public WSCFContextImpl(InputStream in) throws WSCFException{
+ public WSCFContextImpl(InputStream in,J2EEWebServiceContext context) throws WSCFException{
this.document = (WSCFDocument) new WSCFDocumentImpl(in);
}
1.3 +9 -3 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/utils/packager/load/WARPackageModule.java
Index: WARPackageModule.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/utils/packager/load/WARPackageModule.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WARPackageModule.java 27 Jun 2004 15:20:24 -0000 1.2
+++ WARPackageModule.java 26 Jul 2004 12:21:50 -0000 1.3
@@ -28,20 +28,26 @@
*/
public class WARPackageModule extends AbstractPackageModule {
private UncompressingJarClassLoader cl;
+ private ClassLoader parentCL;
/**
* @param jarFile
* @throws GenerationFault
*/
- public WARPackageModule(String jarFile, boolean firstmodule)
+ public WARPackageModule(String jarFile, ClassLoader parentCL,boolean firstmodule)
throws GenerationFault {
- super(jarFile);
+ super(jarFile,parentCL);
+
if (firstmodule) {
+ if(parentCL == null){
+ parentCL = Thread.currentThread().getContextClassLoader();
+ }
cl =
new UncompressingJarClassLoader(
GenerationConstants.CONFIG_STORE,
new File(zip.getName()),
"WEB-INF/classes",
- "WEB-INF/lib");
+ "WEB-INF/lib",
+ parentCL);
}
wscfFile = getInputStreamForJarEntry(jarFile, "WEB-INF/webservice.xml");
if (wscfFile == null) {
1.2 +30 -20 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/utils/packager/load/JarPackageModule.java
Index: JarPackageModule.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/utils/packager/load/JarPackageModule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JarPackageModule.java 22 Jun 2004 09:13:44 -0000 1.1
+++ JarPackageModule.java 26 Jul 2004 12:21:50 -0000 1.2
@@ -17,42 +17,52 @@
package org.apache.geronimo.ews.ws4j2ee.utils.packager.load;
import java.io.File;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLClassLoader;
import java.util.Vector;
import org.apache.axis.utils.ClassUtils;
import org.apache.geronimo.ews.ws4j2ee.toWs.GenerationFault;
+import org.apache.geronimo.ews.ws4j2ee.toWs.UnrecoverableGenerationFault;
/**
* @author Srinath Perera(hemapani@opensource.lk)
*/
public class JarPackageModule extends AbstractPackageModule {
private ClassLoader cl;
- private Vector list = new Vector(1);;
+ private Vector list = new Vector(1);
/**
* @param jarFile
* @throws GenerationFault
*/
- public JarPackageModule(String jarFile, boolean firstmodule)
+ public JarPackageModule(String jarFile, ClassLoader parentCL,boolean firstmodule)
throws GenerationFault {
- super(jarFile);
- list.add(new File(jarFile));
- if (firstmodule)
- cl =
- ClassUtils.createClassLoader(
- zip.getName(),
- this.getClass().getClassLoader());
- wscfFile =
- getInputStreamForJarEntry(jarFile, "META-INF/webservice.xml");
- if (wscfFile == null) {
- wscfFile = getInputStreamForJarEntry(jarFile, "webservice.xml");
+ super(jarFile,parentCL);
+ try {
+ this.parentCL = parentCL;
+ list.add(new File(jarFile));
+ if (firstmodule){
+ if(parentCL == null){
+ throw new UnrecoverableGenerationFault("parent class loader must not be null");
+ }
+ cl = new URLClassLoader(new URL[]{(new File(jarFile)).toURL()},parentCL);
+ }
+ wscfFile =
+ getInputStreamForJarEntry(jarFile, "META-INF/webservice.xml");
+ if (wscfFile == null) {
+ wscfFile = getInputStreamForJarEntry(jarFile, "webservice.xml");
+ }
+ webddfile = getInputStreamForJarEntry(jarFile, "META-INF/web.xml");
+ if (wscfFile == null) {
+ webddfile = getInputStreamForJarEntry(jarFile, "web.xml");
+ }
+ ejbJarfile = getInputStreamForJarEntry(jarFile, "META-INF/ejb-jar.xml");
+ if (wscfFile == null && firstmodule)
+ throw new GenerationFault("wscf file must not be null");
+ } catch (MalformedURLException e) {
+ throw GenerationFault.createGenerationFault(e);
}
- webddfile = getInputStreamForJarEntry(jarFile, "META-INF/web.xml");
- if (wscfFile == null) {
- webddfile = getInputStreamForJarEntry(jarFile, "web.xml");
- }
- ejbJarfile = getInputStreamForJarEntry(jarFile, "META-INF/ejb-jar.xml");
- if (wscfFile == null && firstmodule)
- throw new GenerationFault("wscf file must not be null");
}
/* (non-Javadoc)
1.4 +11 -4 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/utils/packager/load/EARPackageModule.java
Index: EARPackageModule.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/utils/packager/load/EARPackageModule.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EARPackageModule.java 12 Jul 2004 04:14:27 -0000 1.3
+++ EARPackageModule.java 26 Jul 2004 12:21:50 -0000 1.4
@@ -29,20 +29,25 @@
public class EARPackageModule extends AbstractPackageModule {
private UncompressingJarClassLoader cl;
private Vector classPathElements;
+ private ClassLoader parentCL;
/**
* @param jarFile
* @throws GenerationFault
*/
- public EARPackageModule(String jarFile, boolean firstmodule)
+ public EARPackageModule(String jarFile,ClassLoader parentCL, boolean firstmodule)
throws GenerationFault {
- super(jarFile);
+ super(jarFile,parentCL);
if (firstmodule) {
+ if(parentCL == null){
+ parentCL = Thread.currentThread().getContextClassLoader();
+ }
cl =
new UncompressingJarClassLoader(
GenerationConstants.CONFIG_STORE,
new File(zip.getName()),
null,
- "");
+ "",
+ parentCL);
}
wscfFile =
getInputStreamForJarEntry(jarFile, "META-INF/webservice.xml");
@@ -58,7 +63,8 @@
module =
PackageModuleFactory.createPackageModule(
cl.getDir() + files[i],
- false);
+ parentCL,
+ false);
ejbJarfile = module.getEjbJarfile();
break;
}
@@ -69,6 +75,7 @@
module =
PackageModuleFactory.createPackageModule(
cl.getDir() + files[i],
+ parentCL,
false);
webddfile = module.getWebddfile();
break;
1.3 +3 -1 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/utils/packager/load/AbstractPackageModule.java
Index: AbstractPackageModule.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/utils/packager/load/AbstractPackageModule.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractPackageModule.java 12 Jul 2004 04:14:27 -0000 1.2
+++ AbstractPackageModule.java 26 Jul 2004 12:21:50 -0000 1.3
@@ -35,9 +35,11 @@
protected InputStream wsdlfile;
protected InputStream jaxrpcfile;
protected ZipFile zip;
+ protected ClassLoader parentCL;
- public AbstractPackageModule(String jarFile) throws GenerationFault {
+ public AbstractPackageModule(String jarFile,ClassLoader parentCL) throws GenerationFault {
try {
+ this.parentCL = parentCL;
zip = new JarFile(jarFile);
} catch (IOException e) {
e.printStackTrace();
1.2 +4 -2 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/utils/packager/load/DirPackageModule.java
Index: DirPackageModule.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/utils/packager/load/DirPackageModule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DirPackageModule.java 12 Jul 2004 04:14:27 -0000 1.1
+++ DirPackageModule.java 26 Jul 2004 12:21:50 -0000 1.2
@@ -35,14 +35,16 @@
protected InputStream webddfile;
protected InputStream ejbJarfile;
private String location;
+ private ClassLoader parentCL;
/**
* @param jarFile
* @throws GenerationFault
*/
- public DirPackageModule(String location)
+ public DirPackageModule(String location,ClassLoader parentCL)
throws GenerationFault {
File file = null;
+ this.parentCL = parentCL;
this.location = location;
try {
file = new File(location+ "/WEB-INF/webservice.xml");
@@ -117,7 +119,7 @@
public ClassLoader getClassLoaderWithPackageLoaded() throws GenerationFault {
try {
File file = new File(location);
- return new URLClassLoader(new URL[]{file.toURL()});
+ return new URLClassLoader(new URL[]{file.toURL()},parentCL);
} catch (MalformedURLException e) {
throw GenerationFault.createGenerationFault(e);
}
1.4 +16 -5 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/utils/packager/load/PackageModuleFactory.java
Index: PackageModuleFactory.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/utils/packager/load/PackageModuleFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PackageModuleFactory.java 19 Jul 2004 15:40:48 -0000 1.3
+++ PackageModuleFactory.java 26 Jul 2004 12:21:50 -0000 1.4
@@ -32,19 +32,30 @@
* @return
* @throws GenerationFault
*/
+
+ public static PackageModule createPackageModule(
+ String path,boolean firstmodule)throws UnrecoverableGenerationFault{
+ return createPackageModule(path,Thread.currentThread().getContextClassLoader(),firstmodule);
+ }
+
+
public static PackageModule createPackageModule(
- String path,boolean firstmodule)throws UnrecoverableGenerationFault{
+ String path,
+ ClassLoader parentCL,
+ boolean firstmodule)throws UnrecoverableGenerationFault{
try {
if (path != null) {
File file = new File(path);
+ if(!file.exists())
+ throw new UnrecoverableGenerationFault("file not found "+file.getAbsolutePath());
if(file.isDirectory()){
- return new DirPackageModule(path);
+ return new DirPackageModule(path,parentCL);
}else if (path.endsWith(".jar") || path.endsWith(".JAR"))
- return new JarPackageModule(path, firstmodule);
+ return new JarPackageModule(path,parentCL,firstmodule);
else if (path.endsWith(".war") || path.endsWith(".WAR"))
- return new WARPackageModule(path, firstmodule);
+ return new WARPackageModule(path, parentCL, firstmodule);
else if (path.endsWith(".ear") || path.endsWith(".EAR"))
- return new EARPackageModule(path, firstmodule);
+ return new EARPackageModule(path, parentCL, firstmodule);
else if(path.endsWith(".xml"))
return new DirPackageModule(new File(path));
else
1.4 +1 -2 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/dd/JaxrpcMapperGenerator.java
Index: JaxrpcMapperGenerator.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/dd/JaxrpcMapperGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JaxrpcMapperGenerator.java 22 Jun 2004 09:13:44 -0000 1.3
+++ JaxrpcMapperGenerator.java 26 Jul 2004 12:21:51 -0000 1.4
@@ -54,14 +54,13 @@
*/
package org.apache.geronimo.ews.ws4j2ee.toWs.dd;
-
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
-import org.apache.axis.components.logger.LogFactory;
import org.apache.axis.wsdl.Java2WSDL;
import org.apache.axis.wsdl.fromJava.Emitter;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.ews.ws4j2ee.context.InputOutputFile;
import org.apache.geronimo.ews.ws4j2ee.context.J2EEWebServiceContext;
import org.apache.geronimo.ews.ws4j2ee.toWs.GenerationFault;
1.11 +1 -1 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/dd/J2EEContainerSpecificDDGenerator.java
Index: J2EEContainerSpecificDDGenerator.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/dd/J2EEContainerSpecificDDGenerator.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- J2EEContainerSpecificDDGenerator.java 19 Jul 2004 15:40:47 -0000 1.10
+++ J2EEContainerSpecificDDGenerator.java 26 Jul 2004 12:21:51 -0000 1.11
@@ -54,8 +54,8 @@
*/
package org.apache.geronimo.ews.ws4j2ee.toWs.dd;
-import org.apache.axis.components.logger.LogFactory;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.ews.ws4j2ee.context.J2EEWebServiceContext;
import org.apache.geronimo.ews.ws4j2ee.toWs.GenerationConstants;
import org.apache.geronimo.ews.ws4j2ee.toWs.GenerationFault;
1.5 +1 -1 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/dd/WebContainerDDGenerator.java
Index: WebContainerDDGenerator.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/dd/WebContainerDDGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WebContainerDDGenerator.java 14 Jun 2004 08:30:03 -0000 1.4
+++ WebContainerDDGenerator.java 26 Jul 2004 12:21:51 -0000 1.5
@@ -53,8 +53,8 @@
* <http://www.apache.org/>.
*/package org.apache.geronimo.ews.ws4j2ee.toWs.dd;
-import org.apache.axis.components.logger.LogFactory;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.ews.ws4j2ee.context.J2EEWebServiceContext;
import org.apache.geronimo.ews.ws4j2ee.toWs.GenerationFault;
import org.apache.geronimo.ews.ws4j2ee.toWs.Generator;
1.9 +1 -1 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/context/wsdl/impl/AxisWSDLContext.java
Index: AxisWSDLContext.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/context/wsdl/impl/AxisWSDLContext.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AxisWSDLContext.java 12 Jul 2004 04:14:28 -0000 1.8
+++ AxisWSDLContext.java 26 Jul 2004 12:21:51 -0000 1.9
@@ -66,7 +66,6 @@
import javax.wsdl.Service;
import javax.xml.namespace.QName;
-import org.apache.axis.components.logger.LogFactory;
import org.apache.axis.wsdl.symbolTable.BindingEntry;
import org.apache.axis.wsdl.symbolTable.Element;
import org.apache.axis.wsdl.symbolTable.PortEntry;
@@ -76,6 +75,7 @@
import org.apache.axis.wsdl.symbolTable.SymbolTable;
import org.apache.axis.wsdl.symbolTable.TypeEntry;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.ews.ws4j2ee.context.wsdl.WSDLContext;
import org.apache.geronimo.ews.ws4j2ee.context.wsdl.type.SchemaType;
1.5 +1 -1 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/wsdl/WSDLGenerator.java
Index: WSDLGenerator.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/wsdl/WSDLGenerator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WSDLGenerator.java 19 Jul 2004 15:40:47 -0000 1.4
+++ WSDLGenerator.java 26 Jul 2004 12:21:51 -0000 1.5
@@ -55,11 +55,11 @@
package org.apache.geronimo.ews.ws4j2ee.toWs.wsdl;
-import org.apache.axis.components.logger.LogFactory;
import org.apache.axis.utils.ClassUtils;
import org.apache.axis.wsdl.Java2WSDL;
import org.apache.axis.wsdl.fromJava.Emitter;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
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;
1.3 +1 -1 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/parsers/impl/ParserFactoryImpl.java
Index: ParserFactoryImpl.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/parsers/impl/ParserFactoryImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ParserFactoryImpl.java 19 Jul 2004 15:40:47 -0000 1.2
+++ ParserFactoryImpl.java 26 Jul 2004 12:21:51 -0000 1.3
@@ -82,7 +82,7 @@
InputStream inputStream)
throws GenerationFault {
try {
- return new WSCFContextImpl(inputStream);
+ return new WSCFContextImpl(inputStream,context);
} catch (WSCFException e) {
throw GenerationFault.createGenerationFault(e);
}
1.15 +3 -1 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/misc/BuildFileGenerator.java
Index: BuildFileGenerator.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/misc/BuildFileGenerator.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- BuildFileGenerator.java 19 Jul 2004 15:40:47 -0000 1.14
+++ BuildFileGenerator.java 26 Jul 2004 12:21:51 -0000 1.15
@@ -65,8 +65,8 @@
import java.util.StringTokenizer;
import java.util.Vector;
-import org.apache.axis.components.logger.LogFactory;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.geronimo.ews.ws4j2ee.context.InputOutputFile;
import org.apache.geronimo.ews.ws4j2ee.context.J2EEWebServiceContext;
import org.apache.geronimo.ews.ws4j2ee.toWs.GenerationConstants;
@@ -164,6 +164,8 @@
out.write(" <include name=\"dom4j/**/*.jar\"/>\n");
out.write(" <include name=\"jaxb-ri/**/*.jar\"/>\n");
out.write(" <include name=\"xerces/**/*.jar\"/>\n");
+ out.write(" <include name=\"ews/**/*.jar\"/>\n");
+ out.write(" <include name=\"openejb/**/*.jar\"/>\n");
out.write(" </fileset>\n");
}
StringTokenizer tok = getClasspathComponets();
1.11 +4 -0 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/context/MiscInfo.java
Index: MiscInfo.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/context/MiscInfo.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MiscInfo.java 12 Jul 2004 04:14:26 -0000 1.10
+++ MiscInfo.java 26 Jul 2004 12:21:51 -0000 1.11
@@ -187,4 +187,8 @@
public ClassLoader getClassloader();
public void setClassloader(ClassLoader loader);
+
+ public boolean isCompile();
+ public void setCompile(boolean compile);
+
}
1.12 +15 -0 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/context/impl/MiscInfoImpl.java
Index: MiscInfoImpl.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/context/impl/MiscInfoImpl.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- MiscInfoImpl.java 12 Jul 2004 04:14:28 -0000 1.11
+++ MiscInfoImpl.java 26 Jul 2004 12:21:51 -0000 1.12
@@ -99,6 +99,7 @@
private String implStyle = GenerationConstants.USE_LOCAL_AND_REMOTE;
private boolean seiExists = false;
private Vector classpathelements;
+ private boolean compile = true;
private WSCFHandler[] handlers;
public MiscInfoImpl() {
@@ -343,6 +344,20 @@
*/
public void setClassloader(ClassLoader loader) {
classloader = loader;
+ }
+
+ /**
+ * @return
+ */
+ public boolean isCompile() {
+ return compile;
+ }
+
+ /**
+ * @param b
+ */
+ public void setCompile(boolean b) {
+ compile = b;
}
}