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/library/src/descriptor/META-INF hivemodule.xml
Date Wed, 07 Apr 2004 20:03:09 GMT
hlship      2004/04/07 13:03:09

  Modified:    framework/src/java/org/apache/hivemind/impl
                        RegistryBuilder.java
               framework/src/descriptor/META-INF hivemodule.xml
               framework/src/java/org/apache/hivemind/parse
                        InstanceBuilder.java CreateInstanceDescriptor.java
                        InvokeFactoryDescriptor.java DescriptorParser.java
                        ServicePointDescriptor.java
                        AbstractServiceInvocationDescriptor.java
               library/src/test/hivemind/test/lib EJBProxy.xml
               framework/src/test/hivemind/test/services StringHolder.xml
                        RecursiveService.xml ThreadedDiscardable.xml
                        ThreadedRegistryShutdown.xml Shutdown.xml
                        Pooled.xml
               library/src/descriptor/META-INF hivemodule.xml
  Log:
  Move the model descriptor element down to <create-instance> and <invoke-factory>.
  
  Revision  Changes    Path
  1.2       +2 -2      jakarta-hivemind/framework/src/java/org/apache/hivemind/impl/RegistryBuilder.java
  
  Index: RegistryBuilder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/impl/RegistryBuilder.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- RegistryBuilder.java	26 Feb 2004 23:07:40 -0000	1.1
  +++ RegistryBuilder.java	7 Apr 2004 20:03:08 -0000	1.2
  @@ -332,7 +332,7 @@
               point.setServiceInterfaceName(sd.getInterfaceClassName());
               point.setParametersSchema(sd.getParametersSchema());
   
  -            ServiceModelType modelType = sd.getModel();
  +            ServiceModelType modelType = sd.getInstanceBuilder().getServiceModelType();
               ServiceModel model = constructServiceModel(point, modelType);
   
               point.setServiceModel(model);
  
  
  
  1.10      +7 -7      jakarta-hivemind/framework/src/descriptor/META-INF/hivemodule.xml
  
  Index: hivemodule.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/descriptor/META-INF/hivemodule.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- hivemodule.xml	1 Mar 2004 19:38:56 -0000	1.9
  +++ hivemodule.xml	7 Apr 2004 20:03:08 -0000	1.10
  @@ -132,19 +132,19 @@
   		</invoke-factory>
   	</service-point>	
   	
  -	<service-point id="ClassFactory" interface="org.apache.hivemind.service.ClassFactory"
model="primitive">
  +	<service-point id="ClassFactory" interface="org.apache.hivemind.service.ClassFactory">
   		<description>Wrapper around Javassist used to dynamically create classes such as
service interceptors.</description>
  -		<create-instance class="org.apache.hivemind.service.impl.ClassFactoryImpl"/>
  +		<create-instance class="org.apache.hivemind.service.impl.ClassFactoryImpl" model="primitive"/>
   	</service-point>
   	
  -	<service-point id="LoggingInterceptor" interface="org.apache.hivemind.ServiceInterceptorFactory"
model="primitive">
  +	<service-point id="LoggingInterceptor" interface="org.apache.hivemind.ServiceInterceptorFactory">
   		<description>
   			An interceptor factory for adding method-level logging to a service. 
   			Logging occurs at level DEBUG and uses the service id as the logger. 
   		  Method entry (with parameters) and method exit (with return value) are logged,
   		  as are any exceptions.
   		 </description>
  -		<invoke-factory service-id="BuilderFactory">
  +		<invoke-factory service-id="BuilderFactory" model="primitive">
   			<construct
           class="org.apache.hivemind.service.impl.LoggingInterceptorFactory"
           service-id-property="serviceId">
  @@ -155,7 +155,7 @@
   	
   
   	
  -	<service-point id="BuilderFactory" interface="org.apache.hivemind.ServiceImplementationFactory"
model="primitive">
  +	<service-point id="BuilderFactory" interface="org.apache.hivemind.ServiceImplementationFactory">
   		<description>
   		Used to construct a service from a class name and optional constructor parameters and
