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/08/08 18:29:35 UTC
svn commit: r429713 - in /hivemind/branches/branch-2-0-annot:
framework/src/java/org/apache/hivemind/definition/
framework/src/java/org/apache/hivemind/internal/
framework/src/test/hivemind/test/services/
framework/src/test/hivemind/test/services/impl/...
Author: ahuegen
Date: Tue Aug 8 09:29:31 2006
New Revision: 429713
URL: http://svn.apache.org/viewvc?rev=429713&view=rev
Log:
Fixed and restructured some more unit tests.
Added:
hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/internal/AbstractServiceInterceptorConstructor.java
hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/AutowireService.xml (contents, props changed)
- copied, changed from r419477, hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/AutowireService.xml
hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/BuilderAccess.java (contents, props changed)
- copied, changed from r419477, hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/BuilderAccess.java
hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/BuilderAccess.properties (contents, props changed)
- copied, changed from r419477, hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/BuilderAccess.properties
hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/BuilderAccess.xml (contents, props changed)
- copied, changed from r419477, hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/BuilderAccess.xml
hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/BuilderAccessFailure.properties (contents, props changed)
- copied, changed from r419477, hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/BuilderAccessFailure.properties
hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/BuilderAccessFailure.xml (contents, props changed)
- copied, changed from r419477, hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/BuilderAccessFailure.xml
hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/ConstructClassResolver.xml (contents, props changed)
- copied, changed from r419477, hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/ConstructClassResolver.xml
hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/ConstructErrorHandler.xml (contents, props changed)
- copied, changed from r419477, hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/ConstructErrorHandler.xml
hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/ConstructorAccess.java (contents, props changed)
- copied, changed from r419477, hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/ConstructorAccess.java
hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/ConstructorFactory.xml (contents, props changed)
- copied, changed from r419477, hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/ConstructorFactory.xml
hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/EventRegister.xml (contents, props changed)
- copied, changed from r419477, hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/EventRegister.xml
hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/InitializeMethodFailure.xml (contents, props changed)
- copied, changed from r419477, hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/InitializeMethodFailure.xml
hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/SetClassResolver.xml (contents, props changed)
- copied, changed from r419477, hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/SetClassResolver.xml
hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/SetErrorHandler.xml (contents, props changed)
- copied, changed from r419477, hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/SetErrorHandler.xml
hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/SetObject.xml (contents, props changed)
- copied, changed from r419477, hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/SetObject.xml
hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/SetObjectFixture.java (contents, props changed)
- copied, changed from r419477, hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/SetObjectFixture.java
hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/SmartFacet.xml (contents, props changed)
- copied, changed from r419477, hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/SmartFacet.xml
hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/TestEventLinker.java
hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/impl/BuilderAccessImpl.java (contents, props changed)
- copied, changed from r419477, hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/impl/BuilderAccessImpl.java
hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/impl/ConstructorAccessImpl.java (contents, props changed)
- copied, changed from r419477, hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/impl/ConstructorAccessImpl.java
hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/impl/SetObjectFixtureImpl.java (contents, props changed)
- copied, changed from r419477, hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/impl/SetObjectFixtureImpl.java
Removed:
hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/AddSimpleInterceptors1.xml
hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/AddSimpleInterceptors2.xml
hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/AutowireService.xml
hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/BuilderAccess.java
hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/BuilderAccess.properties
hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/BuilderAccess.xml
hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/BuilderAccessFailure.properties
hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/BuilderAccessFailure.xml
hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/ConstructClassResolver.xml
hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/ConstructErrorHandler.xml
hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/ConstructorAccess.java
hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/ConstructorFactory.xml
hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/EventRegister.xml
hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/InitializeMethodFailure.xml
hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/SetClassResolver.xml
hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/SetErrorHandler.xml
hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/SetObject.xml
hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/SetObjectFixture.java
hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/Shutdown.xml
hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/SmartFacet.xml
hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/Tracker.xml
hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/impl/BuilderAccessImpl.java
hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/impl/ConstructorAccessImpl.java
hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/impl/SetObjectFixtureImpl.java
hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/service/impl/generated.xml
Modified:
hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/RegistryDefinition.java
hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/TestEventLinker.java
hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/TestServices.java
hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/TestShutdown.java
hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/impl/RunnableImpl.java
hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestInterceptors.java
hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/InvokeFactoryInterceptorConstructor.java
hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/XmlModuleDescriptorProcessor.java
hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/TestBuilderFactory.java
Modified: hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/RegistryDefinition.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/RegistryDefinition.java?rev=429713&r1=429712&r2=429713&view=diff
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/RegistryDefinition.java (original)
+++ hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/definition/RegistryDefinition.java Tue Aug 8 09:29:31 2006
@@ -11,6 +11,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.hivemind.ErrorHandler;
import org.apache.hivemind.Occurances;
+import org.apache.hivemind.impl.DefaultErrorHandler;
import org.apache.hivemind.impl.RegistryPostProcessor;
import org.apache.hivemind.util.IdUtils;
@@ -40,6 +41,11 @@
private List _postProcessors = new ArrayList();
+ public RegistryDefinition()
+ {
+ this(new DefaultErrorHandler());
+ }
+
public RegistryDefinition(ErrorHandler errorHandler)
{
_errorHandler = errorHandler;
Added: hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/internal/AbstractServiceInterceptorConstructor.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/internal/AbstractServiceInterceptorConstructor.java?rev=429713&view=auto
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/internal/AbstractServiceInterceptorConstructor.java (added)
+++ hivemind/branches/branch-2-0-annot/framework/src/java/org/apache/hivemind/internal/AbstractServiceInterceptorConstructor.java Tue Aug 8 09:29:31 2006
@@ -0,0 +1,42 @@
+package org.apache.hivemind.internal;
+
+import org.apache.hivemind.InterceptorStack;
+import org.apache.hivemind.Location;
+import org.apache.hivemind.impl.BaseLocatable;
+
+/**
+ * Ancestor for implementions of {@link ServiceInterceptorConstructor}.
+ * Reduces the number of methods to implement to one.
+ *
+ * @author Achim Huegen
+ */
+public abstract class AbstractServiceInterceptorConstructor extends BaseLocatable implements ServiceInterceptorConstructor
+{
+
+ private String _contributingModuleId;
+ private String _name;
+
+ public AbstractServiceInterceptorConstructor(Location location, String contributingModuleId, String name)
+ {
+ super(location);
+ _contributingModuleId = contributingModuleId;
+ _name = name;
+ }
+
+ public abstract void constructServiceInterceptor(InterceptorStack interceptorStack, Module contributingModule);
+
+ public String getContributingModuleId()
+ {
+ return _contributingModuleId;
+ }
+
+ public void setContributingModuleId(String moduleId)
+ {
+ _contributingModuleId = moduleId;
+ }
+
+ public String getName()
+ {
+ return _name;
+ }
+}
Modified: hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/TestEventLinker.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/TestEventLinker.java?rev=429713&r1=429712&r2=429713&view=diff
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/TestEventLinker.java (original)
+++ hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/TestEventLinker.java Tue Aug 8 09:29:31 2006
@@ -18,7 +18,6 @@
import org.apache.hivemind.ErrorLog;
import org.apache.hivemind.Location;
-import org.apache.hivemind.Registry;
import org.apache.hivemind.service.EventLinker;
import org.apache.hivemind.service.impl.EventLinkerImpl;
import org.apache.hivemind.test.HiveMindTestCase;
@@ -164,25 +163,6 @@
l.addEventListener(p, null, c, location);
verifyControls();
- }
-
- public void testInsideBuilderFactory() throws Exception
- {
- Registry r = buildFrameworkRegistry("EventRegister.xml");
-
- ZapEventProducer p = (ZapEventProducer) r.getService(
- "hivemind.test.services.ZapEventProducer",
- ZapEventProducer.class);
-
- ZapEventConsumer c = (ZapEventConsumer) r.getService(
- "hivemind.test.services.ZapEventConsumer",
- ZapEventConsumer.class);
-
- assertEquals(false, c.getDidZapWiggle());
-
- p.fireZapDidWiggle(null);
-
- assertEquals(true, c.getDidZapWiggle());
}
}
Modified: hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/TestServices.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/TestServices.java?rev=429713&r1=429712&r2=429713&view=diff
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/TestServices.java (original)
+++ hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/TestServices.java Tue Aug 8 09:29:31 2006
@@ -27,8 +27,10 @@
import org.apache.hivemind.definition.ModuleDefinition;
import org.apache.hivemind.definition.ServiceInterceptorDefinition;
import org.apache.hivemind.definition.ServicePointDefinition;
+import org.apache.hivemind.internal.AbstractServiceInterceptorConstructor;
import org.apache.hivemind.internal.Module;
-import org.apache.hivemind.internal.ServiceInterceptorConstructor;
+import org.apache.hivemind.service.BuilderAccess;
+import org.apache.hivemind.service.ConstructorAccess;
import org.apache.hivemind.service.ThreadLocalStorage;
/**
@@ -98,16 +100,14 @@
}
- class TrackerServiceInterceptorConstructor implements ServiceInterceptorConstructor, Orderable
+ class TrackerServiceInterceptorConstructor extends AbstractServiceInterceptorConstructor implements Orderable
{
- private String _name;
private String _before;
private String _after;
public TrackerServiceInterceptorConstructor(String name, String before, String after)
{
- super();
- _name = name;
+ super(null, "hivemind.test.services", name);
_before = before;
_after = after;
}
@@ -116,20 +116,10 @@
Module contributingModule)
{
TrackerFactory factory = new TrackerFactory();
- factory.setName(_name);
+ factory.setName(getName());
factory.createInterceptor(interceptorStack, contributingModule, null);
}
- public String getContributingModuleId()
- {
- return "hivemind.test.services";
- }
-
- public String getName()
- {
- return _name;
- }
-
public Location getLocation()
{
return newLocation();
@@ -293,77 +283,6 @@
assertLoggedMessage("BEGIN toString()", events);
assertLoggedMessage("END toString() [ToStringImpl of toString()]", events);
- }
-
- public void testBuilderAccess() throws Exception
- {
- Registry r = buildFrameworkRegistry("BuilderAccess.xml");
-
- BuilderAccess s =
- (BuilderAccess) r.getService(
- "hivemind.test.services.BuilderAccess",
- BuilderAccess.class);
-
- assertEquals("A successful test of BuilderFactory.", s.getLocalizedMessage("success"));
-
- assertEquals("hivemind.test.services.BuilderAccess", s.getExtensionPointId());
-
- interceptLogging("hivemind.test.services.BuilderAccess");
-
- s.logMessage("This is a test.");
-
- assertLoggedMessage("This is a test.");
- }
-
- public void testBuilderAccessFailure() throws Exception
- {
- Registry r = buildFrameworkRegistry("BuilderAccessFailure.xml");
-
- // interceptLogging("hivemind.test.services.BuilderAccessFailure");
-
- BuilderAccess s =
- (BuilderAccess) r.getService(
- "hivemind.test.services.BuilderAccessFailure",
- BuilderAccess.class);
-
- assertNotNull(s);
-
- // s is a proxy, invoke a service method to force the creation of the
- // service (and the error).
-
- interceptLogging("hivemind.test.services");
-
- String result = s.getLocalizedMessage("success");
-
- assertLoggedMessagePattern("Class hivemind.test.services.impl.BuilderAccessImpl does not contain a property named 'EVIL'.");
-
- assertEquals("Stumbles, logs error, and continues.", result);
- }
-
- public void testConstructorFactory() throws Exception
- {
- Registry r = buildFrameworkRegistry("ConstructorFactory.xml");
-
- String[] servicesToTest =
- {
- "DefaultConstructor",
- "LongConstructor",
- "StringConstructor",
- "ServiceConstructor",
- "MultiConstructor",
- "ConfigurationConstructor",
- "MappedConfigurationConstructor",
- "LogAndMessagesConstructor",
- "NullConstructor"};
-
- for (int i = 0; i < servicesToTest.length; i++)
- {
- ConstructorAccess s =
- (ConstructorAccess) r.getService(
- "hivemind.test.services." + servicesToTest[i],
- ConstructorAccess.class);
- s.verify();
- }
}
public void testArrayResult() throws Exception
Modified: hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/TestShutdown.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/TestShutdown.java?rev=429713&r1=429712&r2=429713&view=diff
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/TestShutdown.java (original)
+++ hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/TestShutdown.java Tue Aug 8 09:29:31 2006
@@ -15,9 +15,21 @@
package hivemind.test.services;
import hivemind.test.FrameworkTestCase;
+import hivemind.test.services.impl.RunnableImpl;
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.Registry;
+import org.apache.hivemind.definition.ModuleDefinition;
+import org.apache.hivemind.definition.RegistryDefinition;
+import org.apache.hivemind.definition.ServiceImplementationDefinition;
+import org.apache.hivemind.definition.ServicePointDefinition;
+import org.apache.hivemind.events.RegistryShutdownListener;
+import org.apache.hivemind.impl.CreateClassServiceConstructor;
+import org.apache.hivemind.internal.AbstractServiceImplementationConstructor;
+import org.apache.hivemind.internal.Module;
+import org.apache.hivemind.internal.ServiceImplementationConstructor;
+import org.apache.hivemind.internal.ServiceModel;
+import org.apache.hivemind.internal.ServicePoint;
/**
* Tests shutdown on the registry and on deferred and threaded services.
@@ -105,36 +117,66 @@
public void testSingletonCore() throws Exception
{
- Registry r = buildFrameworkRegistry("Shutdown.xml");
+ Registry r = createModuleWithShutdownListener(ServiceModel.SINGLETON);
- Runnable s = (Runnable) r.getService("hivemind.test.services.Singleton", Runnable.class);
+ Runnable s = (Runnable) r.getService("module1.Listener", Runnable.class);
- interceptLogging("hivemind.test.services.Singleton");
+ interceptLogging("hivemind.test.services.impl.RunnableImpl");
s.run();
- assertLoggedMessage("run -- Singleton");
+ assertLoggedMessage("run -- singleton");
r.shutdown();
- assertLoggedMessage("registryDidShutdown -- Singleton");
+ assertLoggedMessage("registryDidShutdown -- singleton");
}
public void testPrimitiveCore() throws Exception
{
- Registry r = buildFrameworkRegistry("Shutdown.xml");
+ Registry r = createModuleWithShutdownListener(ServiceModel.PRITIMIVE);
- Runnable s = (Runnable) r.getService("hivemind.test.services.Primitive", Runnable.class);
+ Runnable s = (Runnable) r.getService("module1.Listener", Runnable.class);
- interceptLogging("hivemind.test.services.Primitive");
+ interceptLogging("hivemind.test.services.impl.RunnableImpl");
s.run();
- assertLoggedMessage("run -- Primitive");
+ assertLoggedMessage("run -- primitive");
r.shutdown();
- assertLoggedMessage("registryDidShutdown -- Primitive");
+ assertLoggedMessage("registryDidShutdown -- primitive");
}
+ /**
+ * Builds a registry containing a single service "Listener" that implements the {@link RegistryShutdownListener}
+ * interface.
+ */
+ private Registry createModuleWithShutdownListener(final String serviceModel)
+ {
+ RegistryDefinition definition = new RegistryDefinition();
+
+ ModuleDefinition module = createModuleDefinition("module1");
+ definition.addModule(module);
+
+ ServicePointDefinition sp1 = createServicePointDefinition("Listener", Runnable.class);
+
+ ServiceImplementationConstructor constructor = new AbstractServiceImplementationConstructor(newLocation(), module.getId()) {
+
+ public Object constructCoreServiceImplementation(ServicePoint servicePoint, Module contributingModule)
+ {
+ RunnableImpl result = new RunnableImpl();
+ result.setType(serviceModel);
+ return result;
+ }};
+
+ ServiceImplementationDefinition impl = new ServiceImplementationDefinition(newLocation(),
+ constructor, serviceModel, true);
+ sp1.addImplementation(impl);
+ module.addServicePoint(sp1);
+ Registry reg = buildFrameworkRegistry(module);
+ return reg;
+ }
+
}
Modified: hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/impl/RunnableImpl.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/impl/RunnableImpl.java?rev=429713&r1=429712&r2=429713&view=diff
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/impl/RunnableImpl.java (original)
+++ hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/impl/RunnableImpl.java Tue Aug 8 09:29:31 2006
@@ -15,6 +15,7 @@
package hivemind.test.services.impl;
import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.hivemind.events.RegistryShutdownListener;
@@ -26,7 +27,7 @@
*/
public class RunnableImpl implements Runnable, RegistryShutdownListener
{
- private Log _log;
+ private final static Log _log = LogFactory.getLog(RunnableImpl.class);
private String _type;
public void run()
@@ -42,11 +43,6 @@
public void setType(String string)
{
_type = string;
- }
-
- public void setLog(Log log)
- {
- _log = log;
}
}
Modified: hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestInterceptors.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestInterceptors.java?rev=429713&r1=429712&r2=429713&view=diff
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestInterceptors.java (original)
+++ hivemind/branches/branch-2-0-annot/framework/src/test/org/apache/hivemind/impl/TestInterceptors.java Tue Aug 8 09:29:31 2006
@@ -22,8 +22,8 @@
import org.apache.hivemind.InterceptorStack;
import org.apache.hivemind.Location;
import org.apache.hivemind.Orderable;
+import org.apache.hivemind.internal.AbstractServiceInterceptorConstructor;
import org.apache.hivemind.internal.Module;
-import org.apache.hivemind.internal.ServiceInterceptorConstructor;
/**
* Test for interceptors.
@@ -102,33 +102,20 @@
verifyControls();
}
- class DummyServiceInterceptorConstructor extends BaseLocatable implements ServiceInterceptorConstructor, Orderable
+ class DummyServiceInterceptorConstructor extends AbstractServiceInterceptorConstructor implements Orderable
{
- private String _contributingModuleId;
- private String _name;
private String _precedingInterceptorIds;
private String _followingInterceptorIds;
public DummyServiceInterceptorConstructor(String contributingModuleId, String name, String precedingInterceptorIds, String followingInterceptorIds)
{
- _contributingModuleId = contributingModuleId;
- _name = name;
+ super(null, contributingModuleId, name);
_precedingInterceptorIds = precedingInterceptorIds;
_followingInterceptorIds = followingInterceptorIds;
}
public void constructServiceInterceptor(InterceptorStack interceptorStack, Module contributingModule)
{
- }
-
- public String getContributingModuleId()
- {
- return _contributingModuleId;
- }
-
- public String getName()
- {
- return _name;
}
public String getFollowingNames()
Modified: hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/InvokeFactoryInterceptorConstructor.java
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/InvokeFactoryInterceptorConstructor.java?rev=429713&r1=429712&r2=429713&view=diff
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/InvokeFactoryInterceptorConstructor.java (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/java/org/apache/hivemind/impl/InvokeFactoryInterceptorConstructor.java Tue Aug 8 09:29:31 2006
@@ -18,13 +18,14 @@
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.InterceptorStack;
+import org.apache.hivemind.Location;
import org.apache.hivemind.Orderable;
import org.apache.hivemind.ServiceInterceptorFactory;
import org.apache.hivemind.TranslatorManager;
import org.apache.hivemind.impl.natures.XmlRegistryNature;
import org.apache.hivemind.impl.natures.XmlServicePointNature;
+import org.apache.hivemind.internal.AbstractServiceInterceptorConstructor;
import org.apache.hivemind.internal.Module;
-import org.apache.hivemind.internal.ServiceInterceptorConstructor;
import org.apache.hivemind.internal.ServicePoint;
import org.apache.hivemind.schema.Schema;
import org.apache.hivemind.util.Defense;
@@ -34,44 +35,40 @@
* Constructs a new interceptor by invoking methods on another service (which implements the
* {@link org.apache.hivemind.ServiceInterceptorFactory} interface.
*/
-public final class InvokeFactoryInterceptorConstructor extends BaseLocatable implements
- ServiceInterceptorConstructor, Orderable
+public final class InvokeFactoryInterceptorConstructor extends AbstractServiceInterceptorConstructor implements
+ Orderable
{
private String _factoryServiceId;
private ServiceInterceptorFactory _factory;
- private String _contributingModuleId;
-
/** List of {@link org.apache.hivemind.Element}, the raw XML parameters. */
private List _parameters;
/** The parameters converted to objects as per the factory's parameter schema. */
private Object _convertedParameters;
- private String _name;
-
private String _precedingInterceptorIds;
private String _followingInterceptorIds;
+ public InvokeFactoryInterceptorConstructor(Location location, String contributingModuleId, String name)
+ {
+ super(location, contributingModuleId, name);
+ }
+
/**
* @return Returns the name.
*/
public String getName()
{
- if( _name == null )
+ if(super.getName() == null )
{
return _factoryServiceId;
}
- return _name;
+ return super.getName();
}
- public void setName( String name )
- {
- _name = name;
- }
-
public void constructServiceInterceptor(InterceptorStack stack, Module contributingModule)
{
setup(contributingModule);
@@ -110,16 +107,6 @@
processor.process(_convertedParameters, _parameters, contributingModule, translatorManager);
}
}
- }
-
- public String getContributingModuleId()
- {
- return _contributingModuleId;
- }
-
- public void setContributingModuleId(String moduleId)
- {
- _contributingModuleId = moduleId;
}
public List getParameters()
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?rev=429713&r1=429712&r2=429713&view=diff
==============================================================================
--- 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 Aug 8 09:29:31 2006
@@ -299,11 +299,10 @@
_log.debug("Adding " + id + " to service extension point " + qualifiedPointId);
// TODO annotations: generic container for parameter
- InvokeFactoryInterceptorConstructor constructor = new InvokeFactoryInterceptorConstructor();
+ InvokeFactoryInterceptorConstructor constructor = new InvokeFactoryInterceptorConstructor(id.getLocation(),
+ contributingModuleId, id.getName());
constructor.setFactoryServiceId(id.getFactoryServiceId());
constructor.setParameters(id.getParameters());
- constructor.setContributingModuleId(contributingModuleId);
- constructor.setName(id.getName());
constructor.setPrecedingInterceptorIds(id.getAfter());
constructor.setFollowingInterceptorIds(id.getBefore());
ServiceInterceptorDefinition interceptor = new ServiceInterceptorDefinition(
Copied: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/AutowireService.xml (from r419477, hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/AutowireService.xml)
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/AutowireService.xml?p2=hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/AutowireService.xml&p1=hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/AutowireService.xml&r1=419477&r2=429713&rev=429713&view=diff
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/AutowireService.xml (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/AutowireService.xml Tue Aug 8 09:29:31 2006
@@ -16,9 +16,9 @@
-->
<module id="hivemind.test.services" version="1.0.0">
- <service-point id="AutowireService" interface="hivemind.test.services.SetObjectFixture">
+ <service-point id="AutowireService" interface="org.apache.hivemind.service.SetObjectFixture">
<invoke-factory>
- <construct class="hivemind.test.services.impl.SetObjectFixtureImpl"/>
+ <construct class="org.apache.hivemind.service.impl.SetObjectFixtureImpl"/>
</invoke-factory>
</service-point>
</module>
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/AutowireService.xml
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.3
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/AutowireService.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/AutowireService.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/BuilderAccess.java (from r419477, hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/BuilderAccess.java)
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/BuilderAccess.java?p2=hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/BuilderAccess.java&p1=hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/BuilderAccess.java&r1=419477&r2=429713&rev=429713&view=diff
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/BuilderAccess.java (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/BuilderAccess.java Tue Aug 8 09:29:31 2006
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package hivemind.test.services;
+package org.apache.hivemind.service;
/**
* Used to test {@link org.apache.hivemind.service.impl.BuilderFactory}.
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/BuilderAccess.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.5
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/BuilderAccess.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/BuilderAccess.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/BuilderAccess.properties (from r419477, hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/BuilderAccess.properties)
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/BuilderAccess.properties?p2=hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/BuilderAccess.properties&p1=hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/BuilderAccess.properties&r1=419477&r2=429713&rev=429713&view=diff
==============================================================================
(empty)
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/BuilderAccess.properties
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.3
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/BuilderAccess.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/BuilderAccess.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/BuilderAccess.xml (from r419477, hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/BuilderAccess.xml)
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/BuilderAccess.xml?p2=hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/BuilderAccess.xml&p1=hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/BuilderAccess.xml&r1=419477&r2=429713&rev=429713&view=diff
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/BuilderAccess.xml (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/BuilderAccess.xml Tue Aug 8 09:29:31 2006
@@ -17,9 +17,9 @@
<module id="hivemind.test.services" version="1.0.0">
- <service-point id="BuilderAccess" interface="hivemind.test.services.BuilderAccess">
+ <service-point id="BuilderAccess" interface="org.apache.hivemind.service.BuilderAccess">
<invoke-factory>
- <construct class="hivemind.test.services.impl.BuilderAccessImpl"
+ <construct class="org.apache.hivemind.service.impl.BuilderAccessImpl"
log-property="log"
messages-property="messages"
service-id-property="extensionPointId"/>
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/BuilderAccess.xml
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.6
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/BuilderAccess.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/BuilderAccess.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/BuilderAccessFailure.properties (from r419477, hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/BuilderAccessFailure.properties)
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/BuilderAccessFailure.properties?p2=hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/BuilderAccessFailure.properties&p1=hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/BuilderAccessFailure.properties&r1=419477&r2=429713&rev=429713&view=diff
==============================================================================
(empty)
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/BuilderAccessFailure.properties
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.2
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/BuilderAccessFailure.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/BuilderAccessFailure.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/BuilderAccessFailure.xml (from r419477, hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/BuilderAccessFailure.xml)
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/BuilderAccessFailure.xml?p2=hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/BuilderAccessFailure.xml&p1=hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/BuilderAccessFailure.xml&r1=419477&r2=429713&rev=429713&view=diff
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/BuilderAccessFailure.xml (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/BuilderAccessFailure.xml Tue Aug 8 09:29:31 2006
@@ -17,9 +17,9 @@
<module id="hivemind.test.services" version="1.0.0">
- <service-point id="BuilderAccessFailure" interface="hivemind.test.services.BuilderAccess">
+ <service-point id="BuilderAccessFailure" interface="org.apache.hivemind.service.BuilderAccess">
<invoke-factory>
- <construct class="hivemind.test.services.impl.BuilderAccessImpl"
+ <construct class="org.apache.hivemind.service.impl.BuilderAccessImpl"
log-property="log"
messages-property="messages"
service-id-property="EVIL"/>
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/BuilderAccessFailure.xml
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.6
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/BuilderAccessFailure.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/BuilderAccessFailure.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/ConstructClassResolver.xml (from r419477, hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/ConstructClassResolver.xml)
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/ConstructClassResolver.xml?p2=hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/ConstructClassResolver.xml&p1=hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/ConstructClassResolver.xml&r1=419477&r2=429713&rev=429713&view=diff
==============================================================================
(empty)
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/ConstructClassResolver.xml
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.3
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/ConstructClassResolver.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/ConstructClassResolver.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/ConstructErrorHandler.xml (from r419477, hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/ConstructErrorHandler.xml)
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/ConstructErrorHandler.xml?p2=hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/ConstructErrorHandler.xml&p1=hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/ConstructErrorHandler.xml&r1=419477&r2=429713&rev=429713&view=diff
==============================================================================
(empty)
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/ConstructErrorHandler.xml
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.3
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/ConstructErrorHandler.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/ConstructErrorHandler.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/ConstructorAccess.java (from r419477, hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/ConstructorAccess.java)
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/ConstructorAccess.java?p2=hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/ConstructorAccess.java&p1=hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/ConstructorAccess.java&r1=419477&r2=429713&rev=429713&view=diff
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/ConstructorAccess.java (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/ConstructorAccess.java Tue Aug 8 09:29:31 2006
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package hivemind.test.services;
+package org.apache.hivemind.service;
import junit.framework.AssertionFailedError;
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/ConstructorAccess.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.4
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/ConstructorAccess.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/ConstructorAccess.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/ConstructorFactory.xml (from r419477, hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/ConstructorFactory.xml)
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/ConstructorFactory.xml?p2=hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/ConstructorFactory.xml&p1=hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/ConstructorFactory.xml&r1=419477&r2=429713&rev=429713&view=diff
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/ConstructorFactory.xml (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/ConstructorFactory.xml Tue Aug 8 09:29:31 2006
@@ -17,44 +17,44 @@
<module id="hivemind.test.services" version="1.0.0">
- <service-point id="DefaultConstructor" interface="hivemind.test.services.ConstructorAccess">
+ <service-point id="DefaultConstructor" interface="org.apache.hivemind.service.ConstructorAccess">
<invoke-factory>
- <construct class="hivemind.test.services.impl.ConstructorAccessImpl" autowire-services="false">
+ <construct class="org.apache.hivemind.service.impl.ConstructorAccessImpl" autowire-services="false">
<set property="expectedConstructorMessage" value="()"/>
</construct>
</invoke-factory>
</service-point>
- <service-point id="LongConstructor" interface="hivemind.test.services.ConstructorAccess">
+ <service-point id="LongConstructor" interface="org.apache.hivemind.service.ConstructorAccess">
<invoke-factory>
- <construct class="hivemind.test.services.impl.ConstructorAccessImpl">
+ <construct class="org.apache.hivemind.service.impl.ConstructorAccessImpl">
<long>42</long>
<set property="expectedConstructorMessage" value="(long)"/>
</construct>
</invoke-factory>
</service-point>
- <service-point id="StringConstructor" interface="hivemind.test.services.ConstructorAccess">
+ <service-point id="StringConstructor" interface="org.apache.hivemind.service.ConstructorAccess">
<invoke-factory>
- <construct class="hivemind.test.services.impl.ConstructorAccessImpl">
+ <construct class="org.apache.hivemind.service.impl.ConstructorAccessImpl">
<string>Foo</string>
<set property="expectedConstructorMessage" value="(String)"/>
</construct>
</invoke-factory>
</service-point>
- <service-point id="ServiceConstructor" interface="hivemind.test.services.ConstructorAccess">
+ <service-point id="ServiceConstructor" interface="org.apache.hivemind.service.ConstructorAccess">
<invoke-factory>
- <construct class="hivemind.test.services.impl.ConstructorAccessImpl">
+ <construct class="org.apache.hivemind.service.impl.ConstructorAccessImpl">
<service>DefaultConstructor</service>
<set property="expectedConstructorMessage" value="(ConstructorAccess)"/>
</construct>
</invoke-factory>
</service-point>
- <service-point id="MultiConstructor" interface="hivemind.test.services.ConstructorAccess">
+ <service-point id="MultiConstructor" interface="org.apache.hivemind.service.ConstructorAccess">
<invoke-factory>
- <construct class="hivemind.test.services.impl.ConstructorAccessImpl">
+ <construct class="org.apache.hivemind.service.impl.ConstructorAccessImpl">
<service>DefaultConstructor</service>
<service-id/>
<set property="expectedConstructorMessage" value="(ConstructorAccess, String)"/>
@@ -62,18 +62,18 @@
</invoke-factory>
</service-point>
- <service-point id="ConfigurationConstructor" interface="hivemind.test.services.ConstructorAccess">
+ <service-point id="ConfigurationConstructor" interface="org.apache.hivemind.service.ConstructorAccess">
<invoke-factory>
- <construct class="hivemind.test.services.impl.ConstructorAccessImpl">
+ <construct class="org.apache.hivemind.service.impl.ConstructorAccessImpl">
<configuration>DummyConfiguration</configuration>
<set property="expectedConstructorMessage" value="(Map)"/>
</construct>
</invoke-factory>
</service-point>
- <service-point id="MappedConfigurationConstructor" interface="hivemind.test.services.ConstructorAccess">
+ <service-point id="MappedConfigurationConstructor" interface="org.apache.hivemind.service.ConstructorAccess">
<invoke-factory>
- <construct class="hivemind.test.services.impl.ConstructorAccessImpl">
+ <construct class="org.apache.hivemind.service.impl.ConstructorAccessImpl">
<configuration>DummyConfiguration</configuration>
<long>42</long>
<set property="expectedConstructorMessage" value="(Map, long)"/>
@@ -81,9 +81,9 @@
</invoke-factory>
</service-point>
- <service-point id="LogAndMessagesConstructor" interface="hivemind.test.services.ConstructorAccess">
+ <service-point id="LogAndMessagesConstructor" interface="org.apache.hivemind.service.ConstructorAccess">
<invoke-factory>
- <construct class="hivemind.test.services.impl.ConstructorAccessImpl">
+ <construct class="org.apache.hivemind.service.impl.ConstructorAccessImpl">
<log/>
<messages/>
<set property="expectedConstructorMessage" value="(Log, Messages)"/>
@@ -91,9 +91,9 @@
</invoke-factory>
</service-point>
- <service-point id="NullConstructor" interface="hivemind.test.services.ConstructorAccess">
+ <service-point id="NullConstructor" interface="org.apache.hivemind.service.ConstructorAccess">
<invoke-factory>
- <construct class="hivemind.test.services.impl.ConstructorAccessImpl">
+ <construct class="org.apache.hivemind.service.impl.ConstructorAccessImpl">
<long>42</long>
<null/>
<set property="expectedConstructorMessage" value="(long, null)"/>
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/ConstructorFactory.xml
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.7
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/ConstructorFactory.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/ConstructorFactory.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/EventRegister.xml (from r419477, hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/EventRegister.xml)
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/EventRegister.xml?p2=hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/EventRegister.xml&p1=hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/EventRegister.xml&r1=419477&r2=429713&rev=429713&view=diff
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/EventRegister.xml (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/EventRegister.xml Tue Aug 8 09:29:31 2006
@@ -17,13 +17,13 @@
<module id="hivemind.test.services" version="1.0.0">
- <service-point id="ZapEventProducer" interface="hivemind.test.services.ZapEventProducer">
- <create-instance class="hivemind.test.services.impl.ZapEventProducerImpl"/>
+ <service-point id="ZapEventProducer" interface="org.apache.hivemind.services.ZapEventProducer">
+ <create-instance class="org.apache.hivemind.services.impl.ZapEventProducerImpl"/>
</service-point>
- <service-point id="ZapEventConsumer" interface="hivemind.test.services.ZapEventConsumer">
+ <service-point id="ZapEventConsumer" interface="org.apache.hivemind.services.ZapEventConsumer">
<invoke-factory>
- <construct class="hivemind.test.services.impl.ZapEventConsumerImpl">
+ <construct class="org.apache.hivemind.services.impl.ZapEventConsumerImpl">
<event-listener service-id="ZapEventProducer"/>
</construct>
</invoke-factory>
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/EventRegister.xml
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.4
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/EventRegister.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/EventRegister.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/InitializeMethodFailure.xml (from r419477, hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/InitializeMethodFailure.xml)
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/InitializeMethodFailure.xml?p2=hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/InitializeMethodFailure.xml&p1=hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/InitializeMethodFailure.xml&r1=419477&r2=429713&rev=429713&view=diff
==============================================================================
(empty)
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/InitializeMethodFailure.xml
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.3
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/InitializeMethodFailure.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/InitializeMethodFailure.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/SetClassResolver.xml (from r419477, hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/SetClassResolver.xml)
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/SetClassResolver.xml?p2=hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/SetClassResolver.xml&p1=hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/SetClassResolver.xml&r1=419477&r2=429713&rev=429713&view=diff
==============================================================================
(empty)
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/SetClassResolver.xml
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.3
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/SetClassResolver.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/SetClassResolver.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/SetErrorHandler.xml (from r419477, hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/SetErrorHandler.xml)
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/SetErrorHandler.xml?p2=hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/SetErrorHandler.xml&p1=hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/SetErrorHandler.xml&r1=419477&r2=429713&rev=429713&view=diff
==============================================================================
(empty)
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/SetErrorHandler.xml
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.3
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/SetErrorHandler.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/SetErrorHandler.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/SetObject.xml (from r419477, hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/SetObject.xml)
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/SetObject.xml?p2=hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/SetObject.xml&p1=hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/SetObject.xml&r1=419477&r2=429713&rev=429713&view=diff
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/SetObject.xml (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/SetObject.xml Tue Aug 8 09:29:31 2006
@@ -16,9 +16,9 @@
-->
<module id="hivemind.test.services" version="1.0.0">
- <service-point id="SestObject" interface="hivemind.test.services.SetObjectFixture">
+ <service-point id="SetObject" interface="org.apache.hivemind.service.SetObjectFixture">
<invoke-factory>
- <construct class="hivemind.test.services.impl.SetObjectFixtureImpl">
+ <construct class="org.apache.hivemind.service.impl.SetObjectFixtureImpl">
<set-object property="classFactory1" value="service:hivemind.ClassFactory"/>
<set-object property="classFactory2" value="service:hivemind.ClassFactory"/>
</construct>
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/SetObject.xml
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.3
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/SetObject.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/SetObject.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/SetObjectFixture.java (from r419477, hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/SetObjectFixture.java)
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/SetObjectFixture.java?p2=hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/SetObjectFixture.java&p1=hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/SetObjectFixture.java&r1=419477&r2=429713&rev=429713&view=diff
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/SetObjectFixture.java (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/SetObjectFixture.java Tue Aug 8 09:29:31 2006
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package hivemind.test.services;
+package org.apache.hivemind.service;
import org.apache.hivemind.service.ClassFactory;
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/SetObjectFixture.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.2
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/SetObjectFixture.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/SetObjectFixture.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/SmartFacet.xml (from r419477, hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/SmartFacet.xml)
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/SmartFacet.xml?p2=hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/SmartFacet.xml&p1=hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/SmartFacet.xml&r1=419477&r2=429713&rev=429713&view=diff
==============================================================================
(empty)
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/SmartFacet.xml
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.3
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/SmartFacet.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/SmartFacet.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
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?rev=429713&r1=429712&r2=429713&view=diff
==============================================================================
--- 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 Aug 8 09:29:31 2006
@@ -20,7 +20,6 @@
import hivemind.test.services.ErrorHandlerHolder;
import hivemind.test.services.InitializeFixture;
import hivemind.test.services.ServiceAutowireTarget;
-import hivemind.test.services.SetObjectFixture;
import hivemind.test.services.SimpleService;
import hivemind.test.services.StringHolder;
import hivemind.test.services.impl.StringHolderImpl;
@@ -607,4 +606,74 @@
assertSame(f.getClassFactory1(), f.getClassFactory2());
}
+ public void testBuilderAccess() throws Exception
+ {
+ Registry r = buildFrameworkRegistry("BuilderAccess.xml");
+
+ BuilderAccess s =
+ (BuilderAccess) r.getService(
+ "hivemind.test.services.BuilderAccess",
+ BuilderAccess.class);
+
+ assertEquals("A successful test of BuilderFactory.", s.getLocalizedMessage("success"));
+
+ assertEquals("hivemind.test.services.BuilderAccess", s.getExtensionPointId());
+
+ interceptLogging("hivemind.test.services.BuilderAccess");
+
+ s.logMessage("This is a test.");
+
+ assertLoggedMessage("This is a test.");
+ }
+
+ public void testBuilderAccessFailure() throws Exception
+ {
+ Registry r = buildFrameworkRegistry("BuilderAccessFailure.xml");
+
+ // interceptLogging("hivemind.test.services.BuilderAccessFailure");
+
+ BuilderAccess s =
+ (BuilderAccess) r.getService(
+ "hivemind.test.services.BuilderAccessFailure",
+ BuilderAccess.class);
+
+ assertNotNull(s);
+
+ // s is a proxy, invoke a service method to force the creation of the
+ // service (and the error).
+
+ interceptLogging("hivemind.test.services");
+
+ String result = s.getLocalizedMessage("success");
+
+ assertLoggedMessagePattern("Class org.apache.hivemind.service.impl.BuilderAccessImpl does not contain a property named 'EVIL'.");
+
+ assertEquals("Stumbles, logs error, and continues.", result);
+ }
+
+ public void testConstructorFactory() throws Exception
+ {
+ Registry r = buildFrameworkRegistry("ConstructorFactory.xml");
+
+ String[] servicesToTest =
+ {
+ "DefaultConstructor",
+ "LongConstructor",
+ "StringConstructor",
+ "ServiceConstructor",
+ "MultiConstructor",
+ "ConfigurationConstructor",
+ "MappedConfigurationConstructor",
+ "LogAndMessagesConstructor",
+ "NullConstructor"};
+
+ for (int i = 0; i < servicesToTest.length; i++)
+ {
+ ConstructorAccess s =
+ (ConstructorAccess) r.getService(
+ "hivemind.test.services." + servicesToTest[i],
+ ConstructorAccess.class);
+ s.verify();
+ }
+ }
}
Added: 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?rev=429713&view=auto
==============================================================================
--- hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/TestEventLinker.java (added)
+++ hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/TestEventLinker.java Tue Aug 8 09:29:31 2006
@@ -0,0 +1,51 @@
+// Copyright 2004, 2005 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.
+
+package org.apache.hivemind.service;
+
+import hivemind.test.services.ZapEventConsumer;
+import hivemind.test.services.ZapEventProducer;
+
+import org.apache.hivemind.Registry;
+import org.apache.hivemind.test.HiveMindTestCase;
+
+/**
+ * Tests for the {@link org.apache.hivemind.service.impl.EventLinkerImpl}class, used by the
+ * {@link org.apache.hivemind.service.impl.BuilderFactory}.
+ *
+ * @author Howard Lewis Ship
+ */
+public class TestEventLinker extends HiveMindTestCase
+{
+
+ public void testInsideBuilderFactory() throws Exception
+ {
+ Registry r = buildFrameworkRegistry("EventRegister.xml");
+
+ ZapEventProducer p = (ZapEventProducer) r.getService(
+ "hivemind.test.services.ZapEventProducer",
+ ZapEventProducer.class);
+
+ ZapEventConsumer c = (ZapEventConsumer) r.getService(
+ "hivemind.test.services.ZapEventConsumer",
+ ZapEventConsumer.class);
+
+ assertEquals(false, c.getDidZapWiggle());
+
+ p.fireZapDidWiggle(null);
+
+ assertEquals(true, c.getDidZapWiggle());
+ }
+
+}
\ No newline at end of file
Copied: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/impl/BuilderAccessImpl.java (from r419477, hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/impl/BuilderAccessImpl.java)
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/impl/BuilderAccessImpl.java?p2=hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/impl/BuilderAccessImpl.java&p1=hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/impl/BuilderAccessImpl.java&r1=419477&r2=429713&rev=429713&view=diff
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/impl/BuilderAccessImpl.java (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/impl/BuilderAccessImpl.java Tue Aug 8 09:29:31 2006
@@ -12,12 +12,12 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package hivemind.test.services.impl;
+package org.apache.hivemind.service.impl;
-import hivemind.test.services.BuilderAccess;
import org.apache.commons.logging.Log;
import org.apache.hivemind.Messages;
+import org.apache.hivemind.service.BuilderAccess;
/**
* Used to test {@link org.apache.hivemind.service.impl.BuilderFactory}.
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/impl/BuilderAccessImpl.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.5
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/impl/BuilderAccessImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/impl/BuilderAccessImpl.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/impl/ConstructorAccessImpl.java (from r419477, hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/impl/ConstructorAccessImpl.java)
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/impl/ConstructorAccessImpl.java?p2=hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/impl/ConstructorAccessImpl.java&p1=hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/impl/ConstructorAccessImpl.java&r1=419477&r2=429713&rev=429713&view=diff
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/impl/ConstructorAccessImpl.java (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/impl/ConstructorAccessImpl.java Tue Aug 8 09:29:31 2006
@@ -12,9 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package hivemind.test.services.impl;
+package org.apache.hivemind.service.impl;
-import hivemind.test.services.ConstructorAccess;
import java.util.Map;
@@ -23,6 +22,7 @@
import org.apache.commons.logging.Log;
import org.apache.hivemind.Messages;
+import org.apache.hivemind.service.ConstructorAccess;
/**
* Used to test constructor parameter passing of
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/impl/ConstructorAccessImpl.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.7
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/impl/ConstructorAccessImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/impl/ConstructorAccessImpl.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Copied: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/impl/SetObjectFixtureImpl.java (from r419477, hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/impl/SetObjectFixtureImpl.java)
URL: http://svn.apache.org/viewvc/hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/impl/SetObjectFixtureImpl.java?p2=hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/impl/SetObjectFixtureImpl.java&p1=hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/impl/SetObjectFixtureImpl.java&r1=419477&r2=429713&rev=429713&view=diff
==============================================================================
--- hivemind/branches/branch-2-0-annot/framework/src/test/hivemind/test/services/impl/SetObjectFixtureImpl.java (original)
+++ hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/impl/SetObjectFixtureImpl.java Tue Aug 8 09:29:31 2006
@@ -12,11 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package hivemind.test.services.impl;
+package org.apache.hivemind.service.impl;
import org.apache.hivemind.service.ClassFactory;
+import org.apache.hivemind.service.SetObjectFixture;
-import hivemind.test.services.SetObjectFixture;
/**
* Used to test the BuilderFactory's set-object element.
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/impl/SetObjectFixtureImpl.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.2
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/impl/SetObjectFixtureImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: hivemind/branches/branch-2-0-annot/xml/src/test/org/apache/hivemind/service/impl/SetObjectFixtureImpl.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision