You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hivemind.apache.org by ah...@apache.org on 2006/10/04 08:25:31 UTC
svn commit: r452755 [2/2] - in /hivemind/branches/branch-2-0-annot: ./
framework/src/java/org/apache/hivemind/definition/
framework/src/java/org/apache/hivemind/definition/construction/
framework/src/java/org/apache/hivemind/impl/ framework/src/java/or...
Modified: hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/service/impl/JdkBeanInterfaceFactory.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/service/impl/JdkBeanInterfaceFactory.java?view=diff&rev=452755&r1=452754&r2=452755
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/service/impl/JdkBeanInterfaceFactory.java (original)
+++ hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/service/impl/JdkBeanInterfaceFactory.java Tue Oct 3 23:25:27 2006
@@ -19,9 +19,8 @@
import java.lang.reflect.Proxy;
import org.apache.hivemind.Location;
+import org.apache.hivemind.definition.construction.ImplementationConstructionContext;
import org.apache.hivemind.internal.AbstractServiceImplementationConstructor;
-import org.apache.hivemind.internal.Module;
-import org.apache.hivemind.internal.ServicePoint;
/**
*
@@ -36,7 +35,7 @@
super(location);
}
- public Object constructCoreServiceImplementation(ServicePoint servicePoint, Module contributingModule)
+ public Object constructCoreServiceImplementation(ImplementationConstructionContext context)
{
return createJdkBean();
}
Modified: hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/service/impl/TestLoggingInterceptorFactory.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/service/impl/TestLoggingInterceptorFactory.java?view=diff&rev=452755&r1=452754&r2=452755
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/service/impl/TestLoggingInterceptorFactory.java (original)
+++ hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/service/impl/TestLoggingInterceptorFactory.java Tue Oct 3 23:25:27 2006
@@ -24,10 +24,10 @@
import org.apache.hivemind.definition.RegistryDefinition;
import org.apache.hivemind.definition.ServiceImplementationDefinition;
import org.apache.hivemind.definition.ServicePointDefinition;
+import org.apache.hivemind.definition.construction.ImplementationConstructor;
import org.apache.hivemind.impl.DefaultErrorHandler;
import org.apache.hivemind.impl.InterceptorStackImpl;
import org.apache.hivemind.internal.Module;
-import org.apache.hivemind.internal.ServiceImplementationConstructor;
import org.apache.hivemind.internal.ServiceModel;
import org.apache.hivemind.internal.ServicePoint;
import org.apache.hivemind.service.ClassFactory;
@@ -120,7 +120,7 @@
* Builds a registry containing a service "BeanInterface" that constructs its instance
* by using the passed constructor.
*/
- private Registry createRegistry(ServiceImplementationConstructor constructor)
+ private Registry createRegistry(ImplementationConstructor constructor)
{
RegistryDefinition definition = new RegistryDefinition(new DefaultErrorHandler());
Modified: hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/ant/RegistrySerializer.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/ant/RegistrySerializer.java?view=diff&rev=452755&r1=452754&r2=452755
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/ant/RegistrySerializer.java (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/ant/RegistrySerializer.java Tue Oct 3 23:25:27 2006
@@ -35,6 +35,7 @@
import org.apache.hivemind.definition.ServiceImplementationDefinition;
import org.apache.hivemind.definition.ServiceInterceptorDefinition;
import org.apache.hivemind.definition.ServicePointDefinition;
+import org.apache.hivemind.definition.construction.ImplementationConstructor;
import org.apache.hivemind.impl.CreateClassServiceConstructor;
import org.apache.hivemind.impl.DefaultErrorHandler;
import org.apache.hivemind.impl.InvokeFactoryServiceConstructor;
@@ -42,7 +43,6 @@
import org.apache.hivemind.impl.natures.XmlConfigurationPointNature;
import org.apache.hivemind.impl.natures.XmlRegistryNature;
import org.apache.hivemind.impl.natures.XmlServicePointNature;
-import org.apache.hivemind.internal.ServiceImplementationConstructor;
import org.apache.hivemind.internal.Visibility;
import org.apache.hivemind.parse.AttributeMappingDescriptor;
import org.apache.hivemind.parse.ConversionDescriptor;
@@ -447,7 +447,7 @@
// return subModule;
// }
- private Element getInstanceBuilderElement(ServiceImplementationDefinition id, ServiceImplementationConstructor ib)
+ private Element getInstanceBuilderElement(ServiceImplementationDefinition id, ImplementationConstructor ib)
{
Element instanceBuilder;
Modified: hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/InvokeFactoryServiceConstructor.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/InvokeFactoryServiceConstructor.java?view=diff&rev=452755&r1=452754&r2=452755
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/InvokeFactoryServiceConstructor.java (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/InvokeFactoryServiceConstructor.java Tue Oct 3 23:25:27 2006
@@ -23,6 +23,7 @@
import org.apache.hivemind.ServiceImplementationFactory;
import org.apache.hivemind.ServiceImplementationFactoryParameters;
import org.apache.hivemind.TranslatorManager;
+import org.apache.hivemind.definition.construction.ImplementationConstructionContext;
import org.apache.hivemind.impl.natures.XmlRegistryNature;
import org.apache.hivemind.impl.natures.XmlServicePointNature;
import org.apache.hivemind.internal.AbstractServiceImplementationConstructor;
@@ -56,14 +57,14 @@
super(location);
}
- public Object constructCoreServiceImplementation(ServicePoint servicePoint, Module contributingModule)
+ public Object constructCoreServiceImplementation(ImplementationConstructionContext context)
{
- setupFactoryAndParameters(servicePoint, contributingModule);
+ setupFactoryAndParameters(context.getServicePoint(), context.getDefiningModule());
try
{
ServiceImplementationFactoryParameters factoryParameters = new ServiceImplementationFactoryParametersImpl(
- servicePoint, contributingModule, _convertedParameters);
+ context.getServicePoint(), context.getDefiningModule(), _convertedParameters);
return _factory.createCoreServiceImplementation(factoryParameters);
}
Modified: hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/SchemaProcessorImpl.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/SchemaProcessorImpl.java?view=diff&rev=452755&r1=452754&r2=452755
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/SchemaProcessorImpl.java (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/SchemaProcessorImpl.java Tue Oct 3 23:25:27 2006
@@ -30,7 +30,7 @@
import org.apache.hivemind.util.Defense;
/**
- * Used to assemble all the {@link org.apache.hivemind.internal.Contribution}s contributed to an
+ * Used to assemble all the data contributed to an
* {@link org.apache.hivemind.internal.ConfigurationPoint} while converting the XML (represented as
* {@link org.apache.hivemind.Element}s into Java objects.
*
Modified: hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/ServiceImplementationFactoryParametersImpl.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/ServiceImplementationFactoryParametersImpl.java?view=diff&rev=452755&r1=452754&r2=452755
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/ServiceImplementationFactoryParametersImpl.java (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/ServiceImplementationFactoryParametersImpl.java Tue Oct 3 23:25:27 2006
@@ -18,8 +18,8 @@
import org.apache.commons.logging.Log;
import org.apache.hivemind.ApplicationRuntimeException;
-import org.apache.hivemind.ServiceImplementationFactoryParameters;
import org.apache.hivemind.ErrorLog;
+import org.apache.hivemind.ServiceImplementationFactoryParameters;
import org.apache.hivemind.internal.Module;
import org.apache.hivemind.internal.ServicePoint;
import org.apache.hivemind.util.Defense;
Modified: hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlConfigurationConstructor.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlConfigurationConstructor.java?view=diff&rev=452755&r1=452754&r2=452755
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlConfigurationConstructor.java (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlConfigurationConstructor.java Tue Oct 3 23:25:27 2006
@@ -3,8 +3,8 @@
import java.util.ArrayList;
import org.apache.hivemind.Location;
-import org.apache.hivemind.internal.ConfigurationConstructor;
-import org.apache.hivemind.internal.Module;
+import org.apache.hivemind.definition.construction.ConfigurationConstructionContext;
+import org.apache.hivemind.definition.construction.ConfigurationConstructor;
import org.apache.hivemind.util.InstanceCreationUtils;
public class XmlConfigurationConstructor implements ConfigurationConstructor
@@ -18,7 +18,7 @@
_location = location;
}
- public Object constructConfigurationContainer(Module contributingModule)
+ public Object constructConfigurationContainer(ConfigurationConstructionContext context)
{
if (_containerClassName == null) {
// For Backward compatiblity create an empty list. Contributions
@@ -28,7 +28,7 @@
return new ArrayList();
} else {
return InstanceCreationUtils.createInstance(
- contributingModule,
+ context.getDefiningModule(),
_containerClassName,
getLocation());
}
Copied: hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlContributionImpl.java (from r451788, hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/ContributionImpl.java)
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlContributionImpl.java?view=diff&rev=452755&p1=hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/ContributionImpl.java&r1=451788&p2=hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlContributionImpl.java&r2=452755
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/ContributionImpl.java (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlContributionImpl.java Tue Oct 3 23:25:27 2006
@@ -20,26 +20,26 @@
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.TranslatorManager;
+import org.apache.hivemind.definition.construction.ContributionConstructionContext;
+import org.apache.hivemind.definition.construction.ContributionConstructor;
import org.apache.hivemind.impl.natures.XmlConfigurationPointNature;
import org.apache.hivemind.impl.natures.XmlRegistryNature;
-import org.apache.hivemind.internal.ConfigurationPoint;
-import org.apache.hivemind.internal.Contribution;
import org.apache.hivemind.internal.Module;
import org.apache.hivemind.schema.Schema;
/**
- * Implements the {@link org.apache.hivemind.internal.Contribution} interface, a wrapper
+ * Implements the {@link org.apache.hivemind.definition.construction.ContributionConstructor} interface, a wrapper
* around objects that can provide values that plug into an extension point.
*
* @author Howard Lewis Ship
*/
-public final class ContributionImpl implements Contribution
+public final class XmlContributionImpl implements ContributionConstructor
{
private String _contributingModuleId;
private List _elements;
- public ContributionImpl(String moduleId, List elements)
+ public XmlContributionImpl(String moduleId, List elements)
{
_contributingModuleId = moduleId;
_elements = elements;
@@ -66,23 +66,23 @@
return _elements;
}
- public void contribute(ConfigurationPoint configurationPoint, Object container)
+ public void contribute(ContributionConstructionContext context, Object container)
{
// Retrieve xml nature
- XmlConfigurationPointNature xmlNature = (XmlConfigurationPointNature) configurationPoint.getNature(XmlConfigurationPointNature.class);
+ XmlConfigurationPointNature xmlNature = (XmlConfigurationPointNature) context.getConfigurationPoint().getNature(XmlConfigurationPointNature.class);
if (xmlNature == null) {
// TODO:
throw new ApplicationRuntimeException("Configuration point has no associated xml schema. You can define one with a schema element that uses the configuration-id attribute");
}
- Module contributingModule = configurationPoint.getModule().getModule(_contributingModuleId);
+ Module contributingModule = context.getDefiningModule();
XmlRegistryNature xmlRegistryNature = (XmlRegistryNature) contributingModule.getRegistryNature(XmlRegistryNature.class);
TranslatorManager translatorManager = xmlRegistryNature.getTranslationManager();
Schema contributionsSchema = xmlNature.getSchema();
if (contributionsSchema != null) {
- SchemaProcessorImpl processor = new SchemaProcessorImpl(configurationPoint.getErrorLog(), contributionsSchema);
+ SchemaProcessorImpl processor = new SchemaProcessorImpl(context.getConfigurationPoint().getErrorLog(), contributionsSchema);
processor.process(container, getElements(), contributingModule, translatorManager);
} else {
// Expect a list that was created by {@link XmlConfigurationConstructor} for
Propchange: hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlContributionImpl.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.6
Propchange: hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlContributionImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlContributionImpl.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlImplMessages.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlImplMessages.java?view=diff&rev=452755&r1=452754&r2=452755
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlImplMessages.java (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlImplMessages.java Tue Oct 3 23:25:27 2006
@@ -30,7 +30,7 @@
*/
class XmlImplMessages
{
- private static final MessageFormatter _formatter = new MessageFormatter(ImplMessages.class,
+ private static final MessageFormatter _formatter = new MessageFormatter(XmlImplMessages.class,
"XmlImplStrings");
Modified: hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlModuleDescriptorProcessor.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlModuleDescriptorProcessor.java?view=diff&rev=452755&r1=452754&r2=452755
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlModuleDescriptorProcessor.java (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlModuleDescriptorProcessor.java Tue Oct 3 23:25:27 2006
@@ -295,7 +295,7 @@
String qualifiedId = IdUtils.qualify(moduleId, pointId);
ContributionDefinition contribution = new ContributionDefinition(module, cd.getLocation(),
- new ContributionImpl(moduleId, cd.getElements()));
+ new XmlContributionImpl(moduleId, cd.getElements()));
module.addContribution(qualifiedId, contribution);
}
Modified: hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlModuleReader.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlModuleReader.java?view=diff&rev=452755&r1=452754&r2=452755
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlModuleReader.java (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlModuleReader.java Tue Oct 3 23:25:27 2006
@@ -64,7 +64,7 @@
}
/**
- * Reads a module specified bye a {@link Resource}
+ * Reads a module specified by a {@link Resource}
*
* @param moduleResource the resource specifying the location of the module
* @throws ApplicationRuntimeException if resource wasn't found
Modified: hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/CreateInstanceDescriptor.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/CreateInstanceDescriptor.java?view=diff&rev=452755&r1=452754&r2=452755
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/CreateInstanceDescriptor.java (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/CreateInstanceDescriptor.java Tue Oct 3 23:25:27 2006
@@ -14,9 +14,9 @@
package org.apache.hivemind.parse;
+import org.apache.hivemind.definition.construction.ImplementationConstructor;
import org.apache.hivemind.impl.BaseLocatable;
import org.apache.hivemind.impl.CreateClassServiceConstructor;
-import org.apache.hivemind.internal.ServiceImplementationConstructor;
import org.apache.hivemind.util.ToStringBuilder;
/**
@@ -40,7 +40,7 @@
_instanceClassName = string;
}
- public ServiceImplementationConstructor createConstructor(
+ public ImplementationConstructor createConstructor(
String contributingModuleId)
{
CreateClassServiceConstructor result = new CreateClassServiceConstructor(
Modified: hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/InstanceBuilder.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/InstanceBuilder.java?view=diff&rev=452755&r1=452754&r2=452755
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/InstanceBuilder.java (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/InstanceBuilder.java Tue Oct 3 23:25:27 2006
@@ -15,7 +15,7 @@
package org.apache.hivemind.parse;
import org.apache.hivemind.Locatable;
-import org.apache.hivemind.internal.ServiceImplementationConstructor;
+import org.apache.hivemind.definition.construction.ImplementationConstructor;
/**
* Interface for an object that can construct the core implementation for a service.
@@ -26,14 +26,14 @@
{
/**
* Returns the name of a service model appropriate for the instance that will be
- * created by the {@link ServiceImplementationConstructor}.
+ * created by the {@link ImplementationConstructor}.
*/
public String getServiceModel();
/**
- * Returns an instance of {@link ServiceImplementationConstructor}
+ * Returns an instance of {@link ImplementationConstructor}
* that will ultimately create the service implementation instance.
*/
- public ServiceImplementationConstructor createConstructor(
+ public ImplementationConstructor createConstructor(
String contributingModuleId);
}
Modified: hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/InvokeFactoryDescriptor.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/InvokeFactoryDescriptor.java?view=diff&rev=452755&r1=452754&r2=452755
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/InvokeFactoryDescriptor.java (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/parse/InvokeFactoryDescriptor.java Tue Oct 3 23:25:27 2006
@@ -14,8 +14,8 @@
package org.apache.hivemind.parse;
+import org.apache.hivemind.definition.construction.ImplementationConstructor;
import org.apache.hivemind.impl.InvokeFactoryServiceConstructor;
-import org.apache.hivemind.internal.ServiceImplementationConstructor;
import org.apache.hivemind.util.ToStringBuilder;
/**
@@ -29,7 +29,7 @@
{
private String _serviceModel;
- public ServiceImplementationConstructor createConstructor(
+ public ImplementationConstructor createConstructor(
String contributingModuleId)
{
InvokeFactoryServiceConstructor result = new InvokeFactoryServiceConstructor(getLocation(),
Modified: hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/schema/SchemaProcessor.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/schema/SchemaProcessor.java?view=diff&rev=452755&r1=452754&r2=452755
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/schema/SchemaProcessor.java (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/schema/SchemaProcessor.java Tue Oct 3 23:25:27 2006
@@ -18,7 +18,7 @@
/**
* Object used when processing the elements contributed in an
- * {@link org.apache.hivemind.internal.Contribution}.
+ * {@link org.apache.hivemind.definition.construction.ContributionConstructor}.
*
* @author Howard Lewis Ship
*/
Copied: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/impl/ServiceModelThreading.xml (from r451788, hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/ServiceModelThreading.xml)
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/impl/ServiceModelThreading.xml?view=diff&rev=452755&p1=hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/ServiceModelThreading.xml&r1=451788&p2=hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/impl/ServiceModelThreading.xml&r2=452755
==============================================================================
(empty)
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/impl/ServiceModelThreading.xml
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.2
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/impl/ServiceModelThreading.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/impl/ServiceModelThreading.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/impl/TestInvokeFactoryServiceConstructor.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/impl/TestInvokeFactoryServiceConstructor.java?view=diff&rev=452755&r1=452754&r2=452755
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/impl/TestInvokeFactoryServiceConstructor.java (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/impl/TestInvokeFactoryServiceConstructor.java Tue Oct 3 23:25:27 2006
@@ -26,8 +26,10 @@
import org.apache.hivemind.Occurances;
import org.apache.hivemind.Registry;
import org.apache.hivemind.ServiceImplementationFactory;
+import org.apache.hivemind.definition.construction.ImplementationConstructionContext;
import org.apache.hivemind.impl.natures.XmlRegistryNature;
import org.apache.hivemind.impl.natures.XmlServicePointNature;
+import org.apache.hivemind.internal.ImplementationConstructionContextImpl;
import org.apache.hivemind.internal.Module;
import org.apache.hivemind.internal.ServicePoint;
import org.apache.hivemind.schema.impl.SchemaImpl;
@@ -111,7 +113,8 @@
c.setFactoryServiceId("foo.bar.Baz");
c.setParameters(Collections.EMPTY_LIST);
- assertEquals("THE SERVICE", c.constructCoreServiceImplementation(point, module));
+ ImplementationConstructionContext context = new ImplementationConstructionContextImpl(module, point);
+ assertEquals("THE SERVICE", c.constructCoreServiceImplementation(context));
verifyControls();
}
Modified: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/TestBuilderFactory.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/TestBuilderFactory.java?view=diff&rev=452755&r1=452754&r2=452755
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/TestBuilderFactory.java (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/TestBuilderFactory.java Tue Oct 3 23:25:27 2006
@@ -42,7 +42,6 @@
import org.apache.hivemind.service.impl.BuilderMessagesFacet;
import org.apache.hivemind.service.impl.BuilderParameter;
import org.apache.hivemind.service.impl.BuilderServiceIdFacet;
-import org.apache.hivemind.test.HiveMindTestCase;
import org.apache.hivemind.xml.XmlTestCase;
import org.easymock.MockControl;
Modified: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/TestBuilderFactoryServiceModel.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/TestBuilderFactoryServiceModel.java?view=diff&rev=452755&r1=452754&r2=452755
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/TestBuilderFactoryServiceModel.java (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/TestBuilderFactoryServiceModel.java Tue Oct 3 23:25:27 2006
@@ -14,7 +14,6 @@
package org.apache.hivemind.service;
-import hivemind.test.FrameworkTestCase;
import hivemind.test.services.StringHolder;
import org.apache.hivemind.HiveMind;
Modified: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/TestEventLinker.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/TestEventLinker.java?view=diff&rev=452755&r1=452754&r2=452755
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/TestEventLinker.java (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/TestEventLinker.java Tue Oct 3 23:25:27 2006
@@ -18,7 +18,6 @@
import hivemind.test.services.ZapEventProducer;
import org.apache.hivemind.Registry;
-import org.apache.hivemind.test.HiveMindTestCase;
import org.apache.hivemind.xml.XmlTestCase;
/**