[jboss-osgi-commits] JBoss-OSGI SVN: r87317 - in projects/jboss-osgi/trunk: build/distribution and 53 other directories.
jboss-osgi-commits at lists.jboss.org
jboss-osgi-commits at lists.jboss.org
Wed Apr 15 04:43:19 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-04-15 04:43:19 -0400 (Wed, 15 Apr 2009)
New Revision: 87317
Added:
projects/jboss-osgi/trunk/bundle/logging/
projects/jboss-osgi/trunk/bundle/remotelog/
projects/jboss-osgi/trunk/bundle/target/
projects/jboss-osgi/trunk/bundle/target/pom-transformed.xml
projects/jboss-osgi/trunk/bundle/webconsole/
projects/jboss-osgi/trunk/service/logging/bin/
projects/jboss-osgi/trunk/service/logging/bin/src/
projects/jboss-osgi/trunk/service/logging/bin/src/main/
projects/jboss-osgi/trunk/service/logging/bin/src/main/java/
projects/jboss-osgi/trunk/service/logging/bin/src/main/java/org/
projects/jboss-osgi/trunk/service/logging/bin/src/main/java/org/jboss/
projects/jboss-osgi/trunk/service/logging/bin/src/main/java/org/jboss/osgi/
projects/jboss-osgi/trunk/service/logging/bin/src/main/java/org/jboss/osgi/service/
projects/jboss-osgi/trunk/service/logging/bin/src/main/java/org/jboss/osgi/service/logging/
projects/jboss-osgi/trunk/service/remote-log/bin/
projects/jboss-osgi/trunk/service/remote-log/bin/src/
projects/jboss-osgi/trunk/service/remote-log/bin/src/main/
projects/jboss-osgi/trunk/service/remote-log/bin/src/main/java/
projects/jboss-osgi/trunk/service/remote-log/bin/src/main/java/org/
projects/jboss-osgi/trunk/service/remote-log/bin/src/main/java/org/jboss/
projects/jboss-osgi/trunk/service/remote-log/bin/src/main/java/org/jboss/osgi/
projects/jboss-osgi/trunk/service/remote-log/bin/src/main/java/org/jboss/osgi/service/
projects/jboss-osgi/trunk/service/remote-log/bin/src/main/java/org/jboss/osgi/service/remlog/
projects/jboss-osgi/trunk/service/remote-log/bin/src/main/java/org/jboss/osgi/service/remlog/internal/
projects/jboss-osgi/trunk/service/webconsole/bin/
projects/jboss-osgi/trunk/service/webconsole/bin/src/
projects/jboss-osgi/trunk/service/webconsole/bin/src/main/
projects/jboss-osgi/trunk/service/webconsole/bin/src/main/java/
projects/jboss-osgi/trunk/service/webconsole/bin/src/main/java/org/
projects/jboss-osgi/trunk/service/webconsole/bin/src/main/java/org/apache/
projects/jboss-osgi/trunk/service/webconsole/bin/src/main/java/org/apache/felix/
projects/jboss-osgi/trunk/service/webconsole/bin/src/main/java/org/apache/felix/webconsole/
projects/jboss-osgi/trunk/service/webconsole/bin/src/main/java/org/apache/felix/webconsole/internal/
projects/jboss-osgi/trunk/service/webconsole/bin/src/main/java/org/apache/felix/webconsole/internal/servlet/
projects/jboss-osgi/trunk/service/webconsole/bin/src/main/java/org/jboss/
projects/jboss-osgi/trunk/service/webconsole/bin/src/main/java/org/jboss/osgi/
projects/jboss-osgi/trunk/service/webconsole/bin/src/main/java/org/jboss/osgi/service/
projects/jboss-osgi/trunk/service/webconsole/bin/src/main/java/org/jboss/osgi/service/webconsole/
projects/jboss-osgi/trunk/service/webconsole/bin/src/main/java/org/jboss/osgi/service/webconsole/internal/
projects/jboss-osgi/trunk/service/webconsole/bin/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/
projects/jboss-osgi/trunk/service/webconsole/bin/src/main/resources/
projects/jboss-osgi/trunk/service/webconsole/bin/src/main/resources/OSGI-INF/
projects/jboss-osgi/trunk/service/webconsole/bin/src/main/resources/OSGI-INF/metatype/
projects/jboss-osgi/trunk/service/webconsole/bin/src/main/resources/res/
projects/jboss-osgi/trunk/service/webconsole/bin/src/main/resources/res/imgs/
projects/jboss-osgi/trunk/service/webconsole/bin/src/main/resources/res/ui/
projects/jboss-osgi/trunk/target/
projects/jboss-osgi/trunk/target/pom-transformed.xml
Removed:
projects/jboss-osgi/trunk/service/.project
projects/jboss-osgi/trunk/service/.settings/
projects/jboss-osgi/trunk/service/logging/.classpath
projects/jboss-osgi/trunk/service/logging/.settings/
projects/jboss-osgi/trunk/service/logging/pom.xml
projects/jboss-osgi/trunk/service/logging/src/
projects/jboss-osgi/trunk/service/pom.xml
projects/jboss-osgi/trunk/service/remote-log/.classpath
projects/jboss-osgi/trunk/service/remote-log/.settings/
projects/jboss-osgi/trunk/service/remote-log/pom.xml
projects/jboss-osgi/trunk/service/remote-log/src/
projects/jboss-osgi/trunk/service/webconsole/.classpath
projects/jboss-osgi/trunk/service/webconsole/.settings/
projects/jboss-osgi/trunk/service/webconsole/pom.xml
projects/jboss-osgi/trunk/service/webconsole/src/
Modified:
projects/jboss-osgi/trunk/build/distribution/pom.xml
projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml
projects/jboss-osgi/trunk/bundle/common/pom.xml
projects/jboss-osgi/trunk/bundle/logging/pom.xml
projects/jboss-osgi/trunk/bundle/pom.xml
projects/jboss-osgi/trunk/bundle/remotelog/pom.xml
projects/jboss-osgi/trunk/bundle/webconsole/pom.xml
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/runtime/equinox/pom.xml
projects/jboss-osgi/trunk/runtime/felix/pom.xml
projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml
projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml
projects/jboss-osgi/trunk/service/remote-log/.project
projects/jboss-osgi/trunk/testsuite/pom.xml
projects/jboss-osgi/trunk/testsuite/scripts/assembly-bundles.xml
projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/example/log/LogServiceRemoteTestCase.java
Log:
Migrate services to bundles
Modified: projects/jboss-osgi/trunk/build/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-04-15 04:02:54 UTC (rev 87316)
+++ projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-04-15 08:43:19 UTC (rev 87317)
@@ -41,45 +41,45 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-deployer</artifactId>
+ <artifactId>jboss-osgi-logging</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-deployer</artifactId>
+ <artifactId>jboss-osgi-logging</artifactId>
<classifier>sources</classifier>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-spi</artifactId>
+ <artifactId>jboss-osgi-runtime-deployer</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-spi</artifactId>
+ <artifactId>jboss-osgi-runtime-deployer</artifactId>
<classifier>sources</classifier>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-service-webconsole</artifactId>
+ <artifactId>jboss-osgi-runtime-spi</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-service-webconsole</artifactId>
+ <artifactId>jboss-osgi-runtime-spi</artifactId>
<classifier>sources</classifier>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-service-logging</artifactId>
+ <artifactId>jboss-osgi-webconsole</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-service-logging</artifactId>
+ <artifactId>jboss-osgi-webconsole</artifactId>
<classifier>sources</classifier>
<version>${version}</version>
</dependency>
Modified: projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml 2009-04-15 04:02:54 UTC (rev 87316)
+++ projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml 2009-04-15 08:43:19 UTC (rev 87317)
@@ -117,8 +117,8 @@
<include name="jboss-osgi-runtime-deployer.jar" />
<include name="jboss-osgi-runtime-felix.jar" />
<include name="jboss-osgi-runtime-spi.jar" />
- <include name="jboss-osgi-service-logging.jar" />
- <include name="jboss-osgi-service-webconsole.jar" />
+ <include name="jboss-osgi-logging.jar" />
+ <include name="jboss-osgi-webconsole.jar" />
<include name="org.apache.felix.framework.jar" />
<include name="org.apache.felix.configadmin.jar" />
<include name="org.apache.felix.http.jetty.jar" />
@@ -133,8 +133,8 @@
<include name="jboss-osgi-runtime-deployer-sources.jar" />
<include name="jboss-osgi-runtime-felix-sources.jar" />
<include name="jboss-osgi-runtime-spi-sources.jar" />
- <include name="jboss-osgi-service-logging-sources.jar" />
- <include name="jboss-osgi-service-webconsole-sources.jar" />
+ <include name="jboss-osgi-logging-sources.jar" />
+ <include name="jboss-osgi-webconsole-sources.jar" />
</fileset>
</pack>
@@ -168,8 +168,8 @@
<include name="org.apache.felix.log.jar" />
<include name="org.apache.felix.metatype.jar" />
<include name="jboss-osgi-common.jar" />
- <include name="jboss-osgi-service-logging.jar" />
- <include name="jboss-osgi-service-webconsole.jar" />
+ <include name="jboss-osgi-logging.jar" />
+ <include name="jboss-osgi-webconsole.jar" />
</fileset>
<!-- Felix Integration -->
@@ -244,8 +244,8 @@
<include name="org.apache.felix.log.jar" />
<include name="org.apache.felix.metatype.jar" />
<include name="jboss-osgi-common.jar" />
- <include name="jboss-osgi-service-logging.jar" />
- <include name="jboss-osgi-service-webconsole.jar" />
+ <include name="jboss-osgi-logging.jar" />
+ <include name="jboss-osgi-webconsole.jar" />
</fileset>
<!-- Felix Integration -->
Modified: projects/jboss-osgi/trunk/bundle/common/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/common/pom.xml 2009-04-15 04:02:54 UTC (rev 87316)
+++ projects/jboss-osgi/trunk/bundle/common/pom.xml 2009-04-15 08:43:19 UTC (rev 87317)
@@ -37,10 +37,7 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Bundle-Name>JBossOSGi Common</Bundle-Name>
- <Bundle-Vendor>JBoss, a division of RedHat</Bundle-Vendor>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Bundle-Version>${version}</Bundle-Version>
<Export-Package>
org.jboss.osgi.common,
org.jboss.osgi.common.log
Copied: projects/jboss-osgi/trunk/bundle/logging (from rev 87316, projects/jboss-osgi/trunk/service/logging)
Property changes on: projects/jboss-osgi/trunk/bundle/logging
___________________________________________________________________
Name: svn:ignore
+ target
Name: svn:mergeinfo
+
Modified: projects/jboss-osgi/trunk/bundle/logging/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/service/logging/pom.xml 2009-04-15 04:02:54 UTC (rev 87316)
+++ projects/jboss-osgi/trunk/bundle/logging/pom.xml 2009-04-15 08:43:19 UTC (rev 87317)
@@ -2,16 +2,16 @@
<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 - Service Logging</name>
+ <name>JBossOSGi - Bundle Logging</name>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-service-logging</artifactId>
+ <artifactId>jboss-osgi-logging</artifactId>
<packaging>bundle</packaging>
<!-- Parent -->
<parent>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-service</artifactId>
+ <artifactId>jboss-osgi-bundle</artifactId>
<version>1.0.0.Beta1</version>
</parent>
@@ -36,6 +36,11 @@
<artifactId>jboss-logging-spi</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-common</artifactId>
+ <version>${version}</version>
+ </dependency>
</dependencies>
<build>
Modified: projects/jboss-osgi/trunk/bundle/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/pom.xml 2009-04-15 04:02:54 UTC (rev 87316)
+++ projects/jboss-osgi/trunk/bundle/pom.xml 2009-04-15 08:43:19 UTC (rev 87317)
@@ -11,8 +11,12 @@
<version>1.0.0.Beta1</version>
</parent>
+ <!-- Modules -->
<modules>
<module>common</module>
+ <module>logging</module>
+ <module>remotelog</module>
+ <module>webconsole</module>
</modules>
</project>
Copied: projects/jboss-osgi/trunk/bundle/remotelog (from rev 87316, projects/jboss-osgi/trunk/service/remote-log)
Modified: projects/jboss-osgi/trunk/bundle/remotelog/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/service/remote-log/pom.xml 2009-04-15 04:02:54 UTC (rev 87316)
+++ projects/jboss-osgi/trunk/bundle/remotelog/pom.xml 2009-04-15 08:43:19 UTC (rev 87317)
@@ -2,16 +2,16 @@
<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 - Service Remote Logging</name>
+ <name>JBossOSGi - Bundle Remote Logging</name>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-service-remote-log</artifactId>
+ <artifactId>jboss-osgi-remotelog</artifactId>
<packaging>bundle</packaging>
<!-- Parent -->
<parent>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-service</artifactId>
+ <artifactId>jboss-osgi-bundle</artifactId>
<version>1.0.0.Beta1</version>
</parent>
Added: projects/jboss-osgi/trunk/bundle/target/pom-transformed.xml
===================================================================
--- projects/jboss-osgi/trunk/bundle/target/pom-transformed.xml (rev 0)
+++ projects/jboss-osgi/trunk/bundle/target/pom-transformed.xml 2009-04-15 08:43:19 UTC (rev 87317)
@@ -0,0 +1,22 @@
+<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</name>
+ <artifactId>jboss-osgi-bundle</artifactId>
+ <packaging>pom</packaging>
+
+ <parent>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi</artifactId>
+ <version>1.0.0.Beta1</version>
+ </parent>
+
+ <!-- Modules -->
+ <modules>
+ <module>common</module>
+ <module>logging</module>
+ <module>remotelog</module>
+ <module>webconsole</module>
+ </modules>
+
+</project>
Property changes on: projects/jboss-osgi/trunk/bundle/target/pom-transformed.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: projects/jboss-osgi/trunk/bundle/webconsole (from rev 87316, projects/jboss-osgi/trunk/service/webconsole)
Property changes on: projects/jboss-osgi/trunk/bundle/webconsole
___________________________________________________________________
Name: svn:ignore
+ target
Name: svn:mergeinfo
+
Modified: projects/jboss-osgi/trunk/bundle/webconsole/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/service/webconsole/pom.xml 2009-04-15 04:02:54 UTC (rev 87316)
+++ projects/jboss-osgi/trunk/bundle/webconsole/pom.xml 2009-04-15 08:43:19 UTC (rev 87317)
@@ -1,16 +1,16 @@
<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 - Service WebConsole</name>
- <description>JBossOSGi - WebConsole Service</description>
+ <name>JBossOSGi - Bundle WebConsole</name>
+ <description>JBossOSGi - WebConsole</description>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-service-webconsole</artifactId>
+ <artifactId>jboss-osgi-webconsole</artifactId>
<packaging>bundle</packaging>
<parent>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi</artifactId>
+ <artifactId>jboss-osgi-bundle</artifactId>
<version>1.0.0.Beta1</version>
</parent>
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-04-15 04:02:54 UTC (rev 87316)
+++ projects/jboss-osgi/trunk/pom.xml 2009-04-15 08:43:19 UTC (rev 87317)
@@ -15,7 +15,7 @@
<version>4</version>
</parent>
- <url>http://www.jboss.org/jbossmc</url>
+ <url>http://www.jboss.org/community/wiki/JBossOSGi</url>
<description>JBossOSGi</description>
<scm>
@@ -30,7 +30,6 @@
<module>repository</module>
<module>runtime</module>
<module>bundle</module>
- <module>service</module>
<module>testsuite</module>
</modules>
Modified: projects/jboss-osgi/trunk/runtime/equinox/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/pom.xml 2009-04-15 04:02:54 UTC (rev 87316)
+++ projects/jboss-osgi/trunk/runtime/equinox/pom.xml 2009-04-15 08:43:19 UTC (rev 87317)
@@ -17,7 +17,6 @@
<!-- Properties -->
<properties>
- <surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/resources/tst.policy</surefire.security.args>
</properties>
<!-- Dependencies -->
@@ -61,30 +60,9 @@
<directory>src/test/resources</directory>
<filtering>true</filtering>
</testResource>
- <testResource>
- <directory>src/testsuite/resources</directory>
- </testResource>
</testResources>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-test-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>src/testsuite</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
@@ -103,16 +81,6 @@
</executions>
</plugin>
<plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>src/testsuite</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<excludes>
@@ -123,71 +91,8 @@
</plugins>
</build>
+ <!-- Profiles -->
<profiles>
-
- <!--
- Name: framework-equinox
- Descr: Setup for Equinox integration testing
- -->
- <profile>
- <id>framework-equinox</id>
- <activation>
- <property>
- <name>framework</name>
- <value>equinox</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-testsuite</artifactId>
- <version>${version}</version>
- <type>zip</type>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-testsuite</artifactId>
- <type>zip</type>
- <outputDirectory>src/testsuite</outputDirectory>
- <excludes>test-libs/**</excludes>
- </artifactItem>
- <artifactItem>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-testsuite</artifactId>
- <type>zip</type>
- <outputDirectory>target</outputDirectory>
- <includes>test-libs/**</includes>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>org/jboss/test/osgi/equinox/**</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
</profiles>
</project>
Modified: projects/jboss-osgi/trunk/runtime/felix/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-04-15 04:02:54 UTC (rev 87316)
+++ projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-04-15 08:43:19 UTC (rev 87317)
@@ -17,7 +17,6 @@
<!-- Properties -->
<properties>
- <surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/resources/tst.policy</surefire.security.args>
</properties>
<!-- Dependencies -->
@@ -56,30 +55,9 @@
<directory>src/test/resources</directory>
<filtering>true</filtering>
</testResource>
- <testResource>
- <directory>src/testsuite/resources</directory>
- </testResource>
</testResources>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-test-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>src/testsuite</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
@@ -98,16 +76,6 @@
</executions>
</plugin>
<plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>src/testsuite</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<excludes>
@@ -120,134 +88,6 @@
<!-- Profiles -->
<profiles>
-
- <!--
- Name: framework-felix
- Descr: Setup for Felix integration testing
- -->
- <profile>
- <id>framework-felix</id>
- <activation>
- <property>
- <name>framework</name>
- <value>felix</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-testsuite</artifactId>
- <version>${version}</version>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-common</artifactId>
- <version>${version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-service-remote-log</artifactId>
- <version>${version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-testsuite</artifactId>
- <type>zip</type>
- <outputDirectory>src/testsuite</outputDirectory>
- <excludes>test-libs/**</excludes>
- </artifactItem>
- <artifactItem>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-testsuite</artifactId>
- <type>zip</type>
- <outputDirectory>target</outputDirectory>
- <includes>test-libs/**</includes>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
- Name: embedded-tesing
- Descr: Setup for embedded integration testing
- -->
- <profile>
- <id>embedded-tesing</id>
- <activation>
- <property>
- <name>!jboss.bind.address</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <!-- Exclude tests that require remote access -->
- <exclude>org/jboss/test/osgi/deployer/**</exclude>
- <exclude>org/jboss/test/osgi/**/*RemoteTestCase.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
- Name: remote-tesing
- Descr: Setup for remote integration testing
- -->
- <profile>
- <id>remote-tesing</id>
- <activation>
- <property>
- <name>jboss.bind.address</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-client</artifactId>
- <scope>test</scope>
- <type>pom</type>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${surefire.security.args}</argLine>
- <excludes>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
</profiles>
</project>
Modified: projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml 2009-04-15 04:02:54 UTC (rev 87316)
+++ projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml 2009-04-15 08:43:19 UTC (rev 87317)
@@ -51,7 +51,7 @@
<list elementClass="java.net.URI">
<value>${jboss.server.home.url}/deploy/osgi/org.osgi.compendium.jar</value>
<value>${jboss.server.home.url}/deploy/osgi/jboss-osgi-common.jar</value>
- <value>${jboss.server.home.url}/deploy/osgi/jboss-osgi-service-logging.jar</value>
+ <value>${jboss.server.home.url}/deploy/osgi/jboss-osgi-logging.jar</value>
</list>
</property>
</bean>
Modified: projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml 2009-04-15 04:02:54 UTC (rev 87316)
+++ projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml 2009-04-15 08:43:19 UTC (rev 87317)
@@ -17,7 +17,6 @@
<!-- Properties -->
<properties>
- <surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/resources/tst.policy</surefire.security.args>
</properties>
<!-- Dependencies -->
@@ -61,30 +60,9 @@
<directory>src/test/resources</directory>
<filtering>true</filtering>
</testResource>
- <testResource>
- <directory>src/testsuite/resources</directory>
- </testResource>
</testResources>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>add-test-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-test-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>src/testsuite</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
@@ -103,16 +81,6 @@
</executions>
</plugin>
<plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <configuration>
- <filesets>
- <fileset>
- <directory>src/testsuite</directory>
- </fileset>
- </filesets>
- </configuration>
- </plugin>
- <plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<excludes>
@@ -123,71 +91,8 @@
</plugins>
</build>
+ <!-- Profiles -->
<profiles>
-
- <!--
- Name: framework-knopflerfish
- Descr: Setup for Knopflerfish integration testing
- -->
- <profile>
- <id>framework-knopflerfish</id>
- <activation>
- <property>
- <name>framework</name>
- <value>knopflerfish</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-testsuite</artifactId>
- <version>${version}</version>
- <type>zip</type>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-testsuite</artifactId>
- <type>zip</type>
- <outputDirectory>src/testsuite</outputDirectory>
- <excludes>test-libs/**</excludes>
- </artifactItem>
- <artifactItem>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-testsuite</artifactId>
- <type>zip</type>
- <outputDirectory>target</outputDirectory>
- <includes>test-libs/**</includes>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>org/jboss/test/osgi/knopflerfish/**</include>
- </includes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
</profiles>
</project>
Deleted: projects/jboss-osgi/trunk/service/.project
===================================================================
--- projects/jboss-osgi/trunk/service/.project 2009-04-15 04:02:54 UTC (rev 87316)
+++ projects/jboss-osgi/trunk/service/.project 2009-04-15 08:43:19 UTC (rev 87317)
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>jboss-osgi-service</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.maven.ide.eclipse.maven2Builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.maven.ide.eclipse.maven2Nature</nature>
- </natures>
-</projectDescription>
Deleted: projects/jboss-osgi/trunk/service/logging/.classpath
===================================================================
--- projects/jboss-osgi/trunk/service/logging/.classpath 2009-04-15 04:02:54 UTC (rev 87316)
+++ projects/jboss-osgi/trunk/service/logging/.classpath 2009-04-15 08:43:19 UTC (rev 87317)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
Deleted: projects/jboss-osgi/trunk/service/logging/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/service/logging/pom.xml 2009-04-15 04:02:54 UTC (rev 87316)
+++ projects/jboss-osgi/trunk/service/logging/pom.xml 2009-04-15 08:43:19 UTC (rev 87317)
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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 - Service Logging</name>
-
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-service-logging</artifactId>
- <packaging>bundle</packaging>
-
- <!-- Parent -->
- <parent>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-service</artifactId>
- <version>1.0.0.Beta1</version>
- </parent>
-
- <!-- Properties -->
- <properties>
- </properties>
-
- <!-- Dependencies -->
- <dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>org.jboss.osgi.service.logging</Bundle-SymbolicName>
- <Bundle-Activator>org.jboss.osgi.service.logging.LoggingServiceActivator</Bundle-Activator>
- <Private-Package>org.jboss.osgi.service.logging</Private-Package>
- <Import-Package>
- org.jboss.logging,
- org.osgi.framework,
- org.osgi.service.log,
- org.osgi.util.tracker
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
Deleted: projects/jboss-osgi/trunk/service/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/service/pom.xml 2009-04-15 04:02:54 UTC (rev 87316)
+++ projects/jboss-osgi/trunk/service/pom.xml 2009-04-15 08:43:19 UTC (rev 87317)
@@ -1,20 +0,0 @@
-<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 - Service</name>
- <artifactId>jboss-osgi-service</artifactId>
- <packaging>pom</packaging>
-
- <parent>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi</artifactId>
- <version>1.0.0.Beta1</version>
- </parent>
-
- <modules>
- <module>logging</module>
- <module>remote-log</module>
- <module>webconsole</module>
- </modules>
-
-</project>
Deleted: projects/jboss-osgi/trunk/service/remote-log/.classpath
===================================================================
--- projects/jboss-osgi/trunk/service/remote-log/.classpath 2009-04-15 04:02:54 UTC (rev 87316)
+++ projects/jboss-osgi/trunk/service/remote-log/.classpath 2009-04-15 08:43:19 UTC (rev 87317)
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
Modified: projects/jboss-osgi/trunk/service/remote-log/.project
===================================================================
--- projects/jboss-osgi/trunk/service/remote-log/.project 2009-04-15 04:02:54 UTC (rev 87316)
+++ projects/jboss-osgi/trunk/service/remote-log/.project 2009-04-15 08:43:19 UTC (rev 87317)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>jboss-osgi-service-remlog</name>
+ <name>jboss-osgi-service-remote-log</name>
<comment></comment>
<projects>
</projects>
Deleted: projects/jboss-osgi/trunk/service/remote-log/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/service/remote-log/pom.xml 2009-04-15 04:02:54 UTC (rev 87316)
+++ projects/jboss-osgi/trunk/service/remote-log/pom.xml 2009-04-15 08:43:19 UTC (rev 87317)
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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 - Service Remote Logging</name>
-
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-service-remote-log</artifactId>
- <packaging>bundle</packaging>
-
- <!-- Parent -->
- <parent>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-service</artifactId>
- <version>1.0.0.Beta1</version>
- </parent>
-
- <!-- Properties -->
- <properties>
- <version.concurrent>1.3.4</version.concurrent>
- <version.jboss.remoting>2.5.0.SP2</version.jboss.remoting>
- <version.jboss.serialization>1.0.3.GA</version.jboss.serialization>
- </properties>
-
- <!-- Dependencies -->
- <dependencies>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-spi</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- Remoting Dependencies -->
- <dependency>
- <groupId>org.jboss.remoting</groupId>
- <artifactId>jboss-remoting-core</artifactId>
- <version>${version.jboss.remoting}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.remoting</groupId>
- <artifactId>jboss-remoting-socket</artifactId>
- <version>${version.jboss.remoting}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.remoting</groupId>
- <artifactId>jboss-remoting-socket-client</artifactId>
- <version>${version.jboss.remoting}</version>
- </dependency>
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-serialization</artifactId>
- <version>${version.jboss.serialization}</version>
- </dependency>
- <dependency>
- <groupId>concurrent</groupId>
- <artifactId>concurrent</artifactId>
- <version>${version.concurrent}</version>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>org.jboss.osgi.service.remote.log</Bundle-SymbolicName>
- <Bundle-Activator>org.jboss.osgi.service.remlog.RemoteLogActivator</Bundle-Activator>
- <Export-Package>org.jboss.osgi.service.remlog;version=${version}</Export-Package>
- <Import-Package>
- org.osgi.framework,
- org.osgi.service.log,
- org.osgi.util.tracker,
-
- javax.crypto;resolution:=optional,
- javax.crypto.spec;resolution:=optional,
- javax.management,
- javax.naming,
- javax.net,
- javax.net.ssl,
- javax.servlet;resolution:=optional,
- javax.servlet.http;resolution:=optional,
- org.apache.log4j,
- org.jboss.logging,
- org.jboss.mx.util;resolution:=optional,
- org.jboss.remoting;resolution:=optional,
- org.jboss.remoting.*;resolution:=optional,
- org.jboss.util.*,
- org.w3c.dom;resolution:=optional,
-
- <!-- jboss-serialization -->
- gnu.trove;resolution:=optional,
- sun.misc;resolution:=optional,
- sun.reflect;resolution:=optional,
-
- <!-- concurrent -->
- javax.swing;resolution:=optional,
- javax.swing.border;resolution:=optional
- </Import-Package>
- <Embed-Dependency>
- concurrent,
- jboss-remoting-core,
- jboss-remoting-socket,
- jboss-remoting-socket-client,
- jboss-serialization
- </Embed-Dependency>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
Deleted: projects/jboss-osgi/trunk/service/webconsole/.classpath
===================================================================
--- projects/jboss-osgi/trunk/service/webconsole/.classpath 2009-04-15 04:02:54 UTC (rev 87316)
+++ projects/jboss-osgi/trunk/service/webconsole/.classpath 2009-04-15 08:43:19 UTC (rev 87317)
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
Deleted: projects/jboss-osgi/trunk/service/webconsole/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/service/webconsole/pom.xml 2009-04-15 04:02:54 UTC (rev 87316)
+++ projects/jboss-osgi/trunk/service/webconsole/pom.xml 2009-04-15 08:43:19 UTC (rev 87317)
@@ -1,145 +0,0 @@
-<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 - Service WebConsole</name>
- <description>JBossOSGi - WebConsole Service</description>
-
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-service-webconsole</artifactId>
- <packaging>bundle</packaging>
-
- <parent>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi</artifactId>
- <version>1.0.0.Beta1</version>
- </parent>
-
- <!-- Dependencies -->
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <version>1.1.1</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>1.4</version>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.webconsole</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>20070829</version>
- <scope>compile</scope>
- <optional>true</optional>
- </dependency>
-
- <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>
- </dependencies>
-
- <!-- Build -->
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <showDeprecation>false</showDeprecation>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy</id>
- <phase>process-resources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.webconsole</artifactId>
- <type>jar</type>
- <outputDirectory>target/classes</outputDirectory>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Bundle-Vendor>JBoss, a division of RedHat</Bundle-Vendor>
- <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Bundle-Activator>org.jboss.osgi.service.webconsole.internal.WebConsoleActivator</Bundle-Activator>
- <Export-Package>
- org.apache.felix.webconsole;version=${version.felix.webconsole},
- org.osgi.service.obr
- </Export-Package>
- <Private-Package>
- !org.apache.felix.webconsole,
- org.apache.felix.webconsole.*,
- org.jboss.osgi.service.webconsole.internal,
- org.jboss.osgi.service.webconsole.internal.*
- </Private-Package>
- <Import-Package>
- org.apache.felix.scr;
- org.apache.felix.shell;
- org.osgi.service.*;resolution:=optional,
- javax.portlet;resolution:=optional,*
- </Import-Package>
- <Embed-Dependency>
- <!-- Import/Export-Package parsing, OBR -->
- org.apache.felix.bundlerepository,
- <!-- Required for JSON data transfer -->
- json,
- <!-- File Upload functionality -->
- commons-fileupload,
- <!-- Required by FileUpload and Util -->
- commons-io
- </Embed-Dependency>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
Added: projects/jboss-osgi/trunk/target/pom-transformed.xml
===================================================================
--- projects/jboss-osgi/trunk/target/pom-transformed.xml (rev 0)
+++ projects/jboss-osgi/trunk/target/pom-transformed.xml 2009-04-15 08:43:19 UTC (rev 87317)
@@ -0,0 +1,457 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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</name>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi</artifactId>
+ <packaging>pom</packaging>
+
+ <version>1.0.0.Beta1</version>
+
+ <parent>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>4</version>
+ </parent>
+
+ <url>http://www.jboss.org/community/wiki/JBossOSGi</url>
+ <description>JBossOSGi</description>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/trunk/</developerConnection>
+ <url>http://fisheye.jboss.com/qsearch/JBossOSGi/</url>
+ </scm>
+
+ <!-- Modules -->
+ <modules>
+ <module>microcontainer</module>
+ <module>repository</module>
+ <module>runtime</module>
+ <module>bundle</module>
+ <module>testsuite</module>
+ </modules>
+
+ <!-- Properties -->
+ <properties>
+ <version.aqute.bnd>0.0.315</version.aqute.bnd>
+ <version.equinox>3.4.2</version.equinox>
+ <version.felix.configadmin>1.0.10</version.felix.configadmin>
+ <version.felix.framework>1.4.1</version.felix.framework>
+ <version.felix.http.jetty>0.9.0-20090218-R745505</version.felix.http.jetty>
+ <version.felix.javax.servlet>1.0.0</version.felix.javax.servlet>
+ <version.felix.log>0.9.0-20090211-R743531</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.webconsole>1.2.8</version.felix.webconsole>
+ <version.izpack>4.2.0</version.izpack>
+ <version.javax.servlet>2.4</version.javax.servlet>
+ <version.jbossas>5.0.1.GA</version.jbossas>
+ <version.jboss.aop>2.0.1.GA</version.jboss.aop>
+ <version.jboss.common.core>2.2.11.GA</version.jboss.common.core>
+ <version.jboss.deployers>2.0.5.GA</version.jboss.deployers>
+ <version.jboss.jacc>1.1.0.GA</version.jboss.jacc>
+ <version.jboss.jdocbook.plugin>2.1.2</version.jboss.jdocbook.plugin>
+ <version.jboss.jdocbook.style>1.1.0</version.jboss.jdocbook.style>
+ <version.jboss.logging.spi>2.0.5.GA</version.jboss.logging.spi>
+ <version.jboss.logging.log4j>2.0.5.GA</version.jboss.logging.log4j>
+ <version.jboss.metadata>1.0.0.CR11</version.jboss.metadata>
+ <version.jboss.microcontainer>2.0.4.GA</version.jboss.microcontainer>
+ <version.jboss.test>1.0.5.GA</version.jboss.test>
+ <version.junit>4.4</version.junit>
+ <version.knopflerfish>2.2.0</version.knopflerfish>
+ <version.log4j>1.2.14</version.log4j>
+ <version.osgi>r4v41</version.osgi>
+ </properties>
+
+ <!-- DependencyManagement -->
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>biz.aQute</groupId>
+ <artifactId>bnd</artifactId>
+ <version>0.0.315</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.izpack</groupId>
+ <artifactId>izpack-standalone-compiler</artifactId>
+ <version>4.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ <version>2.2.11.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ <version>2.0.1.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-client</artifactId>
+ <version>2.0.5.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-client-spi</artifactId>
+ <version>2.0.5.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-structure-spi</artifactId>
+ <version>2.0.5.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs-spi</artifactId>
+ <version>2.0.5.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs</artifactId>
+ <version>2.0.5.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jacc-api</artifactId>
+ <version>1.1.0.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-server</artifactId>
+ <version>5.0.1.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-system-jmx</artifactId>
+ <version>5.0.1.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-client</artifactId>
+ <version>5.0.1.GA</version>
+ <type>pom</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ <version>2.0.5.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ <version>2.0.5.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata</artifactId>
+ <version>1.0.0.CR11</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <version>2.0.4.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-aop-mc-int</artifactId>
+ <version>2.0.4.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>r4v41</version>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>r4v41</version>
+ </dependency>
+
+ <!-- Equinox Dependencies -->
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
+ <version>3.4.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>org.eclipse.osgi.services</artifactId>
+ <version>3.4.2</version>
+ </dependency>
+
+ <!-- Felix Dependencies -->
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>javax.servlet</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>1.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>1.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.configadmin</artifactId>
+ <version>1.0.10</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.framework</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.http.jetty</artifactId>
+ <version>0.9.0-20090218-R745505</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.log</artifactId>
+ <version>0.9.0-20090211-R743531</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.metatype</artifactId>
+ <version>1.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.webconsole</artifactId>
+ <version>1.2.8</version>
+ </dependency>
+
+ <!-- Equinox Dependencies -->
+ <dependency>
+ <groupId>org.knopflerfish</groupId>
+ <artifactId>org.knopflerfish.framework</artifactId>
+ <version>2.2.0</version>
+ </dependency>
+
+ <!-- Test Dependencies -->
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-test</artifactId>
+ <version>1.0.5.GA</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-impl</artifactId>
+ <version>2.0.5.GA</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+
+ <!-- Plugins -->
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <showDeprecation>true</showDeprecation>
+ <showWarnings>true</showWarnings>
+ <optimize>true</optimize>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <tagBase>https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/tags</tagBase>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ <!-- PluginManagement -->
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <artifactId>maven-idea-plugin</artifactId>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <redirectTestOutputToFile>false</redirectTestOutputToFile>
+ <failIfNoTests>false</failIfNoTests>
+ <systemProperties>
+ <property>
+ <name>log4j.output.dir</name>
+ <value>${basedir}/target</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
+ <!-- Repositories -->
+ <repositories>
+ <repository>
+ <id>aQute</id>
+ <url>http://www.aQute.biz/repo</url>
+ </repository>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <layout>default</layout>
+ <url>http://repository.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshots Repository</name>
+ <layout>default</layout>
+ <url>http://snapshots.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </repository>
+ </repositories>
+
+ <!-- PluginRepositories -->
+ <pluginRepositories>
+ <pluginRepository>
+ <id>repository.jboss.org</id>
+ <url>http://repository.jboss.org/maven2</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <!-- Reporting -->
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>dependencies</report>
+ <report>issue-tracking</report>
+ <report>license</report>
+ <report>scm</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>findbugs-maven-plugin</artifactId>
+ <version>1.0.0</version>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <profiles>
+
+ <!--
+ Name: default
+ Desc: The default profile
+ -->
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <microcontainer.outputDirectory>target/classes</microcontainer.outputDirectory>
+ <microcontainer.testOutputDirectory>target/tests-classes</microcontainer.testOutputDirectory>
+ </properties>
+ </profile>
+
+ <!--
+ Name: distro
+ Desc: Build the distribution
+ -->
+ <profile>
+ <id>distro</id>
+ <modules>
+ <module>build/distribution</module>
+ <module>build/docbook</module>
+ </modules>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: eclipse
+ Desc: The eclipse profile
+ -->
+ <profile>
+ <id>eclipse</id>
+ <build>
+ <defaultGoal>process-test-resources</defaultGoal>
+ <plugins>
+ <plugin>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>eclipse</id>
+ <phase>process-test-resources</phase>
+ <goals>
+ <goal>eclipse</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <downloadSources>true</downloadSources>
+ <buildOutputDirectory>${microcontainer.outputDirectory}</buildOutputDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <properties>
+ <microcontainer.outputDirectory>eclipse-target/classes</microcontainer.outputDirectory>
+ <microcontainer.testOutputDirectory>eclipse-target/tests-classes</microcontainer.testOutputDirectory>
+ </properties>
+ </profile>
+ </profiles>
+
+</project>
Property changes on: projects/jboss-osgi/trunk/target/pom-transformed.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-04-15 04:02:54 UTC (rev 87316)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-04-15 08:43:19 UTC (rev 87317)
@@ -60,7 +60,7 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-service-remote-log</artifactId>
+ <artifactId>jboss-osgi-remotelog</artifactId>
<version>${version}</version>
<scope>provided</scope>
</dependency>
@@ -127,70 +127,86 @@
<profiles>
<!--
- Name: framework-any
- Descr: Create the testsuite.zip and skip tests
- -->
+ Name: framework-default
+ Descr: Setup for default framework integration testing
+ -->
<profile>
- <id>framework-any</id>
+ <id>framework-default</id>
<activation>
<property>
- <name>framework</name>
+ <name>!framework</name>
</property>
</activation>
<dependencies>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-felix</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-felix</artifactId>
+ <version>${version}</version>
+ <classifier>config</classifier>
</dependency>
</dependencies>
+ </profile>
+
+ <!--
+ Name: framework-felix
+ Descr: Setup for Felix framework integration testing
+ -->
+ <profile>
+ <id>framework-felix</id>
+ <activation>
+ <property>
+ <name>!framework</name>
+ <value>felix</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-felix</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-felix</artifactId>
+ <version>${version}</version>
+ <classifier>config</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <!--
+ Name: framework-equinox
+ Descr: Setup for Equinox framework integration testing
+ -->
+ <profile>
+ <id>framework-equinox</id>
+ <activation>
+ <property>
+ <name>!framework</name>
+ <value>equinox</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-equinox</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-equinox</artifactId>
+ <version>${version}</version>
+ <classifier>config</classifier>
+ </dependency>
+ </dependencies>
<build>
<plugins>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>testsuite</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>scripts/assembly-testsuite.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>target/${project.artifactId}-${project.version}.zip</file>
- <type>zip</type>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skipTests>true</skipTests>
@@ -201,29 +217,40 @@
</profile>
<!--
- Name: framework-default
- Descr: Setup for default framework integration testing
+ Name: framework-knopflerfish
+ Descr: Setup for Equinox framework integration testing
-->
<profile>
- <id>framework-default</id>
+ <id>framework-knopflerfish</id>
<activation>
<property>
<name>!framework</name>
+ <value>knopflerfish</value>
</property>
</activation>
<dependencies>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-felix</artifactId>
+ <artifactId>jboss-osgi-runtime-knopflerfish</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-felix</artifactId>
+ <artifactId>jboss-osgi-runtime-knopflerfish</artifactId>
<version>${version}</version>
<classifier>config</classifier>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</profile>
<!--
Modified: projects/jboss-osgi/trunk/testsuite/scripts/assembly-bundles.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/scripts/assembly-bundles.xml 2009-04-15 04:02:54 UTC (rev 87316)
+++ projects/jboss-osgi/trunk/testsuite/scripts/assembly-bundles.xml 2009-04-15 08:43:19 UTC (rev 87317)
@@ -18,7 +18,7 @@
<include>*:org.apache.felix.log:jar</include>
<include>*:org.osgi.compendium:jar</include>
<include>*:jboss-osgi-common:jar</include>
- <include>*:jboss-osgi-service-remote-log:jar</include>
+ <include>*:jboss-osgi-remotelog:jar</include>
</includes>
<useStrictFiltering>true</useStrictFiltering>
<scope>provided</scope>
Modified: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/example/log/LogServiceRemoteTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/example/log/LogServiceRemoteTestCase.java 2009-04-15 04:02:54 UTC (rev 87316)
+++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/example/log/LogServiceRemoteTestCase.java 2009-04-15 08:43:19 UTC (rev 87317)
@@ -72,7 +72,7 @@
tracker.open();
// Install the RemoteLogReaderService in the local OSGiFramework.
- installBundle(sysContext, "bundles/jboss-osgi-service-remote-log.jar", true);
+ installBundle(sysContext, "bundles/jboss-osgi-remotelog.jar", true);
// Deploy the RemoteLogListener to the remote OSGiFramework.
deployBundle("bundles/jboss-osgi-service-remote-log.jar");
@@ -87,7 +87,7 @@
undeployBundle("example/example-log-bundleA.jar");
// Uneploy the RemoteLogListener from the remote OSGiFramework.
- undeployBundle("bundles/jboss-osgi-service-remote-log.jar");
+ undeployBundle("bundles/jboss-osgi-remotelog.jar");
// Verify the received log entries
List<LogEntry> entries = logEntryCache.getLog();
More information about the jboss-osgi-commits
mailing list