geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r788813 - /geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/Parser.java
Date Fri, 26 Jun 2009 18:38:38 GMT
Author: gawor
Date: Fri Jun 26 18:38:38 2009
New Revision: 788813

URL: http://svn.apache.org/viewvc?rev=788813&view=rev
Log:
default-initialization -> default-activation

Modified:
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/container/Parser.java

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=788813&r1=788812&r2=788813&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
Fri Jun 26 18:38:38 2009
@@ -130,7 +130,7 @@
     public static final String REGISTRATION_LISTENER_ELEMENT = "registration-listener";
     public static final String ENTRY_ELEMENT = "entry";
     public static final String KEY_ELEMENT = "key";
-    public static final String DEFAULT_INITIALIZATION_ATTRIBUTE = "default-initialization";
+    public static final String DEFAULT_ACTIVATION_ATTRIBUTE = "default-activation";
     public static final String DEFAULT_TIMEOUT_ATTRIBUTE = "default-timeout";
     public static final String DEFAULT_AVAILABILITY_ATTRIBUTE = "default-availability";
     public static final String NAME_ATTRIBUTE = "name";
@@ -200,7 +200,7 @@
     private int idCounter;
     private String defaultTimeout;
     private String defaultAvailability;
-    private String defaultInitialization;
+    private String defaultActivation;
     private Set<URI> namespaces;
     private boolean validation;
     private boolean validated;
@@ -316,15 +316,15 @@
     private void loadComponents(Document doc) {
         defaultTimeout = TIMEOUT_DEFAULT;
         defaultAvailability = AVAILABILITY_DEFAULT;
-        defaultInitialization = ACTIVATION_DEFAULT;
+        defaultActivation = ACTIVATION_DEFAULT;
         Element root = doc.getDocumentElement();
         if (!isBlueprintNamespace(root.getNamespaceURI()) ||
                 !nodeNameEquals(root, BLUEPRINT_ELEMENT)) {
             throw new ComponentDefinitionException("Root element must be {" + BLUEPRINT_NAMESPACE
+ "}" + BLUEPRINT_ELEMENT + " element");
         }
         // Parse global attributes
-        if (root.hasAttribute(DEFAULT_INITIALIZATION_ATTRIBUTE)) {
-            defaultInitialization = root.getAttribute(DEFAULT_INITIALIZATION_ATTRIBUTE);
+        if (root.hasAttribute(DEFAULT_ACTIVATION_ATTRIBUTE)) {
+            defaultActivation = root.getAttribute(DEFAULT_ACTIVATION_ATTRIBUTE);
         }
         if (root.hasAttribute(DEFAULT_TIMEOUT_ATTRIBUTE)) {
             defaultTimeout = root.getAttribute(DEFAULT_TIMEOUT_ATTRIBUTE);
@@ -1102,7 +1102,7 @@
     }
 
     private int parseActivation(Element element) {
-        String initialization = element.hasAttribute(ACTIVATION_ATTRIBUTE) ? element.getAttribute(ACTIVATION_ATTRIBUTE)
: defaultInitialization;
+        String initialization = element.hasAttribute(ACTIVATION_ATTRIBUTE) ? element.getAttribute(ACTIVATION_ATTRIBUTE)
: defaultActivation;
         if (ACTIVATION_EAGER.equals(initialization)) {
             return ComponentMetadata.ACTIVATION_EAGER;
         } else if (ACTIVATION_LAZY.equals(initialization)) {



Mime
View raw message