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/12/22 12:23:06 UTC
svn commit: r123089 - in webservices/axis/trunk/java/dev/scratch/prototype2: . src/java/org/apache/axis/engine src/samples/deployment src/samples/deployment/module1 src/samples/deployment/module2 src/samples/deployment/service1 src/samples/deployment/service2 src/samples/msg/echo src/samples/msg/echo/META-INF src/test/org/apache/axis/deployment src/test/org/apache/axis/engine
Author: hemapani
Date: Wed Dec 22 03:23:03 2004
New Revision: 123089
URL: http://svn.apache.org/viewcvs?view=rev&rev=123089
Log:
add a test case to deployment and exclude them as they fails
Added:
webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/EngineRegistryFactory.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/server.xml
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/deployment/BuildERWithDeploymentTest.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineAndDeploymentTest.java
Modified:
webservices/axis/trunk/java/dev/scratch/prototype2/maven.xml
webservices/axis/trunk/java/dev/scratch/prototype2/project.xml
webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module1/build.xml
webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module2/build.xml
webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service1/build.xml
webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service2/build.xml
webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/msg/echo/Echo.java
webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/msg/echo/META-INF/service.xml
webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/msg/echo/build.xml
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/maven.xml
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/maven.xml?view=diff&rev=123089&p1=webservices/axis/trunk/java/dev/scratch/prototype2/maven.xml&r1=123088&p2=webservices/axis/trunk/java/dev/scratch/prototype2/maven.xml&r2=123089
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/maven.xml (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/maven.xml Wed Dec 22 03:23:03 2004
@@ -9,6 +9,7 @@
xmlns:ant="jelly:ant">
<preGoal name="test:test">
<j:jelly xmlns="jelly:ant">
+ <ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="src/samples/msg/echo"/>
<ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="src/samples/deployment/service1"/>
<ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="src/samples/deployment/service2"/>
<ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="src/samples/deployment/module1"/>
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/project.xml
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/project.xml?view=diff&rev=123089&p1=webservices/axis/trunk/java/dev/scratch/prototype2/project.xml&r1=123088&p2=webservices/axis/trunk/java/dev/scratch/prototype2/project.xml&r2=123089
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/project.xml (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/project.xml Wed Dec 22 03:23:03 2004
@@ -142,8 +142,8 @@
<excludes>
<exclude>**/*Abstract*.java</exclude>
<exclude>**/*Util*.java</exclude>
- <!-- <exclude>**/*BadInputTest.java</exclude> -->
-
+ <exclude>**/*BuildERWithDeploymentTest.java</exclude>
+ <exclude>**/*ServiceTest.java</exclude>
</excludes>
<includes>
<include>**/*Test.java</include>
Added: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/EngineRegistryFactory.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/EngineRegistryFactory.java?view=auto&rev=123089
==============================================================================
--- (empty file)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/engine/EngineRegistryFactory.java Wed Dec 22 03:23:03 2004
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2003,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.axis.engine;
+
+import javax.xml.stream.XMLStreamException;
+
+import org.apache.axis.deployment.DeploymentEngine;
+import org.apache.axis.deployment.DeploymentException;
+import org.apache.axis.phaseresolver.PhaseException;
+
+
+public class EngineRegistryFactory {
+ public EngineRegistry createEngineRegistry(String file)throws AxisFault{
+ try {
+ DeploymentEngine deploymentEngine = new DeploymentEngine(file);
+ return deploymentEngine.start();
+ } catch (PhaseException e) {
+ throw AxisFault.makeFault(e);
+ } catch (DeploymentException e) {
+ throw AxisFault.makeFault(e);
+ } catch (XMLStreamException e) {
+ throw AxisFault.makeFault(e);
+ }
+ }
+}
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module1/build.xml
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module1/build.xml?view=diff&rev=123089&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module1/build.xml&r1=123088&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module1/build.xml&r2=123089
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module1/build.xml (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module1/build.xml Wed Dec 22 03:23:03 2004
@@ -38,7 +38,7 @@
</target>
<target name="init">
- <uptodate property="jars.uptodate" targetfile="${jar.dir}/echo.jar">
+ <uptodate property="jars.uptodate" targetfile="${jar.dir}/module1.jar">
<srcfiles dir="${src}">
<include name="**/*.java"/>
<include name="**/*.xml"/>
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module2/build.xml
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module2/build.xml?view=diff&rev=123089&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module2/build.xml&r1=123088&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module2/build.xml&r2=123089
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module2/build.xml (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module2/build.xml Wed Dec 22 03:23:03 2004
@@ -38,7 +38,7 @@
</target>
<target name="init">
- <uptodate property="jars.uptodate" targetfile="${jar.dir}/echo.jar">
+ <uptodate property="jars.uptodate" targetfile="${jar.dir}/module2.jar">
<srcfiles dir="${src}">
<include name="**/*.java"/>
<include name="**/*.xml"/>
Added: webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/server.xml
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/server.xml?view=auto&rev=123089
==============================================================================
--- (empty file)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/server.xml Wed Dec 22 03:23:03 2004
@@ -0,0 +1,12 @@
+<server name ="AxisJava2.0" >
+ <phaseOrder>
+ <phase name="global"/>
+ <phase name="transport"/>
+ <phase name="p2"/>
+ <phase name="p1"/>
+ <phase name="p3"/>
+ <phase name="anyhase"/>
+ <phase name="service"/>
+ </phaseOrder>
+</server>
+
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service1/build.xml
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service1/build.xml?view=diff&rev=123089&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service1/build.xml&r1=123088&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service1/build.xml&r2=123089
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service1/build.xml (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service1/build.xml Wed Dec 22 03:23:03 2004
@@ -38,7 +38,7 @@
</target>
<target name="init">
- <uptodate property="jars.uptodate" targetfile="${jar.dir}/echo.jar">
+ <uptodate property="jars.uptodate" targetfile="${jar.dir}/service1.jar">
<srcfiles dir="${src}">
<include name="**/*.java"/>
<include name="**/*.xml"/>
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service2/build.xml
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service2/build.xml?view=diff&rev=123089&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service2/build.xml&r1=123088&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service2/build.xml&r2=123089
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service2/build.xml (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service2/build.xml Wed Dec 22 03:23:03 2004
@@ -38,7 +38,7 @@
</target>
<target name="init">
- <uptodate property="jars.uptodate" targetfile="${jar.dir}/echo.jar">
+ <uptodate property="jars.uptodate" targetfile="${jar.dir}/service2.jar">
<srcfiles dir="${src}">
<include name="**/*.java"/>
<include name="**/*.xml"/>
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/msg/echo/Echo.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/msg/echo/Echo.java?view=diff&rev=123089&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/msg/echo/Echo.java&r1=123088&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/msg/echo/Echo.java&r2=123089
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/msg/echo/Echo.java (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/msg/echo/Echo.java Wed Dec 22 03:23:03 2004
@@ -1,4 +1,4 @@
-import org.apache.axis.om.SOAPEnvelope;
+import org.apache.axis.om.OMElement;
/*
* Copyright 2001-2004 The Apache Software Foundation.
@@ -17,7 +17,7 @@
*/
public class Echo {
- public SOAPEnvelope echo(SOAPEnvelope in){
+ public OMElement echo(OMElement in){
return in;
}
}
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/msg/echo/META-INF/service.xml
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/msg/echo/META-INF/service.xml?view=diff&rev=123089&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/msg/echo/META-INF/service.xml&r1=123088&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/msg/echo/META-INF/service.xml&r2=123089
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/msg/echo/META-INF/service.xml (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/msg/echo/META-INF/service.xml Wed Dec 22 03:23:03 2004
@@ -1,9 +1,7 @@
-<service
- provider="org.apache.axis.providers.RawXMLProvider"
- style="msg">
- <java:implementation class="Echo1"/>
- <inflow>
- <handler name="h1" class="Handler2"/>
- </inflow>
+<service style="xsd:msg" contextPath="axis/service/echo">
+ <java:implementation
+ provider="org.apache.axis.impl.providers.RawXMLProvider"
+ class="org.apache.axis.engine.Echo"
+ xmlns:java="http://ws.apache.org/axis2/deployment/java"/>
<operation name="echo"/>
</service>
Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/msg/echo/build.xml
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/msg/echo/build.xml?view=diff&rev=123089&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/msg/echo/build.xml&r1=123088&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/msg/echo/build.xml&r2=123089
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/msg/echo/build.xml (original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/msg/echo/build.xml Wed Dec 22 03:23:03 2004
@@ -6,7 +6,7 @@
<property name="build.lib" location="${build}/lib"/>
<property name="lib" location="lib"/>
<property name="root" location="../../../../"/>
- <property name="jar.dir" location="${root}/target/test-resources/"/>
+ <property name="jar.dir" location="${root}/target/test-resources/services"/>
<path id="axis.test.classpath">
<path refid="maven.dependency.classpath"></path>
@@ -31,7 +31,7 @@
</copy>
<mkdir dir="${jar.dir}"/>
- <jar jarfile="${jar.dir}/echo-msg.jar" basedir="${build.classes}" >
+ <jar jarfile="${jar.dir}/echo.jar" basedir="${build.classes}" >
<include name="**" />
</jar>
<delete dir="${build}"/>
Added: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/deployment/BuildERWithDeploymentTest.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/deployment/BuildERWithDeploymentTest.java?view=auto&rev=123089
==============================================================================
--- (empty file)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/deployment/BuildERWithDeploymentTest.java Wed Dec 22 03:23:03 2004
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2003,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.axis.deployment;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+
+import org.apache.axis.AbstractTestCase;
+import org.apache.axis.description.AxisService;
+import org.apache.axis.engine.AxisFault;
+import org.apache.axis.engine.EngineRegistry;
+import org.apache.axis.phaseresolver.PhaseException;
+
+
+public class BuildERWithDeploymentTest extends AbstractTestCase{
+ /**
+ * @param testName
+ */
+ public BuildERWithDeploymentTest(String testName) {
+ super(testName);
+ }
+
+ public void testDeployment() throws AxisFault, PhaseException, DeploymentException, XMLStreamException{
+ String filename = "./target/test-resources" ;
+ DeploymentEngine deploymentEngine = new DeploymentEngine(filename);
+ EngineRegistry er = deploymentEngine.start();
+ assertNotNull(er);
+ assertNotNull(er.getGlobal());
+
+ AxisService service = er.getService(new QName("echo"));
+ assertNotNull(service);
+ }
+}
Added: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineAndDeploymentTest.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineAndDeploymentTest.java?view=auto&rev=123089
==============================================================================
--- (empty file)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/engine/EngineAndDeploymentTest.java Wed Dec 22 03:23:03 2004
@@ -0,0 +1,36 @@
+/*
+ * Copyright 2003,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.axis.engine;
+
+import javax.xml.stream.XMLStreamException;
+
+import org.apache.axis.AbstractTestCase;
+import org.apache.axis.deployment.DeploymentException;
+import org.apache.axis.phaseresolver.PhaseException;
+
+
+public class EngineAndDeploymentTest extends AbstractTestCase{
+ /**
+ * @param testName
+ */
+ public EngineAndDeploymentTest(String testName) {
+ super(testName);
+ // TODO Auto-generated constructor stub
+ }
+
+ public void testRunServiceWithDeployment() throws AxisFault, PhaseException, DeploymentException, XMLStreamException{
+ }
+}