You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by gn...@apache.org on 2009/05/14 23:17:56 UTC
svn commit: r774934 - in /geronimo/sandbox/blueprint:
blueprint-api/src/main/java/org/osgi/service/blueprint/namespace/
blueprint-core/src/main/java/org/apache/geronimo/blueprint/
blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/ blue...
Author: gnodet
Date: Thu May 14 21:17:56 2009
New Revision: 774934
URL: http://svn.apache.org/viewvc?rev=774934&view=rev
Log:
Rework type converters / processors creation
Modified:
geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/namespace/ComponentDefinitionRegistry.java
geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/ExtendedComponentDefinitionRegistry.java
geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/BlueprintContextImpl.java
geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/BlueprintObjectRecipe.java
geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/BlueprintObjectRepository.java
geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/Parser.java
geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/RecipeBuilder.java
geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/namespace/ComponentDefinitionRegistryImpl.java
geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/utils/ArgumentsMatcher.java
geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/AbstractBlueprintTest.java
geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/WiringTest.java
geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestBlueprintContext.java
Modified: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/namespace/ComponentDefinitionRegistry.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/namespace/ComponentDefinitionRegistry.java?rev=774934&r1=774933&r2=774934&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/namespace/ComponentDefinitionRegistry.java (original)
+++ geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/namespace/ComponentDefinitionRegistry.java Thu May 14 21:17:56 2009
@@ -19,6 +19,7 @@
import java.util.Set;
import org.osgi.service.blueprint.reflect.ComponentMetadata;
+import org.osgi.service.blueprint.reflect.Target;
public interface ComponentDefinitionRegistry {
@@ -31,5 +32,4 @@
void registerComponentDefinition(ComponentMetadata component);
void removeComponentDefinition(String name);
-
}
Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/ExtendedComponentDefinitionRegistry.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/ExtendedComponentDefinitionRegistry.java?rev=774934&r1=774933&r2=774934&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/ExtendedComponentDefinitionRegistry.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/ExtendedComponentDefinitionRegistry.java Thu May 14 21:17:56 2009
@@ -18,7 +18,10 @@
*/
package org.apache.geronimo.blueprint;
+import java.util.List;
+
import org.osgi.service.blueprint.namespace.ComponentDefinitionRegistry;
+import org.osgi.service.blueprint.reflect.Target;
/**
* An extended ComponentDefinitionRegistry that allows converters and processors to be registered.
@@ -35,4 +38,9 @@
String getDefaultDestroyMethod();
void setDefaultDestroyMethod(String defaultDestroyMethod);
+
+ void registerTypeConverter(Target component);
+
+ List<Target> getTypeConverters();
+
}
Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/BlueprintContextImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/BlueprintContextImpl.java?rev=774934&r1=774933&r2=774934&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/BlueprintContextImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/BlueprintContextImpl.java Thu May 14 21:17:56 2009
@@ -64,6 +64,8 @@
import org.osgi.service.blueprint.reflect.BeanMetadata;
import org.osgi.service.blueprint.reflect.ServiceMetadata;
import org.osgi.service.blueprint.reflect.ServiceReferenceMetadata;
+import org.osgi.service.blueprint.reflect.Target;
+import org.osgi.service.blueprint.reflect.RefMetadata;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -86,7 +88,8 @@
WaitForTrigger,
Create,
Created,
- Failed
+ Failed,
+ Destroyed,
}
private final BundleContext bundleContext;
@@ -94,7 +97,6 @@
private final NamespaceHandlerRegistry handlers;
private final List<URL> urls;
private final boolean lazyActivation;
- private final ComponentDefinitionRegistryImpl helperComponentDefinitionRegistry;
private final ComponentDefinitionRegistryImpl componentDefinitionRegistry;
private final ConversionServiceImpl conversionService;
private final ExecutorService executors;
@@ -119,7 +121,6 @@
this.handlers = handlers;
this.urls = urls;
this.conversionService = new ConversionServiceImpl(this);
- this.helperComponentDefinitionRegistry = new ComponentDefinitionRegistryImpl();
this.componentDefinitionRegistry = new ComponentDefinitionRegistryImpl();
this.executors = executors;
this.lazyActivation = lazyActivation;
@@ -199,16 +200,11 @@
return;
}
}
- parser.populateHelperSection(handlers, helperComponentDefinitionRegistry);
- parser.populateMainSection(handlers, componentDefinitionRegistry);
- // TODO: need to wait for references from the helper section, such as ConfigAdmin or Converter from the OSGi registry
- processHelperSection();
+ parser.populate(handlers, componentDefinitionRegistry);
state = State.Populated;
break;
case Populated:
- RecipeBuilder i = new RecipeBuilder(this);
- Repository repository = i.createRepository(componentDefinitionRegistry);
- instantiator = new BlueprintObjectInstantiator(repository);
+ instantiator = new BlueprintObjectInstantiator(new RecipeBuilder(this).createRepository());
trackServiceReferences();
if (checkAllSatisfiables() || !waitForDependencies) {
state = State.InitialReferencesSatisfied;
@@ -228,6 +224,8 @@
return;
}
case InitialReferencesSatisfied:
+ processHelpers();
+ new RecipeBuilder(this).updateRepository((BlueprintObjectRepository) instantiator.getRepository());
// TODO: we should always register ServiceFactory in all cases.
// the reason is that the trigger service creation may actually trigger the activation of
// the bundle if the service properties reference any other components (thus loading a class
@@ -254,6 +252,8 @@
bundleContext.getBundle().getSymbolicName());
props.put(BlueprintConstants.CONTEXT_VERSION_PROPERTY,
bundleContext.getBundle().getHeaders().get(Constants.BUNDLE_VERSION));
+ // TODO: register a service factory so that we can honor the bundle scope when
+ // BlueprintContext.getComponent(String) is called directly
registration = bundleContext.registerService(BlueprintContext.class.getName(), this, props);
sender.sendCreated(this);
@@ -262,6 +262,7 @@
break;
case Created:
case Failed:
+ case Destroyed:
return;
}
}
@@ -273,30 +274,28 @@
}
}
- private void processHelperSection() throws Exception {
- RecipeBuilder i = new RecipeBuilder(this);
- Repository repository = i.createRepository(helperComponentDefinitionRegistry);
- BlueprintObjectInstantiator instantiator = new BlueprintObjectInstantiator(repository);
- Map<String, Object> objects = instantiator.createAll(helperComponentDefinitionRegistry.getComponentDefinitionNames());
- for (Object obj : objects.values()) {
- if (obj instanceof Converter) {
- conversionService.registerConverter((Converter) obj);
- }
- }
- for (Object obj : objects.values()) {
- if (obj instanceof ComponentDefinitionRegistryProcessor) {
- ((ComponentDefinitionRegistryProcessor) obj).process(componentDefinitionRegistry);
+ private void processHelpers() throws Exception {
+ List<String> typeConverters = new ArrayList<String>();
+ for (Target target : componentDefinitionRegistry.getTypeConverters()) {
+ if (target instanceof ComponentMetadata) {
+ typeConverters.add(((ComponentMetadata) target).getId());
+ } else if (target instanceof RefMetadata) {
+ typeConverters.add(((RefMetadata) target).getComponentId());
+ } else {
+ throw new ComponentDefinitionException("Unexpected metadata for type converter: " + target);
}
}
+
+ Map<String, Object> objects = instantiator.createAll(typeConverters.toArray(new String[typeConverters.size()]));
for (Object obj : objects.values()) {
- if (obj instanceof BeanProcessor) {
- this.beanProcessors.add((BeanProcessor) obj);
+ if (obj instanceof Converter) {
+ conversionService.registerConverter((Converter) obj);
+ } else {
+ throw new ComponentDefinitionException("Type converter " + obj + " does not implement the " + Converter.class.getName() + " interface");
}
}
// Instanciate ComponentDefinitionRegistryProcessor and BeanProcessor
- repository = i.createRepository(componentDefinitionRegistry);
- instantiator = new BlueprintObjectInstantiator(repository);
for (BeanMetadata bean : getBeanComponentsMetadata()) {
Class clazz = bean.getRuntimeClass();
if (clazz == null && bean.getClassName() != null) {
@@ -585,7 +584,8 @@
return bundleContext;
}
- public void destroy() {
+ public synchronized void destroy() {
+ state = State.Destroyed;
sender.sendDestroying(this);
if (registration != null) {
Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/BlueprintObjectRecipe.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/BlueprintObjectRecipe.java?rev=774934&r1=774933&r2=774934&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/BlueprintObjectRecipe.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/BlueprintObjectRecipe.java Thu May 14 21:17:56 2009
@@ -61,7 +61,6 @@
*/
public class BlueprintObjectRecipe extends AbstractRecipe {
- private String typeName;
private Class typeClass;
private final LinkedHashMap<String,Object> properties = new LinkedHashMap<String,Object>();
private final EnumSet<Option> options = EnumSet.noneOf(Option.class);
@@ -78,8 +77,8 @@
private List<BeanArgument> beanArguments;
private boolean reorderArguments;
- public BlueprintObjectRecipe(BlueprintContextImpl blueprintContext, Class typeName) {
- this.typeClass = typeName;
+ public BlueprintObjectRecipe(BlueprintContextImpl blueprintContext, Class typeClass) {
+ this.typeClass = typeClass;
this.blueprintContext = blueprintContext;
allow(Option.LAZY_ASSIGNMENT);
}
@@ -458,20 +457,7 @@
}
public Class getType() {
- if (typeClass != null || typeName != null) {
- Class type = typeClass;
- if (type == null) {
- try {
- type = RecipeHelper.loadClass(typeName);
- } catch (ClassNotFoundException e) {
- throw new ConstructionException("Type class could not be found: " + typeName);
- }
- }
-
- return type;
- }
-
- return null;
+ return typeClass;
}
private void setProperties(Map<String, Object> propertyValues, Object instance, Class clazz) {
Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/BlueprintObjectRepository.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/BlueprintObjectRepository.java?rev=774934&r1=774933&r2=774934&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/BlueprintObjectRepository.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/BlueprintObjectRepository.java Thu May 14 21:17:56 2009
@@ -75,6 +75,12 @@
instances.put(name, instance);
}
+
+ public void updateRecipe(String name, Recipe recipe) {
+ if (instances.get(name) instanceof Recipe) {
+ instances.put(name, recipe);
+ }
+ }
public void destroy() {
// destroy objects in reverse creation order
Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/Parser.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/Parser.java?rev=774934&r1=774933&r2=774934&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/Parser.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/Parser.java Thu May 14 21:17:56 2009
@@ -203,7 +203,6 @@
private String defaultLazyInit;
private String defaultInitMethod;
private String defaultDestroyMethod;
- private boolean mainSection;
private Set<URI> namespaces;
private boolean validated;
@@ -261,22 +260,10 @@
}
}
- public void populateHelperSection(NamespaceHandlerRegistry handlers,
- ExtendedComponentDefinitionRegistry registry) {
- doPopulate(handlers, registry, false);
- }
-
- public void populateMainSection(NamespaceHandlerRegistry handlers,
- ExtendedComponentDefinitionRegistry registry) {
- doPopulate(handlers, registry, true);
- }
-
- private void doPopulate(NamespaceHandlerRegistry handlers,
- ExtendedComponentDefinitionRegistry registry,
- boolean mainSection) {
+ public void populate(NamespaceHandlerRegistry handlers,
+ ExtendedComponentDefinitionRegistry registry) {
this.namespaceHandlerRegistry = handlers;
this.registry = registry;
- this.mainSection = mainSection;
// Validate xmls
if (this.documents == null) {
throw new IllegalStateException("Documents should be parsed before populating the registry");
@@ -378,15 +365,12 @@
if (node instanceof Element) {
Element element = (Element) node;
String namespaceUri = element.getNamespaceURI();
- boolean parse = mainSection ^ (isBlueprintNamespace(namespaceUri) && nodeNameEquals(element, TYPE_CONVERTERS_ELEMENT));
- if (parse) {
- if (isBlueprintNamespace(namespaceUri)) {
- parseBlueprintElement(element);
- } else {
- ComponentMetadata component = parseCustomElement(element, null);
- if (component != null) {
- registry.registerComponentDefinition(component);
- }
+ if (isBlueprintNamespace(namespaceUri)) {
+ parseBlueprintElement(element);
+ } else {
+ ComponentMetadata component = parseCustomElement(element, null);
+ if (component != null) {
+ registry.registerComponentDefinition(component);
}
}
}
@@ -440,14 +424,23 @@
Node node = nl.item(i);
if (node instanceof Element) {
Element e = (Element) node;
+ Object target = null;
if (isBlueprintNamespace(e.getNamespaceURI())) {
- parseBlueprintElement(e);
- } else {
- ComponentMetadata component = parseCustomElement(e, null);
- if (component != null) {
- registry.registerComponentDefinition(component);
+ if (nodeNameEquals(e, BEAN_ELEMENT)) {
+ target = parseBeanMetadata(e, true);
+ } else if (nodeNameEquals(e, REF_ELEMENT)) {
+ String componentName = e.getAttribute(COMPONENT_ATTRIBUTE);
+ target = new RefMetadataImpl(componentName);
+ } else if (nodeNameEquals(e, REFERENCE_ELEMENT)) {
+ target = parseReference(e, true);
}
+ } else {
+ target = parseCustomElement(e, null);
+ }
+ if (!(target instanceof Target)) {
+ throw new ComponentDefinitionException("Metadata parsed for element " + e.getNodeName() + " can not be used as a type converter");
}
+ registry.registerTypeConverter((Target) target);
}
}
}
Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/RecipeBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/RecipeBuilder.java?rev=774934&r1=774933&r2=774934&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/RecipeBuilder.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/RecipeBuilder.java Thu May 14 21:17:56 2009
@@ -82,6 +82,7 @@
public RecipeBuilder(BlueprintContextImpl blueprintContext) {
this.blueprintContext = blueprintContext;
+ this.registry = blueprintContext.getComponentDefinitionRegistry();
}
private void addBuiltinComponents(Repository repository) {
@@ -93,9 +94,7 @@
}
}
- public BlueprintObjectRepository createRepository(ExtendedComponentDefinitionRegistry registry) throws Exception {
- this.registry = registry;
-
+ public BlueprintObjectRepository createRepository() throws Exception {
BlueprintObjectRepository repository = new BlueprintObjectRepository();
addBuiltinComponents(repository);
@@ -108,6 +107,14 @@
return repository;
}
+ public void updateRepository(BlueprintObjectRepository repository) throws Exception {
+ for (String name : registry.getComponentDefinitionNames()) {
+ ComponentMetadata component = registry.getComponentDefinition(name);
+ Recipe recipe = createRecipe(component);
+ repository.updateRecipe(name, recipe);
+ }
+ }
+
private Recipe createRecipe(ComponentMetadata component) throws Exception {
if (component instanceof BeanMetadata) {
return createBeanRecipe((BeanMetadata) component);
Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/namespace/ComponentDefinitionRegistryImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/namespace/ComponentDefinitionRegistryImpl.java?rev=774934&r1=774933&r2=774934&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/namespace/ComponentDefinitionRegistryImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/namespace/ComponentDefinitionRegistryImpl.java Thu May 14 21:17:56 2009
@@ -49,11 +49,13 @@
public class ComponentDefinitionRegistryImpl implements ExtendedComponentDefinitionRegistry {
private final Map<String, ComponentMetadata> components;
+ private final List<Target> typeConverters;
private String defaultInitMethod;
private String defaultDestroyMethod;
public ComponentDefinitionRegistryImpl() {
components = new ConcurrentHashMap<String, ComponentMetadata>();
+ typeConverters = new CopyOnWriteArrayList<Target>();
}
public boolean containsComponentDefinition(String name) {
@@ -84,6 +86,17 @@
components.remove(name);
}
+ public void registerTypeConverter(Target component) {
+ typeConverters.add(component);
+ if (component instanceof ComponentMetadata) {
+ registerComponentDefinition((ComponentMetadata) component);
+ }
+ }
+
+ public List<Target> getTypeConverters() {
+ return typeConverters;
+ }
+
public void setDefaultInitMethod(String method) {
defaultInitMethod = method;
}
Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/utils/ArgumentsMatcher.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/utils/ArgumentsMatcher.java?rev=774934&r1=774933&r2=774934&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/utils/ArgumentsMatcher.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/utils/ArgumentsMatcher.java Thu May 14 21:17:56 2009
@@ -29,6 +29,7 @@
import org.apache.xbean.recipe.Recipe;
import org.apache.xbean.recipe.RecipeHelper;
+import org.apache.xbean.recipe.MissingAccessorException;
/**
* TODO: javadoc
@@ -132,11 +133,11 @@
int size = matches.size();
if (size == 0) {
- throw new RuntimeException("Did not find any matching method");
+ throw new MissingAccessorException("Did not find any matching method on class " + type + " for arguments " + arguments, -1);
} else if (size == 1) {
- return matches.get(0);
+ return matches.iterator().next();
} else {
- throw new RuntimeException("Found multiple matching methods");
+ throw new MissingAccessorException("Found multiple matching methods on class " + type + " for arguments " + arguments, -1);
}
}
@@ -217,11 +218,11 @@
int size = matches.size();
if (size == 0) {
- throw new RuntimeException("Did not find any matching constructor");
+ throw new MissingAccessorException("Did not find any matching constructor on class " + type + " for arguments " + arguments, -1);
} else if (size == 1) {
return matches.iterator().next();
} else {
- throw new RuntimeException("Found multiple matching constructors");
+ throw new MissingAccessorException("Found multiple matching constructors on class " + type + " for arguments " + arguments, -1);
}
}
Modified: geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/AbstractBlueprintTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/AbstractBlueprintTest.java?rev=774934&r1=774933&r2=774934&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/AbstractBlueprintTest.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/AbstractBlueprintTest.java Thu May 14 21:17:56 2009
@@ -50,7 +50,7 @@
ComponentDefinitionRegistryImpl registry = new ComponentDefinitionRegistryImpl();
Parser parser = new Parser();
parser.parse(Collections.singletonList(getClass().getResource(name)));
- parser.populateMainSection(handlers, registry);
+ parser.populate(handlers, registry);
return registry;
}
Modified: geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/WiringTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/WiringTest.java?rev=774934&r1=774933&r2=774934&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/WiringTest.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/WiringTest.java Thu May 14 21:17:56 2009
@@ -45,7 +45,7 @@
public void testWiring() throws Exception {
ComponentDefinitionRegistryImpl registry = parse("/test-wiring.xml");
RecipeBuilder i = new RecipeBuilder(new TestBlueprintContext(registry));
- BlueprintObjectRepository repository = i.createRepository(registry);
+ BlueprintObjectRepository repository = i.createRepository();
BlueprintObjectInstantiator graph = new BlueprintObjectInstantiator(repository);
Object obj1 = graph.create("pojoA");
@@ -135,7 +135,7 @@
public void testCompoundProperties() throws Exception {
ComponentDefinitionRegistryImpl registry = parse("/test-wiring.xml");
RecipeBuilder i = new RecipeBuilder(new TestBlueprintContext(registry));
- BlueprintObjectRepository repository = i.createRepository(registry);
+ BlueprintObjectRepository repository = i.createRepository();
BlueprintObjectInstantiator graph = new BlueprintObjectInstantiator(repository);
Object obj5 = graph.create("compound");
@@ -149,7 +149,7 @@
public void testIdRefs() throws Exception {
ComponentDefinitionRegistryImpl registry = parse("/test-wiring.xml");
RecipeBuilder i = new RecipeBuilder(new TestBlueprintContext(registry));
- BlueprintObjectRepository repository = i.createRepository(registry);
+ BlueprintObjectRepository repository = i.createRepository();
BlueprintObjectInstantiator graph = new BlueprintObjectInstantiator(repository);
try {
@@ -173,7 +173,7 @@
ComponentDefinitionRegistryImpl registry = parse("/test-depends-on.xml");
RecipeBuilder i = new RecipeBuilder(new TestBlueprintContext(registry));
- BlueprintObjectRepository repository = i.createRepository(registry);
+ BlueprintObjectRepository repository = i.createRepository();
BlueprintObjectInstantiator graph = new BlueprintObjectInstantiator(repository);
Map instances = graph.createAll("c", "d", "e");
@@ -204,7 +204,7 @@
public void testConstructor() throws Exception {
ComponentDefinitionRegistryImpl registry = parse("/test-constructor.xml");
RecipeBuilder i = new RecipeBuilder(new TestBlueprintContext(registry));
- Repository repository = i.createRepository(registry);
+ Repository repository = i.createRepository();
BlueprintObjectInstantiator graph = new BlueprintObjectInstantiator(repository);
Object obj1 = graph.create("pojoA");
@@ -279,7 +279,7 @@
public void testGenerics() throws Exception {
ComponentDefinitionRegistryImpl registry = parse("/test-generics.xml");
RecipeBuilder i = new RecipeBuilder(new TestBlueprintContext(registry));
- Repository repository = i.createRepository(registry);
+ Repository repository = i.createRepository();
BlueprintObjectInstantiator graph = new BlueprintObjectInstantiator(repository);
List<Integer> expectedList = new ArrayList<Integer>();
@@ -330,7 +330,7 @@
public void testCircular() throws Exception {
ComponentDefinitionRegistryImpl registry = parse("/test-circular.xml");
RecipeBuilder i = new RecipeBuilder(new TestBlueprintContext(registry));
- Repository repository = i.createRepository(registry);
+ Repository repository = i.createRepository();
BlueprintObjectInstantiator graph = new BlueprintObjectInstantiator(repository);
try {
Modified: geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestBlueprintContext.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestBlueprintContext.java?rev=774934&r1=774933&r2=774934&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestBlueprintContext.java (original)
+++ geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestBlueprintContext.java Thu May 14 21:17:56 2009
@@ -43,6 +43,7 @@
import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.configProfile;
import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.logProfile;
import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.profile;
+import static org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption;
import org.ops4j.pax.exam.junit.JUnit4TestRunner;
import org.osgi.framework.Bundle;
import org.osgi.service.blueprint.context.BlueprintContext;
@@ -130,6 +131,9 @@
mavenBundle("org.apache.geronimo", "blueprint-bundle"),
mavenBundle("org.apache.geronimo", "blueprint-sample").noStart(),
+ //vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),
+
+
felix(), equinox() //, knopflerfish()
);