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 module.properties
Date Fri, 19 Nov 2004 20:28:49 GMT
hlship      2004/11/19 12:28:49

  Modified:    .        forrest.properties
               src/documentation/content/xdocs site.xml
               library/src/test/org/apache/hivemind/lib/groovy
                        TestHiveMindBuilder.java
               hivebuild project.xml forrestdoc.xml module.properties
  Log:
  Make a few changes to support Forrest 0.7 (latest SVN snapshot) that can build the site
properly!
  
  Revision  Changes    Path
  1.6       +11 -1     jakarta-hivemind/forrest.properties
  
  Index: forrest.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/forrest.properties,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- forrest.properties	27 Oct 2004 19:29:35 -0000	1.5
  +++ forrest.properties	19 Nov 2004 20:28:49 -0000	1.6
  @@ -19,4 +19,14 @@
   project.debuglevel=DEBUG
   project.bugtracking-url=http://nagoya.apache.org/jira/browse/
   
  -project.configfile=${project.home}/src/documentation/conf/cli.xconf
  \ No newline at end of file
  +project.configfile=${project.home}/src/documentation/conf/cli.xconf
  +
  +project.build-dir=${project.home}/target/forrest
  +project.site-dir=${project.home}/target/docs
  +project.temp-dir=${project.home}/target/forrest-temp
  +project.content-dir=target/forrest-composite
  +
  +
  +# Added when synced to Forrest 0.7-dev from SVN HEAD.
  +
  +project.required.plugins=
  \ No newline at end of file
  
  
  
  1.34      +77 -72    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.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- site.xml	11 Nov 2004 14:13:45 -0000	1.33
  +++ site.xml	19 Nov 2004 20:28:49 -0000	1.34
  @@ -17,9 +17,9 @@
   <!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">
   ]
   >
   
  @@ -37,15 +37,15 @@
    		</reference>
   
       <project-info label="Project Information">
  -		<changes label="Change Log" href="changes.html"/>
  -    <todo label="TODO" href="todo.html"/>
  -    
  -    <mailinglists label="Mailing Lists" href="http://jakarta.apache.org/site/mail2.html#HiveMind"/>
  -    
  -		<downloads href="downloads.html" label="Downloads"/>
  -		<bugs href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10500" label="Bugs"/>
  -		
  -		<cvs href="cvs.html" label="CVS Access"/>
  +      <changes label="Change Log" href="changes.html"/>
  +      <todo label="TODO" href="todo.html"/>
  +      
  +      <mailinglists label="Mailing Lists" href="http://jakarta.apache.org/site/mail2.html#HiveMind"/>
  +      
  +      <downloads href="downloads.html" label="Downloads"/>
  +      <bugs href="http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10500"
