Author: ips Date: Thu Jan 6 16:30:36 2005 New Revision: 124465 URL: http://svn.apache.org/viewcvs?view=rev&rev=124465 Log: xmlbeans now generated to .xmlbeans/ subdir, and each service is generated to serviceName/ subdir
Modified: 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 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=124465&p1=incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java&r1=124464&p2=incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java&r2=124465 ============================================================================== --- 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 Thu Jan 6 16:30:36 2005 @@ -87,11 +87,8 @@ private Map m_portTypeInfoMap = new HashMap(); private WSDLReader m_wsdlReader; private File m_outputDir; - private File m_javaSrcOutputDir; - private File m_xBeanSrcOutputDir; - private File m_classesOutputDir; - private File m_libOutputDir; private File[] m_classpath; + private File m_xmlbeansDir; /** * Creates a new [EMAIL PROTECTED] Wsdl2Java} object. @@ -112,10 +109,7 @@ System.out.println( MSG.getMessage( Keys.WARN_EMPTY_WSDLS ) ); } m_outputDir = outputDir; - m_javaSrcOutputDir = new File( outputDir, "src/java" ); - m_xBeanSrcOutputDir = new File( outputDir, "src/xmlbeans" ); - m_classesOutputDir = new File( outputDir, "classes" ); - m_libOutputDir = new File( outputDir, "lib" ); + m_xmlbeansDir = new File( m_outputDir, ".xmlbeans" ); m_classpath = classpathFiles; validateClasspath(); m_options = ( options != null ) ? options : new Wsdl2JavaOptions(); @@ -210,8 +204,10 @@ { Service service = (Service) serviceIter.next(); ResourceDefinition resourceDef = new ResourceDefinitionImpl( def, service ); + File serviceDir = new File( m_outputDir, resourceDef.getName() ); System.out.println( "Processing WSRF service \"" + resourceDef.getName() + "\"..." ); - processTemplates( resourceDef, wsdlFile ); + processTemplates( resourceDef, wsdlFile, serviceDir ); + copyWsdlFile( wsdlFile, serviceDir ); } generateXmlBeans( wsdlFile ); } @@ -324,10 +320,11 @@ return baseName + "-xbeans.jar"; } - private File getPackageDir( String targetNamespace ) + private File getPackageDir( String targetNamespace, File serviceDir ) { String javaPackageName = GenerationUtils.getJavaPackageName( targetNamespace ); - return new File( m_javaSrcOutputDir, + File javaDir = new File( serviceDir, "src/java" ); + return new File( javaDir, javaPackageName.replace( '.', '/' ) ); } @@ -342,18 +339,19 @@ } private ServiceProperties buildServiceProperties( ResourceDefinition resourceDef, - String wsdlFileName ) + File wsdlFile, + File serviceDir ) { ServiceProperties props = new ServiceProperties(); String targetNamespace = resourceDef.getDefinition().getTargetNamespace(); props.setPackageName( GenerationUtils.getJavaPackageName( targetNamespace ) ); String serviceName = resourceDef.getName(); String capitalizedServiceName = StringUtils.capitalize( serviceName ); - String upperCaseServiceName = capitalizedServiceName; - props.setServiceName( upperCaseServiceName ); - props.setJarDir( m_libOutputDir.getAbsolutePath() ); - props.setSrcDir( m_javaSrcOutputDir.getAbsolutePath() ); - props.setClassesDir( m_classesOutputDir.getAbsolutePath() ); + props.setServiceName( capitalizedServiceName ); + props.setSrcDir( new File( serviceDir, "src/java" ).getAbsolutePath() ); + props.setJarDir( new File( serviceDir, "lib" ).getAbsolutePath() ); + props.setJarFileName( getJarFileName( wsdlFile ) ); + props.setClassesDir( new File( serviceDir, "classes" ).getAbsolutePath() ); props.setEndpointURL( resourceDef.getEndpointURL() ); props.setEndpointServiceName( serviceName ); props.setServiceImplements( ImplementsListBuilder.getServiceImplementsList( resourceDef, m_portTypeInfoMap ) ); @@ -376,15 +374,13 @@ customPropMap.put( propName, customPropertyName ); } - props.setPropertyMap( customPropMap ); props.setResourceImplements( ImplementsListBuilder.getResourceImplementsList( resourceDef, m_portTypeInfoMap ) ); props.setPropertyDocumentName( XmlBeanNameUtils.getDocumentElementXmlBeanClassName( resourceDef .getPropertiesDocumentName() ) ); - props.setWsdlName( wsdlFileName ); - + props.setWsdlName( wsdlFile.getName() ); props.setResourcekey( new QName( targetNamespace, "ResourceID" ) ); Iterator ptNameIter = resourceDef.getImplementedResourceCapabilities().keySet().iterator(); while ( ptNameIter.hasNext() ) @@ -411,7 +407,7 @@ { System.out.println( "Generating XMLBeans for WSDL file \"" + wsdlFile + "\"..." ); SchemaCompiler.Parameters scompParams = new SchemaCompiler.Parameters(); - scompParams.setSrcDir( m_xBeanSrcOutputDir ); + scompParams.setSrcDir( new File( m_xmlbeansDir, "src" ) ); File tempClassesDir = getTempDir(); scompParams.setClassesDir( tempClassesDir ); scompParams.setWsdlFiles( new File[] @@ -425,18 +421,16 @@ final boolean beNoisy = true; XmlErrorPrinter xErrorListener = new XmlErrorPrinter( beNoisy, null ); scompParams.setErrorListener( xErrorListener ); - //m_javaSrcOutputDir.mkdirs( ); // necessary? - m_libOutputDir.mkdirs( ); + File jarDir = new File( m_xmlbeansDir, "lib" ); + jarDir.mkdirs( ); String wsdlJarFileName = getJarFileName( wsdlFile ); - scompParams.setOutputJar( new File( m_libOutputDir, wsdlJarFileName ) ); + scompParams.setOutputJar( new File( jarDir, wsdlJarFileName ) ); try { if ( !SchemaCompiler.compile( scompParams ) ) { throw new Exception( xErrorListener.toString() ); } - //copy wsdl to subdir of src - copyWsdlFile( wsdlFile ); } finally { @@ -445,10 +439,11 @@ } } - private void copyWsdlFile( File wsdlFile ) + private void copyWsdlFile( File wsdlFile, File serviceDir ) throws IOException { - File wsdlDir = new File( m_javaSrcOutputDir, "wsdl" ); + File javaDir = new File( serviceDir, "src" ); + File wsdlDir = new File( javaDir, "wsdl" ); wsdlDir.mkdirs(); FileUtils.copyFile( wsdlFile, new File( wsdlDir, wsdlFile.getName() ) ); } @@ -513,14 +508,14 @@ } private void processTemplates( ResourceDefinition resourceDef, - File wsdlFile ) + File wsdlFile, File serviceDir ) throws Exception { String capitalizedServiceName = StringUtils.capitalize( resourceDef.getName() ); try { VelocityContext context = new VelocityContext(); - ServiceProperties props = buildServiceProperties( resourceDef, wsdlFile.getName() ); + ServiceProperties props = buildServiceProperties( resourceDef, wsdlFile, serviceDir ); //add to context context.put( "generated", props ); @@ -528,7 +523,7 @@ new ConstQNames() ); //generate files - File packageDir = getPackageDir( resourceDef.getDefinition().getTargetNamespace() ); + File packageDir = getPackageDir( resourceDef.getDefinition().getTargetNamespace(), serviceDir ); packageDir.mkdirs(); File outputFile = new File( packageDir, "Abstract" + capitalizedServiceName + "Service.java" ); processTemplate( context, "templates/AbstractService.vm", outputFile ); @@ -576,10 +571,10 @@ outputFile = new File( packageDir, capitalizedServiceName + "CustomOperationsPortType.java" ); processTemplate( context, "templates/CustomOperationsPortType.vm", outputFile ); - outputFile = new File( m_javaSrcOutputDir.getParentFile().getParentFile(), "build.xml" ); + outputFile = new File( serviceDir, "build.xml" ); processTemplate( context, "templates/build.xml.vm", outputFile ); - outputFile = new File( m_javaSrcOutputDir.getParentFile().getParentFile(), "build.properties" ); + outputFile = new File( serviceDir, "build.properties" ); processTemplate( context, "templates/build.properties.vm", outputFile ); } catch ( Exception e ) 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=124465&p1=incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/velocity/ServiceProperties.java&r1=124464&p2=incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/velocity/ServiceProperties.java&r2=124465 ============================================================================== --- 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 Thu Jan 6 16:30:36 2005 @@ -30,6 +30,7 @@ private String m_jarDir; private String m_classesDir; private String m_srcDir; + private String m_jarFileName; public String getSrcDir() { @@ -219,5 +220,15 @@ public String getEndpointURL() { return m_endpointURL; + } + + public String getJarFileName() + { + return m_jarFileName; + } + + public void setJarFileName( String jarFileName ) + { + m_jarFileName = jarFileName; } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
