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/11/02 10:39:35 UTC
cvs commit: ws-axis/contrib/ews/test/org/apache/geronimo/ews/ws4j2ee WebApplicationTest.java
hemapani 2004/11/02 01:39:35
Modified: contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/ws
J2eeDeployWriter.java
contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/toWs/misc
BuildFileGenerator.java
contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/wsutils
EWSProvider.java
contrib/ews/conf/META-INF/services
org.apache.axis.deployment.wsdd.Provider
contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/utils/packager
Packager.java
contrib/ews/test/org/apache/geronimo/ews/ws4j2ee
WebApplicationTest.java
Log:
fix the Provider using for the web based case , but keep it off yet till verified.
Revision Changes Path
1.13 +12 -8 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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- J2eeDeployWriter.java 27 Oct 2004 14:59:38 -0000 1.12
+++ J2eeDeployWriter.java 2 Nov 2004 09:39:34 -0000 1.13
@@ -41,6 +41,7 @@
import org.apache.geronimo.ews.ws4j2ee.context.webservices.server.interfaces.WSCFHandler;
import org.apache.geronimo.ews.ws4j2ee.context.webservices.server.interfaces.WSCFInitParam;
import org.apache.geronimo.ews.ws4j2ee.toWs.GenerationConstants;
+import org.apache.geronimo.ews.ws4j2ee.wsutils.EWSProvider;
import javax.wsdl.Binding;
import javax.wsdl.BindingOperation;
@@ -363,7 +364,7 @@
// pw.println(" <service name=\"" + serviceName + "\" provider=\""
// + prefix + ":RPC" + "\"" + styleStr + useStr + ">");
// }
- if (useProvider) {
+ if (this.useProvider) {
String continer = wscontext.getMiscInfo().getTargetJ2EEContainer();
if (GenerationConstants.GERONIMO_CONTAINER.equals(continer)) {
pw.println(" <service name=\"" + serviceName + "\" provider=\"java:geronimo\""
@@ -378,30 +379,33 @@
}
EJBContext ejbcontext = wscontext.getEJBDDContext();
if (ejbcontext != null) {
+ pw.println(" <parameter name=\""+EWSProvider.OPTION_USE_EJB+"\" value=\"ejb\"/>");
if (ejbcontext.getEjbhomeInterface() != null) {
- pw.println(" <parameter name=\"homeInterfaceName\" value=\""
+ pw.println(" <parameter name=\""+EWSProvider.OPTION_HOMEINTERFACE_NAME+"\" value=\""
+ ejbcontext.getEjbhomeInterface() + "\"/>");
}
if (ejbcontext.getEjbRemoteInterface() != null) {
- pw.println(" <parameter name=\"remoteInterfaceName\" value=\""
+ pw.println(" <parameter name=\""+EWSProvider.OPTION_REMOTEINTERFACE_NAME+"\" value=\""
+ ejbcontext.getEjbRemoteInterface() + "\"/>");
}
if (ejbcontext.getEjbLocalHomeInterfce() != null) {
- pw.println(" <parameter name=\"localHomeInterfaceName\" value=\""
+ pw.println(" <parameter name=\""+EWSProvider.OPTION_LOCALHOMEINTERFACE_NAME+"\" value=\""
+ ejbcontext.getEjbLocalHomeInterfce() + "\"/>");
}
if (ejbcontext.getEjbLocalInterface() != null) {
- pw.println(" <parameter name=\"localInterfaceName\" value=\""
+ pw.println(" <parameter name=\""+EWSProvider.OPTION_LOCALINTERFACE_NAME+"\" value=\""
+ ejbcontext.getEjbLocalInterface() + "\"/>");
}
if (ejbcontext.getEjbRemoteInterface() != null) {
- pw.println(" <parameter name=\"beanJndiName\" value=\""
+ pw.println(" <parameter name=\""+EWSProvider.OPTION_HOMEINTERFACE_NAME+"\" value=\""
+ "ejb/" + ejbcontext.getEjbName() + "\"/>");
}
if (ejbcontext.getEjbRemoteInterface() != null) {
- pw.println(" <parameter name=\"beanName\" value=\""
+ pw.println(" <parameter name=\""+EWSProvider.OPTION_EJB_NAME+"\" value=\""
+ ejbcontext.getEjbName() + "\"/>");
}
+ }else{
+ pw.println(" <parameter name=\""+EWSProvider.OPTION_USE_EJB+"\" value=\"web\"/>");
}
pw.println(" <parameter name=\"wsdlTargetNamespace\" value=\""
+ service.getQName().getNamespaceURI() + "\"/>");
@@ -441,7 +445,7 @@
} else {
className += "Impl";
}
- if (useProvider) {
+ if (this.useProvider) {
WebContext webContext = wscontext.getWebDDContext();
if (webContext != null) {
pw.println(" <parameter name=\"className\" value=\"" + webContext.getServletClass()
1.24 +4 -4 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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- BuildFileGenerator.java 27 Oct 2004 14:59:38 -0000 1.23
+++ BuildFileGenerator.java 2 Nov 2004 09:39:35 -0000 1.24
@@ -132,10 +132,10 @@
out.write(" <include name=\"openejb/**/*.jar\"/>\n");
out.write(" </fileset>\n");
}
- StringTokenizer tok = getClasspathComponets();
- while (tok.hasMoreTokens()) {
- out.write(" <pathelement location=\"" + tok.nextToken() + "\"/>\n");
- }
+// StringTokenizer tok = getClasspathComponets();
+// while (tok.hasMoreTokens()) {
+// out.write(" <pathelement location=\"" + tok.nextToken() + "\"/>\n");
+// }
out.write(" </path>\n");
out.write(" <target name=\"compile\">\n");
out.write(" <mkdir dir=\"${build.classes}\"/>\n");
1.6 +13 -9 ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/wsutils/EWSProvider.java
Index: EWSProvider.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/src/org/apache/geronimo/ews/ws4j2ee/wsutils/EWSProvider.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- EWSProvider.java 27 Oct 2004 14:59:38 -0000 1.5
+++ EWSProvider.java 2 Nov 2004 09:39:35 -0000 1.6
@@ -18,6 +18,7 @@
import org.apache.axis.AxisFault;
import org.apache.axis.MessageContext;
+import org.apache.axis.handlers.soap.SOAPService;
import org.apache.axis.providers.java.RPCProvider;
import org.apache.axis.utils.ClassUtils;
@@ -36,6 +37,7 @@
public static final String OPTION_REMOTEINTERFACE_NAME = "remoteInterfaceName";
public static final String OPTION_LOCALHOMEINTERFACE_NAME = "localHomeInterfaceName";
public static final String OPTION_LOCALINTERFACE_NAME = "localInterfaceName";
+ public static final String OPTION_USE_EJB = "j2eeStyle";
private String ejblookupName;
private String localhome;
@@ -43,12 +45,14 @@
private String remote;
private String local;
- private boolean ejbbased = true;
+ private boolean ejbbased = false;
protected Object makeNewServiceObject(MessageContext msgContext,
String clsName)
throws Exception {
- if (ejbbased) {
+ SOAPService service = msgContext.getService();
+ String j2eeStyle = (String) service.getOption(OPTION_LOCALINTERFACE_NAME);
+ if("web".equals(j2eeStyle) ){
java.util.Properties env = new java.util.Properties();
InputStream jndiIn = ClassUtils.getResourceAsStream(getClass(), "jndi.properties");
if (jndiIn != null) {
@@ -57,11 +61,11 @@
throw new AxisFault("Do not find the JNDI properties file in the class path");
}
javax.naming.Context initial = new javax.naming.InitialContext(env);
- ejblookupName = (String) getOption(OPTION_JNDI_LOOKUP_NAME);
- remote = (String) getOption(OPTION_REMOTEINTERFACE_NAME);
- home = (String) getOption(OPTION_HOMEINTERFACE_NAME);
- local = (String) getOption(OPTION_LOCALINTERFACE_NAME);
- localhome = (String) getOption(OPTION_LOCALHOMEINTERFACE_NAME);
+ ejblookupName = (String) service.getOption(OPTION_JNDI_LOOKUP_NAME);
+ remote = (String) service.getOption(OPTION_REMOTEINTERFACE_NAME);
+ home = (String) service.getOption(OPTION_HOMEINTERFACE_NAME);
+ local = (String) service.getOption(OPTION_LOCALINTERFACE_NAME);
+ localhome = (String) service.getOption(OPTION_LOCALHOMEINTERFACE_NAME);
if (remote != null && home != null && ejblookupName != null) {
Object objref = initial.lookup(ejblookupName);
Class homeClass = ClassUtils.forName(home);
@@ -74,9 +78,9 @@
Method method = homeClass.getMethod("create", new Class[]{});
return method.invoke(homeObj, new Object[]{});
}
- throw new AxisFault("Wrong configuration");
+ throw new AxisFault("Wrong configuration remote="+ remote + "home =" + home + "ejblookupName" + ejblookupName );
} else {
- return makeNewServiceObject(msgContext, clsName);
+ return super.makeNewServiceObject(msgContext, clsName);
}
}
1.2 +3 -1 ws-axis/contrib/ews/conf/META-INF/services/org.apache.axis.deployment.wsdd.Provider
Index: org.apache.axis.deployment.wsdd.Provider
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/conf/META-INF/services/org.apache.axis.deployment.wsdd.Provider,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- org.apache.axis.deployment.wsdd.Provider 9 Jul 2004 02:21:51 -0000 1.1
+++ org.apache.axis.deployment.wsdd.Provider 2 Nov 2004 09:39:35 -0000 1.2
@@ -1 +1,3 @@
-org.apache.geronimo.ews.ws4j2ee.wsutils.WSDDJavaJ2EEProvider
\ No newline at end of file
+org.apache.geronimo.ews.ws4j2ee.wsutils.WSDDJavaJ2EEProvider
+org.apache.geronimo.ews.ws4j2ee.wsutils.WSDDJavaEWSProvider
+org.apache.geronimo.axis.WSDDJavaGeronimoProvider
\ No newline at end of file
1.14 +4 -2 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.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Packager.java 27 Oct 2004 14:59:41 -0000 1.13
+++ Packager.java 2 Nov 2004 09:39:35 -0000 1.14
@@ -50,10 +50,12 @@
for (int j = 0; j < list.size(); j++) {
File temp = new File((String) list.get(j));
String filename = temp.getAbsolutePath();
- int index = filename.indexOf("classes/");
+ String checkedfor = "classes";
+ int index = filename.indexOf(checkedfor);
if (index > 0) {
- filename = filename.substring(index + "classes/".length());
+ filename = filename.substring(index + checkedfor.length()+1);
}
+ filename = filename.replace('\\','/');
JARFileEntry newEntry =
new JARFileEntry(filename,
new FileInputStream(temp));
1.5 +31 -18 ws-axis/contrib/ews/test/org/apache/geronimo/ews/ws4j2ee/WebApplicationTest.java
Index: WebApplicationTest.java
===================================================================
RCS file: /home/cvs/ws-axis/contrib/ews/test/org/apache/geronimo/ews/ws4j2ee/WebApplicationTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WebApplicationTest.java 28 Oct 2004 05:21:20 -0000 1.4
+++ WebApplicationTest.java 2 Nov 2004 09:39:35 -0000 1.5
@@ -34,6 +34,7 @@
import org.apache.axis.deployment.wsdd.WSDDDocument;
import org.apache.axis.transport.http.SimpleAxisServer;
import org.apache.axis.utils.ClassUtils;
+import org.apache.axis.utils.tcpmon;
import org.apache.geronimo.ews.AbstractTestCase;
import org.apache.geronimo.ews.ws4j2ee.toWs.Ws4J2ee;
@@ -41,35 +42,47 @@
* @author Srinath Perera(hemapani@opensource.lk)
*/
public class WebApplicationTest extends AbstractTestCase{
+ private boolean useTcpMon = true;
+ private tcpmon tcpmon;
+ private int sendPort = 4444;
+ private int serverport = 4444;
+
public WebApplicationTest(String testName) {
super(testName);
}
protected void setUp() throws Exception {
-// File wsddFile = new File(getTestFile("target/server-config.wsdd"));
-// wsddFile.delete();
-// wsddFile.createNewFile();
-// OutputStream out = new FileOutputStream(wsddFile);
+ if(useTcpMon){
+ sendPort = 5555;
+ tcpmon = new tcpmon(sendPort,"127.0.0.1",serverport);
+
+ }
+
+
+ File wsddFile = new File(getTestFile("target/server-config.wsdd"));
+ wsddFile.delete();
+ wsddFile.createNewFile();
+ OutputStream out = new FileOutputStream(wsddFile);
InputStream in = Thread.currentThread().getContextClassLoader()
.getResourceAsStream("org/apache/axis/server/server-config.wsdd");
-// byte[] buf = new byte[1024];
-// int read = in.read(buf);
-//
-// while(read > 0){
-// out.write(buf,0,read);
-// read = in.read(buf);
-// }
-// in.close();
-// out.close();
+ byte[] buf = new byte[1024];
+ int read = in.read(buf);
+
+ while(read > 0){
+ out.write(buf,0,read);
+ read = in.read(buf);
+ }
+ in.close();
+ out.close();
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
dbf.setNamespaceAware(true);
DocumentBuilder db = dbf.newDocumentBuilder();
- WSDDDocument wsdddoc = new WSDDDocument(db.parse(in));
+ WSDDDocument wsdddoc = new WSDDDocument(db.parse(wsddFile));
SimpleAxisServer sas = new SimpleAxisServer();
- sas.setServerSocket(new ServerSocket(5555));
+ sas.setServerSocket(new ServerSocket(serverport));
sas.setMyConfig(wsdddoc.getDeployment());
sas.start();
@@ -84,7 +97,7 @@
File jarFile = new File("target/generated/samples/withoutWSDL/echo-war/echo-ewsimpl.jar");
- URLClassLoader cl = new URLClassLoader(new URL[]{jarFile.toURL()});
+ URLClassLoader cl = new URLClassLoader(new URL[]{jarFile.toURL()},Thread.currentThread().getContextClassLoader());
InputStream deplydd = cl.getResourceAsStream("deploy.wsdd");
assertNotNull(deplydd);
@@ -92,7 +105,7 @@
ClassUtils.setDefaultClassLoader(cl);
AdminClient adminClient = new AdminClient();
- URL requestUrl = new URL("http://localhost:5555/axis/services/AdminService");
+ URL requestUrl = new URL("http://localhost:"+sendPort+"/axis/services/AdminService");
Call call = adminClient.getCall();
call.setTargetEndpointAddress(requestUrl);
String result = adminClient.process(null, deplydd);
@@ -104,7 +117,7 @@
Object echoLoacater = echoLoacaterClass.newInstance();
Method getportMethod = echoLoacaterClass.getMethod("getechoPort", new Class[]{URL.class});
- URL serviceURL = new URL("http://localhost:5555/axis/services/echoPort");
+ URL serviceURL = new URL("http://localhost:"+sendPort+"/axis/services/echoPort");
Object echoPort = getportMethod.invoke(echoLoacater, new Object[]{serviceURL});
Class echoClass = echoPort.getClass();