Author: ips Date: Thu Jan 6 12:20:12 2005 New Revision: 124432 URL: http://svn.apache.org/viewcvs?view=rev&rev=124432 Log: refactoring
Modified: incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.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=124432&p1=incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java&r1=124431&p2=incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java&r2=124432 ============================================================================== --- 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 12:20:12 2005 @@ -81,7 +81,8 @@ private File m_jarOutputDir; private Wsdl2JavaOptions m_options; private Map m_portTypeInfoMap = new HashMap( ); - private File m_srcXmlBeansDir; + private File m_srcXmlBeansDir; + private WSDLReader m_wsdlReader; /** * Creates a new [EMAIL PROTECTED] Wsdl2Java} object. @@ -94,18 +95,19 @@ public Wsdl2Java( File[] wsdlFiles, File srcOutputDir, File classesOutputDir, - Wsdl2JavaOptions options ) - { + Wsdl2JavaOptions options ) throws Exception + { m_wsdlFiles = wsdlFiles; if ( m_wsdlFiles.length == 0 ) { System.out.println( MSG.getMessage( Keys.WARN_EMPTY_WSDLS ) ); } - m_srcXmlBeansDir = new File(srcOutputDir, "xmlbeans"); m_srcOutputDir = new File(srcOutputDir, "java"); m_jarOutputDir = classesOutputDir; m_options = ( options != null ) ? options : new Wsdl2JavaOptions( ); + m_wsdlReader = WSDLFactory.newInstance( ).newWSDLReader( ); + initVelocity( ); initPortTypeInfoMap( ); } @@ -157,25 +159,29 @@ public void generate( ) throws Exception { - initVelocity( ); for ( int i = 0; i < m_wsdlFiles.length; i++ ) { - WSDLReader wsdlReader = WSDLFactory.newInstance( ).newWSDLReader( ); - File wsdlFile = m_wsdlFiles[i]; - generateXmlBeans( wsdlFile ); - Definition def = wsdlReader.readWSDL( wsdlFile.getPath( ) ); - Iterator serviceIter = def.getServices( ).values( ).iterator( ); - while ( serviceIter.hasNext( ) ) - { - Service service = (Service) serviceIter.next( ); - ResourceDefinition resourceDef = new ResourceDefinitionImpl( def, service ); - processTemplates( resourceDef, - wsdlFile.getName( ) ); - } + processWsdlFile( m_wsdlFiles[i] ); } } - /** + private void processWsdlFile( File wsdlFile ) + throws Exception + { + System.out.println( "Processing WSDL file \"" + wsdlFile + "\"..." ); + Definition def = m_wsdlReader.readWSDL( wsdlFile.getPath( ) ); + Iterator serviceIter = def.getServices( ).values( ).iterator( ); + while ( serviceIter.hasNext( ) ) + { + Service service = (Service) serviceIter.next( ); + ResourceDefinition resourceDef = new ResourceDefinitionImpl( def, service ); + System.out.println( "Processing WSRF service \"" + resourceDef.getName() + "\"..." ); + processTemplates( resourceDef, wsdlFile ); + } + generateXmlBeans( wsdlFile ); + } + + /** * DOCUMENT_ME * * @param args DOCUMENT_ME @@ -375,6 +381,7 @@ private void generateXmlBeans( File wsdlFile ) throws Exception { + System.out.println( "Generating XMLBeans for WSDL file \"" + wsdlFile + "\"..." ); SchemaCompiler.Parameters scompParams = new SchemaCompiler.Parameters( ); scompParams.setSrcDir( m_srcXmlBeansDir ); @@ -480,14 +487,14 @@ } private void processTemplates( ResourceDefinition resourceDef, - String wsdlFileName ) + File wsdlFile ) throws Exception { String serviceName = getUpperCaseServiceName(resourceDef.getName()); try { VelocityContext context = new VelocityContext( ); - ServiceProperties props = buildServiceProperties( resourceDef, wsdlFileName ); + ServiceProperties props = buildServiceProperties( resourceDef, wsdlFile.getName() ); //add to context context.put( "generated", props ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