properties.	
   		</description>
  @@ -440,7 +440,7 @@
   		  </element>
   		</parameters-schema>
   		
  -		<create-instance class="org.apache.hivemind.service.impl.BuilderFactory"/>
  +		<create-instance class="org.apache.hivemind.service.impl.BuilderFactory" model="primitive"/>
   	</service-point>
   
   
  
  
  
  1.2       +12 -1     jakarta-hivemind/framework/src/java/org/apache/hivemind/parse/InstanceBuilder.java
  
  Index: InstanceBuilder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/parse/InstanceBuilder.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- InstanceBuilder.java	26 Feb 2004 23:07:44 -0000	1.1
  +++ InstanceBuilder.java	7 Apr 2004 20:03:08 -0000	1.2
  @@ -18,6 +18,7 @@
   import org.apache.hivemind.Module;
   import org.apache.hivemind.ServiceExtensionPoint;
   import org.apache.hivemind.ServiceImplementationConstructor;
  +import org.apache.hivemind.impl.ServiceModelType;
   
   /**
    * Interface for an object that can construct the core implementation for a service.
  @@ -27,6 +28,16 @@
    */
   public interface InstanceBuilder extends Locatable
   {
  +	/**
  +	 * Returns the service model appropriate for the instance that will be
  +	 * created by the {@link ServiceImplementationConstructor}.
  +	 */
  +	public ServiceModelType getServiceModelType();
  +	
  +	/**
  +	 * Returns an instance of {@link ServiceImplementationConstructor}
  +	 * that will ultimately create the service implementation instance.
  +	 */
       public ServiceImplementationConstructor createConstructor(
           ServiceExtensionPoint point,
           Module contributingModule);
  
  
  
  1.2       +14 -1     jakarta-hivemind/framework/src/java/org/apache/hivemind/parse/CreateInstanceDescriptor.java
  
  Index: CreateInstanceDescriptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/parse/CreateInstanceDescriptor.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CreateInstanceDescriptor.java	26 Feb 2004 23:07:44 -0000	1.1
  +++ CreateInstanceDescriptor.java	7 Apr 2004 20:03:08 -0000	1.2
  @@ -20,6 +20,7 @@
   import org.apache.hivemind.ServiceImplementationConstructor;
   import org.apache.hivemind.impl.BaseLocatable;
   import org.apache.hivemind.impl.CreateClassServiceConstructor;
  +import org.apache.hivemind.impl.ServiceModelType;
   
   /**
    * Descriptor for the &lt;create-instance&lt; element, used to create
  @@ -30,6 +31,7 @@
    */
   public final class CreateInstanceDescriptor extends BaseLocatable implements InstanceBuilder
   {
  +	private ServiceModelType _serviceModelType = ServiceModelType.SINGLETON;
       private String _instanceClassName;
   
       public String getInstanceClassName()
  @@ -61,8 +63,19 @@
           ToStringBuilder builder = new ToStringBuilder(this);
   
           builder.append("instanceClassName", _instanceClassName);
  +        builder.append("serviceModelType", _serviceModelType);
   
           return builder.toString();
  +    }
  +
  +    public ServiceModelType getServiceModelType()
  +    {
  +        return _serviceModelType;
  +    }
  +
  +    public void setServiceModelType(ServiceModelType type)
  +    {
  +        _serviceModelType = type;
       }
   
   }
  
  
  
  1.2       +20 -1     jakarta-hivemind/framework/src/java/org/apache/hivemind/parse/InvokeFactoryDescriptor.java
  
  Index: InvokeFactoryDescriptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/parse/InvokeFactoryDescriptor.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- InvokeFactoryDescriptor.java	26 Feb 2004 23:07:44 -0000	1.1
  +++ InvokeFactoryDescriptor.java	7 Apr 2004 20:03:08 -0000	1.2
  @@ -14,10 +14,12 @@
   
   package org.apache.hivemind.parse;
   
  +import org.apache.commons.lang.builder.ToStringBuilder;
   import org.apache.hivemind.Module;
   import org.apache.hivemind.ServiceExtensionPoint;
   import org.apache.hivemind.ServiceImplementationConstructor;
   import org.apache.hivemind.impl.InvokeFactoryServiceConstructor;
  +import org.apache.hivemind.impl.ServiceModelType;
   
   /**
    * Descriptor for the &lt;invoke-factory&gt; element.
  @@ -29,6 +31,8 @@
       extends AbstractServiceInvocationDescriptor
       implements InstanceBuilder
   {
  +    private ServiceModelType _serviceModelType = ServiceModelType.SINGLETON;
  +
       public ServiceImplementationConstructor createConstructor(
           ServiceExtensionPoint point,
           Module contributingModule)
  @@ -42,6 +46,21 @@
           result.setServiceExtensionPoint(point);
   
           return result;
  +    }
  +
  +    public ServiceModelType getServiceModelType()
  +    {
  +        return _serviceModelType;
  +    }
  +
  +    public void setServiceModelType(ServiceModelType type)
  +    {
  +        _serviceModelType = type;
  +    }
  +
  +    protected void extendDescription(ToStringBuilder builder)
  +    {
  +        builder.append("serviceModelType", _serviceModelType);
       }
   
   }
  
  
  
  1.5       +13 -7     jakarta-hivemind/framework/src/java/org/apache/hivemind/parse/DescriptorParser.java
  
  Index: DescriptorParser.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/parse/DescriptorParser.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DescriptorParser.java	1 Mar 2004 22:56:27 -0000	1.4
  +++ DescriptorParser.java	7 Apr 2004 20:03:08 -0000	1.5
  @@ -226,7 +226,6 @@
       {
           SERVICE_POINT_ATTRIBUTES.put("id", Boolean.TRUE);
           SERVICE_POINT_ATTRIBUTES.put("interface", Boolean.TRUE);
  -        SERVICE_POINT_ATTRIBUTES.put("model", Boolean.FALSE);
       }
   
       private final Map IMPLEMENTATION_ATTRIBUTES = new HashMap();
  @@ -239,6 +238,7 @@
   
       {
           CREATE_INSTANCE_ATTRIBUTES.put("class", Boolean.TRUE);
  +        CREATE_INSTANCE_ATTRIBUTES.put("model", Boolean.FALSE);
       }
   
       private final Map INTERCEPTOR_ATTRIBUTES = new HashMap();
  @@ -296,6 +296,7 @@
   
       {
           INVOKE_FACTORY_ATTRIBUTES.put("service-id", Boolean.TRUE);
  +        INVOKE_FACTORY_ATTRIBUTES.put("model", Boolean.FALSE);
       }
   
       /**
  @@ -941,11 +942,6 @@
               spd.setId(extractId("id"));
               spd.setInterfaceClassName(getAttribute("interface"));
   
  -            ServiceModelType model = (ServiceModelType) getEnumAttribute("model", MODEL_MAP);
  -
  -            if (model != null)
  -                spd.setModel(model);
  -
               md.addServicePoint(spd);
   
               return;
  @@ -1141,6 +1137,11 @@
   
               cid.setInstanceClassName(getAttribute("class"));
   
  +            ServiceModelType model = (ServiceModelType) getEnumAttribute("model", MODEL_MAP);
  +
  +            if (model != null)
  +                cid.setServiceModelType(model);
  +
               sd.setInstanceBuilder(cid);
   
               return;
  @@ -1155,6 +1156,11 @@
               checkAttributes(INVOKE_FACTORY_ATTRIBUTES);
   
               ifd.setFactoryServiceId(getAttribute("service-id"));
  +
  +            ServiceModelType model = (ServiceModelType) getEnumAttribute("model", MODEL_MAP);
  +
  +            if (model != null)
  +                ifd.setServiceModelType(model);
   
               // TODO: Check if instanceBuilder already set
   
  
  
  
  1.2       +1 -14     jakarta-hivemind/framework/src/java/org/apache/hivemind/parse/ServicePointDescriptor.java
  
  Index: ServicePointDescriptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/parse/ServicePointDescriptor.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ServicePointDescriptor.java	26 Feb 2004 23:07:44 -0000	1.1
  +++ ServicePointDescriptor.java	7 Apr 2004 20:03:08 -0000	1.2
  @@ -15,7 +15,6 @@
   package org.apache.hivemind.parse;
   
   import org.apache.commons.lang.builder.ToStringBuilder;
  -import org.apache.hivemind.impl.ServiceModelType;
   import org.apache.hivemind.schema.Schema;
   
   /**
  @@ -30,7 +29,6 @@
       private String _id;
       private String _interfaceClassName;
       private Schema _parametersSchema;
  -    private ServiceModelType _model = ServiceModelType.SINGLETON;
   
       public String getId()
       {
  @@ -56,7 +54,6 @@
       {
           builder.append("id", _id);
           builder.append("interfaceClassName", _interfaceClassName);
  -        builder.append("model", _model);
           builder.append("parametersSchema", _parametersSchema);
       }
   
  @@ -68,16 +65,6 @@
       public void setParametersSchema(Schema schema)
       {
           _parametersSchema = schema;
  -    }
  -
  -    public ServiceModelType getModel()
  -    {
  -        return _model;
  -    }
  -
  -    public void setModel(ServiceModelType model)
  -    {
  -        _model = model;
       }
   
   }
  
  
  
  1.2       +12 -1     jakarta-hivemind/framework/src/java/org/apache/hivemind/parse/AbstractServiceInvocationDescriptor.java
  
  Index: AbstractServiceInvocationDescriptor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/java/org/apache/hivemind/parse/AbstractServiceInvocationDescriptor.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractServiceInvocationDescriptor.java	26 Feb 2004 23:07:44 -0000	1.1
  +++ AbstractServiceInvocationDescriptor.java	7 Apr 2004 20:03:08 -0000	1.2
  @@ -63,8 +63,19 @@
       
           builder.append("factoryServiceId", _factoryServiceId);
           builder.append("parameters", _parameters);
  +       
  +    	extendDescription(builder);
       
           return builder.toString();
       }
  +    
  +    /**
  +     * Overridden in subclasses to provide more information about
  +     * the instance. This implementation does nothing.
  +     */
  +    protected void extendDescription(ToStringBuilder builder)
  +    {
  +    }
   
  +	
   }
  
  
  
  1.3       +17 -3     jakarta-hivemind/library/src/test/hivemind/test/lib/EJBProxy.xml
  
  Index: EJBProxy.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/library/src/test/hivemind/test/lib/EJBProxy.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- EJBProxy.xml	26 Feb 2004 23:07:52 -0000	1.2
  +++ EJBProxy.xml	7 Apr 2004 20:03:09 -0000	1.3
  @@ -1,4 +1,19 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!-- 
  +   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.
  +-->
   <!-- $Id$ -->
   <module
   	id="hivemind.test.lib" 
  @@ -16,8 +31,7 @@
     </service-point>
     
   	<service-point id="NameLookup"
  -			interface="org.apache.hivemind.lib.NameLookup"
  -			model="primitive">
  +			interface="org.apache.hivemind.lib.NameLookup">
   		<description>
   			A service which can perform name lookups of objects using JNDI.
   		</description>	
  
  
  
  1.3       +18 -3     jakarta-hivemind/framework/src/test/hivemind/test/services/StringHolder.xml
  
  Index: StringHolder.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/test/hivemind/test/services/StringHolder.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- StringHolder.xml	18 Sep 2003 19:00:59 -0000	1.2
  +++ StringHolder.xml	7 Apr 2004 20:03:09 -0000	1.3
  @@ -1,14 +1,29 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!-- 
  +   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.
  +-->
   <!-- $Id$ -->
   <module
   	id="hivemind.test.services" 
   	version="0.0.1">
  -	<service-point id="StringHolder" interface="hivemind.test.services.StringHolder" model="threaded">
  +	<service-point id="StringHolder" interface="hivemind.test.services.StringHolder">
   	  
   	  <!-- Could just use create-instance, but looking for some code coverage instead
   	  	   InvokeFactoryServiceConstructor -->
   	  	   
  -	  <invoke-factory service-id="hivemind.BuilderFactory">
  +	  <invoke-factory service-id="hivemind.BuilderFactory" model="threaded">
   	  	<construct class="hivemind.test.services.impl.StringHolderImpl"/>	
   	  </invoke-factory>
   
  
  
  
  1.4       +22 -7     jakarta-hivemind/framework/src/test/hivemind/test/services/RecursiveService.xml
  
  Index: RecursiveService.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/test/hivemind/test/services/RecursiveService.xml,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- RecursiveService.xml	26 Feb 2004 23:07:36 -0000	1.3
  +++ RecursiveService.xml	7 Apr 2004 20:03:09 -0000	1.4
  @@ -1,10 +1,25 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!-- 
  +   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.
  +-->
   <!-- $Id$ -->
   <module
   	id="hivemind.test.services.tracker" 
   	version="0.0.1">
  -	<service-point id="Fred" interface="org.apache.hivemind.ServiceInterceptorFactory"
