hivemind-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hls...@apache.org
Subject cvs commit: jakarta-hivemind project.properties build.xml
Date Tue, 01 Jun 2004 14:18:07 GMT
hlship      2004/06/01 07:18:07

  Modified:    src/documentation/content/xdocs links.ent filter.xml
                        site.xml
               common   version.properties
               .        build.xml
  Added:       common   dist.properties dist.xml
               .        project.properties
  Log:
  Create a dist module for generating distributions.
  
  Revision  Changes    Path
  1.5       +59 -57    jakarta-hivemind/src/documentation/content/xdocs/links.ent
  
  Index: links.ent
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/src/documentation/content/xdocs/links.ent,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- links.ent	28 May 2004 21:41:11 -0000	1.4
  +++ links.ent	1 Jun 2004 14:18:07 -0000	1.5
  @@ -18,122 +18,124 @@
   <!ENTITY projectroot ''>
   
   <!ENTITY apiroot '&projectroot;hivemind/apidocs/org/apache/hivemind'>
  +<!ENTITY apiroot-lib '&projectroot;hivemind-lib/apidocs/org/apache/hivemind/lib'>
  +
   <!ENTITY hivedoc '&projectroot;hivedocs'>
   
  -<!ENTITY api.ClassResolver '<link href="&apiroot;/ClassResolver.html"><code>ClassResolver</code></link>'>
  -<!ENTITY api.Element '<link href="&apiroot;/Element.html"><code>Element</code></link>'>
  -<!ENTITY api.InterceptorStack '<link href="&apiroot;/InterceptorStack.html"><code>InterceptorStack</code></link>'>
  -<!ENTITY api.Messages '<link href="&apiroot;/Messages.html"><code>Messages</code></link>'>
  -<!ENTITY api.Module '<link href="&apiroot;/Module.html"><code>Module</code></link>'>
  -<!ENTITY api.Registry '<link href="&apiroot;/Registry.html"><code>Registry</code></link>'>
  -<!ENTITY api.RegistryBuilder '<link href="&apiroot;/impl/RegistryBuilder.html"><code>RegistryBuilder</code></link>'>
  -<!ENTITY api.RegistryShutdownListener '<link href="&apiroot;/events/RegistryShutdownListener.html"><code>RegistryShutdownListener</code></link>'>
  -<!ENTITY api.Resource '<link href="&apiroot;/Resource.html"><code>Resource</code></link>'>
  -<!ENTITY api.ServiceImplementationFactory '<link href="&apiroot;/ServiceImplementationFactory.html"><code>ServiceImplementationFactory</code></link>'>
  -<!ENTITY api.ServiceInterceptorFactory '<link href="&apiroot;/ServiceInterceptorFactory.html"><code>ServiceInterceptorFactory</code></link>'>
  -<!ENTITY api.Translator '<link href="&apiroot;/schema/Translator.html"><code>Translator</code></link>'>
  -
  -<!ENTITY api.NameLookup '<link href="&apiroot;/lib/NameLookup.html"><code>NameLookup</code></link>'>
  -<!ENTITY api.RemoteExceptionCoordinator '<link href="&apiroot;/lib/RemoteExceptionCoordinator.html"><code>RemoteExceptionCoordinator</code></link>'>
  -<!ENTITY api.RemoteExceptionListener '<link href="&apiroot;/lib/RemoteExceptionListener.html"><code>RemoteExceptionListener</code></link>'>
  +<!ENTITY api.ClassResolver '<link href="&apiroot;/ClassResolver.html">ClassResolver</link>'>
  +<!ENTITY api.Element '<link href="&apiroot;/Element.html">Element</link>'>
  +<!ENTITY api.InterceptorStack '<link href="&apiroot;/InterceptorStack.html">InterceptorStack</link>'>
  +<!ENTITY api.Messages '<link href="&apiroot;/Messages.html">Messages</link>'>
  +<!ENTITY api.Module '<link href="&apiroot;/Module.html">Module</link>'>
  +<!ENTITY api.Registry '<link href="&apiroot;/Registry.html">Registry</link>'>
  +<!ENTITY api.RegistryBuilder '<link href="&apiroot;/impl/RegistryBuilder.html">RegistryBuilder</link>'>
  +<!ENTITY api.RegistryShutdownListener '<link href="&apiroot;/events/RegistryShutdownListener.html">RegistryShutdownListener</link>'>
  +<!ENTITY api.Resource '<link href="&apiroot;/Resource.html">Resource</link>'>
  +<!ENTITY api.ServiceImplementationFactory '<link href="&apiroot;/ServiceImplementationFactory.html">ServiceImplementationFactory</link>'>
  +<!ENTITY api.ServiceInterceptorFactory '<link href="&apiroot;/ServiceInterceptorFactory.html">ServiceInterceptorFactory</link>'>
  +<!ENTITY api.Translator '<link href="&apiroot;/schema/Translator.html">Translator</link>'>
  +
  +<!ENTITY api.NameLookup '<link href="&apiroot;/lib/NameLookup.html">NameLookup</link>'>
  +<!ENTITY api.RemoteExceptionCoordinator '<link href="&apiroot;/lib/RemoteExceptionCoordinator.html">RemoteExceptionCoordinator</link>'>
  +<!ENTITY api.RemoteExceptionListener '<link href="&apiroot;/lib/RemoteExceptionListener.html">RemoteExceptionListener</link>'>
   
   <!-- Note, these links CAN NOT currently be converted to site:descriptor#foo because
