Author: rsivaram
Date: Thu Mar 20 03:01:07 2008
New Revision: 639230
URL: http://svn.apache.org/viewvc?rev=639230&view=rev
Log:
Use latest Felix release 1.0.3
Modified:
incubator/tuscany/branches/sca-java-1.2/itest/osgi-contribution/contribution-test/pom.xml
incubator/tuscany/branches/sca-java-1.2/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties
incubator/tuscany/branches/sca-java-1.2/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
incubator/tuscany/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties
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/itest/osgi-contribution/contribution-test/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/itest/osgi-contribution/contribution-test/pom.xml?rev=639230&r1=639229&r2=639230&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/itest/osgi-contribution/contribution-test/pom.xml
(original)
+++
incubator/tuscany/branches/sca-java-1.2/itest/osgi-contribution/contribution-test/pom.xml
Thu Mar 20 03:01:07 2008
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.0.3</version>
</dependency>
<dependency>
Modified:
incubator/tuscany/branches/sca-java-1.2/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties?rev=639230&r1=639229&r2=639230&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties
(original)
+++
incubator/tuscany/branches/sca-java-1.2/itest/osgi-contribution/contribution-test/src/test/resources/osgi/felix/felix.config.properties
Thu Mar 20 03:01:07 2008
@@ -27,11 +27,12 @@
felix.auto.start.1= \
-
"file://${FELIX_DIR}/org.apache.felix.shell/1.1.0-SNAPSHOT/org.apache.felix.shell-1.1.0-SNAPSHOT.jar"
\
-
"file://${FELIX_DIR}/org.apache.felix.shell.tui/1.1.0-SNAPSHOT/org.apache.felix.shell.tui-1.1.0-SNAPSHOT.jar"
\
-
"file://${FELIX_DIR}/org.apache.felix.bundlerepository/1.1.0-SNAPSHOT/org.apache.felix.bundlerepository-1.1.0-SNAPSHOT.jar"
\
"file://${FELIX_DIR}/org.apache.felix.scr/1.0.0/org.apache.felix.scr-1.0.0.jar"
\
"file://${FELIX_DIR}/org.apache.felix.configadmin/1.0.0/org.apache.felix.configadmin-1.0.0.jar"
+
+#
"file://${FELIX_DIR}/org.apache.felix.shell/1.1.0-SNAPSHOT/org.apache.felix.shell-1.1.0-SNAPSHOT.jar"
\
+#
"file://${FELIX_DIR}/org.apache.felix.shell.tui/1.1.0-SNAPSHOT/org.apache.felix.shell.tui-1.1.0-SNAPSHOT.jar"
\
+#
"file://${FELIX_DIR}/org.apache.felix.bundlerepository/1.1.0-SNAPSHOT/org.apache.felix.bundlerepository-1.1.0-SNAPSHOT.jar"
\
felix.startlevel.framework=1
Modified:
incubator/tuscany/branches/sca-java-1.2/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties?rev=639230&r1=639229&r2=639230&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
(original)
+++
incubator/tuscany/branches/sca-java-1.2/itest/osgi-implementation/src/test/resources/osgi/felix/felix.config.properties
Thu Mar 20 03:01:07 2008
@@ -27,11 +27,12 @@
felix.auto.start.1= \
-
"file://${FELIX_DIR}/org.apache.felix.shell/1.1.0-SNAPSHOT/org.apache.felix.shell-1.1.0-SNAPSHOT.jar"
\
-
"file://${FELIX_DIR}/org.apache.felix.shell.tui/1.1.0-SNAPSHOT/org.apache.felix.shell.tui-1.1.0-SNAPSHOT.jar"
\
-
"file://${FELIX_DIR}/org.apache.felix.bundlerepository/1.1.0-SNAPSHOT/org.apache.felix.bundlerepository-1.1.0-SNAPSHOT.jar"
\
"file://${FELIX_DIR}/org.apache.felix.scr/1.0.0/org.apache.felix.scr-1.0.0.jar"
\
"file://${FELIX_DIR}/org.apache.felix.configadmin/1.0.0/org.apache.felix.configadmin-1.0.0.jar"
+
+#
"file://${FELIX_DIR}/org.apache.felix.shell/1.1.0-SNAPSHOT/org.apache.felix.shell-1.1.0-SNAPSHOT.jar"
\
+#
"file://${FELIX_DIR}/org.apache.felix.shell.tui/1.1.0-SNAPSHOT/org.apache.felix.shell.tui-1.1.0-SNAPSHOT.jar"
\
+#
"file://${FELIX_DIR}/org.apache.felix.bundlerepository/1.1.0-SNAPSHOT/org.apache.felix.bundlerepository-1.1.0-SNAPSHOT.jar"
\
felix.startlevel.framework=1
Modified:
incubator/tuscany/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties?rev=639230&r1=639229&r2=639230&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties
(original)
+++
incubator/tuscany/branches/sca-java-1.2/itest/osgi-tuscany/osgi-tuscany-test/src/test/resources/felix/felix.config.properties
Thu Mar 20 03:01:07 2008
@@ -27,12 +27,12 @@
felix.auto.start.1= \
-
"file://${FELIX_DIR}/org.apache.felix.shell/1.1.0-SNAPSHOT/org.apache.felix.shell-1.1.0-SNAPSHOT.jar"
\
-
"file://${FELIX_DIR}/org.apache.felix.shell.tui/1.1.0-SNAPSHOT/org.apache.felix.shell.tui-1.1.0-SNAPSHOT.jar"
\
-
"file://${FELIX_DIR}/org.apache.felix.bundlerepository/1.1.0-SNAPSHOT/org.apache.felix.bundlerepository-1.1.0-SNAPSHOT.jar"
\
"file://${FELIX_DIR}/org.apache.felix.scr/1.0.0/org.apache.felix.scr-1.0.0.jar"
#
"file://${FELIX_DIR}/org.apache.felix.configadmin/1.0.0/org.apache.felix.configadmin-1.0.0.jar"
+#
"file://${FELIX_DIR}/org.apache.felix.shell/1.1.0-SNAPSHOT/org.apache.felix.shell-1.1.0-SNAPSHOT.jar"
\
+#
"file://${FELIX_DIR}/org.apache.felix.shell.tui/1.1.0-SNAPSHOT/org.apache.felix.shell.tui-1.1.0-SNAPSHOT.jar"
\
+#
"file://${FELIX_DIR}/org.apache.felix.bundlerepository/1.1.0-SNAPSHOT/org.apache.felix.bundlerepository-1.1.0-SNAPSHOT.jar"
\
felix.startlevel.framework=1
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=639230&r1=639229&r2=639230&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
Thu Mar 20 03:01:07 2008
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
- <version>1.0.1</version>
+ <version>1.0.3</version>
</dependency>
<dependency>
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=639230&r1=639229&r2=639230&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
Thu Mar 20 03:01:07 2008
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
- <version>1.0.1</version>
+ <version>1.0.3</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=639230&r1=639229&r2=639230&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 Thu
Mar 20 03:01:07 2008
@@ -35,7 +35,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
- <version>1.0.1</version>
+ <version>1.0.3</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=639230&r1=639229&r2=639230&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
Thu Mar 20 03:01:07 2008
@@ -123,13 +123,16 @@
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);
- */
+ try {
+ Class<?> autoActivatorClass =
cl.loadClass("org.apache.felix.main.AutoActivator");
+ Constructor autoActivatorConstructor =
autoActivatorClass.getConstructor(Map.class);
+ BundleActivator autoActivator =
(BundleActivator)autoActivatorConstructor.newInstance(props);
+ activators.add(autoActivator);
+
+ } catch (Throwable e) {
+ // Pre-1.0.3 release of Felix did not require 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=639230&r1=639229&r2=639230&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
Thu Mar 20 03:01:07 2008
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
- <version>1.0.1</version>
+ <version>1.0.3</version>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
