You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2009/07/27 16:50:08 UTC
svn commit: r798177 - in
/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint:
ExtendedBlueprintContainer.java container/BlueprintContainerImpl.java
container/ServiceRecipe.java
Author: gawor
Date: Mon Jul 27 14:50:08 2009
New Revision: 798177
URL: http://svn.apache.org/viewvc?rev=798177&view=rev
Log:
revert lazy service registration changes
Modified:
geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/ExtendedBlueprintContainer.java
geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintContainerImpl.java
geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ServiceRecipe.java
Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/ExtendedBlueprintContainer.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/ExtendedBlueprintContainer.java?rev=798177&r1=798176&r2=798177&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/ExtendedBlueprintContainer.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/ExtendedBlueprintContainer.java Mon Jul 27 14:50:08 2009
@@ -59,7 +59,5 @@
Object getService(ServiceReference reference);
AccessControlContext getAccessControlContext();
-
- boolean isServiceEnabled(ServiceRecipe service);
-
+
}
Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintContainerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintContainerImpl.java?rev=798177&r1=798176&r2=798177&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintContainerImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/BlueprintContainerImpl.java Mon Jul 27 14:50:08 2009
@@ -592,20 +592,6 @@
}
}
- public boolean isServiceEnabled(ServiceRecipe r) {
- List<SatisfiableRecipe> dependencies = getSatisfiableDependenciesMap().get(r.getName());
- boolean enabled = true;
- if (dependencies != null) {
- for (SatisfiableRecipe recipe : dependencies) {
- if (!recipe.isSatisfied()) {
- enabled = false;
- break;
- }
- }
- }
- return enabled;
- }
-
private void instantiateEagerComponents() {
List<String> components = new ArrayList<String>();
for (String name : componentDefinitionRegistry.getComponentDefinitionNames()) {
@@ -642,7 +628,7 @@
}
}
}
- if (/*r.isEager() &&*/ enabled) {
+ if (enabled) {
r.register();
}
}
Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ServiceRecipe.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ServiceRecipe.java?rev=798177&r1=798176&r2=798177&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ServiceRecipe.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ServiceRecipe.java Mon Jul 27 14:50:08 2009
@@ -93,10 +93,6 @@
this.explicitDependencies = explicitDependencies;
this.prototypeService = isPrototypeService(metadata.getServiceComponent());
}
-
- public boolean isEager() {
- return (metadata.getActivation() == ComponentMetadata.ACTIVATION_EAGER);
- }
public Recipe getServiceRecipe() {
return serviceRecipe;
@@ -131,9 +127,6 @@
}
ServiceRegistrationProxy proxy = new ServiceRegistrationProxy();
addObject(proxy, true);
- //if (blueprintContainer.isServiceEnabled(this)) {
- register();
- //}
internalGetService(null, null); // null bundle means we don't want to retrieve the actual service when used with a ServiceFactory
return proxy;
}