Forrest 0.5.1 doesn't
        understand the use of the '#' as an anchor. -->
   
  -<!ENTITY _module '<code>&lt;module&gt;</code>'>
  +<!ENTITY _module '&lt;module&gt;'>
   <!ENTITY module '<link href="&projectroot;descriptor.html#module">&_module;</link>'>
   
  -<!ENTITY _implementation '<code>&lt;implementation&gt;</code>'>
  +<!ENTITY _implementation '&lt;implementation&gt;'>
   <!ENTITY implementation '<link href="&projectroot;descriptor.html#implementation">&_implementation;</link>'>
   
  -<!ENTITY _configuration-point '<code>&lt;configuration-point&gt;</code>'>
  +<!ENTITY _configuration-point '&lt;configuration-point&gt;'>
   <!ENTITY configuration-point '<link href="&projectroot;descriptor.html#configuration-point">&_configuration-point;</link>'>
   
  -<!ENTITY _conversion '<code>&lt;conversion&gt;</code>'>
  +<!ENTITY _conversion '&lt;conversion&gt;'>
   <!ENTITY conversion '<link href="&projectroot;descriptor.html#conversion">&_conversion;</link>'>
   
  -<!ENTITY _map '<code>&lt;map&gt;</code>'>
  +<!ENTITY _map '&lt;map&gt;'>
   <!ENTITY map '<link href="&projectroot;descriptor.html#map">&_map;</link>'>
   
  -<!ENTITY _create-instance '<code>&lt;create-instance&gt;</code>'>
  +<!ENTITY _create-instance '&lt;create-instance&gt;'>
   <!ENTITY create-instance '<link href="&projectroot;descriptor.html#create-instance">&_create-instance;</link>'>
   
  -<!ENTITY _invoke-factory '<code>&lt;invoke-factory&gt;</code>'>
  +<!ENTITY _invoke-factory '&lt;invoke-factory&gt;'>
   <!ENTITY invoke-factory '<link href="&projectroot;descriptor.html#invoke-factory">&_invoke-factory;</link>'>
   
  -<!ENTITY _interceptor '<code>&lt;interceptor&gt;</code>'>
  +<!ENTITY _interceptor '&lt;interceptor&gt;'>
   <!ENTITY interceptor '<link href="&projectroot;descriptor.html#interceptor">&_interceptor;</link>'>
   
  -<!ENTITY _description '<code>&lt;description&gt;</code>'>
  +<!ENTITY _description '&lt;description&gt;'>
   <!ENTITY description '<link href="&projectroot;descriptor.html#description">&_description;</link>'>
   
  -<!ENTITY _contribution '<code>&lt;contribution&gt;</code>'>
  +<!ENTITY _contribution '&lt;contribution&gt;'>
   <!ENTITY contribution '<link href="&projectroot;descriptor.html#contribution">&_contribution;</link>'>
   
  -<!ENTITY _service-point '<code>&lt;service-point&gt;</code>'>
  +<!ENTITY _service-point '&lt;service-point&gt;'>
   <!ENTITY service-point '<link href="&projectroot;descriptor.html#service-point">&_service-point;</link>'>
   
  -<!ENTITY _schema '<code>&lt;schema&gt;</code>'>
  +<!ENTITY _schema '&lt;schema&gt;'>
   <!ENTITY schema '<link href="&projectroot;descriptor.html#schema">&_schema;</link>'>
   
  -<!ENTITY _parameters-schema '<code>&lt;parameters-schema&gt;</code>'>
  +<!ENTITY _parameters-schema '&lt;parameters-schema&gt;'>
   <!ENTITY parameters-schema '<link href="&projectroot;descriptor.html#schema">&_parameters-schema;</link>'>
   
  -<!ENTITY _element '<code>&lt;element&gt;</code>'>
  +<!ENTITY _element '&lt;element&gt;'>
   <!ENTITY element '<link href="&projectroot;descriptor.html#element">&_element;</link>'>
   
  -<!ENTITY _attribute '<code>&lt;attribute&gt;</code>'>
  +<!ENTITY _attribute '&lt;attribute&gt;'>
   <!ENTITY attribute '<link href="&projectroot;descriptor.html#attribute">&_attribute;</link>'>
   
  -<!ENTITY _rules '<code>&lt;rules&gt;</code>'>
  +<!ENTITY _rules '&lt;rules&gt;'>
   <!ENTITY rules '<link href="&projectroot;descriptor.html#rules">&_rules;</link>'>
   
  -<!ENTITY _sub-module '<code>&lt;sub-module&gt;</code>'>
  +<!ENTITY _sub-module '&lt;sub-module&gt;'>
   <!ENTITY sub-module '<link href="&projectroot;descriptor.html#sub-module">&_sub-module;</link>'>
   
   <!-- XML entities for the XML processing rules (documented seperately from the rest).
