You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2009/02/23 09:21:05 UTC
svn commit: r746916 - in /servicemix/smx4:
features/trunk/assembly/src/main/filtered-resources/
features/trunk/transaction/transaction/ nmr/trunk/
nmr/trunk/assembly/src/main/filtered-resources/ nmr/trunk/document/
nmr/trunk/jbi/deployer/ nmr/trunk/jbi...
Author: gnodet
Date: Mon Feb 23 08:21:04 2009
New Revision: 746916
URL: http://svn.apache.org/viewvc?rev=746916&view=rev
Log:
SMX4NMR-102: Move transations support from the features to NMR project
Added:
servicemix/smx4/nmr/trunk/transaction/ (props changed)
- copied from r746904, servicemix/smx4/features/trunk/transaction/transaction/
Removed:
servicemix/smx4/features/trunk/transaction/transaction/
Modified:
servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml
servicemix/smx4/nmr/trunk/document/pom.xml
servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/AdminCommandsImpl.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/ComponentInstaller.java
servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java
servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java
servicemix/smx4/nmr/trunk/naming/pom.xml
servicemix/smx4/nmr/trunk/pom.xml
servicemix/smx4/nmr/trunk/transaction/pom.xml
Modified: servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml?rev=746916&r1=746915&r2=746916&view=diff
==============================================================================
--- servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ servicemix/smx4/features/trunk/assembly/src/main/filtered-resources/features.xml Mon Feb 23 08:21:04 2009
@@ -18,17 +18,6 @@
-->
<features>
<repository>mvn:org.apache.servicemix.nmr/apache-servicemix-nmr/${servicemix.nmr.version}/xml/features</repository>
- <feature name="transaction">
- <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta.version}</bundle>
- <bundle>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo.jms.version}</bundle>
- <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/${geronimo.j2ee.connector.version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.howl/${howl.version}</bundle>
- <bundle>mvn:org.apache.geronimo.components/geronimo-transaction/${geronimo.transaction.version}</bundle>
- <bundle>mvn:org.apache.geronimo.components/geronimo-connector/${geronimo.connector.version}</bundle>
- <bundle>mvn:org.springframework/spring-tx/${spring.version}</bundle>
- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jencks/${jencks.version}</bundle>
- <bundle>mvn:org.apache.servicemix.transaction/org.apache.servicemix.transaction/${version}</bundle>
- </feature>
<feature name="web-core">
<bundle>mvn:org.apache.geronimo.specs/geronimo-servlet_2.5_spec/${geronimo.servlet.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jetty-bundle/${jetty.bundle.version}</bundle>
Modified: servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml?rev=746916&r1=746915&r2=746916&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/src/main/filtered-resources/features.xml Mon Feb 23 08:21:04 2009
@@ -17,6 +17,20 @@
limitations under the License.
-->
<features>
+ <feature name="naming" version="${version}">
+ <bundle>mvn:org.apache.xbean/xbean-naming/${xbean.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.naming/org.apache.servicemix.naming/${pom.version}</bundle>
+ </feature>
+ <feature name="transaction" version="${version}">
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta.version}</bundle>
+ <bundle>mvn:org.apache.geronimo.specs/geronimo-j2ee-connector_1.5_spec/${geronimo.j2ee.connector.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.howl/${howl.version}</bundle>
+ <bundle>mvn:org.apache.geronimo.components/geronimo-transaction/${geronimo.transaction.version}</bundle>
+ <bundle>mvn:org.apache.geronimo.components/geronimo-connector/${geronimo.connector.version}</bundle>
+ <bundle>mvn:org.springframework/spring-tx/${spring.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jencks/${jencks.version}</bundle>
+ <bundle>mvn:org.apache.servicemix.transaction/org.apache.servicemix.transaction/${version}</bundle>
+ </feature>
<feature name="nmr" version="${version}">
<bundle>mvn:org.apache.servicemix.document/org.apache.servicemix.document/${pom.version}</bundle>
<bundle>mvn:org.apache.servicemix.nmr/org.apache.servicemix.nmr.api/${pom.version}</bundle>
@@ -27,17 +41,16 @@
<bundle>mvn:org.apache.servicemix.nmr/org.apache.servicemix.nmr.management/${pom.version}</bundle>
</feature>
<feature name="jbi" version="${version}">
+ <feature version="${version}">naming</feature>
+ <feature version="${version}">transaction</feature>
<feature version="${version}">nmr</feature>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix.specs.version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.javamail-api-1.4/${servicemix.specs.version}</bundle>
- <bundle>mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/${geronimo.jta.version}</bundle>
<bundle>mvn:org.apache.xbean/xbean-classloader/${xbean.version}</bundle>
- <bundle>mvn:org.apache.xbean/xbean-naming/${xbean.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.woodstox/${woodstox.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${wsdl4j.version}</bundle>
<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant.version}</bundle>
<bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jbi-api-1.0/${servicemix.specs.version}</bundle>
- <bundle>mvn:org.apache.servicemix.naming/org.apache.servicemix.naming/${pom.version}</bundle>
<bundle>mvn:org.apache.servicemix.jbi/org.apache.servicemix.jbi.runtime/${pom.version}</bundle>
<bundle>mvn:org.apache.servicemix.jbi/org.apache.servicemix.jbi.osgi/${pom.version}</bundle>
<bundle>mvn:org.apache.servicemix.jbi/org.apache.servicemix.jbi.deployer/${pom.version}</bundle>
Modified: servicemix/smx4/nmr/trunk/document/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/document/pom.xml?rev=746916&r1=746915&r2=746916&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/document/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/document/pom.xml Mon Feb 23 08:21:04 2009
@@ -66,6 +66,7 @@
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Export-Package>${pom.artifactId},${pom.artifactId}.factory</Export-Package>
<Private-Package>${pom.artifactId}.impl</Private-Package>
+ <Spring-Context>*;publish-context:=false;create-asynchronously:=true</Spring-Context>
</instructions>
</configuration>
</plugin>
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml?rev=746916&r1=746915&r2=746916&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml Mon Feb 23 08:21:04 2009
@@ -91,7 +91,7 @@
org.apache.geronimo.transaction.manager;resolution:=optional,
*
</Import-Package>
- <Export-Package>org.apache.servicemix.jbi.deployer*,org.apache.servicemix.jbi.management*</Export-Package>
+ <Export-Package>org.apache.servicemix.jbi.deployer*</Export-Package>
<Spring-Context>*;publish-context:=false;create-asynchronously:=false</Spring-Context>
</instructions>
</configuration>
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/AdminCommandsImpl.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/AdminCommandsImpl.java?rev=746916&r1=746915&r2=746916&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/AdminCommandsImpl.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/AdminCommandsImpl.java Mon Feb 23 08:21:04 2009
@@ -73,7 +73,7 @@
if (installationService.unloadInstaller(name, true)) {
return ManagementSupport.createSuccessMessage("uninstallComponent", name);
}
- throw new RuntimeException();
+ throw ManagementSupport.failure("uninstallComponent", name);
} catch (Exception e) {
throw ManagementSupport.failure("uninstallComponent", name, e);
}
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/ComponentInstaller.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/ComponentInstaller.java?rev=746916&r1=746915&r2=746916&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/ComponentInstaller.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/ComponentInstaller.java Mon Feb 23 08:21:04 2009
@@ -352,7 +352,7 @@
for (SharedLibraryList sll : componentDesc.getSharedLibraries()) {
SharedLibrary lib = deployer.getSharedLibrary(sll.getName());
if (lib == null) {
- // TODO: throw exception here
+ // TODO: throw exception here ?
} else {
libs.add(lib);
}
Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java?rev=746916&r1=746915&r2=746916&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java Mon Feb 23 08:21:04 2009
@@ -76,9 +76,6 @@
private final Map<String, ServiceAssemblyImpl> serviceAssemblies = new ConcurrentHashMap<String, ServiceAssemblyImpl>();
private final Map<Bundle, AbstractInstaller> installers = new ConcurrentHashMap<Bundle, AbstractInstaller>();
-// private final Map<String, SharedLibraryInstaller> sharedLibrariesInstallers = new ConcurrentHashMap<String, SharedLibraryInstaller>();
-// private final Map<String, ComponentInstaller> componentsInstallers = new ConcurrentHashMap<String, ComponentInstaller>();
-// private final Map<String, ServiceAssemblyInstaller> serviceAssembliesInstallers = new ConcurrentHashMap<String, ServiceAssemblyInstaller>();
private final ThreadLocal<AbstractInstaller> jmxManaged = new ThreadLocal<AbstractInstaller>();
@@ -100,7 +97,6 @@
private AssemblyReferencesListener endpointListener;
-
// Helper beans
private NamingStrategy namingStrategy;
private ManagementAgent managementAgent;
@@ -347,15 +343,16 @@
props.put(TYPE, componentDesc.getType());
// register the component in the OSGi registry
LOGGER.debug("Registering JBI component");
- registerService(bundle, Component.class.getName(), component, props);
- registerService(bundle, ComponentWrapper.class.getName(), component, props);
+ registerService(bundle, new String[] { Component.class.getName(), ComponentWrapper.class.getName() },
+ component, props);
+ components.put(name, component);
+ // Now, register the inner component
registerService(bundle, javax.jbi.component.Component.class.getName(), innerComponent, props);
getManagementAgent().register(new StandardMBean(component, Component.class),
getNamingStrategy().getObjectName(component));
for (SharedLibrary lib : sharedLibraries) {
((SharedLibraryImpl) lib).addComponent(component);
}
- components.put(name, component);
return component;
}
@@ -442,8 +439,8 @@
Dictionary<String, String> props = new Hashtable<String, String>();
props.put(NAME, name);
props.put(TYPE, componentDesc.getType());
- registerService(reference.getBundle(), Component.class.getName(), wrapper, props);
- registerService(reference.getBundle(), ComponentWrapper.class.getName(), wrapper, props);
+ registerService(reference.getBundle(), new String[] { Component.class.getName(), ComponentWrapper.class.getName() },
+ wrapper, props);
}
}
@@ -527,6 +524,10 @@
* @param props
*/
protected void registerService(Bundle bundle, String clazz, Object service, Dictionary props) {
+ registerService(bundle, new String[] { clazz }, service, props);
+ }
+
+ protected void registerService(Bundle bundle, String[] clazz, Object service, Dictionary props) {
BundleContext context = bundle.getBundleContext() != null ? bundle.getBundleContext() : getBundleContext();
ServiceRegistration reg = context.registerService(clazz, service, props);
List<ServiceRegistration> registrations = services.get(bundle);
Modified: servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java?rev=746916&r1=746915&r2=746916&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/src/test/java/org/apache/servicemix/jbi/itests/ManagementTest.java Mon Feb 23 08:21:04 2009
@@ -92,11 +92,7 @@
System.err.println(res);
fail("Call should have failed: " + res);
} catch (Throwable t) {
- if (t.getCause() instanceof DeploymentException) {
- System.err.println(t.getCause().getMessage());
- } else {
- t.printStackTrace();
- }
+ // Expected
}
System.err.println(admin.installSharedLibrary(smxShared, false));
@@ -107,11 +103,7 @@
System.err.println(res);
fail("Call should have failed: " + res);
} catch (Throwable t) {
- if (t.getCause() instanceof DeploymentException) {
- System.err.println(t.getCause().getMessage());
- } else {
- t.printStackTrace();
- }
+ // Expected
}
System.err.println(admin.uninstallComponent("servicemix-jsr181"));
Modified: servicemix/smx4/nmr/trunk/naming/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/naming/pom.xml?rev=746916&r1=746915&r2=746916&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/naming/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/naming/pom.xml Mon Feb 23 08:21:04 2009
@@ -79,6 +79,7 @@
<Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
<Export-Package>${pom.artifactId}*</Export-Package>
<DynamicImport-Package>*</DynamicImport-Package>
+ <Spring-Context>*;publish-context:=false;create-asynchronously:=true</Spring-Context>
</instructions>
</configuration>
</plugin>
Modified: servicemix/smx4/nmr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=746916&r1=746915&r2=746916&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Mon Feb 23 08:21:04 2009
@@ -34,9 +34,10 @@
<modules>
<module>branding</module>
- <module>nmr</module>
<module>document</module>
<module>naming</module>
+ <module>transaction</module>
+ <module>nmr</module>
<module>jbi</module>
<module>bundle</module>
<module>assembly</module>
@@ -76,10 +77,14 @@
<felix.compendium.version>1.2.0</felix.compendium.version>
<felix.bundlerepository.version>1.2.0</felix.bundlerepository.version>
<felix.prefs.version>1.0.2</felix.prefs.version>
+ <geronimo.connector.version>2.2-r634076</geronimo.connector.version>
+ <geronimo.j2ee.connector.version>2.0.0</geronimo.j2ee.connector.version>
<geronimo.jms.version>1.1.1</geronimo.jms.version>
<geronimo.jta.version>1.1.1</geronimo.jta.version>
<geronimo.servlet.version>1.1.2</geronimo.servlet.version>
<geronimo.stax.version>1.0.1</geronimo.stax.version>
+ <geronimo.transaction.version>2.2-r634076</geronimo.transaction.version>
+ <howl.version>1.0.1-1_1</howl.version>
<jencks.version>2.1_1</jencks.version>
<jline.version>0.9.94</jline.version>
<jmock.version>2.5.1</jmock.version>
@@ -176,6 +181,11 @@
<version>4.4</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.junit</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<dependencyManagement>
@@ -620,6 +630,36 @@
<artifactId>jmock</artifactId>
<version>${jmock.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-transaction</artifactId>
+ <version>${geronimo.transaction.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.components</groupId>
+ <artifactId>geronimo-connector</artifactId>
+ <version>${geronimo.connector.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jencks</artifactId>
+ <version>${jencks.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.howl</artifactId>
+ <version>${howl.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-core</artifactId>
+ <version>${spring.osgi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
Propchange: servicemix/smx4/nmr/trunk/transaction/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Feb 23 08:21:04 2009
@@ -0,0 +1,9 @@
+target
+runner
+*.iml
+*.ipr
+*.iws
+.classpath
+.project
+.settings
+bin
Propchange: servicemix/smx4/nmr/trunk/transaction/
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: servicemix/smx4/nmr/trunk/transaction/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/transaction/pom.xml?rev=746916&r1=746904&r2=746916&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/transaction/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/transaction/pom.xml Mon Feb 23 08:21:04 2009
@@ -22,69 +22,53 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.servicemix.transaction</groupId>
- <artifactId>transaction</artifactId>
- <version>4.0-m2-SNAPSHOT</version>
+ <groupId>org.apache.servicemix.nmr</groupId>
+ <artifactId>nmr-parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.servicemix.transaction</groupId>
<artifactId>org.apache.servicemix.transaction</artifactId>
<packaging>bundle</packaging>
- <version>4.0-m2-SNAPSHOT</version>
- <name>Apache ServiceMix Features :: Transaction</name>
+ <name>Apache ServiceMix Transaction</name>
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
- <version>${geronimo.jta.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-transaction</artifactId>
- <version>${geronimo.transaction.version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-connector</artifactId>
- <version>${geronimo.connector.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.jencks</artifactId>
- <version>${jencks.version}</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.howl</artifactId>
- <version>${howl.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.osgi</groupId>
<artifactId>spring-osgi-core</artifactId>
- <version>${spring.osgi.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-tx</artifactId>
- <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>${felix.osgi.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
- <version>${commons.logging.version}</version>
<scope>test</scope>
</dependency>
</dependencies>