JBoss-OSGI SVN: r86588 - in projects/jboss-osgi/trunk: build/distribution/scripts and 14 other directories.
by jboss-osgi-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-04-01 09:39:25 -0400 (Wed, 01 Apr 2009)
New Revision: 86588
Added:
projects/jboss-osgi/trunk/runtime/equinox/scripts/
projects/jboss-osgi/trunk/runtime/equinox/scripts/assembly-config.xml
projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/jboss-osgi-beans.xml
projects/jboss-osgi/trunk/runtime/felix/scripts/
projects/jboss-osgi/trunk/runtime/felix/scripts/assembly-config.xml
projects/jboss-osgi/trunk/runtime/felix/src/main/resources/jboss-osgi-beans.xml
projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml
Removed:
projects/jboss-osgi/trunk/runtime/deployer/scripts/
projects/jboss-osgi/trunk/runtime/deployer/src/main/resources/
projects/jboss-osgi/trunk/testsuite/src/test/resources/jboss-osgi-beans.xml
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/runtime/deployer/pom.xml
projects/jboss-osgi/trunk/runtime/equinox/pom.xml
projects/jboss-osgi/trunk/runtime/felix/pom.xml
projects/jboss-osgi/trunk/runtime/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java
projects/jboss-osgi/trunk/runtime/felix/src/test/resources/jboss-osgi-beans.xml
projects/jboss-osgi/trunk/testsuite/pom.xml
projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTestCase.java
Log:
Allow testsuite to run against multiple frameworks
Modified: projects/jboss-osgi/trunk/build/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-04-01 13:33:14 UTC (rev 86587)
+++ projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-04-01 13:39:25 UTC (rev 86588)
@@ -59,6 +59,12 @@
<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>
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-01 13:33:14 UTC (rev 86587)
+++ projects/jboss-osgi/trunk/build/distribution/scripts/assembly-deploy-artifacts.xml 2009-04-01 13:39:25 UTC (rev 86588)
@@ -30,10 +30,10 @@
<!-- resources -->
<dependencySet>
- <outputDirectory>resources/jboss-osgi-runtime-deployer-config</outputDirectory>
+ <outputDirectory>resources/jboss-osgi-runtime-felix</outputDirectory>
<useStrictFiltering>true</useStrictFiltering>
<includes>
- <include>*:jboss-osgi-runtime-deployer:jar:config</include>
+ <include>*:jboss-osgi-runtime-felix:jar:config</include>
</includes>
<unpack>true</unpack>
</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-01 13:33:14 UTC (rev 86587)
+++ projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml 2009-04-01 13:39:25 UTC (rev 86588)
@@ -149,7 +149,7 @@
<include name="org.apache.felix.framework.jar" />
<include name="org.osgi.core.jar" />
</fileset>
- <fileset dir="@{deploy.artifacts.dir}/resources/jboss-osgi-runtime-deployer-config" targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer/META-INF" override="true">
+ <fileset 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>
Modified: projects/jboss-osgi/trunk/runtime/deployer/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/deployer/pom.xml 2009-04-01 13:33:14 UTC (rev 86587)
+++ projects/jboss-osgi/trunk/runtime/deployer/pom.xml 2009-04-01 13:39:25 UTC (rev 86588)
@@ -41,32 +41,6 @@
<!-- Build -->
<build>
<plugins>
- <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-jar-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>*beans.xml</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</build>
Modified: projects/jboss-osgi/trunk/runtime/equinox/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/pom.xml 2009-04-01 13:33:14 UTC (rev 86587)
+++ projects/jboss-osgi/trunk/runtime/equinox/pom.xml 2009-04-01 13:39:25 UTC (rev 86588)
@@ -48,6 +48,32 @@
<!-- Build -->
<build>
<plugins>
+ <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-jar-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>*beans.xml</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
Property changes on: projects/jboss-osgi/trunk/runtime/equinox/scripts
___________________________________________________________________
Name: svn:mergeinfo
+
Added: projects/jboss-osgi/trunk/runtime/equinox/scripts/assembly-config.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/scripts/assembly-config.xml (rev 0)
+++ projects/jboss-osgi/trunk/runtime/equinox/scripts/assembly-config.xml 2009-04-01 13:39:25 UTC (rev 86588)
@@ -0,0 +1,17 @@
+<assembly 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/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+ <id>config</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${project.build.outputDirectory}</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>*beans.xml</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Added: 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 (rev 0)
+++ projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/jboss-osgi-beans.xml 2009-04-01 13:39:25 UTC (rev 86588)
@@ -0,0 +1,34 @@
+<!--
+ $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>
+
+ <!-- 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>
Property changes on: projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/jboss-osgi-beans.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: projects/jboss-osgi/trunk/runtime/felix/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-04-01 13:33:14 UTC (rev 86587)
+++ projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-04-01 13:39:25 UTC (rev 86588)
@@ -47,6 +47,32 @@
<!-- Build -->
<build>
<plugins>
+ <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-jar-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>*beans.xml</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
Added: projects/jboss-osgi/trunk/runtime/felix/scripts/assembly-config.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/scripts/assembly-config.xml (rev 0)
+++ projects/jboss-osgi/trunk/runtime/felix/scripts/assembly-config.xml 2009-04-01 13:39:25 UTC (rev 86588)
@@ -0,0 +1,17 @@
+<assembly 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/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+ <id>config</id>
+ <formats>
+ <format>jar</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${project.build.outputDirectory}</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>*beans.xml</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on: projects/jboss-osgi/trunk/runtime/felix/scripts/assembly-config.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: projects/jboss-osgi/trunk/runtime/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java 2009-04-01 13:33:14 UTC (rev 86587)
+++ projects/jboss-osgi/trunk/runtime/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java 2009-04-01 13:39:25 UTC (rev 86588)
@@ -48,20 +48,20 @@
// Provide logging
final Logger log = Logger.getLogger(FelixIntegration.class);
- private Map<String, Object> felixProperties = new HashMap<String, Object>();
+ private Map<String, Object> frameworkProperties = new HashMap<String, Object>();
private List<URI> autoInstall = new ArrayList<URI>();
private List<URI> autoStart = new ArrayList<URI>();
- private Felix felix;
+ private Felix framework;
- public Map<String, Object> getFelixProperties()
+ public Map<String, Object> getFrameworkProperties()
{
- return felixProperties;
+ return frameworkProperties;
}
- public void setFelixProperties(Map<String, Object> props)
+ public void setFrameworkProperties(Map<String, Object> props)
{
- this.felixProperties = props;
+ this.frameworkProperties = props;
}
public List<URI> getAutoInstall()
@@ -86,7 +86,7 @@
public Bundle getSystemBundle()
{
- return felix;
+ return framework;
}
public BundleContext getSystemBundleContext()
@@ -101,16 +101,16 @@
// When a Felix instance is embedded in a host application,
// the host application must inform the Felix instance that it is embedded
- felixProperties.put("felix.embedded.execution", "true");
+ frameworkProperties.put("felix.embedded.execution", "true");
// An instance of Logger that the framework uses as its default logger
- felixProperties.put("felix.log.logger", new FelixLogger());
+ frameworkProperties.put("felix.log.logger", new FelixLogger());
// Init & Start the System Bundle
try
{
- felix = new Felix(felixProperties);
- felix.start();
+ framework = new Felix(frameworkProperties);
+ framework.start();
}
catch (BundleException ex)
{
@@ -121,7 +121,7 @@
public void start()
{
// Get system bundle context
- BundleContext context = felix.getBundleContext();
+ BundleContext context = framework.getBundleContext();
if (context == null)
throw new FrameworkException("Cannot obtain system context");
@@ -166,11 +166,11 @@
public void stop()
{
- if (felix != null)
+ if (framework != null)
{
try
{
- felix.stop();
+ framework.stop();
}
catch (BundleException ex)
{
Copied: projects/jboss-osgi/trunk/runtime/felix/src/main/resources/jboss-osgi-beans.xml (from rev 86569, projects/jboss-osgi/trunk/testsuite/src/test/resources/jboss-osgi-beans.xml)
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/src/main/resources/jboss-osgi-beans.xml (rev 0)
+++ projects/jboss-osgi/trunk/runtime/felix/src/main/resources/jboss-osgi-beans.xml 2009-04-01 13:39:25 UTC (rev 86588)
@@ -0,0 +1,41 @@
+<!--
+ $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>
+ <entry>
+ <key>org.osgi.framework.system.packages</key>
+ <value>
+ org.osgi.framework; version=1.4,
+ org.osgi.util.tracker
+ </value>
+ </entry>
+ </map>
+ </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>
Copied: projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml (from rev 86569, projects/jboss-osgi/trunk/runtime/deployer/src/main/resources/osgi-deployers-jboss-beans.xml)
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml (rev 0)
+++ projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-deployers-jboss-beans.xml 2009-04-01 13:39:25 UTC (rev 86588)
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment 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</key><value>${jboss.server.data.dir}/osgi-store</value></entry>
+ <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>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>
+ <property name="autoStart">
+ <list elementClass="java.net.URI">
+ <value>${jboss.server.home.url}/deploy/osgi/org.osgi.compendium.jar</value>
+ <value>${jboss.server.home.url}/deploy/osgi/jboss-osgi-service-logging.jar</value>
+ </list>
+ </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>
+ </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>
+ </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>
+
+ <!-- The Bundle Management Deployer -->
+ <bean name="jboss.osgi:service=BundleManagementDeployer" class="org.jboss.osgi.deployer.BundleManagementDeployer">
+ <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+ </bean>
+
+</deployment>
\ No newline at end of file
Modified: 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-01 13:33:14 UTC (rev 86587)
+++ projects/jboss-osgi/trunk/runtime/felix/src/test/resources/jboss-osgi-beans.xml 2009-04-01 13:39:25 UTC (rev 86588)
@@ -5,7 +5,7 @@
<!-- The OSGiFramework -->
<bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.felix.framework.FelixIntegration">
- <property name="felixProperties">
+ <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>
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-04-01 13:33:14 UTC (rev 86587)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-04-01 13:39:25 UTC (rev 86588)
@@ -24,16 +24,15 @@
<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-deployer</artifactId>
<version>${version}</version>
</dependency>
<dependency>
+ <groupId>biz.aQute</groupId>
+ <artifactId>bnd</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.compendium</artifactId>
</dependency>
@@ -41,10 +40,6 @@
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-aop-mc-int</artifactId>
</dependency>
- <dependency>
- <groupId>biz.aQute</groupId>
- <artifactId>bnd</artifactId>
- </dependency>
<!-- Test Dependencies -->
<dependency>
@@ -99,11 +94,91 @@
<profiles>
<!--
- Name: embedded-framework
+ Name: framework-default
+ Descr: Setup for default framework 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>
+ </profile>
+
+ <!--
+ Name: framework-felix
+ Descr: Setup for Felix framework testing
+ -->
+ <profile>
+ <id>framework-felix</id>
+ <activation>
+ <property>
+ <name>framework</name>
+ <value>felix</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-felix</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-felix</artifactId>
+ <version>${version}</version>
+ <classifier>config</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <!--
+ Name: framework-equinox
+ Descr: Setup for Felix framework testing
+ -->
+ <profile>
+ <id>framework-equinox</id>
+ <activation>
+ <property>
+ <name>framework</name>
+ <value>equinox</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-equinox</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-equinox</artifactId>
+ <version>${version}</version>
+ <classifier>config</classifier>
+ </dependency>
+ </dependencies>
+ </profile>
+
+ <!--
+ Name: embedded-tesing
Descr: Setup for embedded integration testing
-->
<profile>
- <id>embedded-framework</id>
+ <id>embedded-tesing</id>
<activation>
<property>
<name>!jboss.bind.address</name>
@@ -131,11 +206,11 @@
</profile>
<!--
- Name: remote-framework
+ Name: remote-tesing
Descr: Setup for remote integration testing
-->
<profile>
- <id>remote-framework</id>
+ <id>remote-tesing</id>
<activation>
<property>
<name>jboss.bind.address</name>
Modified: projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTestCase.java 2009-04-01 13:33:14 UTC (rev 86587)
+++ projects/jboss-osgi/trunk/testsuite/src/test/java/org/jboss/test/osgi/bootstrap/BootstrapTestCase.java 2009-04-01 13:39:25 UTC (rev 86588)
@@ -47,7 +47,7 @@
Bundle bundle = framework.getSystemBundle();
assertEquals("BundleId == 0", 0, bundle.getBundleId());
- assertEquals("SymbolicName == system.bundle", "system.bundle", bundle.getSymbolicName());
+ assertNotNull("SymbolicName not null", bundle.getSymbolicName());
MainDeployer mainDeployer = bootProvider.getInstance("MainDeployer", MainDeployer.class);
assertNotNull("MainDeployer not null", mainDeployer);
Deleted: projects/jboss-osgi/trunk/testsuite/src/test/resources/jboss-osgi-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/src/test/resources/jboss-osgi-beans.xml 2009-04-01 13:33:14 UTC (rev 86587)
+++ projects/jboss-osgi/trunk/testsuite/src/test/resources/jboss-osgi-beans.xml 2009-04-01 13:39:25 UTC (rev 86588)
@@ -1,41 +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="felixProperties">
- <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.framework.system.packages</key>
- <value>
- org.osgi.framework; version=1.4,
- org.osgi.util.tracker
- </value>
- </entry>
- </map>
- </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>
16 years, 8 months
JBoss-OSGI SVN: r86586 - projects/jboss-osgi/trunk/runtime/equinox/src/main/java/org/jboss/osgi/equinox/framework.
by jboss-osgi-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-04-01 08:56:23 -0400 (Wed, 01 Apr 2009)
New Revision: 86586
Added:
projects/jboss-osgi/trunk/runtime/equinox/src/main/java/org/jboss/osgi/equinox/framework/FrameworkAdaptorImpl.java
Log:
[JBOSGI-36] Add basic Equinox integration
Added: projects/jboss-osgi/trunk/runtime/equinox/src/main/java/org/jboss/osgi/equinox/framework/FrameworkAdaptorImpl.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/src/main/java/org/jboss/osgi/equinox/framework/FrameworkAdaptorImpl.java (rev 0)
+++ projects/jboss-osgi/trunk/runtime/equinox/src/main/java/org/jboss/osgi/equinox/framework/FrameworkAdaptorImpl.java 2009-04-01 12:56:23 UTC (rev 86586)
@@ -0,0 +1,40 @@
+/*
+ * 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.equinox.framework;
+
+//$Id$
+
+import org.eclipse.osgi.baseadaptor.BaseAdaptor;
+
+/**
+ * An extension to the Equinox {@link BaseAdaptor}
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 01-Apr-2009
+ */
+public class FrameworkAdaptorImpl extends BaseAdaptor
+{
+ public FrameworkAdaptorImpl()
+ {
+ super(null);
+ }
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/trunk/runtime/equinox/src/main/java/org/jboss/osgi/equinox/framework/FrameworkAdaptorImpl.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 8 months
JBoss-OSGI SVN: r86585 - in projects/jboss-osgi/trunk: build/distribution/scripts and 15 other directories.
by jboss-osgi-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-04-01 08:55:57 -0400 (Wed, 01 Apr 2009)
New Revision: 86585
Added:
projects/jboss-osgi/trunk/runtime/equinox/.classpath
projects/jboss-osgi/trunk/runtime/equinox/.project
projects/jboss-osgi/trunk/runtime/equinox/.settings/
projects/jboss-osgi/trunk/runtime/equinox/.settings/org.eclipse.jdt.core.prefs
projects/jboss-osgi/trunk/runtime/equinox/.settings/org.maven.ide.eclipse.prefs
projects/jboss-osgi/trunk/runtime/equinox/pom.xml
projects/jboss-osgi/trunk/runtime/equinox/src/
projects/jboss-osgi/trunk/runtime/equinox/src/main/java/org/jboss/osgi/equinox/
projects/jboss-osgi/trunk/runtime/equinox/src/main/java/org/jboss/osgi/equinox/framework/EquinoxIntegration.java
projects/jboss-osgi/trunk/runtime/equinox/src/test/java/org/jboss/test/osgi/equinox/
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
Removed:
projects/jboss-osgi/trunk/runtime/equinox/src/main/java/org/jboss/osgi/equinox/framework/FelixIntegration.java
projects/jboss-osgi/trunk/runtime/equinox/src/main/java/org/jboss/osgi/equinox/framework/FelixLogger.java
projects/jboss-osgi/trunk/runtime/equinox/src/main/java/org/jboss/osgi/felix/
projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-jboss-beans.xml
projects/jboss-osgi/trunk/runtime/equinox/src/test/java/org/jboss/osgi/
projects/jboss-osgi/trunk/runtime/equinox/src/test/java/org/jboss/test/osgi/equinox/microcontainer/
projects/jboss-osgi/trunk/runtime/equinox/src/test/java/org/jboss/test/osgi/equinox/system/
projects/jboss-osgi/trunk/runtime/equinox/src/test/java/org/jboss/test/osgi/felix/
projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/microcontainer/
projects/jboss-osgi/trunk/runtime/felix/scripts/
projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-jboss-beans.xml
projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/osgi/
projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/system/
Modified:
projects/jboss-osgi/trunk/build/distribution/pom.xml
projects/jboss-osgi/trunk/build/distribution/scripts/assembly-deploy-artifacts.xml
projects/jboss-osgi/trunk/runtime/equinox/
projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/jboss-osgi-beans.xml
projects/jboss-osgi/trunk/runtime/felix/pom.xml
projects/jboss-osgi/trunk/runtime/pom.xml
Log:
[JBOSGI-36] Add basic Equinox integration
Modified: projects/jboss-osgi/trunk/build/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-04-01 10:55:17 UTC (rev 86584)
+++ projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-04-01 12:55:57 UTC (rev 86585)
@@ -59,12 +59,6 @@
<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>
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-01 10:55:17 UTC (rev 86584)
+++ projects/jboss-osgi/trunk/build/distribution/scripts/assembly-deploy-artifacts.xml 2009-04-01 12:55:57 UTC (rev 86585)
@@ -37,14 +37,6 @@
</includes>
<unpack>true</unpack>
</dependencySet>
- <dependencySet>
- <outputDirectory>resources/jboss-osgi-runtime-felix-config</outputDirectory>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>*:jboss-osgi-runtime-felix:jar:config</include>
- </includes>
- <unpack>true</unpack>
- </dependencySet>
<!-- source -->
<dependencySet>
Property changes on: projects/jboss-osgi/trunk/runtime/equinox
___________________________________________________________________
Name: svn:ignore
+ target
Added: projects/jboss-osgi/trunk/runtime/equinox/.classpath
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/.classpath (rev 0)
+++ projects/jboss-osgi/trunk/runtime/equinox/.classpath 2009-04-01 12:55:57 UTC (rev 86585)
@@ -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/equinox/.project
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/.project (rev 0)
+++ projects/jboss-osgi/trunk/runtime/equinox/.project 2009-04-01 12:55:57 UTC (rev 86585)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>jboss-osgi-runtime-equinox</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.maven.ide.eclipse.maven2Nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Added: projects/jboss-osgi/trunk/runtime/equinox/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ projects/jboss-osgi/trunk/runtime/equinox/.settings/org.eclipse.jdt.core.prefs 2009-04-01 12:55:57 UTC (rev 86585)
@@ -0,0 +1,5 @@
+#Wed Apr 01 10:32:07 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/equinox/.settings/org.maven.ide.eclipse.prefs
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/.settings/org.maven.ide.eclipse.prefs (rev 0)
+++ projects/jboss-osgi/trunk/runtime/equinox/.settings/org.maven.ide.eclipse.prefs 2009-04-01 12:55:57 UTC (rev 86585)
@@ -0,0 +1,9 @@
+#Wed Apr 01 10:32:06 CEST 2009
+activeProfiles=
+eclipse.preferences.version=1
+fullBuildGoals=process-test-resources
+includeModules=false
+resolveWorkspaceProjects=true
+resourceFilterGoals=process-resources resources\:testResources
+skipCompilerPlugin=true
+version=1
Added: projects/jboss-osgi/trunk/runtime/equinox/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/pom.xml (rev 0)
+++ projects/jboss-osgi/trunk/runtime/equinox/pom.xml 2009-04-01 12:55:57 UTC (rev 86585)
@@ -0,0 +1,54 @@
+<?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 Equinox</name>
+ <description>JBossOSGi - Equinox Runtime</description>
+
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-equinox</artifactId>
+ <packaging>jar</packaging>
+
+ <parent>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime</artifactId>
+ <version>1.0.0.Beta1</version>
+ </parent>
+
+ <!-- Properties -->
+ <properties>
+ </properties>
+
+ <!-- Dependencies -->
+ <dependencies>
+ <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>
+ </dependency>
+
+ <!-- Test Dependencies -->
+ <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>
+ <plugins>
+ </plugins>
+ </build>
+
+</project>
Property changes on: projects/jboss-osgi/trunk/runtime/equinox/pom.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: projects/jboss-osgi/trunk/runtime/equinox/src (from rev 86569, projects/jboss-osgi/trunk/runtime/felix/src)
Property changes on: projects/jboss-osgi/trunk/runtime/equinox/src
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: projects/jboss-osgi/trunk/runtime/equinox/src/main/java/org/jboss/osgi/equinox (from rev 86569, projects/jboss-osgi/trunk/runtime/felix/src/main/java/org/jboss/osgi/felix)
Copied: projects/jboss-osgi/trunk/runtime/equinox/src/main/java/org/jboss/osgi/equinox/framework/EquinoxIntegration.java (from rev 86569, projects/jboss-osgi/trunk/runtime/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java)
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/src/main/java/org/jboss/osgi/equinox/framework/EquinoxIntegration.java (rev 0)
+++ projects/jboss-osgi/trunk/runtime/equinox/src/main/java/org/jboss/osgi/equinox/framework/EquinoxIntegration.java 2009-04-01 12:55:57 UTC (rev 86585)
@@ -0,0 +1,184 @@
+/*
+ * 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.equinox.framework;
+
+//$Id$
+
+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 java.util.Properties;
+
+import org.eclipse.core.runtime.adaptor.LocationManager;
+import org.eclipse.osgi.framework.internal.core.Framework;
+import org.eclipse.osgi.framework.internal.core.FrameworkProperties;
+import org.jboss.logging.Logger;
+import org.jboss.osgi.spi.FrameworkException;
+import org.jboss.osgi.spi.framework.OSGiFramework;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
+
+/**
+ * The OSGiFramework for Eclipse Equinox
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 01-Apr-2009
+ */
+public class EquinoxIntegration implements OSGiFramework
+{
+ // Provide logging
+ final Logger log = Logger.getLogger(EquinoxIntegration.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.getBundle(0);
+ }
+
+ public BundleContext getSystemBundleContext()
+ {
+ return getSystemBundle().getBundleContext();
+ }
+
+ public void create()
+ {
+ String implVersion = getClass().getPackage().getImplementationVersion();
+ log.info("OSGi Integration Equinox - " + implVersion);
+
+ // Push configured props to FrameworkProperties
+ System.setProperty("osgi.framework.useSystemProperties", "false");
+ Iterator<String> itKeys = frameworkProperties.keySet().iterator();
+ while (itKeys.hasNext())
+ {
+ String key = itKeys.next();
+ Object value = frameworkProperties.get(key);
+ if (value instanceof String)
+ {
+ FrameworkProperties.setProperty(key, (String)value);
+ }
+ }
+
+ // Prevent a NPE when the config area is not set
+ if (FrameworkProperties.getProperty(LocationManager.PROP_INSTALL_AREA) == null)
+ {
+ String userHome = FrameworkProperties.getProperty("user.home");
+ FrameworkProperties.setProperty(LocationManager.PROP_INSTALL_AREA, userHome + "/equinox");
+ }
+
+ // Init & Start the Framework
+ framework = new Framework(new FrameworkAdaptorImpl());
+ framework.launch();
+ }
+
+ 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
Deleted: projects/jboss-osgi/trunk/runtime/equinox/src/main/java/org/jboss/osgi/equinox/framework/FelixIntegration.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java 2009-04-01 05:26:19 UTC (rev 86569)
+++ projects/jboss-osgi/trunk/runtime/equinox/src/main/java/org/jboss/osgi/equinox/framework/FelixIntegration.java 2009-04-01 12:55:57 UTC (rev 86585)
@@ -1,181 +0,0 @@
-/*
- * 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.felix.framework;
-
-//$Id$
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.felix.framework.Felix;
-import org.jboss.logging.Logger;
-import org.jboss.osgi.spi.FrameworkException;
-import org.jboss.osgi.spi.framework.OSGiFramework;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleException;
-
-/**
- * An abstraction of an OSGi Framework
- *
- * @author thomas.diesler(a)jboss.com
- * @since 23-Jan-2009
- */
-public class FelixIntegration implements OSGiFramework
-{
- // Provide logging
- final Logger log = Logger.getLogger(FelixIntegration.class);
-
- private Map<String, Object> felixProperties = new HashMap<String, Object>();
- private List<URI> autoInstall = new ArrayList<URI>();
- private List<URI> autoStart = new ArrayList<URI>();
-
- private Felix felix;
-
- public Map<String, Object> getFelixProperties()
- {
- return felixProperties;
- }
-
- public void setFelixProperties(Map<String, Object> props)
- {
- this.felixProperties = 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 felix;
- }
-
- public BundleContext getSystemBundleContext()
- {
- return getSystemBundle().getBundleContext();
- }
-
- public void create()
- {
- String implVersion = getClass().getPackage().getImplementationVersion();
- log.info("OSGi Integration Felix - " + implVersion);
-
- // When a Felix instance is embedded in a host application,
- // the host application must inform the Felix instance that it is embedded
- felixProperties.put("felix.embedded.execution", "true");
-
- // An instance of Logger that the framework uses as its default logger
- felixProperties.put("felix.log.logger", new FelixLogger());
-
- // Init & Start the System Bundle
- try
- {
- felix = new Felix(felixProperties);
- felix.start();
- }
- catch (BundleException ex)
- {
- throw new FrameworkException("Cannot initialze system bundle", ex);
- }
- }
-
- public void start()
- {
- // Get system bundle context
- BundleContext context = felix.getBundleContext();
- 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 (felix != null)
- {
- try
- {
- felix.stop();
- }
- catch (BundleException ex)
- {
- log.error("Cannot stop Felix", ex);
- }
- }
- }
-}
\ No newline at end of file
Deleted: projects/jboss-osgi/trunk/runtime/equinox/src/main/java/org/jboss/osgi/equinox/framework/FelixLogger.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/src/main/java/org/jboss/osgi/felix/framework/FelixLogger.java 2009-04-01 05:26:19 UTC (rev 86569)
+++ projects/jboss-osgi/trunk/runtime/equinox/src/main/java/org/jboss/osgi/equinox/framework/FelixLogger.java 2009-04-01 12:55:57 UTC (rev 86585)
@@ -1,76 +0,0 @@
-/*
- * 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.felix.framework;
-
-//$Id: FelixIntegration.java 84730 2009-02-25 12:57:23Z thomas.diesler(a)jboss.com $
-
-import org.jboss.logging.Logger;
-import org.osgi.framework.ServiceReference;
-
-/**
- * An integration with the Felix Logger.
- *
- * This Logger gets registered with the Felix framework and
- * delegates framework log messages to the JBoss logger.
- *
- * @author thomas.diesler(a)jboss.com
- * @since 04-Mar-2009
- */
-public class FelixLogger extends org.apache.felix.framework.Logger
-{
- // Provide logging
- final Logger log = Logger.getLogger(FelixLogger.class);
-
- public FelixLogger()
- {
- setLogLevel(LOG_DEBUG);
- }
-
- @Override
- protected void doLog(ServiceReference sref, int level, String msg, Throwable throwable)
- {
- if (sref != null)
- msg = sref + ": " + msg;
-
- // An unresolved bundle causes a WARNING that comes with an exception
- // Currently we log WARNING exceptions at DEBUG level
-
- if (level == LOG_DEBUG)
- {
- log.debug(msg, throwable);
- }
- else if (level == LOG_INFO)
- {
- log.info(msg, throwable);
- }
- else if (level == LOG_WARNING)
- {
- log.warn(msg);
- if (throwable != null)
- log.debug(msg, throwable);
- }
- else if (level == LOG_ERROR)
- {
- log.error(msg, throwable);
- }
- }
-}
\ No newline at end of file
Deleted: projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-jboss-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-jboss-beans.xml 2009-04-01 05:26:19 UTC (rev 86569)
+++ projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-jboss-beans.xml 2009-04-01 12:55:57 UTC (rev 86585)
@@ -1,25 +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="felixProperties">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry>
- <key>org.osgi.framework.system.packages</key>
- <value>
- </value>
- </entry>
- </map>
- </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="bundleContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext"/></property>
- <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property>
- </bean>
-
-</deployment>
Copied: projects/jboss-osgi/trunk/runtime/equinox/src/test/java/org/jboss/test/osgi/equinox (from rev 86569, projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix)
Copied: projects/jboss-osgi/trunk/runtime/equinox/src/test/java/org/jboss/test/osgi/equinox/SystemBundleTestCase.java (from rev 86569, projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/system/SystemBundleTestCase.java)
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/src/test/java/org/jboss/test/osgi/equinox/SystemBundleTestCase.java (rev 0)
+++ projects/jboss-osgi/trunk/runtime/equinox/src/test/java/org/jboss/test/osgi/equinox/SystemBundleTestCase.java 2009-04-01 12:55:57 UTC (rev 86585)
@@ -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.equinox;
+
+//$Id$
+
+import org.jboss.osgi.equinox.framework.EquinoxIntegration;
+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()
+ {
+ EquinoxIntegration framework = new EquinoxIntegration();
+ framework.create();
+ framework.start();
+
+ Bundle bundle = framework.getSystemBundle();
+
+ assertEquals("BundleId == 0", 0, bundle.getBundleId());
+ assertEquals("SymbolicName == org.eclipse.osgi", "org.eclipse.osgi", 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 == org.eclipse.osgi", "org.eclipse.osgi", bundle.getSymbolicName());
+ }
+}
\ No newline at end of file
Modified: 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 2009-04-01 05:26:19 UTC (rev 86569)
+++ projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/jboss-osgi-beans.xml 2009-04-01 12:55:57 UTC (rev 86585)
@@ -4,17 +4,12 @@
<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="felixProperties">
+ <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>
- <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/felix/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-04-01 10:55:17 UTC (rev 86584)
+++ projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-04-01 12:55:57 UTC (rev 86585)
@@ -47,32 +47,6 @@
<!-- Build -->
<build>
<plugins>
- <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-jar-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>*beans.xml</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</build>
Deleted: projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-jboss-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-jboss-beans.xml 2009-04-01 10:55:17 UTC (rev 86584)
+++ projects/jboss-osgi/trunk/runtime/felix/src/main/resources/osgi-jboss-beans.xml 2009-04-01 12:55:57 UTC (rev 86585)
@@ -1,25 +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="felixProperties">
- <map keyClass="java.lang.String" valueClass="java.lang.String">
- <entry>
- <key>org.osgi.framework.system.packages</key>
- <value>
- </value>
- </entry>
- </map>
- </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="bundleContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext"/></property>
- <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property>
- </bean>
-
-</deployment>
Copied: projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/SystemBundleTestCase.java (from rev 86569, projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/system/SystemBundleTestCase.java)
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/SystemBundleTestCase.java (rev 0)
+++ projects/jboss-osgi/trunk/runtime/felix/src/test/java/org/jboss/test/osgi/felix/SystemBundleTestCase.java 2009-04-01 12:55:57 UTC (rev 86585)
@@ -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.felix;
+
+//$Id$
+
+import org.jboss.osgi.felix.framework.FelixIntegration;
+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 testFelixIntegration()
+ {
+ FelixIntegration framework = new FelixIntegration();
+ framework.create();
+ framework.start();
+
+ Bundle bundle = framework.getSystemBundle();
+
+ assertEquals("BundleId == 0", 0, bundle.getBundleId());
+ assertEquals("SymbolicName == system.bundle", "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", "system.bundle", bundle.getSymbolicName());
+ }
+}
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/runtime/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/pom.xml 2009-04-01 10:55:17 UTC (rev 86584)
+++ projects/jboss-osgi/trunk/runtime/pom.xml 2009-04-01 12:55:57 UTC (rev 86585)
@@ -14,6 +14,7 @@
<modules>
<module>spi</module>
<module>deployer</module>
+ <module>equinox</module>
<module>felix</module>
</modules>
16 years, 8 months
JBoss-OSGI SVN: r86578 - projects/jboss-osgi/trunk/service/webconsole.
by jboss-osgi-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-04-01 03:57:34 -0400 (Wed, 01 Apr 2009)
New Revision: 86578
Modified:
projects/jboss-osgi/trunk/service/webconsole/pom.xml
Log:
Use default maven-bundle-plugin
Modified: projects/jboss-osgi/trunk/service/webconsole/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/service/webconsole/pom.xml 2009-04-01 07:53:06 UTC (rev 86577)
+++ projects/jboss-osgi/trunk/service/webconsole/pom.xml 2009-04-01 07:57:34 UTC (rev 86578)
@@ -47,7 +47,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.4.3</version>
<extensions>true</extensions>
<configuration>
<instructions>
16 years, 8 months
JBoss-OSGI SVN: r86577 - in projects/jboss-osgi/trunk/service/webconsole: src/main/java/org/jboss/osgi/service/webconsole/internal/plugins and 1 other directory.
by jboss-osgi-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-04-01 03:53:06 -0400 (Wed, 01 Apr 2009)
New Revision: 86577
Removed:
projects/jboss-osgi/trunk/service/webconsole/LICENSE.felix
projects/jboss-osgi/trunk/service/webconsole/LICENSE.jquery
projects/jboss-osgi/trunk/service/webconsole/LICENSE.json
projects/jboss-osgi/trunk/service/webconsole/NOTICE
projects/jboss-osgi/trunk/service/webconsole/obr.xml
Modified:
projects/jboss-osgi/trunk/service/webconsole/pom.xml
projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/EventAdminPlugin.java
Log:
Make javax.portlet optional
Deleted: projects/jboss-osgi/trunk/service/webconsole/LICENSE.felix
===================================================================
--- projects/jboss-osgi/trunk/service/webconsole/LICENSE.felix 2009-04-01 07:17:02 UTC (rev 86576)
+++ projects/jboss-osgi/trunk/service/webconsole/LICENSE.felix 2009-04-01 07:53:06 UTC (rev 86577)
@@ -1,202 +0,0 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
Deleted: projects/jboss-osgi/trunk/service/webconsole/LICENSE.jquery
===================================================================
--- projects/jboss-osgi/trunk/service/webconsole/LICENSE.jquery 2009-04-01 07:17:02 UTC (rev 86576)
+++ projects/jboss-osgi/trunk/service/webconsole/LICENSE.jquery 2009-04-01 07:53:06 UTC (rev 86577)
@@ -1,20 +0,0 @@
-Copyright (c) 2008 John Resig, http://jquery.com/
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
Deleted: projects/jboss-osgi/trunk/service/webconsole/LICENSE.json
===================================================================
--- projects/jboss-osgi/trunk/service/webconsole/LICENSE.json 2009-04-01 07:17:02 UTC (rev 86576)
+++ projects/jboss-osgi/trunk/service/webconsole/LICENSE.json 2009-04-01 07:53:06 UTC (rev 86577)
@@ -1,21 +0,0 @@
-Copyright (c) 2002 JSON.org
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-The Software shall be used for Good, not Evil.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
Deleted: projects/jboss-osgi/trunk/service/webconsole/NOTICE
===================================================================
--- projects/jboss-osgi/trunk/service/webconsole/NOTICE 2009-04-01 07:17:02 UTC (rev 86576)
+++ projects/jboss-osgi/trunk/service/webconsole/NOTICE 2009-04-01 07:53:06 UTC (rev 86577)
@@ -1,33 +0,0 @@
-Apache Felix OSGi Web Console
-Copyright 2007-2008 The Apache Software Foundation
-
-
-I. Included Software
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-Licensed under the Apache License 2.0.
-
-This product includes software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright 2006 The OSGi Alliance.
-Licensed under the Apache License 2.0.
-
-This product includes software from http://www.json.org.
-Copyright (c) 2002 JSON.org
-
-This product includes software from http://www.jquery.com
-Licensed under the MIT License
-
-II. Used Software
-
-This product uses software developed at
-The OSGi Alliance (http://www.osgi.org/).
-Copyright 2006 The OSGi Alliance.
-Licensed under the Apache License 2.0.
-
-
-III. License Summary
-- Apache License 2.0
-- JSON License
-- MIT License
\ No newline at end of file
Deleted: projects/jboss-osgi/trunk/service/webconsole/obr.xml
===================================================================
--- projects/jboss-osgi/trunk/service/webconsole/obr.xml 2009-04-01 07:17:02 UTC (rev 86576)
+++ projects/jboss-osgi/trunk/service/webconsole/obr.xml 2009-04-01 07:53:06 UTC (rev 86577)
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<obr>
- <require extend="false"
- filter="(service=org.osgi.service.log.LogService)"
- multiple="false" name="service" optional="true">
- Import Service org.osgi.service.log.LogService
- </require>
- <require extend="false"
- filter="(service=javax.servlet.Servlet)"
- multiple="true" name="service" optional="true">
- Import Service javax.servlet.Servlet
- </require>
- <require extend="false"
- filter="(service=org.apache.felix.webconsole.Render)"
- multiple="true" name="service" optional="true">
- Import Service org.apache.felix.webconsole.Render
- </require>
- <require extend="false"
- filter="(service=org.apache.felix.webconsole.Action)"
- multiple="true" name="service" optional="true">
- Import Service org.apache.felix.webconsole.Action
- </require>
- <require extend="false"
- filter="(service=org.osgi.service.http.HttpService)"
- multiple="false" name="service" optional="false">
- Import Service org.osgi.service.http.HttpService
- </require>
- <capability name="service">
- <p n="service" v="org.osgi.service.cm.ManagedService" />
- <p n="service.description"
- v="OSGi Management Console Configuration Receiver" />
- <p n="service.pid"
- v="org.apache.felix.webconsole.internal.servlet.OsgiManager" />
- <p n="service.vendor" v="he Apache Software Foundation" />
- </capability>
-</obr>
Modified: projects/jboss-osgi/trunk/service/webconsole/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/service/webconsole/pom.xml 2009-04-01 07:17:02 UTC (rev 86576)
+++ projects/jboss-osgi/trunk/service/webconsole/pom.xml 2009-04-01 07:53:06 UTC (rev 86577)
@@ -67,8 +67,8 @@
<Import-Package>
org.apache.felix.scr;
org.apache.felix.shell;
- org.osgi.service.*;resolution:=optional,*
- javax.portlet;resolution:=optional,*;
+ org.osgi.service.*;resolution:=optional,
+ javax.portlet;resolution:=optional,*
</Import-Package>
<Embed-Dependency>
<!-- Import/Export-Package parsing, OBR -->
Modified: projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/EventAdminPlugin.java
===================================================================
--- projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/EventAdminPlugin.java 2009-04-01 07:17:02 UTC (rev 86576)
+++ projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/EventAdminPlugin.java 2009-04-01 07:53:06 UTC (rev 86577)
@@ -50,8 +50,11 @@
@Override
protected void endResponse(HttpServletRequest request, PrintWriter pw)
{
- String appRoot = (String)request.getAttribute(OsgiManager.ATTR_APP_ROOT);
- String footer = MessageFormat.format(PluginHelper.getFooter(), new Object[]{ appRoot });
- pw.println(footer);
+ // Footer redered before content in bundle plugin
+ // https://issues.apache.org/jira/browse/FELIX-1020
+
+ //String appRoot = (String)request.getAttribute(OsgiManager.ATTR_APP_ROOT);
+ //String footer = MessageFormat.format(PluginHelper.getFooter(), new Object[]{ appRoot });
+ //pw.println(footer);
}
}
\ No newline at end of file
16 years, 8 months
JBoss-OSGI SVN: r86576 - projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins.
by jboss-osgi-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-04-01 03:17:02 -0400 (Wed, 01 Apr 2009)
New Revision: 86576
Modified:
projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/BundlesPlugin.java
projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/PluginHelper.java
Log:
Fix Bundles Plugin
Modified: projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/BundlesPlugin.java
===================================================================
--- projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/BundlesPlugin.java 2009-04-01 06:49:07 UTC (rev 86575)
+++ projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/BundlesPlugin.java 2009-04-01 07:17:02 UTC (rev 86576)
@@ -23,11 +23,14 @@
//$Id$
+import java.io.IOException;
import java.io.PrintWriter;
import java.text.MessageFormat;
import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.apache.felix.webconsole.internal.Util;
import org.apache.felix.webconsole.internal.core.BundlesServlet;
import org.apache.felix.webconsole.internal.servlet.OsgiManager;
@@ -50,8 +53,11 @@
@Override
protected void endResponse(HttpServletRequest request, PrintWriter pw)
{
- String appRoot = (String)request.getAttribute(OsgiManager.ATTR_APP_ROOT);
- String footer = MessageFormat.format(PluginHelper.getFooter(), new Object[]{ appRoot });
- pw.println(footer);
+ // Footer redered before content in bundle plugin
+ // https://issues.apache.org/jira/browse/FELIX-1020
+
+ //String appRoot = (String)request.getAttribute(OsgiManager.ATTR_APP_ROOT);
+ //String footer = MessageFormat.format(PluginHelper.getFooter(), new Object[]{ appRoot });
+ //pw.println(footer);
}
}
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/PluginHelper.java
===================================================================
--- projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/PluginHelper.java 2009-04-01 06:49:07 UTC (rev 86575)
+++ projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/plugins/PluginHelper.java 2009-04-01 07:17:02 UTC (rev 86576)
@@ -33,13 +33,15 @@
{
static String getHeader()
{
- return "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>"
+ String htmlHeader = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>"
+ "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"xhtml1-transitional.dtd\">"
+ "<html xmlns=\"http://www.w3.org/1999/xhtml\">"
+ "<head>"
+ "<meta http-equiv=\"Content-Type\" content=\"text/html; utf-8\">"
+ "<link rel=\"icon\" href=\"{6}/res/imgs/favicon.ico\">"
+ "<title>{0} - {2}</title>"
+ + "<script src=\"{5}/res/ui/jquery-1.3.2.min.js\" language=\"JavaScript\"></script>"
+ + "<script src=\"{5}/res/ui/jquery.tablesorter-2.0.3.min.js\" language=\"JavaScript\"></script>"
+ "<script src=\"{5}/res/ui/admin.js\" language=\"JavaScript\"></script>"
+ "<script src=\"{5}/res/ui/ui.js\" language=\"JavaScript\"></script>"
+ "<script language=\"JavaScript\">"
@@ -57,6 +59,7 @@
+ "<p>"
+ "<a target=\"_blank\" href=\"{3}\" title=\"{1}\"><img src=\"{5}/res/imgs/jboss_logo.png\" width=\"123\" height=\"103\" border=\"0\"></a>"
+ "</p></div>";
+ return htmlHeader;
}
static String getFooter()
16 years, 8 months
JBoss-OSGI SVN: r86572 - projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal.
by jboss-osgi-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-04-01 02:17:18 -0400 (Wed, 01 Apr 2009)
New Revision: 86572
Modified:
projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/WebConsole.java
Log:
Remove unavailable plugins
Modified: projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/WebConsole.java
===================================================================
--- projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/WebConsole.java 2009-04-01 06:17:13 UTC (rev 86571)
+++ projects/jboss-osgi/trunk/service/webconsole/src/main/java/org/jboss/osgi/service/webconsole/internal/WebConsole.java 2009-04-01 06:17:18 UTC (rev 86572)
@@ -24,8 +24,22 @@
//$Id$
import org.apache.felix.webconsole.Render;
+import org.apache.felix.webconsole.internal.compendium.ComponentConfigurationPrinter;
+import org.apache.felix.webconsole.internal.core.InstallAction;
+import org.apache.felix.webconsole.internal.core.SetStartLevelAction;
+import org.apache.felix.webconsole.internal.misc.ConfigurationRender;
+import org.apache.felix.webconsole.internal.misc.ShellServlet;
+import org.apache.felix.webconsole.internal.obr.BundleRepositoryRender;
+import org.apache.felix.webconsole.internal.obr.InstallFromRepoAction;
+import org.apache.felix.webconsole.internal.obr.RefreshRepoAction;
import org.apache.felix.webconsole.internal.servlet.OsgiManager;
+import org.apache.felix.webconsole.internal.system.GCAction;
+import org.apache.felix.webconsole.internal.system.VMStatPlugin;
+import org.jboss.osgi.service.webconsole.internal.plugins.BundlesPlugin;
+import org.jboss.osgi.service.webconsole.internal.plugins.ConfigManagerPlugin;
+import org.jboss.osgi.service.webconsole.internal.plugins.EventAdminPlugin;
import org.jboss.osgi.service.webconsole.internal.plugins.JBossRenderBridge;
+import org.jboss.osgi.service.webconsole.internal.plugins.LicensePlugin;
import org.osgi.framework.BundleContext;
/**
@@ -59,25 +73,20 @@
protected String[] getPluginClasses()
{
return new String[] {
- "org.jboss.osgi.service.webconsole.internal.plugins.BundlesPlugin",
- "org.jboss.osgi.service.webconsole.internal.plugins.ConfigManagerPlugin",
- "org.jboss.osgi.service.webconsole.internal.plugins.EventAdminPlugin",
- "org.jboss.osgi.service.webconsole.internal.plugins.LicensePlugin",
+ BundlesPlugin.class.getName(),
+ ConfigManagerPlugin.class.getName(),
+ EventAdminPlugin.class.getName(),
+ LicensePlugin.class.getName(),
- "org.apache.felix.webconsole.internal.compendium.ComponentConfigurationPrinter",
- //"org.apache.felix.webconsole.internal.compendium.ComponentsServlet",
- "org.apache.felix.webconsole.internal.core.InstallAction",
- "org.apache.felix.webconsole.internal.core.SetStartLevelAction",
- //"org.apache.felix.webconsole.internal.deppack.DepPackServlet",
- "org.apache.felix.webconsole.internal.misc.ConfigurationRender",
- //"org.apache.felix.webconsole.internal.misc.ShellServlet",
- "org.apache.felix.webconsole.internal.obr.BundleRepositoryRender",
- "org.apache.felix.webconsole.internal.obr.InstallFromRepoAction",
- "org.apache.felix.webconsole.internal.obr.RefreshRepoAction",
- "org.apache.felix.webconsole.internal.system.GCAction",
- "org.apache.felix.webconsole.internal.system.ShutdownAction",
- "org.apache.felix.webconsole.internal.system.ShutdownRender",
- "org.apache.felix.webconsole.internal.system.VMStatRender"
+ ComponentConfigurationPrinter.class.getName(),
+ InstallAction.class.getName(),
+ SetStartLevelAction.class.getName(),
+ ConfigurationRender.class.getName(),
+ BundleRepositoryRender.class.getName(),
+ InstallFromRepoAction.class.getName(),
+ RefreshRepoAction.class.getName(),
+ GCAction.class.getName(),
+ VMStatPlugin.class.getName()
};
}
16 years, 8 months