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 de...@apache.org on 2005/05/30 12:38:26 UTC
svn commit: r179043 - in /webservices/axis/trunk/java/modules: core/
core/html/ core/samples/deployment/echo/
core/samples/deployment/echo/META-INF/ core/samples/deployment/echo/org/
core/samples/deployment/echo/org/apache/
core/samples/deployment/echo/org/apache/axis/
core/samples/deployment/echo/org/apache/axis/echo/
core/src/org/apache/axis/deployment/
core/src/org/apache/axis/deployment/listener/
core/src/org/apache/axis/deployment/repository/utill/ samples/
Author: deepal
Date: Mon May 30 03:38:22 2005
New Revision: 179043
URL: http://svn.apache.org/viewcvs?rev=179043&view=rev
Log:
Happy axis page , and wrote a echo service
Added:
webservices/axis/trunk/java/modules/core/axis2-core.iml
webservices/axis/trunk/java/modules/core/samples/deployment/echo/
webservices/axis/trunk/java/modules/core/samples/deployment/echo/META-INF/
webservices/axis/trunk/java/modules/core/samples/deployment/echo/META-INF/service.xml
webservices/axis/trunk/java/modules/core/samples/deployment/echo/build.xml
webservices/axis/trunk/java/modules/core/samples/deployment/echo/org/
webservices/axis/trunk/java/modules/core/samples/deployment/echo/org/apache/
webservices/axis/trunk/java/modules/core/samples/deployment/echo/org/apache/axis/
webservices/axis/trunk/java/modules/core/samples/deployment/echo/org/apache/axis/echo/
webservices/axis/trunk/java/modules/core/samples/deployment/echo/org/apache/axis/echo/Echo.java
Modified:
webservices/axis/trunk/java/modules/core/html/HappyAxis.jsp
webservices/axis/trunk/java/modules/core/maven.xml
webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/listener/RepositoryListenerImpl.java
webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/ArchiveReader.java
webservices/axis/trunk/java/modules/samples/maven.xml
Added: webservices/axis/trunk/java/modules/core/axis2-core.iml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/axis2-core.iml?rev=179043&view=auto
==============================================================================
--- webservices/axis/trunk/java/modules/core/axis2-core.iml (added)
+++ webservices/axis/trunk/java/modules/core/axis2-core.iml Mon May 30 03:38:22 2005
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="false" type="JAVA_MODULE">
+ <component name="ModuleRootManager" />
+ <component name="NewModuleRootManager">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/samples/deployment/echo" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/samples/deployment/invalidservice" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/samples/deployment/module1" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/samples/deployment/service1/org" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/samples/deployment/service2" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/samples/deployment/serviceModule" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+ </content>
+ <orderEntry type="jdk" jdkName="java version "1.4.2_04"" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="axis2-xml" />
+ <orderEntry type="module" module-name="axis2-wsdl" />
+ <orderEntry type="module-library">
+ <library name="commons-logging">
+ <CLASSES>
+ <root url="jar://C:/Documents and Settings/me/.maven/repository/commons-logging/jars/commons-logging-1.0.3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="stax">
+ <CLASSES>
+ <root url="jar://C:/Documents and Settings/me/.maven/repository/stax/jars/stax-1.1.1-dev.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="log4j">
+ <CLASSES>
+ <root url="jar://C:/Documents and Settings/me/.maven/repository/log4j/jars/log4j-1.2.8.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="stax-api">
+ <CLASSES>
+ <root url="jar://C:/Documents and Settings/me/.maven/repository/stax/jars/stax-api-1.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="james">
+ <CLASSES>
+ <root url="jar://C:/Documents and Settings/me/.maven/repository/james/jars/james-3.0a1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="geronimo-spec-servlet">
+ <CLASSES>
+ <root url="jar://C:/Documents and Settings/me/.maven/repository/geronimo-spec/jars/geronimo-spec-servlet-2.4-rc3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="commons-net">
+ <CLASSES>
+ <root url="jar://C:/Documents and Settings/me/.maven/repository/commons-net/jars/commons-net-1.3.0.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library name="geronimo-spec-javamail">
+ <CLASSES>
+ <root url="jar://C:/Documents and Settings/me/.maven/repository/geronimo-spec/jars/geronimo-spec-javamail-1.3.1-rc3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://C:/Documents and Settings/me/.maven/repository/axis/jars/axis-wsdl4j-1.2-RC1.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://C:/Documents and Settings/me/.maven/repository/axis/jars/axis-wsdl4j-1.2-RC3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://C:/Documents and Settings/me/.maven/repository/dom4j/jars/dom4j-1.4-dev-8.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="library" name="junit" level="application" />
+ <orderEntryProperties />
+ </component>
+</module>
+
Modified: webservices/axis/trunk/java/modules/core/html/HappyAxis.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/html/HappyAxis.jsp?rev=179043&r1=179042&r2=179043&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/html/HappyAxis.jsp (original)
+++ webservices/axis/trunk/java/modules/core/html/HappyAxis.jsp Mon May 30 03:38:22 2005
@@ -12,39 +12,47 @@
org.apache.axis.om.*,
org.apache.axis.soap.SOAPBody,
org.apache.axis.soap.SOAPEnvelope,
- org.apache.axis.soap.SOAPFactory"
+ org.apache.axis.soap.SOAPFactory,
+ org.apache.axis.Constants,
+ javax.xml.stream.XMLOutputFactory,
+ org.apache.axis.engine.AxisFault,
+ javax.xml.stream.XMLStreamException,
+ org.apache.commons.logging.Log,
+ org.apache.commons.logging.LogFactory,
+ javax.xml.namespace.QName,
+ java.io.StringWriter"
session="false" %>
<%
- /*
- * Copyright 2002,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.
- */
-%>
+ /*
+ * Copyright 2002,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.
+ */
+ %>
<head>
<title>Axis2 Happiness Page</title>
- <link href="css/axis-style.css" rel="stylesheet" type="text/css">
+<link href="css/axis-style.css" rel="stylesheet" type="text/css">
</head>
<body>
<jsp:include page="include/header.inc"></jsp:include>
<%port =request.getServerPort();%>
<%!
/*
- * Happiness tests for axis. These look at the classpath and warn if things
- * are missing. Normally addng this much code in a JSP page is mad
- * but here we want to validate JSP compilation too, and have a drop-in
- * page for easy re-use
- */
+ * Happiness tests for axis. These look at the classpath and warn if things
+ * are missing. Normally addng this much code in a JSP page is mad
+ * but here we want to validate JSP compilation too, and have a drop-in
+ * page for easy re-use
+ */
int port = 0;
/**
* Get a string providing install information.
@@ -53,9 +61,9 @@
public String getInstallHints(HttpServletRequest request) {
String hint=
- "<B><I>Note:</I></B> On Tomcat 4.x and Java1.4, you may need to put libraries that contain "
- +"java.* or javax.* packages into CATALINA_HOME/common/lib"
- +"<br>jaxrpc.jar and saaj.jar are two such libraries.";
+ "<B><I>Note:</I></B> On Tomcat 4.x and Java1.4, you may need to put libraries that contain "
+ +"java.* or javax.* packages into CATALINA_HOME/common/lib"
+ +"<br>jaxrpc.jar and saaj.jar are two such libraries.";
return hint;
}
@@ -111,25 +119,25 @@
try {
Class clazz = classExists(classname);
if(clazz == null) {
- String url="";
- if(homePage!=null) {
- url="<br> See <a href="+homePage+">"+homePage+"</a>";
- }
- out.write("<p>"+category+": could not find class "+classname
- +" from file <b>"+jarFile
- +"</b><br> "+errorText
- +url
- +"<p>");
- return 1;
+ String url="";
+ if(homePage!=null) {
+ url="<br> See <a href="+homePage+">"+homePage+"</a>";
+ }
+ out.write("<p>"+category+": could not find class "+classname
+ +" from file <b>"+jarFile
+ +"</b><br> "+errorText
+ +url
+ +"<p>");
+ return 1;
} else {
- String location = getLocation(out, clazz);
- if(location == null) {
- out.write("Found "+ description + " (" + classname + ")<br>");
- }
- else {
- out.write("Found "+ description + " (" + classname + ") at " + location + "<br>");
- }
- return 0;
+ String location = getLocation(out, clazz);
+ if(location == null) {
+ out.write("Found "+ description + " (" + classname + ")<br>");
+ }
+ else {
+ out.write("Found "+ description + " (" + classname + ") at " + location + "<br>");
+ }
+ return 0;
}
} catch(NoClassDefFoundError ncdfe) {
String url="";
@@ -189,11 +197,11 @@
* @return the number of missing libraries (0 or 1)
*/
int needClass(JspWriter out,
- String classname,
- String jarFile,
- String description,
- String errorText,
- String homePage) throws IOException {
+ String classname,
+ String jarFile,
+ String description,
+ String errorText,
+ String homePage) throws IOException {
return probeClass(out,
"<b>Error</b>",
classname,
@@ -214,11 +222,11 @@
* @return the number of missing libraries (0 or 1)
*/
int wantClass(JspWriter out,
- String classname,
- String jarFile,
- String description,
- String errorText,
- String homePage) throws IOException {
+ String classname,
+ String jarFile,
+ String description,
+ String errorText,
+ String homePage) throws IOException {
return probeClass(out,
"<b>Warning</b>",
classname,
@@ -236,12 +244,12 @@
* @throws Exception
*/
int wantResource(JspWriter out,
- String resource,
- String errorText) throws Exception {
+ String resource,
+ String errorText) throws Exception {
if(!resourceExists(resource)) {
out.write("<p><b>Warning</b>: could not find resource "+resource
- +"<br>"
- +errorText);
+ +"<br>"
+ +errorText);
return 0;
} else {
out.write("found "+resource+"<br>");
@@ -310,80 +318,46 @@
return location;
}
- SOAPFactory fac = OMAbstractFactory.getSOAP11Factory();
- OMNamespace ns =
- fac.createOMNamespace("http://apache.ws.apache.org/samples", "samples");
- private SOAPEnvelope createRawMessage(
- String method,
- OMElement parameters) {
- SOAPEnvelope envelope = fac.getDefaultEnvelope();
-
- OMElement responseMethodName = fac.createOMElement(method, ns);
- envelope.getBody().addChild(responseMethodName);
- responseMethodName.addChild(parameters);
- return envelope;
-
- }
+ private String value;
+ private EndpointReference targetEPR =
+ new EndpointReference(AddressingConstants.WSA_TO,
+ "http://127.0.0.1:"
+ + (port)
+ + "/axis2/services/echo/echoOMElement");
+ private QName operationName = new QName("echoOMElement");
+ private OMElement createEnvelope() {
+ OMFactory fac = OMAbstractFactory.getOMFactory();
+ OMNamespace omNs = fac.createOMNamespace("http://localhost/my", "my");
+ OMElement method = fac.createOMElement("echoOMElement", omNs);
+ OMElement value = fac.createOMElement("myValue", omNs);
+ value.addChild(fac.createText(value, "Hello I am Axis2 Echo service !! "));
+ method.addChild(value);
- private boolean validateService(String error){
- try{
- OMNamespace arrayNs =
- fac.createOMNamespace(
- OMConstants.ARRAY_ITEM_NSURI,
- OMConstants.ARRAY_ITEM_NS_PREFIX);
- String message = "Hello testing";
-
- OMElement returnelement = fac.createOMElement("param1", ns);
- returnelement.setBuilder(
- new ObjectToOMBuilder(
- returnelement,
- new SimpleTypeEncoder(message)));
- returnelement.declareNamespace(arrayNs);
- SOAPEnvelope envelope = createRawMessage("echoString", returnelement);
- XMLStreamReader xpp = invokeTheService(envelope);
- String value = SimpleTypeEncodingUtils.deserializeString(xpp);
- error = value;
- return true;
- }catch(Exception e){
- error = e.getMessage();
- return false;
- }
+ return method;
}
-
- private XMLStreamReader invokeTheService(SOAPEnvelope envelope)
- throws Exception {
- EndpointReference targetEPR =
- new EndpointReference(
- AddressingConstants.WSA_TO,
- "http://127.0.0.1:"
- + (port)
- + "/axis2/services/echo"); //listServices /axis2/services/service1
+ public boolean inVokeTheService() {
+ try {
+ OMElement payload = createEnvelope();
Call call = new Call();
call.setTo(targetEPR);
- SOAPEnvelope responseEnv = call.sendReceive(envelope);
-
- SOAPBody body = responseEnv.getBody();
- if(body.hasFault()){
- throw body.getFault().getException();
- }
- XMLStreamReader xpp = body.getXMLStreamReader(true);
+ call.setTransportInfo(Constants.TRANSPORT_HTTP, Constants.TRANSPORT_HTTP, false);
- int event = xpp.next();
- while (event != XMLStreamConstants.START_ELEMENT) {
- event = xpp.next();
- }
- event = xpp.next();
- while (event != XMLStreamConstants.START_ELEMENT) {
- event = xpp.next();
- }
- event = xpp.next();
- while (event != XMLStreamConstants.START_ELEMENT) {
- event = xpp.next();
- }
- return xpp;
+ OMElement result =
+ (OMElement) call.invokeBlocking(operationName.getLocalPart(), payload);
+ StringWriter writer = new StringWriter();
+ result.serializeWithCache(XMLOutputFactory.newInstance().createXMLStreamWriter(writer));
+ writer.flush();
+ value = writer.toString();
+ return true;
+ } catch (AxisFault axisFault) {
+ value = axisFault.getMessage();
+ return false;
+ } catch (XMLStreamException e) {
+ value = e.getMessage();
+ return false;
}
-
- %>
+ }
+%>
<html><head><title>Axis2 Happiness Page</title></head>
<body>
<h1>Axis2 Happiness Page</h1>
@@ -397,7 +371,7 @@
/**
* the essentials, without these Axis is not going to work
*/
- needed=needClass(out, "org.apache.axis.transport.http.AxisServlet",
+ needed=needClass(out, "org.apache.axis.transport.http.AxisServlet",
"axis2-M1.jar",
"Apache-Axis",
"Axis2 will not work",
@@ -418,7 +392,7 @@
"Streaming API for XML",
"Axis2 will not work",
"http://dist.codehaus.org/stax/jars/");
- needed+=needClass(out, "com.bea.xml.stream.MXParser",
+ needed+=needClass(out, "com.bea.xml.stream.MXParser",
"stax-1.1.1-dev.jar",
"Streaming API for XML implementation",
"Axis2 will not work",
@@ -428,19 +402,19 @@
<%
/*
- * resources on the classpath path
- */
+ * resources on the classpath path
+ */
/* broken; this is a file, not a resource
wantResource(out,"/server-config.wsdd",
- "There is no server configuration file;"
- +"run AdminClient to create one");
+ "There is no server configuration file;"
+ +"run AdminClient to create one");
*/
/* add more libraries here */
out.write("<h3>");
//is everythng we need here
if(needed==0) {
- //yes, be happy
+ //yes, be happy
out.write("<i>The core axis libraries are present. </i>");
} else {
//no, be very unhappy
@@ -454,44 +428,43 @@
//now look at wanted stuff
out.write("</h3>");
- %>
- <p>
- <B><I>Note:</I></B> Even if everything this page probes for is present, there is no guarantee your
- web service will work, because there are many configuration options that we do
- not check for. These tests are <i>necessary</i> but not <i>sufficient</i>
- <hr>
- <h2>Examining echo service</h2>
+%>
+<p>
+<B><I>Note:</I></B> Even if everything this page probes for is present, there is no guarantee your
+web service will work, because there are many configuration options that we do
+not check for. These tests are <i>necessary</i> but not <i>sufficient</i>
+<hr>
+<h2>Examining echo service</h2>
<%
- String error ="";
- boolean serviceStatus = validateService(error);
+ boolean serviceStatus = inVokeTheService();
if(serviceStatus){
- %>
- <p>
- <font color="blue" >
- Found the echo service and Axis2 is working properly, and now you can drop any web service in
- to axis2/WEB-INF/service and check it is working.and got the following result
- <br>
- <%= error%> </font>
+ %>
+ <p>
+ <font color="blue" >
+ Found the echo service and Axis2 is working properly, and now you can drop any web service in
+ to axis2/WEB-INF/service and check it is working.and got the following result
+ <br>
+ <%= value%> </font>
</p>
<hr>
<%
} else {
- %>
- <p>
- <font color="brown" >
- You can test the deployement functionality by uploading the echo service jar, which can be found in the
- samples directory of the axis distribution.
- <br>
- <%= error%></font>
+ %>
+ <p>
+ <font color="brown" >
+ You can test the deployement functionality by uploading the echo service jar, which can be found in the
+ samples directory of the axis distribution.
+ <br>
+ </font>
</p>
<hr>
<%
}
%>
<h2>Examining Application Server</h2>
- <table>
- <tr><td>Servlet version</td><td><%=getServletVersion()%></td></tr>
- <tr><td>Platform</td><td><%=getServletConfig().getServletContext().getServerInfo()%></td></tr>
+ <table>
+ <tr><td>Servlet version</td><td><%=getServletVersion()%></td></tr>
+ <tr><td>Platform</td><td><%=getServletConfig().getServletContext().getServerInfo()%></td></tr>
</table>
<h2>Examining System Properties</h2>
Modified: webservices/axis/trunk/java/modules/core/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/maven.xml?rev=179043&r1=179042&r2=179043&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/maven.xml (original)
+++ webservices/axis/trunk/java/modules/core/maven.xml Mon May 30 03:38:22 2005
@@ -11,6 +11,7 @@
<j:jelly xmlns="jelly:ant">
<!-- <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="src/samples/deployment/service1"/> -->
<ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="samples/deployment/service2"/>
+ <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="samples/deployment/echo"/>
<ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="samples/deployment/invalidservice"/>
<ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="samples/deployment/OutService"/>
<ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="samples/deployment/module1"/>
Added: webservices/axis/trunk/java/modules/core/samples/deployment/echo/META-INF/service.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/samples/deployment/echo/META-INF/service.xml?rev=179043&view=auto
==============================================================================
--- webservices/axis/trunk/java/modules/core/samples/deployment/echo/META-INF/service.xml (added)
+++ webservices/axis/trunk/java/modules/core/samples/deployment/echo/META-INF/service.xml Mon May 30 03:38:22 2005
@@ -0,0 +1,9 @@
+<service name="">
+ <description>
+ This service echo the given input , and this was developed to text the axis system working
+ correctly
+ </description>
+ <parameter name="ServiceClass" locked="xsd:false">org.apache.axis.echo.Echo</parameter>
+ <operation name="echoOMElement"/>
+ <operation name="echoString"/>
+</service>
\ No newline at end of file
Added: webservices/axis/trunk/java/modules/core/samples/deployment/echo/build.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/samples/deployment/echo/build.xml?rev=179043&view=auto
==============================================================================
--- webservices/axis/trunk/java/modules/core/samples/deployment/echo/build.xml (added)
+++ webservices/axis/trunk/java/modules/core/samples/deployment/echo/build.xml Mon May 30 03:38:22 2005
@@ -0,0 +1,52 @@
+<?xml version="1.0"?>
+<project basedir="." default="jar">
+ <property name="src" location="."/>
+ <property name="build" location="build"/>
+ <property name="build.classes" location="${build}/classes"/>
+ <property name="build.lib" location="${build}/lib"/>
+ <property name="lib" location="lib"/>
+ <property name="root" location="../../../"/>
+ <property name="jar.dir" location="${root}/target/echo"/>
+
+ <path id="axis.test.classpath">
+ <path refid="maven.dependency.classpath"></path>
+ <pathelement location="../../../target/classes"/>
+ </path>
+
+ <target name="compile" depends="init" unless="jars.uptodate">
+ <mkdir dir="${build.classes}"/>
+ <mkdir dir="${build.lib}"/>
+ <javac destdir="${build.classes}" debug="on">
+ <classpath refid="axis.test.classpath" />
+ <src path="${src}"/>
+ </javac>
+ </target>
+
+ <target name="jar" depends="compile" unless="jars.uptodate">
+ <copy todir="${build.classes}/META-INF">
+ <fileset dir="${basedir}/META-INF/">
+ <include name="**/*.xml"/>
+ <exclude name="build.xml"/>
+ </fileset>
+ </copy>
+
+ <mkdir dir="${jar.dir}"/>
+ <jar jarfile="${jar.dir}/echo.aar" basedir="${build.classes}" >
+ <include name="**" />
+ </jar>
+ <delete dir="${build}"/>
+ </target>
+
+ <target name="init">
+ <uptodate property="jars.uptodate" targetfile="${jar.dir}/echo.aar">
+ <srcfiles dir="${src}">
+ <include name="**/*.java"/>
+ <include name="**/*.xml"/>
+ <include name="**/*.wsdl"/>
+ <exclude name="${build}/**"/>
+ </srcfiles>
+ </uptodate>
+ <echo message="the files are up to date = ${jars.uptodate}"></echo>
+ </target>
+
+</project>
Added: webservices/axis/trunk/java/modules/core/samples/deployment/echo/org/apache/axis/echo/Echo.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/samples/deployment/echo/org/apache/axis/echo/Echo.java?rev=179043&view=auto
==============================================================================
--- webservices/axis/trunk/java/modules/core/samples/deployment/echo/org/apache/axis/echo/Echo.java (added)
+++ webservices/axis/trunk/java/modules/core/samples/deployment/echo/org/apache/axis/echo/Echo.java Mon May 30 03:38:22 2005
@@ -0,0 +1,40 @@
+package org.apache.axis.echo;
+
+import org.apache.axis.om.OMElement;
+
+/*
+ * Copyright 2004,2005 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.
+ *
+ *
+ */
+
+/**
+ * Author : Deepal Jayasinghe
+ * Date: May 30, 2005
+ * Time: 1:12:11 PM
+ */
+public class Echo {
+
+ public Echo() {
+ }
+ public OMElement echoOMElement(OMElement omEle) {
+ omEle.setLocalName(omEle.getLocalName() + "Response");
+ return omEle;
+ }
+ public String echoString(String in) {
+ return in;
+ }
+
+}
\ No newline at end of file
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java?rev=179043&r1=179042&r2=179043&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/DeploymentEngine.java Mon May 30 03:38:22 2005
@@ -214,8 +214,10 @@
public AxisConfiguration loadClient(String clientHome) throws DeploymentException {
InputStream in = null;
+ boolean isRepositoryExist = false;
if (clientHome != null) {
checkClientHome(clientHome);
+ isRepositoryExist = true;
try {
File tempfile = new File(engineConfigName);
in = new FileInputStream(tempfile);
@@ -233,14 +235,16 @@
} catch (XMLStreamException e) {
throw new DeploymentException(e.getMessage());
}
- hotDeployment = false;
- hotUpdate = false;
- new RepositoryListenerImpl(folderName, this);
- try {
- engagdeModules();
- } catch (AxisFault axisFault) {
- log.info("Module validation failed" + axisFault.getMessage());
- throw new DeploymentException(axisFault.getMessage());
+ if (isRepositoryExist) {
+ hotDeployment = false;
+ hotUpdate = false;
+ new RepositoryListenerImpl(folderName, this);
+ try {
+ engagdeModules();
+ } catch (AxisFault axisFault) {
+ log.info("Module validation failed" + axisFault.getMessage());
+ throw new DeploymentException(axisFault.getMessage());
+ }
}
return axisConfig;
}
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/listener/RepositoryListenerImpl.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/listener/RepositoryListenerImpl.java?rev=179043&r1=179042&r2=179043&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/listener/RepositoryListenerImpl.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/listener/RepositoryListenerImpl.java Mon May 30 03:38:22 2005
@@ -163,7 +163,7 @@
* @return
*/
private boolean isServiceArchiveFile(String filename) {
- if (filename.endsWith(".jar") | filename.equals(".aar")) {
+ if (filename.endsWith(".jar") | filename.endsWith(".aar")) {
return true;
}
return false;
Modified: webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/ArchiveReader.java
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/ArchiveReader.java?rev=179043&r1=179042&r2=179043&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/ArchiveReader.java (original)
+++ webservices/axis/trunk/java/modules/core/src/org/apache/axis/deployment/repository/utill/ArchiveReader.java Mon May 30 03:38:22 2005
@@ -111,7 +111,7 @@
// zin.closeEntry();
zin.close();
if (!foundmoduleXML) {
- throw new DeploymentException("module.xml not found");
+ throw new DeploymentException("module.xml not found for the module : " + strArchive);
}
} catch (Exception e) {
throw new DeploymentException(e.getMessage());
Modified: webservices/axis/trunk/java/modules/samples/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/modules/samples/maven.xml?rev=179043&r1=179042&r2=179043&view=diff
==============================================================================
--- webservices/axis/trunk/java/modules/samples/maven.xml (original)
+++ webservices/axis/trunk/java/modules/samples/maven.xml Mon May 30 03:38:22 2005
@@ -8,11 +8,14 @@
xmlns:deploy="deploy"
xmlns:ant="jelly:ant">
<postGoal name="test:compile">
- <mkdir dir="target/test-resources/samples/modules"/>
- <mkdir dir="target/test-resources/repository-client/modules"/>
- <copy file="../addressing/target/addressing.mar"
+ <mkdir dir="target/test-resources/samples/modules"/>
+ <mkdir dir="target/test-resources/repository-client/modules"/>
+ <copy file="../addressing/target/addressing.mar"
tofile="target/test-resources/samples/modules/addressing.mar"/>
- <copy file="../addressing/target/addressing.mar"
+ <copy file="../addressing/target/addressing.mar"
tofile="target/test-resources/repository-client/modules/addressing.mar"/>
- </postGoal>
+ <mkdir dir="target/echo"/>
+ <copy file="../core/target/echo/echo.aar"
+ tofile="target/echo/echo.aar"/>
+ </postGoal>
</project>