geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r766501 - in /geronimo/sandbox/blueprint: ./ blueprint-api/ blueprint-bundle/ blueprint-core/ blueprint-core/src/main/java/org/apache/felix/ blueprint-core/src/main/java/org/apache/geronimo/ blueprint-core/src/main/java/org/apache/geronimo/...
Date Sun, 19 Apr 2009 19:29:56 GMT
Author: gnodet
Date: Sun Apr 19 19:29:54 2009
New Revision: 766501

URL: http://svn.apache.org/viewvc?rev=766501&view=rev
Log:
Refactor packages and modules as geronimo instead of felix

Added:
    geronimo/sandbox/blueprint/blueprint-core/
      - copied from r766467, geronimo/sandbox/blueprint/org.apache.felix.blueprint/
    geronimo/sandbox/blueprint/blueprint-core/pom.xml
      - copied, changed from r766500, geronimo/sandbox/blueprint/org.apache.felix.blueprint/pom.xml
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/
      - copied from r766467, geronimo/sandbox/blueprint/org.apache.felix.blueprint/src/main/java/org/apache/felix/
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/LifeCycle.java
      - copied, changed from r766500, geronimo/sandbox/blueprint/org.apache.felix.blueprint/src/main/java/org/apache/felix/blueprint/LifeCycle.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/BundleDelegatingClassLoader.java
      - copied, changed from r766500, geronimo/sandbox/blueprint/org.apache.felix.blueprint/src/main/java/org/apache/felix/blueprint/context/BundleDelegatingClassLoader.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/ReferenceServiceRecipe.java
      - copied, changed from r766500, geronimo/sandbox/blueprint/org.apache.felix.blueprint/src/main/java/org/apache/felix/blueprint/context/ReferenceServiceRecipe.java
    geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/
      - copied from r766467, geronimo/sandbox/blueprint/org.apache.felix.blueprint/src/test/java/org/apache/felix/
    geronimo/sandbox/blueprint/blueprint-itests/
      - copied from r766467, geronimo/sandbox/blueprint/itests/
    geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/
      - copied from r766467, geronimo/sandbox/blueprint/itests/src/test/java/org/apache/felix/
    geronimo/sandbox/blueprint/blueprint-itests/src/test/resources/org/apache/geronimo/
      - copied from r766467, geronimo/sandbox/blueprint/itests/src/test/resources/org/apache/felix/
    geronimo/sandbox/blueprint/blueprint-sample/
      - copied from r766467, geronimo/sandbox/blueprint/sample/
Removed:
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/felix/
    geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/felix/
    geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/felix/
    geronimo/sandbox/blueprint/blueprint-itests/src/test/resources/org/apache/felix/
    geronimo/sandbox/blueprint/itests/
    geronimo/sandbox/blueprint/org.apache.felix.blueprint/
    geronimo/sandbox/blueprint/sample/
Modified:
    geronimo/sandbox/blueprint/README
    geronimo/sandbox/blueprint/blueprint-api/pom.xml
    geronimo/sandbox/blueprint/blueprint-bundle/pom.xml
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/Activator.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/BlueprintConstants.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/HeaderParser.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/ModuleContextEventSender.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/NamespaceHandlerRegistry.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/DefaultModuleContextEventSender.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/Instanciator.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/ModuleContextImpl.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/Parser.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/ReflectionUtils.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/ServiceRegistrationProxy.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/ValueRecipe.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/WaitForDependencyException.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/convert/ConversionServiceImpl.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/namespace/ComponentDefinitionRegistryImpl.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/namespace/NamespaceHandlerRegistryImpl.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/namespace/ParserContextImpl.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ArrayValueImpl.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/BindingListenerMetadataImpl.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/CollectionBasedServiceReferenceComponentMetadataImpl.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/ComponentValueImpl.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ConstructorInjectionMetadataImpl.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ListValueImpl.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/LocalComponentMetadataImpl.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/MapValueImpl.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/MetadataUtil.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/MethodInjectionMetadataImpl.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ParameterSpecificationImpl.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/PropertiesValueImpl.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/PropertyInjectionMetadataImpl.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ReferenceNameValueImpl.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ReferenceValueImpl.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/RegistrationListenerMetadataImpl.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ServiceExportComponentMetadataImpl.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ServiceReferenceComponentMetadataImpl.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/SetValueImpl.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/TypedStringValueImpl.java
    geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/UnaryServiceReferenceComponentMetadataImpl.java
    geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/AbstractBlueprintTest.java
    geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/HeaderParserTest.java
    geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/ParserTest.java
    geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/WiringTest.java
    geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/convert/ConversionServiceImplTest.java
    geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/pojos/ConverterA.java
    geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/pojos/ConverterB.java
    geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/pojos/InterfaceA.java
    geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/pojos/ListenerA.java
    geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/pojos/PojoA.java
    geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/pojos/PojoB.java
    geronimo/sandbox/blueprint/blueprint-core/src/test/resources/test-simple-component.xml
    geronimo/sandbox/blueprint/blueprint-core/src/test/resources/test-wiring.xml
    geronimo/sandbox/blueprint/blueprint-core/src/test/resources/test.xml
    geronimo/sandbox/blueprint/blueprint-itests/pom.xml
    geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/Test.java
    geronimo/sandbox/blueprint/blueprint-itests/src/test/resources/org/apache/geronimo/blueprint/MANIFEST.MF
    geronimo/sandbox/blueprint/blueprint-sample/pom.xml
    geronimo/sandbox/blueprint/pom.xml

Modified: geronimo/sandbox/blueprint/README
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/README?rev=766501&r1=766500&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/README (original)
+++ geronimo/sandbox/blueprint/README Sun Apr 19 19:29:54 2009
@@ -19,7 +19,7 @@
 4) Build the blueprint project and install the extender and sample bundles:
 
   a) install file://<m2_repo>/org/apache/felix/blueprint-api/1.0.0-SNAPSHOT/blueprint-api-1.0.0-SNAPSHOT.jar
