JBoss-OSGI SVN: r97346 - in projects/jboss-osgi/projects/spi/tags: jboss-osgi-spi-1.0.3 and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-12-03 09:15:23 -0500 (Thu, 03 Dec 2009)
New Revision: 97346
Added:
projects/jboss-osgi/projects/spi/tags/jboss-osgi-spi-1.0.3/
projects/jboss-osgi/projects/spi/tags/jboss-osgi-spi-1.0.3/pom.xml
Removed:
projects/jboss-osgi/projects/spi/tags/jboss-osgi-spi-1.0.3/pom.xml
Log:
[maven-release-plugin] copy for tag jboss-osgi-spi-1.0.3
Copied: projects/jboss-osgi/projects/spi/tags/jboss-osgi-spi-1.0.3 (from rev 97344, projects/jboss-osgi/projects/spi/trunk)
Property changes on: projects/jboss-osgi/projects/spi/tags/jboss-osgi-spi-1.0.3
___________________________________________________________________
Name: svn:ignore
+ target
Name: svn:mergeinfo
+
Deleted: projects/jboss-osgi/projects/spi/tags/jboss-osgi-spi-1.0.3/pom.xml
===================================================================
--- projects/jboss-osgi/projects/spi/trunk/pom.xml 2009-12-03 13:51:11 UTC (rev 97344)
+++ projects/jboss-osgi/projects/spi/tags/jboss-osgi-spi-1.0.3/pom.xml 2009-12-03 14:15:23 UTC (rev 97346)
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
- <!-- ====================================================================== -->
- <!-- -->
- <!-- JBoss, the OpenSource J2EE webOS -->
- <!-- -->
- <!-- Distributable under LGPL license. -->
- <!-- See terms of license at http://www.gnu.org. -->
- <!-- -->
- <!-- ====================================================================== -->
-
- <!-- $Id$ -->
-
-<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 SPI</name>
-
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-spi</artifactId>
- <packaging>jar</packaging>
-
- <version>1.0.3-SNAPSHOT</version>
-
- <!-- Parent -->
- <parent>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-parent</artifactId>
- <version>1.0.4</version>
- </parent>
-
- <!-- Subversion -->
- <scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi/projec...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/...</developerConnection>
- <url>http://fisheye.jboss.com/qsearch/JBossOSGi</url>
- </scm>
-
- <!-- Properties -->
- <properties>
- <version.args4j>2.0.12</version.args4j>
- <version.jboss.vfs>2.1.3.SP1</version.jboss.vfs>
- <version.osgi>4.2.0</version.osgi>
- </properties>
-
- <!-- Dependencies -->
- <dependencies>
-
- <!-- Compile Dependencies -->
- <dependency>
- <groupId>args4j</groupId>
- <artifactId>args4j</artifactId>
- <version>${version.args4j}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- <version>${version.jboss.vfs}</version>
- </dependency>
-
- <!-- Provided Dependencies -->
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>${version.osgi}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <version>${version.osgi}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <!-- Build -->
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <!-- For some reason the distribution javadoc module needs this -->
- <file>target/${artifactId}-${version}-sources.jar</file>
- <classifier>sources</classifier>
- <type>jar</type>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <!-- Repositories -->
- <repositories>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <url>http://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshots Repository</name>
- <url>http://snapshots.jboss.org/maven2/</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- </repositories>
-</project>
Copied: projects/jboss-osgi/projects/spi/tags/jboss-osgi-spi-1.0.3/pom.xml (from rev 97345, projects/jboss-osgi/projects/spi/trunk/pom.xml)
===================================================================
--- projects/jboss-osgi/projects/spi/tags/jboss-osgi-spi-1.0.3/pom.xml (rev 0)
+++ projects/jboss-osgi/projects/spi/tags/jboss-osgi-spi-1.0.3/pom.xml 2009-12-03 14:15:23 UTC (rev 97346)
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+ <!-- ====================================================================== -->
+ <!-- -->
+ <!-- JBoss, the OpenSource J2EE webOS -->
+ <!-- -->
+ <!-- Distributable under LGPL license. -->
+ <!-- See terms of license at http://www.gnu.org. -->
+ <!-- -->
+ <!-- ====================================================================== -->
+
+ <!-- $Id$ -->
+
+<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 SPI</name>
+
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-spi</artifactId>
+ <packaging>jar</packaging>
+
+ <version>1.0.3</version>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-parent</artifactId>
+ <version>1.0.4</version>
+ </parent>
+
+ <!-- Subversion -->
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi/projec...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/...</developerConnection>
+ <url>http://fisheye.jboss.com/qsearch/JBossOSGi/tags/jboss-osgi-spi-1.0.3</url>
+ </scm>
+
+ <!-- Properties -->
+ <properties>
+ <version.args4j>2.0.12</version.args4j>
+ <version.jboss.vfs>2.1.3.SP1</version.jboss.vfs>
+ <version.osgi>4.2.0</version.osgi>
+ </properties>
+
+ <!-- Dependencies -->
+ <dependencies>
+
+ <!-- Compile Dependencies -->
+ <dependency>
+ <groupId>args4j</groupId>
+ <artifactId>args4j</artifactId>
+ <version>${version.args4j}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ <version>${version.jboss.vfs}</version>
+ </dependency>
+
+ <!-- Provided Dependencies -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${version.osgi}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>${version.osgi}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <!-- Build -->
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <!-- For some reason the distribution javadoc module needs this -->
+ <file>target/${artifactId}-${version}-sources.jar</file>
+ <classifier>sources</classifier>
+ <type>jar</type>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <!-- Repositories -->
+ <repositories>
+ <repository>
+ <id>repository.jboss.org</id>
+ <name>JBoss Repository</name>
+ <url>http://repository.jboss.org/maven2/</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>snapshots.jboss.org</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>http://snapshots.jboss.org/maven2/</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+</project>
16 years, 7 months
JBoss-OSGI SVN: r97344 - projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service.
by jboss-osgi-commits＠lists.jboss.org
Author: alesj
Date: 2009-12-03 08:51:11 -0500 (Thu, 03 Dec 2009)
New Revision: 97344
Modified:
projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/ServiceMixUnitTestCase.java
Log:
Small fix.
Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/ServiceMixUnitTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/ServiceMixUnitTestCase.java 2009-12-03 13:37:52 UTC (rev 97343)
+++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/ServiceMixUnitTestCase.java 2009-12-03 13:51:11 UTC (rev 97344)
@@ -214,7 +214,7 @@
}
// check if the bean was unwinded as well
- assertEquals(ControllerState.DESCRIBED, kcc.getState());
+ assertEquals(ControllerState.INSTANTIATED, kcc.getState());
}
finally
{
16 years, 7 months
JBoss-OSGI SVN: r97343 - projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-12-03 08:37:52 -0500 (Thu, 03 Dec 2009)
New Revision: 97343
Modified:
projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java
Log:
Remove sysout debugging
Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java
===================================================================
--- projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java 2009-12-03 13:27:43 UTC (rev 97342)
+++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java 2009-12-03 13:37:52 UTC (rev 97343)
@@ -170,7 +170,6 @@
private void registerMicrocontainerDeployerService()
{
- System.out.println(DeployerService.class.getClassLoader() + " ### " + Thread.currentThread().getContextClassLoader());
Properties props = new Properties();
props.setProperty("provider", "microcontainer");
props.put(Constants.SERVICE_RANKING, Integer.MAX_VALUE);
16 years, 7 months
JBoss-OSGI SVN: r97342 - projects/jboss-osgi/trunk/testsuite/example.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-12-03 08:27:43 -0500 (Thu, 03 Dec 2009)
New Revision: 97342
Modified:
projects/jboss-osgi/trunk/testsuite/example/pom.xml
Log:
[JBOSGI-214] Cannot repeatedly register service bound to an interface from the system classpath
Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-12-03 13:09:57 UTC (rev 97341)
+++ projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-12-03 13:27:43 UTC (rev 97342)
@@ -187,6 +187,7 @@
<exclude>org/jboss/test/osgi/example/webapp/WebAppNegativeTestCase.class</exclude>
<exclude>org/jboss/test/osgi/example/webapp/WebAppInterceptorTestCase.class</exclude>
<!-- [JBOSGI-214] Cannot repeatedly register service bound to an interface from the system classpath -->
+ <exclude>org/jboss/test/osgi/example/blueprint/**</exclude>
<exclude>org/jboss/test/osgi/example/microcontainer/**</exclude>
</excludes>
</configuration>
16 years, 7 months
JBoss-OSGI SVN: r97341 - in projects/jboss-osgi/trunk/reactor/framework/src: test/java/org/jboss/test/osgi/service and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: alesj
Date: 2009-12-03 08:09:57 -0500 (Thu, 03 Dec 2009)
New Revision: 97341
Modified:
projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/MDRUtils.java
projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceState.java
projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/ServiceMixUnitTestCase.java
Log:
Immutable empty dictonary.
OSGi service can have an alias via properties.
Test this alias.
Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/MDRUtils.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/MDRUtils.java 2009-12-03 12:57:01 UTC (rev 97340)
+++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/MDRUtils.java 2009-12-03 13:09:57 UTC (rev 97341)
@@ -22,14 +22,16 @@
package org.jboss.osgi.framework.bundle;
import java.util.Arrays;
+import java.util.Collections;
import java.util.Dictionary;
-import java.util.Hashtable;
+import java.util.Enumeration;
import org.jboss.dependency.spi.ControllerContext;
import org.jboss.logging.Logger;
import org.jboss.metadata.spi.MetaData;
import org.jboss.metadata.spi.scope.CommonLevels;
import org.jboss.metadata.spi.scope.ScopeLevel;
+import org.jboss.util.collection.Iterators;
import org.osgi.framework.Bundle;
import org.osgi.framework.Constants;
@@ -44,7 +46,7 @@
private static final Logger log = Logger.getLogger(MDRUtils.class);
/** The empty dictionary */
- private static final Dictionary<String, Object> EMPTY = new Hashtable<String, Object>();
+ private static final Dictionary<String, Object> EMPTY = new EmptyDictonary<String, Object>();
/**
* Get metadata.
@@ -368,4 +370,43 @@
return (thisServiceId > otherServiceId) ? -1 : 1;
}
+
+ @SuppressWarnings({"unchecked"})
+ private static class EmptyDictonary<K, V> extends Dictionary<K, V>
+ {
+ public int size()
+ {
+ return 0;
+ }
+
+ public boolean isEmpty()
+ {
+ return true;
+ }
+
+ public Enumeration<K> keys()
+ {
+ return Iterators.toEnumeration(Collections.emptySet().iterator());
+ }
+
+ public Enumeration<V> elements()
+ {
+ return Iterators.toEnumeration(Collections.emptySet().iterator());
+ }
+
+ public V get(Object key)
+ {
+ return null;
+ }
+
+ public V put(K key, V value)
+ {
+ return null;
+ }
+
+ public V remove(Object key)
+ {
+ return null;
+ }
+ }
}
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceState.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceState.java 2009-12-03 12:57:01 UTC (rev 97340)
+++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/bundle/OSGiServiceState.java 2009-12-03 13:09:57 UTC (rev 97341)
@@ -49,6 +49,7 @@
import org.jboss.osgi.framework.util.CaseInsensitiveDictionary;
import org.jboss.osgi.spi.util.BundleClassLoader;
import org.jboss.util.id.GUID;
+import org.jboss.util.collection.CollectionsFactory;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleException;
import org.osgi.framework.Constants;
@@ -68,6 +69,9 @@
*/
public class OSGiServiceState extends AbstractControllerContext implements ServiceReference, ServiceRegistration, InvokeDispatchContext
{
+ /** The alias constant */
+ private static final String SERVICE_ALIAS = "service.alias";
+
/** The get classloader permission */
private static final RuntimePermission GET_CLASSLOADER_PERMISSION = new RuntimePermission("getClassLoader");
@@ -114,7 +118,7 @@
public OSGiServiceState(AbstractBundleState bundleState, String[] clazzes, Object service, Dictionary properties)
{
// name is random / unique, we use aliases
- super(GUID.asString(), OSGiControllerContextActions.ACTIONS, null, service);
+ super(GUID.asString(), getAlias(properties), OSGiControllerContextActions.ACTIONS, null, service);
if (bundleState == null)
throw new IllegalArgumentException("Null bundle state");
@@ -145,6 +149,35 @@
}
/**
+ * Check if there is an alias in properties.
+ *
+ * @param properties the properties
+ * @return alias or null
+ */
+ protected static Set<Object> getAlias(Dictionary<String, Object> properties)
+ {
+ if (properties != null)
+ {
+ Set<Object> aliases = null;
+ Enumeration<String> keys = properties.keys();
+ while (keys.hasMoreElements())
+ {
+ String key = keys.nextElement();
+ if (key.startsWith(SERVICE_ALIAS))
+ {
+ if (aliases == null)
+ aliases = CollectionsFactory.createLazySet();
+
+ Object alias = properties.get(key);
+ aliases.add(alias);
+ }
+ }
+ return aliases;
+ }
+ return null;
+ }
+
+ /**
* Get the serviceId.
*
* @return the serviceId.
Modified: projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/ServiceMixUnitTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/ServiceMixUnitTestCase.java 2009-12-03 12:57:01 UTC (rev 97340)
+++ projects/jboss-osgi/trunk/reactor/framework/src/test/java/org/jboss/test/osgi/service/ServiceMixUnitTestCase.java 2009-12-03 13:09:57 UTC (rev 97341)
@@ -168,6 +168,65 @@
}
}
+ public void testInjectionToMCNamedService() throws Throwable
+ {
+ BeanMetaDataBuilder builder = BeanMetaDataBuilder.createBuilder("C", C.class.getName());
+ builder.addPropertyMetaData("a", builder.createInject("A"));
+ BeanMetaData bmd = builder.getBeanMetaData();
+ Deployment bean = addBean("beanA", C.class, bmd, A.class);
+ try
+ {
+ KernelControllerContext kcc = getControllerContext("C", null);
+
+ Bundle bundle1 = assembleBundle("simple2", "/bundles/service/service-bundle3");
+ try
+ {
+ bundle1.start();
+ BundleContext bundleContext1 = bundle1.getBundleContext();
+ assertNotNull(bundleContext1);
+
+ Class<?> aClass = bundle1.loadClass(A.class.getName());
+ Object a = aClass.newInstance();
+ Hashtable<String, Object> table = new Hashtable<String, Object>();
+ table.put("service.alias.1", "A");
+ ServiceRegistration reg1 = bundleContext1.registerService(A.class.getName(), a, table);
+ assertNotNull(reg1);
+ try
+ {
+ checkComplete();
+
+ Object c = getBean("C");
+ assertSame(a, invoke(c, "getA"));
+
+ ServiceReference ref1 = bundleContext1.getServiceReference(A.class.getName());
+ assertUsingBundles(ref1, LazyBundle.getBundle(getDeploymentUnit(bean)));
+
+ change(kcc, ControllerState.DESCRIBED);
+ // we did un-injection, should be removed now
+ assertUsingBundles(ref1);
+
+ change(kcc, ControllerState.INSTALLED);
+ assertEquals(ControllerState.INSTALLED, kcc.getState());
+ }
+ finally
+ {
+ reg1.unregister();
+ }
+
+ // check if the bean was unwinded as well
+ assertEquals(ControllerState.DESCRIBED, kcc.getState());
+ }
+ finally
+ {
+ uninstall(bundle1);
+ }
+ }
+ finally
+ {
+ undeploy(bean);
+ }
+ }
+
public void testFiltering() throws Throwable
{
Deployment bean = addBean("beanA", A.class);
16 years, 7 months
JBoss-OSGI SVN: r97340 - in projects/jboss-osgi: projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer and 10 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-12-03 07:57:01 -0500 (Thu, 03 Dec 2009)
New Revision: 97340
Added:
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi214/
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi214/OSGI214TestCase.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi214/bundle/
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi214/bundle/OSGI214Activator.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi214/bundle/SomeService.java
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi214/
projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi214/jbosgi214-bundle.bnd
Modified:
projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/EmbeddedRuntime.java
projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/AbstractMicrocontainerDeployerService.java
projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java
projects/jboss-osgi/trunk/testsuite/example/pom.xml
projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties
projects/jboss-osgi/trunk/testsuite/functional/pom.xml
projects/jboss-osgi/trunk/testsuite/functional/scripts/antrun-test-jars.xml
Log:
[JBOSGI-214] Cannot repeatedly register service bound to an interface from the system classpath
Modified: projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/EmbeddedRuntime.java
===================================================================
--- projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/EmbeddedRuntime.java 2009-12-03 06:46:18 UTC (rev 97339)
+++ projects/jboss-osgi/projects/bundles/husky/trunk/src/main/java/org/jboss/osgi/testing/internal/EmbeddedRuntime.java 2009-12-03 12:57:01 UTC (rev 97340)
@@ -34,7 +34,6 @@
import javax.management.MBeanServerFactory;
import org.jboss.osgi.deployment.deployer.DeployerService;
-import org.jboss.osgi.deployment.deployer.Deployment;
import org.jboss.osgi.spi.capability.Capability;
import org.jboss.osgi.spi.framework.OSGiBootstrapProvider;
import org.jboss.osgi.spi.util.BundleInfo;
@@ -71,30 +70,21 @@
String symbolicName = info.getSymbolicName();
Version version = info.getVersion();
URL rootURL = info.getRootURL();
-
+
OSGiBundle bundle;
-
+
BundleContext context = getBundleContext();
ServiceReference sref = context.getServiceReference(DeployerService.class.getName());
if (sref != null)
{
- Object obj = context.getService(sref);
- if (obj instanceof DeployerService)
- {
- DeployerService service = (DeployerService)obj;
- service.deploy(rootURL);
- }
- else
- {
- DeployerServiceClient deployer = new DeployerServiceClient(this, DeployerService.MBEAN_DEPLOYER_SERVICE);
- Deployment dep = deployer.createDeployment(info);
- dep.setAutoStart(false);
- deployer.deploy(new Deployment[] { dep });
- }
+ DeployerService service = (DeployerService)context.getService(sref);
+ log.debug("Install using DeployerService: " + service.getClass().getName());
+ service.deploy(rootURL);
bundle = getBundle(symbolicName, version, true);
}
else
{
+ log.debug("Install using system context");
Bundle auxBundle = context.installBundle(rootURL.toExternalForm());
bundle = new EmbeddedBundle(this, auxBundle);
}
@@ -112,13 +102,13 @@
absBundles.toArray(bundleArr);
return bundleArr;
}
-
+
public OSGiBundle getBundle(long bundleId)
{
Bundle bundle = getBundleContext().getBundle(bundleId);
return bundle != null ? new EmbeddedBundle(this, bundle) : null;
}
-
+
public OSGiServiceReference getServiceReference(String clazz)
{
ServiceReference sref = getBundleContext().getServiceReference(clazz);
@@ -128,7 +118,7 @@
public OSGiServiceReference[] getServiceReferences(String clazz, String filter)
{
OSGiServiceReference[] retRefs = null;
-
+
ServiceReference[] srefs;
try
{
@@ -138,11 +128,11 @@
{
throw new IllegalArgumentException("Invalid filter syntax: " + filter);
}
-
+
if (srefs != null)
{
retRefs = new OSGiServiceReference[srefs.length];
- for(int i=0; i < srefs.length; i++)
+ for (int i = 0; i < srefs.length; i++)
retRefs[i] = new EmbeddedServiceReference(srefs[i]);
}
return retRefs;
@@ -159,10 +149,10 @@
if (value == null)
System.setProperty(entry.getKey(), entry.getValue());
}
-
+
super.addCapability(capability);
}
-
+
@Override
public void shutdown()
{
@@ -173,6 +163,7 @@
try
{
Framework framework = bootProvider.getFramework();
+ log.debug("Framework stop: " + framework);
framework.stop();
framework.waitForStop(5000);
}
@@ -180,10 +171,13 @@
{
log.error("Cannot stop the framework", ex);
}
- getTestHelper().ungetBootstrapProvider();
+ finally
+ {
+ getTestHelper().ungetBootstrapProvider();
+ }
}
}
-
+
public BundleContext getBundleContext()
{
OSGiBootstrapProvider bootProvider = getTestHelper().getBootstrapProvider();
@@ -192,6 +186,7 @@
{
try
{
+ log.debug("Framework start: " + framework);
framework.start();
}
catch (BundleException ex)
@@ -208,14 +203,14 @@
ArrayList<MBeanServer> serverArr = MBeanServerFactory.findMBeanServer(null);
if (serverArr.size() > 1)
throw new IllegalStateException("Multiple MBeanServer instances not supported");
-
+
MBeanServer server = null;
if (serverArr.size() == 1)
server = serverArr.get(0);
-
+
if (server == null)
server = MBeanServerFactory.createMBeanServer();
-
+
return server;
}
Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/AbstractMicrocontainerDeployerService.java
===================================================================
--- projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/AbstractMicrocontainerDeployerService.java 2009-12-03 06:46:18 UTC (rev 97339)
+++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/AbstractMicrocontainerDeployerService.java 2009-12-03 12:57:01 UTC (rev 97340)
@@ -59,7 +59,7 @@
// Provide logging
private Logger log = LoggerFactory.getLogger(AbstractMicrocontainerDeployerService.class);
- private VFSDeploymentFactory deploymentFactory = VFSDeploymentFactory.getInstance();
+ private VFSDeploymentFactory deploymentFactory;
private ServiceTracker registryTracker;
public abstract MainDeployer getMainDeployer();
@@ -124,7 +124,7 @@
for (Deployment dep : depArr)
{
VirtualFile root = dep.getRoot();
- VFSDeployment vfsdep = deploymentFactory.createVFSDeployment(root);
+ VFSDeployment vfsdep = createVFSDeployment(root);
dep.addAttachment(VFSDeployment.class, vfsdep);
registry.registerDeployment(dep);
depList.add(vfsdep);
@@ -187,6 +187,14 @@
}
}
+ private VFSDeployment createVFSDeployment(VirtualFile root)
+ {
+ if (deploymentFactory == null)
+ deploymentFactory = VFSDeploymentFactory.getInstance();
+
+ return deploymentFactory.createVFSDeployment(root);
+ }
+
private DeploymentRegistryService getDeploymentRegistry()
{
if (registryTracker == null)
Modified: projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java
===================================================================
--- projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java 2009-12-03 06:46:18 UTC (rev 97339)
+++ projects/jboss-osgi/projects/bundles/microcontainer/trunk/src/main/java/org/jboss/osgi/microcontainer/internal/MicrocontainerServiceImpl.java 2009-12-03 12:57:01 UTC (rev 97340)
@@ -143,7 +143,7 @@
{
Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
EmbeddedKernelBootstrap bootstrap = new EmbeddedKernelBootstrap(context);
-
+
kernel = bootstrap.getKernel();
KernelController controller = kernel.getController();
BundleContext sysContext = context.getBundle(0).getBundleContext();
@@ -170,21 +170,12 @@
private void registerMicrocontainerDeployerService()
{
- ClassLoader ctxLoader = Thread.currentThread().getContextClassLoader();
- try
- {
- Thread.currentThread().setContextClassLoader(getClass().getClassLoader());
-
- Properties props = new Properties();
- props.setProperty("provider", "microcontainer");
- props.put(Constants.SERVICE_RANKING, Integer.MAX_VALUE);
- MainDeployer mainDeployer = (MainDeployer)getRegisteredBean("MainDeployer");
- MicrocontainerDeployerServiceImpl deployerService = new MicrocontainerDeployerServiceImpl(context, mainDeployer);
- context.registerService(DeployerService.class.getName(), deployerService, props);
- }
- finally
- {
- Thread.currentThread().setContextClassLoader(ctxLoader);
- }
+ System.out.println(DeployerService.class.getClassLoader() + " ### " + Thread.currentThread().getContextClassLoader());
+ Properties props = new Properties();
+ props.setProperty("provider", "microcontainer");
+ props.put(Constants.SERVICE_RANKING, Integer.MAX_VALUE);
+ MainDeployer mainDeployer = (MainDeployer)getRegisteredBean("MainDeployer");
+ MicrocontainerDeployerServiceImpl deployerService = new MicrocontainerDeployerServiceImpl(context, mainDeployer);
+ context.registerService(DeployerService.class.getName(), deployerService, props);
}
}
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-12-03 06:46:18 UTC (rev 97339)
+++ projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-12-03 12:57:01 UTC (rev 97340)
@@ -186,8 +186,7 @@
<exclude>org/jboss/test/osgi/example/interceptor/**</exclude>
<exclude>org/jboss/test/osgi/example/webapp/WebAppNegativeTestCase.class</exclude>
<exclude>org/jboss/test/osgi/example/webapp/WebAppInterceptorTestCase.class</exclude>
- <!-- [JBOSGI-211] Cannot run Microcontainer, Blueprint example on Equinox -->
- <exclude>org/jboss/test/osgi/example/blueprint/**</exclude>
+ <!-- [JBOSGI-214] Cannot repeatedly register service bound to an interface from the system classpath -->
<exclude>org/jboss/test/osgi/example/microcontainer/**</exclude>
</excludes>
</configuration>
Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties 2009-12-03 06:46:18 UTC (rev 97339)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties 2009-12-03 12:57:01 UTC (rev 97340)
@@ -11,6 +11,9 @@
org.osgi.framework.storage=${basedir}/target/osgi-store
org.osgi.framework.storage.clean=onFirstInit
+# Framework bootdelegation
+# org.osgi.framework.bootdelegation=org.jboss.osgi.deployment.*
+
# Extra System Packages
org.osgi.framework.system.packages.extra=\
org.apache.log4j;version=1.2, \
Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-12-03 06:46:18 UTC (rev 97339)
+++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-12-03 12:57:01 UTC (rev 97340)
@@ -150,6 +150,8 @@
<exclude>org/jboss/test/osgi/jbosgi39/**</exclude>
<!-- [JBOSGI-108] Investigate statics on PackageAdmin.refresh -->
<exclude>org/jboss/test/osgi/jbosgi108/**</exclude>
+ <!-- [JBOSGI-214] Cannot repeatedly register service bound to an interface from the system classpath -->
+ <exclude>org/jboss/test/osgi/jbosgi214/**</exclude>
</excludes>
</configuration>
</plugin>
Modified: projects/jboss-osgi/trunk/testsuite/functional/scripts/antrun-test-jars.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/scripts/antrun-test-jars.xml 2009-12-03 06:46:18 UTC (rev 97339)
+++ projects/jboss-osgi/trunk/testsuite/functional/scripts/antrun-test-jars.xml 2009-12-03 12:57:01 UTC (rev 97340)
@@ -133,6 +133,9 @@
<!-- jbosgi212 -->
<bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/jbosgi212-bundle.jar" files="${tests.resources.dir}/jbosgi212/jbosgi212-bundle.bnd" />
+ <!-- jbosgi214 -->
+ <bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/jbosgi214-bundle.jar" files="${tests.resources.dir}/jbosgi214/jbosgi214-bundle.bnd" />
+
<!-- performance -->
<bnd classpath="${tests.classes.dir}" output="${tests.output.dir}/test-libs/performance-blueprint.jar" files="${tests.resources.dir}/performance/blueprint/performance-blueprint.bnd" />
Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi214/OSGI214TestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi214/OSGI214TestCase.java (rev 0)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi214/OSGI214TestCase.java 2009-12-03 12:57:01 UTC (rev 97340)
@@ -0,0 +1,142 @@
+/*
+ * 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.jbosgi214;
+
+//$Id:$
+
+import static org.junit.Assert.*;
+
+import java.net.URL;
+
+import org.jboss.osgi.spi.framework.OSGiBootstrap;
+import org.jboss.osgi.spi.framework.OSGiBootstrapProvider;
+import org.jboss.osgi.testing.OSGiTest;
+import org.junit.Test;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
+import org.osgi.framework.launch.Framework;
+import org.osgi.util.tracker.ServiceTracker;
+
+/**
+ * [JBOSGI-214] Cannot repeatedly register service bound to an interface from the system classpath
+ *
+ * https://jira.jboss.org/jira/browse/JBOSGI-214
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 03-Dec-2009
+ */
+public class OSGI214TestCase extends OSGiTest
+{
+ @Test
+ public void testFirstRun() throws Exception
+ {
+ // Bootstrap and start the framework
+ OSGiBootstrapProvider bootProvider = OSGiBootstrap.getBootstrapProvider();
+ Framework framework = bootProvider.getFramework();
+ framework.start();
+
+ // Start the ServiceTracker
+ BundleContext context = framework.getBundleContext();
+ new SystemServiceTracker(context).open();
+
+ try
+ {
+ // Install and start the test bundle
+ URL bundleURL = getTestArchiveURL("jbosgi214-bundle.jar");
+ Bundle bundle = context.installBundle(bundleURL.toExternalForm());
+ bundle.start();
+
+ // Verify that the service is there and can be cast to an interface from the system classpath
+ ServiceReference sref = context.getServiceReference(OSGiBootstrapProvider.class.getName());
+ OSGiBootstrapProvider service = (OSGiBootstrapProvider)context.getService(sref);
+ assertNotNull("Service not null", service);
+
+ // Uninstall the test bundle
+ bundle.uninstall();
+ }
+ finally
+ {
+ // Stop the framework
+ framework.stop();
+ framework.waitForStop(5000);
+ }
+ }
+
+ @Test
+ public void testSecondRun() throws Exception
+ {
+ // Bootstrap and start the framework
+ OSGiBootstrapProvider bootProvider = OSGiBootstrap.getBootstrapProvider();
+ Framework framework = bootProvider.getFramework();
+ framework.start();
+
+ // Start the ServiceTracker
+ BundleContext context = framework.getBundleContext();
+ new SystemServiceTracker(context).open();
+
+ try
+ {
+ // Install and start the test bundle
+ URL bundleURL = getTestArchiveURL("jbosgi214-bundle.jar");
+ Bundle bundle = context.installBundle(bundleURL.toExternalForm());
+ bundle.start();
+
+ // Verify that the service is there and can be cast to an interface from the system classpath
+ ServiceReference sref = context.getServiceReference(OSGiBootstrapProvider.class.getName());
+ OSGiBootstrapProvider service = (OSGiBootstrapProvider)context.getService(sref);
+ assertNotNull("Service not null", service);
+
+ // Uninstall the test bundle
+ bundle.uninstall();
+ }
+ finally
+ {
+ // Stop the framework
+ framework.stop();
+ framework.waitForStop(5000);
+ }
+ }
+
+ class SystemServiceTracker extends ServiceTracker
+ {
+ public SystemServiceTracker(BundleContext context)
+ {
+ super(context, OSGiBootstrapProvider.class.getName(), null);
+ }
+
+ @Override
+ public Object addingService(ServiceReference sref)
+ {
+ Object serviceObj = super.addingService(sref);
+ //System.out.println("addingService: " + serviceObj);
+ return (OSGiBootstrapProvider)serviceObj;
+ }
+
+ @Override
+ public void removedService(ServiceReference reference, Object serviceObj)
+ {
+ //System.out.println("removedService: " + serviceObj);
+ super.removedService(reference, serviceObj);
+ }
+ }
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi214/OSGI214TestCase.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi214/bundle/OSGI214Activator.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi214/bundle/OSGI214Activator.java (rev 0)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi214/bundle/OSGI214Activator.java 2009-12-03 12:57:01 UTC (rev 97340)
@@ -0,0 +1,47 @@
+/*
+ * 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.jbosgi214.bundle;
+
+//$Id$
+
+import org.jboss.osgi.spi.framework.OSGiBootstrapProvider;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+/**
+ * A Service Activator
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 24-Apr-2009
+ */
+public class OSGI214Activator implements BundleActivator
+{
+ public void start(BundleContext context)
+ {
+ // Register a service that is bound to an interface from the system classpath
+ context.registerService(OSGiBootstrapProvider.class.getName(), new SomeService(), null);
+ }
+
+ public void stop(BundleContext context)
+ {
+ }
+}
\ No newline at end of file
Property changes on: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi214/bundle/OSGI214Activator.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi214/bundle/SomeService.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi214/bundle/SomeService.java (rev 0)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi214/bundle/SomeService.java 2009-12-03 12:57:01 UTC (rev 97340)
@@ -0,0 +1,60 @@
+/*
+ * 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.jbosgi214.bundle;
+
+//$Id$
+
+import java.io.InputStream;
+import java.net.URL;
+
+import org.jboss.osgi.spi.framework.OSGiBootstrapProvider;
+import org.osgi.framework.launch.Framework;
+
+/**
+ * A service that implements an interface from the system classpath
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 24-Apr-2009
+ */
+public class SomeService implements OSGiBootstrapProvider
+{
+ public void configure()
+ {
+ }
+
+ public void configure(URL urlConfig)
+ {
+ }
+
+ public void configure(String resourceConfig)
+ {
+ }
+
+ public void configure(InputStream streamConfig)
+ {
+ }
+
+ public Framework getFramework()
+ {
+ return null;
+ }
+}
Property changes on: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi214/bundle/SomeService.java
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi214/jbosgi214-bundle.bnd
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi214/jbosgi214-bundle.bnd (rev 0)
+++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jbosgi214/jbosgi214-bundle.bnd 2009-12-03 12:57:01 UTC (rev 97340)
@@ -0,0 +1,6 @@
+# bnd build -classpath target/test-classes -output target/test-libs/jbosgi214-bundle.jar src/test/resources/jbosgi214/jbosgi214-bundle.bnd
+
+Bundle-SymbolicName: jbosgi214-bundle
+Bundle-Activator: org.jboss.test.osgi.jbosgi214.bundle.OSGI214Activator
+Export-Package: org.jboss.test.osgi.jbosgi214.bundle
+Import-Package: org.jboss.osgi.spi.framework, org.osgi.framework, org.osgi.framework.launch
16 years, 7 months