[prev in list] [next in list] [prev in thread] [next in thread] 

List:       apollo-dev
Subject:    svn commit: r123243 - /incubator/apollo/trunk/src/java/org/apache/ws/resource/Wsdl2Java.java
From:       scamp () apache ! org
Date:       2004-12-23 23:09:44
Message-ID: 20041223230944.61473.qmail () minotaur ! apache ! org
[Download RAW message or body]

Author: scamp
Date: Thu Dec 23 15:09:43 2004
New Revision: 123243

URL: http://svn.apache.org/viewcvs?view=rev&rev=123243
Log:
updated to write to the package dir
Modified:
   incubator/apollo/trunk/src/java/org/apache/ws/resource/Wsdl2Java.java

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/resou \
rce/Wsdl2Java.java?view=diff&rev=123243&p1=incubator/apollo/trunk/src/java/org/apache/ \
ws/resource/Wsdl2Java.java&r1=123242&p2=incubator/apollo/trunk/src/java/org/apache/ws/resource/Wsdl2Java.java&r2=123243
 ==============================================================================
--- 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 \
15:09:43 2004 @@ -300,21 +300,24 @@
       try
       {
          VelocityContext context = new VelocityContext(  );
-         ServiceProperties props = buildServiceProperties(serviceName, resourceDef, \
wsdlFileName); +         String targetNamespace = \
resourceDef.getDefinition().getTargetNamespace(); +         ServiceProperties props = \
buildServiceProperties(serviceName, resourceDef, wsdlFileName,targetNamespace);  
          //add to context
          context.put( "generated", props );
          context.put( "qnames", new ConstQNames() );
 
-
          //generate files
+         String javaPackageName = \
GenerationUtils.getJavaPackageName(targetNamespace); +         javaPackageName = \
javaPackageName.replace('.','/'); +         File packageDir = new \
File(m_srcOutputDir, javaPackageName);  
-         File generatedSrc = new File( m_srcOutputDir, "Abstract" + serviceName + \
"Service.java" ); +         File generatedSrc = new File( packageDir, "Abstract" + \
serviceName + "Service.java" );  writeGeneratedSrcFile( context,
                                 "templates/AbstractService.vm",
                                 generatedSrc.getAbsolutePath(  ) );
 
-         generatedSrc = new File( m_srcOutputDir, serviceName + "Service.java" );
+         generatedSrc = new File( packageDir, serviceName + "Service.java" );
          //only generate if it doesn't exist
          if(!generatedSrc.exists())
          {
@@ -322,12 +325,12 @@
                                 "templates/Service.vm",
                                 generatedSrc.getAbsolutePath(  ) );
          }
-         generatedSrc = new File( m_srcOutputDir, "Abstract" + serviceName + \
"Resource.java" ); +         generatedSrc = new File( packageDir, "Abstract" + \
serviceName + "Resource.java" );  writeGeneratedSrcFile( context,
                                 "templates/AbstractResource.vm",
                                 generatedSrc.getAbsolutePath(  ) );
 
-         generatedSrc = new File( m_srcOutputDir, serviceName + "Resource.java" );
+         generatedSrc = new File( packageDir, serviceName + "Resource.java" );
          //only generate if it doesn't exist
          if(!generatedSrc.exists())
          {
@@ -336,7 +339,7 @@
                                 generatedSrc.getAbsolutePath(  ) );
          }
 
-         generatedSrc = new File( m_srcOutputDir, serviceName + "Home.java" );
+         generatedSrc = new File( packageDir, serviceName + "Home.java" );
          //only generate if it doesn't exist
          if(!generatedSrc.exists())
          {
@@ -347,24 +350,24 @@
          //only if they implemented properties does this make sense.
          if(resourceDef.hasProperties())
          {
-         generatedSrc = new File( m_srcOutputDir, serviceName + \
"PropertyQNames.java" ); +         generatedSrc = new File( packageDir, serviceName + \
"PropertyQNames.java" );  writeGeneratedSrcFile( context,
                                 "templates/PropertyQNames.vm",
                                 generatedSrc.getAbsolutePath(  ) );
          }
 
-         generatedSrc = new File( m_srcOutputDir, serviceName + "_deploy.wsdd" );
+         generatedSrc = new File( packageDir, serviceName + "_deploy.wsdd" );
          writeGeneratedSrcFile( context,
                                 "templates/deploy.vm",
                                 generatedSrc.getAbsolutePath(  ) );
 
-         generatedSrc = new File( m_srcOutputDir, serviceName + "_jndi-config.wsdd" \
); +         generatedSrc = new File( packageDir, serviceName + "_jndi-config.wsdd" \
);  writeGeneratedSrcFile( context,
                                 "templates/jndi.vm",
                                 generatedSrc.getAbsolutePath(  ) );
 
 
-            generatedSrc = new File( m_srcOutputDir, serviceName + \
"CustomOperationsPortType.java" ); +            generatedSrc = new File( packageDir, \
serviceName + "CustomOperationsPortType.java" );  writeGeneratedSrcFile( context,
                                    "templates/CustomOperationsPortType.vm",
                                    generatedSrc.getAbsolutePath(  ) );
@@ -376,13 +379,12 @@
       }
    }
 
-    private ServiceProperties buildServiceProperties(String serviceName, \
ResourceDefinition resourceDef, String wsdlFileName) +    private ServiceProperties \
buildServiceProperties(String serviceName, ResourceDefinition resourceDef, String \
wsdlFileName, String targetNamespace)  {
         ServiceProperties props = new ServiceProperties();
-        String targetNamespace = resourceDef.getDefinition().getTargetNamespace();
         props.setPackageName(GenerationUtils.getJavaPackageName(targetNamespace));
         props.setServiceName(serviceName);
-        props.setServiceImplements(ImplementsListBuilder.getServiceImplementsList(resourceDef)); \
 +        props.setServiceImplements(ImplementsListBuilder.getServiceImplementsList(resourceDef));
  props.setNamespace(targetNamespace);
         props.setPrefix(GenerationUtils.getPrefix(targetNamespace));
         props.setCustomMappings();


[prev in list] [next in list] [prev in thread] [next in thread]