Author: lresende
Date: Wed Mar 19 18:55:44 2008
New Revision: 639110
URL: http://svn.apache.org/viewvc?rev=639110&view=rev
Log:
Applying the right felix version (1.0.1) and porting the FelixRuntime to
properly compile
Modified:
incubator/tuscany/branches/sca-java-1.2/modules/contribution-osgi/pom.xml
incubator/tuscany/branches/sca-java-1.2/modules/implementation-osgi/pom.xml
incubator/tuscany/branches/sca-java-1.2/modules/osgi-runtime/pom.xml
incubator/tuscany/branches/sca-java-1.2/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/FelixRuntime.java
incubator/tuscany/branches/sca-java-1.2/samples/osgi-supplychain/pom.xml
Modified:
incubator/tuscany/branches/sca-java-1.2/modules/contribution-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/contribution-osgi/pom.xml?rev=639110&r1=639109&r2=639110&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/modules/contribution-osgi/pom.xml
(original)
+++ incubator/tuscany/branches/sca-java-1.2/modules/contribution-osgi/pom.xml
Wed Mar 19 18:55:44 2008
@@ -50,10 +50,8 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
- <version>1.1.0</version>
+ <version>1.0.1</version>
</dependency>
-
-
<dependency>
<groupId>org.codehaus.woodstox</groupId>
Modified:
incubator/tuscany/branches/sca-java-1.2/modules/implementation-osgi/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/implementation-osgi/pom.xml?rev=639110&r1=639109&r2=639110&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/modules/implementation-osgi/pom.xml
(original)
+++ incubator/tuscany/branches/sca-java-1.2/modules/implementation-osgi/pom.xml
Wed Mar 19 18:55:44 2008
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
- <version>1.1.0</version>
+ <version>1.0.1</version>
</dependency>
Modified: incubator/tuscany/branches/sca-java-1.2/modules/osgi-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/osgi-runtime/pom.xml?rev=639110&r1=639109&r2=639110&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/modules/osgi-runtime/pom.xml
(original)
+++ incubator/tuscany/branches/sca-java-1.2/modules/osgi-runtime/pom.xml Wed
Mar 19 18:55:44 2008
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
- <version>1.1.0</version>
+ <version>1.0.1</version>
</dependency>
Modified:
incubator/tuscany/branches/sca-java-1.2/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/FelixRuntime.java
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/FelixRuntime.java?rev=639110&r1=639109&r2=639110&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/FelixRuntime.java
(original)
+++
incubator/tuscany/branches/sca-java-1.2/modules/osgi-runtime/src/main/java/org/apache/tuscany/sca/osgi/runtime/FelixRuntime.java
Wed Mar 19 18:55:44 2008
@@ -123,10 +123,13 @@
Constructor felixConstructor =
felixClass.getConstructor(Map.class, List.class);
List<BundleActivator> activators = new
ArrayList<BundleActivator>();
+ //FIXME this is broken after we switch for Felix 1.0.1 release
(classNotFound AutoActivator)
+ /*
Class<?> autoActivatorClass =
cl.loadClass("org.apache.felix.main.AutoActivator");
Constructor autoActivatorConstructor =
autoActivatorClass.getConstructor(Map.class);
BundleActivator autoActivator =
(BundleActivator)autoActivatorConstructor.newInstance(props);
activators.add(autoActivator);
+ */
felix = felixConstructor.newInstance(props, activators);
((Bundle)felix).start();
Modified:
incubator/tuscany/branches/sca-java-1.2/samples/osgi-supplychain/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/samples/osgi-supplychain/pom.xml?rev=639110&r1=639109&r2=639110&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.2/samples/osgi-supplychain/pom.xml
(original)
+++ incubator/tuscany/branches/sca-java-1.2/samples/osgi-supplychain/pom.xml
Wed Mar 19 18:55:44 2008
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
- <version>1.1.0</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
