You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by hl...@apache.org on 2003/10/10 00:58:17 UTC

cvs commit: jakarta-commons-sandbox/hivemind/framework/src/java/org/apache/commons/hivemind/service/impl DefaultsSymbolSource.java ThreadLocalStorageImpl.java

hlship      2003/10/09 15:58:17

  Modified:    hivemind/framework project.xml maven.xml
               hivemind/framework/src/test/hivemind/test/services
                        TestThreadLocalStorage.java
               hivemind/framework/xdocs ThreadEventNotifier.xml
                        navigation.xml BuilderFactory.xml
                        LoggingInterceptor.xml FactoryDefaults.xml
                        ClassFactory.xml ThreadLocalStorage.xml
                        SymbolSource.xml ApplicationDefaults.xml
               hivemind project.xml maven.xml
               hivemind/framework/src/java/org/apache/commons/hivemind
                        PoolManageable.java Initializable.java
               hivemind/xdocs navigation.xml configurations.xml
                        services.xml
               hivemind/library/xdocs navigation.xml
               hivemind/framework/src/java/org/apache/commons/hivemind/impl
                        ConstructableServiceExtensionPoint.java
                        SingletonServiceModel.java ProxyBuilder.java
                        AbstractServiceModelImpl.java RegistryBuilder.java
                        DeferredServiceModel.java ThreadedServiceModel.java
                        PooledServiceModel.java
               hivemind/common links.xml
               hivemind/framework/src/test/hivemind/test/services/impl
                        CheckInitializeServiceImpl.java
               hivemind/framework/xdocs/ant ManifestClassPath.xml
               hivemind/library/src/java/org/apache/commons/hivemind/lib/impl
                        NameLookupImpl.java
               hivemind/framework/src/java/org/apache/commons/hivemind/service/impl
                        DefaultsSymbolSource.java
                        ThreadLocalStorageImpl.java
  Added:       hivemind/xdocs hivedoc.xml
               hivemind/src/xsl hivemind.xsl hivemind.css
               hivemind/library maven.xml
  Removed:     hivemind/framework/xdocs registry.xml
               hivemind/framework/src/test-data/sample
                        org.example.boostrap.xml org.example.toolbar.ui.xml
               hivemind/framework/src/xsl hivemind.xsl hivemind.css
  Log:
  Remove parameter from Initializable.initializeService() method.
  Clean up Javadoc.
  Build Hivedoc at top-level project.
  
  Revision  Changes    Path
  1.8       +1 -9      jakarta-commons-sandbox/hivemind/framework/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/framework/project.xml,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- project.xml	25 Sep 2003 21:38:40 -0000	1.7
  +++ project.xml	9 Oct 2003 22:58:15 -0000	1.8
  @@ -101,14 +101,6 @@
       	<version>3.8.1</version>
       	<url>http://www.junit.org/</url>
       </dependency>
  -    
  -    <!-- Only needed to generate docs. -->
  -    
  -    <dependency>
  -    	<id>saxon</id>	
  -			<version>6.5.2</version>    	
  -			<url>http://saxon.sf.net</url>
  -    </dependency>
                
       <!-- Needed to keep the unit tests from logging too much stuff. -->
       
  
  
  
  1.3       +5 -58     jakarta-commons-sandbox/hivemind/framework/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/framework/maven.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- maven.xml	20 Sep 2003 12:48:19 -0000	1.2
  +++ maven.xml	9 Oct 2003 22:58:15 -0000	1.3
  @@ -2,62 +2,9 @@
   <!-- $Id$ -->
   <project xmlns:j="jelly:core" xmlns:u="jelly:util" xmlns:ant="jelly:ant">
   
  -	<preGoal name="xdoc:jelly-transform">
  -		<!-- Some kind of voodoo magic I picked up from the docbook plugin. -->
  -		<echo>Building HiveModule Registry docs ...</echo>
  -		<taskdef name="constructRegistry"
  -			classname="org.apache.commons.hivemind.ant.ConstructRegistry">
  -			<classpath>
  -				<pathelement location="${maven.build.dest}"/>
  -			</classpath>
  -		</taskdef>
  -		<constructRegistry output="target/base-registry.xml">
  -			<descriptors>
  -				<fileset dir="src/descriptor/META-INF">
  -					<include name="hivemodule.xml"/>
  -				</fileset>
  -			</descriptors>
  -		</constructRegistry>
  -		<mkdir dir="target/docs/base-registry"/>
  -		<j:set var="output.dir" value="target/docs/base-registry"/>
  -		<mkdir dir="${output.dir}"/>
  -		<java fork="true" classname="com.icl.saxon.StyleSheet">
  -			<arg line="-o ${output.dir}/index.html"/>
  -			<arg line="target/base-registry.xml"/>
  -			<arg line="src/xsl/hivemind.xsl"/>
  -			<arg line="base.dir=${output.dir}"/>
  -			<classpath>
  -				<pathelement location="${pom.getDependencyPath('saxon')}"/>
  -			</classpath>
  -		</java>
  -		<copy todir="${output.dir}" file="src/xsl/hivemind.css"/>
  -		
  -		<j:set var="sample.registry" value="target/sample-registry.xml"/>
  -		
  -		<constructRegistry output="${sample.registry}">
  -			<descriptors>
  -				<fileset dir="src/descriptor/META-INF">
  -					<include name="hivemodule.xml"/>
  -				</fileset>
  -				<fileset dir="src/test-data/sample">
  -					<include name="*.xml"/>	
  -				</fileset>
  -			</descriptors>
  -		</constructRegistry>
  -
  -		<j:set var="output.dir" value="target/docs/sample-registry"/>
  -		
  -		<mkdir dir="${output.dir}"/>
  -		<java fork="true" classname="com.icl.saxon.StyleSheet">
  -			<arg line="-o ${output.dir}/index.html"/>
  -			<arg line="${sample.registry}"/>
  -			<arg line="src/xsl/hivemind.xsl"/>
  -			<arg line="base.dir=${output.dir}"/>
  -			<classpath>
  -				<pathelement location="${pom.getDependencyPath('saxon')}"/>
  -			</classpath>
  -		</java>
  -		<copy todir="${output.dir}" file="src/xsl/hivemind.css"/>
  -	</preGoal>
  +	<!-- Apparently, the <postGoal name="site"> in the master maven.xml
  +		   is inherited here, and so we need to supply a No-Op hivedoc
  +		   goal or break the build. -->
  +	<goal name="hivedoc"/>
   	
   </project>
  
  
  
  1.3       +2 -2      jakarta-commons-sandbox/hivemind/framework/src/test/hivemind/test/services/TestThreadLocalStorage.java
  
  Index: TestThreadLocalStorage.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/framework/src/test/hivemind/test/services/TestThreadLocalStorage.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestThreadLocalStorage.java	19 Sep 2003 18:25:19 -0000	1.2
  +++ TestThreadLocalStorage.java	9 Oct 2003 22:58:15 -0000	1.3
  @@ -115,7 +115,7 @@
           ThreadLocalStorageImpl s = new ThreadLocalStorageImpl();
   
           s.setNotifier(notifier);
  -        s.initializeService(s);
  +        s.initializeService();
   
           s.put("biff", "bamf");
   
  
  
  
  1.3       +2 -2      jakarta-commons-sandbox/hivemind/framework/xdocs/ThreadEventNotifier.xml
  
  Index: ThreadEventNotifier.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/framework/xdocs/ThreadEventNotifier.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ThreadEventNotifier.xml	29 Sep 2003 16:16:35 -0000	1.2
  +++ ThreadEventNotifier.xml	9 Oct 2003 22:58:15 -0000	1.3
  @@ -17,7 +17,7 @@
     	<section name="hivemind.ThreadEventNotifier">
   
   <p>
  -The <a href="&hivemind-registry;#service:hivemind.ThreadEventNotifier">ThreadEventNotifier</a> service implements
  +The <a href="&hivemind-hivedoc;#service:hivemind.ThreadEventNotifier">ThreadEventNotifier</a> service implements
   the
   <a href="&apiroot;/service/ThreadEventNotifier.html">ThreadEventNotifier</a> interface. It is used internally by HiveMind
   to receive a notification when a thread should be cleaned up (at the end of a request or transaction).
  
  
  
  1.4       +8 -4      jakarta-commons-sandbox/hivemind/framework/xdocs/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/framework/xdocs/navigation.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- navigation.xml	26 Sep 2003 18:19:35 -0000	1.3
  +++ navigation.xml	9 Oct 2003 22:58:15 -0000	1.4
  @@ -1,5 +1,10 @@
   <?xml version="1.0" encoding="ISO-8859-1"?>
   <!-- $Id$ -->
  +<!DOCTYPE project [
  +	<!ENTITY projectroot '../'>	
  +	<!ENTITY % common-links SYSTEM "../../common/links.xml">
  +	%common-links;
  +	]>
   <project name="HiveMind Framework">
   	<title>HiveMind Framework</title>
   	<body>
  @@ -25,10 +30,9 @@
       
       <menu name="Reference">
   
  +			<item name="HiveDoc" href="/&hivemind-hivedoc;"/>
   
  -    			<item name="HiveMind Registry Documentation" href="/registry.html"/>	
  -    			
  -			<item name="Ant Tasks" href="/ant/index.html" collapse="true">
  + 			<item name="Ant Tasks" href="/ant/index.html" collapse="true">
   				<item name="ManifestClassPath"
   					href="/ant/ManifestClassPath.html"/>
   				<item name="ConstructRegistry"
  
  
  
  1.5       +2 -2      jakarta-commons-sandbox/hivemind/framework/xdocs/BuilderFactory.xml
  
  Index: BuilderFactory.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/framework/xdocs/BuilderFactory.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- BuilderFactory.xml	3 Oct 2003 20:00:16 -0000	1.4
  +++ BuilderFactory.xml	9 Oct 2003 22:58:15 -0000	1.5
  @@ -17,7 +17,7 @@
     	<section name="hivemind.BuilderFactory">
   
   <p>
  -The <a href="&hivemind-registry;#service:hivemind.BuilderFactory">BuilderFactory</a> service is a
  +The <a href="&hivemind-hivedoc;#service:hivemind.BuilderFactory">BuilderFactory</a> service is a
   service implementation factory ... a service that is used to construct other services.
   </p>
   
  
  
  
  1.3       +2 -2      jakarta-commons-sandbox/hivemind/framework/xdocs/LoggingInterceptor.xml
  
  Index: LoggingInterceptor.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/framework/xdocs/LoggingInterceptor.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LoggingInterceptor.xml	29 Sep 2003 16:16:35 -0000	1.2
  +++ LoggingInterceptor.xml	9 Oct 2003 22:58:15 -0000	1.3
  @@ -18,7 +18,7 @@
   
   <p>
   The
  -<a href="&hivemind-registry;#service:hivemind.LoggingInterceptor">LoggingInterceptor</a>
  +<a href="&hivemind-hivedoc;#service:hivemind.LoggingInterceptor">LoggingInterceptor</a>
   service is used to add logging capability to a service, i.e.:
   <source><![CDATA[
     <interceptor service-id="hivemind.LoggingInterceptor"/>	]]>
  
  
  
  1.3       +2 -2      jakarta-commons-sandbox/hivemind/framework/xdocs/FactoryDefaults.xml
  
  Index: FactoryDefaults.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/framework/xdocs/FactoryDefaults.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- FactoryDefaults.xml	29 Sep 2003 16:16:35 -0000	1.2
  +++ FactoryDefaults.xml	9 Oct 2003 22:58:15 -0000	1.3
  @@ -17,7 +17,7 @@
     	<section name="hivemind.FactoryDefaults">
   
   <p>
  -The <a href="&hivemind-registry;#configuration:hivemind.FactoryDefaults">FactoryDefaults</a> configuration
  +The <a href="&hivemind-hivedoc;#configuration:hivemind.FactoryDefaults">FactoryDefaults</a> configuration
   is used to set default values for substitution symbols. Contributions look like:
   <source><![CDATA[
     <default symbol=". . ." value=". . ."/>
  
  
  
  1.3       +2 -2      jakarta-commons-sandbox/hivemind/framework/xdocs/ClassFactory.xml
  
  Index: ClassFactory.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/framework/xdocs/ClassFactory.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ClassFactory.xml	29 Sep 2003 16:16:35 -0000	1.2
  +++ ClassFactory.xml	9 Oct 2003 22:58:15 -0000	1.3
  @@ -17,7 +17,7 @@
     	<section name="hivemind.ClassFactory">
   
   <p>
  -The <a href="&hivemind-registry;#service:hivemind.ClassFactory">ClassFactory</a> service implements
  +The <a href="&hivemind-hivedoc;#service:hivemind.ClassFactory">ClassFactory</a> service implements
   the
   <a href="&apiroot;/service/ClassFactory.html">ClassFactory</a> interface. This service is a wrapper
   around the Javassist framework, as it utilized by the HiveMind framework to construct proxies and
  
  
  
  1.4       +2 -2      jakarta-commons-sandbox/hivemind/framework/xdocs/ThreadLocalStorage.xml
  
  Index: ThreadLocalStorage.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/framework/xdocs/ThreadLocalStorage.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ThreadLocalStorage.xml	6 Oct 2003 18:22:31 -0000	1.3
  +++ ThreadLocalStorage.xml	9 Oct 2003 22:58:15 -0000	1.4
  @@ -17,7 +17,7 @@
     	<section name="hivemind.ThreadLocalStorage">
   
   <p>
  -The <a href="&hivemind-registry;#service:hivemind.ThreadLocalStorage">ThreadLocalStorage</a> service implements
  +The <a href="&hivemind-hivedoc;#service:hivemind.ThreadLocalStorage">ThreadLocalStorage</a> service implements
   the
   <a href="&apiroot;/service/ThreadLocalStorage.html">ThreadLocalStorage</a> interface. This service
   acts as a kind of Map for temporary data. The map is local to the current thread, and is cleared
  
  
  
  1.4       +2 -2      jakarta-commons-sandbox/hivemind/framework/xdocs/SymbolSource.xml
  
  Index: SymbolSource.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/framework/xdocs/SymbolSource.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SymbolSource.xml	29 Sep 2003 16:16:35 -0000	1.3
  +++ SymbolSource.xml	9 Oct 2003 22:58:15 -0000	1.4
  @@ -17,7 +17,7 @@
     	<section name="hivemind.SymbolSource">
   
   <p>
  -The <a href="&hivemind-registry;#configuration:hivemind.SymbolSource">SymbolSource</a> configuration
  +The <a href="&hivemind-hivedoc;#configuration:hivemind.SymbolSource">SymbolSource</a> configuration
   is used to define new 
   <a href="&apiroot;/SymbolSource.html">SymbolSource</a>s (providers of values for substitution symbols).
   
  
  
  
  1.3       +2 -2      jakarta-commons-sandbox/hivemind/framework/xdocs/ApplicationDefaults.xml
  
  Index: ApplicationDefaults.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/framework/xdocs/ApplicationDefaults.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ApplicationDefaults.xml	29 Sep 2003 16:16:35 -0000	1.2
  +++ ApplicationDefaults.xml	9 Oct 2003 22:58:15 -0000	1.3
  @@ -17,7 +17,7 @@
     	<section name="hivemind.ApplicationDefaults">
   
   <p>
  -The <a href="&hivemind-registry;#configuration:hivemind.ApplicationDefaults">ApplicationDefaults</a> configuration
  +The <a href="&hivemind-hivedoc;#configuration:hivemind.ApplicationDefaults">ApplicationDefaults</a> configuration
   is used to set default values for substitution symbols.
   Application defaults override contributions to  <a href="FactoryDefaults.html">hivemind.FactoryDefaults</a>.
   The contribution format is the same FactoryDefaults:
  
  
  
  1.25      +13 -1     jakarta-commons-sandbox/hivemind/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/project.xml,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- project.xml	6 Oct 2003 18:22:30 -0000	1.24
  +++ project.xml	9 Oct 2003 22:58:16 -0000	1.25
  @@ -64,6 +64,18 @@
       </mailingList>
     </mailingLists>
     
  +  <dependencies>
  +
  +    <!-- Only needed to generate docs. -->
  +    
  +    <dependency>
  +    	<id>saxon</id>	
  +			<version>6.5.2</version>    	
  +			<url>http://saxon.sf.net</url>
  +    </dependency>
  +        
  +  </dependencies>
  +    	
     <developers>
   
       <developer>
  
  
  
  1.10      +46 -22    jakarta-commons-sandbox/hivemind/maven.xml
  
  Index: maven.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/maven.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- maven.xml	26 Sep 2003 18:19:35 -0000	1.9
  +++ maven.xml	9 Oct 2003 22:58:16 -0000	1.10
  @@ -2,37 +2,61 @@
   <!-- $Id$ -->
   <project xmlns:j="jelly:core" xmlns:u="jelly:util" xmlns:ant="jelly:ant">
   	
  -	<goal name="build-fresh">
  +	<goal name="clean-all" description="Clean master project and all sub-projects.">
   		<attainGoal name="multiproject:clean"/>
  -		<attainGoal name="multiproject:install"/>
  +		<attainGoal name="clean"/>	
   	</goal>
   	
  -	<goal name="install-latest" description="Build and install latest src and bin distributions to temporary site.">
  -		<attainGoal name="multiproject:clean"/>
  +	<goal name="full-site" description="Install the latest JARs, then build complete site documentation.">
   		<attainGoal name="multiproject:install"/>
   		<attainGoal name="multiproject:site"/>
  -		<attainGoal name="dist:build"/>
  -          
  -    <!-- Rest probably broken since switchover to multiproject ... -->
  -    
  -    	<j:set var="copier" value='${context.getVariable("maven.scp.executable")}'/>
  -    
  -    <echo>Copying from ${maven.dist.dir} to home page ...</echo>
  -    
  -    <!-- Mix Maven, Bash, Cygwin and who knows what ... and get the wrong permissions. -->
  -    	   
  -		<ant:chmod dir="${maven.dist.dir}" includes="*" perm="ogu+r"/>
  -		
  -    <ant:exec dir="${maven.dist.dir}" executable="${copier}">
  -        <ant:arg value="*.zip"/>
  -        <ant:arg value="*.tar.gz"/>
  -        <ant:arg value="hlship@jakarta.apache.org:~/public_html/hivemind"/>
  -    </ant:exec>
   	</goal>
   	
  +	<postGoal name="site">
  +		<attainGoal name="hivedoc"/>
  +	</postGoal>
  +	
  +	<goal name="site-deploy" description="Build the full site and deploy it (must have ssh-agent running).">
  +		<attainGoal name="full-site"/>
  +		<attainGoal name="site:sshdeploy"/>	
  +	</goal>
   	
   	<goal name="multiproject:xdoc">
   		<j:set var="goal" value="xdoc"/>
   		<attainGoal name="multiproject:goal"/>	
  +	</goal>	
  +	
  +	<goal name="hivedoc" description="Create HiveDoc from the installed HiveMind JARs.">
  +		<!-- Some kind of voodoo magic I picked up from the docbook plugin. -->
  +		<echo>Building Hivedoc ...</echo>
  +		
  +		<taskdef name="constructRegistry"
  +			classname="org.apache.commons.hivemind.ant.ConstructRegistry">
  +			<classpath id="hivemind.jars.classpath">
  +				<fileset dir="${maven.repo.local}">
  +					<include name="commons-hivemind/jars/*-${pom.currentVersion}.jar"/>
  +				</fileset>
  +			</classpath>
  +		</taskdef>
  +		
  +		<constructRegistry output="target/registry.xml">
  +			<descriptors refid="hivemind.jars.classpath"/>
  +		</constructRegistry>
  +		
  +		<mkdir dir="target/docs/hivedocs"/>
  +		
  +		<j:set var="output.dir" value="target/docs/hivedocs"/>
  +		<mkdir dir="${output.dir}"/>
  +		<java fork="true" classname="com.icl.saxon.StyleSheet">
  +			<arg line="-o ${output.dir}/index.html"/>
  +			<arg line="target/registry.xml"/>
  +			<arg line="src/xsl/hivemind.xsl"/>
  +			<arg line="base.dir=${output.dir}"/>
  +			<classpath>
  +				<pathelement location="${pom.getDependencyPath('saxon')}"/>
  +			</classpath>
  +		</java>
  +		<copy todir="${output.dir}" file="src/xsl/hivemind.css"/>
  +
   	</goal>	
   </project>
  
  
  
  1.2       +2 -2      jakarta-commons-sandbox/hivemind/framework/src/java/org/apache/commons/hivemind/PoolManageable.java
  
  Index: PoolManageable.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/framework/src/java/org/apache/commons/hivemind/PoolManageable.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PoolManageable.java	6 Oct 2003 18:22:30 -0000	1.1
  +++ PoolManageable.java	9 Oct 2003 22:58:16 -0000	1.2
  @@ -70,7 +70,7 @@
   	/**
   	 * Invoked just after a service is either created, or just after it is removed
   	 * from the service pool and bound to a new thread.  This will also be invoked
  -	 * after {@link Initializable#initializeService(Object)}.
  +	 * after {@link Initializable#initializeService()}.
   	 */
   	public void activateService();
   	
  
  
  
  1.2       +5 -16     jakarta-commons-sandbox/hivemind/framework/src/java/org/apache/commons/hivemind/Initializable.java
  
  Index: Initializable.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/framework/src/java/org/apache/commons/hivemind/Initializable.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Initializable.java	16 Sep 2003 18:51:05 -0000	1.1
  +++ Initializable.java	9 Oct 2003 22:58:16 -0000	1.2
  @@ -59,16 +59,8 @@
   
   /**
    * Interface that <em>may</em> be implemented by a core service implementation
  - * (in addition to the service interface), which is used by HiveMind
  - * to inform a newly created implementation service extension point
  - * it was created for.
  - * 
  - * <p>
  - * The final version of the service is provided (this will
  - * be the receiver if the service extension point has no interceptors; otherwise,
  - * it will be the outermost interceptor).  This allows the
  - * service to, for example, establish a callback to the core implementation that
  - * uses the interceptor stack (rather than bypassing it).
  + * (in addition to the service interface), to allow it to perform
  + * any final initialization after it has been fully configured.
    *
    * @author Howard Lewis Ship
    * @version $Id$
  @@ -76,10 +68,7 @@
   public interface Initializable
   {
       /**
  -     * Invoked after the core implementation is instantiated, and the interceptor
  -     * stack has been created.
  -     * @param service the outside representation of the service, this may be the
  -     * same as the receiver, or can be the outermost interceptor.
  +     * Invoked after the core implementation is instantiated and configured.
        */
  -    public void initializeService(Object service);
  +    public void initializeService();
   }
  
  
  
  1.23      +2 -1      jakarta-commons-sandbox/hivemind/xdocs/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/xdocs/navigation.xml,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- navigation.xml	19 Sep 2003 22:10:58 -0000	1.22
  +++ navigation.xml	9 Oct 2003 22:58:16 -0000	1.23
  @@ -8,6 +8,7 @@
   
   			<item name="Services" href="/services.html"/>
   			<item name="Configurations" href="/configurations.html"/>
  +			<item name="HiveDoc" href="/hivedoc.html"/>
   			<item name="Module Descriptor" href="/descriptor.html"
   				collapse="true">
   				<item name="XML Processing Rules" href="/rules.html"/>
  
  
  
  1.4       +2 -2      jakarta-commons-sandbox/hivemind/xdocs/configurations.xml
  
  Index: configurations.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/xdocs/configurations.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- configurations.xml	29 Sep 2003 16:16:35 -0000	1.3
  +++ configurations.xml	9 Oct 2003 22:58:16 -0000	1.4
  @@ -244,7 +244,7 @@
   <p>
   This begs the question: where do symbol values come from?	The answser is application dependent.
   HiveMind itself defines a configuration configuration point for this purpose: 
  -<a href="&hivemind-registry;#configuration:hivemind.SymbolSource">hivemind.SymbolSource</a>.  Contributions to this configuration point define
  +<a href="&hivemind-hivedoc;#configuration:hivemind.SymbolSource">hivemind.SymbolSource</a>.  Contributions to this configuration point define
   new objects that can provide values for symbols, and identify the order in which
   these objects should be consulted.
   </p>
  
  
  
  1.30      +5 -5      jakarta-commons-sandbox/hivemind/xdocs/services.xml
  
  Index: services.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/xdocs/services.xml,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- services.xml	6 Oct 2003 18:22:30 -0000	1.29
  +++ services.xml	9 Oct 2003 22:58:16 -0000	1.30
  @@ -113,7 +113,7 @@
   			<p>
   			Often, the factory will need some additional configuration information.
   			For example, the
  -			<a href="&hivemind-lib-registry;#service:hivemind.lib.EJBProxyFactory">hivemind.lib.EJBProxyFactory</a>
  +			<a href="&hivemind-lib-hivedoc;#service:hivemind.lib.EJBProxyFactory">hivemind.lib.EJBProxyFactory</a>
   			service uses its parameters to identify the JNDI name of the EJB's home interface,
   			as well as the home interface class itself.
   			</p>
  @@ -127,7 +127,7 @@
   			
   			<p>
   			The most common service factory is  
  -			<a href="&hivemind-registry;#service:hivemind.BuilderFactory">hivemind.BuilderFactory</a>.
  +			<a href="&hivemind-hivedoc;#service:hivemind.BuilderFactory">hivemind.BuilderFactory</a>.
   			It is used to construct a service and then set properties of the service implementation object.	
   			</p>
   							
  @@ -287,7 +287,7 @@
   		the service is constructed on first reference.  This is appropriate for
   		services such as service factories and interceptor factories, and for
   		several of the basic services provided in the
  -		<a href="&hivemind-registry;">hivemind module</a>.
  +		<a href="&hivemind-hivedoc;">hivemind module</a>.
   		</p>	
   		
   		
  @@ -358,7 +358,7 @@
   
   <p>
   The service instance is discarded when notified to cleanup; this is controlled by the
  -<a href="&hivemind-registry;#service:hivemind.ThreadEventNotifier">hivemind.ThreadEventNotifier</a>	 service.
  +<a href="&hivemind-hivedoc;#service:hivemind.ThreadEventNotifier">hivemind.ThreadEventNotifier</a>	 service.
   If your application has any threaded services, you are responsible for invoking the <code>fireThreadCleanup()</code>
   method of the service.
   </p>
  
  
  
  1.1                  jakarta-commons-sandbox/hivemind/xdocs/hivedoc.xml
  
  Index: hivedoc.xml
  ===================================================================
  <?xml version="1.0"?>
  <!-- $Id: hivedoc.xml,v 1.1 2003/10/09 22:58:16 hlship Exp $ -->
  <!DOCTYPE document [
  	<!ENTITY % common-links SYSTEM "../common/links.xml">
  	%common-links;
  	]>
  
  <document>
    <properties>
      <title>HiveDoc</title>
      <author email="hlship@apache.org">Howard M. Lewis Ship</author>
    </properties>
  
    <body>
    	
    	<section name="HiveDoc">
  
  	<p>
  	HiveMind includes tools for  documentating a HiveMind registry ... the combined information
    from all modules that are deployed at runtime.  At build time, all related
  	<code>hivemodule.xml</code>	descriptors are parsed
    and
  	the results combined into a single file. 
  	The framework includes <a href="commons-hivemind/ant/index.html">Ant tasks</a> to facilitate this.
  	The master file (which is only used for this documentation) is
  	 then converted into a set of HTML files using XSLT.  The end result is much like JavaDoc ... its fully
  	hyperlinked and allows you to see all services, configuration points and contributions clearly.
  	
  	</p>
  	
  	<p>
  	The HiveDoc for the HiveMind framework and library is available
  	<a href="&hivedoc;/index.html">here</a>	.
  	</p>
  
  
    	</section>
    	
    	<section name="Building the Documentation">
    	
    	<p>
    	Currently, there isn't an easy way to do this!  Something will
    	be forthcoming in the future. See
    	the <code>maven.xml</code> file for the HiveMind project
    	to see how the examples were generated.  The necessary CSS and XSL files
    	are included in the source distribution.
    	</p>	
    	
    	<p>
    	The XSLT uses a single XSLT 1.1 feature (&lt;xs:document&gt;, used
    	to chunk output to multiple files).  The documentation
    	is generated using <a href="http://saxon.sf.net">Saxon</a> 6.5.2.	
    	</p>
    	
    	</section>
    	
      
    </body>
  </document>
  
  
  
  1.3       +10 -1     jakarta-commons-sandbox/hivemind/library/xdocs/navigation.xml
  
  Index: navigation.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/library/xdocs/navigation.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navigation.xml	24 Sep 2003 16:07:52 -0000	1.2
  +++ navigation.xml	9 Oct 2003 22:58:16 -0000	1.3
  @@ -1,5 +1,10 @@
   <?xml version="1.0" encoding="ISO-8859-1"?>
   <!-- $Id$ -->
  +<!DOCTYPE project [
  +	<!ENTITY projectroot '../'>	
  +	<!ENTITY % common-links SYSTEM "../../common/links.xml">
  +	%common-links;
  +	]>
   <project name="HiveMind Library">
   	<title>HiveMind Standard Library</title>
   	<body>
  @@ -9,5 +14,9 @@
         <item name="HiveMind:Framework" href="../commons-hivemind/index.html"/>      
       </links>
       		
  +    <menu name="Reference">
  +    	<item name="HiveDoc" href="/&hivemind-lib-hivedoc;"/>	
  +    </menu>
  +    
   		</body>
   </project>
  
  
  
  1.2       +3 -3      jakarta-commons-sandbox/hivemind/framework/src/java/org/apache/commons/hivemind/impl/ConstructableServiceExtensionPoint.java
  
  Index: ConstructableServiceExtensionPoint.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/framework/src/java/org/apache/commons/hivemind/impl/ConstructableServiceExtensionPoint.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ConstructableServiceExtensionPoint.java	1 Oct 2003 20:43:21 -0000	1.1
  +++ ConstructableServiceExtensionPoint.java	9 Oct 2003 22:58:16 -0000	1.2
  @@ -79,7 +79,7 @@
       public ServiceImplementationConstructor getServiceConstructor();
   
       /**
  -     * Returns a list of {@link ServiceInterceptorContribution}s, sorted
  +     * Returns a list of {@link org.apache.commons.hivemind.ServiceInterceptorContribution}s, sorted
        * into ascending order. May return an empty list if there are no
        * interceptors, but won't return null.
        */
  @@ -92,7 +92,7 @@
       public void clearConstructorInformation();
       
       /**
  -     * Returns the {@link ShutdownCooordinator}, used by
  +     * Returns the {@link org.apache.commons.hivemind.impl.ShutdownCooordinator}, used by
        * the service model to inform proxies that the service
        * has shutdown.
        */
  
  
  
  1.4       +5 -4      jakarta-commons-sandbox/hivemind/framework/src/java/org/apache/commons/hivemind/impl/SingletonServiceModel.java
  
  Index: SingletonServiceModel.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/framework/src/java/org/apache/commons/hivemind/impl/SingletonServiceModel.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SingletonServiceModel.java	6 Oct 2003 18:22:30 -0000	1.3
  +++ SingletonServiceModel.java	9 Oct 2003 22:58:16 -0000	1.4
  @@ -86,11 +86,12 @@
   
       /**
        * Overrides the super implementation to see if the
  -     * core service implementation implements {@link RegistryShutdownListener}.
  +     * core service implementation implements
  +     * {@link org.apache.commons.hivemind.RegistryShutdownListener}.
        */
  -    protected void initializeCoreServiceImplementation(Object core, Object intercepted)
  +    protected void initializeCoreServiceImplementation(Object core)
       {
  -        super.initializeCoreServiceImplementation(core, intercepted);
  +        super.initializeCoreServiceImplementation(core);
   
           registerForShutdownNotification(core);
       }
  
  
  
  1.4       +2 -2      jakarta-commons-sandbox/hivemind/framework/src/java/org/apache/commons/hivemind/impl/ProxyBuilder.java
  
  Index: ProxyBuilder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/framework/src/java/org/apache/commons/hivemind/impl/ProxyBuilder.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ProxyBuilder.java	6 Oct 2003 18:24:55 -0000	1.3
  +++ ProxyBuilder.java	9 Oct 2003 22:58:16 -0000	1.4
  @@ -110,7 +110,7 @@
   
       /**
        * Creates the service methods for the class.  
  -     * @parameter indirection the name of a variable, or a method invocation snippet,
  +     * @param indirection the name of a variable, or a method invocation snippet,
        * used to redirect the invocation on the proxy to the actual service implementation.
        */
       public void addServiceMethods(String indirection)
  
  
  
  1.5       +12 -5     jakarta-commons-sandbox/hivemind/framework/src/java/org/apache/commons/hivemind/impl/AbstractServiceModelImpl.java
  
  Index: AbstractServiceModelImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/framework/src/java/org/apache/commons/hivemind/impl/AbstractServiceModelImpl.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- AbstractServiceModelImpl.java	6 Oct 2003 18:22:30 -0000	1.4
  +++ AbstractServiceModelImpl.java	9 Oct 2003 22:58:16 -0000	1.5
  @@ -69,6 +69,12 @@
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
   
  +/**
  + * Base class for implementing {@link org.apache.commons.hivemind.ServiceModel}.
  + *
  + * @author Howard Lewis Ship
  + * @version $Id$
  + */
   public abstract class AbstractServiceModelImpl implements ServiceModel
   {
       private static final Log LOG = LogFactory.getLog(AbstractServiceModelImpl.class);
  @@ -167,12 +173,12 @@
        * the {@link Initializable} call back interface, if the
        * core implementation implements it.
        */
  -    protected void initializeCoreServiceImplementation(Object core, Object intercepted)
  +    protected void initializeCoreServiceImplementation(Object core)
       {
           if (core instanceof Initializable)
           {
               Initializable initializeCore = (Initializable) core;
  -            initializeCore.initializeService(intercepted);
  +            initializeCore.initializeService();
           }
       }
   
  @@ -190,8 +196,9 @@
   
       /**
        * Constructs the service implementation; this is invoked
  -     * from {@link #getService(Class)} and from the generated 
  -     * deferrable proxy.  Primarily, invokes
  +     * from {@link org.apache.commons.hivemind.ServiceExtensionPoint#getService(Class)} 
  +     * (for singletons), or from the generated 
  +     * deferrable proxy (for most service models).  Primarily, invokes
        * {@link #constructNewServiceImplementation()} from
        * within a block that checks for recursive builds.
        */
  @@ -233,7 +240,7 @@
   
               Object intercepted = addInterceptors(core);
   
  -            initializeCoreServiceImplementation(core, intercepted);
  +            initializeCoreServiceImplementation(core);
   
               return intercepted;
           }
  
  
  
  1.11      +2 -2      jakarta-commons-sandbox/hivemind/framework/src/java/org/apache/commons/hivemind/impl/RegistryBuilder.java
  
  Index: RegistryBuilder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/framework/src/java/org/apache/commons/hivemind/impl/RegistryBuilder.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- RegistryBuilder.java	6 Oct 2003 18:22:30 -0000	1.10
  +++ RegistryBuilder.java	9 Oct 2003 22:58:16 -0000	1.11
  @@ -101,7 +101,7 @@
    * and runtime logic.  Runtime logic is synchronized and threadsafe.  Construction-time logic
    * is not threadsafe.  Methods such as {@link org.apache.commons.hivemind.impl.RegistryImpl#addModule(Module)},
    * {@link org.apache.commons.hivemind.impl.ModuleImpl#addConfigurationPoint(ConfigurationPoint)},
  - * {@link org.apache.commons.hivemind.impl.ConfigurationPointImpl#addConfiguration(Contribution)}
  + * {@link org.apache.commons.hivemind.impl.ConfigurationPointImpl#addContribution(Contribution)}
    * and the like are construction-time.  Once the registry is fully constructed, it is not
    * allowed to invoke those methods (though, at this time, no checks occur).
    * 
  
  
  
  1.4       +3 -3      jakarta-commons-sandbox/hivemind/framework/src/java/org/apache/commons/hivemind/impl/DeferredServiceModel.java
  
  Index: DeferredServiceModel.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/framework/src/java/org/apache/commons/hivemind/impl/DeferredServiceModel.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DeferredServiceModel.java	6 Oct 2003 18:22:30 -0000	1.3
  +++ DeferredServiceModel.java	9 Oct 2003 22:58:16 -0000	1.4
  @@ -114,9 +114,9 @@
        * core service implementation implements {@link RegistryShutdownListener}.
        */
   
  -    protected void initializeCoreServiceImplementation(Object core, Object intercepted)
  +    protected void initializeCoreServiceImplementation(Object core)
       {
  -        super.initializeCoreServiceImplementation(core, intercepted);
  +        super.initializeCoreServiceImplementation(core);
   
           registerForShutdownNotification(core);
       }
  
  
  
  1.7       +8 -6      jakarta-commons-sandbox/hivemind/framework/src/java/org/apache/commons/hivemind/impl/ThreadedServiceModel.java
  
  Index: ThreadedServiceModel.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/framework/src/java/org/apache/commons/hivemind/impl/ThreadedServiceModel.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- ThreadedServiceModel.java	6 Oct 2003 18:22:30 -0000	1.6
  +++ ThreadedServiceModel.java	9 Oct 2003 22:58:16 -0000	1.7
  @@ -115,7 +115,7 @@
               // Orhpan this object
               _notifier.removeThreadCleanupListener(this);
   
  -            discardActiveService();
  +            unbindServiceFromCurrentThread();
   
               if (_core instanceof Discardable)
               {
  @@ -136,6 +136,9 @@
        */
       public synchronized Object getServiceImplementation()
       {
  +    	// _activeService will be null on first invocation; a good
  +    	// time to create it, the proxy, and find the notifier.
  +    	
           if (_activeService == null)
           {
               _activeService = new ThreadLocal();
  @@ -146,10 +149,9 @@
                   (ThreadEventNotifier) registry.getService(
                       HiveMind.THREAD_EVENT_NOTIFIER_SERVICE,
                       ThreadEventNotifier.class);
  -        }
   
  -        if (_serviceProxy == null)
               _serviceProxy = createServiceProxy();
  +        }
   
           return _serviceProxy;
       }
  @@ -205,7 +207,7 @@
               Object core = constructCoreServiceImplementation();
               Object result = addInterceptors(core);
   
  -            initializeCoreServiceImplementation(core, result);
  +            initializeCoreServiceImplementation(core);
   
               if (core instanceof RegistryShutdownListener)
                   LOG.error(
  @@ -230,7 +232,7 @@
           }
       }
   
  -    private void discardActiveService()
  +    private void unbindServiceFromCurrentThread()
       {
           _activeService.set(null);
       }
  
  
  
  1.2       +24 -11    jakarta-commons-sandbox/hivemind/framework/src/java/org/apache/commons/hivemind/impl/PooledServiceModel.java
  
  Index: PooledServiceModel.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/framework/src/java/org/apache/commons/hivemind/impl/PooledServiceModel.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- PooledServiceModel.java	6 Oct 2003 18:22:30 -0000	1.1
  +++ PooledServiceModel.java	9 Oct 2003 22:58:16 -0000	1.2
  @@ -103,22 +103,26 @@
   
       private class PooledService implements ThreadCleanupListener
       {
  -        Object _service;
  -        PoolManageable _managed;
  +        private Object _service;
  +        private PoolManageable _managed;
   
  -        PooledService(Object service)
  +		/**
  +		 * @param service the full service implementation, including any interceptors
  +		 * @param core the core service implementation, which may optionally implement {@link PoolManageable}
  +		 */
  +        PooledService(Object service, Object core)
           {
               _service = service;
   
  -            if (service instanceof PoolManageable)
  -                _managed = (PoolManageable) service;
  +            if (core instanceof PoolManageable)
  +                _managed = (PoolManageable) core;
               else
                   _managed = NULL_MANAGEABLE;
           }
   
           public void threadDidCleanup()
           {
  -            cleanupPooledService(this);
  +            unbindPooledServiceFromCurrentThread(this);
           }
   
           void activate()
  @@ -130,6 +134,15 @@
           {
               _managed.passivateService();
           }
  +        
  +        /**
  +         * Returns the configured, interceptor service implementation.
  +         */
  +        public Object getService()
  +        {
  +            return _service;
  +        }
  +
       }
   
       public PooledServiceModel(ConstructableServiceExtensionPoint servicePoint)
  @@ -192,7 +205,7 @@
               _activeService.set(pooled);
           }
   
  -        return pooled._service;
  +        return pooled.getService();
       }
   
       private PooledService obtainPooledService()
  @@ -230,11 +243,11 @@
               Object core = constructCoreServiceImplementation();
               Object intercepted = addInterceptors(core);
   
  -            initializeCoreServiceImplementation(core, intercepted);
  +            initializeCoreServiceImplementation(core);
   
               registerForShutdownNotification(core);
   
  -            return new PooledService(core);
  +            return new PooledService(intercepted, core);
           }
           catch (Exception ex)
           {
  @@ -247,7 +260,7 @@
           }
       }
   
  -    private void cleanupPooledService(PooledService pooled)
  +    private void unbindPooledServiceFromCurrentThread(PooledService pooled)
       {
           _notifier.removeThreadCleanupListener(pooled);
   
  
  
  
  1.20      +29 -57    jakarta-commons-sandbox/hivemind/src/xsl/hivemind.xsl
  
  
  
  
  1.5       +0 -0      jakarta-commons-sandbox/hivemind/src/xsl/hivemind.css
  
  
  
  
  1.17      +4 -4      jakarta-commons-sandbox/hivemind/common/links.xml
  
  Index: links.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/common/links.xml,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- links.xml	24 Sep 2003 16:07:52 -0000	1.16
  +++ links.xml	9 Oct 2003 22:58:17 -0000	1.17
  @@ -3,9 +3,9 @@
   <!ENTITY projectroot ''>
   
   <!ENTITY apiroot '&projectroot;commons-hivemind/apidocs/org/apache/commons/hivemind'>
  -<!ENTITY base-registry '&projectroot;commons-hivemind/base-registry'>
  -<!ENTITY hivemind-registry '&base-registry;/hivemind.html'>
  -<!ENTITY hivemind-lib-registry '&base-registry;/hivemind.lib.html'>
  +<!ENTITY hivedoc '&projectroot;hivedocs'>
  +<!ENTITY hivemind-hivedoc '&hivedoc;/hivemind.html'>
  +<!ENTITY hivemind-lib-hivedoc '&hivedoc;/hivemind.lib.html'>
   
   <!ENTITY _module '<code>&lt;module&gt;</code>'>
   <!ENTITY module '<a href="&projectroot;descriptor.html#module">&_module;</a>'>
  
  
  
  1.2       +2 -2      jakarta-commons-sandbox/hivemind/framework/src/test/hivemind/test/services/impl/CheckInitializeServiceImpl.java
  
  Index: CheckInitializeServiceImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/framework/src/test/hivemind/test/services/impl/CheckInitializeServiceImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CheckInitializeServiceImpl.java	16 Sep 2003 18:51:12 -0000	1.1
  +++ CheckInitializeServiceImpl.java	9 Oct 2003 22:58:17 -0000	1.2
  @@ -71,7 +71,7 @@
   {
       private boolean _didInitialize;
   
  -    public void initializeService(Object service)
  +    public void initializeService()
       {
           _didInitialize = true;
       }
  
  
  
  1.1                  jakarta-commons-sandbox/hivemind/library/maven.xml
  
  Index: maven.xml
  ===================================================================
  <?xml version="1.0"?>
  <!-- $Id: maven.xml,v 1.1 2003/10/09 22:58:17 hlship Exp $ -->
  <project xmlns:j="jelly:core" xmlns:u="jelly:util" xmlns:ant="jelly:ant">
  
  	<!-- Apparently, the <postGoal name="site"> in the master maven.xml
  		   is inherited here, and so we need to supply a No-Op hivedoc
  		   goal or break the build. -->
  	<goal name="hivedoc"/>
  	
  </project>
  
  
  
  1.2       +2 -2      jakarta-commons-sandbox/hivemind/framework/xdocs/ant/ManifestClassPath.xml
  
  Index: ManifestClassPath.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/framework/xdocs/ant/ManifestClassPath.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ManifestClassPath.xml	16 Sep 2003 18:51:14 -0000	1.1
  +++ ManifestClassPath.xml	9 Oct 2003 22:58:17 -0000	1.2
  @@ -37,7 +37,7 @@
   			
   			<tr>
   				<td>directory</td>	
  -				<td>If specified, then the directories does two things:
  +				<td>If specified, then the directory attribute does two things:
   					<ul>
   						<li>It acts as a filter, limiting the results to just those elements that are within the directory</li>
   				<li>It strips off the directory as a prefix (plus the separator), creating results that are
  
  
  
  1.3       +2 -2      jakarta-commons-sandbox/hivemind/library/src/java/org/apache/commons/hivemind/lib/impl/NameLookupImpl.java
  
  Index: NameLookupImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/library/src/java/org/apache/commons/hivemind/lib/impl/NameLookupImpl.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- NameLookupImpl.java	24 Sep 2003 16:07:52 -0000	1.2
  +++ NameLookupImpl.java	9 Oct 2003 22:58:17 -0000	1.3
  @@ -150,7 +150,7 @@
           return new InitialContext(properties);
       }
   
  -    public void initializeService(Object service)
  +    public void initializeService()
       {
           _coordinator.addRemoteExceptionListener(this);
       }
  
  
  
  1.2       +2 -2      jakarta-commons-sandbox/hivemind/framework/src/java/org/apache/commons/hivemind/service/impl/DefaultsSymbolSource.java
  
  Index: DefaultsSymbolSource.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/framework/src/java/org/apache/commons/hivemind/service/impl/DefaultsSymbolSource.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultsSymbolSource.java	16 Sep 2003 18:51:09 -0000	1.1
  +++ DefaultsSymbolSource.java	9 Oct 2003 22:58:17 -0000	1.2
  @@ -86,7 +86,7 @@
           return (String) _symbols.get(name);
       }
   
  -    public void initializeService(Object service)
  +    public void initializeService()
       {
           Map symbolMap = new HashMap();
   
  
  
  
  1.2       +2 -2      jakarta-commons-sandbox/hivemind/framework/src/java/org/apache/commons/hivemind/service/impl/ThreadLocalStorageImpl.java
  
  Index: ThreadLocalStorageImpl.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/hivemind/framework/src/java/org/apache/commons/hivemind/service/impl/ThreadLocalStorageImpl.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ThreadLocalStorageImpl.java	16 Sep 2003 18:51:10 -0000	1.1
  +++ ThreadLocalStorageImpl.java	9 Oct 2003 22:58:17 -0000	1.2
  @@ -118,7 +118,7 @@
        * Initializes the service; the implementation registers itself
        * with the {@link ThreadEventNotifier} as a {@link ThreadCleanupListener}.
        */
  -    public void initializeService(Object service)
  +    public void initializeService()
       {
           _notifier.addThreadCleanupListener(this);
       }
  
  
  

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