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 2005/01/12 19:54:07 UTC

svn commit: r124980 - in incubator/apollo/trunk/src: java/org/apache/ws/resource/tool java/org/apache/ws/resource/tool/velocity java/org/apache/ws/util site/content/tutorial/method_impls templates webapp/WEB-INF

Author: scamp
Date: Wed Jan 12 10:54:06 2005
New Revision: 124980

URL: http://svn.apache.org/viewcvs?view=rev&rev=124980
Log:
fixes/additions/updates for code generation
Added:
   incubator/apollo/trunk/src/site/content/tutorial/method_impls/
   incubator/apollo/trunk/src/site/content/tutorial/method_impls/filesys_abstractresource_init.txt.delete
   incubator/apollo/trunk/src/site/content/tutorial/method_impls/filesys_home_getInstance.txt
   incubator/apollo/trunk/src/site/content/tutorial/method_impls/filesys_resource_init.txt
   incubator/apollo/trunk/src/site/content/tutorial/method_impls/filesys_service_methods.txt
   incubator/apollo/trunk/src/site/content/tutorial/method_impls/syspros_home_getinstance.txt
   incubator/apollo/trunk/src/site/content/tutorial/method_impls/syspros_resource_init.txt
Modified:
   incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/GenerationUtils.java
   incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java
   incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/velocity/ServiceProperties.java
   incubator/apollo/trunk/src/java/org/apache/ws/util/OperationInfo.java
   incubator/apollo/trunk/src/templates/AbstractService.vm
   incubator/apollo/trunk/src/templates/CustomOperationsPortType.vm
   incubator/apollo/trunk/src/templates/ResourceIntf.vm
   incubator/apollo/trunk/src/templates/Service.vm
   incubator/apollo/trunk/src/templates/jndi.vm
   incubator/apollo/trunk/src/webapp/WEB-INF/server-config.wsdd

Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/GenerationUtils.java
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/GenerationUtils.java?view=diff&rev=124980&p1=incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/GenerationUtils.java&r1=124979&p2=incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/GenerationUtils.java&r2=124980
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/GenerationUtils.java	(original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/GenerationUtils.java	Wed Jan 12 10:54:06 2005
@@ -112,7 +112,7 @@
         {
             Operation op = resourceDef.getPortType().getOperation( opNames[i], null, null );
             OperationInfo opInfo = new OperationInfo( op );
-            opInfoMap.put( opInfo.getRequestElementName(), op );
+            opInfoMap.put( opInfo.getRequestElementName(), opInfo );
         }
         return opInfoMap;
     }

Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java?view=diff&rev=124980&p1=incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java&r1=124979&p2=incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java&r2=124980
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java	(original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java	Wed Jan 12 10:54:06 2005
@@ -342,7 +342,7 @@
                                                       File wsdlFile,
                                                       File serviceDir )
     {
-        ServiceProperties props = new ServiceProperties();
+        ServiceProperties props = new ServiceProperties(resourceDef);        
         String targetNamespace = resourceDef.getDefinition().getTargetNamespace();
         props.setPackageName( GenerationUtils.getJavaPackageName( targetNamespace ) );
         String serviceName = resourceDef.getName();

Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/velocity/ServiceProperties.java
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/velocity/ServiceProperties.java?view=diff&rev=124980&p1=incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/velocity/ServiceProperties.java&r1=124979&p2=incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/velocity/ServiceProperties.java&r2=124980
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/velocity/ServiceProperties.java	(original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/velocity/ServiceProperties.java	Wed Jan 12 10:54:06 2005
@@ -1,5 +1,7 @@
 package org.apache.ws.resource.tool.velocity;
 
+import org.apache.ws.resource.ResourceDefinition;
+
 import javax.xml.namespace.QName;
 import java.util.List;
 import java.util.Map;
@@ -31,6 +33,12 @@
     private String m_classesDir;
     private String m_srcDir;
     private String m_jarFileName;
+    private ResourceDefinition m_resourceDef;
+
+    public ServiceProperties(ResourceDefinition resourceDef)
+    {
+        m_resourceDef = resourceDef;
+    }
 
     public String getSrcDir()
     {
@@ -230,5 +238,10 @@
     public void setJarFileName( String jarFileName )
     {
         m_jarFileName = jarFileName;
+    }
+
+    public boolean implementsResourceCapability(QName capability)
+    {
+        return m_resourceDef.implementsResourceCapability(capability);     
     }
 }

Modified: incubator/apollo/trunk/src/java/org/apache/ws/util/OperationInfo.java
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/util/OperationInfo.java?view=diff&rev=124980&p1=incubator/apollo/trunk/src/java/org/apache/ws/util/OperationInfo.java&r1=124979&p2=incubator/apollo/trunk/src/java/org/apache/ws/util/OperationInfo.java&r2=124980
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/util/OperationInfo.java	(original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/util/OperationInfo.java	Wed Jan 12 10:54:06 2005
@@ -73,7 +73,7 @@
         {
             responseClassName = void.class.getName();
         }
-        m_methodSig = responseClassName + " " + m_methodName + "( " + requestClassName + " )";
+        m_methodSig = responseClassName + " " + m_methodName + "( " + requestClassName + " requestDoc )";
     }
 
     public String getJavaMethodName()

Added: incubator/apollo/trunk/src/site/content/tutorial/method_impls/filesys_abstractresource_init.txt.delete
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/tutorial/method_impls/filesys_abstractresource_init.txt.delete?view=auto&rev=124980
==============================================================================
--- (empty file)
+++ incubator/apollo/trunk/src/site/content/tutorial/method_impls/filesys_abstractresource_init.txt.delete	Wed Jan 12 10:54:06 2005
@@ -0,0 +1,15 @@
+   public void init()
+	{
+		FileSystemPropertiesDocument propsDoc = FileSystemPropertiesDocument.Factory.newInstance();
+		m_propSet = new org.apache.ws.resource.properties.impl.XmlBeansResourcePropertySet( propsDoc );
+
+		org.apache.ws.resource.properties.ResourceProperty prop = m_propSet.get( org.apache.ws.resource.lifetime.v1_2.porttype.ScheduledResourceTerminationPortType.PROP_QNAME_CURRENT_TIME );
+		org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft01.CurrentTimeDocument currTime = org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft01.CurrentTimeDocument.Factory.newInstance();
+		currTime.setCurrentTime( java.util.Calendar.getInstance() );
+		prop.add( currTime );
+		prop.setCallback( new org.apache.ws.resource.lifetime.callback.CurrentTimeCallback() );
+
+		prop = m_propSet.get( org.apache.ws.resource.lifetime.v1_2.porttype.ScheduledResourceTerminationPortType.PROP_QNAME_CURRENT_TIME );
+		org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft01.TerminationTimeDocument termTime = org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft01.TerminationTimeDocument.Factory.newInstance();
+		termTime.setNilTerminationTime();
+    }
\ No newline at end of file

Added: incubator/apollo/trunk/src/site/content/tutorial/method_impls/filesys_home_getInstance.txt
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/tutorial/method_impls/filesys_home_getInstance.txt?view=auto&rev=124980
==============================================================================
--- (empty file)
+++ incubator/apollo/trunk/src/site/content/tutorial/method_impls/filesys_home_getInstance.txt	Wed Jan 12 10:54:06 2005
@@ -0,0 +1,37 @@
+    public Resource getInstance( ResourceContext resourceContext )
+            throws ResourceException,
+            ResourceContextException,
+            ResourceUnknownException
+    {
+        ResourceKey key = resourceContext.getResourceKey();
+        Resource resource = null;
+        try
+        {
+            resource = find( key );
+        }
+        catch ( ResourceException re )
+        {
+            Object id = key.getValue();
+         /**
+          * Determine if the passed-in key is, in fact, something we expect.
+          */
+         if ( id.equals( "/dev/vg00/lvol1" ) || id.equals( "/dev/vg00/lvol2" ) )
+         {
+            try
+            {
+               resource = createInstance( key);
+            }
+            catch ( Exception e )
+            {
+               throw new ResourceException( e );
+            }
+            add( key, resource );
+         }
+         else
+         {
+            throw new ResourceUnknownException( id,
+                  resourceContext.getServiceName() );
+            }
+        }
+        return resource;
+    }

Added: incubator/apollo/trunk/src/site/content/tutorial/method_impls/filesys_resource_init.txt
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/tutorial/method_impls/filesys_resource_init.txt?view=auto&rev=124980
==============================================================================
--- (empty file)
+++ incubator/apollo/trunk/src/site/content/tutorial/method_impls/filesys_resource_init.txt	Wed Jan 12 10:54:06 2005
@@ -0,0 +1,64 @@
+    public void init()
+    {
+
+        super.init();
+
+        /*
+         * This is where you should associate the backend instance with
+         * the resource instance for a given id.
+         */
+        example.filesystem.backend.FileSystem m_fileSystem = new example.filesystem.backend.UnixFileSystem( m_id );
+
+        /*
+         * Initialize each of our properties by calling prop.add(propElem) and/or prop.setCallback(callback)...
+         */
+        org.apache.ws.resource.properties.ResourceProperty prop = m_propSet.get( FilesystemPropertyQNames.DEVICESPECIALFILE );
+        DeviceSpecialFileDocument deviceDocXBean = DeviceSpecialFileDocument.Factory.newInstance();
+        deviceDocXBean.setDeviceSpecialFile( m_fileSystem.getDeviceSpecialFile() );
+        prop.add( deviceDocXBean );
+
+        prop = m_propSet.get( FilesystemPropertyQNames.TYPE );
+        TypeDocument typeDocXBean = TypeDocument.Factory.newInstance();
+        typeDocXBean.setType( m_fileSystem.getType() );
+        prop.add( typeDocXBean );
+
+        BackupFrequencyDocument backupDocXBean = BackupFrequencyDocument.Factory.newInstance();
+        backupDocXBean.setBackupFrequency( m_fileSystem.getBackupFrequency() );
+        prop = m_propSet.get( FilesystemPropertyQNames.BACKUPFREQUENCY );
+        prop.add( backupDocXBean );
+        prop.setCallback( new example.filesystem.callback.BackupFrequencyCallback( m_fileSystem ) );
+
+        CommentDocument commentDocXBean = CommentDocument.Factory.newInstance();
+        commentDocXBean.setComment( m_fileSystem.getComment() );
+        prop = m_propSet.get( FilesystemPropertyQNames.COMMENT );
+        prop.add( commentDocXBean );
+        prop.setCallback( new example.filesystem.callback.CommentCallback( m_fileSystem ) );
+
+        FsckPassNumberDocument fsckDocXBean = FsckPassNumberDocument.Factory.newInstance();
+        fsckDocXBean.setFsckPassNumber( m_fileSystem.getFsckPassNumber() );
+        prop = m_propSet.get( FilesystemPropertyQNames.FSCKPASSNUMBER );
+        prop.add( fsckDocXBean );
+        prop.setCallback( new example.filesystem.callback.FsckPassNumberCallback( m_fileSystem ) );
+
+        MountPointDirectoryDocument mountPointDocXBean = MountPointDirectoryDocument.Factory.newInstance();
+        mountPointDocXBean.setMountPointDirectory( m_fileSystem.getMountPoint() );
+        prop = m_propSet.get( FilesystemPropertyQNames.MOUNTPOINTDIRECTORY );
+        prop.add( mountPointDocXBean );
+        prop.setCallback( new example.filesystem.callback.MountPointCallback( m_fileSystem ) );
+
+        OptionsDocument optionsDocXBean =
+                OptionsDocument.Factory.newInstance();
+        org.apache.ws.resource.example.filesystem.OptionsDocument.Options options =
+                optionsDocXBean.addNewOptions();
+        java.util.List backendOptions =
+                m_fileSystem.getOptions();
+        for ( int i = 0; i < backendOptions.size(); i++ )
+        {
+            options.addOption( (String) backendOptions.get( i ) );
+        }
+
+        prop = m_propSet.get( FilesystemPropertyQNames.OPTIONS );
+        prop.add( optionsDocXBean );
+        prop.setCallback( new example.filesystem.callback.OptionsCallback( m_fileSystem ) );
+
+    }

Added: incubator/apollo/trunk/src/site/content/tutorial/method_impls/filesys_service_methods.txt
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/tutorial/method_impls/filesys_service_methods.txt?view=auto&rev=124980
==============================================================================
--- (empty file)
+++ incubator/apollo/trunk/src/site/content/tutorial/method_impls/filesys_service_methods.txt	Wed Jan 12 10:54:06 2005
@@ -0,0 +1,8 @@
+   public org.apache.ws.resource.example.filesystem.UnmountResponseDocument Unmount( org.apache.ws.resource.example.filesystem.UnmountDocument resp)
+   {
+		return UnmountResponseDocument.Factory.newInstance();
+   }
+   public org.apache.ws.resource.example.filesystem.MountResponseDocument Mount( org.apache.ws.resource.example.filesystem.MountDocument resp)
+   {
+	    return MountResponseDocument.Factory.newInstance();		     
+   }
\ No newline at end of file

Added: incubator/apollo/trunk/src/site/content/tutorial/method_impls/syspros_home_getinstance.txt
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/tutorial/method_impls/syspros_home_getinstance.txt?view=auto&rev=124980
==============================================================================
--- (empty file)
+++ incubator/apollo/trunk/src/site/content/tutorial/method_impls/syspros_home_getinstance.txt	Wed Jan 12 10:54:06 2005
@@ -0,0 +1,32 @@
+public Resource getInstance( ResourceContext resourceContext )
+            throws ResourceException,
+            ResourceContextException,
+            ResourceUnknownException
+    {
+        ResourceKey key = resourceContext.getResourceKey();
+        Resource resource = null;
+        try
+        {
+            resource = find( key );
+        }
+        catch ( ResourceException re )
+        {
+            //todo add any checking for key validity
+        }
+
+        if ( resource == null )
+            {
+               try
+               {
+                  resource = createInstance( key );
+               }
+               catch ( Exception e )
+               {
+                  throw new ResourceException( e );
+               }
+
+               add( key, resource );
+            }
+
+        return resource;
+    }

Added: incubator/apollo/trunk/src/site/content/tutorial/method_impls/syspros_resource_init.txt
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/tutorial/method_impls/syspros_resource_init.txt?view=auto&rev=124980
==============================================================================
--- (empty file)
+++ incubator/apollo/trunk/src/site/content/tutorial/method_impls/syspros_resource_init.txt	Wed Jan 12 10:54:06 2005
@@ -0,0 +1,29 @@
+public void init()
+    {
+        super.init();
+      //create a resource metadata and resource property
+      org.apache.ws.resource.properties.ResourcePropertyMetaData propMetaData = new org.apache.ws.resource.properties.impl.AnyResourcePropertyMetaData( new javax.xml.namespace.QName( SyspropsService.TARGET_NSURI, "property" ) );
+      org.apache.ws.resource.properties.ResourceProperty prop = new org.apache.ws.resource.properties.impl.XmlBeansResourceProperty( propMetaData, (org.apache.ws.resource.properties.impl.XmlBeansResourcePropertySet) m_propSet );
+      //add the property to the prop set
+      m_propSet.add( prop );
+
+      //get the current sys properties
+      java.util.Properties sysProps = System.getProperties();
+      java.util.Iterator iterator = sysProps.keySet().iterator();
+      //iterate the sysprops and add to property set
+      while ( iterator.hasNext() )
+      {
+         String sysPropKey = (String) iterator.next();
+         String sysPropValue = sysProps.getProperty( sysPropKey );
+         try
+         {
+            //build an arbitrary XmlObject out of the sysprop data
+            org.apache.xmlbeans.XmlObject propElem = org.apache.xmlbeans.XmlObject.Factory.parse( "<" + SyspropsService.TARGET_NSPREFIX + ":" + "property" + " name=\"" + sysPropKey + "\" value=\"" + sysPropValue + "\" xmlns:" + SyspropsService.TARGET_NSPREFIX + "=\"" + SyspropsService.TARGET_NSURI + "\"/>" );
+            prop.add( propElem );
+         }
+         catch ( org.apache.xmlbeans.XmlException e )
+         {
+            e.printStackTrace();
+         }
+        }
+    }
\ No newline at end of file

Modified: incubator/apollo/trunk/src/templates/AbstractService.vm
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/AbstractService.vm?view=diff&rev=124980&p1=incubator/apollo/trunk/src/templates/AbstractService.vm&r1=124979&p2=incubator/apollo/trunk/src/templates/AbstractService.vm&r2=124980
==============================================================================
--- incubator/apollo/trunk/src/templates/AbstractService.vm	(original)
+++ incubator/apollo/trunk/src/templates/AbstractService.vm	Wed Jan 12 10:54:06 2005
@@ -3,7 +3,7 @@
 #set( $implements = $generated.serviceImplements)
 #set( $namespace = $generated.namespace)
 #set( $prefix = $generated.prefix)
-#set( $customMethodList = $generated.customMethodList)
+#set( $customMethodList = $generated.CustomMappings)
 #set( $qnames = $qnames)
 
 package $package;
@@ -74,15 +74,14 @@
       /**
        * DOCUMENT_ME
        */
-      public void init(  )
-      {
-         m_methodNameMap    = new ServiceSoapMethodNameMap( getResourceContext(  ) );
-         
-         #foreach( $key in $customMethodList.keySet() )
-           m_methodNameMap.addMapping( $key, $customMethodList.get($key).JavaMethodName )	     
-	 #end         
-         m_isInitialized      = true;
-      }
+   public void init(  )
+   {
+      m_methodNameMap    = new ServiceSoapMethodNameMap( getResourceContext(  ) );
+      #foreach( $key in $customMethodList.keySet() )
+m_methodNameMap.addMapping( javax.xml.namespace.QName.valueOf("${key}") , "$customMethodList.get($key).JavaMethodName" );
+      #end
+m_isInitialized      = true;
+   }
    
    
       /**

Modified: incubator/apollo/trunk/src/templates/CustomOperationsPortType.vm
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/CustomOperationsPortType.vm?view=diff&rev=124980&p1=incubator/apollo/trunk/src/templates/CustomOperationsPortType.vm&r1=124979&p2=incubator/apollo/trunk/src/templates/CustomOperationsPortType.vm&r2=124980
==============================================================================
--- incubator/apollo/trunk/src/templates/CustomOperationsPortType.vm	(original)
+++ incubator/apollo/trunk/src/templates/CustomOperationsPortType.vm	Wed Jan 12 10:54:06 2005
@@ -1,6 +1,6 @@
 #set( $package = $generated.packageName)
 #set( $serviceName = $generated.ServiceName)
-#set( $customMethodList = $generated.customMethodList)
+#set( $customMethodList = $generated.CustomMappings)
 
 package $package;
 
@@ -13,8 +13,8 @@
 public interface ${serviceName}CustomOperationsPortType
 {
    
-   #foreach( $method in $customMethodList.valueSet() )
-   $method.JavaMethodSignature;       
+   #foreach( $key in $customMethodList.keySet() )
+   public $customMethodList.get($key).JavaMethodSignature ;       
    #end   
 
 }

Modified: incubator/apollo/trunk/src/templates/ResourceIntf.vm
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/ResourceIntf.vm?view=diff&rev=124980&p1=incubator/apollo/trunk/src/templates/ResourceIntf.vm&r1=124979&p2=incubator/apollo/trunk/src/templates/ResourceIntf.vm&r2=124980
==============================================================================
--- incubator/apollo/trunk/src/templates/ResourceIntf.vm	(original)
+++ incubator/apollo/trunk/src/templates/ResourceIntf.vm	Wed Jan 12 10:54:06 2005
@@ -49,14 +49,14 @@
 	
        #if($generated.implementsResourceCapability($qnames.scheduledResourceTermination))
         org.apache.ws.resource.properties.ResourceProperty prop = m_propSet.get( org.apache.ws.resource.lifetime.v1_2.porttype.ScheduledResourceTerminationPortType.PROP_QNAME_CURRENT_TIME );
-        org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft01.CurrentTimeDocument currTime = org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft01.CurrentTimeDocument.Factory.newInstance();
-        currTime.setCurrentTime( java.util.Calendar.getInstance() );
-        prop.add( currTime );
-        prop.setCallback( new org.apache.ws.resource.lifetime.callback.CurrentTimeCallback() );
+	org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft01.CurrentTimeDocument currTime = org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft01.CurrentTimeDocument.Factory.newInstance();
+	currTime.setCurrentTime( java.util.Calendar.getInstance() );
+	prop.add( currTime );
+	prop.setCallback( new org.apache.ws.resource.lifetime.callback.CurrentTimeCallback() );
 
-        prop = m_propSet.get( org.apache.ws.resource.lifetime.v1_2.porttype.ScheduledResourceTerminationPortType.PROP_QNAME_TERMINATION_TIME );
-        org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft01.TerminationTimeDocument termTime = org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft01.TerminationTimeDocument.Factory.newInstance();
-        termTime.setNilTerminationTime();
+	prop = m_propSet.get( org.apache.ws.resource.lifetime.v1_2.porttype.ScheduledResourceTerminationPortType.PROP_QNAME_CURRENT_TIME );
+	org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft01.TerminationTimeDocument termTime = org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft01.TerminationTimeDocument.Factory.newInstance();
+	termTime.setNilTerminationTime();
        #end
       
     }

Modified: incubator/apollo/trunk/src/templates/Service.vm
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/Service.vm?view=diff&rev=124980&p1=incubator/apollo/trunk/src/templates/Service.vm&r1=124979&p2=incubator/apollo/trunk/src/templates/Service.vm&r2=124980
==============================================================================
--- incubator/apollo/trunk/src/templates/Service.vm	(original)
+++ incubator/apollo/trunk/src/templates/Service.vm	Wed Jan 12 10:54:06 2005
@@ -1,6 +1,6 @@
 #set( $package = $generated.packageName)
 #set( $serviceName = $generated.ServiceName)
-#set( $customMethodList = $generated.customMethodList)
+#set( $customMethodList = $generated.CustomMappings)
 package $package;
 
 import org.apache.ws.resource.ResourceContext;
@@ -47,19 +47,14 @@
       return m_resourceContext;
    }
 
-   #foreach( $method in $customMethodList.valueSet() )
-   public $method.JavaMethodSignature
-   {
-     	//todo implement
-     	try
-	{
-	    return XmlObject.Factory.parse( "<foo />" );
-	}
-	catch ( XmlException xe )
-	{
-	    throw new JAXRPCException( xe );
-      	}
+   #foreach( $key in $customMethodList.keySet() )
+   
+   public $customMethodList.get($key).JavaMethodSignature
+   {              
+     	//todo implement  
+     	return null;
    }
+   
    #end   
    
 }

Modified: incubator/apollo/trunk/src/templates/jndi.vm
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/jndi.vm?view=diff&rev=124980&p1=incubator/apollo/trunk/src/templates/jndi.vm&r1=124979&p2=incubator/apollo/trunk/src/templates/jndi.vm&r2=124980
==============================================================================
--- incubator/apollo/trunk/src/templates/jndi.vm	(original)
+++ incubator/apollo/trunk/src/templates/jndi.vm	Wed Jan 12 10:54:06 2005
@@ -1,4 +1,5 @@
 #set( $package = $generated.packageName )
+#set( $endpointServiceName = $generated.EndpointServiceName )
 #set( $serviceName = $generated.ServiceName )
 #set( $namespace = $generated.namespace )
 #set( $resourcekey = $generated.resourcekey )
@@ -6,7 +7,7 @@
 
 <jndiConfig xmlns="http://www.apache.org/wsfx/wsrf/jndi/config">
 
-   <service name="$serviceName">
+   <service name="$endpointServiceName">
       <resource name="home" type="${package}.${serviceName}Home">
          <resourceParams>
             <parameter>

Modified: incubator/apollo/trunk/src/webapp/WEB-INF/server-config.wsdd
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/webapp/WEB-INF/server-config.wsdd?view=diff&rev=124980&p1=incubator/apollo/trunk/src/webapp/WEB-INF/server-config.wsdd&r1=124979&p2=incubator/apollo/trunk/src/webapp/WEB-INF/server-config.wsdd&r2=124980
==============================================================================
--- incubator/apollo/trunk/src/webapp/WEB-INF/server-config.wsdd	(original)
+++ incubator/apollo/trunk/src/webapp/WEB-INF/server-config.wsdd	Wed Jan 12 10:54:06 2005
@@ -35,14 +35,8 @@
          <handler type="java:org.apache.axis.handlers.http.HTTPAuthHandler"/>
       </requestFlow>
       <parameter name="qs:list" value="org.apache.axis.transport.http.QSListHandler"/>
-      <!--
-           Set the useDefaultQueryStrings to "false" if you would like the WsdmQSWsdlHandler
-           to handle ?wsdl requests and ensure the soap:address location is returned in the wsdl
-           with the same host as was sent in the ?wsdl request.
-      -->
+      
       <parameter name="useDefaultQueryStrings" value="true"/>
-      <parameter name="qs:wsdl" value="com.hp.ws.platform.axis.wsdl.WsdmQSWsdlHandler"/>
-      <parameter name="qs.wsdl" value="com.hp.ws.platform.axis.wsdl.WsdmQSWsdlHandler"/>
       <parameter name="qs.list" value="org.apache.axis.transport.http.QSListHandler"/>
       <parameter name="qs.method" value="org.apache.axis.transport.http.QSMethodHandler"/>
       <parameter name="qs:method" value="org.apache.axis.transport.http.QSMethodHandler"/>

---------------------------------------------------------------------
To unsubscribe, e-mail: apollo-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: apollo-dev-help@ws.apache.org