svn commit: r278980 - in /webservices/axis/trunk/c: build/serviceInitialize.xml services.xml

[di...@apache.org]

Author: dicka
Date: Tue Sep  6 05:00:39 2005
New Revision: 278980

URL: http://svn.apache.org/viewcvs?rev=278980&view=rev
Log:
Updating scripts for testing server-side to use similar structure as used by client-side testing.
Found some additional changes, where there are name clashes in targets between client and server.

Modified:
    webservices/axis/trunk/c/build/serviceInitialize.xml
    webservices/axis/trunk/c/services.xml

Modified: webservices/axis/trunk/c/build/serviceInitialize.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/build/serviceInitialize.xml?rev=278980&r1=278979&r2=278980&view=diff
==============================================================================
--- webservices/axis/trunk/c/build/serviceInitialize.xml (original)
+++ webservices/axis/trunk/c/build/serviceInitialize.xml Tue Sep  6 05:00:39 2005
@@ -1,4 +1,4 @@
-<project>
+<project name="initializeServer" default="decideserverproperties">
     <target name="decideserverproperties">
 
         <property name="wsdd.file" value="${dir.test.generated}${file.separator}server${file.separator}server.wsdd" />

Modified: webservices/axis/trunk/c/services.xml
URL: http://svn.apache.org/viewcvs/webservices/axis/trunk/c/services.xml?rev=278980&r1=278979&r2=278980&view=diff
==============================================================================
--- webservices/axis/trunk/c/services.xml (original)
+++ webservices/axis/trunk/c/services.xml Tue Sep  6 05:00:39 2005
@@ -4,7 +4,7 @@
     <import file="${basedir}/build/testInitialize.xml" />
     <import file="${basedir}/build/serviceInitialize.xml" />
 
-    <target name="createConfigurationFile" depends="initialize, decideserverproperties">
+    <target name="createServerConfigurationFile" depends="initialize, decideserverproperties">
         <!-- Select which parser library to use -->
         <condition property="ClientParserLib" value="${libraryPrefix}${xml4c.xmlParserLibraryName}${librarySuffix}">
             <istrue value="${testconf.client.parser.xml4c}"/>
@@ -67,7 +67,7 @@
 
 
     <target name="deployServices"
-            depends="initialize, stopserver, createConfigurationFile, startWSDDFile, buildServices, endWSDDFile, runserver"
+            depends="initialize, stopserver, createServerConfigurationFile, startWSDDFile, buildServices, endWSDDFile, runserver"
             description="Build and deploy services for tests" />
 
 
@@ -146,14 +146,14 @@
     </target>
 
     <target name="buildService"
-            depends="setPropertiesForService,generateStubs, compileService, generateWSDDService" />
+            depends="setPropertiesForService,generateServerStubs, compileService, generateWSDDService" />
 
 
     <target name="setPropertiesForService"
-            depends="loadXMLProperties,setServiceName,setServiceDesc,setServiceCode,setServiceLang,setServiceWsdl" />
+            depends="loadServerXMLProperties,setServiceName,setServiceDesc,setServiceCode,setServiceLang,setServiceWsdl" />
 
 
-    <target name="loadXMLProperties">
+    <target name="loadServerXMLProperties">
         <echo message="Loading XML file ${service_property}" />
         <xmlproperty file="${service_property}" keepRoot="true" />
     </target>
@@ -187,14 +187,14 @@
     </target>
 
 
-    <target name="setLanguage">
+    <target name="setServiceLanguage">
         <condition property="generated.lang" value="c++">
             <equals arg1="${serviceLang}" arg2="cpp" />
         </condition>
     </target>
 
 
-    <target name="generateStubs" depends="setLanguage">
+    <target name="generateServerStubs" depends="setServiceLanguage">
         <!-- Make directory in which all generated code shall be placed -->
         <echo message="${dir.test.generated}/server/${serviceLang}/${serviceName}" />
         <mkdir dir="${dir.test.generated}/server/${serviceLang}/${serviceName}" />