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/hivebuild project.xml forrestdoc.xml jar-module.xml jar-module.properties
Date Sat, 23 Oct 2004 14:17:56 GMT
hlship      2004/10/23 07:17:56

  Modified:    src/documentation/content/xdocs tabs.xml site.xml
               hivebuild project.xml forrestdoc.xml jar-module.xml
                        jar-module.properties
  Log:
  Fix more (all?) probems with docs caused by upgrade to Forrest 0.6.
  
  Revision  Changes    Path
  1.5       +6 -12     jakarta-hivemind/src/documentation/content/xdocs/tabs.xml
  
  Index: tabs.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/src/documentation/content/xdocs/tabs.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- tabs.xml	20 Jul 2004 17:26:39 -0000	1.4
  +++ tabs.xml	23 Oct 2004 14:17:56 -0000	1.5
  @@ -16,11 +16,8 @@
   -->
   <!DOCTYPE tabs PUBLIC "-//APACHE//DTD Cocoon Documentation Tab V1.0//EN" "http://apache.org/forrest/dtd/tab-cocoon-v10.dtd">
   
  -<tabs software="HiveMind"
  -  title="HiveMind Project"
  -  copyright="Apache Software Foundation"
  +<tabs software="HiveMind" title="HiveMind Project" copyright="Apache Software Foundation"

     xmlns:xlink="http://www.w3.org/1999/xlink">
  -
     <!-- The rules are:
       @dir will always have '/@indexfile' added.
       @indexfile gets appended to @dir if the tab is selected. Defaults to 'index.html'
  @@ -31,11 +28,8 @@
       
       If @id's are present, site.xml entries with a matching @tab will be in that tab.
     -->
  -
  -  <tab label="HiveMind Project" href="index.html" id="project"/>
  -  
  -  <tab label="Module: hivemind" dir="hivemind" href="hivemind" id="hivemind"/>
  -  <tab label="Module: hivemind-lib" dir="hivemind-lib" href="hivemind-lib" id="hivemind-lib"/>
  -  <tab label="Example Code" dir="hivemind-examples" href="hivemind-examples" id="hivemind-examples"/>
  -  
  - </tabs>
  +  <tab id="project" label="HiveMind Project" dir="" />
  +  <tab id="hivemind" label="Module: hivemind" dir="hivemind/" />
  +  <tab id="hivemind-lib" label="Module: hivemind-lib" dir="hivemind-lib/" />
  +  <tab id="hivemind-examples" label="Example Code" dir="hivemind-examples/" />
  +</tabs>
  
  
  
  1.28      +38 -39    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.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- site.xml	21 Oct 2004 12:35:56 -0000	1.27
  +++ site.xml	23 Oct 2004 14:17:56 -0000	1.28
  @@ -17,17 +17,16 @@
   <!DOCTYPE site
   [
   <!ENTITY project-report-menu.ent SYSTEM "project-report-menu.ent">
  -<!ENTITY hivemind-report-menu.ent SYSTEM "hivemind-report-menu.ent">
  -<!ENTITY hivemind-lib-report-menu.ent SYSTEM "hivemind-lib-report-menu.ent">
  -<!ENTITY hivemind-examples-report-menu.ent SYSTEM "hivemind-examples-report-menu.ent">
  +<!ENTITY hivemind-report-menu.ent SYSTEM "hivemind/report-menu.ent">
  +<!ENTITY hivemind-lib-report-menu.ent SYSTEM "hivemind-lib/report-menu.ent">
  +<!ENTITY hivemind-examples-report-menu.ent SYSTEM "hivemind-examples/report-menu.ent">
   ]
   >
   
  -<site xmlns="http://apache.org/forrest/linkmap/1.0" tab="project">
  +<site label="HiveMind" xmlns="http://apache.org/forrest/linkmap/1.0" tab="project">
   	
   	<index href="index.html"/>
   	
  -	<project label="HiveMind Project">
   		<reference label="Reference">
   			<services label="Services" href="services.html"/>
   			<configurations label="Configurations" href="configurations.html"/>
  @@ -60,41 +59,40 @@
   		<reports label="Reports">
   			&project-report-menu.ent;
   		</reports>
  -	</project>
   	
  -	<hivemind label="Module: hivemind" tab="hivemind" href="hivemind/">
  +	<hivemind label="Module: hivemind" tab="hivemind">
   		
  -		<index href="index.html"/>
  +		<index href="hivemind/index.html"/>
   			
       <services label="Services">
         <hivemind.BuilderFactory label="BuilderFactory" 
  -        href="BuilderFactory.html"/>
  +        href="hivemind/BuilderFactory.html"/>
         <hivemind.LoggingInterceptor label="LoggingInterceptor" 
  -        href="LoggingInterceptor.html"/>
  +        href="hivemind/LoggingInterceptor.html"/>
         <hivemind.ShutdownCoordinator label="ShutdownCoordinator" 
  -        href="ShutdownCoordinator.html"/>
  +        href="hivemind/ShutdownCoordinator.html"/>
         <hivemind.ThreadLocalStorage label="ThreadLocalStorage" 
  -        href="ThreadLocalStorage.html"/>
  +        href="hivemind/ThreadLocalStorage.html"/>
       </services>
   		
   		<configs label="Configurations">
   			
   			<hivemind.ApplicationDefaults label="ApplicationDefaults"
  -				href="ApplicationDefaults.html"/>
  -			<hivemind.EagerLoad label="EagerLoad" href="EagerLoad.html"/>
  +				href="hivemind/ApplicationDefaults.html"/>
  +			<hivemind.EagerLoad label="EagerLoad" href="hivemind/EagerLoad.html"/>
   			<hivemind.FactoryDefaults label="FactoryDefaults"
  -				href="FactoryDefaults.html"/>
  -      <hivemind.ObjectProviders label="ObjectProviders" href="ObjectProviders.html"/>
  -			<hivemind.ServiceModels label="ServiceModels" href="ServiceModels.html"/>
  -			<hivemind.SymbolSources label="SymbolSources" href="SymbolSources.html"/>
  -			<hivemind.Translators label="Translators" href="Translators.html"/>
  +				href="hivemind/FactoryDefaults.html"/>
  +      <hivemind.ObjectProviders label="ObjectProviders" href="hivemind/ObjectProviders.html"/>
  +			<hivemind.ServiceModels label="ServiceModels" href="hivemind/ServiceModels.html"/>
  +			<hivemind.SymbolSources label="SymbolSources" href="hivemind/SymbolSources.html"/>
  +			<hivemind.Translators label="Translators" href="hivemind/Translators.html"/>
   			
   		</configs>
   		
   		<anttasks label="Ant Tasks">
   		
  -			<ConstructRegistry label="ConstructRegistry" href="ant/ConstructRegistry.html"/>
  -			<ManifestClassPath label="ManifestClassPath" href="ant/ManifestClassPath.html"/>
  +			<ConstructRegistry label="ConstructRegistry" href="hivemind/ant/ConstructRegistry.html"/>
  +			<ManifestClassPath label="ManifestClassPath" href="hivemind/ant/ManifestClassPath.html"/>
   		
   		</anttasks>
   		
  @@ -104,20 +102,20 @@
   		
   	</hivemind>
   	
  -	<hivemind.lib label="Module: hivemind.lib" tab="hivemind-lib" href="hivemind-lib/">
  +	<hivemind.lib label="Module: hivemind.lib" tab="hivemind-lib">
   	
  -		<index href="index.html"/>
  +		<index href="hivemind-lib/index.html"/>
   		
   		<services label="Services">
  -      <hivemind.lib.BeanFactoryBuilder label="BeanFactoryBuilder" href="BeanFactoryBuilder.html"/>
  -      <hivemind.lib.DefaultImplementationBuilder label="DefaultImplementationBuilder"