model="primitive">
  -		<invoke-factory service-id="hivemind.BuilderFactory">
  +	<service-point id="Fred" interface="org.apache.hivemind.ServiceInterceptorFactory">
  +		<invoke-factory service-id="hivemind.BuilderFactory" model="primitive">
   			<construct class="hivemind.test.services.impl.TrackerFactory">
   				<set property="name" value="Fred"/>
   			</construct>
  @@ -12,8 +27,8 @@
   	  <interceptor service-id="Barney"/>
   	</service-point>
   	
  -	<service-point id="Barney" interface="org.apache.hivemind.ServiceInterceptorFactory"
model="primitive">
  -		<invoke-factory service-id="hivemind.BuilderFactory">
  +	<service-point id="Barney" interface="org.apache.hivemind.ServiceInterceptorFactory">
  +		<invoke-factory service-id="hivemind.BuilderFactory" model="primitive">
   			<construct class="hivemind.test.services.impl.TrackerFactory">
   				<set property="name" value="Barney"/>
   			</construct>
  @@ -21,8 +36,8 @@
   	  <interceptor service-id="Wilma"/>	  
   	</service-point>
   	
  -	<service-point id="Wilma" interface="org.apache.hivemind.ServiceInterceptorFactory"
model="primitive">
  -		<invoke-factory service-id="hivemind.BuilderFactory">
  +	<service-point id="Wilma" interface="org.apache.hivemind.ServiceInterceptorFactory">
  +		<invoke-factory service-id="hivemind.BuilderFactory" model="primitive">
   			<construct class="hivemind.test.services.impl.TrackerFactory">
   				<set property="name" value="Wilma"/>
   			</construct>
  
  
  
  1.2       +18 -3     jakarta-hivemind/framework/src/test/hivemind/test/services/ThreadedDiscardable.xml
  
  Index: ThreadedDiscardable.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/test/hivemind/test/services/ThreadedDiscardable.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ThreadedDiscardable.xml	2 Oct 2003 18:42:06 -0000	1.1
  +++ ThreadedDiscardable.xml	7 Apr 2004 20:03:09 -0000	1.2
  @@ -1,11 +1,26 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!-- 
  +   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.
  +-->
   <!-- $Id$ -->
   <module
   	id="hivemind.test.services" 
   	version="1.0.0">
  -	<service-point id="ThreadedDiscardable" interface="hivemind.test.services.StringHolder"
