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 sc...@apache.org on 2004/12/23 23:20:59 UTC
svn commit: r123234 - in incubator/apollo/trunk/src: java/org/apache/ws/resource java/org/apache/ws/util java/org/apache/ws/util/velocity templates
Author: scamp
Date: Thu Dec 23 14:20:57 2004
New Revision: 123234
URL: http://svn.apache.org/viewcvs?view=rev&rev=123234
Log:
updated for codegen
Added:
incubator/apollo/trunk/src/java/org/apache/ws/util/velocity/ImplementsListBuilder.java
incubator/apollo/trunk/src/java/org/apache/ws/util/velocity/Method.java
incubator/apollo/trunk/src/java/org/apache/ws/util/velocity/ServiceProperties.java
Removed:
incubator/apollo/trunk/src/java/org/apache/ws/util/ImplementsListBuilder.java
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/Wsdl2Java.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/Wsdl2JavaTask.java
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
incubator/apollo/trunk/src/templates/templating.txt
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/Wsdl2Java.java
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/Wsdl2Java.java?view=diff&rev=123234&p1=incubator/apollo/trunk/src/java/org/apache/ws/resource/Wsdl2Java.java&r1=123233&p2=incubator/apollo/trunk/src/java/org/apache/ws/resource/Wsdl2Java.java&r2=123234
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/Wsdl2Java.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/Wsdl2Java.java Thu Dec 23 14:20:57 2004
@@ -18,6 +18,7 @@
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.PosixParser;
+import org.apache.commons.lang.StringUtils;
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
@@ -27,7 +28,11 @@
import org.apache.ws.resource.i18n.MessagesImpl;
import org.apache.ws.resource.impl.ResourceDefinitionImpl;
import org.apache.ws.util.velocity.ConstQNames;
+import org.apache.ws.util.velocity.ServiceProperties;
import org.apache.ws.util.i18n.Messages;
+import org.apache.ws.util.ImplementsListBuilder;
+import org.apache.ws.util.XmlBeanUtils;
+import org.apache.ws.util.XmlBeanNameUtils;
import org.apache.xmlbeans.impl.common.XmlErrorPrinter;
import org.apache.xmlbeans.impl.tool.SchemaCompiler;
@@ -35,6 +40,7 @@
import javax.wsdl.Service;
import javax.wsdl.factory.WSDLFactory;
import javax.wsdl.xml.WSDLReader;
+import javax.xml.namespace.QName;
import java.io.File;
import java.io.FileWriter;
import java.util.ArrayList;
@@ -91,7 +97,8 @@
private File m_srcOutputDir;
private File m_classesOutputDir;
private Options m_options;
- private boolean m_isSingleton;
+ private boolean m_isSingleton;
+ private String m_resourceKey;
/**
@@ -283,67 +290,90 @@
MSG.getMessage( Keys.OPT_CLASSPATH_SENT_TO_XMLBEANS ) );
}
- private void generateSkeletonCode(ResourceDefinition resourceDef, String wsdlPath)
+ private void generateSkeletonCode(ResourceDefinition resourceDef, String wsdlFileName)
throws Exception
{
initVelocityProperties( );
+ String serviceName = StringUtils.capitalize(resourceDef.getName());
try
{
VelocityContext context = new VelocityContext( );
- context.put( "generated", resourceDef );
+ ServiceProperties props = new ServiceProperties();
+ props.setPackageName();
+ props.setServiceName(serviceName);
+ props.setServiceImplements(ImplementsListBuilder.getServiceImplementsList(resourceDef));
+ String targetNamespace = resourceDef.getDefinition().getTargetNamespace();
+ props.setNamespace(targetNamespace);
+ props.setPrefix();
+ props.setCustomMappings();
+ props.setPropertyMap();//todo
+ props.setResourceImplements(ImplementsListBuilder.getResourceImplementsList(resourceDef));
+ props.setPropertyDocumentName(XmlBeanNameUtils.getDocumentElementXmlBeanClassName(resourceDef.getPropertiesDocumentName()));
+ props.setWsdlName(wsdlFileName);
+ if( m_resourceKey == null )
+ {
+ //if its not a singleton and is null, create a default
+ if(m_isSingleton == false)
+ {
+ props.setResourcekey(new QName(targetNamespace,"ResourceID"));
+ }
+ }
+ else
+ {
+ props.setResourcekey(QName.valueOf(m_resourceKey));
+ }
+ context.put( "generated", props );
context.put( "qnames", new ConstQNames() );
- File generatedSrc = new File( m_srcOutputDir, "Abstract" + "SERVICE_NAME" + "Service.java" );
+ File generatedSrc = new File( m_srcOutputDir, "Abstract" + serviceName + "Service.java" );
writeGeneratedSrcFile( context,
"templates/AbstractService.vm",
generatedSrc.getAbsolutePath( ) );
- generatedSrc = new File( m_srcOutputDir, "SERVICE_NAME" + "Service.java" );
+ generatedSrc = new File( m_srcOutputDir, serviceName + "Service.java" );
writeGeneratedSrcFile( context,
"templates/Service.vm",
generatedSrc.getAbsolutePath( ) );
- generatedSrc = new File( m_srcOutputDir, "Abstract" + "SERVICE_NAME" + "Resource.java" );
+ generatedSrc = new File( m_srcOutputDir, "Abstract" + serviceName + "Resource.java" );
writeGeneratedSrcFile( context,
"templates/AbstractResource.vm",
generatedSrc.getAbsolutePath( ) );
- generatedSrc = new File( m_srcOutputDir, "SERVICE_NAME" + "Resource.java" );
+ generatedSrc = new File( m_srcOutputDir, serviceName + "Resource.java" );
writeGeneratedSrcFile( context,
"templates/Resource.vm",
generatedSrc.getAbsolutePath( ) );
- generatedSrc = new File( m_srcOutputDir, "SERVICE_NAME" + "Home.java" );
+ generatedSrc = new File( m_srcOutputDir, serviceName + "Home.java" );
writeGeneratedSrcFile( context,
"templates/Home.vm",
generatedSrc.getAbsolutePath( ) );
//only if they implemented properties does this make sense.
if(resourceDef.hasProperties())
{
- generatedSrc = new File( m_srcOutputDir, "SERVICE_NAME" + "PropertyQNames.java" );
+ generatedSrc = new File( m_srcOutputDir, serviceName + "PropertyQNames.java" );
writeGeneratedSrcFile( context,
"templates/PropertyQNames.vm",
generatedSrc.getAbsolutePath( ) );
}
- generatedSrc = new File( m_srcOutputDir, "SERVICE_NAME" + "_deploy.wsdd" );
+ generatedSrc = new File( m_srcOutputDir, serviceName + "_deploy.wsdd" );
writeGeneratedSrcFile( context,
"templates/deploy.vm",
generatedSrc.getAbsolutePath( ) );
- generatedSrc = new File( m_srcOutputDir, "SERVICE_NAME" + "_jndi-config.wsdd" );
+ generatedSrc = new File( m_srcOutputDir, serviceName + "_jndi-config.wsdd" );
writeGeneratedSrcFile( context,
"templates/jndi.vm",
generatedSrc.getAbsolutePath( ) );
- //determine if custom ops defined
- if ( resourceDef.getCustomOperationNames().length > 0 )
- {
- generatedSrc = new File( m_srcOutputDir, "SERVICE_NAME" + "CustomOperationsPortType.java" );
+
+ generatedSrc = new File( m_srcOutputDir, serviceName + "CustomOperationsPortType.java" );
writeGeneratedSrcFile( context,
"templates/CustomOperationsPortType.vm",
generatedSrc.getAbsolutePath( ) );
- }
+
}
catch ( Exception e )
{
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/Wsdl2JavaTask.java
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/Wsdl2JavaTask.java?view=diff&rev=123234&p1=incubator/apollo/trunk/src/java/org/apache/ws/resource/Wsdl2JavaTask.java&r1=123233&p2=incubator/apollo/trunk/src/java/org/apache/ws/resource/Wsdl2JavaTask.java&r2=123234
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/Wsdl2JavaTask.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/Wsdl2JavaTask.java Thu Dec 23 14:20:57 2004
@@ -51,8 +51,30 @@
private Path m_classpath;
private Boolean m_verbose;
private Boolean m_debug;
+ private boolean m_singleton;
+ private String m_resourceKey;
- public void setSrcOutputDir( File srcOutputDir )
+ public boolean isSingleton()
+ {
+ return m_singleton;
+ }
+
+ public void setSingleton(boolean singleton)
+ {
+ m_singleton = singleton;
+ }
+
+ public String getResourceKey()
+ {
+ return m_resourceKey;
+ }
+
+ public void setResourceKey(String resourceKey)
+ {
+ m_resourceKey = resourceKey;
+ }
+
+ public void setSrcOutputDir( File srcOutputDir )
{
m_srcOutputDir = srcOutputDir;
}
@@ -229,7 +251,7 @@
{
options.setDebug( m_debug.booleanValue() );
}
- Wsdl2Java wsdl2Java = new Wsdl2Java( (File[]) m_wsdls.toArray( new File[0] ), m_srcOutputDir, m_classesOutputDir, options, singleton, resourceKey);
+ Wsdl2Java wsdl2Java = new Wsdl2Java( (File[]) m_wsdls.toArray( new File[0] ), m_srcOutputDir, m_classesOutputDir, options, m_singleton, m_resourceKey);
try
{
wsdl2Java.generate();
Deleted: /incubator/apollo/trunk/src/java/org/apache/ws/util/ImplementsListBuilder.java
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/util/ImplementsListBuilder.java?view=auto&rev=123233
==============================================================================
Added: incubator/apollo/trunk/src/java/org/apache/ws/util/velocity/ImplementsListBuilder.java
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/util/velocity/ImplementsListBuilder.java?view=auto&rev=123234
==============================================================================
--- (empty file)
+++ incubator/apollo/trunk/src/java/org/apache/ws/util/velocity/ImplementsListBuilder.java Thu Dec 23 14:20:57 2004
@@ -0,0 +1,112 @@
+/*=============================================================================*
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *=============================================================================*/
+package org.apache.ws.util;
+
+import org.apache.ws.resource.ResourceDefinition;
+import org.apache.ws.resource.PropertiesResource;
+import org.apache.ws.resource.Resource;
+import org.apache.ws.resource.lifetime.v1_2.porttype.ImmediateResourceTerminationPortType;
+import org.apache.ws.resource.lifetime.v1_2.porttype.ScheduledResourceTerminationPortType;
+import org.apache.ws.resource.lifetime.ScheduledResourceTerminationResource;
+import org.apache.ws.resource.properties.v1_2.porttype.GetMultipleResourcePropertiesPortType;
+import org.apache.ws.resource.properties.v1_2.porttype.GetResourcePropertyPortType;
+import org.apache.ws.resource.properties.v1_2.porttype.QueryResourcePropertiesPortType;
+import org.apache.ws.resource.properties.v1_2.porttype.SetResourcePropertiesPortType;
+
+import javax.xml.namespace.QName;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * TODO
+ *
+ * @author Ian Springer (ian DOT springer AT hp DOT com)
+ */
+public class ImplementsListBuilder
+{
+
+ public static String getServiceImplementsList( ResourceDefinition resourceDef )
+ {
+ Iterator ptNameIter = resourceDef.getImplementedResourceCapabilities().keySet().iterator();
+ List interfaceNames = new ArrayList();
+ while ( ptNameIter.hasNext() )
+ {
+ QName ptName = (QName) ptNameIter.next();
+ if ( ptName.equals( GetResourcePropertyPortType.NAME ) )
+ {
+ interfaceNames.add( GetResourcePropertyPortType.class.getName() );
+ }
+ else if ( ptName.equals( GetMultipleResourcePropertiesPortType.NAME ) )
+ {
+ interfaceNames.add( GetMultipleResourcePropertiesPortType.class.getName() );
+ }
+ else if ( ptName.equals( SetResourcePropertiesPortType.NAME ) )
+ {
+ interfaceNames.add( SetResourcePropertiesPortType.class.getName() );
+ }
+ else if ( ptName.equals( QueryResourcePropertiesPortType.NAME ) )
+ {
+ interfaceNames.add( QueryResourcePropertiesPortType.class.getName() );
+ }
+ else if ( ptName.equals( ScheduledResourceTerminationPortType.NAME ) )
+ {
+ interfaceNames.add( ScheduledResourceTerminationPortType.class.getName() );
+ }
+ else if ( ptName.equals( ImmediateResourceTerminationPortType.NAME ) )
+ {
+ interfaceNames.add( ImmediateResourceTerminationPortType.class.getName() );
+ }
+ }
+ return toCommaSeparatedString( interfaceNames );
+ }
+
+ public static String getResourceImplementsList( ResourceDefinition resourceDef )
+ {
+ Iterator ptNameIter = resourceDef.getImplementedResourceCapabilities().keySet().iterator();
+ List interfaceNames = new ArrayList();
+ while ( ptNameIter.hasNext() )
+ {
+ QName ptName = (QName) ptNameIter.next();
+ if ( ptName.equals( GetResourcePropertyPortType.NAME ) )
+ {
+ interfaceNames.add( PropertiesResource.class.getName() );
+ }
+ else if ( ptName.equals( ScheduledResourceTerminationPortType.NAME ) )
+ {
+ interfaceNames.add( ScheduledResourceTerminationResource.class.getName() );
+ }
+ }
+ if ( interfaceNames.isEmpty() )
+ {
+ interfaceNames.add( Resource.class.getName() );
+ }
+ return toCommaSeparatedString( interfaceNames );
+ }
+
+ private static String toCommaSeparatedString( List list )
+ {
+ StringBuffer buf = new StringBuffer();
+ for ( int i = 0; i < list.size() - 1; i++ )
+ {
+ buf.append( list.get( i ) );
+ buf.append( ", " );
+ }
+ buf.append( list.get( list.size() - 1 ) );
+ return buf.toString();
+ }
+
+}
Added: incubator/apollo/trunk/src/java/org/apache/ws/util/velocity/Method.java
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/util/velocity/Method.java?view=auto&rev=123234
==============================================================================
--- (empty file)
+++ incubator/apollo/trunk/src/java/org/apache/ws/util/velocity/Method.java Thu Dec 23 14:20:57 2004
@@ -0,0 +1,54 @@
+package org.apache.ws.util.velocity;
+
+
+/**
+ * @author Sal Campana
+ */
+public class Method
+{
+ public String returnType;
+ public String name;
+ public String params;
+
+ public Method()
+ {
+ }
+
+ public Method(String aReturn, String name, String params)
+ {
+ returnType = aReturn;
+ this.name = name;
+ this.params = params;
+ }
+
+ public String getReturnType()
+ {
+ return returnType != null?returnType:"void";
+ }
+
+ public void setReturnType(String aReturn)
+ {
+ returnType = aReturn;
+ }
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+ public String getParams()
+ {
+ return params;
+ }
+
+ public void setParams(String params)
+ {
+ this.params = params;
+ }
+
+}
Added: incubator/apollo/trunk/src/java/org/apache/ws/util/velocity/ServiceProperties.java
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/util/velocity/ServiceProperties.java?view=auto&rev=123234
==============================================================================
--- (empty file)
+++ incubator/apollo/trunk/src/java/org/apache/ws/util/velocity/ServiceProperties.java Thu Dec 23 14:20:57 2004
@@ -0,0 +1,136 @@
+package org.apache.ws.util.velocity;
+
+import javax.xml.namespace.QName;
+import java.util.Map;
+import java.util.List;
+
+
+/**
+ * @author Sal Campana
+ */
+public class ServiceProperties
+{
+ String packageName;
+ String serviceName;
+ String serviceImplements;
+ String namespace;
+ String prefix;
+ Map customMappings;
+ Map propertyMap;
+ String resourceImplements;
+ String propertyDocumentName;
+ String wsdlName;
+ QName resourcekey;
+
+ public String getPackageName()
+ {
+ return packageName;
+ }
+
+ public void setPackageName(String packageName)
+ {
+ this.packageName = packageName;
+ }
+
+ public String getServiceName()
+ {
+ return serviceName;
+ }
+
+ public void setServiceName(String serviceName)
+ {
+ this.serviceName = serviceName;
+ }
+
+ public String getServiceImplements()
+ {
+ return serviceImplements;
+ }
+
+ public void setServiceImplements(String serviceImplements)
+ {
+ this.serviceImplements = serviceImplements;
+ }
+
+ public String getNamespace()
+ {
+ return namespace;
+ }
+
+ public void setNamespace(String namespace)
+ {
+ this.namespace = namespace;
+ }
+
+ public String getPrefix()
+ {
+ return prefix;
+ }
+
+ public void setPrefix(String prefix)
+ {
+ this.prefix = prefix;
+ }
+
+ public Map getCustomMappings()
+ {
+ return customMappings;
+ }
+
+ public void setCustomMappings(Map customMappings)
+ {
+ this.customMappings = customMappings;
+ }
+
+ public Map getPropertyMap()
+ {
+ return propertyMap;
+ }
+
+ public void setPropertyMap(Map propertyMap)
+ {
+ this.propertyMap = propertyMap;
+ }
+
+ public String getResourceImplements()
+ {
+ return resourceImplements;
+ }
+
+ public void setResourceImplements(String resourceImplements)
+ {
+ this.resourceImplements = resourceImplements;
+ }
+
+ public String getPropertyDocumentName()
+ {
+ return propertyDocumentName;
+ }
+
+ public void setPropertyDocumentName(String propertyDocumentName)
+ {
+ this.propertyDocumentName = propertyDocumentName;
+ }
+
+ public String getWsdlName()
+ {
+ return wsdlName;
+ }
+
+ public void setWsdlName(String wsdlName)
+ {
+ this.wsdlName = wsdlName;
+ }
+
+ public QName getResourcekey()
+ {
+ return resourcekey;
+ }
+
+ public void setResourcekey(QName resourcekey)
+ {
+ this.resourcekey = resourcekey;
+ }
+
+
+}
Modified: incubator/apollo/trunk/src/templates/AbstractResource.vm
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/AbstractResource.vm?view=diff&rev=123234&p1=incubator/apollo/trunk/src/templates/AbstractResource.vm&r1=123233&p2=incubator/apollo/trunk/src/templates/AbstractResource.vm&r2=123234
==============================================================================
--- incubator/apollo/trunk/src/templates/AbstractResource.vm (original)
+++ incubator/apollo/trunk/src/templates/AbstractResource.vm Thu Dec 23 14:20:57 2004
@@ -1,5 +1,5 @@
-#set( $package = $generated.genpackage)
-#set( $servicename = $generated.servicename)
+#set( $package = $generated.packageName)
+#set( $serviceName = $generated.serviceName)
#set( $implements = $generated.resourceImplements)
#set( $ScheduledResourceTerminationResource = $generated.IsScheduledResourceTerminationResource)
#set( $Resource = $generated.IsResource)
@@ -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$servicenameResource implements Resource #if($implements) , $implements #end
+public abstract class Abstract$serviceNameResource implements Resource #if($implements) , $implements #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=123234&p1=incubator/apollo/trunk/src/templates/AbstractService.vm&r1=123233&p2=incubator/apollo/trunk/src/templates/AbstractService.vm&r2=123234
==============================================================================
--- incubator/apollo/trunk/src/templates/AbstractService.vm (original)
+++ incubator/apollo/trunk/src/templates/AbstractService.vm Thu Dec 23 14:20:57 2004
@@ -1,5 +1,5 @@
-#set( $package = $generated.genpackage)
-#set( $servicename = $generated.servicename)
+#set( $package = $generated.packageName)
+#set( $serviceName = $generated.serviceName)
#set( $implements = $generated.serviceImplements)
#set( $namespace = $generated.namespace)
#set( $prefix = $generated.prefix)
@@ -24,7 +24,7 @@
* NOTE: This class is generated and is NOT meant to be modified.
*
*/
-public abstract class Abstract$servicenameService
+public abstract class Abstract$serviceNameService
implements WsrfService #if($implements) , $implements #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=123234&p1=incubator/apollo/trunk/src/templates/CustomOperationsPortType.vm&r1=123233&p2=incubator/apollo/trunk/src/templates/CustomOperationsPortType.vm&r2=123234
==============================================================================
--- incubator/apollo/trunk/src/templates/CustomOperationsPortType.vm (original)
+++ incubator/apollo/trunk/src/templates/CustomOperationsPortType.vm Thu Dec 23 14:20:57 2004
@@ -1,5 +1,5 @@
-#set( $package = $generated.genpackage)
-#set( $servicename = $generated.servicename)
+#set( $package = $generated.packageName)
+#set( $serviceName = $generated.serviceName)
#set( $customMethodList = $generated.customMethodList)
@@ -13,11 +13,11 @@
* NOTE: This class is generated and is NOT meant to be modified.
*
*/
-public interface $servicenameCustomOperationsPortType
+public interface $serviceNameCustomOperationsPortType
{
#foreach( $method in $customMethodList )
- public $method.Return $method.Name ( $method.Params)
+ public $method.ReturnType $method.Name ( $method.Params)
{
//todo implement
}
Modified: incubator/apollo/trunk/src/templates/Home.vm
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/Home.vm?view=diff&rev=123234&p1=incubator/apollo/trunk/src/templates/Home.vm&r1=123233&p2=incubator/apollo/trunk/src/templates/Home.vm&r2=123234
==============================================================================
--- incubator/apollo/trunk/src/templates/Home.vm (original)
+++ incubator/apollo/trunk/src/templates/Home.vm Thu Dec 23 14:20:57 2004
@@ -1,5 +1,5 @@
-#set( $package = $generated.genpackage)
-#set( $servicename = $generated.servicename)
+#set( $package = $generated.packageName)
+#set( $serviceName = $generated.serviceName)
package $package;
@@ -14,11 +14,11 @@
import java.io.Serializable;
/**
- * Home for $servicename WS-Resources.
+ * Home for $serviceName WS-Resources.
* <p/>
*
*/
-public class $servicenameHome
+public class $serviceNameHome
extends AbstractResourceHome
implements Serializable
{
Modified: incubator/apollo/trunk/src/templates/PropertyQNames.vm
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/PropertyQNames.vm?view=diff&rev=123234&p1=incubator/apollo/trunk/src/templates/PropertyQNames.vm&r1=123233&p2=incubator/apollo/trunk/src/templates/PropertyQNames.vm&r2=123234
==============================================================================
--- incubator/apollo/trunk/src/templates/PropertyQNames.vm (original)
+++ incubator/apollo/trunk/src/templates/PropertyQNames.vm Thu Dec 23 14:20:57 2004
@@ -1,5 +1,5 @@
-#set( $package = $generated.genpackage)
-#set( $servicename = $generated.servicename)
+#set( $package = $generated.packageName)
+#set( $serviceName = $generated.serviceName)
#set( $propertyMap = $generated.propertyMap)
@@ -8,12 +8,12 @@
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.
*
*/
-public interface $servicenamePropertyQNames
+public interface $serviceNamePropertyQNames
{
#foreach( $key in $propertyMap.keySet() )
Modified: incubator/apollo/trunk/src/templates/Resource.vm
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/Resource.vm?view=diff&rev=123234&p1=incubator/apollo/trunk/src/templates/Resource.vm&r1=123233&p2=incubator/apollo/trunk/src/templates/Resource.vm&r2=123234
==============================================================================
--- incubator/apollo/trunk/src/templates/Resource.vm (original)
+++ incubator/apollo/trunk/src/templates/Resource.vm Thu Dec 23 14:20:57 2004
@@ -1,5 +1,5 @@
-#set( $package = $generated.genpackage)
-#set( $servicename = $generated.servicename)
+#set( $package = $generated.packageName)
+#set( $serviceName = $generated.serviceName)
package $package;
@@ -28,7 +28,7 @@
* NOTE: This class is generated.
*
*/
-public class $servicenameResource extends Abstract$servicenameResource
+public class $serviceNameResource extends Abstract$serviceNameResource
{
Modified: incubator/apollo/trunk/src/templates/Service.vm
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/Service.vm?view=diff&rev=123234&p1=incubator/apollo/trunk/src/templates/Service.vm&r1=123233&p2=incubator/apollo/trunk/src/templates/Service.vm&r2=123234
==============================================================================
--- incubator/apollo/trunk/src/templates/Service.vm (original)
+++ incubator/apollo/trunk/src/templates/Service.vm Thu Dec 23 14:20:57 2004
@@ -1,5 +1,5 @@
-#set( $package = $generated.genpackage)
-#set( $servicename = $generated.servicename)
+#set( $package = $generated.packageName)
+#set( $serviceName = $generated.serviceName)
package $package;
@@ -19,9 +19,9 @@
* calls to the code generator.
*
*/
-public class $servicenameService
- extends Abstract$servicenameService ##needs if check! for implements clause
- implements $servicenameCustomOperationsPortType
+public class $serviceNameService
+ extends Abstract$serviceNameService
+ implements $serviceNameCustomOperationsPortType
{
private ResourceContext m_resourceContext;
@@ -31,7 +31,7 @@
*
* @param resourceContext DOCUMENT_ME
*/
- public $servicenameService( ResourceContext resourceContext )
+ public $serviceNameService( ResourceContext resourceContext )
{
m_resourceContext = resourceContext;
init( );
Modified: incubator/apollo/trunk/src/templates/deploy.vm
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/deploy.vm?view=diff&rev=123234&p1=incubator/apollo/trunk/src/templates/deploy.vm&r1=123233&p2=incubator/apollo/trunk/src/templates/deploy.vm&r2=123234
==============================================================================
--- incubator/apollo/trunk/src/templates/deploy.vm (original)
+++ incubator/apollo/trunk/src/templates/deploy.vm Thu Dec 23 14:20:57 2004
@@ -1,4 +1,4 @@
-#set( $servicename = $generated.servicename)
+#set( $serviceName = $generated.serviceName)
#set( $wsdlName = $generated.wsdlname)
<?xml version="1.0"?>
@@ -6,7 +6,7 @@
<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>
Modified: incubator/apollo/trunk/src/templates/jndi.vm
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/jndi.vm?view=diff&rev=123234&p1=incubator/apollo/trunk/src/templates/jndi.vm&r1=123233&p2=incubator/apollo/trunk/src/templates/jndi.vm&r2=123234
==============================================================================
--- incubator/apollo/trunk/src/templates/jndi.vm (original)
+++ incubator/apollo/trunk/src/templates/jndi.vm Thu Dec 23 14:20:57 2004
@@ -1,5 +1,5 @@
-#set( $package = $generated.genpackage)
-#set( $servicename = $generated.servicename)
+#set( $package = $generated.packageName)
+#set( $serviceName = $generated.serviceName)
#set( $namespace = $generated.namespace)
#set( $resourcekey = $generated.resourcekey)
@@ -7,16 +7,16 @@
<jndiConfig xmlns="http://www.apache.org/wsfx/wsrf/jndi/config">
- <service name="$servicename">
- <resource name="home" type="$package.$servicenameHome">
+ <service name="$serviceName">
+ <resource name="home" type="$package.$serviceNameHome">
<resourceParams>
<parameter>
<name>serviceClassName</name>
- <value>$package.$servicenameService</value>
+ <value>$package.$serviceNameService</value>
</parameter>
<parameter>
<name>resourceClassName</name>
- <value>$package.$servicenameResource</value>
+ <value>$package.$serviceNameResource</value>
</parameter>
<parameter>
<name>wsdlTargetNamespace</name>
Modified: incubator/apollo/trunk/src/templates/templating.txt
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/templating.txt?view=diff&rev=123234&p1=incubator/apollo/trunk/src/templates/templating.txt&r1=123233&p2=incubator/apollo/trunk/src/templates/templating.txt&r2=123234
==============================================================================
--- incubator/apollo/trunk/src/templates/templating.txt (original)
+++ incubator/apollo/trunk/src/templates/templating.txt Thu Dec 23 14:20:57 2004
@@ -1,6 +1,6 @@
1. PACKAGE NAME
-#set( $package = $generated.genpackage)
+#set( $package = $generated.packageName)
package $package;
@@ -8,10 +8,10 @@
2. SERVICE NAME
-#set( $servicename = $generated.servicename)
+#set( $serviceName = $generated.serviceName)
Used in various places to build other names...sometime prefix for file names etc
-i.e. Abstract$servicenameResource
+i.e. Abstract$serviceNameResource
==========================================================
---------------------------------------------------------------------
To unsubscribe, e-mail: apollo-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: apollo-dev-help@ws.apache.org