Author: scamp Date: Wed Jan 5 12:20:33 2005 New Revision: 124267 URL: http://svn.apache.org/viewcvs?view=rev&rev=124267 Log: reverted! Modified: incubator/apollo/trunk/src/templates/AbstractResource.vm incubator/apollo/trunk/src/templates/AbstractService.vm incubator/apollo/trunk/src/templates/CustomOperationsPortType.vm incubator/apollo/trunk/src/templates/Home.vm incubator/apollo/trunk/src/templates/PropertyQNames.vm incubator/apollo/trunk/src/templates/Resource.vm incubator/apollo/trunk/src/templates/Service.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?view=diff&rev=124267&p1=incubator/apollo/trunk/src/templates/AbstractResource.vm&r1=124266&p2=incubator/apollo/trunk/src/templates/AbstractResource.vm&r2=124267 ============================================================================== --- incubator/apollo/trunk/src/templates/AbstractResource.vm (original) +++ incubator/apollo/trunk/src/templates/AbstractResource.vm Wed Jan 5 12:20:33 2005 @@ -1,11 +1,11 @@ -#set( ${package} = ${generated}.packageName) -#set( ${serviceName} = ${generated}.ServiceName) -#set( ${implements} = ${generated}.resourceImplements) -#set( ${ScheduledResourceTerminationResource} = ${generated}.IsScheduledResourceTerminationResource) -#set( ${Resource} = ${generated}.IsResource) -#set( ${PropertiesResource} = ${generated}.IsPropertiesResource) +#set( $package = $generated.packageName) +#set( $serviceName = $generated.ServiceName) +#set( $implements = $generated.resourceImplements) +#set( $ScheduledResourceTerminationResource = $generated.IsScheduledResourceTerminationResource) +#set( $Resource = $generated.IsResource) +#set( $PropertiesResource = $generated.IsPropertiesResource) -package ${package}; +package $package; import org.apache.ws.resource.PropertiesResource; import org.apache.ws.resource.Resource; @@ -24,12 +24,12 @@ import java.util.Calendar; /** - * An abstract ${serviceName} WS-Resource. + * An abstract $serviceName WS-Resource. * <p/> * NOTE: This class is generated and is NOT meant to be modified. * */ -public abstract class Abstract${serviceName}Resource implements Resource #if(${implements}) , ${implements} #end +public abstract class Abstract${serviceName}Resource implements Resource #if($implements) , $implements #end { /** @@ -37,7 +37,7 @@ */ protected String m_id; - #if(${generated}.hasProperties()) + #if($generated.hasProperties()) /** * The ResourceProperty Set containing the resource props. */ @@ -46,8 +46,8 @@ #parse( "templates/ResourceIntf.vm" ) -#foreach( ${includeFile} in ${generated}.ResourceIncludeFiles ) -#include( ${includeFile} ) +#foreach( $includeFile in $generated.ResourceIncludeFiles ) +#include( $includeFile ) #end Modified: incubator/apollo/trunk/src/templates/AbstractService.vm Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/AbstractService.vm?view=diff&rev=124267&p1=incubator/apollo/trunk/src/templates/AbstractService.vm&r1=124266&p2=incubator/apollo/trunk/src/templates/AbstractService.vm&r2=124267 ============================================================================== --- incubator/apollo/trunk/src/templates/AbstractService.vm (original) +++ incubator/apollo/trunk/src/templates/AbstractService.vm Wed Jan 5 12:20:33 2005 @@ -1,12 +1,12 @@ -#set( ${package} = ${generated}.packageName) -#set( ${serviceName} = ${generated}.ServiceName) -#set( ${implements} = ${generated}.serviceImplements) -#set( ${namespace} = ${generated}.namespace) -#set( ${prefix} = ${generated}.prefix) -#set( ${customMethodList} = ${generated}.customMethodList) -#set( ${qnames} = ${qnames}) +#set( $package = $generated.packageName) +#set( $serviceName = $generated.ServiceName) +#set( $implements = $generated.serviceImplements) +#set( $namespace = $generated.namespace) +#set( $prefix = $generated.prefix) +#set( $customMethodList = $generated.customMethodList) +#set( $qnames = $qnames) -package ${package}; +package $package; import org.apache.ws.resource.ResourceContext; import org.apache.ws.resource.handler.SoapMethodNameMap; @@ -23,11 +23,11 @@ * NOTE: This class is generated and is NOT meant to be modified. */ public abstract class Abstract${serviceName}Service - implements WsrfService #if(${implements}) , ${implements} #end + implements WsrfService #if($implements) , $implements #end { - public static final String TARGET_NSURI = "${namespace}"; - public static final String TARGET_NSPREFIX = "${prefix}"; + public static final String TARGET_NSURI = "$namespace"; + public static final String TARGET_NSPREFIX = "$prefix"; /** * DOCUMENT_ME @@ -80,8 +80,8 @@ { m_methodNameMap = new ServiceSoapMethodNameMap( getResourceContext( ) ); - #foreach( ${key} in ${customMethodList}.keySet() ) - m_methodNameMap.addMapping( ${key}, ${customMethodList}.get(${key}).JavaMethodName ) + #foreach( $key in $customMethodList.keySet() ) + m_methodNameMap.addMapping( $key, $customMethodList.get($key).JavaMethodName ) #end m_isInitialized = true; } @@ -97,8 +97,8 @@ return m_isInitialized; } -#foreach( ${includeFile} in ${generated}.ServiceIncludeFiles ) -#include( ${includeFile} ) +#foreach( $includeFile in $generated.ServiceIncludeFiles ) +#include( $includeFile ) #end Modified: incubator/apollo/trunk/src/templates/CustomOperationsPortType.vm Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/CustomOperationsPortType.vm?view=diff&rev=124267&p1=incubator/apollo/trunk/src/templates/CustomOperationsPortType.vm&r1=124266&p2=incubator/apollo/trunk/src/templates/CustomOperationsPortType.vm&r2=124267 ============================================================================== --- incubator/apollo/trunk/src/templates/CustomOperationsPortType.vm (original) +++ incubator/apollo/trunk/src/templates/CustomOperationsPortType.vm Wed Jan 5 12:20:33 2005 @@ -1,8 +1,8 @@ -#set( ${package} = ${generated}.packageName) -#set( ${serviceName} = ${generated}.ServiceName) -#set( ${customMethodList} = ${generated}.customMethodList) +#set( $package = $generated.packageName) +#set( $serviceName = $generated.ServiceName) +#set( $customMethodList = $generated.customMethodList) -package ${package}; +package $package; import org.apache.xmlbeans.XmlObject; @@ -15,8 +15,8 @@ public interface ${serviceName}CustomOperationsPortType { - #foreach( ${method} in ${customMethodList}.valueSet() ) - ${method}.JavaMethodSignature; + #foreach( $method in $customMethodList.valueSet() ) + $method.JavaMethodSignature; #end } Modified: incubator/apollo/trunk/src/templates/Home.vm Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/Home.vm?view=diff&rev=124267&p1=incubator/apollo/trunk/src/templates/Home.vm&r1=124266&p2=incubator/apollo/trunk/src/templates/Home.vm&r2=124267 ============================================================================== --- incubator/apollo/trunk/src/templates/Home.vm (original) +++ incubator/apollo/trunk/src/templates/Home.vm Wed Jan 5 12:20:33 2005 @@ -1,6 +1,6 @@ -#set( ${package} = ${generated}.packageName ) -#set( ${serviceName} = ${generated}.ServiceName ) -package ${package}; +#set( $package = $generated.packageName ) +#set( $serviceName = $generated.ServiceName ) +package $package; import org.apache.ws.resource.Resource; import org.apache.ws.resource.ResourceContext; @@ -13,7 +13,7 @@ import java.io.Serializable; /** - * Home for ${serviceName} WS-Resources. + * Home for $serviceName WS-Resources. */ public class ${serviceName}Home extends AbstractResourceHome Modified: incubator/apollo/trunk/src/templates/PropertyQNames.vm Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/PropertyQNames.vm?view=diff&rev=124267&p1=incubator/apollo/trunk/src/templates/PropertyQNames.vm&r1=124266&p2=incubator/apollo/trunk/src/templates/PropertyQNames.vm&r2=124267 ============================================================================== --- incubator/apollo/trunk/src/templates/PropertyQNames.vm (original) +++ incubator/apollo/trunk/src/templates/PropertyQNames.vm Wed Jan 5 12:20:33 2005 @@ -1,12 +1,12 @@ -#set( ${package} = ${generated}.packageName) -#set( ${serviceName} = ${generated}.serviceName) -#set( ${propertyMap} = ${generated}.propertyMap) -package ${package}; +#set( $package = $generated.packageName) +#set( $serviceName = $generated.serviceName) +#set( $propertyMap = $generated.propertyMap) +package $package; import javax.xml.namespace.QName; /** - * QNames of the resource properties defined by ${serviceName} WSDL. + * QNames of the resource properties defined by $serviceName WSDL. * <p/> * NOTE: This class is generated and is NOT meant to be modified. * @@ -14,9 +14,9 @@ public interface ${serviceName}PropertyQNames { - #foreach( ${key} in ${propertyMap}.keySet() ) - QName ${key} = - new QName( "${propertyMap}.get(${key}).NamespaceURI", "${propertyMap}.get(${key}).LocalPart", "${propertyMap}.get(${key}).Prefix"); + #foreach( $key in $propertyMap.keySet() ) + QName $key = + new QName( "$propertyMap.get($key).NamespaceURI", "$propertyMap.get($key).LocalPart", "$propertyMap.get($key).Prefix"); #end } Modified: incubator/apollo/trunk/src/templates/Resource.vm Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/Resource.vm?view=diff&rev=124267&p1=incubator/apollo/trunk/src/templates/Resource.vm&r1=124266&p2=incubator/apollo/trunk/src/templates/Resource.vm&r2=124267 ============================================================================== --- incubator/apollo/trunk/src/templates/Resource.vm (original) +++ incubator/apollo/trunk/src/templates/Resource.vm Wed Jan 5 12:20:33 2005 @@ -1,7 +1,7 @@ -#set( ${package} = ${generated}.packageName) -#set( ${serviceName} = ${generated}.serviceName) +#set( $package = $generated.packageName) +#set( $serviceName = $generated.serviceName) -package ${package}; +package $package; import example.filesystem.backend.FileSystem; import example.filesystem.backend.UnixFileSystem; @@ -23,7 +23,7 @@ import java.util.List; /** - * A ${serviceName} WS-Resource. + * A $serviceName WS-Resource. * <p/> * NOTE: This class is generated. */ Modified: incubator/apollo/trunk/src/templates/Service.vm Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/Service.vm?view=diff&rev=124267&p1=incubator/apollo/trunk/src/templates/Service.vm&r1=124266&p2=incubator/apollo/trunk/src/templates/Service.vm&r2=124267 ============================================================================== --- incubator/apollo/trunk/src/templates/Service.vm (original) +++ incubator/apollo/trunk/src/templates/Service.vm Wed Jan 5 12:20:33 2005 @@ -1,7 +1,7 @@ -#set( ${package} = ${generated}.packageName) -#set( ${serviceName} = ${generated}.ServiceName) -#set( ${customMethodList} = ${generated}.customMethodList) -package ${package}; +#set( $package = $generated.packageName) +#set( $serviceName = $generated.ServiceName) +#set( $customMethodList = $generated.customMethodList) +package $package; import org.apache.ws.resource.ResourceContext; import org.apache.xmlbeans.XmlObject; @@ -47,8 +47,8 @@ return m_resourceContext; } - #foreach( ${method} in ${customMethodList}.valueSet() ) - public ${method}.JavaMethodSignature + #foreach( $method in $customMethodList.valueSet() ) + public $method.JavaMethodSignature { //todo implement try Modified: incubator/apollo/trunk/src/templates/deploy.vm Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/deploy.vm?view=diff&rev=124267&p1=incubator/apollo/trunk/src/templates/deploy.vm&r1=124266&p2=incubator/apollo/trunk/src/templates/deploy.vm&r2=124267 ============================================================================== --- incubator/apollo/trunk/src/templates/deploy.vm (original) +++ incubator/apollo/trunk/src/templates/deploy.vm Wed Jan 5 12:20:33 2005 @@ -1,13 +1,13 @@ -#set( ${serviceName} = ${generated}.ServiceName ) -#set( ${wsdlName} = ${generated}.wsdlName ) +#set( $serviceName = $generated.ServiceName ) +#set( $wsdlName = $generated.wsdlName ) <?xml version="1.0"?> <deployment xmlns="http://xml.apache.org/axis/wsdd/"; xmlns:java="http://xml.apache.org/axis/wsdd/providers/java";> - <service name="${serviceName}" provider="java:WSRF" style="document" use="literal"> + <service name="$serviceName" provider="java:WSRF" style="document" use="literal"> - <wsdlFile>/wsdl/${wsdlName}</wsdlFile> + <wsdlFile>/wsdl/$wsdlName</wsdlFile> <requestFlow> <handler type="java:org.apache.axis.handlers.JAXRPCHandler"> Modified: incubator/apollo/trunk/src/templates/jndi.vm Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/jndi.vm?view=diff&rev=124267&p1=incubator/apollo/trunk/src/templates/jndi.vm&r1=124266&p2=incubator/apollo/trunk/src/templates/jndi.vm&r2=124267 ============================================================================== --- incubator/apollo/trunk/src/templates/jndi.vm (original) +++ incubator/apollo/trunk/src/templates/jndi.vm Wed Jan 5 12:20:33 2005 @@ -1,12 +1,12 @@ -#set( ${package} = ${generated}.packageName ) -#set( ${serviceName} = ${generated}.ServiceName ) -#set( ${namespace} = ${generated}.namespace ) -#set( ${resourcekey} = ${generated}.resourcekey ) +#set( $package = $generated.packageName ) +#set( $serviceName = $generated.ServiceName ) +#set( $namespace = $generated.namespace ) +#set( $resourcekey = $generated.resourcekey ) <?xml version="1.0"?> <jndiConfig xmlns="http://www.apache.org/wsfx/wsrf/jndi/config";> - <service name="${serviceName}"> + <service name="$serviceName"> <resource name="home" type="${package}.${serviceName}Home"> <resourceParams> <parameter> @@ -22,7 +22,7 @@ <value>${namespace}</value> </parameter> - #if(${resourcekey}) + #if($resourcekey) <parameter> <name>resourceKeyName</name> <value>{${resourcekey.NamespaceURI}}${resourcekey.LocalPart}</value> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