model="threaded">
  +	<service-point id="ThreadedDiscardable" interface="hivemind.test.services.StringHolder">
   	  
  -	  <invoke-factory service-id="hivemind.BuilderFactory">
  +	  <invoke-factory service-id="hivemind.BuilderFactory" model="threaded">
     		<construct class="hivemind.test.services.impl.DiscardableStringHolderImpl"
     			log-property="log"/>	  	
   	  </invoke-factory>
  
  
  
  1.2       +18 -3     jakarta-hivemind/framework/src/test/hivemind/test/services/ThreadedRegistryShutdown.xml
  
  Index: ThreadedRegistryShutdown.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/test/hivemind/test/services/ThreadedRegistryShutdown.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ThreadedRegistryShutdown.xml	2 Oct 2003 18:42:06 -0000	1.1
  +++ ThreadedRegistryShutdown.xml	7 Apr 2004 20:03:09 -0000	1.2
  @@ -1,11 +1,26 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!-- 
  +   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.
  +-->
   <!-- $Id$ -->
   <module
   	id="hivemind.test.services" 
   	version="1.0.0">
  -	<service-point id="ThreadedRegistryShutdown" interface="hivemind.test.services.StringHolder"
model="threaded">
  +	<service-point id="ThreadedRegistryShutdown" interface="hivemind.test.services.StringHolder">
   	  
  -	  <create-instance class="hivemind.test.services.impl.RegistryShutdownStringHolderImpl"/>

  +	  <create-instance class="hivemind.test.services.impl.RegistryShutdownStringHolderImpl"
