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 2007/01/22 22:16:36 UTC
svn commit: r498806 [2/2] - in /hivemind/hivemind2/trunk:
annotations/src/java/org/apache/hivemind/annotations/internal/
framework/src/java/org/apache/hivemind/definition/
framework/src/java/org/apache/hivemind/definition/construction/
framework/src/ja...
Modified: hivemind/hivemind2/trunk/framework/src/test/org/apache/hivemind/impl/TestInterceptors.java
URL: http://svn.apache.org/viewvc/hivemind/hivemind2/trunk/framework/src/test/org/apache/hivemind/impl/TestInterceptors.java?view=diff&rev=498806&r1=498805&r2=498806
==============================================================================
--- hivemind/hivemind2/trunk/framework/src/test/org/apache/hivemind/impl/TestInterceptors.java (original)
+++ hivemind/hivemind2/trunk/framework/src/test/org/apache/hivemind/impl/TestInterceptors.java Mon Jan 22 13:16:33 2007
@@ -21,7 +21,7 @@
import org.apache.hivemind.Location;
import org.apache.hivemind.definition.ModuleDefinition;
-import org.apache.hivemind.definition.ServiceInterceptorDefinition;
+import org.apache.hivemind.definition.InterceptorDefinition;
import org.apache.hivemind.definition.Visibility;
import org.apache.hivemind.definition.impl.OrderedServiceInterceptorDefinitionImpl;
import org.apache.hivemind.definition.impl.ServicePointDefinitionImpl;
@@ -63,10 +63,10 @@
ModuleDefinition moduleDef = createModuleDefinition("module");
ServicePointImpl sp = newServicePoint(moduleDef, l, module);
- ServiceInterceptorDefinition interceptor1 = new OrderedServiceInterceptorDefinitionImpl(moduleDef, "Interceptor1", null, null,
+ InterceptorDefinition interceptor1 = new OrderedServiceInterceptorDefinitionImpl(moduleDef, "Interceptor1", null, null,
null, null);
sp.getServicePointDefinition().addInterceptor(interceptor1);
- ServiceInterceptorDefinition interceptor2 = new OrderedServiceInterceptorDefinitionImpl(moduleDef, "Interceptor2", null, null,
+ InterceptorDefinition interceptor2 = new OrderedServiceInterceptorDefinitionImpl(moduleDef, "Interceptor2", null, null,
null, null);
sp.getServicePointDefinition().addInterceptor(interceptor2);
// sp.getServicePointDefinition()setExtensionPointId("ExtensionPointId");
@@ -88,10 +88,10 @@
ModuleDefinition moduleDef = createModuleDefinition("module");
ServicePointImpl sp = newServicePoint(moduleDef, l, module);
- ServiceInterceptorDefinition interceptor1 = new OrderedServiceInterceptorDefinitionImpl(moduleDef, "Interceptor1", null, null,
+ InterceptorDefinition interceptor1 = new OrderedServiceInterceptorDefinitionImpl(moduleDef, "Interceptor1", null, null,
null, null);
sp.getServicePointDefinition().addInterceptor(interceptor1);
- ServiceInterceptorDefinition interceptor2 = new OrderedServiceInterceptorDefinitionImpl(moduleDef, "Interceptor2", null, null,
+ InterceptorDefinition interceptor2 = new OrderedServiceInterceptorDefinitionImpl(moduleDef, "Interceptor2", null, null,
null, "Interceptor1");
sp.getServicePointDefinition().addInterceptor(interceptor2);
final List ordered = sp.getOrderedInterceptorContributions();
Modified: hivemind/hivemind2/trunk/framework/src/test/org/apache/hivemind/impl/servicemodel/TestRegistryShutdownListenerServices.java
URL: http://svn.apache.org/viewvc/hivemind/hivemind2/trunk/framework/src/test/org/apache/hivemind/impl/servicemodel/TestRegistryShutdownListenerServices.java?view=diff&rev=498806&r1=498805&r2=498806
==============================================================================
--- hivemind/hivemind2/trunk/framework/src/test/org/apache/hivemind/impl/servicemodel/TestRegistryShutdownListenerServices.java (original)
+++ hivemind/hivemind2/trunk/framework/src/test/org/apache/hivemind/impl/servicemodel/TestRegistryShutdownListenerServices.java Mon Jan 22 13:16:33 2007
@@ -18,11 +18,11 @@
import org.apache.hivemind.Registry;
import org.apache.hivemind.ShutdownCoordinator;
+import org.apache.hivemind.definition.ImplementationConstructionContext;
+import org.apache.hivemind.definition.ImplementationConstructor;
import org.apache.hivemind.definition.ModuleDefinition;
import org.apache.hivemind.definition.ModuleDefinitionHelper;
import org.apache.hivemind.definition.ServicePointDefinition;
-import org.apache.hivemind.definition.construction.ImplementationConstructionContext;
-import org.apache.hivemind.definition.construction.ImplementationConstructor;
import org.apache.hivemind.internal.AbstractServiceImplementationConstructor;
import org.apache.hivemind.internal.ServiceModel;
Modified: hivemind/hivemind2/trunk/framework/src/test/org/apache/hivemind/service/impl/CglibBeanInterfaceFactory.java
URL: http://svn.apache.org/viewvc/hivemind/hivemind2/trunk/framework/src/test/org/apache/hivemind/service/impl/CglibBeanInterfaceFactory.java?view=diff&rev=498806&r1=498805&r2=498806
==============================================================================
--- hivemind/hivemind2/trunk/framework/src/test/org/apache/hivemind/service/impl/CglibBeanInterfaceFactory.java (original)
+++ hivemind/hivemind2/trunk/framework/src/test/org/apache/hivemind/service/impl/CglibBeanInterfaceFactory.java Mon Jan 22 13:16:33 2007
@@ -23,7 +23,7 @@
import net.sf.cglib.proxy.NoOp;
import org.apache.hivemind.Location;
-import org.apache.hivemind.definition.construction.ImplementationConstructionContext;
+import org.apache.hivemind.definition.ImplementationConstructionContext;
import org.apache.hivemind.internal.AbstractServiceImplementationConstructor;
/**
Modified: hivemind/hivemind2/trunk/framework/src/test/org/apache/hivemind/service/impl/JavassistBeanInterfaceFactory.java
URL: http://svn.apache.org/viewvc/hivemind/hivemind2/trunk/framework/src/test/org/apache/hivemind/service/impl/JavassistBeanInterfaceFactory.java?view=diff&rev=498806&r1=498805&r2=498806
==============================================================================
--- hivemind/hivemind2/trunk/framework/src/test/org/apache/hivemind/service/impl/JavassistBeanInterfaceFactory.java (original)
+++ hivemind/hivemind2/trunk/framework/src/test/org/apache/hivemind/service/impl/JavassistBeanInterfaceFactory.java Mon Jan 22 13:16:33 2007
@@ -21,7 +21,7 @@
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.Location;
-import org.apache.hivemind.definition.construction.ImplementationConstructionContext;
+import org.apache.hivemind.definition.ImplementationConstructionContext;
import org.apache.hivemind.internal.AbstractServiceImplementationConstructor;
import org.apache.hivemind.service.ClassFabUtils;
Modified: hivemind/hivemind2/trunk/framework/src/test/org/apache/hivemind/service/impl/JdkBeanInterfaceFactory.java
URL: http://svn.apache.org/viewvc/hivemind/hivemind2/trunk/framework/src/test/org/apache/hivemind/service/impl/JdkBeanInterfaceFactory.java?view=diff&rev=498806&r1=498805&r2=498806
==============================================================================
--- hivemind/hivemind2/trunk/framework/src/test/org/apache/hivemind/service/impl/JdkBeanInterfaceFactory.java (original)
+++ hivemind/hivemind2/trunk/framework/src/test/org/apache/hivemind/service/impl/JdkBeanInterfaceFactory.java Mon Jan 22 13:16:33 2007
@@ -19,7 +19,7 @@
import java.lang.reflect.Proxy;
import org.apache.hivemind.Location;
-import org.apache.hivemind.definition.construction.ImplementationConstructionContext;
+import org.apache.hivemind.definition.ImplementationConstructionContext;
import org.apache.hivemind.internal.AbstractServiceImplementationConstructor;
/**
Modified: hivemind/hivemind2/trunk/framework/src/test/org/apache/hivemind/service/impl/TestLoggingInterceptorFactory.java
URL: http://svn.apache.org/viewvc/hivemind/hivemind2/trunk/framework/src/test/org/apache/hivemind/service/impl/TestLoggingInterceptorFactory.java?view=diff&rev=498806&r1=498805&r2=498806
==============================================================================
--- hivemind/hivemind2/trunk/framework/src/test/org/apache/hivemind/service/impl/TestLoggingInterceptorFactory.java (original)
+++ hivemind/hivemind2/trunk/framework/src/test/org/apache/hivemind/service/impl/TestLoggingInterceptorFactory.java Mon Jan 22 13:16:33 2007
@@ -21,10 +21,10 @@
import org.apache.commons.logging.Log;
import org.apache.hivemind.Registry;
+import org.apache.hivemind.definition.ImplementationConstructor;
import org.apache.hivemind.definition.ModuleDefinition;
import org.apache.hivemind.definition.RegistryDefinition;
-import org.apache.hivemind.definition.ServiceImplementationDefinition;
-import org.apache.hivemind.definition.construction.ImplementationConstructor;
+import org.apache.hivemind.definition.ImplementationDefinition;
import org.apache.hivemind.definition.impl.ServiceImplementationDefinitionImpl;
import org.apache.hivemind.definition.impl.ServicePointDefinitionImpl;
import org.apache.hivemind.impl.InterceptorStackImpl;
@@ -130,7 +130,7 @@
definition.addModule(module);
ServicePointDefinitionImpl sp1 = createServicePointDefinition(module, "BeanInterface", BeanInterface.class);
- ServiceImplementationDefinition impl = new ServiceImplementationDefinitionImpl(module, newLocation(),
+ ImplementationDefinition impl = new ServiceImplementationDefinitionImpl(module, newLocation(),
constructor, ServiceModel.SINGLETON, true);
sp1.addImplementation(impl);
module.addServicePoint(sp1);
Modified: hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/ant/RegistrySerializer.java
URL: http://svn.apache.org/viewvc/hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/ant/RegistrySerializer.java?view=diff&rev=498806&r1=498805&r2=498806
==============================================================================
--- hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/ant/RegistrySerializer.java (original)
+++ hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/ant/RegistrySerializer.java Mon Jan 22 13:16:33 2007
@@ -29,14 +29,14 @@
import org.apache.hivemind.ErrorHandler;
import org.apache.hivemind.definition.ConfigurationPointDefinition;
import org.apache.hivemind.definition.ContributionDefinition;
+import org.apache.hivemind.definition.ImplementationConstructor;
import org.apache.hivemind.definition.ModuleDefinition;
import org.apache.hivemind.definition.Occurances;
import org.apache.hivemind.definition.RegistryDefinition;
-import org.apache.hivemind.definition.ServiceImplementationDefinition;
-import org.apache.hivemind.definition.ServiceInterceptorDefinition;
+import org.apache.hivemind.definition.ImplementationDefinition;
+import org.apache.hivemind.definition.InterceptorDefinition;
import org.apache.hivemind.definition.ServicePointDefinition;
import org.apache.hivemind.definition.Visibility;
-import org.apache.hivemind.definition.construction.ImplementationConstructor;
import org.apache.hivemind.impl.CreateClassServiceConstructor;
import org.apache.hivemind.impl.DefaultErrorHandler;
import org.apache.hivemind.impl.ExtensionResolver;
@@ -247,7 +247,7 @@
// {
// for (Iterator i = implementations.iterator(); i.hasNext();)
// {
-// ServiceImplementationDefinition id = (ServiceImplementationDefinition) i.next();
+// ImplementationDefinition id = (ImplementationDefinition) i.next();
//
// Element implementation = getImplementationElement(id);
//
@@ -316,7 +316,7 @@
if (spd instanceof XmlServicePointDefinitionImpl)
processXmlServicePoint(servicePoint, (XmlServicePointDefinitionImpl) spd);
- ServiceImplementationDefinition ib = spd.getDefaultImplementation();
+ ImplementationDefinition ib = spd.getDefaultImplementation();
if (ib != null)
{
@@ -331,7 +331,7 @@
{
for (Iterator i = interceptors.iterator(); i.hasNext();)
{
- ServiceInterceptorDefinition icd = (ServiceInterceptorDefinition) i.next();
+ InterceptorDefinition icd = (InterceptorDefinition) i.next();
Element interceptor = getInterceptorElement(icd);
@@ -415,7 +415,7 @@
return contribution;
}
-// private Element getImplementationElement(ServiceImplementationDefinition id)
+// private Element getImplementationElement(ImplementationDefinition id)
// {
// Element implementation = _document.createElement("implementation");
//
@@ -447,7 +447,7 @@
// return subModule;
// }
- private Element getInstanceBuilderElement(ServiceImplementationDefinition id, ImplementationConstructor ib)
+ private Element getInstanceBuilderElement(ImplementationDefinition id, ImplementationConstructor ib)
{
Element instanceBuilder;
@@ -488,7 +488,7 @@
return instanceBuilder;
}
- private Element getInterceptorElement(ServiceInterceptorDefinition icd)
+ private Element getInterceptorElement(InterceptorDefinition icd)
{
Element interceptor = _document.createElement("interceptor");
Modified: hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/impl/InvokeFactoryServiceConstructor.java
URL: http://svn.apache.org/viewvc/hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/impl/InvokeFactoryServiceConstructor.java?view=diff&rev=498806&r1=498805&r2=498806
==============================================================================
--- hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/impl/InvokeFactoryServiceConstructor.java (original)
+++ hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/impl/InvokeFactoryServiceConstructor.java Mon Jan 22 13:16:33 2007
@@ -21,9 +21,9 @@
import org.apache.hivemind.Location;
import org.apache.hivemind.ServiceImplementationFactory;
import org.apache.hivemind.ServiceImplementationFactoryParameters;
+import org.apache.hivemind.definition.ImplementationConstructionContext;
import org.apache.hivemind.definition.Occurances;
import org.apache.hivemind.definition.ServicePointDefinition;
-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;
Modified: hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/impl/XmlCoreServicesProvider.java
URL: http://svn.apache.org/viewvc/hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/impl/XmlCoreServicesProvider.java?view=diff&rev=498806&r1=498805&r2=498806
==============================================================================
--- hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/impl/XmlCoreServicesProvider.java (original)
+++ hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/impl/XmlCoreServicesProvider.java Mon Jan 22 13:16:33 2007
@@ -12,14 +12,14 @@
import org.apache.hivemind.SymbolSource;
import org.apache.hivemind.TranslatorManager;
import org.apache.hivemind.definition.ConfigurationPointDefinition;
+import org.apache.hivemind.definition.Contribution;
+import org.apache.hivemind.definition.ContributionContext;
+import org.apache.hivemind.definition.ImplementationConstructionContext;
+import org.apache.hivemind.definition.ImplementationConstructor;
import org.apache.hivemind.definition.ModuleDefinition;
import org.apache.hivemind.definition.ModuleDefinitionHelper;
import org.apache.hivemind.definition.RegistryDefinition;
import org.apache.hivemind.definition.ServicePointDefinition;
-import org.apache.hivemind.definition.construction.Contribution;
-import org.apache.hivemind.definition.construction.ContributionContext;
-import org.apache.hivemind.definition.construction.ImplementationConstructionContext;
-import org.apache.hivemind.definition.construction.ImplementationConstructor;
import org.apache.hivemind.internal.AbstractServiceImplementationConstructor;
import org.apache.hivemind.internal.ServiceModel;
Modified: hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/impl/XmlModuleDescriptorProcessor.java
URL: http://svn.apache.org/viewvc/hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/impl/XmlModuleDescriptorProcessor.java?view=diff&rev=498806&r1=498805&r2=498806
==============================================================================
--- hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/impl/XmlModuleDescriptorProcessor.java (original)
+++ hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/impl/XmlModuleDescriptorProcessor.java Mon Jan 22 13:16:33 2007
@@ -16,7 +16,7 @@
import org.apache.hivemind.definition.ConfigurationParserDefinition;
import org.apache.hivemind.definition.ModuleDefinition;
import org.apache.hivemind.definition.RegistryDefinition;
-import org.apache.hivemind.definition.ServiceImplementationDefinition;
+import org.apache.hivemind.definition.ImplementationDefinition;
import org.apache.hivemind.definition.impl.ConfigurationParserDefinitionImpl;
import org.apache.hivemind.definition.impl.ContributionDefinitionImpl;
import org.apache.hivemind.definition.impl.ServiceImplementationDefinitionImpl;
@@ -224,7 +224,7 @@
return;
if (builder != null) {
- ServiceImplementationDefinition implementation = new ServiceImplementationDefinitionImpl(
+ ImplementationDefinition implementation = new ServiceImplementationDefinitionImpl(
module, builder.getLocation(), builder.createConstructor(module.getId()),
builder.getServiceModel(), false);
point.addImplementation(implementation);
Modified: hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/parse/CreateInstanceDescriptor.java
URL: http://svn.apache.org/viewvc/hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/parse/CreateInstanceDescriptor.java?view=diff&rev=498806&r1=498805&r2=498806
==============================================================================
--- hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/parse/CreateInstanceDescriptor.java (original)
+++ hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/parse/CreateInstanceDescriptor.java Mon Jan 22 13:16:33 2007
@@ -14,7 +14,7 @@
package org.apache.hivemind.parse;
-import org.apache.hivemind.definition.construction.ImplementationConstructor;
+import org.apache.hivemind.definition.ImplementationConstructor;
import org.apache.hivemind.impl.BaseLocatable;
import org.apache.hivemind.impl.CreateClassServiceConstructor;
import org.apache.hivemind.util.ToStringBuilder;
Modified: hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/parse/InstanceBuilder.java
URL: http://svn.apache.org/viewvc/hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/parse/InstanceBuilder.java?view=diff&rev=498806&r1=498805&r2=498806
==============================================================================
--- hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/parse/InstanceBuilder.java (original)
+++ hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/parse/InstanceBuilder.java Mon Jan 22 13:16:33 2007
@@ -15,7 +15,7 @@
package org.apache.hivemind.parse;
import org.apache.hivemind.Locatable;
-import org.apache.hivemind.definition.construction.ImplementationConstructor;
+import org.apache.hivemind.definition.ImplementationConstructor;
/**
* Interface for an object that can construct the core implementation for a service.
Modified: hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/parse/InvokeFactoryDescriptor.java
URL: http://svn.apache.org/viewvc/hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/parse/InvokeFactoryDescriptor.java?view=diff&rev=498806&r1=498805&r2=498806
==============================================================================
--- hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/parse/InvokeFactoryDescriptor.java (original)
+++ hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/parse/InvokeFactoryDescriptor.java Mon Jan 22 13:16:33 2007
@@ -14,7 +14,7 @@
package org.apache.hivemind.parse;
-import org.apache.hivemind.definition.construction.ImplementationConstructor;
+import org.apache.hivemind.definition.ImplementationConstructor;
import org.apache.hivemind.impl.InvokeFactoryServiceConstructor;
import org.apache.hivemind.util.ToStringBuilder;
Modified: hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/schema/SchemaProcessor.java
URL: http://svn.apache.org/viewvc/hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/schema/SchemaProcessor.java?view=diff&rev=498806&r1=498805&r2=498806
==============================================================================
--- hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/schema/SchemaProcessor.java (original)
+++ hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/schema/SchemaProcessor.java Mon Jan 22 13:16:33 2007
@@ -19,7 +19,7 @@
/**
* Object used when processing the elements contributed in an
- * {@link org.apache.hivemind.definition.construction.Contribution}.
+ * {@link org.apache.hivemind.definition.Contribution}.
*
* @author Howard Lewis Ship
*/
Modified: hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/xml/definition/impl/HiveMindSchemaParser.java
URL: http://svn.apache.org/viewvc/hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/xml/definition/impl/HiveMindSchemaParser.java?view=diff&rev=498806&r1=498805&r2=498806
==============================================================================
--- hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/xml/definition/impl/HiveMindSchemaParser.java (original)
+++ hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/xml/definition/impl/HiveMindSchemaParser.java Mon Jan 22 13:16:33 2007
@@ -19,7 +19,7 @@
import org.apache.hivemind.Element;
import org.apache.hivemind.definition.ConfigurationParser;
-import org.apache.hivemind.definition.construction.ContributionContext;
+import org.apache.hivemind.definition.ContributionContext;
import org.apache.hivemind.impl.SchemaProcessorImpl;
import org.apache.hivemind.internal.Module;
import org.apache.hivemind.schema.Schema;
@@ -43,7 +43,7 @@
/**
* @param a list of {@link Element}s
- * @see org.apache.hivemind.definition.ConfigurationParser#parse(org.apache.hivemind.definition.construction.ContributionContext, java.lang.Object)
+ * @see org.apache.hivemind.definition.ConfigurationParser#parse(org.apache.hivemind.definition.ContributionContext, java.lang.Object)
*/
public Object parse(ContributionContext context, Object data)
{
Modified: hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/xml/definition/impl/HiveMindSchemaParserConstructor.java
URL: http://svn.apache.org/viewvc/hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/xml/definition/impl/HiveMindSchemaParserConstructor.java?view=diff&rev=498806&r1=498805&r2=498806
==============================================================================
--- hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/xml/definition/impl/HiveMindSchemaParserConstructor.java (original)
+++ hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/xml/definition/impl/HiveMindSchemaParserConstructor.java Mon Jan 22 13:16:33 2007
@@ -1,8 +1,8 @@
package org.apache.hivemind.xml.definition.impl;
import org.apache.hivemind.definition.ConfigurationParser;
-import org.apache.hivemind.definition.construction.ConfigurationParserConstructor;
-import org.apache.hivemind.definition.construction.ConstructionContext;
+import org.apache.hivemind.definition.ConfigurationParserConstructor;
+import org.apache.hivemind.definition.ConstructionContext;
import org.apache.hivemind.schema.Schema;
import org.apache.hivemind.util.Defense;
Modified: hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/xml/definition/impl/XmlContributionImpl.java
URL: http://svn.apache.org/viewvc/hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/xml/definition/impl/XmlContributionImpl.java?view=diff&rev=498806&r1=498805&r2=498806
==============================================================================
--- hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/xml/definition/impl/XmlContributionImpl.java (original)
+++ hivemind/hivemind2/trunk/xml/src/java/org/apache/hivemind/xml/definition/impl/XmlContributionImpl.java Mon Jan 22 13:16:33 2007
@@ -22,11 +22,11 @@
import org.apache.hivemind.definition.ConfigurationParser;
import org.apache.hivemind.definition.ConfigurationParserDefinition;
import org.apache.hivemind.definition.ConfigurationPointDefinition;
-import org.apache.hivemind.definition.construction.Contribution;
-import org.apache.hivemind.definition.construction.ContributionContext;
+import org.apache.hivemind.definition.Contribution;
+import org.apache.hivemind.definition.ContributionContext;
/**
- * Implements the {@link org.apache.hivemind.definition.construction.Contribution} interface.
+ * Implements the {@link org.apache.hivemind.definition.Contribution} interface.
* Contributes data that is defined as xml in a HiveMind xml module.
* The data is passed in as instances of {@link Element}.
*
@@ -66,7 +66,7 @@
}
/**
- * @see org.apache.hivemind.definition.construction.Contribution#contribute(org.apache.hivemind.definition.construction.ContributionContext)
+ * @see org.apache.hivemind.definition.Contribution#contribute(org.apache.hivemind.definition.ContributionContext)
*/
public void contribute(ContributionContext context)
{
Modified: hivemind/hivemind2/trunk/xml/src/test/org/apache/hivemind/impl/TestInvokeFactoryServiceConstructor.java
URL: http://svn.apache.org/viewvc/hivemind/hivemind2/trunk/xml/src/test/org/apache/hivemind/impl/TestInvokeFactoryServiceConstructor.java?view=diff&rev=498806&r1=498805&r2=498806
==============================================================================
--- hivemind/hivemind2/trunk/xml/src/test/org/apache/hivemind/impl/TestInvokeFactoryServiceConstructor.java (original)
+++ hivemind/hivemind2/trunk/xml/src/test/org/apache/hivemind/impl/TestInvokeFactoryServiceConstructor.java Mon Jan 22 13:16:33 2007
@@ -24,9 +24,9 @@
import org.apache.hivemind.Location;
import org.apache.hivemind.Registry;
import org.apache.hivemind.ServiceImplementationFactory;
+import org.apache.hivemind.definition.ImplementationConstructionContext;
import org.apache.hivemind.definition.ModuleDefinition;
import org.apache.hivemind.definition.Occurances;
-import org.apache.hivemind.definition.construction.ImplementationConstructionContext;
import org.apache.hivemind.internal.ImplementationConstructionContextImpl;
import org.apache.hivemind.internal.Module;
import org.apache.hivemind.internal.ServicePoint;