-->
   
  -<!ENTITY _create-object '<code>&lt;create-object&gt;</code>'>
  +<!ENTITY _create-object '&lt;create-object&gt;'>
   <!ENTITY create-object '<link href="&projectroot;rules.html#create-object">&_create-object;</link>'>
   
  -<!ENTITY _invoke-parent '<code>&lt;invoke-parent&gt;</code>'>
  +<!ENTITY _invoke-parent '&lt;invoke-parent&gt;'>
   <!ENTITY invoke-parent '<link href="&projectroot;rules.html#invoke-parent">&_invoke-parent;</link>'>
   
  -<!ENTITY _read-attribute '<code>&lt;read-attribute&gt;</code>'>
  +<!ENTITY _read-attribute '&lt;read-attribute&gt;'>
   <!ENTITY read-attribute '<link href="&projectroot;rules.html#read-attribute">&_read-attribute;</link>'>
   
  -<!ENTITY _read-content '<code>&lt;read-content&gt;</code>'>
  +<!ENTITY _read-content '&lt;read-content&gt;'>
   <!ENTITY read-content '<link href="&projectroot;rules.html#read-content">&_read-content;</link>'>
   
   
  -<!ENTITY _set-module '<code>&lt;set-module&gt;</code>'>
  +<!ENTITY _set-module '&lt;set-module&gt;'>
   <!ENTITY set-module '<link href="&projectroot;rules.html#set-module">&_set-module;</link>'>
   
  -<!ENTITY _set-parent '<code>&lt;set-parent&gt;</code>'>
  +<!ENTITY _set-parent '&lt;set-parent&gt;'>
   <!ENTITY set-parent '<link href="&projectroot;rules.html#set-parent">&_set-parent;</link>'>
   
  -<!ENTITY _set-property '<code>&lt;set-property&gt;</code>'>
  +<!ENTITY _set-property '&lt;set-property&gt;'>
   <!ENTITY set-property '<link href="&projectroot;rules.html#set-property">&_set-property;</link>'>
   
  -<!ENTITY _custom '<code>&lt;custom&gt;</code>'>
  +<!ENTITY _custom '&lt;custom&gt;'>
   <!ENTITY custom '<link href="&projectroot;rules.html#custom">&_custom;</link>'>
   
  -<!ENTITY _push-attribute '<code>&lt;push-attribute&gt;</code>'>
  +<!ENTITY _push-attribute '&lt;push-attribute&gt;'>
   <!ENTITY push-attribute '<link href="&projectroot;rules.html#push-attribute">&_push-attribute;</link>'>
   
   <!-- Entities for common services and configurations. -->
   
  -<!ENTITY hivemind.ApplicationDefaults '<link href="site:hivemind.ApplicationDefaults"><code>hivemind.ApplicationDefaults</code></link>'>
  -<!ENTITY hivemind.BuilderFactory '<link href="site:hivemind.BuilderFactory"><code>hivemind.BuilderFactory</code></link>'>
  -<!ENTITY hivemind.EagerLoad '<link href="site:hivemind.EagerLoad"><code>hivemind.EagerLoad</code></link>'>
  -<!ENTITY hivemind.FactoryDefaults '<link href="site:hivemind.FactoryDefaults"><code>hivemind.FactoryDefaults</code></link>'>
  -<!ENTITY hivemind.LoggingInterceptor '<link href="site:hivemind.LoggingInterceptor"><code>hivemind.LoggingInterceptor</code></link>'>
  -<!ENTITY hivemind.ServiceModels '<code>hivemind.ServiceModels</code>'>
  -<!ENTITY hivemind.SymbolSources '<link href="site:hivemind.SymbolSources"><code>hivemind.SymbolSources</code></link>'>
  -<!ENTITY hivemind.ThreadEventNotifier '<code>hivemind.ThreadEventNotifier</code>'>
  -<!ENTITY hivemind.ThreadLocalStorage '<link href="site:hivemind.ThreadLocalStorage"><code>hivemind.ThreadLocalStorage</code></link>'>
  -<!ENTITY hivemind.Translators '<link href="site:hivemind.Translators"><code>hivemind.Translators</code></link>'>
  -
  -<!ENTITY hivemind.lib.EJBProxyFactory '<link href="site:hivemind.lib.EJBProxyFactory"><code>hivemind.lib.EJBProxyFactory</code></link>'>
  -<!ENTITY hivemind.lib.NameLookup '<link href="site:hivemind.lib.NameLookup"><code>hivemind.lib.NameLookup</code></link>'>
  -<!ENTITY hivemind.lib.RemoteExceptionCoordinator '<link href="site:hivemind.lib.RemoteExceptionCoordinator">hivemind.lib.RemoteExceptionCoordinator</code></link>'>
  \ No newline at end of file
  +<!ENTITY hivemind.ApplicationDefaults '<link href="site:hivemind.ApplicationDefaults">hivemind.ApplicationDefaults</link>'>
  +<!ENTITY hivemind.BuilderFactory '<link href="site:hivemind.BuilderFactory">hivemind.BuilderFactory</link>'>
  +<!ENTITY hivemind.EagerLoad '<link href="site:hivemind.EagerLoad">hivemind.EagerLoad</link>'>
  +<!ENTITY hivemind.FactoryDefaults '<link href="site:hivemind.FactoryDefaults">hivemind.FactoryDefaults</link>'>
  +<!ENTITY hivemind.LoggingInterceptor '<link href="site:hivemind.LoggingInterceptor">hivemind.LoggingInterceptor</link>'>
  +<!ENTITY hivemind.ServiceModels 'hivemind.ServiceModels'>
  +<!ENTITY hivemind.SymbolSources '<link href="site:hivemind.SymbolSources">hivemind.SymbolSources</link>'>
  +<!ENTITY hivemind.ThreadEventNotifier 'hivemind.ThreadEventNotifier'>
  +<!ENTITY hivemind.ThreadLocalStorage '<link href="site:hivemind.ThreadLocalStorage">hivemind.ThreadLocalStorage</link>'>
  +<!ENTITY hivemind.Translators '<link href="site:hivemind.Translators">hivemind.Translators</link>'>
  +
  +<!ENTITY hivemind.lib.EJBProxyFactory '<link href="site:hivemind.lib.EJBProxyFactory">hivemind.lib.EJBProxyFactory</link>'>
  +<!ENTITY hivemind.lib.NameLookup '<link href="site:hivemind.lib.NameLookup">hivemind.lib.NameLookup</link>'>
  +<!ENTITY hivemind.lib.RemoteExceptionCoordinator '<link href="site:hivemind.lib.RemoteExceptionCoordinator">hivemind.lib.RemoteExceptionCoordinator</link>'>
  \ No newline at end of file
  
  
  
  1.2       +2 -2      jakarta-hivemind/src/documentation/content/xdocs/filter.xml
  
  Index: filter.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/src/documentation/content/xdocs/filter.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- filter.xml	26 May 2004 16:58:43 -0000	1.1
  +++ filter.xml	1 Jun 2004 14:18:07 -0000	1.2
  @@ -35,7 +35,7 @@
   			initialized, and will shutdown the Registry when the containing
   			application is undeployed.</p>
   		<p>Each request will be terminated with a call to the <link
  -			href="&apiroot;Registry.html#cleanupThread()">Registry's cleanupThread()
  +			href="&apiroot;/Registry.html#cleanupThread()">Registry's cleanupThread()
   			method</link>, which will cleanup any thread-local values, including
   			service implementations that are bound to the current thread.</p>
   		<p>The HiveMindFilter class includes a static method for accessing the
  
  
  
  1.6       +2 -2      jakarta-hivemind/src/documentation/content/xdocs/site.xml
  
  Index: site.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/src/documentation/content/xdocs/site.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- site.xml	28 May 2004 21:41:11 -0000	1.5
  +++ site.xml	1 Jun 2004 14:18:07 -0000	1.6
  @@ -93,10 +93,10 @@
   	<hivemind.lib label="Module: hivemind.lib" href="hivemind-lib/">
   	
   		<services label="Services">
  -		
   			<hivemind.lib.EJBProxyFactory label="EJBProxyFactory" href="EJBProxyFactory.html"/>
   			<hivemind.lib.NameLookup label="NameLookup" href="NameLookup.html"/>
   			<hivemind.lib.RemoteExceptionCoordinator label="RemoteExceptionCoordinator" href="RemoteExceptionCoordinator.html"/>
  +			<hivemind.lib.SpringLookupFactory label="SpringLookupFactory" href="SpringLookupFactory.html"/>
   		</services>	
   		
   		<reports label="Reports">
  
  
  
  1.2       +2 -2      jakarta-hivemind/common/version.properties
  
  Index: version.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/common/version.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- version.properties	20 May 2004 23:57:44 -0000	1.1
  +++ version.properties	1 Jun 2004 14:18:07 -0000	1.2
  @@ -17,4 +17,4 @@
   # Version of project; incorporated into the names of
   # archives and distributions.
   
  -project.version=1.0.beta-1
  +project.version=1.0.beta-1-snapshot
  
  
  
  1.1                  jakarta-hivemind/common/dist.properties
  
  Index: dist.properties
  ===================================================================
  # $Id: dist.properties,v 1.1 2004/06/01 14:18:07 hlship Exp $
  
  dist.dir=${target.dir}/dist
  dist.base.name=${dist.name}-${project.version}
  dist.basefile=${dist.dir}/${dist.base.name}
  dist.docs.file=${dist.base.name}-docs.tar.gz
  
  dist.install.dir=${dist.install.user}@${dist.install.host}:${dist.install.path}
  
  dist.install.docs.host=${dist.install.host}
  dist.install.docs.user=${dist.install.user}
  
  dist.install.docs.dir=${dist.install.docs.user}@${dist.install.docs.host}:${dist.install.docs.path}
  
  
  
  1.1                  jakarta-hivemind/common/dist.xml
  
  Index: dist.xml
  ===================================================================
  <?xml version="1.0"?>
  <!-- $Id: dist.xml,v 1.1 2004/06/01 14:18:07 hlship Exp $ -->
  <!-- 
     Copyright 2004 The Apache Software Foundation
  
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
     You may obtain a copy of the License at
  
         http://www.apache.org/licenses/LICENSE-2.0
  
     Unless required by applicable law or agreed to in writing, software
     distributed under the License is distributed on an "AS IS" BASIS,
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
  -->
  <project name="dist">
  	
  	<property file="${basedir}/project.properties"/>
  	<property file="${common.dir}/dist.properties"/>
  	
  	<!-- This will be here until we add some new taskdefs and typedefs to simplify this.
