You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wsrf-dev@ws.apache.org by ip...@apache.org on 2005/05/20 23:44:18 UTC
svn commit: r171159 - in /incubator/apollo/trunk/src/templates:
AbstractResource.vm AbstractService.vm BaseFaultExtension.vm CustomFault.vm
CustomOperationsPortType.vm PropertyQNames.vm build.xml.vm deploy.vm jndi.vm
Author: ips
Date: Fri May 20 14:44:16 2005
New Revision: 171159
URL: http://svn.apache.org/viewcvs?rev=171159&view=rev
Log:
removed escaping of dollar signs; fixed typos
Modified:
incubator/apollo/trunk/src/templates/AbstractResource.vm
incubator/apollo/trunk/src/templates/AbstractService.vm
incubator/apollo/trunk/src/templates/BaseFaultExtension.vm
incubator/apollo/trunk/src/templates/CustomFault.vm
incubator/apollo/trunk/src/templates/CustomOperationsPortType.vm
incubator/apollo/trunk/src/templates/PropertyQNames.vm
incubator/apollo/trunk/src/templates/build.xml.vm
incubator/apollo/trunk/src/templates/deploy.vm
incubator/apollo/trunk/src/templates/jndi.vm
Modified: incubator/apollo/trunk/src/templates/AbstractResource.vm
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/AbstractResource.vm?rev=171159&r1=171158&r2=171159&view=diff
==============================================================================
--- incubator/apollo/trunk/src/templates/AbstractResource.vm (original)
+++ incubator/apollo/trunk/src/templates/AbstractResource.vm Fri May 20 14:44:16 2005
@@ -8,7 +8,7 @@
import org.apache.ws.addressing.EndpointReference;
/**
- * **** WARNING: This file will be overwritted during generation ****
+ * **** WARNING: This file will be overwritten during generation ****
*
* An abstract $serviceName WS-Resource.
* <p/>
Modified: incubator/apollo/trunk/src/templates/AbstractService.vm
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/AbstractService.vm?rev=171159&r1=171158&r2=171159&view=diff
==============================================================================
--- incubator/apollo/trunk/src/templates/AbstractService.vm (original)
+++ incubator/apollo/trunk/src/templates/AbstractService.vm Fri May 20 14:44:16 2005
@@ -15,7 +15,7 @@
import javax.xml.namespace.QName;
/**
- * **** WARNING: This file will be overwritted during generation ****
+ * **** WARNING: This file will be overwritten during generation ****
*
* This class should be generated on every "generation" against the WSDL.
* This will ensure it is always up-to-date with the WSDL.
Modified: incubator/apollo/trunk/src/templates/BaseFaultExtension.vm
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/BaseFaultExtension.vm?rev=171159&r1=171158&r2=171159&view=diff
==============================================================================
--- incubator/apollo/trunk/src/templates/BaseFaultExtension.vm (original)
+++ incubator/apollo/trunk/src/templates/BaseFaultExtension.vm Fri May 20 14:44:16 2005
@@ -12,7 +12,7 @@
import org.apache.ws.resource.properties.NamespaceVersionHolder;
/**
- * **** WARNING: This file will be overwritted during generation ****
+ * **** WARNING: This file will be overwritten during generation ****
*/
public class $faultName
extends AbstractBaseFaultException
@@ -45,4 +45,4 @@
return m_name;
}
-}
\ No newline at end of file
+}
Modified: incubator/apollo/trunk/src/templates/CustomFault.vm
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/CustomFault.vm?rev=171159&r1=171158&r2=171159&view=diff
==============================================================================
--- incubator/apollo/trunk/src/templates/CustomFault.vm (original)
+++ incubator/apollo/trunk/src/templates/CustomFault.vm Fri May 20 14:44:16 2005
@@ -13,9 +13,8 @@
import org.apache.ws.resource.faults.FaultException;
import javax.xml.namespace.QName;
-
/**
- * **** WARNING: This file will be overwritted during generation ****
+ * **** WARNING: This file will be overwritten during generation ****
*/
public class $faultName
extends FaultException
@@ -52,4 +51,4 @@
}
}
-}
\ No newline at end of file
+}
Modified: incubator/apollo/trunk/src/templates/CustomOperationsPortType.vm
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/CustomOperationsPortType.vm?rev=171159&r1=171158&r2=171159&view=diff
==============================================================================
--- incubator/apollo/trunk/src/templates/CustomOperationsPortType.vm (original)
+++ incubator/apollo/trunk/src/templates/CustomOperationsPortType.vm Fri May 20 14:44:16 2005
@@ -5,7 +5,7 @@
package $package;
/**
- * **** WARNING: This file will be overwritted during generation ****
+ * **** WARNING: This file will be overwritten during generation ****
*
* Custom operations portType.
*
Modified: incubator/apollo/trunk/src/templates/PropertyQNames.vm
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/PropertyQNames.vm?rev=171159&r1=171158&r2=171159&view=diff
==============================================================================
--- incubator/apollo/trunk/src/templates/PropertyQNames.vm (original)
+++ incubator/apollo/trunk/src/templates/PropertyQNames.vm Fri May 20 14:44:16 2005
@@ -6,7 +6,7 @@
import javax.xml.namespace.QName;
/**
- * **** WARNING: This file will be overwritted during generation ****
+ * **** WARNING: This file will be overwritten during generation ****
*
* QNames of the resource properties defined by $serviceName WSDL.
* <p/>
Modified: incubator/apollo/trunk/src/templates/build.xml.vm
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/build.xml.vm?rev=171159&r1=171158&r2=171159&view=diff
==============================================================================
--- incubator/apollo/trunk/src/templates/build.xml.vm (original)
+++ incubator/apollo/trunk/src/templates/build.xml.vm Fri May 20 14:44:16 2005
@@ -7,7 +7,7 @@
#set( $serviceName = $generated.ServiceName )
<?xml version="1.0"?>
-<!-- **** WARNING: This file will be overwritted during generation **** -->
+<!-- **** WARNING: This file will be overwritten during generation **** -->
<project name="${serviceName}_buildfile" default="usage" basedir=".">
@@ -30,10 +30,10 @@
<echo>Using webapp dir: ${${generated.WebappName}.webapp.dir}</echo>
<path id="${serviceName}.classpath.id">
<pathelement location="${${generated.WebappName}.webapp.dir}/WEB-INF/classes" />
- <fileset dir="\${${generated.WebappName}.webapp.dir}/WEB-INF/lib" includes="*.jar" />
- <fileset dir="\${jar.dir}" />
- <pathelement location="\${activation.jar}" />
- <pathelement location="\${mail.jar}" />
+ <fileset dir="${${generated.WebappName}.webapp.dir}/WEB-INF/lib" includes="*.jar" />
+ <fileset dir="${jar.dir}" />
+ <pathelement location="${activation.jar}" />
+ <pathelement location="${mail.jar}" />
</path>
<property name="${serviceName}.classpath" refid="${serviceName}.classpath.id" />
@@ -42,40 +42,40 @@
<target name="compile"
depends="init"
description="compile all classes below classes directory">
- <mkdir dir="\${classes.dir}" />
- <javac srcdir="\${src.dir}"
- destdir="\${classes.dir}"
+ <mkdir dir="${classes.dir}" />
+ <javac srcdir="${src.dir}"
+ destdir="${classes.dir}"
classpathref="${serviceName}.classpath.id"
debug="on"
excludes="xmlbeans/**"/>
- <copy todir="\${classes.dir}">
- <fileset dir="\${src.dir}" excludes="**/*.java,**/package.html" />
+ <copy todir="${classes.dir}">
+ <fileset dir="${src.dir}" excludes="**/*.java,**/package.html" />
</copy>
</target>
<target name="deploy"
depends="init"
- description="deploys the ${endpointServiceName} service to the \${${generated.WebappName}.webapp.dir} webapp">
+ description="deploys the ${endpointServiceName} service to the ${${generated.WebappName}.webapp.dir} webapp">
- <copy file="\${wsdl.file}" todir="${${generated.WebappName}.webapp.dir}/WEB-INF/classes/wsdl" overwrite="true" verbose="true" />
- <echo>Deploying ${endpointServiceName} classes to \${${generated.WebappName}.webapp.dir}/WEB-INF/classes/...</echo>
+ <copy file="${wsdl.file}" todir="${${generated.WebappName}.webapp.dir}/WEB-INF/classes/wsdl" overwrite="true" verbose="true" />
+ <echo>Deploying ${endpointServiceName} classes to ${${generated.WebappName}.webapp.dir}/WEB-INF/classes/...</echo>
<copy todir="${${generated.WebappName}.webapp.dir}/WEB-INF/classes">
- <fileset dir="\${classes.dir}" />
+ <fileset dir="${classes.dir}" />
</copy>
- <copy file="\${jar.dir}/${jarFile}" todir="\${${generated.WebappName}.webapp.dir}/WEB-INF/lib" />
+ <copy file="${jar.dir}/${jarFile}" todir="${${generated.WebappName}.webapp.dir}/WEB-INF/lib" />
<!-- update server-config.wsdd using WsddUpdater -->
<taskdef name="wsddUpdater" classname="org.apache.ws.util.platform.axis.tool.WsddUpdater" classpathref="${serviceName}.classpath.id" />
- <property name="config.wsdd" location="\${${generated.WebappName}.webapp.dir}/WEB-INF/server-config.wsdd" /> <!-- normalize path -->
- <wsddUpdater configWsdd="\${config.wsdd}">
- <wsddPaths dir="\${src.dir}" includes="**/${serviceName}_deploy.wsdd" />
+ <property name="config.wsdd" location="${${generated.WebappName}.webapp.dir}/WEB-INF/server-config.wsdd" /> <!-- normalize path -->
+ <wsddUpdater configWsdd="${config.wsdd}">
+ <wsddPaths dir="${src.dir}" includes="**/${serviceName}_deploy.wsdd" />
</wsddUpdater>
<!-- update jndi-config.wsdd using JndiConfigUpdater -->
<taskdef name="jndiUpdater" classname="org.apache.ws.util.jndi.tools.JndiConfigUpdater" classpathref="${serviceName}.classpath.id" />
- <property name="jndi.config" location="\${${generated.WebappName}.webapp.dir}/WEB-INF/classes/jndi-config.xml" /> <!-- normalize path -->
- <jndiUpdater jndiConfig="\${jndi.config}">
- <jndiConfigPaths dir="\${src.dir}" includes="**/${serviceName}_jndi-config.xml" />
+ <property name="jndi.config" location="${${generated.WebappName}.webapp.dir}/WEB-INF/classes/jndi-config.xml" /> <!-- normalize path -->
+ <jndiUpdater jndiConfig="${jndi.config}">
+ <jndiConfigPaths dir="${src.dir}" includes="**/${serviceName}_jndi-config.xml" />
</jndiUpdater>
</target>
@@ -84,19 +84,19 @@
description="sends a request to the ${endpointServiceName} service">
<ant antfile="soapclient.xml">
- <property name="url" value="\${endpoint.url}" />
+ <property name="url" value="${endpoint.url}" />
</ant>
</target>
<target name="clean" description="delete the generated source and class files">
- <delete dir="\${classes.dir}" />
+ <delete dir="${classes.dir}" />
</target>
<target name="usage">
<java classname="org.apache.tools.ant.Main">
<arg value="-buildfile" />
- <arg value="\${ant.file}" />
+ <arg value="${ant.file}" />
<arg value="-projecthelp" />
</java>
</target>
Modified: incubator/apollo/trunk/src/templates/deploy.vm
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/deploy.vm?rev=171159&r1=171158&r2=171159&view=diff
==============================================================================
--- incubator/apollo/trunk/src/templates/deploy.vm (original)
+++ incubator/apollo/trunk/src/templates/deploy.vm Fri May 20 14:44:16 2005
@@ -1,7 +1,7 @@
#set( $endpointServiceName = $generated.EndpointServiceName )
#set( $wsdlName = $generated.wsdlName )
<?xml version="1.0"?>
-<!-- **** WARNING: This file will be overwritted during generation **** -->
+<!-- **** WARNING: This file will be overwritten during generation **** -->
<deployment xmlns="http://xml.apache.org/axis/wsdd/"
xmlns:java="http://xml.apache.org/axis/wsdd/providers/java">
Modified: incubator/apollo/trunk/src/templates/jndi.vm
URL: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/jndi.vm?rev=171159&r1=171158&r2=171159&view=diff
==============================================================================
--- incubator/apollo/trunk/src/templates/jndi.vm (original)
+++ incubator/apollo/trunk/src/templates/jndi.vm Fri May 20 14:44:16 2005
@@ -5,7 +5,7 @@
#set( $resourcekey = $generated.resourcekey )
<?xml version="1.0"?>
-<!-- **** WARNING: This file will be overwritted during generation **** -->
+<!-- **** WARNING: This file will be overwritten during generation **** -->
<jndiConfig xmlns="http://www.apache.org/wsfx/wsrf/jndi/config">
---------------------------------------------------------------------
To unsubscribe, e-mail: apollo-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: apollo-dev-help@ws.apache.org