Author: scamp
Date: Thu Jan  6 11:52:49 2005
New Revision: 124424

URL: http://svn.apache.org/viewcvs?view=rev&rev=124424
Log:
updated these temples for generation
Modified:
   incubator/apollo/trunk/src/templates/build.properties.vm
   incubator/apollo/trunk/src/templates/build.xml.vm

Modified: incubator/apollo/trunk/src/templates/build.properties.vm
Url: 
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/build.properties.vm?view=diff&rev=124424&p1=incubator/apollo/trunk/src/templates/build.properties.vm&r1=124423&p2=incubator/apollo/trunk/src/templates/build.properties.vm&r2=124424
==============================================================================
--- incubator/apollo/trunk/src/templates/build.properties.vm    (original)
+++ incubator/apollo/trunk/src/templates/build.properties.vm    Thu Jan  6 
11:52:49 2005
@@ -1,4 +1,6 @@
-base.url=http://localhost:8080/wsrf/services

+#set( $endpointURL = $generated.EndpointURL )

+

+enpoint.url=${endpointURL}

 

 # Uncomment and modify the below lines if you would like to deploy to a

 # wsrf webapp located somewhere other than the default location of


Modified: incubator/apollo/trunk/src/templates/build.xml.vm
Url: 
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/build.xml.vm?view=diff&rev=124424&p1=incubator/apollo/trunk/src/templates/build.xml.vm&r1=124423&p2=incubator/apollo/trunk/src/templates/build.xml.vm&r2=124424
==============================================================================
--- incubator/apollo/trunk/src/templates/build.xml.vm   (original)
+++ incubator/apollo/trunk/src/templates/build.xml.vm   Thu Jan  6 11:52:49 2005
@@ -1,3 +1,7 @@
+#set( $wsdlName = $generated.wsdlName )

+#set( $endpointServiceName = $generated.EndpointServiceName )

+

+

 <?xml version="1.0"?>

 

 <project name="filesystem_example" default="usage" basedir=".">

@@ -12,20 +16,10 @@
    <property name="classes.dir"           location="classes"/>

    <property name="jar.dir"              location="jar"/>

    <property name="src.dir"               location="src/java" />

-   <property name="filesystem.wsdl"       location="FileSystem.wsdl" />

-   <property name="url"                   value="${base.url}/filesystem" />

-   <property name="xml.basedir"           location="${basedir}" />

+   <property name="wsdl.file"             location="$wsdlName" />

 

    <target name="init">

-     

-    <!-- <available file="../../webapps/wsrf" type="dir" 
property="dist.wsrf.webapp.dir" value="../../webapps/wsrf" />         

-     <condition property="wsrf.webapp.dir" value="${dist.wsrf.webapp.dir}">

-        <isset property="dist.wsrf.webapp.dir"/>

-     </condition>     

- 

-     

-     <fail unless="wsrf.webapp.dir" message="webapp dir ../../webapps/wsrf 
does not exist." /> 

-        --> 

+        

      <echo>Using webapp dir: ${wsrf.webapp.dir}</echo>    

     

      <path id="apollo.classpath.id">

@@ -55,11 +49,10 @@
            

    <target name="deploy"

            depends="init"

-           description="deploys the filesystem service to the wsrf webapp">

+           description="deploys the ${endpointServiceName} service to the wsrf 
webapp">

           

-       <copy file="${filesystem.wsdl}" 
todir="${wsrf.webapp.dir}/WEB-INF/classes/wsdl" overwrite="true" verbose="true" 
/>

-       <copy file="${sysprop.wsdl}" 
todir="${wsrf.webapp.dir}/WEB-INF/classes/wsdl" overwrite="true" verbose="true" 
/>

-       <echo>Deploying filesystem and sysprop service classes to 
${wsrf.webapp.dir}/WEB-INF/classes/...</echo>

+       <copy file="${wsdl.file}" 
todir="${wsrf.webapp.dir}/WEB-INF/classes/wsdl" overwrite="true" verbose="true" 
/>       

+       <echo>Deploying ${endpointServiceName} classes to 
${wsrf.webapp.dir}/WEB-INF/classes/...</echo>

        <copy todir="${wsrf.webapp.dir}/WEB-INF/classes">

          <fileset dir="${classes.dir}" />        

        </copy>

@@ -67,35 +60,20 @@
        <!-- TODO: update server-config.wsdd using WsddUpdater -->

        

    </target>

-      

-   <target name="run"

-           depends="init, compile, deploy"

-           description="run a client test of the filesystem service">      

-   

-     <property name="xml" 
location="requests/GetResourceProperty_validProp.soap" />

-     <antcall target="sendRequest" />

-   

-   </target>

-

+        

    <target name="sendRequest"

-           description="sends a request to the filesystem service">      

+           description="sends a request to the ${endpointServiceName} 
service">      

         

      <ant antfile="soapclient.xml">

-       <property name="url" value="${base.url}/filesystem" />

+       <property name="url" value="${endpoint.url}" />

      </ant>

    

    </target>

-   <target name="sendSysRequest"

-              description="sends a request to the filesystem service">      

-           

-   <ant antfile="soapclient.xml">

-    <property name="url" value="${base.url}/sysprops" />

-   </ant>

-      

-   </target>

+   

    <target name="clean" description="delete the generated source and class 
files">

-       <delete dir="${src.dir}" /> <!-- this should not be here!  -->

+       <delete dir="${src.dir}/xmlbeans" />

        <delete dir="${classes.dir}" />

+       <delete dir="${jar.dir}" />

    </target>

    

    <target name="usage">      


---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to