[jboss-cvs] JBossAS SVN: r99662 - in projects/jboss-osgi/trunk: reactor and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2010-01-20 10:34:30 -0500 (Wed, 20 Jan 2010)
New Revision: 99662

Modified:
   projects/jboss-osgi/trunk/pom.xml
   projects/jboss-osgi/trunk/reactor/blueprint/pom.xml
   projects/jboss-osgi/trunk/reactor/pom.xml
Log:
Externalize blueprint

Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml	2010-01-20 15:10:45 UTC (rev 99661)
+++ projects/jboss-osgi/trunk/pom.xml	2010-01-20 15:34:30 UTC (rev 99662)
@@ -53,7 +53,7 @@
     <version.apache.felix.metatype>1.0.2</version.apache.felix.metatype>
     <version.izpack>4.3.1</version.izpack>
     <version.jboss.osgi.apache.xerces>2.9.1.SP3</version.jboss.osgi.apache.xerces>
-    <version.jboss.osgi.blueprint>1.0.0.Beta1</version.jboss.osgi.blueprint>
+    <version.jboss.osgi.blueprint>1.0.0.Beta1-SNAPSHOT</version.jboss.osgi.blueprint>
     <version.jboss.osgi.common>1.0.3</version.jboss.osgi.common>
     <version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
     <version.jboss.osgi.deployment>1.0.1-SNAPSHOT</version.jboss.osgi.deployment>

Modified: projects/jboss-osgi/trunk/reactor/blueprint/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/blueprint/pom.xml	2010-01-20 15:10:45 UTC (rev 99661)
+++ projects/jboss-osgi/trunk/reactor/blueprint/pom.xml	2010-01-20 15:34:30 UTC (rev 99662)
@@ -20,18 +20,27 @@
   <artifactId>jboss-osgi-blueprint</artifactId>
   <packaging>bundle</packaging>
 
-  <version>1.0.0.Beta1</version>
+  <version>1.0.0.Beta1-SNAPSHOT</version>
 
   <!-- Parent -->
   <parent>
     <groupId>org.jboss.osgi</groupId>
-    <artifactId>jboss-osgi</artifactId>
-    <version>1.0.0.Beta6</version>
-    <relativePath>../../pom.xml</relativePath>
+    <artifactId>jboss-osgi-parent</artifactId>
+    <version>1.0.4</version>
   </parent>
 
   <!-- Properties -->
   <properties>
+    <version.apache.aries.blueprint>1.0.0.20100120</version.apache.aries.blueprint>
+    <version.apache.aries.util>1.0.0.20100120</version.apache.aries.util>
+    <version.jboss.osgi.common>1.0.3</version.jboss.osgi.common>
+    <version.jboss.osgi.framework>1.0.0-SNAPSHOT</version.jboss.osgi.framework>
+    <version.jboss.osgi.husky>1.0.3-SNAPSHOT</version.jboss.osgi.husky>
+    <version.jboss.osgi.jmx>1.0.3-SNAPSHOT</version.jboss.osgi.jmx>
+    <version.jboss.osgi.spi>1.0.4-SNAPSHOT</version.jboss.osgi.spi>
+    <version.osgi>4.2.0</version.osgi>
+    
+    <surefire.jpda.args></surefire.jpda.args>
   </properties>
 
   <!-- Dependencies -->
@@ -41,35 +50,48 @@
       <artifactId>bnd</artifactId>
     </dependency>
   
+    <!-- Compile Dependencies -->
+    <dependency>
+      <groupId>org.jboss.osgi</groupId>
+      <artifactId>jboss-osgi-spi</artifactId>
+      <version>${version.jboss.osgi.spi}</version>
+    </dependency>
+
     <!-- Provided Dependencies -->
     <dependency>
       <groupId>org.apache.aries.blueprint</groupId>
       <artifactId>org.apache.aries.blueprint</artifactId>
+      <version>${version.apache.aries.blueprint}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.aries</groupId>
       <artifactId>org.apache.aries.util</artifactId>
+      <version>${version.apache.aries.util}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.jboss.osgi.bundles</groupId>
       <artifactId>jboss-osgi-common</artifactId>
+      <version>${version.jboss.osgi.common}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.jboss.osgi.bundles</groupId>
       <artifactId>jboss-osgi-husky</artifactId>
+      <version>${version.jboss.osgi.husky}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.jboss.osgi.bundles</groupId>
       <artifactId>jboss-osgi-jmx</artifactId>
+      <version>${version.jboss.osgi.jmx}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.jboss.osgi.runtime</groupId>
       <artifactId>jboss-osgi-framework</artifactId>
+      <version>${version.jboss.osgi.framework}</version>
       <scope>provided</scope>
     </dependency>
 
@@ -77,11 +99,13 @@
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.core</artifactId>
+      <version>${version.osgi}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.compendium</artifactId>
+      <version>${version.osgi}</version>
       <scope>provided</scope>
     </dependency>
 
@@ -288,6 +312,22 @@
       </build>
     </profile>
 
+    <!--
+      Name: jpda
+      Descr: Enable JPDA remote debuging
+    -->
+    <profile>
+      <id>jpda</id>
+      <activation>
+        <property>
+          <name>jpda</name>
+        </property>
+      </activation>
+      <properties>
+        <surefire.jpda.args>-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y</surefire.jpda.args>
+      </properties>
+    </profile>
+    
   </profiles>
 
 </project>

Modified: projects/jboss-osgi/trunk/reactor/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/pom.xml	2010-01-20 15:10:45 UTC (rev 99661)
+++ projects/jboss-osgi/trunk/reactor/pom.xml	2010-01-20 15:34:30 UTC (rev 99662)
@@ -40,10 +40,6 @@
     <version>1.0.0.Beta6</version>
   </parent>
 
-  <modules>
-    <module>blueprint</module>
-  </modules>
-
   <!-- Profiles -->
   <profiles>