label="Bugs"/>
  +      
  +      <cvs href="cvs.html" label="CVS Access"/>
   		</project-info>
       
   		<tutorials label="Tutorials and Information">
  @@ -63,81 +63,86 @@
   			&project-report-menu.ent;
   		</reports>
   	
  +		<hivemind label="Framework" href="hivemind/" tab="hivemind">
  +    
  +      <index href="index.html"/>
  +        
  +      <services label="Services">
  +        <hivemind.BuilderFactory label="BuilderFactory" 
  +          href="BuilderFactory.html"/>
  +        <hivemind.LoggingInterceptor label="LoggingInterceptor" 
  +          href="LoggingInterceptor.html"/>
  +        <hivemind.ShutdownCoordinator label="ShutdownCoordinator" 
  +          href="ShutdownCoordinator.html"/>
  +        <hivemind.ThreadLocalStorage label="ThreadLocalStorage" 
  +          href="ThreadLocalStorage.html"/>
  +      </services>
  +      
  +      <configs label="Configurations">
  +        
  +        <hivemind.ApplicationDefaults label="ApplicationDefaults"
  +          href="ApplicationDefaults.html"/>
  +        <hivemind.EagerLoad label="EagerLoad" href="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"/>
  +        
  +      </configs>
  +      
  +      <anttasks label="Ant Tasks">
  +      
  +        <ConstructRegistry label="ConstructRegistry" href="ant/ConstructRegistry.html"/>
  +        <ManifestClassPath label="ManifestClassPath" href="ant/ManifestClassPath.html"/>
  +      
  +      </anttasks>
  +      
  +      <reports label="Reports">
  +      &hivemind-report-menu.ent;
  +      </reports>
   		
  -		<index href="hivemind/index.html" tab="hivemind"/>
  -			
  -    <services label="Services" tab="hivemind">
  -      <hivemind.BuilderFactory label="BuilderFactory" 
  -        href="hivemind/BuilderFactory.html"/>
  -      <hivemind.LoggingInterceptor label="LoggingInterceptor" 
  -        href="hivemind/LoggingInterceptor.html"/>
  -      <hivemind.ShutdownCoordinator label="ShutdownCoordinator" 
  -        href="hivemind/ShutdownCoordinator.html"/>
  -      <hivemind.ThreadLocalStorage label="ThreadLocalStorage" 
  -        href="hivemind/ThreadLocalStorage.html"/>
  -    </services>
  -		
  -		<configs label="Configurations" tab="hivemind">
  -			
  -			<hivemind.ApplicationDefaults label="ApplicationDefaults"
  -				href="hivemind/ApplicationDefaults.html"/>
  -			<hivemind.EagerLoad label="EagerLoad" href="hivemind/EagerLoad.html"/>
  -			<hivemind.FactoryDefaults label="FactoryDefaults"
  -				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" tab="hivemind">
  -		
  -			<ConstructRegistry label="ConstructRegistry" href="hivemind/ant/ConstructRegistry.html"/>
  -			<ManifestClassPath label="ManifestClassPath" href="hivemind/ant/ManifestClassPath.html"/>
  -		
  -		</anttasks>
  -		
  -		<reports label="Reports" tab="hivemind">
  -		&hivemind-report-menu.ent;
  -		</reports>
  -		
  +    
  +    </hivemind>
   
  +	  <hivemind-lib label="Library" tab="hivemind-lib" href="hivemind-lib/">
   	
  -	
  -		<index href="hivemind-lib/index.html" tab="hivemind-lib"/>
  +		<index href="index.html"/>
   		
  -		<services label="Services" tab="hivemind-lib">
  -      <hivemind.lib.AdapterRegistryFactory label="AdapterRegistryFactory" href="hivemind-lib/AdapterRegistryFactory.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 label="Services">
  +      <hivemind.lib.AdapterRegistryFactory label="AdapterRegistryFactory" href="AdapterRegistryFactory.html"/>
  +      <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"/>
   		</services>	
   		
  -		<reports label="Reports" tab="hivemind-lib">
  +		<reports label="Reports">
   		&hivemind-lib-report-menu.ent;
   		</reports>
   	
  -  
  +   </hivemind-lib>
       
  -      <index href="hivemind-examples/index.html" tab="hivemind-examples"/>
  +    <hivemind-examples label="Example Code" href="hivemind-examples/" tab="hivemind-examples">
  +      
  +
  +      <index href="index.html"/>
         
  -      <samples label="Example Code" tab="hivemind-examples">
  -      <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"/>
  -      </samples>
  +      <examples.calc label="Calculator" href="calc.html"/>
  +      <examples.panorama label="Panorama Startup" href="panorama.html"/>
  +      <examples.logging label="Logging Interceptor" href="logging.html"/>
         
  -      <reports label="Reports" tab="hivemind-examples">
  +      <reports label="Reports">
           &hivemind-examples-report-menu.ent;
         </reports>
       
  +    </hivemind-examples>    
   	
   	<other-resources label="Other Resources">
   		<wiki label="HiveMind Wiki" href="http://wiki.apache.org/jakarta-hivemind/"/>
  
  
  
  1.3       +4 -7      jakarta-hivemind/library/src/test/org/apache/hivemind/lib/groovy/TestHiveMindBuilder.java
  
  Index: TestHiveMindBuilder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/library/src/test/org/apache/hivemind/lib/groovy/TestHiveMindBuilder.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestHiveMindBuilder.java	16 Nov 2004 10:27:12 -0000	1.2
  +++ TestHiveMindBuilder.java	19 Nov 2004 20:28:49 -0000	1.3
  @@ -1,4 +1,4 @@
  -//Copyright 2004 The Apache Software Foundation
  +// 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.
  @@ -24,9 +24,6 @@
   import org.apache.hivemind.Resource;
   import org.apache.hivemind.impl.DefaultClassResolver;
   import org.apache.hivemind.impl.DefaultErrorHandler;
  -import org.apache.hivemind.impl.RegistryAssembly;
  -import org.apache.hivemind.impl.RegistryAssemblyImpl;
  -import org.apache.hivemind.lib.groovy.HiveMindBuilder;
   import org.apache.hivemind.parse.DescriptorParser;
   import org.apache.hivemind.test.HiveMindTestCase;
   import org.easymock.MockControl;
  @@ -65,8 +62,6 @@
       {
           Resource resource = getResource("missingModuleId.groovy");
   
  -        RegistryAssembly assembly = new RegistryAssemblyImpl();
  -
           ErrorHandler handler = new DefaultErrorHandler();
           DescriptorParser parser = new DescriptorParser(handler);
   
  @@ -84,7 +79,9 @@
           }
           catch (ApplicationRuntimeException e)
           {
  -            assertExceptionRegexp(e, "Missing required attribute .+missingModuleId\\.groovy,
line 15\\)\\.");
  +            assertExceptionRegexp(
  +                    e,
  +                    "Missing required attribute .+missingModuleId\\.groovy, line 15\\)\\.");
           }
       }
   
  
  
  
  1.10      +0 -7      jakarta-hivemind/hivebuild/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/hivebuild/project.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- project.xml	2 Nov 2004 17:46:10 -0000	1.9
  +++ project.xml	19 Nov 2004 20:28:49 -0000	1.10
  @@ -23,7 +23,6 @@
   	<import file="forrestdoc.xml"/>
   	
     <property name="forrest.report-menu.file" value="${project.forrest.xdocs.dir}/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. -->
  @@ -65,12 +64,6 @@
   	</target>
   	
   		<target name="site" description="Build site documentation using Forrest.">
  -		
  -			<unpacked-zip-dependency
  -					url="${apache.mirror.url}/forrest/"
  -					zip="apache-forrest-0.6.zip"
  -					dir="${forrest-package-dir}"/>
  -			
   			<antcall target="marshall-documentation"/>
   			<antcall target="run-forrest"/>
   		</target>
  
  
  
  1.5       +6 -26     jakarta-hivemind/hivebuild/forrestdoc.xml
  
  Index: forrestdoc.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/hivebuild/forrestdoc.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- forrestdoc.xml	31 Oct 2004 14:44:25 -0000	1.4
  +++ forrestdoc.xml	19 Nov 2004 20:28:49 -0000	1.5
  @@ -7,34 +7,14 @@
   		<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"/ -->
  -     
  -		<target name="run-forrest" description="Runs Forrest to generate final site documentation.">
  + 		<target name="run-forrest" description="Runs Forrest to generate final site documentation.">
   			<announce message="Invoking Forrest ..."/>
         
  -      <!-- HiveBuild already defines a site target; forrest.build.xml imports a site
