svn commit: r230672 - in /beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/generator: ServiceControlGenerator.java servicecontrol.vm

[ekoneil]

Author: ekoneil
Date: Sun Aug  7 08:33:16 2005
New Revision: 230672

URL: http://svn.apache.org/viewcvs?rev=230672&view=rev
Log:
Couple of tweaks to web service control generation:

- cleanup some spacing to use four spaces instead of two
- change the name of the packageName key passed into the Velocity macro so it 
doesn't use "jcx" which we should move away from

BB: self
DRT: ws control pass


Modified:
    
beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/generator/ServiceControlGenerator.java
    
beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/generator/servicecontrol.vm

Modified: 
beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/generator/ServiceControlGenerator.java
URL: 
http://svn.apache.org/viewcvs/beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/generator/ServiceControlGenerator.java?rev=230672&r1=230671&r2=230672&view=diff
==============================================================================
--- 
beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/generator/ServiceControlGenerator.java
 (original)
+++ 
beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/generator/ServiceControlGenerator.java
 Sun Aug  7 08:33:16 2005
@@ -15,6 +15,16 @@
  */
 package org.apache.beehive.controls.system.webservice.generator;
 
+import java.io.File;
+import java.io.FileFilter;
+import java.io.FileNotFoundException;
+import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.Properties;
+import javax.jws.WebParam;
+
 import org.apache.axis.wsdl.toJava.Utils;
 import org.apache.beehive.wsm.axis.databinding.SystemTypeLookupService;
 import org.apache.beehive.wsm.model.BeehiveWsMethodMetadata;
@@ -32,16 +42,6 @@
 import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
 import org.xmlsoap.schemas.wsdl.DefinitionsDocument;
 
-import javax.jws.WebParam;
-import java.io.File;
-import java.io.FileFilter;
-import java.io.FileNotFoundException;
-import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
-import java.io.Writer;
-import java.util.ArrayList;
-import java.util.Properties;
-
 /**
  * Generate a service control from a WSDL using Velocity.
  */
@@ -112,7 +112,7 @@
         }
 
         VelocityContext context = new VelocityContext();
-        context.put("jcxPackageName", pkgName);
+        context.put("controlPackageName", pkgName);
         context.put("serviceName", bwtm.getWsServiceName());
         context.put("serviceURLString", serviceURLString);
         context.put("wsdlPath", wsdlPath);

Modified: 
beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/generator/servicecontrol.vm
URL: 
http://svn.apache.org/viewcvs/beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/generator/servicecontrol.vm?rev=230672&r1=230671&r2=230672&view=diff
==============================================================================
--- 
beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/generator/servicecontrol.vm
 (original)
+++ 
beehive/trunk/system-controls/src/webservice/org/apache/beehive/controls/system/webservice/generator/servicecontrol.vm
 Sun Aug  7 08:33:16 2005
@@ -33,7 +33,7 @@
 ##

 ## THE WEB SERVICE CONTROL CLASS TEMPLATE

 ##

-package $jcxPackageName;

+package $controlPackageName;

 

 import org.apache.beehive.controls.api.bean.ControlExtension;

 import org.apache.beehive.controls.system.webservice.ServiceControl;

@@ -48,14 +48,14 @@
 @Location(urls = {"$serviceURLString"})

 @WSDL(path = "$wsdlPath", service = "$serviceName")

 public interface $serviceName

-  extends ServiceControl {

+    extends ServiceControl {

 

 #foreach($method in $methodList)

     public $method.returnTypeName $method.name(

 #if($method.params.size() > 0)

 #params($method)

 #else

-)

+    )

 #end

        throws Exception;

 #end