-->
  	
  	<target name="dist" description="Build a distribution." depends="clean,install,site,dist-build"/>
  	
  	<target name="dist-build" description="Constructs final distribution files.">
  		<mkdir dir="${dist.dir}"/>
  		
  		<fail unless="dist.name"
  				message="You must provide a value for property property dist.name."/>
  				
  		<announce message="Assembling binary/src distribution (.tar.gz format) ..."/>
  		
  		<tar destfile="${dist.basefile}.tar.gz"
  			compression="gzip">
  						
  			<tarfileset id="dist.src.set" dir="." prefix="${dist.base.name}">
  				<exclude name="**/target/**"/>
  				<exclude name="target/**"/>
  				<exclude name="ext-package/**"/>
  				
  				<!-- These are all related to Eclipse. -->
  				<exclude name="bin/**"/>
  				<exclude name=".*"/>
  				
  				<!-- These are left around by PaintShopPro and Windows Explorer -->
  				
  				<exclude name="**/Thumbs.db"/>
  				<exclude name="**/pspbrwse.jbf"/>
  			</tarfileset>
  			
  			<!-- Pick up the packaged libraries. -->
  			
  			<tarfileset id="dist.bin.set" dir="${target.dir}" prefix="${dist.base.name}">
  				<include name="*.jar"/>
  			</tarfileset>		
  		</tar>
  		
  		<announce message="Assembling binary/src distribution (.zip format) ..."/>
  		
  		<zip destfile="${dist.basefile}.zip">						
  			<zipfileset refid="dist.src.set"/>
  			<zipfileset refid="dist.bin.set"/>	
  		</zip>		
  		
  		<announce message="Assembling documentation distribution ..."/>
  		<tar destfile="${dist.dir}/${dist.docs.file}" compression="gzip">
  			<tarfileset dir="${project.docs.target.dir}"/>
  		</tar>
  		
  		<checksum fileext=".md5">
  		  <fileset dir="${dist.dir}">
  		  	<include name="*.zip"/>
  		  	<include name="*.gz"/>
  		  </fileset>
  		</checksum>
  	</target>
  
  	
  	<target name="-check-password" unless="password">
  	
  		<input message="Please provide password for installation:" addproperty="password"/>
  
  	</target>
  	
  	<target name="install-docs" depends="-check-password"
  			description="Copies the documentation to a directory and unpacks it remotely.">
  
  		<!-- TODO: Check for missing properties. -->
  		
  		<announce message="Installing documentation distribution to ${dist.install.docs.dir}