project containing a site target;
  -           that's the one for us) -->
  -           
  -      <!-- antcall target="site.site"/ -->
  +      <property environment="env"/>
         
  -         
  -      <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}"/>
  -        <sysproperty key="project.build-dir" value="${basedir}/target/forrest"/>
  -        <sysproperty key="project.site-dir" value="${basedir}/target/docs"/>
  -        <sysproperty key="project.temp-dir" value="${basedir}/target/forrest"/>
  -        <sysproperty key="project.content-dir" value="target/forrest-composite"/>
  -        
  -        <classpath>
  -          <fileset dir="${forrest.home}/../..">
  -            <include name="lib/endorsed/*.jar"/>
  -            <include name="tools/ant/lib/*.jar"/>
  -          </fileset>
  -        </classpath>
  -      </java>
  +      <!-- The extension is a problem; this will work for Unix and Cygwin but not pure
Windows. -->
  +      
  +      <exec dir="${basedir}" executable="${env.FORREST_HOME}/bin/forrest.bat"/>
    
   		</target>
   		
  @@ -45,7 +25,7 @@
   			
   			<sequential>
   				<echo file="${forrest.report-menu.file}" append="true">
  -<![CDATA[ <@{element} label="@{label}" href="${forrest.report.folder}@{file}"/>
]]>	
  +<![CDATA[ <@{element} label="@{label}" href="@{file}"/> ]]>	
   				</echo>	
   			</sequential>	
   		</macrodef>
  
  
  
  1.2       +2 -2      jakarta-hivemind/hivebuild/module.properties
  
  Index: module.properties
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/hivebuild/module.properties,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- module.properties	28 Oct 2004 22:09:53 -0000	1.1
  +++ module.properties	19 Nov 2004 20:28:49 -0000	1.2
  @@ -40,7 +40,7 @@
   module.javac-test.source=${module.javac.source}
   module.javac-test.listfiles=${module.javac.listfiles}
   
  -# Directorty into which the module's jar should be installed.
  +# Directory into which the module's jar should be installed.
   
   module.install.dir=${project.target.dir}
   
  @@ -58,4 +58,4 @@
   # Override this to compile if java sources uses JUnit classes.
   module.junit.use=test
   
  -forrest.report.folder=${module.name}/
  \ No newline at end of file
  +forrest.report-menu.file=${project.forrest.xdocs.dir}/${module.name}-report-menu.ent
  \ 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