-  b) install file://<m2_repo>/org/apache/felix/org.apache.felix.blueprint/1.0.0-SNAPSHOT/org.apache.felix.blueprint-1.0.0-SNAPSHOT.jar
+  b) install file://<m2_repo>/org/apache/felix/org.apache.geronimo.blueprint/1.0.0-SNAPSHOT/org.apache.geronimo.blueprint-1.0.0-SNAPSHOT.jar
   c) install file://<m2_repo>/org/apache/felix/sample/1.0.0-SNAPSHOT/sample-1.0.0-SNAPSHOT.jar
 
 5) Start the extender and sample bundles:

Modified: geronimo/sandbox/blueprint/blueprint-api/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-api/pom.xml?rev=766501&r1=766500&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-api/pom.xml (original)
+++ geronimo/sandbox/blueprint/blueprint-api/pom.xml Sun Apr 19 19:29:54 2009
@@ -17,14 +17,14 @@
 <project>
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.felix</groupId>
+        <groupId>org.apache.geronimo</groupId>
         <artifactId>blueprint</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>blueprint-api</artifactId>
     <packaging>jar</packaging>
-    <name>Blueprint API</name>
+    <name>Apache Geronimo Blueprint API</name>
     <build>
         <plugins>
             <plugin>

Modified: geronimo/sandbox/blueprint/blueprint-bundle/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-bundle/pom.xml?rev=766501&r1=766500&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-bundle/pom.xml (original)
+++ geronimo/sandbox/blueprint/blueprint-bundle/pom.xml Sun Apr 19 19:29:54 2009
@@ -17,14 +17,14 @@
 <project>
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.felix</groupId>
+        <groupId>org.apache.geronimo</groupId>
         <artifactId>blueprint</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>blueprint-bundle</artifactId>
     <packaging>bundle</packaging>
-    <name>Blueprint Bundle</name>
+    <name>Apache Geronimo Blueprint Bundle</name>
     <build>
         <plugins>
             <plugin>
@@ -34,10 +34,14 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-                        <Bundle-Activator>org.apache.felix.blueprint.Activator</Bundle-Activator>
+                        <Bundle-Activator>org.apache.geronimo.blueprint.Activator</Bundle-Activator>
+                        <Import-Package>
+                            org.apache.tools.ant*;resolution:=optional,
+                            *
+                        </Import-Package>
                         <Export-Package>
                             org.osgi.service.blueprint*;version="1.0",
-                            org.apache.felix.blueprint*;version="${pom.version}"
+                            org.apache.geronimo.blueprint*;version="${pom.version}"
                         </Export-Package>
                         <Private-Package>
                             org.apache.xbean*,
@@ -51,8 +55,8 @@
     </build>
     <dependencies>
         <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.blueprint</artifactId>
+            <groupId>org.apache.geronimo</groupId>
+            <artifactId>blueprint-core</artifactId>
             <version>${version}</version>
             <scope>provided</scope>
         </dependency>

