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 2004/12/23 07:26:30 UTC

svn commit: r123168 - in webservices/axis/trunk/java/dev/scratch/prototype2: . src/java/org/apache/axis/deployment src/samples/deployment/module1 src/samples/deployment/module2 src/samples/deployment/service1 src/samples/deployment/service2 src/samples/msg/echo src/test/org/apache/axis/deployment

Author: deepal
Date: Wed Dec 22 22:26:28 2004
New Revision: 123168

URL: http://svn.apache.org/viewcvs?view=rev&rev=123168
Log:
folder structure
Modified:
   webservices/axis/trunk/java/dev/scratch/prototype2/maven.xml
   webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java
   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/build.xml
   webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/deployment/ServiceTest.java

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=123168&p1=webservices/axis/trunk/java/dev/scratch/prototype2/maven.xml&r1=123167&p2=webservices/axis/trunk/java/dev/scratch/prototype2/maven.xml&r2=123168
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/maven.xml	(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/maven.xml	Wed Dec 22 22:26:28 2004
@@ -15,9 +15,10 @@
 			<ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="src/samples/deployment/module1"/>
 			<ant:ant antfile="build.xml" inheritall="true" inheritrefs="true" dir="src/samples/deployment/module2"/>
         </j:jelly>
+      <ant:copy file="${basedir}/src/test-resources/deployment/server.xml" tofile="${basedir}/target/test-resources/deployment/server.xml"/>
     </preGoal> 
 	<postGoal name="jar">
         <ant:mkdir dir="${maven.repo.local}/axis/jars"/>
 		<ant:copy file="${basedir}/target/axis2-M1.jar" tofile="${maven.repo.local}/axis/jars/axis2-M1.jar"/>
-    </postGoal>
+              </postGoal>
  </project>

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java?view=diff&rev=123168&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java&r1=123167&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java&r2=123168
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java	(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/java/org/apache/axis/deployment/DeploymentEngine.java	Wed Dec 22 22:26:28 2004
@@ -89,6 +89,7 @@
      */
     public DeploymentEngine(String RepositaryName) {
         this.folderName = RepositaryName;
+        this.serverconfigName = RepositaryName + "/server.xml";
     }
 
     public DeploymentEngine(String RepositaryName , String configFileName) {

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=123168&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module1/build.xml&r1=123167&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module1/build.xml&r2=123168
==============================================================================
--- 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 22:26:28 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/modules/"/>
+	<property name="jar.dir" location="${root}/target/test-resources/deployment/modules/"/>
 	
 	<path id="axis.test.classpath">
 		<path refid="maven.dependency.classpath"></path>

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=123168&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module2/build.xml&r1=123167&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/module2/build.xml&r2=123168
==============================================================================
--- 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 22:26:28 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/modules/"/>
+	<property name="jar.dir" location="${root}/target/test-resources/deployment/modules/"/>
 	
 	<path id="axis.test.classpath">
 		<path refid="maven.dependency.classpath"></path>

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=123168&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service1/build.xml&r1=123167&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service1/build.xml&r2=123168
==============================================================================
--- 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 22:26:28 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/services/"/>
+	<property name="jar.dir" location="${root}/target/test-resources/deployment/services/"/>
 	
 	<path id="axis.test.classpath">
 		<path refid="maven.dependency.classpath"></path>

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=123168&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service2/build.xml&r1=123167&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/deployment/service2/build.xml&r2=123168
==============================================================================
--- 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 22:26:28 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/services/"/>
+	<property name="jar.dir" location="${root}/target/test-resources/deployment/services/"/>
 	
 	<path id="axis.test.classpath">
 		<path refid="maven.dependency.classpath"></path>

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=123168&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/msg/echo/build.xml&r1=123167&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/samples/msg/echo/build.xml&r2=123168
==============================================================================
--- 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 22:26:28 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/services"/>
+	<property name="jar.dir" location="${root}/target/test-resources/deployment/services"/>
 	
 	<path id="axis.test.classpath">
 		<path refid="maven.dependency.classpath"></path>

Modified: webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/deployment/ServiceTest.java
Url: http://svn.apache.org/viewcvs/webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/deployment/ServiceTest.java?view=diff&rev=123168&p1=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/deployment/ServiceTest.java&r1=123167&p2=webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/deployment/ServiceTest.java&r2=123168
==============================================================================
--- webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/deployment/ServiceTest.java	(original)
+++ webservices/axis/trunk/java/dev/scratch/prototype2/src/test/org/apache/axis/deployment/ServiceTest.java	Wed Dec 22 22:26:28 2004
@@ -26,7 +26,7 @@
 public class ServiceTest extends TestCase {
     EngineRegistry er = null;
     public void testparseService1() throws PhaseException ,DeploymentException, AxisFault, XMLStreamException{
-        String filename = "./target/test-resources" ;
+        String filename = "./target/test-resources/deployment" ;
         DeploymentEngine deploymentEngine = new DeploymentEngine(filename);
         er = deploymentEngine.start();
         try {
@@ -36,21 +36,21 @@
         }
     }
 
-    public static void main(String args []){
-        String filename = "./target/test-resources" ;
-        DeploymentEngine deploymentEngine = new DeploymentEngine(filename);
-        EngineRegistry er = null;
-        try {
-            er = deploymentEngine.start();
-        } catch (AxisFault axisFault) {
-            axisFault.printStackTrace();  //To change body of catch statement use Options | File Templates.
-        } catch (PhaseException e) {
-            e.printStackTrace();  //To change body of catch statement use Options | File Templates.
-        } catch (DeploymentException e) {
-            e.printStackTrace();  //To change body of catch statement use Options | File Templates.
-        } catch (XMLStreamException e) {
-            e.printStackTrace();  //To change body of catch statement use Options | File Templates.
-        }
-    }
+//    public static void main(String args []){
+//        String filename = "./target/test-resources" ;
+//        DeploymentEngine deploymentEngine = new DeploymentEngine(filename);
+//        EngineRegistry er = null;
+//        try {
+//            er = deploymentEngine.start();
+//        } catch (AxisFault axisFault) {
+//            axisFault.printStackTrace();  //To change body of catch statement use Options | File Templates.
+//        } catch (PhaseException e) {
+//            e.printStackTrace();  //To change body of catch statement use Options | File Templates.
+//        } catch (DeploymentException e) {
+//            e.printStackTrace();  //To change body of catch statement use Options | File Templates.
+//        } catch (XMLStreamException e) {
+//            e.printStackTrace();  //To change body of catch statement use Options | File Templates.
+//        }
+//    }
      
 }