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 de...@apache.org on 2005/09/16 08:00:35 UTC
svn commit: r289390 - in /webservices/axis2/trunk/java/modules:
core/src/org/apache/axis2/deployment/ core/src/org/apache/axis2/description/
core/src/org/apache/axis2/phaseresolver/
core/test-resources/deployment/echo/META-INF/ core/test-resources/depl...
Author: deepal
Date: Thu Sep 15 22:58:30 2005
New Revision: 289390
URL: http://svn.apache.org/viewcvs?rev=289390&view=rev
Log:
Completing ServiceGroup issue ,
changed service descriptor from service.xml to services.xml
Now onward only the valid service descriptor in side a service is services.xml and service.xml wont be a valid one. This is just name change if you only have one service in your service archive but if you have multiple service in it then the services.xml format will be little bit change and the way is as fllows
<serviceGroup>
<service name=”foo”>
</service>
<service name=”bar”>
</service>
</serviceGroup>
To make the previous service archive file to be run in the current system I am thinking of providing a way to have either service.xml or services.xml in side META-INF and if both of them are there in META-INF at the deployment time I will only read services.xml and ignore service.xml , and if only the service.xml is there it will work as previous without giving any exception.
Added:
webservices/axis2/trunk/java/modules/core/test-resources/deployment/echo/META-INF/services.xml
- copied unchanged from r289369, webservices/axis2/trunk/java/modules/core/test-resources/deployment/echo/META-INF/service.xml
webservices/axis2/trunk/java/modules/core/test-resources/deployment/invalidservice/META-INF/services.xml
- copied unchanged from r289369, webservices/axis2/trunk/java/modules/core/test-resources/deployment/invalidservice/META-INF/service.xml
webservices/axis2/trunk/java/modules/core/test-resources/deployment/outservice/META-INF/services.xml
- copied unchanged from r289369, webservices/axis2/trunk/java/modules/core/test-resources/deployment/outservice/META-INF/service.xml
webservices/axis2/trunk/java/modules/core/test-resources/deployment/service1/META-INF/services.xml
- copied unchanged from r289369, webservices/axis2/trunk/java/modules/core/test-resources/deployment/service1/META-INF/service.xml
webservices/axis2/trunk/java/modules/core/test-resources/deployment/service2/META-INF/services.xml
- copied unchanged from r289369, webservices/axis2/trunk/java/modules/core/test-resources/deployment/service2/META-INF/service.xml
webservices/axis2/trunk/java/modules/core/test-resources/deployment/serviceGroupRepo/services/serviceGroup/META-INF/services.xml
- copied unchanged from r289369, webservices/axis2/trunk/java/modules/core/test-resources/deployment/serviceGroupRepo/services/serviceGroup/META-INF/service.xml
webservices/axis2/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestServiceB/META-INF/services.xml
- copied unchanged from r289369, webservices/axis2/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestServiceB/META-INF/service.xml
webservices/axis2/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestServiceC/META-INF/services.xml
- copied unchanged from r289369, webservices/axis2/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestServiceC/META-INF/service.xml
webservices/axis2/trunk/java/modules/samples/conf/services.xml
- copied unchanged from r289369, webservices/axis2/trunk/java/modules/samples/conf/service.xml
webservices/axis2/trunk/java/modules/samples/src/sample/axisversion/META-INF/services.xml
- copied unchanged from r289369, webservices/axis2/trunk/java/modules/samples/src/sample/axisversion/META-INF/service.xml
webservices/axis2/trunk/java/modules/samples/src/sample/groovy/META-INF/services.xml
- copied unchanged from r289369, webservices/axis2/trunk/java/modules/samples/src/sample/groovy/META-INF/service.xml
webservices/axis2/trunk/java/modules/samples/src/sample/mtom/imagetransfer/service/META-INF/services.xml
- copied unchanged from r289369, webservices/axis2/trunk/java/modules/samples/src/sample/mtom/imagetransfer/service/META-INF/service.xml
webservices/axis2/trunk/java/modules/samples/src/sample/mtom/interop/service/META-INF/services.xml
- copied unchanged from r289369, webservices/axis2/trunk/java/modules/samples/src/sample/mtom/interop/service/META-INF/service.xml
webservices/axis2/trunk/java/modules/samples/src/userguide/example1/META-INF/services.xml
- copied unchanged from r289369, webservices/axis2/trunk/java/modules/samples/src/userguide/example1/META-INF/service.xml
webservices/axis2/trunk/java/modules/samples/src/userguide/example2/META-INF/services.xml
- copied unchanged from r289369, webservices/axis2/trunk/java/modules/samples/src/userguide/example2/META-INF/service.xml
webservices/axis2/trunk/java/modules/security/interop/services.xml
- copied unchanged from r289369, webservices/axis2/trunk/java/modules/security/interop/service.xml
Removed:
webservices/axis2/trunk/java/modules/core/test-resources/deployment/echo/META-INF/service.xml
webservices/axis2/trunk/java/modules/core/test-resources/deployment/invalidservice/META-INF/service.xml
webservices/axis2/trunk/java/modules/core/test-resources/deployment/outservice/META-INF/service.xml
webservices/axis2/trunk/java/modules/core/test-resources/deployment/service1/META-INF/service.xml
webservices/axis2/trunk/java/modules/core/test-resources/deployment/service2/META-INF/service.xml
webservices/axis2/trunk/java/modules/core/test-resources/deployment/serviceGroupRepo/services/serviceGroup/META-INF/service.xml
webservices/axis2/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestServiceB/META-INF/service.xml
webservices/axis2/trunk/java/modules/integration/test-resources/SOAP12Testing/SOAP12TestServiceC/META-INF/service.xml
webservices/axis2/trunk/java/modules/samples/conf/service.xml
webservices/axis2/trunk/java/modules/samples/src/sample/axisversion/META-INF/service.xml
webservices/axis2/trunk/java/modules/samples/src/sample/groovy/META-INF/service.xml
webservices/axis2/trunk/java/modules/samples/src/sample/mtom/imagetransfer/service/META-INF/service.xml
webservices/axis2/trunk/java/modules/samples/src/sample/mtom/interop/service/META-INF/service.xml
webservices/axis2/trunk/java/modules/samples/src/userguide/example1/META-INF/service.xml
webservices/axis2/trunk/java/modules/samples/src/userguide/example2/META-INF/service.xml
webservices/axis2/trunk/java/modules/security/interop/service.xml
Modified:
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ModuleDescription.java
webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseHolder.java
webservices/axis2/trunk/java/modules/core/webapp/HappyAxis.jsp
webservices/axis2/trunk/java/modules/integration/maven.xml
webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/InteropTestBase.java
webservices/axis2/trunk/java/modules/samples/build.xml
webservices/axis2/trunk/java/modules/security/maven.xml
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java?rev=289390&r1=289389&r2=289390&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentConstants.java Thu Sep 15 22:58:30 2005
@@ -24,7 +24,7 @@
int MODULE = 1; // if it is a module
String META_INF ="META-INF";
- String SERVICEXML = "META-INF/service.xml";
+ String SERVICEXML = "META-INF/services.xml";
String SERVICEWSDL = "META-INF/service.wsdl";
String MODULEXML = "META-INF/module.xml";
String PARAMETERST = "parameter";// paramater start tag
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java?rev=289390&r1=289389&r2=289390&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DeploymentEngine.java Thu Sep 15 22:58:30 2005
@@ -780,7 +780,7 @@
*/
/**
- * This method is used to fill a axisservice object using service.xml , first it should create
+ * This method is used to fill a axisservice object using services.xml , first it should create
* an axisservice object using WSDL and then fill that using given servic.xml and load all the requed
* class and build the chains , finally add the servicecontext to EngineContext and axisservice into
* EngineConfiguration
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java?rev=289390&r1=289389&r2=289390&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/DescriptionBuilder.java Thu Sep 15 22:58:30 2005
@@ -58,7 +58,7 @@
}
/**
- * This will creat OMElemnt for a given service.xml
+ * This will creat OMElemnt for a given services.xml
*
* @return OMElement <code>OMElement</code>
* @throws javax.xml.stream.XMLStreamException
@@ -75,7 +75,7 @@
/**
- * To process Flow elements in service.xml
+ * To process Flow elements in services.xml
* @param flowelement <code>OMElement</code>
* @return
* @throws DeploymentException <code>DeploymentException</code>
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java?rev=289390&r1=289389&r2=289390&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ModuleBuilder.java Thu Sep 15 22:58:30 2005
@@ -30,7 +30,7 @@
import java.util.ArrayList;
import java.util.Iterator;
/**
- * This class is to convert OM->ServiceDescrption , where first create OM from service.xml and
+ * This class is to convert OM->ServiceDescrption , where first create OM from services.xml and
* then populate service description by using OM
*/
public class ModuleBuilder extends DescriptionBuilder{
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java?rev=289390&r1=289389&r2=289390&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/deployment/ServiceBuilder.java Thu Sep 15 22:58:30 2005
@@ -40,7 +40,7 @@
/**
- * This class is to convert OM->ServiceDescrption , where first create OM from service.xml and
+ * This class is to convert OM->ServiceDescrption , where first create OM from services.xml and
* then populate service description by using OM
*/
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ModuleDescription.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ModuleDescription.java?rev=289390&r1=289389&r2=289390&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ModuleDescription.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/description/ModuleDescription.java Thu Sep 15 22:58:30 2005
@@ -31,7 +31,7 @@
* <li>handlers<li>
* <ol>
* <p>Handler are registered once they are avlible but they avalibe to all services if axis2.xml
- * has a module ref="." or avalible to a single service if service.xml have module ref=".."</p>
+ * has a module ref="." or avalible to a single service if services.xml have module ref=".."</p>
*/
public class ModuleDescription implements FlowInclude, ParameterInclude {
Modified: webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseHolder.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseHolder.java?rev=289390&r1=289389&r2=289390&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseHolder.java (original)
+++ webservices/axis2/trunk/java/modules/core/src/org/apache/axis2/phaseresolver/PhaseHolder.java Thu Sep 15 22:58:30 2005
@@ -26,7 +26,7 @@
/**
- * This class hold all the phases found in the service.xml and server.xml
+ * This class hold all the phases found in the services.xml and server.xml
*/
public class PhaseHolder {
Modified: webservices/axis2/trunk/java/modules/core/webapp/HappyAxis.jsp
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/core/webapp/HappyAxis.jsp?rev=289390&r1=289389&r2=289390&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/core/webapp/HappyAxis.jsp (original)
+++ webservices/axis2/trunk/java/modules/core/webapp/HappyAxis.jsp Thu Sep 15 22:58:30 2005
@@ -46,7 +46,7 @@
<%IP=request.getRequestURL().toString();
int lastindex = IP.lastIndexOf('/');
IP = IP.substring(0,lastindex);
- targetEPR = new EndpointReference(IP + "/services/Version/getVersion");
+ targetEPR = new EndpointReference(IP + "/services/version");
%>
<%!
/*
@@ -327,7 +327,7 @@
private OMElement createEnvelope() {
OMFactory fac = OMAbstractFactory.getOMFactory();
OMNamespace omNs = fac.createOMNamespace("http://localhost/my", "my");
- OMElement method = fac.createOMElement("Version", omNs);
+ OMElement method = fac.createOMElement("getVersion", omNs);
OMElement value = fac.createOMElement("myValue", omNs);
method.addChild(value);
return method;
Modified: webservices/axis2/trunk/java/modules/integration/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/maven.xml?rev=289390&r1=289389&r2=289390&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/integration/maven.xml Thu Sep 15 22:58:30 2005
@@ -104,9 +104,9 @@
<copy file="../security/target/security.mar"
tofile="target/test-resources/scenario1_service_repo/modules/security.mar"/>
- <!-- Copy service.xml to ../security/target/interop/classes/META-INF/ -->
+ <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/s1.service.xml"
- tofile="../security/target/interop/classes/META-INF/service.xml" overwrite="true"/>
+ tofile="../security/target/interop/classes/META-INF/services.xml" overwrite="true"/>
<!-- Create the .aar file -->
<jar jarfile="target/test-resources/scenario1_service_repo/services/PingPort.aar"
@@ -132,9 +132,9 @@
<copy file="../security/target/security.mar"
tofile="target/test-resources/scenario2_service_repo/modules/security.mar"/>
- <!-- Copy service.xml to ../security/target/interop/classes/META-INF/ -->
+ <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/s2.service.xml"
- tofile="../security/target/interop/classes/META-INF/service.xml" overwrite="true"/>
+ tofile="../security/target/interop/classes/META-INF/services.xml" overwrite="true"/>
<!-- Create the .aar file -->
<jar jarfile="target/test-resources/scenario2_service_repo/services/PingPort.aar"
@@ -160,9 +160,9 @@
<copy file="../security/target/security.mar"
tofile="target/test-resources/scenario2a_service_repo/modules/security.mar"/>
- <!-- Copy service.xml to ../security/target/interop/classes/META-INF/ -->
+ <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/s2a.service.xml"
- tofile="../security/target/interop/classes/META-INF/service.xml" overwrite="true"/>
+ tofile="../security/target/interop/classes/META-INF/services.xml" overwrite="true"/>
<!-- Create the .aar file -->
<jar jarfile="target/test-resources/scenario2a_service_repo/services/PingPort.aar"
@@ -188,9 +188,9 @@
<copy file="../security/target/security.mar"
tofile="target/test-resources/scenario3_service_repo/modules/security.mar"/>
- <!-- Copy service.xml to ../security/target/interop/classes/META-INF/ -->
+ <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/s3.service.xml"
- tofile="../security/target/interop/classes/META-INF/service.xml" overwrite="true"/>
+ tofile="../security/target/interop/classes/META-INF/services.xml" overwrite="true"/>
<!-- Create the .aar file -->
<jar jarfile="target/test-resources/scenario3_service_repo/services/PingPort.aar"
@@ -217,9 +217,9 @@
<copy file="../security/target/security.mar"
tofile="target/test-resources/scenario4_service_repo/modules/security.mar"/>
- <!-- Copy service.xml to ../security/target/interop/classes/META-INF/ -->
+ <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/s4.service.xml"
- tofile="../security/target/interop/classes/META-INF/service.xml" overwrite="true"/>
+ tofile="../security/target/interop/classes/META-INF/services.xml" overwrite="true"/>
<!-- Create the .aar file -->
<jar jarfile="target/test-resources/scenario4_service_repo/services/PingPort.aar"
@@ -246,9 +246,9 @@
<copy file="../security/target/security.mar"
tofile="target/test-resources/scenario5_service_repo/modules/security.mar"/>
- <!-- Copy service.xml to ../security/target/interop/classes/META-INF/ -->
+ <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/s5.service.xml"
- tofile="../security/target/interop/classes/META-INF/service.xml" overwrite="true"/>
+ tofile="../security/target/interop/classes/META-INF/services.xml" overwrite="true"/>
<!-- Create the .aar file -->
<jar jarfile="target/test-resources/scenario5_service_repo/services/PingPort.aar"
@@ -275,9 +275,9 @@
<copy file="../security/target/security.mar"
tofile="target/test-resources/scenario6_service_repo/modules/security.mar"/>
- <!-- Copy service.xml to ../security/target/interop/classes/META-INF/ -->
+ <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/s6.service.xml"
- tofile="../security/target/interop/classes/META-INF/service.xml" overwrite="true"/>
+ tofile="../security/target/interop/classes/META-INF/services.xml" overwrite="true"/>
<!-- Create the .aar file -->
<jar jarfile="target/test-resources/scenario6_service_repo/services/PingPort.aar"
@@ -304,9 +304,9 @@
<copy file="../security/target/security.mar"
tofile="target/test-resources/scenario7_service_repo/modules/security.mar"/>
- <!-- Copy service.xml to ../security/target/interop/classes/META-INF/ -->
+ <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/s7.service.xml"
- tofile="../security/target/interop/classes/META-INF/service.xml" overwrite="true"/>
+ tofile="../security/target/interop/classes/META-INF/services.xml" overwrite="true"/>
<!-- Create the .aar file -->
<jar jarfile="target/test-resources/scenario7_service_repo/services/PingPort.aar"
@@ -339,9 +339,9 @@
<copy file="../security/target/security.mar"
tofile="target/test-resources/scenarioST1_service_repo/modules/security.mar"/>
- <!-- Copy service.xml to ../security/target/interop/classes/META-INF/ -->
+ <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/sST1.service.xml"
- tofile="../security/target/interop/classes/META-INF/service.xml" overwrite="true"/>
+ tofile="../security/target/interop/classes/META-INF/services.xml" overwrite="true"/>
<!-- Create the .aar file -->
<jar jarfile="target/test-resources/scenarioST1_service_repo/services/PingPort.aar"
@@ -368,9 +368,9 @@
<copy file="../security/target/security.mar"
tofile="target/test-resources/mtom_sec_service_repo/modules/security.mar"/>
- <!-- Copy service.xml to ../security/target/interop/classes/META-INF/ -->
+ <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/secMtom.service.xml"
- tofile="../security/target/interop/classes/META-INF/service.xml" overwrite="true"/>
+ tofile="../security/target/interop/classes/META-INF/services.xml" overwrite="true"/>
<!-- Create the .aar file -->
<jar jarfile="target/test-resources/mtom_sec_service_repo/services/PingPort.aar"
@@ -402,9 +402,9 @@
<copy file="../addressing/target/addressing.mar"
tofile="target/test-resources/complete_service_repo/modules/addressing.mar"/>
- <!-- Copy service.xml to ../security/target/interop/classes/META-INF/ -->
+ <!-- Copy services.xml to ../security/target/interop/classes/META-INF/ -->
<copy file="test-resources/security/complete.service.xml"
- tofile="../security/target/interop/classes/META-INF/service.xml" overwrite="true"/>
+ tofile="../security/target/interop/classes/META-INF/services.xml" overwrite="true"/>
<!-- Create the .aar file -->
<jar jarfile="target/test-resources/complete_service_repo/services/PingPort.aar"
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/InteropTestBase.java
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/InteropTestBase.java?rev=289390&r1=289389&r2=289390&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/InteropTestBase.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/axis2/security/InteropTestBase.java Thu Sep 15 22:58:30 2005
@@ -77,7 +77,7 @@
/*
* We have to create different a client repository and a service repository
* for each scenarion since we dont have the support to get the parameter
- * values off the service.xml yet
+ * values off the services.xml yet
*/
private String serviceRepo;
Modified: webservices/axis2/trunk/java/modules/samples/build.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/samples/build.xml?rev=289390&r1=289389&r2=289390&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/samples/build.xml (original)
+++ webservices/axis2/trunk/java/modules/samples/build.xml Thu Sep 15 22:58:30 2005
@@ -74,7 +74,7 @@
<fileset dir="${classes.dir}"/>
</jar>
- <copy file="${conf.dir}/service.xml" todir="${build.dir}/META-INF" overwrite="true"/>
+ <copy file="${conf.dir}/services.xml" todir="${build.dir}/META-INF" overwrite="true"/>
<jar destfile="${jardrop.dir}/sample1.jar">
@@ -82,12 +82,12 @@
<include name="**/EchoXML.class"/>
</fileset>
<fileset dir="${build.dir}">
- <include name="META-INF/service.xml"/>
+ <include name="META-INF/services.xml"/>
</fileset>
</jar>
- <copy file="${conf.dir}/service4withhandler.xml" tofile="${build.dir}/META-INF/service.xml" overwrite="true"/>
+ <copy file="${conf.dir}/service4withhandler.xml" tofile="${build.dir}/META-INF/services.xml" overwrite="true"/>
<jar destfile="${jardrop.dir}/sample1WithHandler.jar">
@@ -96,7 +96,7 @@
<include name="**/LoggingHandler.class"/>
</fileset>
<fileset dir="${build.dir}">
- <include name="META-INF/service.xml"/>
+ <include name="META-INF/services.xml"/>
</fileset>
</jar>
<delete dir="${classes.dir}" failonerror="false"/>
Modified: webservices/axis2/trunk/java/modules/security/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/java/modules/security/maven.xml?rev=289390&r1=289389&r2=289390&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/maven.xml (original)
+++ webservices/axis2/trunk/java/modules/security/maven.xml Thu Sep 15 22:58:30 2005
@@ -111,9 +111,9 @@
<!-- Create the META-INF directory -->
<mkdir dir="${class.dir}/META-INF"/>
- <!-- copy the service.xml-->
- <copy file="interop/service.xml"
- tofile="${class.dir}/META-INF/service.xml" overwrite="yes"/>
+ <!-- copy the services.xml-->
+ <copy file="interop/services.xml"
+ tofile="${class.dir}/META-INF/services.xml" overwrite="yes"/>
<!-- copy axis2.crypto.properties -->