Author: sergeyb
Date: Wed Oct 15 02:17:58 2008
New Revision: 704817
URL: http://svn.apache.org/viewvc?rev=704817&view=rev
Log:
DOSGI : applying second patch for CXF-1866 on behalf of David B.
Added:
cxf/sandbox/dosgi/distribution/single-bundle/
cxf/sandbox/dosgi/distribution/single-bundle/pom.xml (with props)
cxf/sandbox/dosgi/distribution/single-bundle/src/
cxf/sandbox/dosgi/distribution/single-bundle/src/main/
cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/
cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/
cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/
cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/
cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/
cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/AggregatedActivator.java
(with props)
cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/SPIActivator.java
(with props)
cxf/sandbox/dosgi/distribution/single-bundle/src/main/resources/
cxf/sandbox/dosgi/distribution/single-bundle/src/main/resources/org/
cxf/sandbox/dosgi/distribution/single-bundle/src/main/resources/org/apache/
cxf/sandbox/dosgi/distribution/single-bundle/src/main/resources/org/apache/cxf/
cxf/sandbox/dosgi/distribution/single-bundle/src/main/resources/org/apache/cxf/dosgi/
cxf/sandbox/dosgi/distribution/single-bundle/src/main/resources/org/apache/cxf/dosgi/activators.list
cxf/sandbox/dosgi/distribution/single-bundle/src/main/resources/org/apache/cxf/dosgi/old_activators.list
cxf/sandbox/dosgi/distribution/single-bundle/src/test/
cxf/sandbox/dosgi/distribution/single-bundle/src/test/java/
cxf/sandbox/dosgi/distribution/single-bundle/src/test/java/org/
cxf/sandbox/dosgi/distribution/single-bundle/src/test/java/org/apache/
cxf/sandbox/dosgi/distribution/single-bundle/src/test/java/org/apache/cxf/
cxf/sandbox/dosgi/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/
cxf/sandbox/dosgi/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/AggregatedActivatorTest.java
(with props)
Modified:
cxf/sandbox/dosgi/distribution/multi-bundle/pom.xml
cxf/sandbox/dosgi/distribution/pom.xml
Modified: cxf/sandbox/dosgi/distribution/multi-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/distribution/multi-bundle/pom.xml?rev=704817&r1=704816&r2=704817&view=diff
==============================================================================
--- cxf/sandbox/dosgi/distribution/multi-bundle/pom.xml (original)
+++ cxf/sandbox/dosgi/distribution/multi-bundle/pom.xml Wed Oct 15 02:17:58 2008
@@ -31,7 +31,7 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-dosgi-ri-distribution-parent</artifactId>
<version>1.0-SNAPSHOT</version>
- <relativePath>../parent/pom.xml</relativePath>
+ <relativePath>../../parent/pom.xml</relativePath>
</parent>
<properties>
Modified: cxf/sandbox/dosgi/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/distribution/pom.xml?rev=704817&r1=704816&r2=704817&view=diff
==============================================================================
--- cxf/sandbox/dosgi/distribution/pom.xml (original)
+++ cxf/sandbox/dosgi/distribution/pom.xml Wed Oct 15 02:17:58 2008
@@ -39,5 +39,6 @@
<modules>
<module>multi-bundle</module>
+ <module>single-bundle</module>
</modules>
</project>
Added: cxf/sandbox/dosgi/distribution/single-bundle/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/distribution/single-bundle/pom.xml?rev=704817&view=auto
==============================================================================
--- cxf/sandbox/dosgi/distribution/single-bundle/pom.xml (added)
+++ cxf/sandbox/dosgi/distribution/single-bundle/pom.xml Wed Oct 15 02:17:58
2008
@@ -0,0 +1,232 @@
+<?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";>
+<!--
+ 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.
+-->
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-dosgi-ri-singlebundle-distribution</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+ <name>Distributed OSGI Single-Bundle Distribution</name>
+ <url>http://cxf.apache.org</url>
+
+ <parent>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-dosgi-ri-distribution-parent</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <relativePath>../../parent/pom.xml</relativePath>
+ </parent>
+
+ <properties>
+ <topDirectoryLocation>../..</topDirectoryLocation>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <version>1.0.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>com.springsource.org.apache.commons.logging</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jdom</groupId>
+ <artifactId>com.springsource.org.jdom</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.aopalliance</groupId>
+ <artifactId>com.springsource.org.aopalliance</artifactId>
+ <version>1.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-io</artifactId>
+ <version>${spring.osgi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-core</artifactId>
+ <version>${spring.osgi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-extender</artifactId>
+ <version>${spring.osgi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.locator</artifactId>
+ <version>${servicemix.specs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
+ <version>${servicemix.specs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
+ <version>${servicemix.specs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jaxb-api-2.0</artifactId>
+ <version>${servicemix.specs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jaxws-api-2.0</artifactId>
+ <version>${servicemix.specs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jaxb-impl-2.0.3</artifactId>
+ <version>${servicemix.feature.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.wsdl4j-1.6.1</artifactId>
+ <version>${servicemix.feature.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.xmlschema-1.3.2</artifactId>
+ <version>${servicemix.feature.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.asm-2.2.3</artifactId>
+ <version>${servicemix.kernel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.xmlresolver-1.2</artifactId>
+ <version>${servicemix.feature.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.neethi-2.0.2</artifactId>
+ <version>${servicemix.feature.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.woodstox</artifactId>
+ <version>${woodstox.bundle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-bundle-minimal</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-dosgi-ri-discovery-local</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-dosgi-ri-dsw-cxf</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Bundle-Name>Distributed OSGi Distribution Software Single-Bundle
Distribution</Bundle-Name>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
+
<Bundle-Activator>org.apache.cxf.dosgi.AggregatedActivator</Bundle-Activator>
+ <!-- <Private-Package>*</Private-Package> -->
+ <Import-Package>
+ !.,
+ !bsh,
+ org.osgi.*,
+ *;resolution:=optional
+ </Import-Package>
+ <Export-Package>org.apache.cxf.dosgi</Export-Package>
+ <Embed-Dependency>*;scope=compile;inline=false</Embed-Dependency>
+ <Embed-Directory>lib</Embed-Directory>
+ <_exportcontents>*</_exportcontents>
+ <DynamicImport-Package>*</DynamicImport-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: cxf/sandbox/dosgi/distribution/single-bundle/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cxf/sandbox/dosgi/distribution/single-bundle/pom.xml
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange: cxf/sandbox/dosgi/distribution/single-bundle/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/AggregatedActivator.java
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/AggregatedActivator.java?rev=704817&view=auto
==============================================================================
---
cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/AggregatedActivator.java
(added)
+++
cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/AggregatedActivator.java
Wed Oct 15 02:17:58 2008
@@ -0,0 +1,65 @@
+package org.apache.cxf.dosgi;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+
+public class AggregatedActivator implements BundleActivator {
+ private static final String ACTIVATOR_RESOURCE = "activators.list";
+
+ private List<BundleActivator> activators = new
ArrayList<BundleActivator>();
+
+ public void start(BundleContext ctx) throws Exception {
+ SPIActivator sba = new SPIActivator();
+ sba.start(ctx);
+ activators.add(sba);
+
+ for (String s : getActivators()) {
+ try {
+ System.out.println("Activator class name " + s);
+ Class<?> clazz = getClass().getClassLoader().loadClass(s);
+ Object o = clazz.newInstance();
+ if (o instanceof BundleActivator) {
+ System.out.println("Starting " + s);
+ BundleActivator ba = (BundleActivator) o;
+ activators.add(ba);
+ ba.start(ctx);
+ }
+ } catch (Throwable th) {
+ th.printStackTrace();
+ }
+ }
+ }
+
+ public void stop(BundleContext ctx) throws Exception {
+ for (BundleActivator ba : activators) {
+ ba.stop(ctx);
+ }
+ }
+
+ Collection<String> getActivators() throws IOException {
+ List<String> bundleActivators = new ArrayList<String>();
+
+ URL url = getClass().getResource(ACTIVATOR_RESOURCE);
+ if (url == null) {
+ return Collections.emptyList();
+ }
+
+ BufferedReader br = new BufferedReader(new
InputStreamReader(url.openStream()));
+ String line = null;
+ while ((line = br.readLine()) != null) {
+ bundleActivators.add(line);
+ }
+
+ return bundleActivators;
+ }
+
+}
Propchange:
cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/AggregatedActivator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/AggregatedActivator.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/SPIActivator.java
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/SPIActivator.java?rev=704817&view=auto
==============================================================================
---
cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/SPIActivator.java
(added)
+++
cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/SPIActivator.java
Wed Oct 15 02:17:58 2008
@@ -0,0 +1,96 @@
+package org.apache.cxf.dosgi;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Vector;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import org.apache.servicemix.specs.locator.OsgiLocator;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleEvent;
+import org.osgi.framework.SynchronousBundleListener;
+import org.springframework.core.io.Resource;
+import org.springframework.osgi.io.OsgiBundleResourcePatternResolver;
+
+public class SPIActivator implements BundleActivator,
SynchronousBundleListener {
+ private ConcurrentMap<Long, Map<String, Callable<Class>>> factories = new
ConcurrentHashMap<Long, Map<String, Callable<Class>>>();
+
+ public synchronized void start(BundleContext bundleContext) throws
Exception {
+ register(bundleContext.getBundle());
+ }
+
+ public synchronized void stop(BundleContext bundleContext) throws
Exception {
+ while (!factories.isEmpty()) {
+ unregister(factories.keySet().iterator().next());
+ }
+ }
+
+ public void bundleChanged(BundleEvent event) {
+ if (event.getType() == BundleEvent.RESOLVED) {
+ register(event.getBundle());
+ } else if (event.getType() == BundleEvent.UNRESOLVED) {
+ unregister(event.getBundle().getBundleId());
+ }
+ }
+
+ protected void register(final Bundle bundle) {
+ Map<String, Callable<Class>> map = factories.get(bundle.getBundleId());
+
+ Vector<URL> v = new Vector<URL>();
+ try {
+ Resource[] resources = new
OsgiBundleResourcePatternResolver(bundle).getResources("classpath*:META-INF/services/*");
+ for (Resource r : resources) {
+ v.add(r.getURL());
+ }
+ } catch (IOException e1) {
+ e1.printStackTrace();
+ }
+
+ Enumeration<URL> e = v.elements();
+ if (e != null) {
+ while (e.hasMoreElements()) {
+ final URL u = (URL) e.nextElement();
+ final String url = u.toString();
+ if (url.endsWith("/")) {
+ continue;
+ }
+ final String factoryId = url.substring(url.lastIndexOf("/") +
1);
+ if (map == null) {
+ map = new HashMap<String, Callable<Class>>();
+ factories.put(bundle.getBundleId(), map);
+ }
+ map.put(factoryId, new Callable<Class>() {
+ public Class call() throws Exception {
+ BufferedReader br = new BufferedReader(new
InputStreamReader(u.openStream(), "UTF-8"));
+ String factoryClassName = br.readLine();
+ br.close();
+ return bundle.loadClass(factoryClassName);
+ }
+ });
+ }
+ }
+ if (map != null) {
+ for (Map.Entry<String, Callable<Class>> entry : map.entrySet()) {
+ OsgiLocator.register(entry.getKey(), entry.getValue());
+ }
+ }
+ }
+
+ protected void unregister(long bundleId) {
+ Map<String, Callable<Class>> map = factories.remove(bundleId);
+ if (map != null) {
+ for (Map.Entry<String, Callable<Class>> entry : map.entrySet()) {
+ OsgiLocator.unregister(entry.getKey(), entry.getValue());
+ }
+ }
+ }
+}
Propchange:
cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/SPIActivator.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cxf/sandbox/dosgi/distribution/single-bundle/src/main/java/org/apache/cxf/dosgi/SPIActivator.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added:
cxf/sandbox/dosgi/distribution/single-bundle/src/main/resources/org/apache/cxf/dosgi/activators.list
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/distribution/single-bundle/src/main/resources/org/apache/cxf/dosgi/activators.list?rev=704817&view=auto
==============================================================================
---
cxf/sandbox/dosgi/distribution/single-bundle/src/main/resources/org/apache/cxf/dosgi/activators.list
(added)
+++
cxf/sandbox/dosgi/distribution/single-bundle/src/main/resources/org/apache/cxf/dosgi/activators.list
Wed Oct 15 02:17:58 2008
@@ -0,0 +1,3 @@
+org.apache.cxf.dosgi.discovery.local.Activator
+org.apache.cxf.dosgi.dsw.Activator
+org.springframework.osgi.extender.internal.activator.ContextLoaderListener
Added:
cxf/sandbox/dosgi/distribution/single-bundle/src/main/resources/org/apache/cxf/dosgi/old_activators.list
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/distribution/single-bundle/src/main/resources/org/apache/cxf/dosgi/old_activators.list?rev=704817&view=auto
==============================================================================
---
cxf/sandbox/dosgi/distribution/single-bundle/src/main/resources/org/apache/cxf/dosgi/old_activators.list
(added)
+++
cxf/sandbox/dosgi/distribution/single-bundle/src/main/resources/org/apache/cxf/dosgi/old_activators.list
Wed Oct 15 02:17:58 2008
@@ -0,0 +1,4 @@
+org.apache.cxf.dosgi.discovery.local.Activator
+org.apache.cxf.dosgi.dsw.Activator
+org.apache.servicemix.specs.locator.Activator
+org.springframework.osgi.extender.internal.activator.ContextLoaderListener
Added:
cxf/sandbox/dosgi/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/AggregatedActivatorTest.java
URL:
http://svn.apache.org/viewvc/cxf/sandbox/dosgi/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/AggregatedActivatorTest.java?rev=704817&view=auto
==============================================================================
---
cxf/sandbox/dosgi/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/AggregatedActivatorTest.java
(added)
+++
cxf/sandbox/dosgi/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/AggregatedActivatorTest.java
Wed Oct 15 02:17:58 2008
@@ -0,0 +1,17 @@
+package org.apache.cxf.dosgi;
+
+import java.util.Arrays;
+
+import junit.framework.TestCase;
+
+public class AggregatedActivatorTest extends TestCase {
+ public void testReadResourcesFile() throws Exception {
+ String[] expected = {"org.apache.cxf.dosgi.discovery.local.Activator",
+ "org.apache.cxf.dosgi.dsw.Activator",
+// "org.apache.servicemix.specs.locator.Activator",
+
"org.springframework.osgi.extender.internal.activator.ContextLoaderListener"};
+
+ AggregatedActivator aa = new AggregatedActivator();
+ assertEquals(Arrays.asList(expected), aa.getActivators());
+ }
+}
Propchange:
cxf/sandbox/dosgi/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/AggregatedActivatorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cxf/sandbox/dosgi/distribution/single-bundle/src/test/java/org/apache/cxf/dosgi/AggregatedActivatorTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
