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/src/xsl hivemind.xsl
Date Fri, 28 May 2004 21:41:11 GMT
hlship      2004/05/28 14:41:11

  Modified:    common   javadoc-report.xml clover-report.xml
                        common.properties jar-module.xml license-report.xml
                        project.xml clover.properties forrest.xml
               src/documentation/content/xdocs site.xml links.ent
               src/documentation/conf cli.xconf
               .        build.xml
               src/xsl  hivemind.xsl
  Added:       framework/src/descriptor hivemind-tasks.properties
               common   hivedoc-report.properties hivedoc-report.xml
               src/documentation/content/xdocs downloads.xml
  Log:
  Finish HiveDoc report output.
  Optimize documentation build to minimize amount of copying.
  Add targets for building and deploying distributions and documentation.
  
  Revision  Changes    Path
  1.1                  jakarta-hivemind/framework/src/descriptor/hivemind-tasks.properties
  
  Index: hivemind-tasks.properties
  ===================================================================
  # 
  
  constructregistry=org.apache.hivemind.ant.ConstructRegistry
  manifestclasspath=org.apache.hivemind.ant.ManifestClassPath
  
  
  1.2       +1 -4      jakarta-hivemind/common/javadoc-report.xml
  
  Index: javadoc-report.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/common/javadoc-report.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- javadoc-report.xml	27 May 2004 15:28:22 -0000	1.1
  +++ javadoc-report.xml	28 May 2004 21:41:11 -0000	1.2
  @@ -22,9 +22,6 @@
   		<sequential>
   			<announce message="Running JavaDoc Report ..."/>
   			<antcall target="javadoc"/>
  -			<copy todir="${root.forrest.composite.dir}/content/${module.name}/apidocs">
  -				<fileset dir="${javadoc.target.dir}"/>
  -			</copy>
   			<add-report-to-menu element="javadoc-report" label="JavaDoc"
   				file="apidocs/index.html"/>
   		</sequential>
  
  
  
  1.2       +1 -1      jakarta-hivemind/common/clover-report.xml
  
  Index: clover-report.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/common/clover-report.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- clover-report.xml	28 May 2004 16:44:39 -0000	1.1
  +++ clover-report.xml	28 May 2004 21:41:11 -0000	1.2
  @@ -58,7 +58,7 @@
   			<clover-report>
   				<current
   					title="Code Coverage for ${module.name} release ${project.version}"
  -					outfile="${root.forrest.composite.dir}/content/${module.name}/clover">
  +					outfile="${module.docs.target.dir}/clover">
   					<format type="html">
   					</format>
   				</current>
  
  
  
  1.4       +11 -9     jakarta-hivemind/common/common.properties
  
  Index: common.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/common/common.properties,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- common.properties	27 May 2004 15:28:22 -0000	1.3
  +++ common.properties	28 May 2004 21:41:11 -0000	1.4
  @@ -87,17 +87,22 @@
   
   # Note: project.version is defined in version.properties
   
  -# Directory to which documentation is generated. This is often
  -# overriden when creating a distribution.
  -doc.target.dir=${target.dir}/docs
  +
  +# Project-level directory for documentation
  +
  +project.docs.target.dir=${root.target.dir}/docs
  +
  +# Directory to which documentation is generated.
  +module.docs.target.dir=${project.docs.target.dir}/${module.name}
   
   # Directory to which javadoc is generated
  -javadoc.target.dir=${doc.target.dir}/apidocs
  +javadoc.target.dir=${module.docs.target.dir}/apidocs
   
   # Directory to which project and module documentation files are ultimately copied (or generated)
   root.forrest.composite.dir=${root.target.dir}/forrest-composite
   
  -root.forrest.content.dir=${root.forrest.composite.dir}/content/xdocs
  +# Directory to which Forrest XDoc files should be copied or generated.
  +root.forrest.xdocs.dir=${root.forrest.composite.dir}/content/xdocs
   
   # File into which reports can record menu items.
   
  @@ -105,8 +110,5 @@
   forrest.documentation.dir=${src.dir}/documentation
   
   # Directory containing report artifacts
  -
   forrest.report-artifacts.dir=${common.dir}/report-artifacts
  -
  -
   
  
  
  
  1.6       +2 -2      jakarta-hivemind/common/jar-module.xml
  
  Index: jar-module.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/common/jar-module.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- jar-module.xml	28 May 2004 16:44:39 -0000	1.5
  +++ jar-module.xml	28 May 2004 21:41:11 -0000	1.6
  @@ -25,7 +25,7 @@
   	<import file="dependency.xml"/>
   	<import file="forrest.xml"/>
   		
  -	<property name="forrest.report-menu.file" value="${root.forrest.content.dir}/${module.name}-report-menu.ent"/>
  +	<property name="forrest.report-menu.file" value="${root.forrest.xdocs.dir}/${module.name}-report-menu.ent"/>
   		
   	<!-- The default classpath for compilation is all external package JARs. -->
   	
  
  
  
  1.2       +2 -2      jakarta-hivemind/common/license-report.xml
  
  Index: license-report.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/common/license-report.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- license-report.xml	27 May 2004 15:28:22 -0000	1.1
  +++ license-report.xml	28 May 2004 21:41:11 -0000	1.2
  @@ -21,7 +21,7 @@
   	<macrodef name="license-report">
   		<sequential>
   			<announce message="Generating License Report ..."/>
  -			<concat destfile="${root.forrest.content.dir}/license-report.xml">
  +			<concat destfile="${root.forrest.xdocs.dir}/license-report.xml">
   				<filelist dir="${forrest.report-artifacts.dir}"
   					files="license-report.header.xml"/>
   				<filelist dir="." files="${license-report.license-file}"/>
  
  
  
  1.4       +2 -2      jakarta-hivemind/common/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/common/project.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- project.xml	27 May 2004 15:28:22 -0000	1.3
  +++ project.xml	28 May 2004 21:41:11 -0000	1.4
  @@ -22,7 +22,7 @@
   	<import file="dependency.xml"/>
   	<import file="forrest.xml"/>
   	
  -	<property name="forrest.report-menu.file" value="${root.forrest.content.dir}/project-report-menu.ent"/>
  +	<property name="forrest.report-menu.file" value="${root.forrest.xdocs.dir}/project-report-menu.ent"/>
   	
   	<!-- Typically, project.name is all lower case and the title is mixed case, but
   		the project name is still a good default. -->
  
  
  
  1.2       +1 -1      jakarta-hivemind/common/clover.properties
  
  Index: clover.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/common/clover.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- clover.properties	28 May 2004 16:44:39 -0000	1.1
  +++ clover.properties	28 May 2004 21:41:11 -0000	1.2
  @@ -2,7 +2,7 @@
   
   clover.classes.dir=${target.dir}/clover-classes
   clover.db.dir=${target.dir}/clover-db
  -clover.report.dir=${root.forrest.composite.dir}/content/${module.name}/clover
  +clover.report.dir=${project.forrest.content.dir}/${module.name}/clover
   clover.jar=clover-1.2.3.jar
   
   
  
  
  
  1.3       +11 -10    jakarta-hivemind/common/forrest.xml
  
  Index: forrest.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/common/forrest.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- forrest.xml	27 May 2004 15:28:22 -0000	1.2
  +++ forrest.xml	28 May 2004 21:41:11 -0000	1.3
  @@ -6,6 +6,15 @@
   
   		<property name="forrest-package-dir" value="${external.package.dir}/apache-forrest-0.5.1-bin"/>
   
  +		<target name="run-forrest" description="Runs Forrest to generate final site documentation.">
  +			<announce message="Invoking Forrest ..."/>
  +				
  +			<ant antfile="${forrest-package-dir}/forrest.antproxy.xml" target="site">
  +				<property name="project.home" location="${basedir}"/>
  +				<property name="forrest.home" location="${forrest-package-dir}"/>
  +			</ant>			
  +		</target>
  +
   		<target name="site" description="Build site documentation using Forrest.">
   		
   			<unpacked-zip-dependency
  @@ -14,20 +23,12 @@
   					dir="${forrest-package-dir}"/>
   			
   			<antcall target="marshall-documentation"/>
  -			
  -			<announce message="Invoking Forrest ..."/>
  -				
  -			<ant antfile="${forrest-package-dir}/forrest.antproxy.xml" target="site">
  -				<property name="project.home" location="${basedir}"/>
  -				<property name="forrest.home" location="${forrest-package-dir}"/>
  -			</ant>
  -			
  -			
  +			<antcall target="run-forrest"/>
   		</target>
   		
   		<target name="-initialize-report-menu-file">
   		
  -			<mkdir dir="${root.forrest.content.dir}"/>
  +			<mkdir dir="${root.forrest.xdocs.dir}"/>
   			
   			<echo message="" file="${forrest.report-menu.file}"/>
   			
  
  
  
  1.1                  jakarta-hivemind/common/hivedoc-report.properties
  
  Index: hivedoc-report.properties
  ===================================================================
  # 
  
  # File containing the master registry (used as input to the XSLT transform). Generated
  # by the constructregistry task.
  
  hivedoc.registry.file=${target.dir}/registry.xml
  
  hivedoc.xslt.file=${src.dir}/xsl/hivemind.xsl
  
  # Directory containing additional assets needed by the generated HTML files; this
  # consists of images and stylesheets.
  
  hivedoc.assets.dir=${src.dir}/xsl
  
  # Directory to which HiveDoc should be generated
  
  hivedoc.output.dir=${project.docs.target.dir}/hivedocs
  
  
  
  1.1                  jakarta-hivemind/common/hivedoc-report.xml
  
  Index: hivedoc-report.xml
  ===================================================================
  <?xml version="1.0"?>
  <!-- $Id: hivedoc-report.xml,v 1.1 2004/05/28 21:41:11 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="hivedoc-report">
  	<fail unless="ant.file.forrest" message="Must import forrest.xml first."/>
  	<property file="${common.dir}/hivedoc-report.properties"/>
  	
  	<!-- Fileset used to identify the derived files that will be scanned for
  		   module deployment descriptors. -->
  		   
  	<path id="default.hivedoc.classpath">
  		<fileset dir="${target.dir}">
  			<include name="*.jar"/>
  		</fileset>
  		<fileset dir="${external.lib.dir}">
  			<include name="*.jar"/>
  		</fileset>
  	</path>
  	
  	
  	<macrodef name="hivedoc-report">
  		<attribute name="doc-path-id" default="default.hivedoc.classpath"
  				description="Path defining the files to obtain deployment descriptors from."/>
  		
  		<attribute name="taskdef-path-id" default="default.hivedoc.classpath"
  				description="Path containing the master HiveMind module, which contains the Ant tasks."/>
  				
  		<sequential>
  			<announce message="Building Master Registry ..."/>
  
  			<taskdef resource="hivemind-tasks.properties">
  				<classpath refid="@{taskdef-path-id}"/>	
  			</taskdef>
  
  			<constructregistry output="${hivedoc.registry.file}">
  				<descriptors refid="@{doc-path-id}"/>	
  			</constructregistry>
  
  			<mkdir dir="${hivedoc.output.dir}"/>
  			
  			<announce message="Building HiveDoc ..."/>
  			
  			<xslt out="${hivedoc.output.dir}/index.html"
  				in="${hivedoc.registry.file}"
  				style="${hivedoc.xslt.file}">
  				<param name="base.dir" expression="${hivedoc.output.dir}"/>
  			</xslt>
  				
  			<copy todir="${hivedoc.output.dir}">
  				<fileset dir="${hivedoc.assets.dir}">
  					<exclude name="*.xsl"/>	
  				</fileset>	
  			</copy>
  				
  
  			<add-report-to-menu element="hivedoc-report" label="HiveDoc"
  				file="hivedocs/index.html"/>
  		</sequential>
  	</macrodef>
  </project>
  
  
  
  1.5       +19 -1     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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- site.xml	27 May 2004 15:28:22 -0000	1.4
  +++ site.xml	28 May 2004 21:41:11 -0000	1.5
  @@ -1,5 +1,20 @@
   <?xml version="1.0"?>
   <!-- $Id$ -->
  +<!-- 
  +   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.
  +-->
   <!DOCTYPE site
   [
   <!ENTITY project-report-menu.ent SYSTEM "project-report-menu.ent">
  @@ -18,6 +33,9 @@
   			<descriptor label="Module  Descriptor" href="descriptor.html"/>
   			<rules label="Contribution Processing Rules" href="rules.html"/>
   		</reference>
  +		
  +		<downloads href="downloads.html" label="Downloads"/>
  +		
   		<tutorials label="Tutorials and Information">
   			<bootstrap label="Bootstrapping the Registry" href="bootstrap.html"/>
   			<case1 label="Case Study #1: Panorama Startup" href="case1.html"/>
  
  
  
  1.4       +2 -2      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- links.ent	26 May 2004 21:28:49 -0000	1.3
  +++ links.ent	28 May 2004 21:41:11 -0000	1.4
  @@ -27,7 +27,7 @@
   <!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;/event/RegistryShutdownListener.html"><code>RegistryShutdownListener</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>'>
  
  
  
  1.1                  jakarta-hivemind/src/documentation/content/xdocs/downloads.xml
  
  Index: downloads.xml
  ===================================================================
  <?xml version="1.0"?>
  <!-- $Id: downloads.xml,v 1.1 2004/05/28 21:41:11 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.
  -->
  <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.2//EN"
  	"./dtd/document-v12.dtd" [
  	<!ENTITY % common-links SYSTEM "links.ent">
  	%common-links;
  	]>
  <document>
  	<header>
  		<title>HiveMind Downloads</title>
  	</header>
  	<body>
  
  <p>
  HiveMind distributions are available from a
  <fork href="http://jakarta.apache.org/~hlship/hivemind/">temporary download location</fork>.
 As of release 
  1.0-beta-1 there are three files:
  </p>
  
  <ul>
  <li><code>hivemind-</code><em>release</em><code>.tar.gz</code>
-- Combined binary/source distribution</li>	
  <li><code>hivemind-</code><em>release</em><code>.zip</code>
-- Combined binary/source distribution (about twice the size of the .tar.gz)</li>
  <li><code>hivemind-</code><em>release</em><code>-docs.tar.gz</code>
-- The HiveMind documentation (the same as this site)</li>
  </ul>
  	
  <p>
  Each file also has a MD5 checksum file, so you can verify that what you download is valid

  </p>
  	
  <warning>
  Under Internet Explorer, the .tar.gz files do not download with the correct file name. 
Download them, rename
  them to .tar.gz and then open them using WinZip.	
  </warning>
  
  	</body>
  </document>
  
  
  
  1.2       +3 -2      jakarta-hivemind/src/documentation/conf/cli.xconf
  
  Index: cli.xconf
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/src/documentation/conf/cli.xconf,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- cli.xconf	25 May 2004 22:31:41 -0000	1.1
  +++ cli.xconf	28 May 2004 21:41:11 -0000	1.2
  @@ -175,7 +175,8 @@
      <!-- This is generated after the rest. -->
      
      <exclude pattern="hivedocs/**"/>
  -   <exclude pattern="hivemind/apidocs/**"/>
  +   <exclude pattern="*/apidocs/**"/>
  +   <exclude pattern="*/clover/**"/>
   
      <!-- Exclude tokens used in URLs to ASF mirrors (interpreted by a CGI) -->
      <exclude pattern="[preferred]/**"/>
  
  
  
  1.5       +112 -1    jakarta-hivemind/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/build.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- build.xml	27 May 2004 15:28:23 -0000	1.4
  +++ build.xml	28 May 2004 21:41:11 -0000	1.5
  @@ -26,9 +26,120 @@
   
   	<import file="common/project.xml"/>
   	<import file="common/license-report.xml"/>
  +	<import file="common/hivedoc-report.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>
  +	
  +	<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.30      +13 -12    jakarta-hivemind/src/xsl/hivemind.xsl
  
  Index: hivemind.xsl
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/src/xsl/hivemind.xsl,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- hivemind.xsl	19 May 2004 15:08:49 -0000	1.29
  +++ hivemind.xsl	28 May 2004 21:41:11 -0000	1.30
  @@ -19,10 +19,11 @@
   TODO: <schema>s can now be referenced across modules. Need a UID for them
   and new rules for creating cross-module links to schemas.
   -->
  -<xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  -	xmlns:exsl="http://exslt.org/common" extension-element-prefixes="exsl">
   
  -	<xsl:param name="base.dir"/>
  +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
  +                 version="1.0"
  +                 xmlns:redirect="org.apache.xalan.xslt.extensions.Redirect"
  +                 extension-element-prefixes="redirect">
   	
   	<xsl:template match="/registry">
   		<html>
  @@ -127,7 +128,7 @@
   		
   			<xsl:message>Writing module <xsl:value-of select="@id"/></xsl:message>
   		
  -			<xsl:document href="{$base.dir}/module/{@id}.html">
  +			<redirect:write file="module/{@id}.html">
   			
   	<html>
   			<head>
  @@ -257,7 +258,7 @@
   					</body>
   		</html>
   		
  -					</xsl:document>
  +					</redirect:write>
   
   	</xsl:template>
   	
  @@ -282,7 +283,7 @@
   		
   			<xsl:message>Writing configuration-point <xsl:value-of select="@id"/></xsl:message>
   		
  -		<xsl:document href="{$base.dir}/config/{@id}.html">
  +		<redirect:write file="config/{@id}.html">
   			
   	<html>
   			<head>
  @@ -351,7 +352,7 @@
   		
   		</body>
   		</html>
  -		</xsl:document>
  +		</redirect:write>
   		
   	</xsl:template>
   	
  @@ -365,7 +366,7 @@
   					
   			<xsl:message>Writing schema <xsl:value-of select="@id"/></xsl:message>
   		
  -		<xsl:document href="{$base.dir}/schema/{@id}.html">
  +		<redirect:write file="schema/{@id}.html">
   			
   	<html>
   			<head>
  @@ -389,7 +390,7 @@
   			</body>
   			</html>
   			
  -		</xsl:document>
  +		</redirect:write>
   			
   	</xsl:template>
   
  @@ -544,7 +545,7 @@
   		
   					<xsl:message>Writing service-point <xsl:value-of select="@id"/></xsl:message>
   		
  -		<xsl:document href="{$base.dir}/service/{@id}.html">
  +		<redirect:write file="service/{@id}.html">
   			
   	<html>
   			<head>
  @@ -622,7 +623,7 @@
   		</body>
   		</html>
   		
  -		</xsl:document>
  +		</redirect:write>
   		
   	</xsl:template>
   	
  
  
  

---------------------------------------------------------------------
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