geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r813276 - in /geronimo/sandbox/blueprint/trunk: ./ blueprint-api/ blueprint-api/src/main/resources/META-INF/ blueprint-api/src/main/resources/org/ blueprint-api/src/main/resources/org/osgi/ blueprint-api/src/main/resources/org/osgi/service/...
Date Thu, 10 Sep 2009 07:29:39 GMT
Author: gnodet
Date: Thu Sep 10 07:29:38 2009
New Revision: 813276

URL: http://svn.apache.org/viewvc?rev=813276&view=rev
Log:
Fix groupId/artifactIds, NOTICE files, blueprint schema location, project descriptions

Added:
    geronimo/sandbox/blueprint/trunk/blueprint-api/src/main/resources/org/
    geronimo/sandbox/blueprint/trunk/blueprint-api/src/main/resources/org/osgi/
    geronimo/sandbox/blueprint/trunk/blueprint-api/src/main/resources/org/osgi/service/
    geronimo/sandbox/blueprint/trunk/blueprint-api/src/main/resources/org/osgi/service/blueprint/
    geronimo/sandbox/blueprint/trunk/blueprint-api/src/main/resources/org/osgi/service/blueprint/blueprint.xsd
      - copied unchanged from r812830, geronimo/sandbox/blueprint/trunk/blueprint-core/src/main/resources/org/apache/geronimo/blueprint/blueprint.xsd
Removed:
    geronimo/sandbox/blueprint/trunk/blueprint-api/src/main/resources/META-INF/
    geronimo/sandbox/blueprint/trunk/blueprint-bundle/src/main/resources/META-INF/
    geronimo/sandbox/blueprint/trunk/blueprint-cm/src/main/resources/META-INF/
    geronimo/sandbox/blueprint/trunk/blueprint-core/src/main/resources/META-INF/
    geronimo/sandbox/blueprint/trunk/blueprint-core/src/main/resources/org/apache/geronimo/blueprint/blueprint.xsd
Modified:
    geronimo/sandbox/blueprint/trunk/blueprint-api/pom.xml
    geronimo/sandbox/blueprint/trunk/blueprint-bundle/pom.xml
    geronimo/sandbox/blueprint/trunk/blueprint-cm/pom.xml
    geronimo/sandbox/blueprint/trunk/blueprint-cm/src/main/resources/OSGI-INF/blueprint/blueprint-cm.xml
    geronimo/sandbox/blueprint/trunk/blueprint-core/pom.xml
    geronimo/sandbox/blueprint/trunk/blueprint-itests/pom.xml
    geronimo/sandbox/blueprint/trunk/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/BlueprintContainerTest.java
    geronimo/sandbox/blueprint/trunk/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestConfigAdmin.java
    geronimo/sandbox/blueprint/trunk/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestReferences.java
    geronimo/sandbox/blueprint/trunk/blueprint-sample/pom.xml
    geronimo/sandbox/blueprint/trunk/pom.xml

Modified: geronimo/sandbox/blueprint/trunk/blueprint-api/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/trunk/blueprint-api/pom.xml?rev=813276&r1=813275&r2=813276&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/trunk/blueprint-api/pom.xml (original)
+++ geronimo/sandbox/blueprint/trunk/blueprint-api/pom.xml Thu Sep 10 07:29:38 2009
@@ -17,14 +17,17 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.geronimo</groupId>
+        <groupId>org.apache.geronimo.blueprint</groupId>
         <artifactId>blueprint</artifactId>
         <version>1.0.1-SNAPSHOT</version>
     </parent>
 
-    <artifactId>blueprint-api</artifactId>
-    <packaging>jar</packaging>
+    <artifactId>org.apache.geronimo.blueprint.api</artifactId>
+    <packaging>bundle</packaging>
     <name>Apache Geronimo Blueprint API</name>
+    <description>
+        This bundle contains the blueprint api 1.0.0 and the corresponding xml schema.
+    </description>
 
     <dependencies>
         <dependency>
@@ -45,27 +48,12 @@
                         <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
                         <Export-Package>org.osgi.service.blueprint*;version="1.0"</Export-Package>
                         <Import-Package>!org.osgi.service.blueprint*,*</Import-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>
                     </instructions>
                 </configuration>
