geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r781852 - in /geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect: BeanMetadataImpl.java ComponentMetadataImpl.java RefCollectionMetadataImpl.java ReferenceMetadataImpl.java ServiceMetadataImpl.java
Date Thu, 04 Jun 2009 20:57:21 GMT
Author: gnodet
Date: Thu Jun  4 20:57:20 2009
New Revision: 781852

URL: http://svn.apache.org/viewvc?rev=781852&view=rev
Log:
Fix <service> depends-on attribute

Modified:
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/BeanMetadataImpl.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ComponentMetadataImpl.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/RefCollectionMetadataImpl.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ReferenceMetadataImpl.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ServiceMetadataImpl.java

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/BeanMetadataImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/BeanMetadataImpl.java?rev=781852&r1=781851&r2=781852&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/BeanMetadataImpl.java
(original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/BeanMetadataImpl.java
Thu Jun  4 20:57:20 2009
@@ -202,17 +202,17 @@
     public String toString() {
         return "BeanMetadata[" +
                 "id='" + id + '\'' +
+                ", initialization=" + initialization +
+                ", dependsOn=" + dependsOn +
                 ", className='" + className + '\'' +
                 ", initMethodName='" + initMethodName + '\'' +
                 ", destroyMethodName='" + destroyMethodName + '\'' +
                 ", arguments=" + arguments +
                 ", properties=" + properties +
-                ", initialization=" + initialization +
                 ", factoryMethodName='" + factoryMethodName + '\'' +
                 ", factoryComponent=" + factoryComponent +
                 ", scope='" + scope + '\'' +
                 ", runtimeClass=" + runtimeClass +
-                ", explicitDependencies=" + dependsOn +
                 ']';
     }
 }

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ComponentMetadataImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ComponentMetadataImpl.java?rev=781852&r1=781851&r2=781852&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ComponentMetadataImpl.java
(original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ComponentMetadataImpl.java
Thu Jun  4 20:57:20 2009
@@ -42,6 +42,8 @@
     
     protected ComponentMetadataImpl(ComponentMetadata source) {
         id = source.getId();
+        initialization = source.getInitialization();
+        dependsOn = new ArrayList<String>(source.getDependsOn());
     }
     
     public String getId() {

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/RefCollectionMetadataImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/RefCollectionMetadataImpl.java?rev=781852&r1=781851&r2=781852&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/RefCollectionMetadataImpl.java
(original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/RefCollectionMetadataImpl.java
Thu Jun  4 20:57:20 2009
@@ -81,7 +81,10 @@
     @Override
     public String toString() {
         return "RefCollectionMetadata[" +
-                "availability=" + availability +
+                "id='" + id + '\'' +
+                ", initialization=" + initialization +
+                ", dependsOn=" + dependsOn +
+                ", availability=" + availability +
                 ", interfaceNames=" + interfaceNames +
                 ", componentName='" + componentName + '\'' +
                 ", filter='" + filter + '\'' +

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ReferenceMetadataImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ReferenceMetadataImpl.java?rev=781852&r1=781851&r2=781852&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ReferenceMetadataImpl.java
(original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ReferenceMetadataImpl.java
Thu Jun  4 20:57:20 2009
@@ -50,7 +50,10 @@
     @Override
     public String toString() {
         return "ReferenceMetadata[" +
-                "availability=" + availability +
+                "id='" + id + '\'' +
+                ", initialization=" + initialization +
+                ", dependsOn=" + dependsOn +
+                ", availability=" + availability +
                 ", interfaceNames=" + interfaceNames +
                 ", componentName='" + componentName + '\'' +
                 ", filter='" + filter + '\'' +

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ServiceMetadataImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ServiceMetadataImpl.java?rev=781852&r1=781851&r2=781852&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ServiceMetadataImpl.java
(original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ServiceMetadataImpl.java
Thu Jun  4 20:57:20 2009
@@ -45,7 +45,6 @@
     private List<MapEntry> serviceProperties;
     private int ranking;
     private Collection<RegistrationListener> registrationListeners;
-    private List<String> explicitDependencies;
 
     public ServiceMetadataImpl() {
     }
@@ -62,7 +61,6 @@
         for (RegistrationListener listener : source.getRegistrationListeners()) {
             addRegistrationListener(new RegistrationListenerImpl(listener));
         }
-        this.explicitDependencies = new ArrayList<String>(source.getDependsOn());
     }
 
     public Target getServiceComponent() {
@@ -176,42 +174,18 @@
         }
     }
 
-    public List<String> getDependsOn() {
-        if (this.explicitDependencies == null) {
-            return Collections.emptyList();
-        } else {
-            return this.explicitDependencies;
-        }
-    }
-
-    public void setExplicitDependencies(List<String> explicitDependencies) {
-        this.explicitDependencies = explicitDependencies;
-    }
-
-    public void addDependsOn(String explicitDependency) {
-        if (this.explicitDependencies == null) {
-            this.explicitDependencies = new ArrayList<String>();
-        }
-        this.explicitDependencies.add(explicitDependency);
-    }
-
-    public void removeDependsOn(String dependency) {
-        if (this.explicitDependencies != null) {
-            this.explicitDependencies.remove(dependency);
-        }
-    }
-
     @Override
     public String toString() {
         return "ServiceMetadata[" +
                 "id='" + id + '\'' +
+                ", initialization=" + initialization +
+                ", dependsOn=" + dependsOn +
                 ", exportedComponent=" + serviceComponent +
                 ", interfaceNames=" + interfaceNames +
                 ", autoExportMode=" + autoExportMode +
                 ", serviceProperties=" + serviceProperties +
                 ", ranking=" + ranking +
                 ", registrationListeners=" + registrationListeners +
-                ", explicitDependencies=" + explicitDependencies +
                 ']';
     }
 }



Mime
View raw message