Author: scamp Date: Fri Jan 7 10:49:11 2005 New Revision: 124558 URL: http://svn.apache.org/viewcvs?view=rev&rev=124558 Log: updated templates to remove unnecessary imports.
updated jndi-config to remove entries for examples Modified: incubator/apollo/trunk/src/templates/AbstractResource.vm incubator/apollo/trunk/src/templates/AbstractService.vm incubator/apollo/trunk/src/templates/CustomOperationsPortType.vm incubator/apollo/trunk/src/templates/PropertiesResource.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/Service.vm incubator/apollo/trunk/src/templates/build.xml.vm incubator/apollo/trunk/src/webapp/WEB-INF/classes/jndi-config.xml Modified: incubator/apollo/trunk/src/templates/AbstractResource.vm Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/AbstractResource.vm?view=diff&rev=124558&p1=incubator/apollo/trunk/src/templates/AbstractResource.vm&r1=124557&p2=incubator/apollo/trunk/src/templates/AbstractResource.vm&r2=124558 ============================================================================== --- incubator/apollo/trunk/src/templates/AbstractResource.vm (original) +++ incubator/apollo/trunk/src/templates/AbstractResource.vm Fri Jan 7 10:49:11 2005 @@ -7,21 +7,6 @@ package $package; -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.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; -import org.apache.ws.resource.properties.ResourcePropertySet; -import org.apache.ws.resource.properties.XmlBeansResourcePropertyUtils; -import org.apache.ws.resource.properties.impl.XmlBeansResourceProperty; -import org.apache.ws.resource.properties.impl.XmlBeansResourcePropertySet; -import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft01.CurrentTimeDocument; -import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft01.TerminationTimeDocument; - -import java.util.Calendar; /** * An abstract $serviceName WS-Resource. @@ -41,7 +26,7 @@ /** * The ResourceProperty Set containing the resource props. */ - protected ResourcePropertySet m_propSet; + protected org.apache.ws.resource.properties.ResourcePropertySet m_propSet; #end #parse( "templates/ResourceIntf.vm" ) Modified: incubator/apollo/trunk/src/templates/AbstractService.vm Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/AbstractService.vm?view=diff&rev=124558&p1=incubator/apollo/trunk/src/templates/AbstractService.vm&r1=124557&p2=incubator/apollo/trunk/src/templates/AbstractService.vm&r2=124558 ============================================================================== --- incubator/apollo/trunk/src/templates/AbstractService.vm (original) +++ incubator/apollo/trunk/src/templates/AbstractService.vm Fri Jan 7 10:49:11 2005 @@ -13,8 +13,6 @@ import org.apache.ws.resource.handler.WsrfService; import org.apache.ws.resource.handler.ServiceSoapMethodNameMap; import javax.xml.namespace.QName; -import java.util.Map; -import java.util.HashMap; /** * This class should be generated on every "generation" against the WSDL. Modified: incubator/apollo/trunk/src/templates/CustomOperationsPortType.vm Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/CustomOperationsPortType.vm?view=diff&rev=124558&p1=incubator/apollo/trunk/src/templates/CustomOperationsPortType.vm&r1=124557&p2=incubator/apollo/trunk/src/templates/CustomOperationsPortType.vm&r2=124558 ============================================================================== --- incubator/apollo/trunk/src/templates/CustomOperationsPortType.vm (original) +++ incubator/apollo/trunk/src/templates/CustomOperationsPortType.vm Fri Jan 7 10:49:11 2005 @@ -4,8 +4,6 @@ package $package; -import org.apache.xmlbeans.XmlObject; - /** * Custom operations portType. * Modified: incubator/apollo/trunk/src/templates/PropertiesResource.txt Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/PropertiesResource.txt?view=diff&rev=124558&p1=incubator/apollo/trunk/src/templates/PropertiesResource.txt&r1=124557&p2=incubator/apollo/trunk/src/templates/PropertiesResource.txt&r2=124558 ============================================================================== --- incubator/apollo/trunk/src/templates/PropertiesResource.txt (original) +++ incubator/apollo/trunk/src/templates/PropertiesResource.txt Fri Jan 7 10:49:11 2005 @@ -1,7 +1,7 @@ /** * @see org.apache.ws.resource.PropertiesResource#setResourcePropertySet(org.apache.ws.resource.properties.ResourcePropertySet) */ - public void setResourcePropertySet( ResourcePropertySet propSet ) + public void setResourcePropertySet( org.apache.ws.resource.properties.ResourcePropertySet propSet ) { m_propSet = propSet; } @@ -9,7 +9,7 @@ /** * @see org.apache.ws.resource.PropertiesResource#getResourcePropertySet() */ - public ResourcePropertySet getResourcePropertySet() + public org.apache.ws.resource.properties.ResourcePropertySet getResourcePropertySet() { return m_propSet; } Modified: incubator/apollo/trunk/src/templates/Resource.vm Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/Resource.vm?view=diff&rev=124558&p1=incubator/apollo/trunk/src/templates/Resource.vm&r1=124557&p2=incubator/apollo/trunk/src/templates/Resource.vm&r2=124558 ============================================================================== --- incubator/apollo/trunk/src/templates/Resource.vm (original) +++ incubator/apollo/trunk/src/templates/Resource.vm Fri Jan 7 10:49:11 2005 @@ -3,18 +3,6 @@ package $package; -import org.apache.ws.resource.example.filesystem.BackupFrequencyDocument; -import org.apache.ws.resource.example.filesystem.CommentDocument; -import org.apache.ws.resource.example.filesystem.DeviceSpecialFileDocument; -import org.apache.ws.resource.example.filesystem.FileSystemPropertiesDocument; -import org.apache.ws.resource.example.filesystem.FsckPassNumberDocument; -import org.apache.ws.resource.example.filesystem.MountPointDirectoryDocument; -import org.apache.ws.resource.example.filesystem.OptionsDocument; -import org.apache.ws.resource.example.filesystem.TypeDocument; -import org.apache.ws.resource.properties.ResourceProperty; - -import java.util.List; - /** * A $serviceName WS-Resource. * <p/> Modified: incubator/apollo/trunk/src/templates/ResourceIntf.vm Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/ResourceIntf.vm?view=diff&rev=124558&p1=incubator/apollo/trunk/src/templates/ResourceIntf.vm&r1=124557&p2=incubator/apollo/trunk/src/templates/ResourceIntf.vm&r2=124558 ============================================================================== --- incubator/apollo/trunk/src/templates/ResourceIntf.vm (original) +++ incubator/apollo/trunk/src/templates/ResourceIntf.vm Fri Jan 7 10:49:11 2005 @@ -43,19 +43,19 @@ $propDoc propsDoc = ${propDoc}.Factory.newInstance(); #if($generated.hasProperties()) - m_propSet = new XmlBeansResourcePropertySet( propsDoc ); + m_propSet = new org.apache.ws.resource.properties.impl.XmlBeansResourcePropertySet( propsDoc ); #end //todo init resource properties and setup callbacks. #if($generated.implementsResourceCapability($qnames.scheduledResourceTermination)) - 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() ); + org.apache.ws.resource.properties.ResourceProperty prop = m_propSet.get( org.apache.ws.resource.lifetime.v1_2.porttype.ScheduledResourceTerminationPortType.PROP_QNAME_CURRENT_TIME ); + org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft01.CurrentTimeDocument currTime = org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft01.CurrentTimeDocument.Factory.newInstance(); + currTime.setCurrentTime( java.util.Calendar.getInstance() ); prop.add( currTime ); - prop.setCallback( new CurrentTimeCallback() ); + prop.setCallback( new org.apache.ws.resource.lifetime.callback.CurrentTimeCallback() ); prop = m_propSet.get( org.apache.ws.resource.lifetime.v1_2.porttype.ScheduledResourceTerminationPortType.PROP_QNAME_TERMINATION_TIME ); - TerminationTimeDocument termTime = TerminationTimeDocument.Factory.newInstance(); + org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft01.TerminationTimeDocument termTime = org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft01.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=124558&p1=incubator/apollo/trunk/src/templates/ScheduledResourceTerminationResource.txt&r1=124557&p2=incubator/apollo/trunk/src/templates/ScheduledResourceTerminationResource.txt&r2=124558 ============================================================================== --- incubator/apollo/trunk/src/templates/ScheduledResourceTerminationResource.txt (original) +++ incubator/apollo/trunk/src/templates/ScheduledResourceTerminationResource.txt Fri Jan 7 10:49:11 2005 @@ -3,20 +3,20 @@ * * @param time DOCUMENT_ME */ - public void setTerminationTime( Calendar time ) + public void setTerminationTime( java.util.Calendar time ) { - XmlBeansResourcePropertyUtils.setDateTimePropertyValue( (XmlBeansResourceProperty) getResourcePropertySet().get( org.apache.ws.resource.lifetime.v1_2.porttype.ScheduledResourceTerminationPortType.PROP_QNAME_TERMINATION_TIME ), + org.apache.ws.resource.properties.XmlBeansResourcePropertyUtils.setDateTimePropertyValue( (org.apache.ws.resource.properties.impl.XmlBeansResourceProperty) getResourcePropertySet().get( org.apache.ws.resource.lifetime.v1_2.porttype.ScheduledResourceTerminationPortType.PROP_QNAME_TERMINATION_TIME ), time ); } /** * Returns the current time from the prop set. * - * @return Calendar + * @return java.util.Calendar */ - public Calendar getCurrentTime() + public java.util.Calendar getCurrentTime() { - return XmlBeansResourcePropertyUtils.getDateTimePropertyValue( (XmlBeansResourceProperty) m_propSet.get( org.apache.ws.resource.lifetime.v1_2.porttype.ScheduledResourceTerminationPortType.PROP_QNAME_CURRENT_TIME ) ); + return org.apache.ws.resource.properties.XmlBeansResourcePropertyUtils.getDateTimePropertyValue( (org.apache.ws.resource.properties.impl.XmlBeansResourceProperty) m_propSet.get( org.apache.ws.resource.lifetime.v1_2.porttype.ScheduledResourceTerminationPortType.PROP_QNAME_CURRENT_TIME ) ); } @@ -25,7 +25,7 @@ * * @return DOCUMENT_ME */ - public Calendar getTerminationTime() + public java.util.Calendar getTerminationTime() { - return XmlBeansResourcePropertyUtils.getDateTimePropertyValue( (XmlBeansResourceProperty) m_propSet.get( org.apache.ws.resource.lifetime.v1_2.porttype.ScheduledResourceTerminationPortType.PROP_QNAME_TERMINATION_TIME ) ); + return org.apache.ws.resource.properties.XmlBeansResourcePropertyUtils.getDateTimePropertyValue( (org.apache.ws.resource.properties.impl.XmlBeansResourceProperty) m_propSet.get( org.apache.ws.resource.lifetime.v1_2.porttype.ScheduledResourceTerminationPortType.PROP_QNAME_TERMINATION_TIME ) ); } Modified: incubator/apollo/trunk/src/templates/Service.vm Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/Service.vm?view=diff&rev=124558&p1=incubator/apollo/trunk/src/templates/Service.vm&r1=124557&p2=incubator/apollo/trunk/src/templates/Service.vm&r2=124558 ============================================================================== --- incubator/apollo/trunk/src/templates/Service.vm (original) +++ incubator/apollo/trunk/src/templates/Service.vm Fri Jan 7 10:49:11 2005 @@ -27,7 +27,7 @@ private ResourceContext m_resourceContext; /** - * Creates a new [EMAIL PROTECTED] FileSystemService} object. + * Creates a new [EMAIL PROTECTED] ${serviceName}Service } object. * * @param resourceContext DOCUMENT_ME */ @@ -53,7 +53,7 @@ //todo implement try { - return XmlObject.Factory.parse( "<MountResponse />" ); + return XmlObject.Factory.parse( "<foo />" ); } catch ( XmlException xe ) { Modified: incubator/apollo/trunk/src/templates/build.xml.vm Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/build.xml.vm?view=diff&rev=124558&p1=incubator/apollo/trunk/src/templates/build.xml.vm&r1=124557&p2=incubator/apollo/trunk/src/templates/build.xml.vm&r2=124558 ============================================================================== --- incubator/apollo/trunk/src/templates/build.xml.vm (original) +++ incubator/apollo/trunk/src/templates/build.xml.vm Fri Jan 7 10:49:11 2005 @@ -7,7 +7,7 @@ #set( $serviceName = $generated.ServiceName ) <?xml version="1.0"?> -<project name="filesystem_example" default="usage" basedir="."> +<project name="${serviceName}_buildfile" default="usage" basedir="."> <property environment="env" /> <property file="build.properties" /> Modified: incubator/apollo/trunk/src/webapp/WEB-INF/classes/jndi-config.xml Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/webapp/WEB-INF/classes/jndi-config.xml?view=diff&rev=124558&p1=incubator/apollo/trunk/src/webapp/WEB-INF/classes/jndi-config.xml&r1=124557&p2=incubator/apollo/trunk/src/webapp/WEB-INF/classes/jndi-config.xml&r2=124558 ============================================================================== --- incubator/apollo/trunk/src/webapp/WEB-INF/classes/jndi-config.xml (original) +++ incubator/apollo/trunk/src/webapp/WEB-INF/classes/jndi-config.xml Fri Jan 7 10:49:11 2005 @@ -28,47 +28,5 @@ </global> - <service name="filesystem"> - <resource name="home" type="example.filesystem.FileSystemHome"> - <resourceParams> - <parameter> - <name>serviceClassName</name> - <value>example.filesystem.FileSystemService</value> - </parameter> - <parameter> - <name>resourceClassName</name> - <value>example.filesystem.FileSystemResource</value> - </parameter> - <parameter> - <name>wsdlTargetNamespace</name> - <value>http://ws.apache.org/resource/example/filesystem</value> - </parameter> - <parameter> - <name>resourceKeyName</name> - <value>{http://ws.apache.org/resource/example/filesystem}ResourceId</value> - </parameter> - </resourceParams> - </resource> - </service> - - <service name="sysprops"> - <resource name="home" type="example.sysprops.JavaSysPropsHome"> - <resourceParams> - <parameter> - <name>serviceClassName</name> - <value>example.sysprops.JavaSysPropsService</value> - </parameter> - <parameter> - <name>resourceClassName</name> - <value>example.sysprops.JavaSysPropsResource</value> - </parameter> - <parameter> - <name>wsdlTargetNamespace</name> - <value>http://ws.apache.org/resource/example/sysprops</value> - </parameter> - </resourceParams> - </resource> - </service> - </jndiConfig> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