model="threaded"/>	
   
   	</service-point>
   </module>
  
  
  
  1.3       +19 -4     jakarta-hivemind/framework/src/test/hivemind/test/services/Shutdown.xml
  
  Index: Shutdown.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/test/hivemind/test/services/Shutdown.xml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Shutdown.xml	26 Feb 2004 23:07:36 -0000	1.2
  +++ Shutdown.xml	7 Apr 2004 20:03:09 -0000	1.3
  @@ -1,17 +1,32 @@
   <?xml version="1.0" encoding="UTF-8"?>
  +<!-- 
  +   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.
  +-->
   <!-- $Id$ -->
   <module
   	id="hivemind.test.services" 
   	version="1.0.0">
  -	<service-point id="Primitive" interface="java.lang.Runnable" model="primitive">
  -		<invoke-factory service-id="hivemind.BuilderFactory">
  +	<service-point id="Primitive" interface="java.lang.Runnable">
  +		<invoke-factory service-id="hivemind.BuilderFactory" model="primitive">
   		  <construct class="hivemind.test.services.impl.RunnableImpl" log-property="log">
   		  	<set property="type" value="Primitive"/>	
   		  </construct>	
   		</invoke-factory>
   	</service-point>
   	
  -	<service-point id="Singleton" interface="java.lang.Runnable" model="singleton">
  +	<service-point id="Singleton" interface="java.lang.Runnable">
   		<invoke-factory service-id="hivemind.BuilderFactory">
   		  <construct class="hivemind.test.services.impl.RunnableImpl" log-property="log">
   		  	<set property="type" value="Singleton"/>	
  
  
  
  1.2       +20 -5     jakarta-hivemind/framework/src/test/hivemind/test/services/Pooled.xml
  
  Index: Pooled.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/framework/src/test/hivemind/test/services/Pooled.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Pooled.xml	6 Oct 2003 18:22:30 -0000	1.1
  +++ Pooled.xml	7 Apr 2004 20:03:09 -0000	1.2
  @@ -1,16 +1,31 @@
   <?xml version="1.0"?>
  +<!-- 
  +   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.
  +-->
   <!-- $Id$ -->
   <module id="hivemind.test.services" version="1.0.0">
   
  -  <service-point id="Managed" interface="hivemind.test.services.StringHolder" model="pooled">
  -  	<invoke-factory service-id="hivemind.BuilderFactory">
  +  <service-point id="Managed" interface="hivemind.test.services.StringHolder">
  +  	<invoke-factory service-id="hivemind.BuilderFactory" model="pooled">
     		<construct class="hivemind.test.services.impl.PooledStringHolderImpl"
     				log-property="log"/>	
     	</invoke-factory>	
     </service-point>
     
  -  <service-point id="Unmanaged" interface="hivemind.test.services.StringHolder" model="pooled">
  -  	<create-instance class="hivemind.test.services.impl.StringHolderImpl"/>	
  +  <service-point id="Unmanaged" interface="hivemind.test.services.StringHolder">
  +  	<create-instance class="hivemind.test.services.impl.StringHolderImpl" model="pooled"/>

     </service-point>
     
   </module>
  
  
  
  1.5       +6 -7      jakarta-hivemind/library/src/descriptor/META-INF/hivemodule.xml
  
  Index: hivemodule.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-hivemind/library/src/descriptor/META-INF/hivemodule.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- hivemodule.xml	1 Mar 2004 01:08:02 -0000	1.4
  +++ hivemodule.xml	7 Apr 2004 20:03:09 -0000	1.5
  @@ -18,16 +18,15 @@
   <module id="hivemind.lib" version="1.0.0">
   
   	<service-point id="RemoteExceptionCoordinator"
  -			interface="org.apache.hivemind.lib.RemoteExceptionCoordinator"
  -			model="primitive">
  +			interface="org.apache.hivemind.lib.RemoteExceptionCoordinator">
   		<description>Used to coordinate propogation of remote exceptions (typically, to
allow
   			cached remote data to be discarded after a remote exception).</description>		
  -			<create-instance class="org.apache.hivemind.lib.impl.RemoteExceptionCoordinatorImpl"/>
  +			<create-instance class="org.apache.hivemind.lib.impl.RemoteExceptionCoordinatorImpl"

  +			  model="primitive"/>
   	</service-point>
   	
   	<service-point id="NameLookup"
  -			interface="org.apache.hivemind.lib.NameLookup"
  -			model="singleton">
  +			interface="org.apache.hivemind.lib.NameLookup">
   		<description>
   			A service which can perform name lookups of objects using JNDI.
   		</description>	
  @@ -51,7 +50,7 @@
   	</contribution>
   
   	<service-point id="EJBProxyFactory"
  -		interface="org.apache.hivemind.ServiceImplementationFactory" model="singleton">
  +		interface="org.apache.hivemind.ServiceImplementationFactory">
   		<description>
   		Core service implementation factory that constructs dynamic proxies to EJB stateless
session beans. 
   		Factory parameters are used to specify the JNDI name of the EJB and the name 
  
  
  

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