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 22:25:23 UTC
svn commit: r123224 - in incubator/apollo/trunk/src: java/org/apache/ws/resource java/org/apache/ws/resource/lifetime/v1_2/porttype java/org/apache/ws/resource/properties/v1_2 java/org/apache/ws/resource/properties/v1_2/porttype java/org/apache/ws/util/velocity templates
Author: scamp
Date: Thu Dec 23 13:25:22 2004
New Revision: 123224
URL: http://svn.apache.org/viewcvs?view=rev&rev=123224
Log:
updated for codegen
Added:
incubator/apollo/trunk/src/java/org/apache/ws/util/velocity/
incubator/apollo/trunk/src/java/org/apache/ws/util/velocity/ConstQNames.java
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/Wsdl2Java.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2/porttype/ImmediateResourceTerminationPortType.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2/porttype/ScheduledResourceTerminationPortType.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/ResourceProperties1_2Constants.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/GetMultipleResourcePropertiesPortType.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/GetResourcePropertyPortType.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/QueryResourcePropertiesPortType.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/SetResourcePropertiesPortType.java
incubator/apollo/trunk/src/templates/AbstractResource.vm
incubator/apollo/trunk/src/templates/AbstractService.vm
incubator/apollo/trunk/src/templates/Resource.vm
incubator/apollo/trunk/src/templates/ResourceIntf.vm
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=123224&p1=incubator/apollo/trunk/src/java/org/apache/ws/resource/Wsdl2Java.java&r1=123223&p2=incubator/apollo/trunk/src/java/org/apache/ws/resource/Wsdl2Java.java&r2=123224
==============================================================================
--- 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 13:25:22 2004
@@ -26,6 +26,7 @@
import org.apache.ws.resource.i18n.Keys;
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.i18n.Messages;
import org.apache.xmlbeans.impl.common.XmlErrorPrinter;
import org.apache.xmlbeans.impl.tool.SchemaCompiler;
@@ -71,6 +72,16 @@
/** DOCUMENT_ME */
protected static final String LONG_OPT_CLASSPATH = "classpath";
+ /**
+ * Denotes if service is a singleton
+ */
+ protected static final String LONG_OPT_IS_SINGLETON = "singleton";
+
+ /**
+ * QName (squigly format) of Resource Key to be used.
+ */
+ protected static final String LONG_OPT_RESOURCEKEY = "resourcekey";
+
static
{
initCmdLineOptions( );
@@ -81,7 +92,8 @@
private File m_classesOutputDir;
private Options m_options;
- /**
+
+ /**
* Creates a new {@link Wsdl2Java} object.
*
* @param wsdlFiles DOCUMENT_ME
@@ -157,13 +169,14 @@
for ( int i = 0; i < m_wsdlFiles.length; i++ )
{
WSDLReader wsdlReader = WSDLFactory.newInstance( ).newWSDLReader( );
- Definition def = wsdlReader.readWSDL( m_wsdlFiles[i].getPath( ) );
+ File wsdlFile = m_wsdlFiles[i];
+ Definition def = wsdlReader.readWSDL( wsdlFile.getPath() );
Iterator serviceIter = def.getServices( ).values( ).iterator( );
while ( serviceIter.hasNext( ) )
{
Service service = (Service) serviceIter.next( );
ResourceDefinition resourceDef = new ResourceDefinitionImpl( def, service );
- //generateSkeletonCode(resourceDef); todo need Ians object for each service
+ generateSkeletonCode(resourceDef,wsdlFile.getName());
}
}
}
@@ -184,6 +197,16 @@
File srcOutputDir = new File( cmdLine.getOptionValue( LONG_OPT_SRC_OUTPUT_DIR ) );
File classesOutputDir = new File( cmdLine.getOptionValue( LONG_OPT_CLASSES_OUTPUT_DIR ) );
Options options = new Wsdl2Java.Options( );
+ boolean singleton = false;
+
+ if( cmdLine.hasOption( LONG_OPT_IS_SINGLETON))
+ {
+ singleton = true;
+ }
+ if( cmdLine.hasOption( LONG_OPT_RESOURCEKEY))
+ {
+
+ }
if ( cmdLine.hasOption( LONG_OPT_CLASSPATH ) )
{
options.setClasspath( cmdLine.getOptionValue( LONG_OPT_CLASSPATH ) );
@@ -254,14 +277,15 @@
MSG.getMessage( Keys.OPT_CLASSPATH_SENT_TO_XMLBEANS ) );
}
- private void generateSkeletonCode(ResourceCapability resourceDef)
+ private void generateSkeletonCode(ResourceDefinition resourceDef, String wsdlPath)
throws Exception
{
initVelocityProperties( );
try
{
VelocityContext context = new VelocityContext( );
- context.put( "generated", "ians_obj" );
+ context.put( "generated", resourceDef );
+ context.put( "qnames", new ConstQNames() );
File generatedSrc = new File( m_srcOutputDir, "Abstract" + "SERVICE_NAME" + "Service.java" );
writeGeneratedSrcFile( context,
@@ -287,11 +311,14 @@
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" );
writeGeneratedSrcFile( context,
"templates/PropertyQNames.vm",
generatedSrc.getAbsolutePath( ) );
+ }
generatedSrc = new File( m_srcOutputDir, "SERVICE_NAME" + "_deploy.wsdd" );
writeGeneratedSrcFile( context,
@@ -303,8 +330,8 @@
"templates/jndi.vm",
generatedSrc.getAbsolutePath( ) );
- //todo determine if custom ops defined
- if ( true )
+ //determine if custom ops defined
+ if ( resourceDef.getCustomOperationNames().length > 0 )
{
generatedSrc = new File( m_srcOutputDir, "SERVICE_NAME" + "CustomOperationsPortType.java" );
writeGeneratedSrcFile( context,
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2/porttype/ImmediateResourceTerminationPortType.java
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2/porttype/ImmediateResourceTerminationPortType.java?view=diff&rev=123224&p1=incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2/porttype/ImmediateResourceTerminationPortType.java&r1=123223&p2=incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2/porttype/ImmediateResourceTerminationPortType.java&r2=123224
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2/porttype/ImmediateResourceTerminationPortType.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2/porttype/ImmediateResourceTerminationPortType.java Thu Dec 23 13:25:22 2004
@@ -17,6 +17,9 @@
import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft01.DestroyDocument;
import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft01.DestroyResponseDocument;
+import org.apache.ws.resource.lifetime.v1_2.ResourceLifetime1_2Constants;
+
+import javax.xml.namespace.QName;
/**
* The WSRF-RL ImmediateResourceTermination portType.
@@ -25,6 +28,7 @@
*/
public interface ImmediateResourceTerminationPortType
{
+ QName NAME = new QName( ResourceLifetime1_2Constants.NSURI_WSRL_WSDL, "ImmediateResourceTermination", ResourceLifetime1_2Constants.NSPREFIX_WSRL_WSDL );
/**
* DOCUMENT_ME
*
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2/porttype/ScheduledResourceTerminationPortType.java
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2/porttype/ScheduledResourceTerminationPortType.java?view=diff&rev=123224&p1=incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2/porttype/ScheduledResourceTerminationPortType.java&r1=123223&p2=incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2/porttype/ScheduledResourceTerminationPortType.java&r2=123224
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2/porttype/ScheduledResourceTerminationPortType.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/lifetime/v1_2/porttype/ScheduledResourceTerminationPortType.java Thu Dec 23 13:25:22 2004
@@ -39,6 +39,8 @@
*/
QName PROP_QNAME_TERMINATION_TIME = new QName( ResourceLifetime1_2Constants.NSURI_WSRL_SCHEMA, "TerminationTime", ResourceLifetime1_2Constants.NSPREFIX_WSRL_SCHEMA );
+ QName NAME = new QName( ResourceLifetime1_2Constants.NSURI_WSRL_WSDL, "ScheduledResourceTermination", ResourceLifetime1_2Constants.NSPREFIX_WSRL_WSDL );
+
/**
* DOCUMENT_ME
*
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/ResourceProperties1_2Constants.java
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/ResourceProperties1_2Constants.java?view=diff&rev=123224&p1=incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/ResourceProperties1_2Constants.java&r1=123223&p2=incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/ResourceProperties1_2Constants.java&r2=123224
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/ResourceProperties1_2Constants.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/ResourceProperties1_2Constants.java Thu Dec 23 13:25:22 2004
@@ -43,11 +43,6 @@
*/
String NSPREFIX_WSRP_WSDL = "wsrpw";
- QName PORT_TYPE_NAME_GET_RESOURCE_PROPERTY = new QName( NSURI_WSRP_WSDL, "GetResourceProperty", NSPREFIX_WSRP_SCHEMA );
- QName PORT_TYPE_NAME_GET_MULTIPLE_RESOURCE_PROPERTIES = new QName( NSURI_WSRP_WSDL, "GetMultipleResourceProperties", NSPREFIX_WSRP_SCHEMA );
- QName PORT_TYPE_NAME_SET_RESOURCE_PROPERTIES = new QName( NSURI_WSRP_WSDL, "SetResourceProperties", NSPREFIX_WSRP_SCHEMA );
- QName PORT_TYPE_NAME_QUERY_RESOURCE_PROPERTIES = new QName( NSURI_WSRP_WSDL, "QueryResourceProperties", NSPREFIX_WSRP_SCHEMA );
-
/**
* QName of the "ResourceProperties" portType attribute.
*/
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/GetMultipleResourcePropertiesPortType.java
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/GetMultipleResourcePropertiesPortType.java?view=diff&rev=123224&p1=incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/GetMultipleResourcePropertiesPortType.java&r1=123223&p2=incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/GetMultipleResourcePropertiesPortType.java&r2=123224
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/GetMultipleResourcePropertiesPortType.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/GetMultipleResourcePropertiesPortType.java Thu Dec 23 13:25:22 2004
@@ -17,6 +17,9 @@
import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetMultipleResourcePropertiesDocument;
import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetMultipleResourcePropertiesResponseDocument;
+import org.apache.ws.resource.properties.v1_2.ResourceProperties1_2Constants;
+
+import javax.xml.namespace.QName;
/**
* The WSRF-RP GetResourceProperties portType.
@@ -25,7 +28,9 @@
*/
public interface GetMultipleResourcePropertiesPortType
{
- /**
+ QName PORT_TYPE_NAME_GET_MULTIPLE_RESOURCE_PROPERTIES = new QName( ResourceProperties1_2Constants.NSURI_WSRP_WSDL, "GetMultipleResourceProperties", ResourceProperties1_2Constants.NSPREFIX_WSRP_SCHEMA );
+
+ /**
* DOCUMENT_ME
*
* @param requestDoc DOCUMENT_ME
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/GetResourcePropertyPortType.java
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/GetResourcePropertyPortType.java?view=diff&rev=123224&p1=incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/GetResourcePropertyPortType.java&r1=123223&p2=incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/GetResourcePropertyPortType.java&r2=123224
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/GetResourcePropertyPortType.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/GetResourcePropertyPortType.java Thu Dec 23 13:25:22 2004
@@ -17,6 +17,9 @@
import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetResourcePropertyDocument;
import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetResourcePropertyResponseDocument;
+import org.apache.ws.resource.properties.v1_2.ResourceProperties1_2Constants;
+
+import javax.xml.namespace.QName;
/**
* The WSRF-RP GetResourceProperty portType.
@@ -25,7 +28,9 @@
*/
public interface GetResourcePropertyPortType
{
- /**
+ QName PORT_TYPE_NAME_GET_RESOURCE_PROPERTY = new QName( ResourceProperties1_2Constants.NSURI_WSRP_WSDL, "GetResourceProperty", ResourceProperties1_2Constants.NSPREFIX_WSRP_SCHEMA );
+
+ /**
* DOCUMENT_ME
*
* @param requestDoc DOCUMENT_ME
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/QueryResourcePropertiesPortType.java
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/QueryResourcePropertiesPortType.java?view=diff&rev=123224&p1=incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/QueryResourcePropertiesPortType.java&r1=123223&p2=incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/QueryResourcePropertiesPortType.java&r2=123224
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/QueryResourcePropertiesPortType.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/QueryResourcePropertiesPortType.java Thu Dec 23 13:25:22 2004
@@ -17,6 +17,9 @@
import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.QueryResourcePropertiesDocument;
import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.QueryResourcePropertiesResponseDocument;
+import org.apache.ws.resource.properties.v1_2.ResourceProperties1_2Constants;
+
+import javax.xml.namespace.QName;
/**
* The WSRF-RP QueryResourceProperties portType.
@@ -25,7 +28,9 @@
*/
public interface QueryResourcePropertiesPortType
{
- /**
+ QName PORT_TYPE_NAME_QUERY_RESOURCE_PROPERTIES = new QName( ResourceProperties1_2Constants.NSURI_WSRP_WSDL, "QueryResourceProperties", ResourceProperties1_2Constants.NSPREFIX_WSRP_SCHEMA );
+
+ /**
* DOCUMENT_ME
*
* @param requestDoc DOCUMENT_ME
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/SetResourcePropertiesPortType.java
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/SetResourcePropertiesPortType.java?view=diff&rev=123224&p1=incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/SetResourcePropertiesPortType.java&r1=123223&p2=incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/SetResourcePropertiesPortType.java&r2=123224
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/SetResourcePropertiesPortType.java (original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/properties/v1_2/porttype/SetResourcePropertiesPortType.java Thu Dec 23 13:25:22 2004
@@ -17,6 +17,9 @@
import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.SetResourcePropertiesDocument;
import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.SetResourcePropertiesResponseDocument;
+import org.apache.ws.resource.properties.v1_2.ResourceProperties1_2Constants;
+
+import javax.xml.namespace.QName;
/**
* The WSRF-RP SetResourceProperties portType.
@@ -25,7 +28,9 @@
*/
public interface SetResourcePropertiesPortType
{
- /**
+ QName PORT_TYPE_NAME_SET_RESOURCE_PROPERTIES = new QName( ResourceProperties1_2Constants.NSURI_WSRP_WSDL, "SetResourceProperties", ResourceProperties1_2Constants.NSPREFIX_WSRP_SCHEMA );
+
+ /**
* DOCUMENT_ME
*
* @param requestDoc DOCUMENT_ME
Added: incubator/apollo/trunk/src/java/org/apache/ws/util/velocity/ConstQNames.java
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/util/velocity/ConstQNames.java?view=auto&rev=123224
==============================================================================
--- (empty file)
+++ incubator/apollo/trunk/src/java/org/apache/ws/util/velocity/ConstQNames.java Thu Dec 23 13:25:22 2004
@@ -0,0 +1,57 @@
+package org.apache.ws.util.velocity;
+
+import org.apache.ws.resource.properties.v1_2.ResourceProperties1_2Constants;
+import org.apache.ws.resource.properties.v1_2.porttype.GetResourcePropertyPortType;
+import org.apache.ws.resource.properties.v1_2.porttype.GetMultipleResourcePropertiesPortType;
+import org.apache.ws.resource.properties.v1_2.porttype.SetResourcePropertiesPortType;
+import org.apache.ws.resource.properties.v1_2.porttype.QueryResourcePropertiesPortType;
+import org.apache.ws.resource.lifetime.v1_2.ResourceLifetime1_2Constants;
+import org.apache.ws.resource.lifetime.v1_2.porttype.ScheduledResourceTerminationPortType;
+import org.apache.ws.resource.lifetime.v1_2.porttype.ImmediateResourceTerminationPortType;
+
+import javax.xml.namespace.QName;
+
+
+/**
+ * @author Sal Campana
+ */
+public class ConstQNames
+{
+ public QName multipleResource = GetMultipleResourcePropertiesPortType.PORT_TYPE_NAME_GET_MULTIPLE_RESOURCE_PROPERTIES;
+ public QName resource = GetResourcePropertyPortType.PORT_TYPE_NAME_GET_RESOURCE_PROPERTY;
+ public QName queryResource = QueryResourcePropertiesPortType.PORT_TYPE_NAME_QUERY_RESOURCE_PROPERTIES;
+ public QName setResource = SetResourcePropertiesPortType.PORT_TYPE_NAME_SET_RESOURCE_PROPERTIES;
+ public QName scheduledResourceTermination = ScheduledResourceTerminationPortType.NAME;
+ public QName immediateResourceTermination = ImmediateResourceTerminationPortType.NAME;
+
+ public QName getImmediateResourceTermination()
+ {
+ return immediateResourceTermination;
+ }
+
+ public QName getScheduledResourceTermination()
+ {
+ return scheduledResourceTermination;
+ }
+
+ public QName getMultipleResource()
+ {
+ return multipleResource;
+ }
+
+ public QName getResource()
+ {
+ return resource;
+ }
+
+ public QName getQueryResource()
+ {
+ return queryResource;
+ }
+
+ public QName getSetResource()
+ {
+ return setResource;
+ }
+
+}
Modified: incubator/apollo/trunk/src/templates/AbstractResource.vm
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/AbstractResource.vm?view=diff&rev=123224&p1=incubator/apollo/trunk/src/templates/AbstractResource.vm&r1=123223&p2=incubator/apollo/trunk/src/templates/AbstractResource.vm&r2=123224
==============================================================================
--- incubator/apollo/trunk/src/templates/AbstractResource.vm (original)
+++ incubator/apollo/trunk/src/templates/AbstractResource.vm Thu Dec 23 13:25:22 2004
@@ -31,29 +31,27 @@
*/
public abstract class Abstract$servicenameResource implements Resource #if($implements) , $implements #end
{
- #if($Resource)
+
/**
* The resource ID of the instance.
*/
protected String m_id;
- #end
- #if($PropertiesResource)
+
+ #if($generated.hasProperties())
/**
* The ResourceProperty Set containing the resource props.
*/
protected ResourcePropertySet m_propSet;
#end
-
- #if($Resource)
- #parse( "ResourceIntf.vm" )
- #end
+
+ #parse( "ResourceIntf.vm" )
- #if($PropertiesResource)
+ #if($generated.hasProperties())
#include( "PropertiesResource.txt" )
#end
- #if($ScheduledResourceTerminationResource)
+ #if($generated.implementsResourceCapability($qnames.scheduledResourceTermination))
#include( "ScheduledResourceTerminationResource.txt" )
#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=123224&p1=incubator/apollo/trunk/src/templates/AbstractService.vm&r1=123223&p2=incubator/apollo/trunk/src/templates/AbstractService.vm&r2=123224
==============================================================================
--- incubator/apollo/trunk/src/templates/AbstractService.vm (original)
+++ incubator/apollo/trunk/src/templates/AbstractService.vm Thu Dec 23 13:25:22 2004
@@ -4,6 +4,7 @@
#set( $namespace = $generated.namespace)
#set( $prefix = $generated.prefix)
#set( $customMappings = $generated.customMappings)
+#set( $qnames = $qnames)
package $package;
@@ -99,27 +100,27 @@
}
- #if()
+ #if($generated.implementsResourceCapability($qnames.multipleResource))
#include(GetMultiple.txt);
#end
- #if()
+ #if($generated.implementsResourceCapability($qnames.setResource))
#include(Set.txt);
#end
- #if()
+ #if($generated.implementsResourceCapability($qnames.resource))
#include(GetResource.txt);
#end
- #if()
+ #if($generated.implementsResourceCapability($qnames.queryResource))
#include(Query.txt);
#end
- #if()
+ #if($generated.implementsResourceCapability($qnames.immediateResourceTermination))
#include(ImmediateResourceTermination.txt);
#end
- #if()
+ #if($generated.implementsResourceCapability($qnames.scheduledResourceTermination))
#include(SetTerminationTime.txt);
#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=123224&p1=incubator/apollo/trunk/src/templates/Resource.vm&r1=123223&p2=incubator/apollo/trunk/src/templates/Resource.vm&r2=123224
==============================================================================
--- incubator/apollo/trunk/src/templates/Resource.vm (original)
+++ incubator/apollo/trunk/src/templates/Resource.vm Thu Dec 23 13:25:22 2004
@@ -40,7 +40,7 @@
super.init();
- //todo init resoruce properties and setup callbacks
+ //todo init resource properties and setup callbacks
}
}
Modified: incubator/apollo/trunk/src/templates/ResourceIntf.vm
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/ResourceIntf.vm?view=diff&rev=123224&p1=incubator/apollo/trunk/src/templates/ResourceIntf.vm&r1=123223&p2=incubator/apollo/trunk/src/templates/ResourceIntf.vm&r2=123224
==============================================================================
--- incubator/apollo/trunk/src/templates/ResourceIntf.vm (original)
+++ incubator/apollo/trunk/src/templates/ResourceIntf.vm Thu Dec 23 13:25:22 2004
@@ -45,7 +45,7 @@
//todo init resource properties and setup callbacks.
- #if($ScheduledResourceTerminationResource)
+ #if($generated.implementsResourceCapability($qnames.scheduledResourceTermination))
ResourceProperty prop = m_propSet.get( ResourceLifetime1_2Constants.PROP_QNAME_CURRENT_TIME );
CurrentTimeDocument currTime = CurrentTimeDocument.Factory.newInstance();
currTime.setCurrentTime( Calendar.getInstance() );
---------------------------------------------------------------------
To unsubscribe, e-mail: apollo-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: apollo-dev-help@ws.apache.org