You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wsrf-dev@ws.apache.org by ip...@apache.org on 2005/01/04 21:34:03 UTC

svn commit: r124154 - incubator/apollo/trunk/src/templates

Author: ips
Date: Tue Jan  4 12:34:00 2005
New Revision: 124154

URL: http://svn.apache.org/viewcvs?view=rev&rev=124154
Log:
fixes

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/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=124154&p1=incubator/apollo/trunk/src/templates/AbstractResource.vm&r1=124153&p2=incubator/apollo/trunk/src/templates/AbstractResource.vm&r2=124154
==============================================================================
--- incubator/apollo/trunk/src/templates/AbstractResource.vm	(original)
+++ incubator/apollo/trunk/src/templates/AbstractResource.vm	Tue Jan  4 12:34:00 2005
@@ -29,7 +29,7 @@
  * 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${serviceName}Resource implements Resource #if($implements) , $implements #end
 {
     
     /**
@@ -44,10 +44,11 @@
     protected ResourcePropertySet m_propSet;
     #end
         
-    #parse( "ResourceIntf.vm" )
+    #parse( "templates/ResourceIntf.vm" )
 
-    #foreach( $includeFile in $generated.ResourceIncludeFiles )
-       #include( $includeFile );
-    #end         
+#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=124154&p1=incubator/apollo/trunk/src/templates/AbstractService.vm&r1=124153&p2=incubator/apollo/trunk/src/templates/AbstractService.vm&r2=124154
==============================================================================
--- incubator/apollo/trunk/src/templates/AbstractService.vm	(original)
+++ incubator/apollo/trunk/src/templates/AbstractService.vm	Tue Jan  4 12:34:00 2005
@@ -6,7 +6,6 @@
 #set( $customMethodList = $generated.customMethodList)
 #set( $qnames = $qnames)
 
-
 package $package;
 
 import org.apache.ws.resource.ResourceContext;
@@ -22,9 +21,8 @@
  * This will ensure it is always up-to-date with the WSDL.
  *
  * NOTE: This class is generated and is NOT meant to be modified.
- *
  */
-public abstract class Abstract$serviceNameService
+public abstract class Abstract${serviceName}Service
    implements WsrfService #if($implements) , $implements #end
 {
 
@@ -39,7 +37,7 @@
    /**
     * DOCUMENT_ME
     */
-   private boolean isInitialized = false;
+   private boolean m_isInitialized;
 
    /**
     * DOCUMENT_ME
@@ -50,7 +48,7 @@
     */
    public String getMethodName( QName requestQname )
    {
-      if ( !isInitialized )
+      if ( !m_isInitialized )
       {
          init(  );
       }
@@ -85,7 +83,7 @@
          #foreach( $key in $customMethodList.keySet() )
            m_methodNameMap.addMapping( $key, $customMethodList.get($key).JavaMethodName )	     
 	 #end         
-         isInitialized      = true;
+         m_isInitialized      = true;
       }
    
    
@@ -96,12 +94,12 @@
        */
    protected final boolean isInitialized(  )
    {
-         return isInitialized;
+         return m_isInitialized;
    }
 
+#foreach( $includeFile in $generated.ServiceIncludeFiles )
+#include( $includeFile )
 
-   #foreach( $includeFile in $generated.ServiceIncludeFiles )
-      #include( $includeFile );
-   #end         
+#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=124154&p1=incubator/apollo/trunk/src/templates/CustomOperationsPortType.vm&r1=124153&p2=incubator/apollo/trunk/src/templates/CustomOperationsPortType.vm&r2=124154
==============================================================================
--- incubator/apollo/trunk/src/templates/CustomOperationsPortType.vm	(original)
+++ incubator/apollo/trunk/src/templates/CustomOperationsPortType.vm	Tue Jan  4 12:34:00 2005
@@ -2,7 +2,6 @@
 #set( $serviceName = $generated.ServiceName)
 #set( $customMethodList = $generated.customMethodList)
 
-
 package $package;
 
 import org.apache.xmlbeans.XmlObject;
@@ -13,11 +12,11 @@
  * NOTE: This class is generated and is NOT meant to be modified.
  *
  */
-public interface $serviceNameCustomOperationsPortType
+public interface ${serviceName}CustomOperationsPortType
 {
    
    #foreach( $method in $customMethodList.valueSet() )
    $method.JavaMethodSignature;       
    #end   
 
-}
\ No newline at end of file
+}

Modified: incubator/apollo/trunk/src/templates/Home.vm
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/Home.vm?view=diff&rev=124154&p1=incubator/apollo/trunk/src/templates/Home.vm&r1=124153&p2=incubator/apollo/trunk/src/templates/Home.vm&r2=124154
==============================================================================
--- incubator/apollo/trunk/src/templates/Home.vm	(original)
+++ incubator/apollo/trunk/src/templates/Home.vm	Tue Jan  4 12:34:00 2005
@@ -1,6 +1,6 @@
 #set( $package = $generated.packageName )
 #set( $serviceName = $generated.ServiceName )
-package ${package};
+package $package;
 
 import org.apache.ws.resource.Resource;
 import org.apache.ws.resource.ResourceContext;
@@ -13,9 +13,9 @@
 import java.io.Serializable;
 
 /**
- * Home for ${serviceName} WS-Resources.
+ * Home for $serviceName WS-Resources.
  */
-public class $serviceNameHome
+public class ${serviceName}Home
         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=124154&p1=incubator/apollo/trunk/src/templates/PropertyQNames.vm&r1=124153&p2=incubator/apollo/trunk/src/templates/PropertyQNames.vm&r2=124154
==============================================================================
--- incubator/apollo/trunk/src/templates/PropertyQNames.vm	(original)
+++ incubator/apollo/trunk/src/templates/PropertyQNames.vm	Tue Jan  4 12:34:00 2005
@@ -1,8 +1,6 @@
 #set( $package = $generated.packageName)
 #set( $serviceName = $generated.serviceName)
 #set( $propertyMap = $generated.propertyMap)
-
-
 package $package;
 
 import javax.xml.namespace.QName;

Modified: incubator/apollo/trunk/src/templates/Resource.vm
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/Resource.vm?view=diff&rev=124154&p1=incubator/apollo/trunk/src/templates/Resource.vm&r1=124153&p2=incubator/apollo/trunk/src/templates/Resource.vm&r2=124154
==============================================================================
--- incubator/apollo/trunk/src/templates/Resource.vm	(original)
+++ incubator/apollo/trunk/src/templates/Resource.vm	Tue Jan  4 12:34:00 2005
@@ -23,12 +23,11 @@
 import java.util.List;
 
 /**
- * A filesystem WS-Resource.
+ * A $serviceName WS-Resource.
  * <p/>
  * NOTE: This class is generated.
- *
  */
-public class $serviceNameResource extends Abstract$serviceNameResource
+public class ${serviceName}Resource extends Abstract${serviceName}Resource
 
 {
 
@@ -37,10 +36,8 @@
      */
     public void init()
     {
-
         super.init();
-
         //todo init resource properties and setup callbacks
     }
 
-}
\ No newline at end of file
+}