href="DefaultImplementationBuilder.html"/>
  -			<hivemind.lib.EJBProxyFactory label="EJBProxyFactory" href="EJBProxyFactory.html"/>
  -			<hivemind.lib.NameLookup label="NameLookup" href="NameLookup.html"/>
  -      <hivemind.lib.PlaceholderFactory label="PlaceholderFactory" href="PlaceholderFactory.html"/>

  -      <hivemind.lib.PipelineFactory label="PipelineFactory" href="PipelineFactory.html"/>
    
  -			<hivemind.lib.RemoteExceptionCoordinator label="RemoteExceptionCoordinator" href="RemoteExceptionCoordinator.html"/>
  -      <hivemind.lib.ServicePropertyFactory label="ServicePropertyFactory" href="ServicePropertyFactory.html"/>
  -			<hivemind.lib.SpringLookupFactory label="SpringLookupFactory" href="SpringLookupFactory.html"/>
  +      <hivemind.lib.BeanFactoryBuilder label="BeanFactoryBuilder" href="hivemind-lib/BeanFactoryBuilder.html"/>
  +      <hivemind.lib.DefaultImplementationBuilder label="DefaultImplementationBuilder"
href="hivemind-lib/DefaultImplementationBuilder.html"/>
  +			<hivemind.lib.EJBProxyFactory label="EJBProxyFactory" href="hivemind-lib/EJBProxyFactory.html"/>
  +			<hivemind.lib.NameLookup label="NameLookup" href="hivemind-lib/NameLookup.html"/>
  +      <hivemind.lib.PlaceholderFactory label="PlaceholderFactory" href="hivemind-lib/PlaceholderFactory.html"/>

  +      <hivemind.lib.PipelineFactory label="PipelineFactory" href="hivemind-lib/PipelineFactory.html"/>
    
  +			<hivemind.lib.RemoteExceptionCoordinator label="RemoteExceptionCoordinator" href="hivemind-lib/RemoteExceptionCoordinator.html"/>
  +      <hivemind.lib.ServicePropertyFactory label="ServicePropertyFactory" href="hivemind-lib/ServicePropertyFactory.html"/>
  +			<hivemind.lib.SpringLookupFactory label="SpringLookupFactory" href="hivemind-lib/SpringLookupFactory.html"/>
   		</services>	
   		
   		<reports label="Reports">
  @@ -126,13 +124,13 @@
   		
   	</hivemind.lib>
     
  -  <hivemind-examples label="Example Code" tab="hivemind-examples" href="hivemind-examples/">
  +  <hivemind-examples label="Example Code" tab="hivemind-examples">
       
  -      <index href="index.html"/>
  +      <index href="hivemind-examples/index.html"/>
         
  -      <examples.calc label="Calculator" href="calc.html"/>
  -      <examples.panorama label="Panorama Startup" href="panorama.html"/>
  -      <examples.logging label="Logging Interceptor" href="logging.html"/>
  +      <examples.calc label="Calculator" href="hivemind-examples/calc.html"/>
  +      <examples.panorama label="Panorama Startup" href="hivemind-examples/panorama.html"/>
  +      <examples.logging label="Logging Interceptor" href="hivemind-examples/logging.html"/>
        
         <reports label="Reports">
           &hivemind-examples-report-menu.ent;
  @@ -146,10 +144,11 @@
   				href="http://howardlewisship.com/blog/"/>	
   	</other-resources>
   	
  -	<complete-site label="Complete Site">
  +	<!-- complete-site label="Complete Site">
   		<complete-html label="HTML" href="wholesite.html"/>
   		<complete-pdf label="PDF" href="wholesite.pdf"/>
  -	</complete-site>
  +	</complete-site -->
  +  
   	<related label="Related Projects">
   		<tapestry label="Tapestry" href="http://jakarta.apache.org/tapestry/"/>
   		<spring label="Spring" href="http://www.springframework.org"/>
  
  
  
  1.6       +2 -1      jakarta-hivemind/hivebuild/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/hivebuild/project.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- project.xml	21 Oct 2004 14:57:19 -0000	1.5
  +++ project.xml	23 Oct 2004 14:17:56 -0000	1.6
  @@ -22,7 +22,8 @@
   	<import file="dependency.xml"/>
   	<import file="forrestdoc.xml"/>
   	
  -	<property name="forrest.report-menu.file" value="${project.forrest.xdocs.dir}/project-report-menu.ent"/>
  +	<property name="forrest.report-menu.file" value="project-report-menu.ent"/>
  +  <property name="forrest.report.folder" value=""/>
   	
   	<!-- Typically, project.name is all lower case and the title is mixed case, but
   		the project name is still a good default. -->
  
  
  
  1.2       +4 -3      jakarta-hivemind/hivebuild/forrestdoc.xml
  
  Index: forrestdoc.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/hivebuild/forrestdoc.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- forrestdoc.xml	21 Oct 2004 12:35:56 -0000	1.1
  +++ forrestdoc.xml	23 Oct 2004 14:17:56 -0000	1.2
  @@ -7,7 +7,7 @@
   		<property name="forrest-package-dir" value="${external.package.dir}/apache-forrest-0.6"/>
       <property name="forrest.home" location="${forrest-package-dir}/src/core"/>
   
  -    <import file="${forrest.home}/forrest.build.xml"/>
  +    <!-- import file="${forrest.home}/forrest.build.xml"/ -->
        
   		<target name="run-forrest" description="Runs Forrest to generate final site documentation.">
   			<announce message="Invoking Forrest ..."/>
  @@ -18,8 +18,9 @@
         <!-- antcall target="site.site"/ -->
         
            
  -      <java classname="org.apache.tools.ant.Main" fork="true" dir="${basedir}">
  +      <java classname="org.apache.tools.ant.Main" fork="true" dir="${basedir}" maxmemory="384M">
           <arg line="-emacs -buildfile ${forrest.home}/forrest.build.xml"/>
  +        <arg line="-logger org.apache.tools.ant.NoBannerLogger"/>
                   
           <sysproperty key="forrest.home" value="${forrest.home}"/>
           <sysproperty key="project.home" value="${basedir}"/>
  @@ -41,7 +42,7 @@
   			
   			<sequential>
   				<echo file="${forrest.report-menu.file}" append="true">
  -<![CDATA[ <@{element} label="@{label}" href="@{file}"/> ]]>	
  +<![CDATA[ <@{element} label="@{label}" href="${forrest.report.folder}@{file}"/>
]]>	
   				</echo>	
   			</sequential>	
   		</macrodef>
  
  
  
  1.15      +1 -1      jakarta-hivemind/hivebuild/jar-module.xml
  
  Index: jar-module.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/hivebuild/jar-module.xml,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- jar-module.xml	21 Oct 2004 12:35:56 -0000	1.14
  +++ jar-module.xml	23 Oct 2004 14:17:56 -0000	1.15
  @@ -25,7 +25,7 @@
   	<import file="forrestdoc.xml"/>
     <property file="${hivebuild.dir}/jar-module.properties"/>
   		
  -	<property name="forrest.report-menu.file" value="${project.forrest.xdocs.dir}/${module.name}-report-menu.ent"/>
  +	<property name="forrest.report-menu.file" value="${project.forrest.xdocs.dir}/${module.name}/report-menu.ent"/>
   		
   	<!-- The default classpath for compilation is all external package JARs. -->
   	
  
  
  
  1.6       +3 -1      jakarta-hivemind/hivebuild/jar-module.properties
  
  Index: jar-module.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/hivebuild/jar-module.properties,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- jar-module.properties	27 Aug 2004 13:36:25 -0000	1.5
  +++ jar-module.properties	23 Oct 2004 14:17:56 -0000	1.6
  @@ -56,4 +56,6 @@
   module.junit.jar=junit-${module.junit.version}.jar
   
   # Override this to compile if java sources uses JUnit classes.
  -module.junit.use=test
  \ No newline at end of file
  +module.junit.use=test
  +
  +forrest.report.folder=${module.name}/
  \ No newline at end of file
  
  
  

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