..."/>
  		
  		<scp
  				file="${dist.dir}/${dist.docs.file}" 
  				todir="${dist.install.docs.dir}"
  				password="${password}"
  				trust="yes"/>
  		
  		<sshexec 
  			username="${dist.install.docs.user}"
  			host="${dist.install.docs.host}"
  			command="cd ${dist.dist.install.docs.path} ; tar xzvf ${dist.docs.file} ; rm ${dist.docs.file}"
  			password="${password}"
  			trust="yes"/>
  
  	</target>
  	
  	<target name="install-dist" depends="-check-password"
  		description="Install current distributions.">
  		
  		<announce message="Installing distributions to ${dist.install.dir} ..."/>
  		
  		<scp todir="${dist.install.dir}"
  				password="${password}"
  				trust="yes">
  			<fileset dir="${dist.dir}"/>
  		</scp>
  	</target>
  	
  </project>
  
  
  
  1.6       +6 -108    jakarta-hivemind/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/build.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- build.xml	28 May 2004 21:41:11 -0000	1.5
  +++ build.xml	1 Jun 2004 14:18:07 -0000	1.6
  @@ -27,119 +27,17 @@
   	<import file="common/project.xml"/>
   	<import file="common/license-report.xml"/>
   	<import file="common/hivedoc-report.xml"/>
  +	<import file="common/dist.xml"/>
   
   	<target name="run-reports">
   		<license-report/>
   		<hivedoc-report/>
   	</target>
   	
  -	<!-- This will be here until we add some new taskdefs and typedefs to simplify this.