Modified: incubator/apollo/trunk/src/templates/Service.vm
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/Service.vm?view=diff&rev=124154&p1=incubator/apollo/trunk/src/templates/Service.vm&r1=124153&p2=incubator/apollo/trunk/src/templates/Service.vm&r2=124154
==============================================================================
--- incubator/apollo/trunk/src/templates/Service.vm	(original)
+++ incubator/apollo/trunk/src/templates/Service.vm	Tue Jan  4 12:34:00 2005
@@ -20,9 +20,9 @@
  *       calls to the code generator.
  *
  */
-public class $serviceNameService
-   extends Abstract$serviceNameService 
-   implements $serviceNameCustomOperationsPortType
+public class ${serviceName}Service
+   extends Abstract${serviceName}Service 
+   implements ${serviceName}CustomOperationsPortType
 {
 
    private ResourceContext m_resourceContext;
@@ -35,7 +35,7 @@
    public $serviceNameService( ResourceContext resourceContext )
    {
       m_resourceContext = resourceContext;
-      init(  );
+      init();
    }
 
    /**
@@ -63,4 +63,4 @@
    }
    #end   
    
-}
\ No newline at end of file
+}

Modified: incubator/apollo/trunk/src/templates/jndi.vm
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/jndi.vm?view=diff&rev=124154&p1=incubator/apollo/trunk/src/templates/jndi.vm&r1=124153&p2=incubator/apollo/trunk/src/templates/jndi.vm&r2=124154
==============================================================================
--- incubator/apollo/trunk/src/templates/jndi.vm	(original)
+++ incubator/apollo/trunk/src/templates/jndi.vm	Tue Jan  4 12:34:00 2005
@@ -6,7 +6,7 @@
 
 <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>

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