geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r764655 - in /geronimo/sandbox/blueprint: blueprint-api/src/main/java/org/osgi/service/blueprint/context/ blueprint-api/src/main/java/org/osgi/service/blueprint/namespace/ org.apache.felix.blueprint/ org.apache.felix.blueprint/src/main/java...
Date Tue, 14 Apr 2009 00:42:43 GMT
Author: gawor
Date: Tue Apr 14 00:42:42 2009
New Revision: 764655

URL: http://svn.apache.org/viewvc?rev=764655&view=rev
Log:
use blueprint-api module

Removed:
    geronimo/sandbox/blueprint/org.apache.felix.blueprint/src/main/java/org/osgi/
Modified:
    geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/context/ModuleContextEventConstants.java
    geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/namespace/ParserContext.java
    geronimo/sandbox/blueprint/org.apache.felix.blueprint/pom.xml
    geronimo/sandbox/blueprint/org.apache.felix.blueprint/src/main/java/org/apache/felix/blueprint/context/Parser.java

Modified: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/context/ModuleContextEventConstants.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/context/ModuleContextEventConstants.java?rev=764655&r1=764654&r2=764655&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/context/ModuleContextEventConstants.java
(original)
+++ geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/context/ModuleContextEventConstants.java
Tue Apr 14 00:42:42 2009
@@ -24,7 +24,7 @@
     
     static final String EXTENDER_ID = "extender.bundle.id";
     
-    static final String EXTENDER_SYMBLOICNAME = "extender.bundle.symbolicName";
+    static final String EXTENDER_SYMBOLICNAME = "extender.bundle.symbolicName";
     
     static final String TOPIC_BLUEPRINT_EVENTS = "org/osgi/service/blueprint";
     

Modified: geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/namespace/ParserContext.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/namespace/ParserContext.java?rev=764655&r1=764654&r2=764655&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/namespace/ParserContext.java
(original)
+++ geronimo/sandbox/blueprint/blueprint-api/src/main/java/org/osgi/service/blueprint/namespace/ParserContext.java
Tue Apr 14 00:42:42 2009
@@ -25,6 +25,6 @@
     
     ComponentMetadata getEnclosingComponent();
     
-    Node getSourceNoe();
+    Node getSourceNode();
              
 }

Modified: geronimo/sandbox/blueprint/org.apache.felix.blueprint/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/org.apache.felix.blueprint/pom.xml?rev=764655&r1=764654&r2=764655&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/org.apache.felix.blueprint/pom.xml (original)
+++ geronimo/sandbox/blueprint/org.apache.felix.blueprint/pom.xml Tue Apr 14 00:42:42 2009
@@ -32,6 +32,11 @@
   
   <dependencies>
       <dependency>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>blueprint-api</artifactId>
+          <version>${version}</version>
+      </dependency>
+      <dependency>
           <groupId>org.apache.xbean</groupId>
           <artifactId>xbean-reflect</artifactId>
           <version>3.6-SNAPSHOT</version>

Modified: geronimo/sandbox/blueprint/org.apache.felix.blueprint/src/main/java/org/apache/felix/blueprint/context/Parser.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/org.apache.felix.blueprint/src/main/java/org/apache/felix/blueprint/context/Parser.java?rev=764655&r1=764654&r2=764655&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/org.apache.felix.blueprint/src/main/java/org/apache/felix/blueprint/context/Parser.java
(original)
+++ geronimo/sandbox/blueprint/org.apache.felix.blueprint/src/main/java/org/apache/felix/blueprint/context/Parser.java
Tue Apr 14 00:42:42 2009
@@ -775,9 +775,9 @@
         }
         String availability = element.hasAttribute(AVAILABILITY_ATTRIBUTE) ? element.getAttribute(AVAILABILITY_ATTRIBUTE)
: defaultAvailability;
         if (AVAILABILITY_MANDATORY.equals(availability)) {
-            reference.setServiceAvailabilitySpecification(ServiceReferenceComponentMetadata.AVAILABILITY_MANDATORY);
+            reference.setServiceAvailabilitySpecification(ServiceReferenceComponentMetadata.MANDATORY_AVAILABILITY);
         } else if (AVAILABILITY_OPTIONAL.equals(availability)) {
-            reference.setServiceAvailabilitySpecification(ServiceReferenceComponentMetadata.AVAILABILITY_OPTIONAL);
+            reference.setServiceAvailabilitySpecification(ServiceReferenceComponentMetadata.OPTIONAL_AVAILABILITY);
         } else {
             throw new ComponentDefinitionException("Illegal value for " + AVAILABILITY_ATTRIBUTE
+ " attribute: " + availability);
         }



Mime
View raw message