Copied: geronimo/sandbox/blueprint/blueprint-core/pom.xml (from r766500, geronimo/sandbox/blueprint/org.apache.felix.blueprint/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/pom.xml?p2=geronimo/sandbox/blueprint/blueprint-core/pom.xml&p1=geronimo/sandbox/blueprint/org.apache.felix.blueprint/pom.xml&r1=766500&r2=766501&rev=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/org.apache.felix.blueprint/pom.xml (original)
+++ geronimo/sandbox/blueprint/blueprint-core/pom.xml Sun Apr 19 19:29:54 2009
@@ -18,19 +18,19 @@
 -->
 <project>
  <parent>
-    <groupId>org.apache.felix</groupId>
+    <groupId>org.apache.geronimo</groupId>
     <artifactId>blueprint</artifactId>
     <version>1.0.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
-  <artifactId>org.apache.felix.blueprint</artifactId>
-  <name>Apache Felix Blueprint</name>
+  <artifactId>blueprint-core</artifactId>
+  <name>Apache Geronimo Blueprint Core</name>
   <packaging>bundle</packaging>
   
   <dependencies>
       <dependency>
-          <groupId>org.apache.felix</groupId>
+          <groupId>org.apache.geronimo</groupId>
           <artifactId>blueprint-api</artifactId>
           <version>${version}</version>
       </dependency>
@@ -68,9 +68,9 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Export-Package>org.apache.felix.blueprint*;version="${pom.version}"</Export-Package>
+                        <Export-Package>org.apache.geronimo.blueprint*;version="${pom.version}"</Export-Package>
                         <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-                        <Bundle-Activator>org.apache.felix.blueprint.Activator</Bundle-Activator>
+                        <Bundle-Activator>org.apache.geronimo.blueprint.Activator</Bundle-Activator>
                     </instructions>
                 </configuration>
             </plugin>

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/Activator.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/Activator.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/Activator.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/Activator.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint;
+package org.apache.geronimo.blueprint;
 
 import java.net.URL;
 import java.util.ArrayList;
@@ -28,10 +28,10 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 
-import org.apache.felix.blueprint.HeaderParser.PathElement;
-import org.apache.felix.blueprint.context.DefaultModuleContextEventSender;
-import org.apache.felix.blueprint.context.ModuleContextImpl;
-import org.apache.felix.blueprint.namespace.NamespaceHandlerRegistryImpl;
+import org.apache.geronimo.blueprint.HeaderParser.PathElement;
+import org.apache.geronimo.blueprint.context.DefaultModuleContextEventSender;
+import org.apache.geronimo.blueprint.context.ModuleContextImpl;
+import org.apache.geronimo.blueprint.namespace.NamespaceHandlerRegistryImpl;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/BlueprintConstants.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/BlueprintConstants.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/BlueprintConstants.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/BlueprintConstants.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint;
+package org.apache.geronimo.blueprint;
 
 public class BlueprintConstants  {
    

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/HeaderParser.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/HeaderParser.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/HeaderParser.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/HeaderParser.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint;
+package org.apache.geronimo.blueprint;
 
 import java.util.ArrayList;
 import java.util.HashMap;

Copied: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/LifeCycle.java (from r766500, geronimo/sandbox/blueprint/org.apache.felix.blueprint/src/main/java/org/apache/felix/blueprint/LifeCycle.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/LifeCycle.java?p2=geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/LifeCycle.java&p1=geronimo/sandbox/blueprint/org.apache.felix.blueprint/src/main/java/org/apache/felix/blueprint/LifeCycle.java&r1=766500&r2=766501&rev=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/org.apache.felix.blueprint/src/main/java/org/apache/felix/blueprint/LifeCycle.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/LifeCycle.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint;
+package org.apache.geronimo.blueprint;
 
 public interface LifeCycle {
 

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/ModuleContextEventSender.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/ModuleContextEventSender.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/ModuleContextEventSender.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/ModuleContextEventSender.java Sun Apr 19 19:29:54 2009
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint;
+package org.apache.geronimo.blueprint;
 
-import org.apache.felix.blueprint.context.ModuleContextImpl;
+import org.apache.geronimo.blueprint.context.ModuleContextImpl;
 import org.osgi.service.blueprint.context.ModuleContext;
 import org.osgi.service.blueprint.context.ModuleContextEventConstants;
 

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/NamespaceHandlerRegistry.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/NamespaceHandlerRegistry.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/NamespaceHandlerRegistry.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/NamespaceHandlerRegistry.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint;
+package org.apache.geronimo.blueprint;
 
 import java.net.URI;
 

Copied: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/BundleDelegatingClassLoader.java (from r766500, geronimo/sandbox/blueprint/org.apache.felix.blueprint/src/main/java/org/apache/felix/blueprint/context/BundleDelegatingClassLoader.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/BundleDelegatingClassLoader.java?p2=geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/BundleDelegatingClassLoader.java&p1=geronimo/sandbox/blueprint/org.apache.felix.blueprint/src/main/java/org/apache/felix/blueprint/context/BundleDelegatingClassLoader.java&r1=766500&r2=766501&rev=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/org.apache.felix.blueprint/src/main/java/org/apache/felix/blueprint/context/BundleDelegatingClassLoader.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/BundleDelegatingClassLoader.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.context;
+package org.apache.geronimo.blueprint.context;
 
 import java.net.URL;
 import java.util.Enumeration;

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/DefaultModuleContextEventSender.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/DefaultModuleContextEventSender.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/DefaultModuleContextEventSender.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/DefaultModuleContextEventSender.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.context;
+package org.apache.geronimo.blueprint.context;
 
 import java.util.Dictionary;
 import java.util.Hashtable;
@@ -31,8 +31,8 @@
 import org.osgi.service.event.EventConstants;
 import org.osgi.service.blueprint.context.ModuleContextEventConstants;
 import org.osgi.service.blueprint.context.ModuleContext;
-import org.apache.felix.blueprint.BlueprintConstants;
-import org.apache.felix.blueprint.ModuleContextEventSender;
+import org.apache.geronimo.blueprint.BlueprintConstants;
+import org.apache.geronimo.blueprint.ModuleContextEventSender;
 
 /**
  * TODO: javadoc

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/Instanciator.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/Instanciator.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/Instanciator.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/Instanciator.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.context;
+package org.apache.geronimo.blueprint.context;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -26,8 +26,8 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.felix.blueprint.namespace.ComponentDefinitionRegistryImpl;
-import org.apache.felix.blueprint.reflect.ServiceExportComponentMetadataImpl;
+import org.apache.geronimo.blueprint.namespace.ComponentDefinitionRegistryImpl;
+import org.apache.geronimo.blueprint.reflect.ServiceExportComponentMetadataImpl;
 import org.apache.xbean.recipe.ArrayRecipe;
 import org.apache.xbean.recipe.CollectionRecipe;
 import org.apache.xbean.recipe.ConstructionException;

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/ModuleContextImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/ModuleContextImpl.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/ModuleContextImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/ModuleContextImpl.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.context;
+package org.apache.geronimo.blueprint.context;
 
 import java.net.URL;
 import java.util.ArrayList;
@@ -29,13 +29,13 @@
 import java.util.Set;
 import java.util.Properties;
 
-import org.apache.felix.blueprint.BlueprintConstants;
-import org.apache.felix.blueprint.HeaderParser;
-import org.apache.felix.blueprint.HeaderParser.PathElement;
-import org.apache.felix.blueprint.ModuleContextEventSender;
-import org.apache.felix.blueprint.NamespaceHandlerRegistry;
-import org.apache.felix.blueprint.convert.ConversionServiceImpl;
-import org.apache.felix.blueprint.namespace.ComponentDefinitionRegistryImpl;
+import org.apache.geronimo.blueprint.BlueprintConstants;
+import org.apache.geronimo.blueprint.HeaderParser;
+import org.apache.geronimo.blueprint.HeaderParser.PathElement;
+import org.apache.geronimo.blueprint.ModuleContextEventSender;
+import org.apache.geronimo.blueprint.NamespaceHandlerRegistry;
+import org.apache.geronimo.blueprint.convert.ConversionServiceImpl;
+import org.apache.geronimo.blueprint.namespace.ComponentDefinitionRegistryImpl;
 import org.apache.xbean.recipe.ObjectGraph;
 import org.apache.xbean.recipe.Repository;
 import org.osgi.framework.Bundle;

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=766501&r1=766467&r2=766501&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 Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.context;
+package org.apache.geronimo.blueprint.context;
 
 import java.io.InputStream;
 import java.net.URI;
@@ -43,26 +43,26 @@
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import org.apache.felix.blueprint.NamespaceHandlerRegistry;
-import org.apache.felix.blueprint.namespace.ComponentDefinitionRegistryImpl;
-import org.apache.felix.blueprint.namespace.ParserContextImpl;
-import org.apache.felix.blueprint.reflect.ArrayValueImpl;
-import org.apache.felix.blueprint.reflect.BindingListenerMetadataImpl;
-import org.apache.felix.blueprint.reflect.CollectionBasedServiceReferenceComponentMetadataImpl;
-import org.apache.felix.blueprint.reflect.ComponentValueImpl;
-import org.apache.felix.blueprint.reflect.ListValueImpl;
-import org.apache.felix.blueprint.reflect.LocalComponentMetadataImpl;
-import org.apache.felix.blueprint.reflect.MapValueImpl;
-import org.apache.felix.blueprint.reflect.ParameterSpecificationImpl;
-import org.apache.felix.blueprint.reflect.PropertiesValueImpl;
-import org.apache.felix.blueprint.reflect.PropertyInjectionMetadataImpl;
-import org.apache.felix.blueprint.reflect.ReferenceValueImpl;
-import org.apache.felix.blueprint.reflect.RegistrationListenerMetadataImpl;
-import org.apache.felix.blueprint.reflect.ServiceExportComponentMetadataImpl;
-import org.apache.felix.blueprint.reflect.ServiceReferenceComponentMetadataImpl;
-import org.apache.felix.blueprint.reflect.SetValueImpl;
-import org.apache.felix.blueprint.reflect.TypedStringValueImpl;
-import org.apache.felix.blueprint.reflect.UnaryServiceReferenceComponentMetadataImpl;
+import org.apache.geronimo.blueprint.NamespaceHandlerRegistry;
+import org.apache.geronimo.blueprint.namespace.ComponentDefinitionRegistryImpl;
+import org.apache.geronimo.blueprint.namespace.ParserContextImpl;
+import org.apache.geronimo.blueprint.reflect.ArrayValueImpl;
+import org.apache.geronimo.blueprint.reflect.BindingListenerMetadataImpl;
+import org.apache.geronimo.blueprint.reflect.CollectionBasedServiceReferenceComponentMetadataImpl;
+import org.apache.geronimo.blueprint.reflect.ComponentValueImpl;
+import org.apache.geronimo.blueprint.reflect.ListValueImpl;
+import org.apache.geronimo.blueprint.reflect.LocalComponentMetadataImpl;
+import org.apache.geronimo.blueprint.reflect.MapValueImpl;
+import org.apache.geronimo.blueprint.reflect.ParameterSpecificationImpl;
+import org.apache.geronimo.blueprint.reflect.PropertiesValueImpl;
+import org.apache.geronimo.blueprint.reflect.PropertyInjectionMetadataImpl;
+import org.apache.geronimo.blueprint.reflect.ReferenceValueImpl;
+import org.apache.geronimo.blueprint.reflect.RegistrationListenerMetadataImpl;
+import org.apache.geronimo.blueprint.reflect.ServiceExportComponentMetadataImpl;
+import org.apache.geronimo.blueprint.reflect.ServiceReferenceComponentMetadataImpl;
+import org.apache.geronimo.blueprint.reflect.SetValueImpl;
+import org.apache.geronimo.blueprint.reflect.TypedStringValueImpl;
+import org.apache.geronimo.blueprint.reflect.UnaryServiceReferenceComponentMetadataImpl;
 import org.osgi.service.blueprint.context.ComponentDefinitionException;
 import org.osgi.service.blueprint.namespace.NamespaceHandler;
 import org.osgi.service.blueprint.reflect.ArrayValue;

Copied: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/ReferenceServiceRecipe.java (from r766500, geronimo/sandbox/blueprint/org.apache.felix.blueprint/src/main/java/org/apache/felix/blueprint/context/ReferenceServiceRecipe.java)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/ReferenceServiceRecipe.java?p2=geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/ReferenceServiceRecipe.java&p1=geronimo/sandbox/blueprint/org.apache.felix.blueprint/src/main/java/org/apache/felix/blueprint/context/ReferenceServiceRecipe.java&r1=766500&r2=766501&rev=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/org.apache.felix.blueprint/src/main/java/org/apache/felix/blueprint/context/ReferenceServiceRecipe.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/ReferenceServiceRecipe.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.context;
+package org.apache.geronimo.blueprint.context;
 
 import java.lang.reflect.Type;
 import java.util.List;
@@ -25,8 +25,8 @@
 
 import org.apache.xbean.recipe.AbstractRecipe;
 import org.apache.xbean.recipe.ConstructionException;
-import org.apache.felix.blueprint.LifeCycle;
-import org.apache.felix.blueprint.BlueprintConstants;
+import org.apache.geronimo.blueprint.LifeCycle;
+import org.apache.geronimo.blueprint.BlueprintConstants;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceReference;

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/ReflectionUtils.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/ReflectionUtils.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/ReflectionUtils.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/ReflectionUtils.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.context;
+package org.apache.geronimo.blueprint.context;
 
 import java.lang.reflect.Method;
 import java.util.Set;

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/ServiceRegistrationProxy.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/ServiceRegistrationProxy.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/ServiceRegistrationProxy.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/ServiceRegistrationProxy.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.context;
+package org.apache.geronimo.blueprint.context;
 
 import java.lang.reflect.Method;
 import java.util.Dictionary;
@@ -26,7 +26,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.felix.blueprint.BlueprintConstants;
+import org.apache.geronimo.blueprint.BlueprintConstants;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.ServiceRegistration;

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/ValueRecipe.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/ValueRecipe.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/ValueRecipe.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/ValueRecipe.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.context;
+package org.apache.geronimo.blueprint.context;
 
 import java.lang.reflect.Type;
 

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/WaitForDependencyException.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/WaitForDependencyException.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/WaitForDependencyException.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/context/WaitForDependencyException.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.context;
+package org.apache.geronimo.blueprint.context;
 
 /**
  * Created by IntelliJ IDEA.

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/convert/ConversionServiceImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/convert/ConversionServiceImpl.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/convert/ConversionServiceImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/convert/ConversionServiceImpl.java Sun Apr 19 19:29:54 2009
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.felix.blueprint.convert;
+package org.apache.geronimo.blueprint.convert;
 
 import java.io.ByteArrayInputStream;
 import java.lang.reflect.Constructor;

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/namespace/ComponentDefinitionRegistryImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/namespace/ComponentDefinitionRegistryImpl.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/namespace/ComponentDefinitionRegistryImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/namespace/ComponentDefinitionRegistryImpl.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.namespace;
+package org.apache.geronimo.blueprint.namespace;
 
 import java.util.Collections;
 import java.util.HashMap;

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/namespace/NamespaceHandlerRegistryImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/namespace/NamespaceHandlerRegistryImpl.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/namespace/NamespaceHandlerRegistryImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/namespace/NamespaceHandlerRegistryImpl.java Sun Apr 19 19:29:54 2009
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.namespace;
+package org.apache.geronimo.blueprint.namespace;
 
 import java.net.URI;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.apache.felix.blueprint.NamespaceHandlerRegistry;
+import org.apache.geronimo.blueprint.NamespaceHandlerRegistry;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.blueprint.namespace.NamespaceHandler;

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/namespace/ParserContextImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/namespace/ParserContextImpl.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/namespace/ParserContextImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/namespace/ParserContextImpl.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.namespace;
+package org.apache.geronimo.blueprint.namespace;
 
 import org.w3c.dom.Node;
 

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ArrayValueImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ArrayValueImpl.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ArrayValueImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ArrayValueImpl.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.reflect;
+package org.apache.geronimo.blueprint.reflect;
 
 import org.osgi.service.blueprint.reflect.ArrayValue;
 import org.osgi.service.blueprint.reflect.Value;

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/BindingListenerMetadataImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/BindingListenerMetadataImpl.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/BindingListenerMetadataImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/BindingListenerMetadataImpl.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.reflect;
+package org.apache.geronimo.blueprint.reflect;
 
 import org.osgi.service.blueprint.reflect.BindingListenerMetadata;
 import org.osgi.service.blueprint.reflect.Value;

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/CollectionBasedServiceReferenceComponentMetadataImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/CollectionBasedServiceReferenceComponentMetadataImpl.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/CollectionBasedServiceReferenceComponentMetadataImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/CollectionBasedServiceReferenceComponentMetadataImpl.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.reflect;
+package org.apache.geronimo.blueprint.reflect;
 
 import org.osgi.service.blueprint.reflect.CollectionBasedServiceReferenceComponentMetadata;
 import org.osgi.service.blueprint.reflect.Value;

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=766501&r1=766467&r2=766501&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 Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.reflect;
+package org.apache.geronimo.blueprint.reflect;
 
 import java.util.Collections;
 import java.util.HashSet;

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ComponentValueImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ComponentValueImpl.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ComponentValueImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ComponentValueImpl.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.reflect;
+package org.apache.geronimo.blueprint.reflect;
 
 import org.osgi.service.blueprint.reflect.ComponentMetadata;
 import org.osgi.service.blueprint.reflect.ComponentValue;

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ConstructorInjectionMetadataImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ConstructorInjectionMetadataImpl.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ConstructorInjectionMetadataImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ConstructorInjectionMetadataImpl.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.reflect;
+package org.apache.geronimo.blueprint.reflect;
 
 import java.util.Collections;
 import java.util.Iterator;

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ListValueImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ListValueImpl.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ListValueImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ListValueImpl.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.reflect;
+package org.apache.geronimo.blueprint.reflect;
 
 import java.util.ArrayList;
 import java.util.Iterator;

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/LocalComponentMetadataImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/LocalComponentMetadataImpl.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/LocalComponentMetadataImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/LocalComponentMetadataImpl.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.reflect;
+package org.apache.geronimo.blueprint.reflect;
 
 import java.util.ArrayList;
 import java.util.Collection;

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/MapValueImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/MapValueImpl.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/MapValueImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/MapValueImpl.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.reflect;
+package org.apache.geronimo.blueprint.reflect;
 
 import java.util.HashMap;
 import java.util.Iterator;

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/MetadataUtil.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/MetadataUtil.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/MetadataUtil.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/MetadataUtil.java Sun Apr 19 19:29:54 2009
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.felix.blueprint.reflect;
+package org.apache.geronimo.blueprint.reflect;
 
 import org.osgi.service.blueprint.reflect.ArrayValue;
 import org.osgi.service.blueprint.reflect.CollectionBasedServiceReferenceComponentMetadata;

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/MethodInjectionMetadataImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/MethodInjectionMetadataImpl.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/MethodInjectionMetadataImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/MethodInjectionMetadataImpl.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.reflect;
+package org.apache.geronimo.blueprint.reflect;
 
 import java.util.ArrayList;
 import java.util.Collections;

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ParameterSpecificationImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ParameterSpecificationImpl.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ParameterSpecificationImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ParameterSpecificationImpl.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.reflect;
+package org.apache.geronimo.blueprint.reflect;
 
 import org.osgi.service.blueprint.reflect.ParameterSpecification;
 import org.osgi.service.blueprint.reflect.Value;

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/PropertiesValueImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/PropertiesValueImpl.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/PropertiesValueImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/PropertiesValueImpl.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.reflect;
+package org.apache.geronimo.blueprint.reflect;
 
 import java.util.Properties;
 

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/PropertyInjectionMetadataImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/PropertyInjectionMetadataImpl.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/PropertyInjectionMetadataImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/PropertyInjectionMetadataImpl.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.reflect;
+package org.apache.geronimo.blueprint.reflect;
 
 import org.osgi.service.blueprint.reflect.PropertyInjectionMetadata;
 import org.osgi.service.blueprint.reflect.Value;

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ReferenceNameValueImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ReferenceNameValueImpl.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ReferenceNameValueImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ReferenceNameValueImpl.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.reflect;
+package org.apache.geronimo.blueprint.reflect;
 
 import org.osgi.service.blueprint.reflect.ReferenceNameValue;
 

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ReferenceValueImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ReferenceValueImpl.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ReferenceValueImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ReferenceValueImpl.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.reflect;
+package org.apache.geronimo.blueprint.reflect;
 
 import org.osgi.service.blueprint.reflect.ReferenceValue;
 

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/RegistrationListenerMetadataImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/RegistrationListenerMetadataImpl.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/RegistrationListenerMetadataImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/RegistrationListenerMetadataImpl.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.reflect;
+package org.apache.geronimo.blueprint.reflect;
 
 import org.osgi.service.blueprint.reflect.RegistrationListenerMetadata;
 import org.osgi.service.blueprint.reflect.Value;

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ServiceExportComponentMetadataImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ServiceExportComponentMetadataImpl.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ServiceExportComponentMetadataImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ServiceExportComponentMetadataImpl.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.reflect;
+package org.apache.geronimo.blueprint.reflect;
 
 import java.util.Collection;
 import java.util.Collections;

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ServiceReferenceComponentMetadataImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ServiceReferenceComponentMetadataImpl.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ServiceReferenceComponentMetadataImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/ServiceReferenceComponentMetadataImpl.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.reflect;
+package org.apache.geronimo.blueprint.reflect;
 
 import java.util.Collection;
 import java.util.Collections;

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/SetValueImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/SetValueImpl.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/SetValueImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/SetValueImpl.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.reflect;
+package org.apache.geronimo.blueprint.reflect;
 
 import java.util.HashSet;
 import java.util.Iterator;

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/TypedStringValueImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/TypedStringValueImpl.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/TypedStringValueImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/TypedStringValueImpl.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.reflect;
+package org.apache.geronimo.blueprint.reflect;
 
 import org.osgi.service.blueprint.reflect.TypedStringValue;
 

Modified: geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/UnaryServiceReferenceComponentMetadataImpl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/UnaryServiceReferenceComponentMetadataImpl.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/UnaryServiceReferenceComponentMetadataImpl.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/main/java/org/apache/geronimo/blueprint/reflect/UnaryServiceReferenceComponentMetadataImpl.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.reflect;
+package org.apache.geronimo.blueprint.reflect;
 
 import org.osgi.service.blueprint.reflect.UnaryServiceReferenceComponentMetadata;
 

Modified: geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/AbstractBlueprintTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/AbstractBlueprintTest.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/AbstractBlueprintTest.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/AbstractBlueprintTest.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint;
+package org.apache.geronimo.blueprint;
 
 import java.net.URI;
 import java.util.Collections;
@@ -24,8 +24,8 @@
 import junit.framework.TestCase;
 import org.osgi.service.blueprint.namespace.ComponentDefinitionRegistry;
 import org.osgi.service.blueprint.namespace.NamespaceHandler;
-import org.apache.felix.blueprint.namespace.ComponentDefinitionRegistryImpl;
-import org.apache.felix.blueprint.context.Parser;
+import org.apache.geronimo.blueprint.namespace.ComponentDefinitionRegistryImpl;
+import org.apache.geronimo.blueprint.context.Parser;
 
 public abstract class AbstractBlueprintTest extends TestCase {
 

Modified: geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/HeaderParserTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/HeaderParserTest.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/HeaderParserTest.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/HeaderParserTest.java Sun Apr 19 19:29:54 2009
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint;
+package org.apache.geronimo.blueprint;
 
 import java.util.List;
 
 import junit.framework.TestCase;
 
-import org.apache.felix.blueprint.HeaderParser.PathElement;
+import org.apache.geronimo.blueprint.HeaderParser.PathElement;
 
 public class HeaderParserTest extends TestCase {
 

Modified: geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/ParserTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/ParserTest.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/ParserTest.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/ParserTest.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint;
+package org.apache.geronimo.blueprint;
 
 import java.net.URI;
 import java.net.URL;
@@ -29,9 +29,9 @@
 import org.w3c.dom.Node;
 
 import junit.framework.TestCase;
-import org.apache.felix.blueprint.context.Parser;
-import org.apache.felix.blueprint.namespace.ComponentDefinitionRegistryImpl;
-import org.apache.felix.blueprint.reflect.LocalComponentMetadataImpl;
+import org.apache.geronimo.blueprint.context.Parser;
+import org.apache.geronimo.blueprint.namespace.ComponentDefinitionRegistryImpl;
+import org.apache.geronimo.blueprint.reflect.LocalComponentMetadataImpl;
 import org.osgi.service.blueprint.namespace.ComponentDefinitionRegistry;
 import org.osgi.service.blueprint.namespace.NamespaceHandler;
 import org.osgi.service.blueprint.namespace.ParserContext;
@@ -66,7 +66,7 @@
         assertTrue(deps.contains("pojoC"));
         assertTrue(component instanceof LocalComponentMetadata);
         LocalComponentMetadata local = (LocalComponentMetadata) component;
-        assertEquals("org.apache.felix.blueprint.pojos.PojoA", local.getClassName());
+        assertEquals("org.apache.geronimo.blueprint.pojos.PojoA", local.getClassName());
         ConstructorInjectionMetadata cns = local.getConstructorInjectionMetadata();
         assertNotNull(cns);
         List<ParameterSpecification> params = cns.getParameterSpecifications();

Modified: geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/WiringTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/WiringTest.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/WiringTest.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/WiringTest.java Sun Apr 19 19:29:54 2009
@@ -16,16 +16,16 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint;
+package org.apache.geronimo.blueprint;
 
 import java.math.BigInteger;
 import java.net.URI;
 
-import org.apache.felix.blueprint.context.Instanciator;
-import org.apache.felix.blueprint.convert.ConversionServiceImpl;
-import org.apache.felix.blueprint.namespace.ComponentDefinitionRegistryImpl;
-import org.apache.felix.blueprint.pojos.PojoA;
-import org.apache.felix.blueprint.pojos.PojoB;
+import org.apache.geronimo.blueprint.context.Instanciator;
+import org.apache.geronimo.blueprint.convert.ConversionServiceImpl;
+import org.apache.geronimo.blueprint.namespace.ComponentDefinitionRegistryImpl;
+import org.apache.geronimo.blueprint.pojos.PojoA;
+import org.apache.geronimo.blueprint.pojos.PojoB;
 import org.apache.xbean.recipe.ObjectGraph;
 import org.apache.xbean.recipe.Repository;
 import org.osgi.framework.ServiceRegistration;

Modified: geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/convert/ConversionServiceImplTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/convert/ConversionServiceImplTest.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/convert/ConversionServiceImplTest.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/convert/ConversionServiceImplTest.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.convert;
+package org.apache.geronimo.blueprint.convert;
 
 import java.net.URI;
 import java.net.URL;

Modified: geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/pojos/ConverterA.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/pojos/ConverterA.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/pojos/ConverterA.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/pojos/ConverterA.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.pojos;
+package org.apache.geronimo.blueprint.pojos;
 
 import java.io.File;
 

Modified: geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/pojos/ConverterB.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/pojos/ConverterB.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/pojos/ConverterB.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/pojos/ConverterB.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.pojos;
+package org.apache.geronimo.blueprint.pojos;
 
 import java.io.File;
 import java.net.URI;

Modified: geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/pojos/InterfaceA.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/pojos/InterfaceA.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/pojos/InterfaceA.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/pojos/InterfaceA.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.pojos;
+package org.apache.geronimo.blueprint.pojos;
 
 public interface InterfaceA {
 }

Modified: geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/pojos/ListenerA.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/pojos/ListenerA.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/pojos/ListenerA.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/pojos/ListenerA.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.pojos;
+package org.apache.geronimo.blueprint.pojos;
 
 import org.osgi.framework.ServiceReference;
 

Modified: geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/pojos/PojoA.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/pojos/PojoA.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/pojos/PojoA.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/pojos/PojoA.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.pojos;
+package org.apache.geronimo.blueprint.pojos;
 
 import java.util.Map;
 import java.util.List;

Modified: geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/pojos/PojoB.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/pojos/PojoB.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/pojos/PojoB.java (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/test/java/org/apache/geronimo/blueprint/pojos/PojoB.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.pojos;
+package org.apache.geronimo.blueprint.pojos;
 
 import java.net.URI;
 

Modified: geronimo/sandbox/blueprint/blueprint-core/src/test/resources/test-simple-component.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/test/resources/test-simple-component.xml?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/test/resources/test-simple-component.xml (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/test/resources/test-simple-component.xml Sun Apr 19 19:29:54 2009
@@ -3,7 +3,7 @@
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 ../../main/resources/org/apache/felix/blueprint/blueprint.xsd">
 
-    <component id="pojoA" class="org.apache.felix.blueprint.pojos.PojoA" depends-on=" pojoB , pojoC ,">
+    <component id="pojoA" class="org.apache.geronimo.blueprint.pojos.PojoA" depends-on=" pojoB , pojoC ,">
         <constructor-arg value="val0"/>
         <constructor-arg ref="val1" index="2"/>
         <constructor-arg index="1">

Modified: geronimo/sandbox/blueprint/blueprint-core/src/test/resources/test-wiring.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/test/resources/test-wiring.xml?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/test/resources/test-wiring.xml (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/test/resources/test-wiring.xml Sun Apr 19 19:29:54 2009
@@ -5,7 +5,7 @@
             default-availability="mandatory">
 
     <type-converters>
-            <component id="converter1" class="org.apache.felix.blueprint.convert.TestConverter">
+            <component id="converter1" class="org.apache.geronimo.blueprint.convert.TestConverter">
                 <property name="bundle" ref="bundle" />
             </component>
     </type-converters>
@@ -17,11 +17,11 @@
         </service-properties>    
     </service>
     
-    <component id="pojoB" class="org.apache.felix.blueprint.pojos.PojoB">
+    <component id="pojoB" class="org.apache.geronimo.blueprint.pojos.PojoB">
         <property name="uri" value="urn:myuri" />
     </component>
 
-    <component id="pojoA" class="org.apache.felix.blueprint.pojos.PojoA">
+    <component id="pojoA" class="org.apache.geronimo.blueprint.pojos.PojoA">
         <property name="pojob" ref="pojoB"/>
         <property name="map">
             <map>

Modified: geronimo/sandbox/blueprint/blueprint-core/src/test/resources/test.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-core/src/test/resources/test.xml?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-core/src/test/resources/test.xml (original)
+++ geronimo/sandbox/blueprint/blueprint-core/src/test/resources/test.xml Sun Apr 19 19:29:54 2009
@@ -9,40 +9,40 @@
     </description>
 
     <type-converters>
-        <component class="org.apache.felix.blueprint.pojos.ConverterA"/>
+        <component class="org.apache.geronimo.blueprint.pojos.ConverterA"/>
         <ref component="converterB"/>
     </type-converters>
 
-    <component id="pojoA" class="org.apache.felix.blueprint.pojos.PojoA">
+    <component id="pojoA" class="org.apache.geronimo.blueprint.pojos.PojoA">
         <property name="pojob" ref="pojoB"/>
     </component>
 
-    <component id="pojoAcns" class="org.apache.felix.blueprint.pojos.PojoA">
+    <component id="pojoAcns" class="org.apache.geronimo.blueprint.pojos.PojoA">
         <constructor-arg ref="pojoB"/>
     </component>
 
-    <component id="pojoB" class="org.apache.felix.blueprint.pojos.PojoB">
+    <component id="pojoB" class="org.apache.geronimo.blueprint.pojos.PojoB">
         <property name="uri" value="urn:myuri"/>
     </component>
 
-    <component id="pojoBcns" class="org.apache.felix.blueprint.pojos.PojoB">
+    <component id="pojoBcns" class="org.apache.geronimo.blueprint.pojos.PojoB">
         <constructor-arg value="urn:myuri"/>
     </component>
 
-    <component id="converterB" class="org.apache.felix.blueprint.pojos.ConverterB"/>
+    <component id="converterB" class="org.apache.geronimo.blueprint.pojos.ConverterB"/>
 
-    <reference id="refA" filter="(key=prop)" interface="org.apache.felix.blueprint.pojos.InterfaceA"/>
+    <reference id="refA" filter="(key=prop)" interface="org.apache.geronimo.blueprint.pojos.InterfaceA"/>
 
     <reference id="refB" availability="optional">
         <interfaces>
-            <value>org.apache.felix.blueprint.pojos.InterfaceA</value>
+            <value>org.apache.geronimo.blueprint.pojos.InterfaceA</value>
         </interfaces>
         <listener ref="listenerA" bind-method="bind" unbind-method="unbind"/>
     </reference>
 
-    <service interface="org.apache.felix.blueprint.pojos.InterfaceA" ref="pojoA"/>
+    <service interface="org.apache.geronimo.blueprint.pojos.InterfaceA" ref="pojoA"/>
 
-    <component id="listenerA" class="org.apache.felix.blueprint.pojos.ListenerA"/>
+    <component id="listenerA" class="org.apache.geronimo.blueprint.pojos.ListenerA"/>
 
     <ref-list availability="optional" member-type="service-instance"/>
 

Modified: geronimo/sandbox/blueprint/blueprint-itests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-itests/pom.xml?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-itests/pom.xml (original)
+++ geronimo/sandbox/blueprint/blueprint-itests/pom.xml Sun Apr 19 19:29:54 2009
@@ -18,14 +18,14 @@
 -->
 <project>
     <parent>
-        <groupId>org.apache.felix</groupId>
+        <groupId>org.apache.geronimo</groupId>
         <artifactId>blueprint</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.apache.felix.blueprint.itests</artifactId>
-    <name>Apache Felix Blueprint iTests</name>
+    <artifactId>blueprint-itests</artifactId>
+    <name>Apache Geronimo Blueprint iTests</name>
 
     <dependencies>
         <dependency>
@@ -35,14 +35,14 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
+            <groupId>org.apache.geronimo</groupId>
             <artifactId>blueprint-bundle</artifactId>
             <version>${pom.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>sample</artifactId>
+            <groupId>org.apache.geronimo</groupId>
+            <artifactId>blueprint-sample</artifactId>
             <version>${pom.version}</version>
             <scope>test</scope>
         </dependency>

Modified: geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/Test.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/Test.java?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/Test.java (original)
+++ geronimo/sandbox/blueprint/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/Test.java Sun Apr 19 19:29:54 2009
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.felix.blueprint.itests;
+package org.apache.geronimo.blueprint.itests;
 
 import java.net.URLDecoder;
 
@@ -31,7 +31,7 @@
 public class Test extends AbstractIntegrationTest {
 
     public void test() throws Exception {
-        Resource res = locateBundle(getBundle("org.apache.felix", "sample"));
+        Resource res = locateBundle(getBundle("org.apache.geronimo", "blueprint-sample"));
         Bundle bundle = installBundle(res);
         assertNotNull(bundle);
         bundle.start();
@@ -71,7 +71,7 @@
 	 * of the entire manifest...
 	 */
 	protected String getManifestLocation() {
-		return "classpath:org/apache/felix/blueprint/MANIFEST.MF";
+		return "classpath:org/apache/geronimo/blueprint/MANIFEST.MF";
 	}
 
 	/**
@@ -89,7 +89,7 @@
 	 */
 	protected String[] getTestBundlesNames() {
         return new String[] {
-                getBundle("org.apache.felix", "blueprint-bundle"),
+                getBundle("org.apache.geronimo", "blueprint-bundle"),
 		};
 	}
 

Modified: geronimo/sandbox/blueprint/blueprint-itests/src/test/resources/org/apache/geronimo/blueprint/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-itests/src/test/resources/org/apache/geronimo/blueprint/MANIFEST.MF?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-itests/src/test/resources/org/apache/geronimo/blueprint/MANIFEST.MF (original)
+++ geronimo/sandbox/blueprint/blueprint-itests/src/test/resources/org/apache/geronimo/blueprint/MANIFEST.MF Sun Apr 19 19:29:54 2009
@@ -3,4 +3,4 @@
 Bundle-SymbolicName: org.apache.servicemix.test
 Bundle-Activator: org.springframework.osgi.test.JUnitTestActivator
 DynamicImport-Package: *
-Export-Package: org.apache.felix.blueprint.itests
+Export-Package: org.apache.geronimo.blueprint.itests

Modified: geronimo/sandbox/blueprint/blueprint-sample/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/blueprint-sample/pom.xml?rev=766501&r1=766467&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/blueprint-sample/pom.xml (original)
+++ geronimo/sandbox/blueprint/blueprint-sample/pom.xml Sun Apr 19 19:29:54 2009
@@ -17,14 +17,14 @@
 <project>
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.felix</groupId>
+        <groupId>org.apache.geronimo</groupId>
         <artifactId>blueprint</artifactId>
         <version>1.0.0-SNAPSHOT</version>
     </parent>
 
-    <artifactId>sample</artifactId>
+    <artifactId>blueprint-sample</artifactId>
+    <name>Apache Geronimo Blueprint Sample</name>
     <packaging>bundle</packaging>
-    <name>Sample Blueprint Bundle</name>
 
     <build>
         <plugins>

Modified: geronimo/sandbox/blueprint/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/pom.xml?rev=766501&r1=766500&r2=766501&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/pom.xml (original)
+++ geronimo/sandbox/blueprint/pom.xml Sun Apr 19 19:29:54 2009
@@ -25,9 +25,9 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
+    <groupId>org.apache.geronimo</groupId>
     <artifactId>blueprint</artifactId>
-    <groupId>org.apache.felix</groupId>
-    <name>Apache Felix Blueprint Parent</name>
+    <name>Apache Geronimo Blueprint</name>
     <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
@@ -65,10 +65,10 @@
 
     <modules>
         <module>blueprint-api</module>
-        <module>org.apache.felix.blueprint</module>
+        <module>blueprint-core</module>
         <module>blueprint-bundle</module>
-        <module>sample</module>
-        <module>itests</module>
+        <module>blueprint-sample</module>
+        <module>blueprint-itests</module>
     </modules>
 
 </project>



Mime
View raw message