JBoss-OSGI SVN: r86949 - in projects/jboss-osgi/trunk: build/hudson/hudson-home/jobs/jbossosgi-embedded and 10 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-04-08 05:57:31 -0400 (Wed, 08 Apr 2009)
New Revision: 86949
Added:
projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-embedded/
projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-embedded/config.xml
Removed:
projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/jboss-osgi-beans.xml
projects/jboss-osgi/trunk/runtime/felix/src/test/resources/jboss-osgi-beans.xml
projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/jboss-osgi-beans.xml
Modified:
projects/jboss-osgi/trunk/runtime/equinox/pom.xml
projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/jboss-osgi-beans.xml
projects/jboss-osgi/trunk/runtime/felix/pom.xml
projects/jboss-osgi/trunk/runtime/felix/src/main/resources/jboss-osgi-beans.xml
projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml
projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/jboss-osgi-beans.xml
projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
Add embedded testing
Added: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-embedded/config.xml
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-embedded/config.xml (rev 0)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-embedded/config.xml 2009-04-08 09:57:31 UTC (rev 86949)
@@ -0,0 +1,50 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<maven2-moduleset>
+ <actions/>
+ <description>Build and test embedded JBossOSGi @version.id@</description>
+ <keepDependencies>false</keepDependencies>
+ <properties/>
+ <scm class="hudson.scm.SubversionSCM">
+ <locations>
+ <hudson.scm.SubversionSCM_-ModuleLocation>
+ <remote>@hudson.osgi.url@</remote>
+ <local>jboss-osgi</local>
+ </hudson.scm.SubversionSCM_-ModuleLocation>
+ </locations>
+ <useUpdate>true</useUpdate>
+ <browser class="hudson.scm.browsers.FishEyeSVN">
+ <url>http://fisheye.jboss.com/browse/JBossOSGi/</url>
+ <rootModule></rootModule>
+ </browser>
+ <excludedRegions></excludedRegions>
+ </scm>
+ <assignedNode>master</assignedNode>
+ <canRoam>false</canRoam>
+ <disabled>false</disabled>
+ <jdk>jdk1.6</jdk>
+ <triggers class="vector"/>
+ <rootModule>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi</artifactId>
+ </rootModule>
+ <goals>clean package</goals>
+ <aggregatorStyleBuild>true</aggregatorStyleBuild>
+ <usePrivateRepository>false</usePrivateRepository>
+ <ignoreUpstremChanges>true</ignoreUpstremChanges>
+ <reporters/>
+ <publishers class="vector">
+ <hudson.tasks.JavadocArchiver>
+ <javadocDir>jboss-osgi/runtime/spi/target/apidocs</javadocDir>
+ <keepAll>false</keepAll>
+ </hudson.tasks.JavadocArchiver>
+ <hudson.tasks.junit.JUnitResultArchiver>
+ <testResults>jboss-osgi/**/target/surefire-reports/TEST-*.xml</testResults>
+ </hudson.tasks.junit.JUnitResultArchiver>
+ <hudson.tasks.Mailer>
+ <recipients>@hudson.mail.recipients@</recipients>
+ <dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
+ <sendToIndividuals>true</sendToIndividuals>
+ </hudson.tasks.Mailer>
+ </publishers>
+ <buildWrappers/>
+</maven2-moduleset>
\ No newline at end of file
Property changes on: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-embedded/config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: projects/jboss-osgi/trunk/runtime/equinox/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/pom.xml 2009-04-08 09:18:03 UTC (rev 86948)
+++ projects/jboss-osgi/trunk/runtime/equinox/pom.xml 2009-04-08 09:57:31 UTC (rev 86949)
@@ -43,12 +43,6 @@
<!-- Test Dependencies -->
<dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-testsuite</artifactId>
- <version>${version}</version>
- <type>zip</type>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -143,6 +137,14 @@
<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>
Modified: projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/jboss-osgi-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/jboss-osgi-beans.xml 2009-04-08 09:18:03 UTC (rev 86948)
+++ projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/jboss-osgi-beans.xml 2009-04-08 09:57:31 UTC (rev 86949)
@@ -12,23 +12,4 @@
</property>
</bean>
- <!-- The OSGi MetaData Deployer -->
- <bean name="jboss.osgi:service=BundleMetaDataDeployer" class="org.jboss.osgi.deployer.BundleMetaDataDeployer" />
-
- <!-- The OSGi Bundle Deployer -->
- <bean name="jboss.osgi:service=BundleRealDeployer" class="org.jboss.osgi.deployer.BundleRealDeployer">
- <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property>
- <property name="skipBundles"><inject bean="jboss.osgi:service=Framework" property="autoInstall" /></property>
- </bean>
-
- <!-- The Bundle ClassLoader Deployer -->
- <bean name="jboss.osgi:service=BundleClassLoaderDeployer" class="org.jboss.osgi.deployer.BundleClassLoaderDeployer">
- <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property>
- </bean>
-
- <!-- The Bundle Start/Stop Deployer -->
- <bean name="jboss.osgi:service=BundleStartStopDeployer" class="org.jboss.osgi.deployer.BundleStartStopDeployer">
- <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property>
- </bean>
-
</deployment>
Deleted: projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/jboss-osgi-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/jboss-osgi-beans.xml 2009-04-08 09:18:03 UTC (rev 86948)
+++ projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/jboss-osgi-beans.xml 2009-04-08 09:57:31 UTC (rev 86949)
@@ -1,15 +0,0 @@
-<!--
- $Id$
--->
-<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- The OSGiFramework -->
- <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.equinox.framework.EquinoxIntegration">
- <property name="frameworkProperties">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
- </map>
- </property>
- </bean>
-
-</deployment>
Modified: projects/jboss-osgi/trunk/runtime/felix/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-04-08 09:18:03 UTC (rev 86948)
+++ projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-04-08 09:57:31 UTC (rev 86949)
@@ -38,12 +38,6 @@
<!-- Test Dependencies -->
<dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-testsuite</artifactId>
- <version>${version}</version>
- <type>zip</type>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -126,7 +120,7 @@
<!-- Profiles -->
<profiles>
-
+
<!--
Name: framework-felix
Descr: Setup for Felix integration testing
@@ -139,6 +133,14 @@
<value>felix</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>
Modified: projects/jboss-osgi/trunk/runtime/felix/src/main/resources/jboss-osgi-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/src/main/resources/jboss-osgi-beans.xml 2009-04-08 09:18:03 UTC (rev 86948)
+++ projects/jboss-osgi/trunk/runtime/felix/src/main/resources/jboss-osgi-beans.xml 2009-04-08 09:57:31 UTC (rev 86949)
@@ -19,23 +19,4 @@
</property>
</bean>
- <!-- The OSGi MetaData Deployer -->
- <bean name="jboss.osgi:service=BundleMetaDataDeployer" class="org.jboss.osgi.deployer.BundleMetaDataDeployer" />
-
- <!-- The OSGi Bundle Deployer -->
- <bean name="jboss.osgi:service=BundleRealDeployer" class="org.jboss.osgi.deployer.BundleRealDeployer">
- <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property>
- <property name="skipBundles"><inject bean="jboss.osgi:service=Framework" property="autoInstall" /></property>
- </bean>
-
- <!-- The Bundle ClassLoader Deployer -->
- <bean name="jboss.osgi:service=BundleClassLoaderDeployer" class="org.jboss.osgi.deployer.BundleClassLoaderDeployer">
- <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property>
- </bean>
-
- <!-- The Bundle Start/Stop Deployer -->
- <bean name="jboss.osgi:service=BundleStartStopDeployer" class="org.jboss.osgi.deployer.BundleStartStopDeployer">
- <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property>
- </bean>
-
</deployment>
Deleted: projects/jboss-osgi/trunk/runtime/felix/src/test/resources/jboss-osgi-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/src/test/resources/jboss-osgi-beans.xml 2009-04-08 09:18:03 UTC (rev 86948)
+++ projects/jboss-osgi/trunk/runtime/felix/src/test/resources/jboss-osgi-beans.xml 2009-04-08 09:57:31 UTC (rev 86949)
@@ -1,20 +0,0 @@
-<!--
- $Id$
--->
-<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- The OSGiFramework -->
- <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.felix.framework.FelixIntegration">
- <property name="frameworkProperties">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
- </map>
- </property>
- </bean>
-
- <bean name="jboss.osgi:service=Microcontainer" class="org.jboss.osgi.service.MicrocontainerService">
- <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext"/></property>
- <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property>
- </bean>
-
-</deployment>
Modified: projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml 2009-04-08 09:18:03 UTC (rev 86948)
+++ projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml 2009-04-08 09:57:31 UTC (rev 86949)
@@ -43,12 +43,6 @@
<!-- Test Dependencies -->
<dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-testsuite</artifactId>
- <version>${version}</version>
- <type>zip</type>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -143,6 +137,14 @@
<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>
Modified: projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/jboss-osgi-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/jboss-osgi-beans.xml 2009-04-08 09:18:03 UTC (rev 86948)
+++ projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/jboss-osgi-beans.xml 2009-04-08 09:57:31 UTC (rev 86949)
@@ -12,23 +12,4 @@
</property>
</bean>
- <!-- The OSGi MetaData Deployer -->
- <bean name="jboss.osgi:service=BundleMetaDataDeployer" class="org.jboss.osgi.deployer.BundleMetaDataDeployer" />
-
- <!-- The OSGi Bundle Deployer -->
- <bean name="jboss.osgi:service=BundleRealDeployer" class="org.jboss.osgi.deployer.BundleRealDeployer">
- <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property>
- <property name="skipBundles"><inject bean="jboss.osgi:service=Framework" property="autoInstall" /></property>
- </bean>
-
- <!-- The Bundle ClassLoader Deployer -->
- <bean name="jboss.osgi:service=BundleClassLoaderDeployer" class="org.jboss.osgi.deployer.BundleClassLoaderDeployer">
- <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property>
- </bean>
-
- <!-- The Bundle Start/Stop Deployer -->
- <bean name="jboss.osgi:service=BundleStartStopDeployer" class="org.jboss.osgi.deployer.BundleStartStopDeployer">
- <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property>
- </bean>
-
</deployment>
Deleted: projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/jboss-osgi-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/jboss-osgi-beans.xml 2009-04-08 09:18:03 UTC (rev 86948)
+++ projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/jboss-osgi-beans.xml 2009-04-08 09:57:31 UTC (rev 86949)
@@ -1,15 +0,0 @@
-<!--
- $Id$
--->
-<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" xmlns="urn:jboss:bean-deployer:2.0">
-
- <!-- The OSGiFramework -->
- <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.knopflerfish.KnopflerfishIntegration">
- <property name="frameworkProperties">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
- </map>
- </property>
- </bean>
-
-</deployment>
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-04-08 09:18:03 UTC (rev 86948)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-04-08 09:57:31 UTC (rev 86949)
@@ -3,12 +3,9 @@
<modelVersion>4.0.0</modelVersion>
<!--
+ *************************************************************************************** * * * The Testsuite module provides the test artifacts that can be reused by
+ the various * * supported OSGi Frameworks. The tests are not run as part of the Testsuite module. * * *
***************************************************************************************
- * *
- * The Testsuite module provides the test artifacts that can be reused by the various *
- * supported OSGi Frameworks. The tests are not run as part of the Testsuite module. *
- * *
- ***************************************************************************************
-->
<name>JBossOSGi - Testsuite</name>
<description>JBossOSGi - Testsuite</description>
@@ -133,5 +130,112 @@
</plugin>
</plugins>
</build>
-
+
+ <profiles>
+ <!--
+ Name: framework-default
+ Descr: Setup for default framework integration testing
+ -->
+ <profile>
+ <id>framework-default</id>
+ <activation>
+ <property>
+ <name>!framework</name>
+ </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>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>false</skipTests>
+ </configuration>
+ </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/**/*DeployerTestCase.java</exclude>
+ <exclude>org/jboss/test/osgi/service/http/junit/*TestCase.java</exclude>
+ <exclude>org/jboss/test/osgi/service/microcontainer/junit/*TestCase.java</exclude>
+ <!-- [JBOSGI-36] Bundle classes leak into system classloader -->
+ <exclude>org/jboss/test/osgi/jbosgi36/*TestCase.java</exclude>
+ <!-- [JBOSGI-39] Bundle gets wired to an already uninstalled bundle -->
+ <exclude>org/jboss/test/osgi/jbosgi39/*TestCase.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>
+ <!-- [JBOSGI-40] Cannot run embedded tests with SecurityManager -->
+ <exclude>org/jboss/test/osgi/**/*EmbeddedTestCase.java</exclude>
+ <!-- [JBOSGI-39] Bundle gets wired to an already uninstalled bundle -->
+ <exclude>org/jboss/test/osgi/jbosgi39/*TestCase.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
17 years, 3 months
- 1
- 0
JBoss-OSGI SVN: r86948 - projects/jboss-osgi/trunk/build/hudson/jboss/bin.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-04-08 05:18:03 -0400 (Wed, 08 Apr 2009)
New Revision: 86948
Modified:
projects/jboss-osgi/trunk/build/hudson/jboss/bin/http-spider.sh
Log:
tiemout jboss startup after 60sec, was 36sec
Modified: projects/jboss-osgi/trunk/build/hudson/jboss/bin/http-spider.sh
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/jboss/bin/http-spider.sh 2009-04-08 08:58:57 UTC (rev 86947)
+++ projects/jboss-osgi/trunk/build/hudson/jboss/bin/http-spider.sh 2009-04-08 09:18:03 UTC (rev 86948)
@@ -16,7 +16,7 @@
TIMEOUT=2 # wget timeout in sec
SLEEP_TIME=10 # the actual sleep time in between test
-NUM_RETRIES=18 # equals 180 seconds before exit
+NUM_RETRIES=30 # equals 60 seconds before exit
if [ "x$1" = "x" -o "x$2" = "x" ]; then
echo "Usage: http-spider.sh <hostname:port> <output_dir>"
17 years, 3 months
- 1
- 0
JBoss-OSGI SVN: r86851 - projects/jboss-osgi/trunk/runtime/knopflerfish.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-04-06 09:55:45 -0400 (Mon, 06 Apr 2009)
New Revision: 86851
Modified:
projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml
Log:
Add missing compendium jar
Modified: projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml 2009-04-06 13:49:41 UTC (rev 86850)
+++ projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml 2009-04-06 13:55:45 UTC (rev 86851)
@@ -36,6 +36,10 @@
<groupId>org.knopflerfish</groupId>
<artifactId>org.knopflerfish.framework</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </dependency>
<!-- Test Dependencies -->
<dependency>
17 years, 3 months
- 1
- 0
JBoss-OSGI SVN: r86850 - in projects/jboss-osgi/trunk: build/distribution/scripts and 4 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-04-06 09:49:41 -0400 (Mon, 06 Apr 2009)
New Revision: 86850
Modified:
projects/jboss-osgi/trunk/build/distribution/pom.xml
projects/jboss-osgi/trunk/build/distribution/scripts/assembly-deploy-artifacts.xml
projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml
projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/user-input-spec.xml
projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-matrix/config.xml
projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/osgi-deployers-jboss-beans.xml
projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/jboss-osgi-beans.xml
Log:
Kopflerfish container integration
Modified: projects/jboss-osgi/trunk/build/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-04-06 13:36:36 UTC (rev 86849)
+++ projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-04-06 13:49:41 UTC (rev 86850)
@@ -53,40 +53,6 @@
</dependency>
<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>
- <classifier>config</classifier>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-equinox</artifactId>
- <classifier>sources</classifier>
- <version>${version}</version>
- </dependency>
- <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>
- <classifier>config</classifier>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-felix</artifactId>
- <classifier>sources</classifier>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-runtime-spi</artifactId>
<version>${version}</version>
</dependency>
@@ -135,6 +101,23 @@
<!-- Equinox 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>
+ <classifier>config</classifier>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-equinox</artifactId>
+ <classifier>sources</classifier>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.osgi</artifactId>
</dependency>
@@ -145,6 +128,23 @@
<!-- Felix 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>
+ <classifier>config</classifier>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-felix</artifactId>
+ <classifier>sources</classifier>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>javax.servlet</artifactId>
</dependency>
@@ -165,6 +165,29 @@
<artifactId>org.apache.felix.metatype</artifactId>
</dependency>
+ <!-- Knopflerfish Dependencies -->
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-knopflerfish</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-knopflerfish</artifactId>
+ <classifier>config</classifier>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-knopflerfish</artifactId>
+ <classifier>sources</classifier>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.knopflerfish</groupId>
+ <artifactId>org.knopflerfish.framework</artifactId>
+ </dependency>
+
<!-- izpack -->
<dependency>
<groupId>org.codehaus.izpack</groupId>
Modified: projects/jboss-osgi/trunk/build/distribution/scripts/assembly-deploy-artifacts.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/scripts/assembly-deploy-artifacts.xml 2009-04-06 13:36:36 UTC (rev 86849)
+++ projects/jboss-osgi/trunk/build/distribution/scripts/assembly-deploy-artifacts.xml 2009-04-06 13:49:41 UTC (rev 86850)
@@ -45,6 +45,14 @@
</includes>
<unpack>true</unpack>
</dependencySet>
+ <dependencySet>
+ <outputDirectory>resources/jboss-osgi-runtime-knopflerfish</outputDirectory>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>*:jboss-osgi-runtime-knopflerfish:jar:config</include>
+ </includes>
+ <unpack>true</unpack>
+ </dependencySet>
<!-- source -->
<dependencySet>
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-06 13:36:36 UTC (rev 86849)
+++ projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml 2009-04-06 13:49:41 UTC (rev 86850)
@@ -51,6 +51,10 @@
<name>frameworkSelection</name>
<value>equinox</value>
</condition>
+ <condition type="variable" id="isKnopflerfish">
+ <name>frameworkSelection</name>
+ <value>knopflerfish</value>
+ </condition>
<condition type="variable" id="isJBoss501">
<name>jbossSelection</name>
<value>jboss501</value>
@@ -193,6 +197,19 @@
<include name="org.eclipse.osgi.services.jar" />
</fileset>
+ <!-- Knopflerfish Integration -->
+
+ <fileset condition="isKnopflerfish" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer" override="true">
+ <include name="jboss-osgi-runtime-knopflerfish.jar" />
+ <include name="org.knopflerfish.framework.jar" />
+ </fileset>
+ <fileset condition="isKnopflerfish" dir="@{deploy.artifacts.dir}/resources/jboss-osgi-runtime-knopflerfish" targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer/META-INF" override="true">
+ <include name="osgi-deployers-jboss-beans.xml" />
+ </fileset>
+ <fileset condition="isKnopflerfish" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/default/deploy/osgi" override="true">
+ <include name="org.osgi.compendium.jar" />
+ </fileset>
+
</pack>
<!--
@@ -255,6 +272,19 @@
<include name="org.eclipse.osgi.services.jar" />
</fileset>
+ <!-- Knopflerfish Integration -->
+
+ <fileset condition="isKnopflerfish" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true">
+ <include name="jboss-osgi-runtime-knopflerfish.jar" />
+ <include name="org.knopflerfish.framework.jar" />
+ </fileset>
+ <fileset condition="isKnopflerfish" dir="@{deploy.artifacts.dir}/resources/jboss-osgi-runtime-knopflerfish" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF" override="true">
+ <include name="osgi-deployers-jboss-beans.xml" />
+ </fileset>
+ <fileset condition="isKnopflerfish" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true">
+ <include name="org.osgi.compendium.jar" />
+ </fileset>
+
</pack>
</packs>
Modified: projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/user-input-spec.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/user-input-spec.xml 2009-04-06 13:36:36 UTC (rev 86849)
+++ projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/user-input-spec.xml 2009-04-06 13:49:41 UTC (rev 86850)
@@ -5,6 +5,7 @@
<spec>
<choice txt="Felix" value="felix" set="true"/>
<choice txt="Equinox" value="equinox"/>
+ <choice txt="Knopflerfish" value="knopflerfish"/>
</spec>
</field>
</panel>
Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-matrix/config.xml
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-matrix/config.xml 2009-04-06 13:36:36 UTC (rev 86849)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-matrix/config.xml 2009-04-06 13:49:41 UTC (rev 86850)
@@ -35,6 +35,8 @@
<name>framework</name>
<values>
<string>felix</string>
+ <string>equinox</string>
+ <string>knopflerfish</string>
</values>
</axis>
<axis>
Modified: projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/osgi-deployers-jboss-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/osgi-deployers-jboss-beans.xml 2009-04-06 13:36:36 UTC (rev 86849)
+++ projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/osgi-deployers-jboss-beans.xml 2009-04-06 13:49:41 UTC (rev 86850)
@@ -8,7 +8,7 @@
<map keyClass="java.lang.String" valueClass="java.lang.String">
<entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
<entry><key>org.osgi.service.http.port</key><value>8090</value></entry>
- <entry><key>osgi.install.area</key><value>${jboss.server.data.dir}/equinox</value></entry>
+ <entry><key>org.osgi.framework.dir</key><value>${jboss.server.data.dir}/knopflerfish</value></entry>
<entry><key>felix.cm.dir</key><value>${jboss.server.data.dir}/osgi-configadmin</value></entry>
<entry>
<key>org.osgi.framework.system.packages</key>
Modified: projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/jboss-osgi-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/jboss-osgi-beans.xml 2009-04-06 13:36:36 UTC (rev 86849)
+++ projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/jboss-osgi-beans.xml 2009-04-06 13:49:41 UTC (rev 86850)
@@ -8,7 +8,6 @@
<property name="frameworkProperties">
<map keyClass="java.lang.String" valueClass="java.lang.String">
<entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
- <entry><key>org.knopflerfish.osgi.registerserviceurlhandler</key><value>false</value></entry>
</map>
</property>
</bean>
17 years, 3 months
- 1
- 0
JBoss-OSGI SVN: r86847 - in projects/jboss-osgi/trunk: runtime and 10 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-04-06 09:07:23 -0400 (Mon, 06 Apr 2009)
New Revision: 86847
Added:
projects/jboss-osgi/trunk/runtime/knopflerfish/.classpath
projects/jboss-osgi/trunk/runtime/knopflerfish/.project
projects/jboss-osgi/trunk/runtime/knopflerfish/.settings/
projects/jboss-osgi/trunk/runtime/knopflerfish/.settings/org.eclipse.jdt.core.prefs
projects/jboss-osgi/trunk/runtime/knopflerfish/.settings/org.maven.ide.eclipse.prefs
projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml
projects/jboss-osgi/trunk/runtime/knopflerfish/scripts/
projects/jboss-osgi/trunk/runtime/knopflerfish/src/
projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/java/org/jboss/osgi/knopflerfish/
projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/java/org/jboss/osgi/knopflerfish/KnopflerfishIntegration.java
projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/java/org/jboss/test/osgi/knopflerfish/
projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/java/org/jboss/test/osgi/knopflerfish/SystemBundleTestCase.java
Removed:
projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/java/org/jboss/osgi/equinox/
projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/java/org/jboss/test/osgi/equinox/
Modified:
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/runtime/equinox/src/test/java/org/jboss/test/osgi/equinox/SystemBundleTestCase.java
projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/SystemBundleTestCase.java
projects/jboss-osgi/trunk/runtime/knopflerfish/
projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/jboss-osgi-beans.xml
projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/osgi-deployers-jboss-beans.xml
projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/jboss-osgi-beans.xml
projects/jboss-osgi/trunk/runtime/pom.xml
Log:
Initial Knopflerfish integration
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-04-06 11:53:41 UTC (rev 86846)
+++ projects/jboss-osgi/trunk/pom.xml 2009-04-06 13:07:23 UTC (rev 86847)
@@ -60,6 +60,7 @@
<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>
@@ -243,6 +244,13 @@
<version>${version.felix.webconsole}</version>
</dependency>
+ <!-- Equinox Dependencies -->
+ <dependency>
+ <groupId>org.knopflerfish</groupId>
+ <artifactId>org.knopflerfish.framework</artifactId>
+ <version>${version.knopflerfish}</version>
+ </dependency>
+
<!-- Test Dependencies -->
<dependency>
<groupId>org.jboss</groupId>
Modified: projects/jboss-osgi/trunk/runtime/equinox/src/test/java/org/jboss/test/osgi/equinox/SystemBundleTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/src/test/java/org/jboss/test/osgi/equinox/SystemBundleTestCase.java 2009-04-06 11:53:41 UTC (rev 86846)
+++ projects/jboss-osgi/trunk/runtime/equinox/src/test/java/org/jboss/test/osgi/equinox/SystemBundleTestCase.java 2009-04-06 13:07:23 UTC (rev 86847)
@@ -47,7 +47,7 @@
Bundle bundle = framework.getSystemBundle();
assertEquals("BundleId == 0", 0, bundle.getBundleId());
- assertEquals("SymbolicName == org.eclipse.osgi", "org.eclipse.osgi", bundle.getSymbolicName());
+ assertEquals("SymbolicName", "org.eclipse.osgi", bundle.getSymbolicName());
}
public void testSystemBundle()
@@ -57,6 +57,6 @@
Bundle bundle = framework.getSystemBundle();
assertEquals("BundleId == 0", 0, bundle.getBundleId());
- assertEquals("SymbolicName == org.eclipse.osgi", "org.eclipse.osgi", bundle.getSymbolicName());
+ assertEquals("SymbolicName", "org.eclipse.osgi", bundle.getSymbolicName());
}
}
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/SystemBundleTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/SystemBundleTestCase.java 2009-04-06 11:53:41 UTC (rev 86846)
+++ projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/SystemBundleTestCase.java 2009-04-06 13:07:23 UTC (rev 86847)
@@ -47,7 +47,7 @@
Bundle bundle = framework.getSystemBundle();
assertEquals("BundleId == 0", 0, bundle.getBundleId());
- assertEquals("SymbolicName == system.bundle", "system.bundle", bundle.getSymbolicName());
+ assertEquals("SymbolicName", "system.bundle", bundle.getSymbolicName());
}
public void testSystemBundle()
@@ -57,6 +57,6 @@
Bundle bundle = framework.getSystemBundle();
assertEquals("BundleId == 0", 0, bundle.getBundleId());
- assertEquals("SymbolicName == system.bundle", "system.bundle", bundle.getSymbolicName());
+ assertEquals("SymbolicName", "system.bundle", bundle.getSymbolicName());
}
}
\ No newline at end of file
Property changes on: projects/jboss-osgi/trunk/runtime/knopflerfish
___________________________________________________________________
Name: svn:ignore
+ target
Added: projects/jboss-osgi/trunk/runtime/knopflerfish/.classpath
===================================================================
--- projects/jboss-osgi/trunk/runtime/knopflerfish/.classpath (rev 0)
+++ projects/jboss-osgi/trunk/runtime/knopflerfish/.classpath 2009-04-06 13:07:23 UTC (rev 86847)
@@ -0,0 +1,10 @@
+<?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="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/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>
Added: projects/jboss-osgi/trunk/runtime/knopflerfish/.project
===================================================================
--- projects/jboss-osgi/trunk/runtime/knopflerfish/.project (rev 0)
+++ projects/jboss-osgi/trunk/runtime/knopflerfish/.project 2009-04-06 13:07:23 UTC (rev 86847)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jboss-osgi-runtime-knopflerfish</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.maven.ide.eclipse.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.maven.ide.eclipse.maven2Nature</nature>
+ </natures>
+</projectDescription>
Added: projects/jboss-osgi/trunk/runtime/knopflerfish/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/jboss-osgi/trunk/runtime/knopflerfish/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ projects/jboss-osgi/trunk/runtime/knopflerfish/.settings/org.eclipse.jdt.core.prefs 2009-04-06 13:07:23 UTC (rev 86847)
@@ -0,0 +1,5 @@
+#Mon Apr 06 13:33:40 CEST 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.source=1.5
Added: projects/jboss-osgi/trunk/runtime/knopflerfish/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- projects/jboss-osgi/trunk/runtime/knopflerfish/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ projects/jboss-osgi/trunk/runtime/knopflerfish/.settings/org.maven.ide.eclipse.prefs 2009-04-06 13:07:23 UTC (rev 86847)
@@ -0,0 +1,9 @@
+#Mon Apr 06 13:33:38 CEST 2009
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Copied: projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml (from rev 86836, projects/jboss-osgi/trunk/runtime/equinox/pom.xml)
===================================================================
--- projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml (rev 0)
+++ projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml 2009-04-06 13:07:23 UTC (rev 86847)
@@ -0,0 +1,242 @@
+<?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 - Runtime Knopflerfish</name>
+ <description>JBossOSGi - Knopflerfish Runtime</description>
+
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-knopflerfish</artifactId>
+ <packaging>jar</packaging>
+
+ <parent>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime</artifactId>
+ <version>1.0.0.Beta1</version>
+ </parent>
+
+ <!-- Properties -->
+ <properties>
+ <surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/resources/tst.policy</surefire.security.args>
+ </properties>
+
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-spi</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.knopflerfish</groupId>
+ <artifactId>org.knopflerfish.framework</artifactId>
+ </dependency>
+
+ <!-- Test Dependencies -->
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-testsuite</artifactId>
+ <version>${version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <!-- Build -->
+ <build>
+ <testResources>
+ <testResource>
+ <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>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>${project.build.finalName}</finalName>
+ <appendAssemblyId>true</appendAssemblyId>
+ <descriptors>
+ <descriptor>scripts/assembly-config.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </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>
+ <exclude>*beans.xml</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <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>
+ <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 all testsuite tests -->
+ <exclude>org/jboss/test/osgi/jbosgi*/**</exclude>
+ <exclude>org/jboss/test/osgi/service/**</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>
+ <!-- Exclude all testsuite tests -->
+ <exclude>org/jboss/test/osgi/jbosgi*/**</exclude>
+ <exclude>org/jboss/test/osgi/service/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ </profiles>
+
+</project>
Property changes on: projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Copied: projects/jboss-osgi/trunk/runtime/knopflerfish/scripts (from rev 86836, projects/jboss-osgi/trunk/runtime/equinox/scripts)
Copied: projects/jboss-osgi/trunk/runtime/knopflerfish/src (from rev 86836, projects/jboss-osgi/trunk/runtime/equinox/src)
Copied: projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/java/org/jboss/osgi/knopflerfish/KnopflerfishIntegration.java (from rev 86836, projects/jboss-osgi/trunk/runtime/equinox/src/main/java/org/jboss/osgi/equinox/framework/EquinoxIntegration.java)
===================================================================
--- projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/java/org/jboss/osgi/knopflerfish/KnopflerfishIntegration.java (rev 0)
+++ projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/java/org/jboss/osgi/knopflerfish/KnopflerfishIntegration.java 2009-04-06 13:07:23 UTC (rev 86847)
@@ -0,0 +1,209 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.knopflerfish;
+
+//$Id$
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.jboss.logging.Logger;
+import org.jboss.osgi.spi.FrameworkException;
+import org.jboss.osgi.spi.framework.OSGiFramework;
+import org.knopflerfish.framework.Framework;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
+
+/**
+ * The OSGiFramework for Makewave Knopflerfish
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 06-Apr-2009
+ */
+public class KnopflerfishIntegration implements OSGiFramework
+{
+ // Provide logging
+ final Logger log = Logger.getLogger(KnopflerfishIntegration.class);
+
+ private Map<String, Object> frameworkProperties = new HashMap<String, Object>();
+ private List<URI> autoInstall = new ArrayList<URI>();
+ private List<URI> autoStart = new ArrayList<URI>();
+
+ private Framework framework;
+
+ public Map<String, Object> getFrameworkProperties()
+ {
+ return frameworkProperties;
+ }
+
+ public void setFrameworkProperties(Map<String, Object> props)
+ {
+ this.frameworkProperties = props;
+ }
+
+ public List<URI> getAutoInstall()
+ {
+ return autoInstall;
+ }
+
+ public void setAutoInstall(List<URI> autoInstall)
+ {
+ this.autoInstall = autoInstall;
+ }
+
+ public List<URI> getAutoStart()
+ {
+ return autoStart;
+ }
+
+ public void setAutoStart(List<URI> autoStart)
+ {
+ this.autoStart = autoStart;
+ }
+
+ public Bundle getSystemBundle()
+ {
+ return framework.getSystemBundleContext().getBundle();
+ }
+
+ public BundleContext getSystemBundleContext()
+ {
+ return getSystemBundle().getBundleContext();
+ }
+
+ public void create()
+ {
+ String implVersion = getClass().getPackage().getImplementationVersion();
+ log.info("OSGi Integration Knopflerfish - " + implVersion);
+
+ // Push configured props to FrameworkProperties
+ Iterator<String> itKeys = frameworkProperties.keySet().iterator();
+ while (itKeys.hasNext())
+ {
+ String key = itKeys.next();
+ Object value = frameworkProperties.get(key);
+ if (value instanceof String)
+ {
+ Framework.setProperty(key, (String)value);
+ }
+ }
+
+ // Prevent a NPE when the config area is not set
+ if (Framework.getProperty("org.osgi.framework.dir") == null)
+ {
+ String userHome = Framework.getProperty("user.home");
+ Framework.setProperty("org.osgi.framework.dir", userHome + "/knopflerfish");
+ }
+
+ // Cannot disable REGISTERSERVICEURLHANDLER
+ // https://sourceforge.net/tracker/?func=detail&aid=2737425&group_id=82798&a...
+ //
+ // java.lang.Error: factory already defined
+ // at java.net.URL.setURLStreamHandlerFactory(URL.java:1076)
+ // at org.knopflerfish.framework.Framework.<init>(Framework.java:353)
+ PrintStream sysOut = System.out;
+ System.setOut(new PrintStream(new ByteArrayOutputStream()));
+ PrintStream sysErr = System.err;
+ System.setErr(new PrintStream(new ByteArrayOutputStream()));
+
+ // Init & Start the Framework
+ try
+ {
+ framework = new Framework(null);
+ framework.launch(0);
+ }
+ catch (RuntimeException rte)
+ {
+ throw rte;
+ }
+ catch (Exception ex)
+ {
+ throw new FrameworkException("Cannot initialze system bundle", ex);
+ }
+ finally
+ {
+ System.setOut(sysOut);
+ System.setErr(sysErr);
+ }
+ }
+
+ public void start()
+ {
+ // Get system bundle context
+ BundleContext context = getSystemBundleContext();
+ if (context == null)
+ throw new FrameworkException("Cannot obtain system context");
+
+ Map<URI, Bundle> autoBundles = new HashMap<URI, Bundle>();
+
+ // Add the autoStart bundles to autoInstall
+ for (URI bundleURI : autoStart)
+ {
+ autoInstall.add(bundleURI);
+ }
+
+ // Install autoInstall bundles
+ for (URI bundleURI : autoInstall)
+ {
+ try
+ {
+ Bundle bundle = context.installBundle(bundleURI.toString());
+ log.info("Installed bundle: " + bundle.getSymbolicName());
+ autoBundles.put(bundleURI, bundle);
+ }
+ catch (BundleException ex)
+ {
+ log.error("Cannot install bundle: " + bundleURI, ex);
+ }
+ }
+
+ // Start autoStart bundles
+ for (URI bundleURI : autoStart)
+ {
+ try
+ {
+ Bundle bundle = autoBundles.get(bundleURI);
+ bundle.start();
+ log.info("Started bundle: " + bundle.getSymbolicName());
+ }
+ catch (BundleException ex)
+ {
+ log.error("Cannot start bundle: " + bundleURI, ex);
+ }
+ }
+ }
+
+ public void stop()
+ {
+ if (framework != null)
+ {
+ framework.shutdown();
+ }
+ }
+}
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/jboss-osgi-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/jboss-osgi-beans.xml 2009-04-06 07:33:56 UTC (rev 86836)
+++ projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/jboss-osgi-beans.xml 2009-04-06 13:07:23 UTC (rev 86847)
@@ -4,7 +4,7 @@
<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" xmlns="urn:jboss:bean-deployer:2.0">
<!-- The OSGiFramework -->
- <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.equinox.framework.EquinoxIntegration">
+ <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.knopflerfish.KnopflerfishIntegration">
<property name="frameworkProperties">
<map keyClass="java.lang.String" valueClass="java.lang.String">
<entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
Modified: projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/osgi-deployers-jboss-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml 2009-04-06 07:33:56 UTC (rev 86836)
+++ projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/osgi-deployers-jboss-beans.xml 2009-04-06 13:07:23 UTC (rev 86847)
@@ -3,12 +3,11 @@
<deployment xmlns="urn:jboss:bean-deployer:2.0">
<!-- The OSGiFramework -->
- <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.equinox.framework.EquinoxIntegration">
+ <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.knopflerfish.KnopflerfishIntegration">
<property name="frameworkProperties">
<map keyClass="java.lang.String" valueClass="java.lang.String">
<entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
<entry><key>org.osgi.service.http.port</key><value>8090</value></entry>
- <entry><key>osgi.framework</key><value>${jboss.server.home.url}/deployers/osgi.deployer/org.eclipse.osgi.jar</value></entry>
<entry><key>osgi.install.area</key><value>${jboss.server.data.dir}/equinox</value></entry>
<entry><key>felix.cm.dir</key><value>${jboss.server.data.dir}/osgi-configadmin</value></entry>
<entry>
Copied: projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/java/org/jboss/test/osgi/knopflerfish/SystemBundleTestCase.java (from rev 86836, projects/jboss-osgi/trunk/runtime/equinox/src/test/java/org/jboss/test/osgi/equinox/SystemBundleTestCase.java)
===================================================================
--- projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/java/org/jboss/test/osgi/knopflerfish/SystemBundleTestCase.java (rev 0)
+++ projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/java/org/jboss/test/osgi/knopflerfish/SystemBundleTestCase.java 2009-04-06 13:07:23 UTC (rev 86847)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.osgi.knopflerfish;
+
+//$Id$
+
+import org.jboss.osgi.knopflerfish.KnopflerfishIntegration;
+import org.jboss.osgi.spi.framework.OSGiBootstrap;
+import org.jboss.osgi.spi.framework.OSGiBootstrapProvider;
+import org.jboss.osgi.spi.framework.OSGiFramework;
+import org.jboss.osgi.spi.junit.OSGiTest;
+import org.osgi.framework.Bundle;
+
+/**
+ * Test OSGi System bundle access
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 23-Jan-2009
+ */
+public class SystemBundleTestCase extends OSGiTest
+{
+ public void testEquinoxIntegration()
+ {
+ KnopflerfishIntegration framework = new KnopflerfishIntegration();
+ framework.create();
+ framework.start();
+
+ Bundle bundle = framework.getSystemBundle();
+
+ assertEquals("BundleId == 0", 0, bundle.getBundleId());
+ assertEquals("SymbolicName", "system.bundle", bundle.getSymbolicName());
+ }
+
+ public void testSystemBundle()
+ {
+ OSGiBootstrapProvider configProvider = OSGiBootstrap.getBootstrapProvider();
+ OSGiFramework framework = configProvider.getFramework();
+ Bundle bundle = framework.getSystemBundle();
+
+ assertEquals("BundleId == 0", 0, bundle.getBundleId());
+ assertEquals("SymbolicName", "system.bundle", bundle.getSymbolicName());
+ }
+}
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/jboss-osgi-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/jboss-osgi-beans.xml 2009-04-06 07:33:56 UTC (rev 86836)
+++ projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/jboss-osgi-beans.xml 2009-04-06 13:07:23 UTC (rev 86847)
@@ -4,10 +4,11 @@
<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" xmlns="urn:jboss:bean-deployer:2.0">
<!-- The OSGiFramework -->
- <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.equinox.framework.EquinoxIntegration">
+ <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.knopflerfish.KnopflerfishIntegration">
<property name="frameworkProperties">
<map keyClass="java.lang.String" valueClass="java.lang.String">
<entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
+ <entry><key>org.knopflerfish.osgi.registerserviceurlhandler</key><value>false</value></entry>
</map>
</property>
</bean>
Modified: projects/jboss-osgi/trunk/runtime/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/pom.xml 2009-04-06 11:53:41 UTC (rev 86846)
+++ projects/jboss-osgi/trunk/runtime/pom.xml 2009-04-06 13:07:23 UTC (rev 86847)
@@ -16,6 +16,7 @@
<module>deployer</module>
<module>equinox</module>
<module>felix</module>
+ <module>knopflerfish</module>
</modules>
</project>
17 years, 3 months
- 1
- 0
JBoss-OSGI SVN: r86747 - in projects/jboss-osgi/trunk: build/distribution/src/main/resources/installer and 6 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-04-03 09:22:37 -0400 (Fri, 03 Apr 2009)
New Revision: 86747
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/microcontainer/osgi-int/.classpath
projects/jboss-osgi/trunk/microcontainer/osgi-int/pom.xml
projects/jboss-osgi/trunk/runtime/deployer/.classpath
projects/jboss-osgi/trunk/runtime/equinox/.classpath
projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml
projects/jboss-osgi/trunk/runtime/felix/pom.xml
projects/jboss-osgi/trunk/service/logging/pom.xml
Log:
Profide explicit framework reference for equinox
Modified: projects/jboss-osgi/trunk/build/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-04-03 13:22:29 UTC (rev 86746)
+++ projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-04-03 13:22:37 UTC (rev 86747)
@@ -133,8 +133,18 @@
<version>${version}</version>
</dependency>
- <!-- felix -->
+ <!-- Equinox Dependencies -->
<dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>org.eclipse.osgi.services</artifactId>
+ </dependency>
+
+ <!-- Felix Dependencies -->
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>javax.servlet</artifactId>
</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-03 13:22:29 UTC (rev 86746)
+++ projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml 2009-04-03 13:22:37 UTC (rev 86747)
@@ -168,29 +168,30 @@
<!-- Felix Integration -->
- <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer" override="true" condition="isFelix">
+ <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer" override="true">
<include name="jboss-osgi-runtime-felix.jar" />
<include name="org.apache.felix.framework.jar" />
<include name="org.osgi.core.jar" />
</fileset>
- <fileset dir="@{deploy.artifacts.dir}/resources/jboss-osgi-runtime-felix" targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer/META-INF"
- override="true" condition="isFelix">
+ <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/resources/jboss-osgi-runtime-felix" targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer/META-INF" override="true">
<include name="osgi-deployers-jboss-beans.xml" />
</fileset>
- <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/default/deploy/osgi" override="true" condition="isFelix">
+ <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/default/deploy/osgi" override="true">
<include name="org.osgi.compendium.jar" />
</fileset>
<!-- Equinox Integration -->
- <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer" override="true" condition="isEquinox">
+ <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer" override="true">
<include name="jboss-osgi-runtime-equinox.jar" />
- <include name="osgi.jar" />
+ <include name="org.eclipse.osgi.jar" />
</fileset>
- <fileset dir="@{deploy.artifacts.dir}/resources/jboss-osgi-runtime-equinox" targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer/META-INF"
- override="true" condition="isEquinox">
+ <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/resources/jboss-osgi-runtime-equinox" targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer/META-INF" override="true">
<include name="osgi-deployers-jboss-beans.xml" />
</fileset>
+ <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/default/deploy/osgi" override="true">
+ <include name="org.eclipse.osgi.services.jar" />
+ </fileset>
</pack>
@@ -207,21 +208,15 @@
<description>Integration with an existing JBossAS instance</description>
<!-- deployers -->
- <fileset dir="@{deploy.artifacts.dir}/etc/jboss501/server/deployers" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers" override="true" condition="isJBoss501">
+ <fileset condition="isJBoss501" dir="@{deploy.artifacts.dir}/etc/jboss501/server/deployers" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers" override="true">
<include name="metadata-deployer-jboss-beans.xml" />
</fileset>
<!-- deployers/osgi.deployer -->
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true">
<include name="jboss-osgi-runtime-deployer.jar" />
- <include name="jboss-osgi-runtime-felix.jar" />
<include name="jboss-osgi-runtime-spi.jar" />
- <include name="org.apache.felix.framework.jar" />
- <include name="org.osgi.core.jar" />
</fileset>
- <fileset dir="@{deploy.artifacts.dir}/resources/jboss-osgi-runtime-felix" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF" override="true">
- <include name="osgi-deployers-jboss-beans.xml" />
- </fileset>
<!-- deploy/osgi -->
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true">
@@ -235,28 +230,30 @@
<!-- Felix Integration -->
- <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true" condition="isFelix">
+ <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true">
<include name="jboss-osgi-runtime-felix.jar" />
<include name="org.apache.felix.framework.jar" />
</fileset>
- <fileset dir="@{deploy.artifacts.dir}/resources/jboss-osgi-runtime-felix" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF"
- override="true" condition="isFelix">
+ <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/resources/jboss-osgi-runtime-felix" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF" override="true">
<include name="osgi-deployers-jboss-beans.xml" />
</fileset>
- <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true" condition="isFelix">
+ <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true">
<include name="org.osgi.compendium.jar" />
</fileset>
<!-- Equinox Integration -->
- <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true" condition="isEquinox">
+ <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true">
<include name="jboss-osgi-runtime-equinox.jar" />
<include name="org.apache.equinox.framework.jar" />
+ <include name="org.eclipse.osgi.jar"/>
</fileset>
- <fileset dir="@{deploy.artifacts.dir}/resources/jboss-osgi-runtime-equinox" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF"
- override="true" condition="isEquinox">
+ <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/resources/jboss-osgi-runtime-equinox" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF" override="true">
<include name="osgi-deployers-jboss-beans.xml" />
</fileset>
+ <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true">
+ <include name="org.eclipse.osgi.services.jar" />
+ </fileset>
</pack>
Modified: projects/jboss-osgi/trunk/microcontainer/osgi-int/.classpath
===================================================================
--- projects/jboss-osgi/trunk/microcontainer/osgi-int/.classpath 2009-04-03 13:22:29 UTC (rev 86746)
+++ projects/jboss-osgi/trunk/microcontainer/osgi-int/.classpath 2009-04-03 13:22:37 UTC (rev 86747)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main/javacc"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
Modified: projects/jboss-osgi/trunk/microcontainer/osgi-int/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/microcontainer/osgi-int/pom.xml 2009-04-03 13:22:29 UTC (rev 86746)
+++ projects/jboss-osgi/trunk/microcontainer/osgi-int/pom.xml 2009-04-03 13:22:37 UTC (rev 86747)
@@ -11,24 +11,6 @@
<version>1.0.0.Beta1</version>
</parent>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>javacc-maven-plugin</artifactId>
- <version>2.1</version>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <goals>
- <goal>javacc</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
<dependencies>
<!-- Global dependencies -->
<dependency>
@@ -93,6 +75,7 @@
</exclusion>
</exclusions>
</dependency>
+
<!-- Test dependencies -->
<dependency>
<groupId>org.jboss</groupId>
@@ -120,4 +103,23 @@
<scope>test</scope>
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javacc-maven-plugin</artifactId>
+ <version>2.1</version>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>javacc</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: projects/jboss-osgi/trunk/runtime/deployer/.classpath
===================================================================
--- projects/jboss-osgi/trunk/runtime/deployer/.classpath 2009-04-03 13:22:29 UTC (rev 86746)
+++ projects/jboss-osgi/trunk/runtime/deployer/.classpath 2009-04-03 13:22:37 UTC (rev 86747)
@@ -1,7 +1,6 @@
<?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"/>
Modified: projects/jboss-osgi/trunk/runtime/equinox/.classpath
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/.classpath 2009-04-03 13:22:29 UTC (rev 86746)
+++ projects/jboss-osgi/trunk/runtime/equinox/.classpath 2009-04-03 13:22:37 UTC (rev 86747)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry kind="src" path="src/testsuite/java"/>
<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
<classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/>
Modified: projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml 2009-04-03 13:22:29 UTC (rev 86746)
+++ projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml 2009-04-03 13:22:37 UTC (rev 86747)
@@ -4,23 +4,46 @@
<!-- The OSGiFramework -->
<bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.equinox.framework.EquinoxIntegration">
- <property name="frameworkProperties">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
- </map>
- </property>
+ <property name="frameworkProperties">
+ <map keyClass="java.lang.String" valueClass="java.lang.String">
+ <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
+ <entry><key>org.osgi.service.http.port</key><value>8090</value></entry>
+ <entry><key>osgi.framework</key><value>${jboss.server.home.url}/deployers/osgi.deployer/org.eclipse.osgi.jar</value></entry>
+ <entry><key>osgi.install.area</key><value>${jboss.server.data.dir}/equinox</value></entry>
+ <entry><key>felix.cm.dir</key><value>${jboss.server.data.dir}/osgi-configadmin</value></entry>
+ <entry>
+ <key>org.osgi.framework.system.packages</key>
+ <value>
+ javax.management,
+ javax.xml.parsers,
+ org.jboss.logging,
+ org.jboss.osgi.service,
+ org.jboss.osgi.spi.management,
+ org.osgi.framework; version=1.4,
+ org.osgi.service.packageadmin; version=1.2,
+ org.osgi.service.startlevel; version=1.1,
+ org.xml.sax
+ </value>
+ </entry>
+ <!--
+ If set to 'true' bundles can be deployed in any order. Deployed bundle will get started when their dependencies can be resolved.
+ If set to 'false' bundles must be deployed in the order that is required to start them.
+ -->
+ <entry><key>org.jboss.osgi.deferred.start</key><value>true</value></entry>
+ </map>
+ </property>
</bean>
<!-- The Framework Management -->
<bean name="jboss.osgi:service=ManagedFramework" class="org.jboss.osgi.spi.management.ManagedFramework">
- <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+ <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
</bean>
<!-- A Service that gives access to the Microcontainer Kernel -->
<bean name="jboss.osgi:service=Microcontainer" class="org.jboss.osgi.service.MicrocontainerService">
- <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext"/></property>
- <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
- <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property>
+ <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext"/></property>
+ <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+ <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property>
</bean>
<!-- The OSGi MetaData Deployer -->
Modified: projects/jboss-osgi/trunk/runtime/felix/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-04-03 13:22:29 UTC (rev 86746)
+++ projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-04-03 13:22:37 UTC (rev 86747)
@@ -127,54 +127,7 @@
<!-- Profiles -->
<profiles>
-
<!--
- Name: framework-default
- Descr: Setup for default integration testing
- -->
- <profile>
- <id>framework-default</id>
- <activation>
- <property>
- <name>!framework</name>
- </property>
- </activation>
- <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: framework-felix
Descr: Setup for Felix integration testing
-->
Modified: projects/jboss-osgi/trunk/service/logging/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/service/logging/pom.xml 2009-04-03 13:22:29 UTC (rev 86746)
+++ projects/jboss-osgi/trunk/service/logging/pom.xml 2009-04-03 13:22:37 UTC (rev 86747)
@@ -22,7 +22,12 @@
<!-- Dependencies -->
<dependencies>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <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>
17 years, 3 months
- 1
- 0
JBoss-OSGI SVN: r86737 - in projects/jboss-osgi/trunk: runtime/deployer and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-04-03 06:55:34 -0400 (Fri, 03 Apr 2009)
New Revision: 86737
Modified:
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/runtime/deployer/pom.xml
Log:
Add org.osgi dependencies to deployer in scope provided
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-04-03 10:35:38 UTC (rev 86736)
+++ projects/jboss-osgi/trunk/pom.xml 2009-04-03 10:55:34 UTC (rev 86737)
@@ -36,7 +36,7 @@
<!-- Properties -->
<properties>
<version.aqute.bnd>0.0.249</version.aqute.bnd>
- <version.eclipse.osgi>3.4.2</version.eclipse.osgi>
+ <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>
@@ -58,10 +58,10 @@
<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.log4j>1.2.14</version.log4j>
<version.osgi>r4v41</version.osgi>
- <version.org.jboss.test>1.0.5.GA</version.org.jboss.test>
</properties>
<!-- DependencyManagement -->
@@ -93,16 +93,6 @@
<version>${version.izpack}</version>
</dependency>
<dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>org.eclipse.osgi</artifactId>
- <version>${version.eclipse.osgi}</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.equinox</groupId>
- <artifactId>org.eclipse.osgi.services</artifactId>
- <version>${version.eclipse.osgi}</version>
- </dependency>
- <dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
<version>${version.jboss.common.core}</version>
@@ -194,6 +184,18 @@
<version>${version.osgi}</version>
</dependency>
+ <!-- Equinox Dependencies -->
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
+ <version>${version.equinox}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>org.eclipse.osgi.services</artifactId>
+ <version>${version.equinox}</version>
+ </dependency>
+
<!-- Felix Dependencies -->
<dependency>
<groupId>org.apache.felix</groupId>
@@ -245,7 +247,7 @@
<dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-test</artifactId>
- <version>${version.org.jboss.test}</version>
+ <version>${version.jboss.test}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: projects/jboss-osgi/trunk/runtime/deployer/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/deployer/pom.xml 2009-04-03 10:35:38 UTC (rev 86736)
+++ projects/jboss-osgi/trunk/runtime/deployer/pom.xml 2009-04-03 10:55:34 UTC (rev 86737)
@@ -22,6 +22,16 @@
<!-- 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.osgi</groupId>
<artifactId>jboss-osgi-runtime-spi</artifactId>
<version>${version}</version>
17 years, 3 months
- 1
- 0
JBoss-OSGI SVN: r86736 - in projects/jboss-osgi/trunk: runtime/equinox and 1 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-04-03 06:35:38 -0400 (Fri, 03 Apr 2009)
New Revision: 86736
Modified:
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/runtime/equinox/pom.xml
projects/jboss-osgi/trunk/service/webconsole/pom.xml
Log:
Clean equinox dependencies
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-04-03 09:48:37 UTC (rev 86735)
+++ projects/jboss-osgi/trunk/pom.xml 2009-04-03 10:35:38 UTC (rev 86736)
@@ -36,6 +36,7 @@
<!-- Properties -->
<properties>
<version.aqute.bnd>0.0.249</version.aqute.bnd>
+ <version.eclipse.osgi>3.4.2</version.eclipse.osgi>
<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>
@@ -45,6 +46,7 @@
<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>
@@ -71,6 +73,11 @@
<version>${version.aqute.bnd}</version>
</dependency>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${version.javax.servlet}</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${version.junit}</version>
@@ -86,6 +93,16 @@
<version>${version.izpack}</version>
</dependency>
<dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
+ <version>${version.eclipse.osgi}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>org.eclipse.osgi.services</artifactId>
+ <version>${version.eclipse.osgi}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
<version>${version.jboss.common.core}</version>
Modified: projects/jboss-osgi/trunk/runtime/equinox/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/pom.xml 2009-04-03 09:48:37 UTC (rev 86735)
+++ projects/jboss-osgi/trunk/runtime/equinox/pom.xml 2009-04-03 10:35:38 UTC (rev 86736)
@@ -23,15 +23,23 @@
<!-- Dependencies -->
<dependencies>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-runtime-spi</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.eclipse</groupId>
- <artifactId>osgi</artifactId>
- <version>3.4.3.R34x_v20081215-1030</version>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.eclipse.equinox</groupId>
+ <artifactId>org.eclipse.osgi.services</artifactId>
+ </dependency>
<!-- Test Dependencies -->
<dependency>
Modified: projects/jboss-osgi/trunk/service/webconsole/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/service/webconsole/pom.xml 2009-04-03 09:48:37 UTC (rev 86735)
+++ projects/jboss-osgi/trunk/service/webconsole/pom.xml 2009-04-03 10:35:38 UTC (rev 86736)
@@ -14,6 +14,63 @@
<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>
@@ -85,59 +142,4 @@
</plugins>
</build>
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.4</version>
- <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>
</project>
17 years, 3 months
- 1
- 0
JBoss-OSGI SVN: r86735 - in projects/jboss-osgi/trunk: microcontainer/osgi-int and 6 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-04-03 05:48:37 -0400 (Fri, 03 Apr 2009)
New Revision: 86735
Added:
projects/jboss-osgi/trunk/microcontainer/osgi-int/.settings/org.maven.ide.eclipse.prefs
projects/jboss-osgi/trunk/repository/api/.settings/org.maven.ide.eclipse.prefs
Modified:
projects/jboss-osgi/trunk/microcontainer/osgi-int/pom.xml
projects/jboss-osgi/trunk/microcontainer/osgi-int/src/main/java/org/jboss/osgi/plugins/facade/BundleImpl.java
projects/jboss-osgi/trunk/microcontainer/osgi-int/src/main/java/org/jboss/osgi/plugins/facade/ServiceReferenceImpl.java
projects/jboss-osgi/trunk/pom.xml
projects/jboss-osgi/trunk/repository/api/pom.xml
projects/jboss-osgi/trunk/runtime/equinox/pom.xml
projects/jboss-osgi/trunk/runtime/spi/pom.xml
Log:
Upgrade to org.osgi-r4v41
Added: projects/jboss-osgi/trunk/microcontainer/osgi-int/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- projects/jboss-osgi/trunk/microcontainer/osgi-int/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ projects/jboss-osgi/trunk/microcontainer/osgi-int/.settings/org.maven.ide.eclipse.prefs 2009-04-03 09:48:37 UTC (rev 86735)
@@ -0,0 +1,9 @@
+#Fri Apr 03 11:35:09 CEST 2009
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Modified: projects/jboss-osgi/trunk/microcontainer/osgi-int/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/microcontainer/osgi-int/pom.xml 2009-04-03 09:48:13 UTC (rev 86734)
+++ projects/jboss-osgi/trunk/microcontainer/osgi-int/pom.xml 2009-04-03 09:48:37 UTC (rev 86735)
@@ -45,9 +45,13 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
+ <artifactId>org.osgi.core</artifactId>
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.aop</groupId>
<artifactId>jboss-aop</artifactId>
<exclusions>
Modified: projects/jboss-osgi/trunk/microcontainer/osgi-int/src/main/java/org/jboss/osgi/plugins/facade/BundleImpl.java
===================================================================
--- projects/jboss-osgi/trunk/microcontainer/osgi-int/src/main/java/org/jboss/osgi/plugins/facade/BundleImpl.java 2009-04-03 09:48:13 UTC (rev 86734)
+++ projects/jboss-osgi/trunk/microcontainer/osgi-int/src/main/java/org/jboss/osgi/plugins/facade/BundleImpl.java 2009-04-03 09:48:37 UTC (rev 86735)
@@ -42,6 +42,7 @@
import org.jboss.virtual.VirtualFile;
import org.osgi.framework.AdminPermission;
import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
import org.osgi.framework.ServiceReference;
@@ -350,4 +351,22 @@
+ unit.getName(), e);
}
}
+
+ public BundleContext getBundleContext()
+ {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public void start(int options) throws BundleException
+ {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void stop(int options) throws BundleException
+ {
+ // TODO Auto-generated method stub
+
+ }
}
Modified: projects/jboss-osgi/trunk/microcontainer/osgi-int/src/main/java/org/jboss/osgi/plugins/facade/ServiceReferenceImpl.java
===================================================================
--- projects/jboss-osgi/trunk/microcontainer/osgi-int/src/main/java/org/jboss/osgi/plugins/facade/ServiceReferenceImpl.java 2009-04-03 09:48:13 UTC (rev 86734)
+++ projects/jboss-osgi/trunk/microcontainer/osgi-int/src/main/java/org/jboss/osgi/plugins/facade/ServiceReferenceImpl.java 2009-04-03 09:48:37 UTC (rev 86735)
@@ -55,4 +55,10 @@
{
return false; //To change body of implemented methods use File | Settings | File Templates.
}
+
+ public int compareTo(Object reference)
+ {
+ // TODO Auto-generated method stub
+ return 0;
+ }
}
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-04-03 09:48:13 UTC (rev 86734)
+++ projects/jboss-osgi/trunk/pom.xml 2009-04-03 09:48:37 UTC (rev 86735)
@@ -58,7 +58,7 @@
<version.jboss.microcontainer>2.0.4.GA</version.jboss.microcontainer>
<version.junit>4.4</version.junit>
<version.log4j>1.2.14</version.log4j>
- <version.osgi.r4.core>1.0</version.osgi.r4.core>
+ <version.osgi>r4v41</version.osgi>
<version.org.jboss.test>1.0.5.GA</version.org.jboss.test>
</properties>
@@ -168,9 +168,14 @@
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
- <version>${version.osgi.r4.core}</version>
+ <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>
<!-- Felix Dependencies -->
<dependency>
Added: projects/jboss-osgi/trunk/repository/api/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- projects/jboss-osgi/trunk/repository/api/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ projects/jboss-osgi/trunk/repository/api/.settings/org.maven.ide.eclipse.prefs 2009-04-03 09:48:37 UTC (rev 86735)
@@ -0,0 +1,9 @@
+#Fri Apr 03 11:35:09 CEST 2009
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Modified: projects/jboss-osgi/trunk/repository/api/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/repository/api/pom.xml 2009-04-03 09:48:13 UTC (rev 86734)
+++ projects/jboss-osgi/trunk/repository/api/pom.xml 2009-04-03 09:48:37 UTC (rev 86735)
@@ -15,7 +15,7 @@
<dependencies>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>osgi_R4_core</artifactId>
+ <artifactId>org.osgi.core</artifactId>
</dependency>
</dependencies>
</project>
Modified: projects/jboss-osgi/trunk/runtime/equinox/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/pom.xml 2009-04-03 09:48:13 UTC (rev 86734)
+++ projects/jboss-osgi/trunk/runtime/equinox/pom.xml 2009-04-03 09:48:37 UTC (rev 86735)
@@ -32,10 +32,6 @@
<artifactId>osgi</artifactId>
<version>3.4.3.R34x_v20081215-1030</version>
</dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </dependency>
<!-- Test Dependencies -->
<dependency>
@@ -225,7 +221,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <!-- argLine>${surefire.security.args}</argLine -->
+ <argLine>${surefire.security.args}</argLine>
<excludes>
<!-- Exclude all testsuite tests -->
<exclude>org/jboss/test/osgi/jbosgi*/**</exclude>
Modified: projects/jboss-osgi/trunk/runtime/spi/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/spi/pom.xml 2009-04-03 09:48:13 UTC (rev 86734)
+++ projects/jboss-osgi/trunk/runtime/spi/pom.xml 2009-04-03 09:48:37 UTC (rev 86735)
@@ -19,8 +19,9 @@
<!-- Dependencies -->
<dependencies>
<dependency>
- <groupId>org.apache.felix</groupId>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.deployers</groupId>
17 years, 3 months
- 1
- 0
JBoss-OSGI SVN: r86731 - projects/jboss-osgi/trunk/runtime/equinox.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-04-03 03:34:33 -0400 (Fri, 03 Apr 2009)
New Revision: 86731
Modified:
projects/jboss-osgi/trunk/runtime/equinox/pom.xml
Log:
Temp disable security manager for equinox
Modified: projects/jboss-osgi/trunk/runtime/equinox/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/pom.xml 2009-04-03 07:33:12 UTC (rev 86730)
+++ projects/jboss-osgi/trunk/runtime/equinox/pom.xml 2009-04-03 07:34:33 UTC (rev 86731)
@@ -225,7 +225,7 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>${surefire.security.args}</argLine>
+ <!-- argLine>${surefire.security.args}</argLine -->
<excludes>
<!-- Exclude all testsuite tests -->
<exclude>org/jboss/test/osgi/jbosgi*/**</exclude>
17 years, 3 months
- 1
- 0