-                <executions>
-                    <execution>
-                        <id>bundle-manifest</id>
-                        <phase>process-classes</phase>
-                        <goals>
-                            <goal>manifest</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
-                    </archive>
-                </configuration>
             </plugin>
         </plugins>
     </build>

Modified: geronimo/sandbox/blueprint/trunk/blueprint-bundle/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/trunk/blueprint-bundle/pom.xml?rev=813276&r1=813275&r2=813276&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/trunk/blueprint-bundle/pom.xml (original)
+++ geronimo/sandbox/blueprint/trunk/blueprint-bundle/pom.xml Thu Sep 10 07:29:38 2009
@@ -17,23 +17,27 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.geronimo</groupId>
+        <groupId>org.apache.geronimo.blueprint</groupId>
         <artifactId>blueprint</artifactId>
         <version>1.0.1-SNAPSHOT</version>
     </parent>
 
-    <artifactId>blueprint-bundle</artifactId>
+    <artifactId>org.apache.geronimo.blueprint.bundle</artifactId>
     <packaging>bundle</packaging>
     <name>Apache Geronimo Blueprint Bundle</name>
+    <description>
+        This bundle contains the standalone implementation along with the API.
+        It's composed of the blueprint-api, blueprint-core and blueprint-cm modules.
+    </description>
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo</groupId>
-            <artifactId>blueprint-core</artifactId>
+            <groupId>org.apache.geronimo.blueprint</groupId>
+            <artifactId>org.apache.geronimo.blueprint.core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo</groupId>
-            <artifactId>blueprint-cm</artifactId>
+            <groupId>org.apache.geronimo.blueprint</groupId>
+            <artifactId>org.apache.geronimo.blueprint.cm</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
@@ -84,17 +88,10 @@
                             org.apache.geronimo.blueprint.namespace,
                             org.apache.geronimo.blueprint.reflect,
                             org.apache.geronimo.blueprint.utils,
-                            <!--
-                            org.objectweb.asm,
-                            org.objectweb.asm.commons,
-                            org.objectweb.asm.signature,
-                            org.objectweb.asm.tree*,
-                            org.objectweb.asm.util,
-                            net.sf.cglib.core,
-                            net.sf.cglib.proxy,
-                            net.sf.cglib.reflect,
-                            -->
+                            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>
@@ -102,6 +99,9 @@
                     <unpackBundle>true</unpackBundle>
                 </configuration>
             </plugin>
+            <!-- Use the shade plugin with the dependency plugin to unjar the three jars
(api, core and cm)
+                 so that the associated sources and javadocs jars are complete.
+                 To build the main jar, the maven-bundle-plugin is used, that's why everything
is exluded -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
@@ -114,30 +114,12 @@
                         <configuration>
                             <artifactSet>
                                 <includes>
-                                    <!--
-                                    <include>asm:asm-all</include>
-                                    <include>cglib:cglib</include>
-                                    -->
                                     <include>org.apache.geronimo:blueprint-api</include>
                                     <include>org.apache.geronimo:blueprint-core</include>
                                     <include>org.apache.geronimo:blueprint-cm</include>
                                 </includes>
                             </artifactSet>
                             <filters>
