[jboss-osgi-commits] JBoss-OSGI SVN: r94554 - in projects/jboss-osgi/trunk/reactor: framework and 4 other directories.
jboss-osgi-commits at lists.jboss.org
jboss-osgi-commits at lists.jboss.org
Fri Oct 9 04:37:32 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-10-09 04:37:32 -0400 (Fri, 09 Oct 2009)
New Revision: 94554
Added:
projects/jboss-osgi/trunk/reactor/framework/src/test/resources/log4j.xml
Removed:
projects/jboss-osgi/trunk/reactor/framework/src/test/resources/log4j-example.xml
Modified:
projects/jboss-osgi/trunk/reactor/framework/pom.xml
projects/jboss-osgi/trunk/reactor/framework/scripts/assembly-bundles.xml
projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/BundleResolverTest.java
projects/jboss-osgi/trunk/reactor/pom.xml
projects/jboss-osgi/trunk/reactor/remotejmx/pom.xml
Log:
Move framework to jboss-osgi reactor
Modified: projects/jboss-osgi/trunk/reactor/framework/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/pom.xml 2009-10-09 08:33:09 UTC (rev 94553)
+++ projects/jboss-osgi/trunk/reactor/framework/pom.xml 2009-10-09 08:37:32 UTC (rev 94554)
@@ -23,7 +23,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 Runtime - Microcontainer</name>
+ <name>JBossOSGi Framework</name>
<groupId>org.jboss.osgi.runtime</groupId>
<artifactId>jboss-osgi-framework</artifactId>
<packaging>bundle</packaging>
@@ -32,42 +32,24 @@
<parent>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-parent</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <artifactId>jboss-osgi</artifactId>
+ <version>1.0.0.Beta4</version>
</parent>
<!-- Properties -->
<properties>
- <version.aqute.bnd>0.0.356</version.aqute.bnd>
- <version.apache.felix.configadmin>1.0.10</version.apache.felix.configadmin>
- <version.apache.felix.http.jetty>1.0.1</version.apache.felix.http.jetty>
- <version.apache.felix.log>1.0.0</version.apache.felix.log>
- <version.apache.felix.metatype>1.0.2</version.apache.felix.metatype>
<version.jboss.aop>2.1.0.CR3</version.jboss.aop>
<version.jboss.classloading>2.0.7-SNAPSHOT</version.jboss.classloading>
<version.jboss.deployers>2.0.8.GA</version.jboss.deployers>
<version.jboss.logging.log4j>2.1.0.GA</version.jboss.logging.log4j>
- <version.jboss.osgi.apache.xerces>2.9.1.SP2</version.jboss.osgi.apache.xerces>
- <version.jboss.osgi.common>1.0.2-SNAPSHOT</version.jboss.osgi.common>
- <version.jboss.osgi.common-core>2.2.13.GA</version.jboss.osgi.common-core>
- <version.jboss.osgi.hotdeploy>1.0.1</version.jboss.osgi.hotdeploy>
- <version.jboss.osgi.husky>1.0.0</version.jboss.osgi.husky>
- <version.jboss.osgi.jaxb>2.1.10.SP2</version.jboss.osgi.jaxb>
- <version.jboss.osgi.jmx>1.0.1</version.jboss.osgi.jmx>
- <version.jboss.osgi.jndi>1.0.1</version.jboss.osgi.jndi>
- <version.jboss.osgi.runtime.deployers>1.0.2-SNAPSHOT</version.jboss.osgi.runtime.deployers>
- <version.jboss.osgi.spi>1.0.2-SNAPSHOT</version.jboss.osgi.spi>
- <version.jboss.osgi.xml.binding>2.0.1.SP1</version.jboss.osgi.xml.binding>
<version.jboss.microcontainer>2.0.9.GA</version.jboss.microcontainer>
<version.jboss.test>1.1.4.GA</version.jboss.test>
- <version.osgi>r4v42</version.osgi>
</properties>
<dependencies>
<dependency>
<groupId>biz.aQute</groupId>
<artifactId>bnd</artifactId>
- <version>${version.aqute.bnd}</version>
</dependency>
<dependency>
<groupId>org.jboss.aop</groupId>
@@ -166,12 +148,10 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>${version.osgi}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>${version.osgi}</version>
</dependency>
<!-- Test dependencies -->
@@ -196,7 +176,6 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
- <version>${version.apache.felix.configadmin}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -211,24 +190,7 @@
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.http.jetty</artifactId>
- <version>${version.apache.felix.http.jetty}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.log</artifactId>
- <version>${version.apache.felix.log}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -244,7 +206,6 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.metatype</artifactId>
- <version>${version.apache.felix.metatype}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -260,43 +221,36 @@
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-apache-xerces</artifactId>
- <version>${version.jboss.osgi.apache.xerces}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-common</artifactId>
- <version>${version.jboss.osgi.common}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-common-core</artifactId>
- <version>${version.jboss.osgi.common-core}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-husky</artifactId>
- <version>${version.jboss.osgi.husky}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-jaxb</artifactId>
- <version>${version.jboss.osgi.jaxb}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-jmx</artifactId>
- <version>${version.jboss.osgi.jmx}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.osgi.bundles</groupId>
<artifactId>jboss-osgi-xml-binding</artifactId>
- <version>${version.jboss.osgi.xml.binding}</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: projects/jboss-osgi/trunk/reactor/framework/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/scripts/assembly-bundles.xml 2009-10-09 08:33:09 UTC (rev 94553)
+++ projects/jboss-osgi/trunk/reactor/framework/scripts/assembly-bundles.xml 2009-10-09 08:37:32 UTC (rev 94554)
@@ -35,7 +35,6 @@
<include>*:jboss-osgi-jndi:jar</include>
<include>*:jboss-osgi-xml-binding:jar</include>
<include>*:org.apache.felix.configadmin:jar</include>
- <include>*:org.apache.felix.http.jetty:jar</include>
<include>*:org.apache.felix.log:jar</include>
<include>*:org.apache.felix.metatype:jar</include>
</includes>
Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/BundleResolverTest.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/BundleResolverTest.java 2009-10-09 08:33:09 UTC (rev 94553)
+++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/resolver/BundleResolverTest.java 2009-10-09 08:37:32 UTC (rev 94554)
@@ -65,7 +65,7 @@
bundlePaths.add("bundles/jboss-osgi-jndi.jar");
bundlePaths.add("bundles/jboss-osgi-xml-binding.jar");
bundlePaths.add("bundles/org.apache.felix.configadmin.jar");
- bundlePaths.add("bundles/org.apache.felix.http.jetty.jar");
+ //bundlePaths.add("bundles/org.apache.felix.http.jetty.jar");
bundlePaths.add("bundles/org.apache.felix.log.jar");
bundlePaths.add("bundles/org.apache.felix.metatype.jar");
bundlePaths.add("bundles/org.osgi.compendium.jar");
Deleted: projects/jboss-osgi/trunk/reactor/framework/src/test/resources/log4j-example.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/test/resources/log4j-example.xml 2009-10-09 08:33:09 UTC (rev 94553)
+++ projects/jboss-osgi/trunk/reactor/framework/src/test/resources/log4j-example.xml 2009-10-09 08:37:32 UTC (rev 94554)
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
- <!-- ================================= -->
- <!-- Preserve messages in a local file -->
- <!-- ================================= -->
-
- <appender name="FILE" class="org.apache.log4j.FileAppender">
- <param name="File" value="${log4j.output.dir}/test.log"/>
- <param name="Append" value="false"/>
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
- </layout>
- </appender>
-
- <!-- ============================== -->
- <!-- Append messages to the console -->
- <!-- ============================== -->
-
- <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <param name="Target" value="System.out" />
- <param name="Threshold" value="INFO" />
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n" />
- </layout>
- </appender>
-
- <!-- ================ -->
- <!-- Limit categories -->
- <!-- ================ -->
-
- <!-- Show jboss deployer traces
- <category name="org.jboss.deployer">
- <priority value="TRACE" />
- </category>
- -->
-
- <!-- ======================= -->
- <!-- Setup the Root category -->
- <!-- ======================= -->
-
- <root>
- <!--appender-ref ref="CONSOLE"/-->
- <appender-ref ref="FILE"/>
- </root>
-
-</log4j:configuration>
Copied: projects/jboss-osgi/trunk/reactor/framework/src/test/resources/log4j.xml (from rev 94551, projects/jboss-osgi/trunk/reactor/framework/src/test/resources/log4j-example.xml)
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/test/resources/log4j.xml (rev 0)
+++ projects/jboss-osgi/trunk/reactor/framework/src/test/resources/log4j.xml 2009-10-09 08:37:32 UTC (rev 94554)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <!-- ================================= -->
+ <!-- Preserve messages in a local file -->
+ <!-- ================================= -->
+
+ <appender name="FILE" class="org.apache.log4j.FileAppender">
+ <param name="File" value="${log4j.output.dir}/test.log"/>
+ <param name="Append" value="false"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- ============================== -->
+ <!-- Append messages to the console -->
+ <!-- ============================== -->
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <param name="Target" value="System.out" />
+ <param name="Threshold" value="INFO" />
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n" />
+ </layout>
+ </appender>
+
+ <!-- ================ -->
+ <!-- Limit categories -->
+ <!-- ================ -->
+
+ <!-- Show jboss deployer traces
+ <category name="org.jboss.deployer">
+ <priority value="TRACE" />
+ </category>
+ -->
+
+ <!-- ======================= -->
+ <!-- Setup the Root category -->
+ <!-- ======================= -->
+
+ <root>
+ <!--appender-ref ref="CONSOLE"/-->
+ <appender-ref ref="FILE"/>
+ </root>
+
+</log4j:configuration>
Modified: projects/jboss-osgi/trunk/reactor/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/pom.xml 2009-10-09 08:33:09 UTC (rev 94553)
+++ projects/jboss-osgi/trunk/reactor/pom.xml 2009-10-09 08:37:32 UTC (rev 94554)
@@ -42,6 +42,7 @@
</parent>
<modules>
+ <module>framework</module>
<module>blueprint</module>
<module>remotejmx</module>
</modules>
Modified: projects/jboss-osgi/trunk/reactor/remotejmx/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/remotejmx/pom.xml 2009-10-09 08:33:09 UTC (rev 94553)
+++ projects/jboss-osgi/trunk/reactor/remotejmx/pom.xml 2009-10-09 08:37:32 UTC (rev 94554)
@@ -14,7 +14,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 Runtime - JMX Invoker Adaptor Client</name>
+ <name>JBossOSGi Runtime - Invoker Adaptor Client</name>
<groupId>org.jboss.osgi.runtime</groupId>
<artifactId>jmx-invoker-adaptor-client</artifactId>
More information about the jboss-osgi-commits
mailing list