[jboss-osgi-commits] JBoss-OSGI SVN: r91146 - in projects/jboss-osgi/projects/bundles: husky and 5 other directories.

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

Author: thomas.diesler at jboss.com
Date: 2009-07-13 06:27:10 -0400 (Mon, 13 Jul 2009)
New Revision: 91146

Added:
   projects/jboss-osgi/projects/bundles/husky/
   projects/jboss-osgi/projects/bundles/husky/trunk/
Modified:
   projects/jboss-osgi/projects/bundles/husky/trunk/harness/pom.xml
   projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/husky/HuskyCapability.java
   projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml
   projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/pom.xml
   projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/scripts/assembly-bundles.xml
Log:
Extract Husky

Copied: projects/jboss-osgi/projects/bundles/husky/trunk (from rev 91144, projects/jboss-osgi/trunk/husky)

Modified: projects/jboss-osgi/projects/bundles/husky/trunk/harness/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/husky/harness/pom.xml	2009-07-13 07:02:00 UTC (rev 91144)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/harness/pom.xml	2009-07-13 10:27:10 UTC (rev 91146)
@@ -18,13 +18,13 @@
   <name>JBossOSGi Husky - Harness</name>
 
   <groupId>org.jboss.osgi</groupId>
-  <artifactId>jboss-osgi-husky-harness</artifactId>
+  <artifactId>jboss-osgi-husky</artifactId>
   <packaging>bundle</packaging>
 
   <!-- Parent -->
   <parent>
     <groupId>org.jboss.osgi</groupId>
-    <artifactId>jboss-osgi-husky</artifactId>
+    <artifactId>jboss-osgi-husky-parent</artifactId>
     <version>1.0.0-SNAPSHOT</version>
   </parent>
 

Modified: projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/husky/HuskyCapability.java
===================================================================
--- projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/HuskyCapability.java	2009-07-13 07:02:00 UTC (rev 91144)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/harness/src/main/java/org/jboss/osgi/husky/HuskyCapability.java	2009-07-13 10:27:10 UTC (rev 91146)
@@ -49,6 +49,6 @@
       super("org.jboss.osgi.husky.runtime.Connector");
       
       addDependency(new JMXCapability());
-      addBundle("bundles/jboss-osgi-husky-harness.jar");
+      addBundle("bundles/jboss-osgi-husky.jar");
    }
 }
\ No newline at end of file

Modified: projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/husky/pom.xml	2009-07-13 07:02:00 UTC (rev 91144)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/pom.xml	2009-07-13 10:27:10 UTC (rev 91146)
@@ -19,19 +19,24 @@
   <description>JBoss OSGi Test Support</description>
 
   <groupId>org.jboss.osgi</groupId>
-  <artifactId>jboss-osgi-husky</artifactId>
+  <artifactId>jboss-osgi-husky-parent</artifactId>
   <packaging>pom</packaging>
 
   <version>1.0.0-SNAPSHOT</version>
   
   <parent>
     <groupId>org.jboss.osgi</groupId>
-    <artifactId>jboss-osgi</artifactId>
-    <version>1.0.0.Beta3</version>
+    <artifactId>jboss-osgi-parent</artifactId>
+    <version>1.0.1-SNAPSHOT</version>
   </parent>
 
   <!-- Properties -->
   <properties>
+    <version.apache.felix.log>1.0.0</version.apache.felix.log>
+    <version.jboss.osgi.jmx>1.0.0-SNAPSHOT</version.jboss.osgi.jmx>
+    <version.jboss.osgi.runtime.felix>1.0.0-SNAPSHOT</version.jboss.osgi.runtime.felix>
+    <version.junit>4.6</version.junit>
+    <version.osgi>r4v41</version.osgi>
   </properties>
   
   <!-- Modules -->
@@ -62,11 +67,6 @@
       </dependency>
       <dependency>
         <groupId>org.jboss.osgi.bundles</groupId>
-        <artifactId>jboss-osgi-common</artifactId>
-        <version>${version.jboss.osgi.common}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.jboss.osgi.bundles</groupId>
         <artifactId>jboss-osgi-jmx</artifactId>
         <version>${version.jboss.osgi.jmx}</version>
       </dependency>

Modified: projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/husky/testsuite/pom.xml	2009-07-13 07:02:00 UTC (rev 91144)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/pom.xml	2009-07-13 10:27:10 UTC (rev 91146)
@@ -24,7 +24,7 @@
   <!-- Parent -->
   <parent>
     <groupId>org.jboss.osgi</groupId>
-    <artifactId>jboss-osgi-husky</artifactId>
+    <artifactId>jboss-osgi-husky-parent</artifactId>
     <version>1.0.0-SNAPSHOT</version>
   </parent>
 
@@ -32,11 +32,8 @@
   <dependencies>
     <dependency>
       <groupId>org.jboss.osgi</groupId>
-      <artifactId>jboss-osgi-spi</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.osgi</groupId>
-      <artifactId>jboss-osgi-husky-harness</artifactId>
+      <artifactId>jboss-osgi-husky</artifactId>
+      <version>${version}</version>
       <scope>provided</scope>
     </dependency>
     
@@ -65,11 +62,6 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.osgi.bundles</groupId>
-      <artifactId>jboss-osgi-common</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.jboss.osgi.bundles</groupId>
       <artifactId>jboss-osgi-jmx</artifactId>
       <scope>provided</scope>
     </dependency>

Modified: projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/trunk/husky/testsuite/scripts/assembly-bundles.xml	2009-07-13 07:02:00 UTC (rev 91144)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/testsuite/scripts/assembly-bundles.xml	2009-07-13 10:27:10 UTC (rev 91146)
@@ -17,7 +17,7 @@
       <includes>
         <include>*:jboss-osgi-common:jar</include>
         <include>*:jboss-osgi-jmx:jar</include>
-        <include>*:jboss-osgi-husky-harness:jar</include>
+        <include>*:jboss-osgi-husky:jar</include>
         <include>*:org.apache.felix.log:jar</include>
         <include>*:org.osgi.compendium:jar</include>
       </includes>