geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r788514 - in /geronimo/sandbox/blueprint: blueprint-cm/src/main/java/org/apache/geronimo/blueprint/compendium/cm/ blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/ blueprint-core/src/main/java/org/apache/geronimo/bluepri...
Date Thu, 25 Jun 2009 21:20:16 GMT
Author: gawor
Date: Thu Jun 25 21:20:14 2009
New Revision: 788514

URL: http://svn.apache.org/viewvc?rev=788514&view=rev
Log:
some cleanup: setInitialization -> setActivation

Modified:
    geronimo/sandbox/blueprint/blueprint-cm/src/main/java/org/apache/geronimo/blueprint/compendium/cm/CmNamespaceHandler.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/Parser.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/mutable/MutableComponentMetadata.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/ReferenceListMetadataImpl.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-cm/src/main/java/org/apache/geronimo/blueprint/compendium/cm/CmNamespaceHandler.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-cm/src/main/java/org/apache/geronimo/blueprint/compendium/cm/CmNamespaceHandler.java?rev=788514&r1=788513&r2=788514&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-cm/src/main/java/org/apache/geronimo/blueprint/compendium/cm/CmNamespaceHandler.java
(original)
+++ geronimo/sandbox/blueprint/blueprint-cm/src/main/java/org/apache/geronimo/blueprint/compendium/cm/CmNamespaceHandler.java
Thu Jun 25 21:20:14 2009
@@ -420,7 +420,7 @@
         MutableBeanMetadata bean = context.createMetadata(MutableBeanMetadata.class);
         bean.setRuntimeClass(CmNamespaceHandler.class);
         bean.setFactoryMethod("getConfigAdmin");
-        bean.setInitialization(MutableBeanMetadata.ACTIVATION_LAZY);
+        bean.setActivation(MutableBeanMetadata.ACTIVATION_LAZY);
         bean.setScope(MutableBeanMetadata.SCOPE_PROTOTYPE);
         return bean;
     }

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/Parser.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/Parser.java?rev=788514&r1=788513&r2=788514&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/Parser.java
(original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/Parser.java
Thu Jun 25 21:20:14 2009
@@ -460,10 +460,10 @@
             } else {
                 metadata.setScope(BeanMetadata.SCOPE_SINGLETON);
             }
-            metadata.setInitialization(parseInitialization(element));
+            metadata.setActivation(parseActivation(element));
         } else {
             metadata.setScope(BeanMetadata.SCOPE_PROTOTYPE);
-            metadata.setInitialization(ComponentMetadata.ACTIVATION_LAZY);
+            metadata.setActivation(ComponentMetadata.ACTIVATION_LAZY);
         }
         if (element.hasAttribute(CLASS_ATTRIBUTE)) {
             metadata.setClassName(element.getAttribute(CLASS_ATTRIBUTE));
@@ -540,9 +540,9 @@
         boolean hasInterfaceNameAttribute = false;
         if (topElement) {
             service.setId(getId(element));
-            service.setInitialization(parseInitialization(element));
+            service.setActivation(parseActivation(element));
         } else {
-            service.setInitialization(ComponentMetadata.ACTIVATION_LAZY);
+            service.setActivation(ComponentMetadata.ACTIVATION_LAZY);
         }
         if (element.hasAttribute(INTERFACE_ATTRIBUTE)) {
             service.setInterfaceNames(Collections.singletonList(element.getAttribute(INTERFACE_ATTRIBUTE)));
@@ -892,9 +892,9 @@
     private void parseReference(Element element, ServiceReferenceMetadataImpl reference,
boolean topElement) {
         // Parse attributes
         if (topElement) {
-            reference.setInitialization(parseInitialization(element));
+            reference.setActivation(parseActivation(element));
         } else {
-            reference.setInitialization(ComponentMetadata.ACTIVATION_LAZY);
+            reference.setActivation(ComponentMetadata.ACTIVATION_LAZY);
         }
         if (element.hasAttribute(DEPENDS_ON_ATTRIBUTE)) {
             reference.setDependsOn(parseList(element.getAttribute(DEPENDS_ON_ATTRIBUTE)));
@@ -1101,7 +1101,7 @@
         return new IdRefMetadataImpl(component);
     }
 
-    private int parseInitialization(Element element) {
+    private int parseActivation(Element element) {
         String initialization = element.hasAttribute(ACTIVATION_ATTRIBUTE) ? element.getAttribute(ACTIVATION_ATTRIBUTE)
: defaultInitialization;
         if (ACTIVATION_EAGER.equals(initialization)) {
             return ComponentMetadata.ACTIVATION_EAGER;

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/mutable/MutableComponentMetadata.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/mutable/MutableComponentMetadata.java?rev=788514&r1=788513&r2=788514&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/mutable/MutableComponentMetadata.java
(original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/mutable/MutableComponentMetadata.java
Thu Jun 25 21:20:14 2009
@@ -32,7 +32,7 @@
 
     void setId(String id);
 
-    void setInitialization(int initialization);
+    void setActivation(int activation);
 
     void setDependsOn(List<String> 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=788514&r1=788513&r2=788514&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 25 21:20:14 2009
@@ -34,7 +34,7 @@
 public class ComponentMetadataImpl implements MutableComponentMetadata {
 
     protected String id;
-    protected int initialization = ACTIVATION_EAGER;
+    protected int activation = ACTIVATION_EAGER;
     protected List<String> dependsOn;
 
     protected ComponentMetadataImpl() {
@@ -42,7 +42,7 @@
     
     protected ComponentMetadataImpl(ComponentMetadata source) {
         id = source.getId();
-        initialization = source.getActivation();
+        activation = source.getActivation();
         dependsOn = new ArrayList<String>(source.getDependsOn());
     }
     
@@ -55,11 +55,11 @@
     }
 
     public int getActivation() {
-        return initialization;
+        return activation;
     }
 
-    public void setInitialization(int initialization) {
-        this.initialization = initialization;
+    public void setActivation(int activation) {
+        this.activation = activation;
     }
 
     public List<String> getDependsOn() {

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ReferenceListMetadataImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ReferenceListMetadataImpl.java?rev=788514&r1=788513&r2=788514&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ReferenceListMetadataImpl.java
(original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ReferenceListMetadataImpl.java
Thu Jun 25 21:20:14 2009
@@ -51,7 +51,7 @@
     public String toString() {
         return "RefCollectionMetadata[" +
                 "id='" + id + '\'' +
-                ", initialization=" + initialization +
+                ", activation=" + activation +
                 ", dependsOn=" + dependsOn +
                 ", availability=" + availability +
                 ", interface='" + interfaceName + '\'' +

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=788514&r1=788513&r2=788514&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 25 21:20:14 2009
@@ -51,7 +51,7 @@
     public String toString() {
         return "ReferenceMetadata[" +
                 "id='" + id + '\'' +
-                ", initialization=" + initialization +
+                ", activation=" + activation +
                 ", dependsOn=" + dependsOn +
                 ", availability=" + availability +
                 ", interface='" + interfaceName + '\'' +

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=788514&r1=788513&r2=788514&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 25 21:20:14 2009
@@ -178,7 +178,7 @@
     public String toString() {
         return "ServiceMetadata[" +
                 "id='" + id + '\'' +
-                ", initialization=" + initialization +
+                ", activation=" + activation +
                 ", dependsOn=" + dependsOn +
                 ", exportedComponent=" + serviceComponent +
                 ", interfaces=" + interfaceNames +



Mime
View raw message