geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r773055 - in /geronimo/sandbox/blueprint: blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ blueprint-cm/src/main/java/org/apache/geronimo/blueprint/compendium/cm/ blueprint-core/src/main/java/org/apache/geronimo/blueprint/con...
Date Fri, 08 May 2009 18:11:38 GMT
Author: gawor
Date: Fri May  8 18:11:38 2009
New Revision: 773055

URL: http://svn.apache.org/viewvc?rev=773055&view=rev
Log:
oops. forgot to commit some fixes to constant names

Modified:
    geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/RefCollectionMetadata.java
    geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ServiceReferenceMetadata.java
    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/context/Parser.java

Modified: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/RefCollectionMetadata.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/RefCollectionMetadata.java?rev=773055&r1=773054&r2=773055&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/RefCollectionMetadata.java
(original)
+++ geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/RefCollectionMetadata.java
Fri May  8 18:11:38 2009
@@ -18,9 +18,9 @@
 
 public interface RefCollectionMetadata extends ServiceReferenceMetadata {
 
-    static final int ORDER_BASIS_SERVICE = 1;
+    static final int ORDERING_BASIS_SERVICE = 1;
 
-    static final int ORDER_BASIS_SERVICE_REFERENCE = 2;
+    static final int ORDERING_BASIS_SERVICE_REFERENCE = 2;
 
     static final int MEMBER_TYPE_SERVICE_INSTANCE = 1;
 

Modified: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ServiceReferenceMetadata.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ServiceReferenceMetadata.java?rev=773055&r1=773054&r2=773055&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ServiceReferenceMetadata.java
(original)
+++ geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/reflect/ServiceReferenceMetadata.java
Fri May  8 18:11:38 2009
@@ -21,9 +21,9 @@
 
 public interface ServiceReferenceMetadata extends ComponentMetadata {
 
-    static final int MANDATORY_AVAILABILITY = 1;
+    static final int AVAILABILITY_MANDATORY = 1;
     
-    static final int OPTIONAL_AVAILABILITY = 2;
+    static final int AVAILABILITY_OPTIONAL = 2;
     
     int getAvailability();
 

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=773055&r1=773054&r2=773055&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
Fri May  8 18:11:38 2009
@@ -217,7 +217,7 @@
             MutableReferenceMetadata reference = context.createMetadata(MutableReferenceMetadata.class);
             reference.setId(CONFIG_ADMIN_REFERENCE_NAME);
             reference.addInterfaceName(ConfigurationAdmin.class.getName());
-            reference.setAvailability(ReferenceMetadata.MANDATORY_AVAILABILITY);
+            reference.setAvailability(ReferenceMetadata.AVAILABILITY_MANDATORY);
             reference.setTimeout(300000);
             registry.registerComponentDefinition(reference);
         }

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=773055&r1=773054&r2=773055&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
Fri May  8 18:11:38 2009
@@ -847,9 +847,9 @@
         if (element.hasAttribute(ORDERING_BASIS_ATTRIBUTE)) {
             String ordering = element.getAttribute(ORDERING_BASIS_ATTRIBUTE);
             if (ORDERING_BASIS_SERVICES.equals(ordering)) {
-                references.setOrderingBasis(RefCollectionMetadata.ORDER_BASIS_SERVICE);
+                references.setOrderingBasis(RefCollectionMetadata.ORDERING_BASIS_SERVICE);
             } else if (ODERING_BASIS_SERVICE_REFERENCES.equals(ordering)) {
-                references.setOrderingBasis(RefCollectionMetadata.ORDER_BASIS_SERVICE_REFERENCE);
+                references.setOrderingBasis(RefCollectionMetadata.ORDERING_BASIS_SERVICE_REFERENCE);
             }
         }
         parseReference(element, references);
@@ -920,9 +920,9 @@
         }
         String availability = element.hasAttribute(AVAILABILITY_ATTRIBUTE) ? element.getAttribute(AVAILABILITY_ATTRIBUTE)
: defaultAvailability;
         if (AVAILABILITY_MANDATORY.equals(availability)) {
-            reference.setAvailability(ServiceReferenceMetadata.MANDATORY_AVAILABILITY);
+            reference.setAvailability(ServiceReferenceMetadata.AVAILABILITY_MANDATORY);
         } else if (AVAILABILITY_OPTIONAL.equals(availability)) {
-            reference.setAvailability(ServiceReferenceMetadata.OPTIONAL_AVAILABILITY);
+            reference.setAvailability(ServiceReferenceMetadata.AVAILABILITY_OPTIONAL);
         } else {
             throw new ComponentDefinitionException("Illegal value for " + AVAILABILITY_ATTRIBUTE
+ " attribute: " + availability);
         }



Mime
View raw message