geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r813852 - in /geronimo/components/blueprint/trunk: ./ blueprint-api/ blueprint-bundle/ blueprint-cm/ blueprint-core/ blueprint-itests/ blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/ blueprint-sample/
Date Fri, 11 Sep 2009 14:26:21 GMT
Author: gnodet
Date: Fri Sep 11 14:26:20 2009
New Revision: 813852

URL: http://svn.apache.org/viewvc?rev=813852&view=rev
Log:
Change artifactsIds to geronimo-blueprint(-api/-core/-cm), update README to use the just released
Felix Framework 2.0.0, and bundles symbolic names to org.apache.geronimo.blueprint(.api/.core/.cm)

Modified:
    geronimo/components/blueprint/trunk/README
    geronimo/components/blueprint/trunk/blueprint-api/pom.xml
    geronimo/components/blueprint/trunk/blueprint-bundle/pom.xml
    geronimo/components/blueprint/trunk/blueprint-cm/pom.xml
    geronimo/components/blueprint/trunk/blueprint-core/pom.xml
    geronimo/components/blueprint/trunk/blueprint-itests/pom.xml
    geronimo/components/blueprint/trunk/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/BlueprintContainerTest.java
    geronimo/components/blueprint/trunk/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestConfigAdmin.java
    geronimo/components/blueprint/trunk/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestReferences.java
    geronimo/components/blueprint/trunk/blueprint-sample/pom.xml
    geronimo/components/blueprint/trunk/pom.xml

Modified: geronimo/components/blueprint/trunk/README
URL: http://svn.apache.org/viewvc/geronimo/components/blueprint/trunk/README?rev=813852&r1=813851&r2=813852&view=diff
==============================================================================
--- geronimo/components/blueprint/trunk/README (original)
+++ geronimo/components/blueprint/trunk/README Fri Sep 11 14:26:20 2009
@@ -1,8 +1,8 @@
 Installing and running the blueprint-sample bundle:
 ---------------------------------------------------
-0) Download Felix (version 2.0.0 when released or a 1.9.0-SNAPSHOT snapshot version used
at the time of this writing):
+0) Download Felix (v2.0.0 at the time of this writing):
    
-   see http://felix.apache.org/site/building-felix.html
+   http://www.apache.org/dist/felix/felix-framework-2.0.0.tar.gz
 
 1) Start Felix under Java SE 5:
  
@@ -20,7 +20,7 @@
 
 4) Build the blueprint project and install the extender and sample bundles:
 
-  a) install file:///<m2_repo>/org/apache/geronimo/blueprint/org.apache.geronimo.blueprint.bundle/<version>/org.apache.geronimo.blueprint.bundle-<version>.jar
+  a) install file:///<m2_repo>/org/apache/geronimo/blueprint/geronimo-blueprint/<version>/geronimo-blueprint-<version>.jar
   b) install file:///<m2_repo>/org/apache/geronimo/blueprint/org.apache.geronimo.blueprint.sample/<version>/org.apache.geronimo.blueprint.sample-<version>.jar
 
 5) Start the ConfigurationAdmin, extender and sample bundles:

Modified: geronimo/components/blueprint/trunk/blueprint-api/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/components/blueprint/trunk/blueprint-api/pom.xml?rev=813852&r1=813851&r2=813852&view=diff
==============================================================================
--- geronimo/components/blueprint/trunk/blueprint-api/pom.xml (original)
+++ geronimo/components/blueprint/trunk/blueprint-api/pom.xml Fri Sep 11 14:26:20 2009
@@ -22,7 +22,7 @@
         <version>1.0.1-SNAPSHOT</version>
     </parent>
 
-    <artifactId>org.apache.geronimo.blueprint.api</artifactId>
+    <artifactId>geronimo-blueprint-api</artifactId>
     <packaging>bundle</packaging>
     <name>Apache Geronimo Blueprint API</name>
     <description>
@@ -45,7 +45,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${pom.groupId}.api</Bundle-SymbolicName>
                         <Export-Package>org.osgi.service.blueprint*;version="1.0"</Export-Package>
                         <Import-Package>!org.osgi.service.blueprint*,*</Import-Package>
                         <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>

Modified: geronimo/components/blueprint/trunk/blueprint-bundle/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/components/blueprint/trunk/blueprint-bundle/pom.xml?rev=813852&r1=813851&r2=813852&view=diff
==============================================================================
--- geronimo/components/blueprint/trunk/blueprint-bundle/pom.xml (original)
+++ geronimo/components/blueprint/trunk/blueprint-bundle/pom.xml Fri Sep 11 14:26:20 2009
@@ -22,7 +22,7 @@
         <version>1.0.1-SNAPSHOT</version>
     </parent>
 