-->
  -	
  -	<target name="dist" description="Build a distribution.">
  -		<antcall target="clean install site"/>
  -		<antcall target="dist-build"/>
  -	</target>
  -
  -	<property name="dist.dir" value="${target.dir}/dist"/>
  -	<property name="dist.base.name" value="hivemind-${project.version}"/>
  -	<property name="base.distfile" value="${dist.dir}/${dist.base.name}"/>
  -	<property name="dist.docs.file" value="${dist.base.name}-docs.tar.gz"/>
  -	
  -	<target name="dist-build" description="Constructs final distribution files.">
  -		<mkdir dir="${dist.dir}"/>
  -		
  -		<announce message="Assembling binary/src distribution (.tar.gz format) ..."/>
  -		
  -		<tar destfile="${base.distfile}.tar.gz"
  -			compression="gzip">
  -						
  -			<tarfileset id="dist.src.set" dir="." prefix="${dist.base.name}">
  -				<exclude name="**/target/**"/>
  -				<exclude name="target/**"/>
  -				<exclude name="ext-package/**"/>
  -				
  -				<!-- These are all related to Eclipse. -->
  -				<exclude name="bin/**"/>
  -				<exclude name=".*"/>
  -				
  -				<!-- These are left around by PaintShopPro and Windows Explorer -->
  -				
  -				<exclude name="**/Thumbs.db"/>
  -				<exclude name="**/pspbrwse.jbf"/>
  -			</tarfileset>
  -			
  -			<!-- Pick up the packaged libraries. -->
  -			
  -			<tarfileset id="dist.bin.set" dir="${target.dir}" prefix="${dist.base.name}">
  -				<include name="*.jar"/>
  -			</tarfileset>		
  -		</tar>
  -		
  -		<announce message="Assembling binary/src distribution (.zip format) ..."/>
  -		
  -		<zip destfile="${base.distfile}.zip">						
  -			<zipfileset refid="dist.src.set"/>
  -			<zipfileset refid="dist.bin.set"/>	
  -		</zip>		
  -		
  -		<announce message="Assembling documentation distribution ..."/>
  -		<tar destfile="${dist.dir}/${dist.docs.file}" compression="gzip">
  -			<tarfileset dir="${project.docs.target.dir}"/>
  -		</tar>
  -		
  -		<checksum fileext=".md5">
  -		  <fileset dir="${dist.dir}">
  -		  	<include name="*.zip"/>
  -		  	<include name="*.gz"/>
  -		  </fileset>
  -		</checksum>
  -	</target>
  -	
  -	<property name="install.docs.host" value="jakarta.apache.org"/>
  -	<property name="install.docs.path" value="/www/jakarta.apache.org/hivemind/"/>
  -	<property name="install.docs.user" value="hlship"/>
  -	<property name="install.docs.dir" value="${install.docs.user}@${install.docs.host}:${install.docs.path}"/>
  -	
  -	<property name="install.dist.host" value="${install.docs.host}"/>
  -	<property name="install.dist.user" value="${install.docs.user}"/>
  -	<property name="install.dist.path" value="public_html/hivemind"/>
  -	<property name="install.dist.dir" value="${install.dist.user}@${install.dist.host}:${install.dist.path}"/>
  -	
  -	<target name="-check-password">
  -		<fail unless="password"
  -				message="You must specify -Dpassword=... to use this target."/>
  +	<target name="fast-site" depends="copy-documentation-to-composite"
  +		description="Generate site documentation from XDocs only, omitting reports.">
  +		<reinvoke-ant target="copy-documentation-to-composite"/>
  +		<antcall target="run-forrest"/>
   	</target>
   	
  -	<target name="install-docs" depends="-check-password"
  -			description="Copies the documentation to a directory and unpacks it remotely.">
  -
  -		<announce message="Installing documentation distribution to ${install.docs.dir} ..."/>
  -		
  -		<scp
  -				file="${dist.dir}/${dist.docs.file}" 
  -				todir="${install.docs.dir}"
  -				password="${password}"
  -				trust="yes"/>
  -		
  -		<sshexec 
  -			username="${install.docs.user}"
  -			host="${install.docs.host}"
  -			command="cd ${install.docs.path} ; tar xzvf ${dist.docs.file} ; rm ${dist.docs.file}"
  -			password="${password}"
  -			trust="yes"/>
  -
  -	</target>
  -	
  -	<target name="install-dist" depends="-check-password"
  -		description="Install current distributions.">
  -		
  -		<announce message="Installing distributions to ${install.dist.dir} ..."/>
  -		
  -		<scp todir="${install.dist.dir}"
  -				password="${password}"
  -				trust="yes">
  -			<fileset dir="${dist.dir}"/>
  -		</scp>
  -	</target>
  -
   </project>
  
  
  
  1.10      +6 -30     jakarta-hivemind/project.properties
  
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: hivemind-cvs-unsubscribe@jakarta.apache.org
For additional commands, e-mail: hivemind-cvs-help@jakarta.apache.org


Mime
View raw message