Author: scamp Date: Thu Jan 6 11:28:02 2005 New Revision: 124422 URL: http://svn.apache.org/viewcvs?view=rev&rev=124422 Log: updated code generation 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 incubator/apollo/trunk/src/templates/AbstractResource.vm incubator/apollo/trunk/src/templates/GetMultiple.txt incubator/apollo/trunk/src/templates/GetResource.txt incubator/apollo/trunk/src/templates/ImmediateResourceTermination.txt incubator/apollo/trunk/src/templates/Query.txt incubator/apollo/trunk/src/templates/Resource.vm incubator/apollo/trunk/src/templates/ResourceIntf.vm incubator/apollo/trunk/src/templates/ScheduledResourceTerminationResource.txt incubator/apollo/trunk/src/templates/Set.txt incubator/apollo/trunk/src/templates/SetTerminationTime.txt incubator/apollo/trunk/src/templates/deploy.vm
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=124422&p1=incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java&r1=124421&p2=incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java&r2=124422 ============================================================================== --- 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 11:28:02 2005 @@ -80,8 +80,9 @@ private File m_jarOutputDir; private Wsdl2JavaOptions m_options; private Map m_portTypeInfoMap = new HashMap( ); + private File m_srcXmlBeansDir; - /** + /** * Creates a new [EMAIL PROTECTED] Wsdl2Java} object. * * @param wsdlFiles DOCUMENT_ME @@ -100,7 +101,8 @@ System.out.println( MSG.getMessage( Keys.WARN_EMPTY_WSDLS ) ); } - m_srcOutputDir = srcOutputDir; + m_srcXmlBeansDir = new File(srcOutputDir, "xmlbeans"); + m_srcOutputDir = new File(srcOutputDir, "java"); m_jarOutputDir = classesOutputDir; m_options = ( options != null ) ? options : new Wsdl2JavaOptions( ); initPortTypeInfoMap( ); @@ -318,19 +320,21 @@ return tempClassesDir; } - private ServiceProperties buildServiceProperties( String serviceName, - ResourceDefinition resourceDef, + private ServiceProperties buildServiceProperties( ResourceDefinition resourceDef, String wsdlFileName ) { ServiceProperties props = new ServiceProperties( ); String targetNamespace = resourceDef.getDefinition( ).getTargetNamespace( ); props.setPackageName( GenerationUtils.getJavaPackageName( targetNamespace ) ); - props.setServiceName( serviceName ); + String serviceName = resourceDef.getName(); + String upperCaseServiceName = getUpperCaseServiceName(serviceName); + props.setServiceName( upperCaseServiceName ); + props.setEndpointServiceName(serviceName); props.setServiceImplements( ImplementsListBuilder.getServiceImplementsList( resourceDef, m_portTypeInfoMap ) ); props.setNamespace( targetNamespace ); props.setPrefix( GenerationUtils.getPrefix( targetNamespace ) ); props.setCustomMappings( GenerationUtils.getOperationInfoMap( resourceDef ) ); - + props.setHasProperties(resourceDef.hasProperties()); QName[] customPropertyNames = resourceDef.getCustomPropertyNames( ); Map customPropMap = new HashMap( ); for ( int i = 0; i < customPropertyNames.length; i++ ) @@ -380,7 +384,7 @@ throws Exception { SchemaCompiler.Parameters scompParams = new SchemaCompiler.Parameters( ); - scompParams.setSrcDir( m_srcOutputDir ); + scompParams.setSrcDir( m_srcXmlBeansDir ); File tempClassesDir = getTempDir( ); @@ -477,11 +481,11 @@ String wsdlFileName ) throws Exception { - String serviceName = StringUtils.capitalize( resourceDef.getName( ) ); - try + String serviceName = getUpperCaseServiceName(resourceDef.getName()); + try { VelocityContext context = new VelocityContext( ); - ServiceProperties props = buildServiceProperties( serviceName, resourceDef, wsdlFileName ); + ServiceProperties props = buildServiceProperties( resourceDef, wsdlFileName ); //add to context context.put( "generated", props ); @@ -543,7 +547,13 @@ } } - /** + private String getUpperCaseServiceName(String name) + { + String serviceName = StringUtils.capitalize( name ); + return serviceName; + } + + /** * DOCUMENT_ME * * @version $Revision: 1.8 $ 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=124422&p1=incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/velocity/ServiceProperties.java&r1=124421&p2=incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/velocity/ServiceProperties.java&r2=124422 ============================================================================== --- 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 11:28:02 2005 @@ -24,6 +24,8 @@ QName m_resourcekey; List m_resourceIncludes = new ArrayList(); List m_serviceIncludes = new ArrayList(); + private boolean m_hasProperties; + private String m_endpointServiceName; public List getResourceIncludeFiles() { @@ -155,4 +157,23 @@ this.m_resourcekey = resourcekey; } + public boolean hasProperties() + { + return m_hasProperties; + } + + public void setHasProperties(boolean hasProps) + { + m_hasProperties = hasProps; + } + + public void setEndpointServiceName(String serviceName) + { + m_endpointServiceName = serviceName; + } + + public String getEndpointServiceName() + { + return m_endpointServiceName; + } } Modified: incubator/apollo/trunk/src/templates/AbstractResource.vm Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/AbstractResource.vm?view=diff&rev=124422&p1=incubator/apollo/trunk/src/templates/AbstractResource.vm&r1=124421&p2=incubator/apollo/trunk/src/templates/AbstractResource.vm&r2=124422 ============================================================================== --- incubator/apollo/trunk/src/templates/AbstractResource.vm (original) +++ incubator/apollo/trunk/src/templates/AbstractResource.vm Thu Jan 6 11:28:02 2005 @@ -10,7 +10,7 @@ import org.apache.ws.resource.PropertiesResource; import org.apache.ws.resource.Resource; import org.apache.ws.resource.example.filesystem.FileSystemPropertiesDocument; -import org.apache.ws.resource.lifetime.ResourceLifetime1_2Constants; +import org.apache.ws.resource.lifetime.v1_2.ResourceLifetime1_2Constants; import org.apache.ws.resource.lifetime.ScheduledResourceTerminationResource; import org.apache.ws.resource.lifetime.callback.CurrentTimeCallback; import org.apache.ws.resource.properties.ResourceProperty; @@ -29,7 +29,7 @@ * NOTE: This class is generated and is NOT meant to be modified. * */ -public abstract class Abstract${serviceName}Resource implements Resource #if($implements) , $implements #end +public abstract class Abstract${serviceName}Resource #if($implements) implements ${implements} #end { /** Modified: incubator/apollo/trunk/src/templates/GetMultiple.txt Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/GetMultiple.txt?view=diff&rev=124422&p1=incubator/apollo/trunk/src/templates/GetMultiple.txt&r1=124421&p2=incubator/apollo/trunk/src/templates/GetMultiple.txt&r2=124422 ============================================================================== --- incubator/apollo/trunk/src/templates/GetMultiple.txt (original) +++ incubator/apollo/trunk/src/templates/GetMultiple.txt Thu Jan 6 11:28:02 2005 @@ -5,7 +5,7 @@ * * @return DOCUMENT_ME */ - public GetMultipleResourcePropertiesResponseDocument getMultipleResourceProperties( GetMultipleResourcePropertiesDocument requestDoc ) + public org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetMultipleResourcePropertiesResponseDocument getMultipleResourceProperties( org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetMultipleResourcePropertiesDocument requestDoc ) { - return new GetMultipleResourcePropertiesProvider( getResourceContext( ) ).getMultipleResourceProperties( requestDoc ); + return new org.apache.ws.resource.properties.v1_2.porttype.impl.GetMultipleResourcePropertiesProvider( getResourceContext( ) ).getMultipleResourceProperties( requestDoc ); } Modified: incubator/apollo/trunk/src/templates/GetResource.txt Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/GetResource.txt?view=diff&rev=124422&p1=incubator/apollo/trunk/src/templates/GetResource.txt&r1=124421&p2=incubator/apollo/trunk/src/templates/GetResource.txt&r2=124422 ============================================================================== --- incubator/apollo/trunk/src/templates/GetResource.txt (original) +++ incubator/apollo/trunk/src/templates/GetResource.txt Thu Jan 6 11:28:02 2005 @@ -5,7 +5,7 @@ * * @return DOCUMENT_ME */ - public GetResourcePropertyResponseDocument getResourceProperty( GetResourcePropertyDocument requestDoc ) + public org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetResourcePropertyResponseDocument getResourceProperty( org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetResourcePropertyDocument requestDoc ) { - return new GetResourcePropertyProvider( getResourceContext( ) ).getResourceProperty( requestDoc ); + return new org.apache.ws.resource.properties.v1_2.porttype.impl.GetResourcePropertyProvider( getResourceContext( ) ).getResourceProperty( requestDoc ); } Modified: incubator/apollo/trunk/src/templates/ImmediateResourceTermination.txt Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/ImmediateResourceTermination.txt?view=diff&rev=124422&p1=incubator/apollo/trunk/src/templates/ImmediateResourceTermination.txt&r1=124421&p2=incubator/apollo/trunk/src/templates/ImmediateResourceTermination.txt&r2=124422 ============================================================================== --- incubator/apollo/trunk/src/templates/ImmediateResourceTermination.txt (original) +++ incubator/apollo/trunk/src/templates/ImmediateResourceTermination.txt Thu Jan 6 11:28:02 2005 @@ -5,7 +5,7 @@ * * @return DOCUMENT_ME */ - public DestroyResponseDocument destroy( DestroyDocument requestDoc ) + public org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft01.DestroyResponseDocument destroy( org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft01.DestroyDocument requestDoc ) { - return new ImmediateResourceTerminationPortTypeImpl( getResourceContext( ) ).destroy( requestDoc ); + return new org.apache.ws.resource.lifetime.v1_2.porttype.impl.ImmediateResourceTerminationPortTypeImpl( getResourceContext( ) ).destroy( requestDoc ); } Modified: incubator/apollo/trunk/src/templates/Query.txt Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/Query.txt?view=diff&rev=124422&p1=incubator/apollo/trunk/src/templates/Query.txt&r1=124421&p2=incubator/apollo/trunk/src/templates/Query.txt&r2=124422 ============================================================================== --- incubator/apollo/trunk/src/templates/Query.txt (original) +++ incubator/apollo/trunk/src/templates/Query.txt Thu Jan 6 11:28:02 2005 @@ -5,7 +5,7 @@ * * @return DOCUMENT_ME */ - public QueryResourcePropertiesResponseDocument queryResourceProperties( QueryResourcePropertiesDocument requestDoc ) + public org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.QueryResourcePropertiesResponseDocument queryResourceProperties( org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.QueryResourcePropertiesDocument requestDoc ) { - return new QueryResourcePropertiesProvider( getResourceContext( ) ).queryResourceProperties( requestDoc ); + return new org.apache.ws.resource.properties.v1_2.porttype.impl.QueryResourcePropertiesProvider( getResourceContext( ) ).queryResourceProperties( requestDoc ); } Modified: incubator/apollo/trunk/src/templates/Resource.vm Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/Resource.vm?view=diff&rev=124422&p1=incubator/apollo/trunk/src/templates/Resource.vm&r1=124421&p2=incubator/apollo/trunk/src/templates/Resource.vm&r2=124422 ============================================================================== --- incubator/apollo/trunk/src/templates/Resource.vm (original) +++ incubator/apollo/trunk/src/templates/Resource.vm Thu Jan 6 11:28:02 2005 @@ -3,13 +3,6 @@ package $package; -import example.filesystem.backend.FileSystem; -import example.filesystem.backend.UnixFileSystem; -import example.filesystem.callback.BackupFrequencyCallback; -import example.filesystem.callback.CommentCallback; -import example.filesystem.callback.FsckPassNumberCallback; -import example.filesystem.callback.MountPointCallback; -import example.filesystem.callback.OptionsCallback; import org.apache.ws.resource.example.filesystem.BackupFrequencyDocument; import org.apache.ws.resource.example.filesystem.CommentDocument; import org.apache.ws.resource.example.filesystem.DeviceSpecialFileDocument; Modified: incubator/apollo/trunk/src/templates/ResourceIntf.vm Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/ResourceIntf.vm?view=diff&rev=124422&p1=incubator/apollo/trunk/src/templates/ResourceIntf.vm&r1=124421&p2=incubator/apollo/trunk/src/templates/ResourceIntf.vm&r2=124422 ============================================================================== --- incubator/apollo/trunk/src/templates/ResourceIntf.vm (original) +++ incubator/apollo/trunk/src/templates/ResourceIntf.vm Thu Jan 6 11:28:02 2005 @@ -41,18 +41,20 @@ public void init() { $propDoc propsDoc = ${propDoc}.Factory.newInstance(); + + #if($generated.hasProperties()) m_propSet = new XmlBeansResourcePropertySet( propsDoc ); - + #end //todo init resource properties and setup callbacks. #if($generated.implementsResourceCapability($qnames.scheduledResourceTermination)) - ResourceProperty prop = m_propSet.get( ResourceLifetime1_2Constants.PROP_QNAME_CURRENT_TIME ); + ResourceProperty prop = m_propSet.get( org.apache.ws.resource.lifetime.v1_2.porttype.ScheduledResourceTerminationPortType.PROP_QNAME_CURRENT_TIME ); CurrentTimeDocument currTime = CurrentTimeDocument.Factory.newInstance(); currTime.setCurrentTime( Calendar.getInstance() ); prop.add( currTime ); prop.setCallback( new CurrentTimeCallback() ); - prop = m_propSet.get( ResourceLifetime1_2Constants.PROP_QNAME_TERMINATION_TIME ); + prop = m_propSet.get( org.apache.ws.resource.lifetime.v1_2.porttype.ScheduledResourceTerminationPortType.PROP_QNAME_TERMINATION_TIME ); TerminationTimeDocument termTime = TerminationTimeDocument.Factory.newInstance(); termTime.setNilTerminationTime(); #end Modified: incubator/apollo/trunk/src/templates/ScheduledResourceTerminationResource.txt Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/ScheduledResourceTerminationResource.txt?view=diff&rev=124422&p1=incubator/apollo/trunk/src/templates/ScheduledResourceTerminationResource.txt&r1=124421&p2=incubator/apollo/trunk/src/templates/ScheduledResourceTerminationResource.txt&r2=124422 ============================================================================== --- incubator/apollo/trunk/src/templates/ScheduledResourceTerminationResource.txt (original) +++ incubator/apollo/trunk/src/templates/ScheduledResourceTerminationResource.txt Thu Jan 6 11:28:02 2005 @@ -5,7 +5,7 @@ */ public void setTerminationTime( Calendar time ) { - XmlBeansResourcePropertyUtils.setDateTimePropertyValue( (XmlBeansResourceProperty) getResourcePropertySet().get( ResourceLifetime1_2Constants.PROP_QNAME_TERMINATION_TIME ), + XmlBeansResourcePropertyUtils.setDateTimePropertyValue( (XmlBeansResourceProperty) getResourcePropertySet().get( org.apache.ws.resource.lifetime.v1_2.porttype.ScheduledResourceTerminationPortType.PROP_QNAME_TERMINATION_TIME ), time ); } @@ -16,7 +16,7 @@ */ public Calendar getCurrentTime() { - return XmlBeansResourcePropertyUtils.getDateTimePropertyValue( (XmlBeansResourceProperty) m_propSet.get( ResourceLifetime1_2Constants.PROP_QNAME_CURRENT_TIME ) ); + return XmlBeansResourcePropertyUtils.getDateTimePropertyValue( (XmlBeansResourceProperty) m_propSet.get( org.apache.ws.resource.lifetime.v1_2.porttype.ScheduledResourceTerminationPortType.PROP_QNAME_CURRENT_TIME ) ); } @@ -27,5 +27,5 @@ */ public Calendar getTerminationTime() { - return XmlBeansResourcePropertyUtils.getDateTimePropertyValue( (XmlBeansResourceProperty) m_propSet.get( ResourceLifetime1_2Constants.PROP_QNAME_TERMINATION_TIME ) ); + return XmlBeansResourcePropertyUtils.getDateTimePropertyValue( (XmlBeansResourceProperty) m_propSet.get( org.apache.ws.resource.lifetime.v1_2.porttype.ScheduledResourceTerminationPortType.PROP_QNAME_TERMINATION_TIME ) ); } Modified: incubator/apollo/trunk/src/templates/Set.txt Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/Set.txt?view=diff&rev=124422&p1=incubator/apollo/trunk/src/templates/Set.txt&r1=124421&p2=incubator/apollo/trunk/src/templates/Set.txt&r2=124422 ============================================================================== --- incubator/apollo/trunk/src/templates/Set.txt (original) +++ incubator/apollo/trunk/src/templates/Set.txt Thu Jan 6 11:28:02 2005 @@ -5,7 +5,7 @@ * * @return DOCUMENT_ME */ - public SetResourcePropertiesResponseDocument setResourceProperties( SetResourcePropertiesDocument requestDoc ) + public org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.SetResourcePropertiesResponseDocument setResourceProperties( org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.SetResourcePropertiesDocument requestDoc ) { - return new SetResourcePropertiesProvider( getResourceContext( ) ).setResourceProperties( requestDoc ); + return new org.apache.ws.resource.properties.v1_2.porttype.impl.SetResourcePropertiesProvider( getResourceContext( ) ).setResourceProperties( requestDoc ); } Modified: incubator/apollo/trunk/src/templates/SetTerminationTime.txt Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/SetTerminationTime.txt?view=diff&rev=124422&p1=incubator/apollo/trunk/src/templates/SetTerminationTime.txt&r1=124421&p2=incubator/apollo/trunk/src/templates/SetTerminationTime.txt&r2=124422 ============================================================================== --- incubator/apollo/trunk/src/templates/SetTerminationTime.txt (original) +++ incubator/apollo/trunk/src/templates/SetTerminationTime.txt Thu Jan 6 11:28:02 2005 @@ -5,7 +5,7 @@ * * @return DOCUMENT_ME */ - public SetTerminationTimeResponseDocument setTerminationTime( SetTerminationTimeDocument requestDoc ) + public org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft01.SetTerminationTimeResponseDocument setTerminationTime( org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft01.SetTerminationTimeDocument requestDoc ) { - return new ScheduledResourceTerminationPortTypeImpl( getResourceContext( ) ).setTerminationTime( requestDoc ); + return new org.apache.ws.resource.lifetime.v1_2.porttype.impl.ScheduledResourceTerminationPortTypeImpl( getResourceContext( ) ).setTerminationTime( requestDoc ); } Modified: incubator/apollo/trunk/src/templates/deploy.vm Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/deploy.vm?view=diff&rev=124422&p1=incubator/apollo/trunk/src/templates/deploy.vm&r1=124421&p2=incubator/apollo/trunk/src/templates/deploy.vm&r2=124422 ============================================================================== --- incubator/apollo/trunk/src/templates/deploy.vm (original) +++ incubator/apollo/trunk/src/templates/deploy.vm Thu Jan 6 11:28:02 2005 @@ -1,11 +1,11 @@ -#set( $serviceName = $generated.ServiceName ) +#set( $endpointServiceName = $generated.EndpointServiceName ) #set( $wsdlName = $generated.wsdlName ) <?xml version="1.0"?> <deployment xmlns="http://xml.apache.org/axis/wsdd/"; xmlns:java="http://xml.apache.org/axis/wsdd/providers/java";> - <service name="$serviceName" provider="java:WSRF" style="document" use="literal"> + <service name="$endpointServiceName" provider="java:WSRF" style="document" use="literal"> <wsdlFile>/wsdl/$wsdlName</wsdlFile> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