-                                <!--
-                                <filter>
-                                    <artifact>asm:asm-all</artifact>
-                                    <excludes>
-                                        <exclude>org/**</exclude>
-                                    </excludes>
-                                </filter>
-                                <filter>
-                                    <artifact>cglib:cglib</artifact>
-                                    <excludes>
-                                        <exclude>net/**</exclude>
-                                    </excludes>
-                                </filter>
-                                -->
                                 <filter>
                                     <artifact>org.apache.geronimo:blueprint-api</artifact>
                                     <excludes>

Modified: geronimo/sandbox/blueprint/trunk/blueprint-cm/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/trunk/blueprint-cm/pom.xml?rev=813276&r1=813275&r2=813276&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/trunk/blueprint-cm/pom.xml (original)
+++ geronimo/sandbox/blueprint/trunk/blueprint-cm/pom.xml Thu Sep 10 07:29:38 2009
@@ -17,21 +17,24 @@
  under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
  <parent>
-    <groupId>org.apache.geronimo</groupId>
+    <groupId>org.apache.geronimo.blueprint</groupId>
     <artifactId>blueprint</artifactId>
     <version>1.0.1-SNAPSHOT</version>
   </parent>
 
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>blueprint-cm</artifactId>
-  <name>Apache Geronimo Blueprint CM</name>
+  <artifactId>org.apache.geronimo.blueprint.cm</artifactId>
   <packaging>bundle</packaging>
+  <name>Apache Geronimo Blueprint CM</name>
+  <description>
+      This bundle contains the ConfigAdmin namespace for blueprint.
+  </description>
   
   <dependencies>
       <dependency>
-          <groupId>org.apache.geronimo</groupId>
-          <artifactId>blueprint-core</artifactId>
+          <groupId>org.apache.geronimo.blueprint</groupId>
+          <artifactId>org.apache.geronimo.blueprint.core</artifactId>
       </dependency>
       <dependency>
           <groupId>org.eclipse</groupId>
@@ -56,6 +59,8 @@
                         <Bundle-SymbolicName>${pom.artifactId}</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>
+                        <!-- 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>
                     </instructions>

Modified: geronimo/sandbox/blueprint/trunk/blueprint-cm/src/main/resources/OSGI-INF/blueprint/blueprint-cm.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/trunk/blueprint-cm/src/main/resources/OSGI-INF/blueprint/blueprint-cm.xml?rev=813276&r1=813275&r2=813276&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/trunk/blueprint-cm/src/main/resources/OSGI-INF/blueprint/blueprint-cm.xml
(original)
+++ geronimo/sandbox/blueprint/trunk/blueprint-cm/src/main/resources/OSGI-INF/blueprint/blueprint-cm.xml
Thu Sep 10 07:29:38 2009
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
 
     <service interface="org.apache.geronimo.blueprint.NamespaceHandler">

Modified: geronimo/sandbox/blueprint/trunk/blueprint-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/trunk/blueprint-core/pom.xml?rev=813276&r1=813275&r2=813276&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/trunk/blueprint-core/pom.xml (original)
+++ geronimo/sandbox/blueprint/trunk/blueprint-core/pom.xml Thu Sep 10 07:29:38 2009
@@ -17,21 +17,25 @@
  under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
-    <groupId>org.apache.geronimo</groupId>
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.geronimo.blueprint</groupId>
     <artifactId>blueprint</artifactId>
     <version>1.0.1-SNAPSHOT</version>
   </parent>
 
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>blueprint-core</artifactId>
-  <name>Apache Geronimo Blueprint Core</name>
+  <artifactId>org.apache.geronimo.blueprint.core</artifactId>
   <packaging>bundle</packaging>
+  <name>Apache Geronimo Blueprint Core</name>
+  <description>
+      This bundle contains the core implementation of Blueprint 
+      along with the "ext" namespace handler.
+  </description>
   
   <dependencies>
       <dependency>
-          <groupId>org.apache.geronimo</groupId>
-          <artifactId>blueprint-api</artifactId>
+          <groupId>org.apache.geronimo.blueprint</groupId>
+          <artifactId>org.apache.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>
@@ -61,6 +65,18 @@
   </dependencies>
 
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+            <resource>
+                <directory>../blueprint-api/src/main/resources/org/osgi/service/blueprint</directory>
+                <targetPath>org/apache/geronimo/blueprint</targetPath>
+                <includes>
+                    <include>blueprint.xsd</include>
+                </includes>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>
@@ -74,6 +90,8 @@
                             org.apache.geronimo.blueprint*;version="${pom.version}"
                         </Export-Package>
                         <Import-Package>!org.apache.geronimo.blueprint*,*</Import-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>
                     </instructions>

Modified: geronimo/sandbox/blueprint/trunk/blueprint-itests/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/trunk/blueprint-itests/pom.xml?rev=813276&r1=813275&r2=813276&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/trunk/blueprint-itests/pom.xml (original)
+++ geronimo/sandbox/blueprint/trunk/blueprint-itests/pom.xml Thu Sep 10 07:29:38 2009
@@ -17,25 +17,29 @@
  under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.geronimo</groupId>
+        <groupId>org.apache.geronimo.blueprint</groupId>
         <artifactId>blueprint</artifactId>
         <version>1.0.1-SNAPSHOT</version>
     </parent>
 
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>blueprint-itests</artifactId>
+    <artifactId>org.apache.geronimo.blueprint.itests</artifactId>
     <name>Apache Geronimo Blueprint iTests</name>
+    <description>
+        Integration tests using the standalone blueprint-bundle for the implementation
+        and blueprint-sample for the blueprint application to be tested.
+    </description>
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.geronimo</groupId>
-            <artifactId>blueprint-bundle</artifactId>
+            <groupId>org.apache.geronimo.blueprint</groupId>
+            <artifactId>org.apache.geronimo.blueprint.bundle</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo</groupId>
-            <artifactId>blueprint-sample</artifactId>
+            <groupId>org.apache.geronimo.blueprint</groupId>
+            <artifactId>org.apache.geronimo.blueprint.sample</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: geronimo/sandbox/blueprint/trunk/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/BlueprintContainerTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/trunk/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/BlueprintContainerTest.java?rev=813276&r1=813275&r2=813276&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/trunk/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/BlueprintContainerTest.java
(original)
+++ geronimo/sandbox/blueprint/trunk/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/BlueprintContainerTest.java
Thu Sep 10 07:29:38 2009
@@ -59,12 +59,12 @@
         props.put("key.b", "10");
         cf.update(props);
 
-        Bundle bundle = getInstalledBundle("blueprint-sample");
+        Bundle bundle = getInstalledBundle("org.apache.geronimo.blueprint.sample");
         assertNotNull(bundle);
 
         bundle.start();
 
-        BlueprintContainer blueprintContainer = getBlueprintContainerForBundle("blueprint-sample",
5000);
+        BlueprintContainer blueprintContainer = getBlueprintContainerForBundle("org.apache.geronimo.blueprint.sample",
5000);
         assertNotNull(blueprintContainer);
 
         Object obj = blueprintContainer.getComponentInstance("bar");
@@ -99,7 +99,7 @@
         Thread.sleep(1000);
 
         try {
-            blueprintContainer = getBlueprintContainerForBundle("blueprint-sample", 1);
+            blueprintContainer = getBlueprintContainerForBundle("org.apache.geronimo.blueprint.sample",
1);
             fail("BlueprintContainer should have been unregistered");
         } catch (Exception e) {
             // Expected, as the module container should have been unregistered
@@ -125,8 +125,8 @@
             systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
 
             // Bundles
-            mavenBundle("org.apache.geronimo", "blueprint-bundle"),
-            mavenBundle("org.apache.geronimo", "blueprint-sample").noStart(),
+            mavenBundle("org.apache.geronimo.blueprint", "org.apache.geronimo.blueprint.bundle"),
+            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/sandbox/blueprint/trunk/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestConfigAdmin.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/trunk/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestConfigAdmin.java?rev=813276&r1=813275&r2=813276&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/trunk/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestConfigAdmin.java
(original)
+++ geronimo/sandbox/blueprint/trunk/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestConfigAdmin.java
Thu Sep 10 07:29:38 2009
@@ -53,11 +53,11 @@
         props.put("currency", "PLN");
         cf.update(props);
 
-        Bundle bundle = getInstalledBundle("blueprint-sample");
+        Bundle bundle = getInstalledBundle("org.apache.geronimo.blueprint.sample");
         assertNotNull(bundle);
         bundle.start();
 
-        BlueprintContainer blueprintContainer = getBlueprintContainerForBundle("blueprint-sample",
5000);
+        BlueprintContainer blueprintContainer = getBlueprintContainerForBundle("org.apache.geronimo.blueprint.sample",
5000);
         assertNotNull(blueprintContainer);
 
         Foo foo = (Foo) blueprintContainer.getComponentInstance("none-managed");
@@ -87,11 +87,11 @@
         props.put("currency", "PLN");
         cf.update(props);
 
-        Bundle bundle = getInstalledBundle("blueprint-sample");
+        Bundle bundle = getInstalledBundle("org.apache.geronimo.blueprint.sample");
         assertNotNull(bundle);
         bundle.start();
 
-        BlueprintContainer blueprintContainer = getBlueprintContainerForBundle("blueprint-sample",
5000);
+        BlueprintContainer blueprintContainer = getBlueprintContainerForBundle("org.apache.geronimo.blueprint.sample",
5000);
         assertNotNull(blueprintContainer);
 
         Foo foo = (Foo) blueprintContainer.getComponentInstance("container-managed");
@@ -120,11 +120,11 @@
         props.put("currency", "PLN");
         cf.update(props);
 
-        Bundle bundle = getInstalledBundle("blueprint-sample");
+        Bundle bundle = getInstalledBundle("org.apache.geronimo.blueprint.sample");
         assertNotNull(bundle);
         bundle.start();
 
-        BlueprintContainer blueprintContainer = getBlueprintContainerForBundle("blueprint-sample",
5000);
+        BlueprintContainer blueprintContainer = getBlueprintContainerForBundle("org.apache.geronimo.blueprint.sample",
5000);
         assertNotNull(blueprintContainer);
 
         Foo foo = (Foo) blueprintContainer.getComponentInstance("component-managed");
@@ -156,11 +156,11 @@
         props.put("currency", "PLN");
         cf.update(props);
 
-        Bundle bundle = getInstalledBundle("blueprint-sample");
+        Bundle bundle = getInstalledBundle("org.apache.geronimo.blueprint.sample");
         assertNotNull(bundle);
         bundle.start();
 
-        BlueprintContainer blueprintContainer = getBlueprintContainerForBundle("blueprint-sample",
5000);
+        BlueprintContainer blueprintContainer = getBlueprintContainerForBundle("org.apache.geronimo.blueprint.sample",
5000);
         assertNotNull(blueprintContainer);
 
         Thread.sleep(5000);
@@ -182,8 +182,8 @@
             systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("DEBUG"),
 
             // Bundles
-            mavenBundle("org.apache.geronimo", "blueprint-bundle"),
-            mavenBundle("org.apache.geronimo", "blueprint-sample").noStart(),
+            mavenBundle("org.apache.geronimo.blueprint", "org.apache.geronimo.blueprint.bundle"),
+            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/sandbox/blueprint/trunk/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestReferences.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/trunk/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestReferences.java?rev=813276&r1=813275&r2=813276&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/trunk/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestReferences.java
(original)
+++ geronimo/sandbox/blueprint/trunk/blueprint-itests/src/test/java/org/apache/geronimo/blueprint/itests/TestReferences.java
Thu Sep 10 07:29:38 2009
@@ -50,7 +50,7 @@
 
     @Test
     public void testUnaryReference() throws Exception {
-        BlueprintContainer blueprintContainer = getBlueprintContainerForBundle("blueprint-sample");
+        BlueprintContainer blueprintContainer = getBlueprintContainerForBundle("org.apache.geronimo.blueprint.sample");
         assertNotNull(blueprintContainer);
 
         BindingListener listener = (BindingListener) blueprintContainer.getComponentInstance("bindingListener");
@@ -104,7 +104,7 @@
 
     @Test
     public void testListReferences() throws Exception {
-        BlueprintContainer blueprintContainer = getBlueprintContainerForBundle("blueprint-sample");
+        BlueprintContainer blueprintContainer = getBlueprintContainerForBundle("org.apache.geronimo.blueprint.sample");
         assertNotNull(blueprintContainer);
 
         BindingListener listener = (BindingListener) blueprintContainer.getComponentInstance("listBindingListener");
@@ -144,8 +144,8 @@
             systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"),
 
             // Bundles
-            mavenBundle("org.apache.geronimo", "blueprint-bundle"),
-            mavenBundle("org.apache.geronimo", "blueprint-sample"),
+            mavenBundle("org.apache.geronimo.blueprint", "org.apache.geronimo.blueprint.bundle"),
+            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/sandbox/blueprint/trunk/blueprint-sample/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/trunk/blueprint-sample/pom.xml?rev=813276&r1=813275&r2=813276&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/trunk/blueprint-sample/pom.xml (original)
+++ geronimo/sandbox/blueprint/trunk/blueprint-sample/pom.xml Thu Sep 10 07:29:38 2009
@@ -17,14 +17,17 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.apache.geronimo</groupId>
+        <groupId>org.apache.geronimo.blueprint</groupId>
         <artifactId>blueprint</artifactId>
         <version>1.0.1-SNAPSHOT</version>
     </parent>
 
-    <artifactId>blueprint-sample</artifactId>
+    <artifactId>org.apache.geronimo.blueprint.sample</artifactId>
     <name>Apache Geronimo Blueprint Sample</name>
     <packaging>bundle</packaging>
+    <description>
+        Example blueprint application, mostly used for integration tests.
+    </description>
 
     <build>
         <plugins>
@@ -54,8 +57,8 @@
             <scope>provided</scope>
         </dependency>
        <dependency>
-           <groupId>org.apache.geronimo</groupId>
-           <artifactId>blueprint-api</artifactId>
+           <groupId>org.apache.geronimo.blueprint</groupId>
+           <artifactId>org.apache.geronimo.blueprint.api</artifactId>
        </dependency>
     </dependencies>
 </project>

Modified: geronimo/sandbox/blueprint/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/trunk/pom.xml?rev=813276&r1=813275&r2=813276&view=diff
==============================================================================
--- geronimo/sandbox/blueprint/trunk/pom.xml (original)
+++ geronimo/sandbox/blueprint/trunk/pom.xml Thu Sep 10 07:29:38 2009
@@ -25,7 +25,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.geronimo</groupId>
+    <groupId>org.apache.geronimo.blueprint</groupId>
     <artifactId>blueprint</artifactId>
     <name>Apache Geronimo Blueprint</name>
     <version>1.0.1-SNAPSHOT</version>
@@ -36,9 +36,9 @@
     </description>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/sandbox/blueprint/trunk</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/sandbox/blueprint/trunk</developerConnection>
-        <url>http://svn.apache.org/viewvc/geronimo/sandbox/blueprint/trunk</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/components/blueprint/trunk</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/components/blueprint/trunk</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/components/blueprint/trunk</url>
     </scm>
     
     <repositories>
@@ -58,33 +58,33 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>org.apache.geronimo</groupId>
-                <artifactId>blueprint-api</artifactId>
+                <groupId>org.apache.geronimo.blueprint</groupId>
+                <artifactId>org.apache.geronimo.blueprint.api</artifactId>
                 <version>${version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo</groupId>
-                <artifactId>blueprint-core</artifactId>
+                <groupId>org.apache.geronimo.blueprint</groupId>
+                <artifactId>org.apache.geronimo.blueprint.core</artifactId>
                 <version>${version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo</groupId>
-                <artifactId>blueprint-cm</artifactId>
+                <groupId>org.apache.geronimo.blueprint</groupId>
+                <artifactId>org.apache.geronimo.blueprint.cm</artifactId>
                 <version>${version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo</groupId>
-                <artifactId>blueprint-bundle</artifactId>
+                <groupId>org.apache.geronimo.blueprint</groupId>
+                <artifactId>org.apache.geronimo.blueprint.bundle</artifactId>
                 <version>${version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo</groupId>
-                <artifactId>blueprint-sample</artifactId>
+                <groupId>org.apache.geronimo.blueprint</groupId>
+                <artifactId>org.apache.geronimo.blueprint.sample</artifactId>
                 <version>${version}</version>
             </dependency>
             <dependency>
-                <groupId>org.apache.geronimo</groupId>
-                <artifactId>blueprint-itests</artifactId>
+                <groupId>org.apache.geronimo.blueprint</groupId>
+                <artifactId>org.apache.geronimo.blueprint.itests</artifactId>
                 <version>${version}</version>
             </dependency>
             <dependency>



Mime
View raw message