-    <artifactId>org.apache.geronimo.blueprint.bundle</artifactId>
+    <artifactId>geronimo-blueprint</artifactId>
     <packaging>bundle</packaging>
     <name>Apache Geronimo Blueprint Bundle</name>
     <description>
@@ -33,11 +33,11 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.blueprint</groupId>
-            <artifactId>org.apache.geronimo.blueprint.core</artifactId>
+            <artifactId>geronimo-blueprint-core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.blueprint</groupId>
-            <artifactId>org.apache.geronimo.blueprint.cm</artifactId>
+            <artifactId>geronimo-blueprint-cm</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
@@ -64,7 +64,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${pom.groupId}</Bundle-SymbolicName>
                         <Bundle-Activator>org.apache.geronimo.blueprint.container.BlueprintExtender</Bundle-Activator>
                         <Import-Package>
                             !org.apache.geronimo.blueprint*,
@@ -90,6 +90,8 @@
                             org.apache.geronimo.blueprint.utils,
                             OSGI-INF*
                         </Private-Package>
+                        <!-- include the right NOTICE with attribution to the OSGi alliance
-->
+                        <Include-Resource>{maven-resources},META-INF/NOTICE=../NOTICE</Include-Resource>
                         <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
                         <_removeheaders>Ignore-Package,Include-Resource,Private-Package,Bundle-DocURL</_removeheaders>
                         <_failok>true</_failok>
@@ -112,26 +114,26 @@
                         <configuration>
                             <artifactSet>
                                 <includes>
-                                    <include>org.apache.geronimo.blueprint:org.apache.geronimo.blueprint.api</include>
-                                    <include>org.apache.geronimo.blueprint:org.apache.geronimo.blueprint.core</include>
-                                    <include>org.apache.geronimo.blueprint:org.apache.geronimo.blueprint.cm</include>
+                                    <include>org.apache.geronimo.blueprint:geronimo-blueprint-api</include>
+                                    <include>org.apache.geronimo.blueprint:geronimo-blueprint-core</include>
+                                    <include>org.apache.geronimo.blueprint:geronimo-blueprint-cm</include>
                                 </includes>
                             </artifactSet>
                             <filters>
                                 <filter>
