3:48 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2009-05-20 04:48:24 -0400 (Wed, 20 May 2009)
New Revision: 89167
Modified:
projects/jboss-osgi/parent/trunk/pom.xml
projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml
projects/jboss-osgi/projects/bundles/blueprint/trunk/scripts/assembly-bundles.xml
projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml
projects/jboss-osgi/projects/bundles/pom.xml
projects/jboss-osgi/projects/bundles/remotelog/trunk/pom.xml
projects/jboss-osgi/projects/bundles/webconsole/trunk/pom.xml
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/HuskyCapability.java
Log:
restructure svn - WIP
Modified: projects/jboss-osgi/parent/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/parent/trunk/pom.xml 2009-05-20 08:19:35 UTC (rev 89166)
+++ projects/jboss-osgi/parent/trunk/pom.xml 2009-05-20 08:48:24 UTC (rev 89167)
@@ -17,6 +17,7 @@
<properties>
<version.aqute.bnd>0.0.323</version.aqute.bnd>
<version.equinox>3.4.2</version.equinox>
+ <version.felix.bundlerepository>1.0.3</version.felix.bundlerepository>
<version.felix.configadmin>1.0.10</version.felix.configadmin>
<version.felix.framework>1.6.1</version.felix.framework>
<version.felix.http.jetty>1.0.0</version.felix.http.jetty>
@@ -24,6 +25,7 @@
<version.felix.log>1.0.0</version.felix.log>
<version.felix.metatype>1.0.2</version.felix.metatype>
<version.felix.osgi.core>1.2.0</version.felix.osgi.core>
+ <version.felix.scr>1.0.0</version.felix.scr>
<version.felix.webconsole>1.2.8</version.felix.webconsole>
<version.jboss.logging>2.0.5.GA</version.jboss.logging>
<version.junit>4.6</version.junit>
@@ -74,6 +76,11 @@
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.bundlerepository</artifactId>
+ <version>${version.felix.bundlerepository}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
<artifactId>org.osgi.compendium</artifactId>
<version>${version.felix.osgi.core}</version>
</dependency>
@@ -109,6 +116,11 @@
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr</artifactId>
+ <version>${version.felix.scr}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.webconsole</artifactId>
<version>${version.felix.webconsole}</version>
</dependency>
@@ -119,7 +131,7 @@
<artifactId>org.knopflerfish.framework</artifactId>
<version>${version.knopflerfish}</version>
</dependency>
-
+
</dependencies>
</dependencyManagement>
@@ -137,6 +149,39 @@
<optimize>true</optimize>
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <redirectTestOutputToFile>false</redirectTestOutputToFile>
+ <failIfNoTests>false</failIfNoTests>
+ <systemProperties>
+ <property>
+
<name>org.apache.xerces.xni.parser.XMLParserConfiguration</name>
+
<value>org.apache.xerces.parsers.XIncludeAwareParserConfiguration</value>
+ </property>
+ <property>
+ <name>org.jboss.osgi.husky.Invoker</name>
+ <value>org.jboss.osgi.husky.internal.LocalInvoker</value>
+ </property>
+ <!--
+ Implement URLStreamHandlerService
+ https://jira.jboss.org/jira/browse/JBOSGI-75
+ -->
+ <property>
+ <name>java.protocol.handler.pkgs</name>
+
<value>org.jboss.net.protocol|org.jboss.virtual.protocol</value>
+ </property>
+ <property>
+ <name>test.archive.directory</name>
+ <value>${project.build.directory}/test-libs</value>
+ </property>
+ <property>
+ <name>log4j.output.dir</name>
+ <value>${basedir}/target</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
</plugins>
<!-- PluginManagement -->
Modified: projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml 2009-05-20 08:19:35 UTC
(rev 89166)
+++ projects/jboss-osgi/projects/bundles/blueprint/trunk/pom.xml 2009-05-20 08:48:24 UTC
(rev 89167)
@@ -1,7 +1,7 @@
<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>
- <name>JBossOSGi - Bundle Blueprint</name>
+ <name>JBossOSGi Bundles - Blueprint</name>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-blueprint</artifactId>
@@ -16,8 +16,10 @@
<!-- Properties -->
<properties>
<version.jboss.osgi.common>1.0.0-SNAPSHOT</version.jboss.osgi.common>
+ <version.jboss.osgi.husky>1.0.0-SNAPSHOT</version.jboss.osgi.husky>
<version.jboss.osgi.jmx>1.0.0-SNAPSHOT</version.jboss.osgi.jmx>
<version.jboss.osgi.logging>1.0.0-SNAPSHOT</version.jboss.osgi.logging>
+
<version.jboss.osgi.runtome.felix>1.0.0-SNAPSHOT</version.jboss.osgi.runtome.felix>
<version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi>
<version.jbossxb.bundle>2.0.0-SNAPSHOT</version.jbossxb.bundle>
<version.osgi>r4v41</version.osgi>
@@ -70,7 +72,8 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-husky-harness</artifactId>
+ <artifactId>jboss-osgi-husky</artifactId>
+ <version>${version.jboss.osgi.husky}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -90,7 +93,7 @@
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-runtime-felix</artifactId>
- <version>${version}</version>
+ <version>${version.jboss.osgi.runtome.felix}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified:
projects/jboss-osgi/projects/bundles/blueprint/trunk/scripts/assembly-bundles.xml
===================================================================
---
projects/jboss-osgi/projects/bundles/blueprint/trunk/scripts/assembly-bundles.xml 2009-05-20
08:19:35 UTC (rev 89166)
+++
projects/jboss-osgi/projects/bundles/blueprint/trunk/scripts/assembly-bundles.xml 2009-05-20
08:48:24 UTC (rev 89167)
@@ -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>*:jboss-osgi-logging:jar</include>
<include>*:jbossxb-bundle:jar</include>
<include>*:org.apache.felix.log:jar</include>
Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-05-20 08:19:35
UTC (rev 89166)
+++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/pom.xml 2009-05-20 08:48:24
UTC (rev 89167)
@@ -2,7 +2,7 @@
<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>
- <name>JBossOSGi - Bundle Microcontainer</name>
+ <name>JBossOSGi Bundles - Microcontainer</name>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-microcontainer</artifactId>
Modified: projects/jboss-osgi/projects/bundles/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/pom.xml 2009-05-20 08:19:35 UTC (rev 89166)
+++ projects/jboss-osgi/projects/bundles/pom.xml 2009-05-20 08:48:24 UTC (rev 89167)
@@ -28,15 +28,13 @@
<!-- jboss-osgi -->
<module>common/trunk</module>
+ <module>blueprint/trunk</module>
<module>logging/trunk</module>
<module>jmx/trunk</module>
<module>jndi/trunk</module>
- <!--
- <module>blueprint/trunk</module>
<module>microcontainer/trunk</module>
<module>remotelog/trunk</module>
<module>webconsole/trunk</module>
- -->
</modules>
Modified: projects/jboss-osgi/projects/bundles/remotelog/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/remotelog/trunk/pom.xml 2009-05-20 08:19:35 UTC
(rev 89166)
+++ projects/jboss-osgi/projects/bundles/remotelog/trunk/pom.xml 2009-05-20 08:48:24 UTC
(rev 89167)
@@ -2,15 +2,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>
- <name>JBossOSGi - Bundle Remote Logging</name>
+ <name>JBossOSGi Bundles - Remote Logging</name>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-remotelog</artifactId>
<packaging>bundle</packaging>
+ <version>1.0.0-SNAPSHOT</version>
+
<!-- Parent -->
<parent>
- <groupId>org.jboss.osgi</groupId>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-bundles</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
@@ -18,8 +20,10 @@
<!-- Properties -->
<properties>
<version.concurrent>1.3.4</version.concurrent>
+ <version.jboss.osgi.spi>1.0.0-SNAPSHOT</version.jboss.osgi.spi>
<version.jboss.remoting>2.5.0.SP2</version.jboss.remoting>
<version.jboss.serialization>1.0.3.GA</version.jboss.serialization>
+ <version.osgi>r4v41</version.osgi>
</properties>
<!-- Dependencies -->
@@ -27,16 +31,18 @@
<dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-spi</artifactId>
- <version>${version}</version>
+ <version>${version.jboss.osgi.spi}</version>
</dependency>
<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>
Modified: projects/jboss-osgi/projects/bundles/webconsole/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/projects/bundles/webconsole/trunk/pom.xml 2009-05-20 08:19:35 UTC
(rev 89166)
+++ projects/jboss-osgi/projects/bundles/webconsole/trunk/pom.xml 2009-05-20 08:48:24 UTC
(rev 89167)
@@ -1,36 +1,47 @@
<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>
- <name>JBossOSGi - Bundle WebConsole</name>
+ <name>JBossOSGi Bundles - WebConsole</name>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-webconsole</artifactId>
<packaging>bundle</packaging>
+ <version>1.0.0-SNAPSHOT</version>
+
<parent>
- <groupId>org.jboss.osgi</groupId>
+ <groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-bundles</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
+ <!-- Properties -->
+ <properties>
+ <version.commons.fileupload>1.1.1</version.commons.fileupload>
+ <version.commons.io>1.4</version.commons.io>
+ <version.javax.servlet>2.4</version.javax.servlet>
+ <version.json>20070829</version.json>
+ </properties>
+
<!-- Dependencies -->
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
+ <version>${version.javax.servlet}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.1.1</version>
+ <version>${version.commons.fileupload}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.4</version>
+ <version>${version.commons.io}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
@@ -48,7 +59,7 @@
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
- <version>20070829</version>
+ <version>${version.json}</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
@@ -56,14 +67,12 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
- <version>1.0.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.bundlerepository</artifactId>
- <version>1.0.3</version>
<scope>compile</scope>
<optional>true</optional>
</dependency>
Modified:
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/HuskyCapability.java
===================================================================
---
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/HuskyCapability.java 2009-05-20
08:19:35 UTC (rev 89166)
+++
projects/jboss-osgi/projects/spi/trunk/src/main/java/org/jboss/osgi/spi/testing/HuskyCapability.java 2009-05-20
08:48:24 UTC (rev 89167)
@@ -40,6 +40,6 @@
//props.setProperty("org.jboss.osgi.jmx.host",
System.getProperty("jboss.bind.address", "localhost"));
//props.setProperty("org.jboss.osgi.jmx.rmi.port", "1198");
- addBundle("bundles/jboss-osgi-husky-harness.jar");
+ addBundle("bundles/jboss-osgi-husky.jar");
}
}
\ No newline at end of file