Author: gnodet
Date: Fri Sep 26 08:12:14 2008
New Revision: 699359
URL: http://svn.apache.org/viewvc?rev=699359&view=rev
Log:
SMX4KNL-98: Use dependency management section for all dependencies
Modified:
servicemix/smx4/kernel/trunk/pom.xml
servicemix/smx4/kernel/trunk/testing/support/pom.xml
servicemix/smx4/kernel/trunk/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/SmxKernelPlatform.java
Modified: servicemix/smx4/kernel/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/pom.xml?rev=699359&r1=699358&r2=699359&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/pom.xml Fri Sep 26 08:12:14 2008
@@ -226,6 +226,11 @@
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.main</artifactId>
+ <version>${felix.main.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${felix.osgi.version}</version>
</dependency>
Modified: servicemix/smx4/kernel/trunk/testing/support/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/testing/support/pom.xml?rev=699359&r1=699358&r2=699359&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/testing/support/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/testing/support/pom.xml Fri Sep 26 08:12:14
2008
@@ -48,6 +48,10 @@
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.main</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.configadmin</artifactId>
</dependency>
<dependency>
Modified:
servicemix/smx4/kernel/trunk/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/SmxKernelPlatform.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/SmxKernelPlatform.java?rev=699359&r1=699358&r2=699359&view=diff
==============================================================================
---
servicemix/smx4/kernel/trunk/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/SmxKernelPlatform.java
(original)
+++
servicemix/smx4/kernel/trunk/testing/support/src/main/java/org/apache/servicemix/kernel/testing/support/SmxKernelPlatform.java
Fri Sep 26 08:12:14 2008
@@ -26,12 +26,8 @@
import java.net.URL;
import java.net.URLClassLoader;
import java.net.MalformedURLException;
-import java.net.URLStreamHandlerFactory;
-import java.net.URLStreamHandler;
import java.io.File;
import java.io.IOException;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
import java.lang.reflect.Method;
import java.lang.reflect.Constructor;
import java.security.AccessController;
@@ -42,7 +38,6 @@
import org.springframework.util.ClassUtils;
import org.apache.felix.main.Main;
import org.apache.felix.framework.Felix;
-import org.apache.felix.framework.util.SecureAction;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.osgi.framework.BundleContext;