-                                    <artifact>org.apache.geronimo.blueprint:org.apache.geronimo.blueprint.api</artifact>
+                                    <artifact>org.apache.geronimo.blueprint:geronimo-blueprint-api</artifact>
                                     <excludes>
                                         <exclude>org/**</exclude>
                                     </excludes>
                                 </filter>
                                 <filter>
-                                    <artifact>org.apache.geronimo.blueprint:org.apache.geronimo.blueprint.core</artifact>
+                                    <artifact>org.apache.geronimo.blueprint:geronimo-blueprint-core</artifact>
                                     <excludes>
                                         <exclude>org/**</exclude>
                                     </excludes>
                                 </filter>
                                 <filter>
-                                    <artifact>org.apache.geronimo.blueprint:org.apache.geronimo.blueprint.cm</artifact>
+                                    <artifact>org.apache.geronimo.blueprint:geronimo-blueprint-cm</artifact>
                                     <excludes>
                                         <exclude>org/**</exclude>
                                     </excludes>
@@ -169,17 +171,17 @@
                                     <artifactItems>
                                         <artifactItem>
                                             <groupId>org.apache.geronimo.blueprint</groupId>
-                                            <artifactId>org.apache.geronimo.blueprint.api</artifactId>
+                                            <artifactId>geronimo-blueprint-api</artifactId>
                                             <classifier>sources</classifier>
                                         </artifactItem>
                                         <artifactItem>
                                             <groupId>org.apache.geronimo.blueprint</groupId>
-                                            <artifactId>org.apache.geronimo.blueprint.core</artifactId>
+                                            <artifactId>geronimo-blueprint-core</artifactId>
                                             <classifier>sources</classifier>
                                         </artifactItem>
                                         <artifactItem>
                                             <groupId>org.apache.geronimo.blueprint</groupId>
-                                            <artifactId>org.apache.geronimo.blueprint.cm</artifactId>
+                                            <artifactId>geronimo-blueprint-cm</artifactId>
                                             <classifier>sources</classifier>
                                         </artifactItem>
                                     </artifactItems>

Modified: geronimo/components/blueprint/trunk/blueprint-cm/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/components/blueprint/trunk/blueprint-cm/pom.xml?rev=813852&r1=813851&r2=813852&view=diff
==============================================================================
--- geronimo/components/blueprint/trunk/blueprint-cm/pom.xml (original)
+++ geronimo/components/blueprint/trunk/blueprint-cm/pom.xml Fri Sep 11 14:26:20 2009
@@ -24,7 +24,7 @@
     <version>1.0.1-SNAPSHOT</version>
   </parent>
 
-  <artifactId>org.apache.geronimo.blueprint.cm</artifactId>
+  <artifactId>geronimo-blueprint-cm</artifactId>
   <packaging>bundle</packaging>
   <name>Apache Geronimo Blueprint CM</name>
   <description>
@@ -34,7 +34,7 @@
   <dependencies>
       <dependency>
           <groupId>org.apache.geronimo.blueprint</groupId>
-          <artifactId>org.apache.geronimo.blueprint.core</artifactId>
+          <artifactId>geronimo-blueprint-core</artifactId>
       </dependency>
       <dependency>
           <groupId>org.eclipse</groupId>
@@ -56,7 +56,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${pom.groupId}.cm</Bundle-SymbolicName>
                         <Export-Package>org.apache.geronimo.blueprint.compendium.cm*;version="${pom.version}"</Export-Package>
                         <Import-Package>!org.apache.geronimo.blueprint.compendium.cm*,*</Import-Package>
                         <_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>

Modified: geronimo/components/blueprint/trunk/blueprint-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/components/blueprint/trunk/blueprint-core/pom.xml?rev=813852&r1=813851&r2=813852&view=diff
==============================================================================
--- geronimo/components/blueprint/trunk/blueprint-core/pom.xml (original)
+++ geronimo/components/blueprint/trunk/blueprint-core/pom.xml Fri Sep 11 14:26:20 2009
@@ -24,7 +24,7 @@
     <version>1.0.1-SNAPSHOT</version>
   </parent>
 
-  <artifactId>org.apache.geronimo.blueprint.core</artifactId>
+  <artifactId>geronimo-blueprint-core</artifactId>
   <packaging>bundle</packaging>
   <name>Apache Geronimo Blueprint Core</name>
   <description>
@@ -35,7 +35,7 @@
   <dependencies>
       <dependency>
           <groupId>org.apache.geronimo.blueprint</groupId>
-          <artifactId>org.apache.geronimo.blueprint.api</artifactId>
+          <artifactId>geronimo-blueprint-api</artifactId>
       </dependency>
       <!-- We should use the org.osgi:org.osgi.core:1.5 jar, but it has not been released
yet -->
       <dependency>
@@ -84,7 +84,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${pom.groupId}.core</Bundle-SymbolicName>
                         <Bundle-Activator>org.apache.geronimo.blueprint.container.BlueprintExtender</Bundle-Activator>
                         <Export-Package>
                             org.apache.geronimo.blueprint*;version="${pom.version}"

Modified: geronimo/components/blueprint/trunk/blueprint-itests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/components/blueprint/trunk/blueprint-itests/pom.xml?rev=813852&r1=813851&r2=813852&view=diff
==============================================================================
--- geronimo/components/blueprint/trunk/blueprint-itests/pom.xml (original)
+++ geronimo/components/blueprint/trunk/blueprint-itests/pom.xml Fri Sep 11 14:26:20 2009
@@ -34,7 +34,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.blueprint</groupId>
-            <artifactId>org.apache.geronimo.blueprint.bundle</artifactId>
+            <artifactId>geronimo-blueprint</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: geronimo/components/blueprint/trunk/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/BlueprintContainerTest.java
URL: http://svn.apache.org/viewvc/geronimo/components/blueprint/trunk/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/BlueprintContainerTest.java?rev=813852&r1=813851&r2=813852&view=diff
==============================================================================
--- geronimo/components/blueprint/trunk/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/BlueprintContainerTest.java
(original)
+++ geronimo/components/blueprint/trunk/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/BlueprintContainerTest.java
Fri Sep 11 14:26:20 2009
@@ -125,7 +125,7 @@
             systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
 
             // Bundles
-            mavenBundle("org.apache.geronimo.blueprint", "org.apache.geronimo.blueprint.bundle"),
+            mavenBundle("org.apache.geronimo.blueprint", "geronimo-blueprint"),
             mavenBundle("org.apache.geronimo.blueprint", "org.apache.geronimo.blueprint.sample").noStart(),
 
 //            org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),

Modified: geronimo/components/blueprint/trunk/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestConfigAdmin.java
URL: http://svn.apache.org/viewvc/geronimo/components/blueprint/trunk/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestConfigAdmin.java?rev=813852&r1=813851&r2=813852&view=diff
==============================================================================
--- geronimo/components/blueprint/trunk/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestConfigAdmin.java
(original)
+++ geronimo/components/blueprint/trunk/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestConfigAdmin.java
Fri Sep 11 14:26:20 2009
@@ -182,7 +182,7 @@
             systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
 
             // Bundles
-            mavenBundle("org.apache.geronimo.blueprint", "org.apache.geronimo.blueprint.bundle"),
+            mavenBundle("org.apache.geronimo.blueprint", "geronimo-blueprint"),
             mavenBundle("org.apache.geronimo.blueprint", "org.apache.geronimo.blueprint.sample").noStart(),
 
 //            org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),

Modified: geronimo/components/blueprint/trunk/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestReferences.java
URL: http://svn.apache.org/viewvc/geronimo/components/blueprint/trunk/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestReferences.java?rev=813852&r1=813851&r2=813852&view=diff
==============================================================================
--- geronimo/components/blueprint/trunk/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestReferences.java
(original)
+++ geronimo/components/blueprint/trunk/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestReferences.java
Fri Sep 11 14:26:20 2009
@@ -144,7 +144,7 @@
             systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
 
             // Bundles
-            mavenBundle("org.apache.geronimo.blueprint", "org.apache.geronimo.blueprint.bundle"),
+            mavenBundle("org.apache.geronimo.blueprint", "geronimo-blueprint"),
             mavenBundle("org.apache.geronimo.blueprint", "org.apache.geronimo.blueprint.sample"),
 
 //            org.ops4j.pax.exam.container.def.PaxRunnerOptions.vmOption("-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"),

Modified: geronimo/components/blueprint/trunk/blueprint-sample/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/components/blueprint/trunk/blueprint-sample/pom.xml?rev=813852&r1=813851&r2=813852&view=diff
==============================================================================
--- geronimo/components/blueprint/trunk/blueprint-sample/pom.xml (original)
+++ geronimo/components/blueprint/trunk/blueprint-sample/pom.xml Fri Sep 11 14:26:20 2009
@@ -38,7 +38,7 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Bundle-SymbolicName>${pom.groupId}.sample</Bundle-SymbolicName>
                         <Bundle-Activator>
                             org.apache.geronimo.blueprint.sample.Activator
                         </Bundle-Activator>
@@ -58,7 +58,7 @@
         </dependency>
        <dependency>
            <groupId>org.apache.geronimo.blueprint</groupId>
-           <artifactId>org.apache.geronimo.blueprint.api</artifactId>
+           <artifactId>geronimo-blueprint-api</artifactId>
        </dependency>
     </dependencies>
 </project>

Modified: geronimo/components/blueprint/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/components/blueprint/trunk/pom.xml?rev=813852&r1=813851&r2=813852&view=diff
==============================================================================
--- geronimo/components/blueprint/trunk/pom.xml (original)
+++ geronimo/components/blueprint/trunk/pom.xml Fri Sep 11 14:26:20 2009
@@ -59,22 +59,22 @@
         <dependencies>
             <dependency>
                 <groupId>org.apache.geronimo.blueprint</groupId>
-                <artifactId>org.apache.geronimo.blueprint.api</artifactId>
+                <artifactId>geronimo-blueprint-api</artifactId>
                 <version>${version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.blueprint</groupId>
-                <artifactId>org.apache.geronimo.blueprint.core</artifactId>
+                <artifactId>geronimo-blueprint-core</artifactId>
                 <version>${version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.blueprint</groupId>
-                <artifactId>org.apache.geronimo.blueprint.cm</artifactId>
+                <artifactId>geronimo-blueprint-cm</artifactId>
                 <version>${version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.geronimo.blueprint</groupId>
-                <artifactId>org.apache.geronimo.blueprint.bundle</artifactId>
+                <artifactId>geronimo-blueprint</artifactId>
                 <version>${version}</version>
             </dependency>
             <dependency>
@@ -131,22 +131,22 @@
             <dependency>
                 <groupId>org.ops4j.pax.exam</groupId>
                 <artifactId>pax-exam</artifactId>
-                <version>1.0.0</version>
+                <version>1.1.0</version>
             </dependency>
             <dependency>
                 <groupId>org.ops4j.pax.exam</groupId>
                 <artifactId>pax-exam-junit</artifactId>
-                <version>1.0.0</version>
+                <version>1.1.0</version>
             </dependency>
             <dependency>
                 <groupId>org.ops4j.pax.exam</groupId>
                 <artifactId>pax-exam-container-default</artifactId>
-                <version>1.0.0</version>
+                <version>1.1.0</version>
             </dependency>
             <dependency>
                 <groupId>org.ops4j.pax.exam</groupId>
                 <artifactId>pax-exam-junit-extender-impl</artifactId>
-                <version>1.0.0</version>
+                <version>1.1.0</version>
             </dependency>
             <dependency>
                 <groupId>org.ops4j.pax.runner</groupId>
@@ -156,7 +156,7 @@
             <dependency>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>org.apache.felix.configadmin</artifactId>
-                <version>1.2.0</version>
+                <version>1.2.4</version>
             </dependency>
             <dependency>
                 <groupId>org.ops4j.pax.logging</groupId>
@@ -178,7 +178,7 @@
             <dependency>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>org.apache.felix.main</artifactId>
-                <version>1.8.0</version>
+                <version>2.0.0</version>
             </dependency>
             <dependency>
                 <groupId>org.eclipse</groupId>



Mime
View raw message