You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2008/02/04 17:31:44 UTC
svn commit: r618318 - in /felix/trunk/examples: extenderbased.host/
extenderbased.host/src/main/java/org/apache/felix/example/extenderbased/host/
servicebased.host/
servicebased.host/src/main/java/org/apache/felix/example/servicebased/host/
Author: rickhall
Date: Mon Feb 4 08:31:44 2008
New Revision: 618318
URL: http://svn.apache.org/viewvc?rev=618318&view=rev
Log:
Modified example application to use new launcher approach from newly
released Felix version.
Modified:
felix/trunk/examples/extenderbased.host/pom.xml
felix/trunk/examples/extenderbased.host/src/main/java/org/apache/felix/example/extenderbased/host/Activator.java
felix/trunk/examples/servicebased.host/pom.xml
felix/trunk/examples/servicebased.host/src/main/java/org/apache/felix/example/servicebased/host/Activator.java
Modified: felix/trunk/examples/extenderbased.host/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/examples/extenderbased.host/pom.xml?rev=618318&r1=618317&r2=618318&view=diff
==============================================================================
--- felix/trunk/examples/extenderbased.host/pom.xml (original)
+++ felix/trunk/examples/extenderbased.host/pom.xml Mon Feb 4 08:31:44 2008
@@ -35,8 +35,8 @@
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>1.0.0</version>
+ <artifactId>org.apache.felix.main</artifactId>
+ <version>1.0.3</version>
</dependency>
</dependencies>
<build>
Modified: felix/trunk/examples/extenderbased.host/src/main/java/org/apache/felix/example/extenderbased/host/Activator.java
URL: http://svn.apache.org/viewvc/felix/trunk/examples/extenderbased.host/src/main/java/org/apache/felix/example/extenderbased/host/Activator.java?rev=618318&r1=618317&r2=618318&view=diff
==============================================================================
--- felix/trunk/examples/extenderbased.host/src/main/java/org/apache/felix/example/extenderbased/host/Activator.java (original)
+++ felix/trunk/examples/extenderbased.host/src/main/java/org/apache/felix/example/extenderbased/host/Activator.java Mon Feb 4 08:31:44 2008
@@ -32,6 +32,7 @@
import org.apache.felix.framework.util.FelixConstants;
import org.apache.felix.framework.util.StringMap;
import org.apache.felix.framework.cache.BundleCache;
+import org.apache.felix.main.AutoActivator;
/**
* The activator of the host application bundle. The activator creates the
@@ -153,14 +154,18 @@
"org.osgi.util.tracker; version=1.3.2," +
"org.apache.felix.example.extenderbased.host.extension; version=1.0.0," +
"javax.swing");
- configMap.put(FelixConstants.AUTO_START_PROP + ".1",
+ configMap.put(AutoActivator.AUTO_START_PROP + ".1",
"file:../extenderbased.circle/target/extenderbased.circle-1.0.0.jar " +
"file:../extenderbased.square/target/extenderbased.square-1.0.0.jar " +
"file:../extenderbased.triangle/target/extenderbased.triangle-1.0.0.jar");
configMap.put(FelixConstants.LOG_LEVEL_PROP, "1");
configMap.put(BundleCache.CACHE_PROFILE_DIR_PROP, cachedir.getAbsolutePath());
+ // Create list to hold custom framework activators.
List list = new ArrayList();
+ // Add activator to process auto-start/install properties.
+ list.add(new AutoActivator(configMap));
+ // Add our own activator.
list.add(new Activator());
try
@@ -194,4 +199,4 @@
}
file.delete();
}
-}
\ No newline at end of file
+}
Modified: felix/trunk/examples/servicebased.host/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/examples/servicebased.host/pom.xml?rev=618318&r1=618317&r2=618318&view=diff
==============================================================================
--- felix/trunk/examples/servicebased.host/pom.xml (original)
+++ felix/trunk/examples/servicebased.host/pom.xml Mon Feb 4 08:31:44 2008
@@ -35,8 +35,8 @@
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>1.0.0</version>
+ <artifactId>org.apache.felix.main</artifactId>
+ <version>1.0.3</version>
</dependency>
</dependencies>
<build>
Modified: felix/trunk/examples/servicebased.host/src/main/java/org/apache/felix/example/servicebased/host/Activator.java
URL: http://svn.apache.org/viewvc/felix/trunk/examples/servicebased.host/src/main/java/org/apache/felix/example/servicebased/host/Activator.java?rev=618318&r1=618317&r2=618318&view=diff
==============================================================================
--- felix/trunk/examples/servicebased.host/src/main/java/org/apache/felix/example/servicebased/host/Activator.java (original)
+++ felix/trunk/examples/servicebased.host/src/main/java/org/apache/felix/example/servicebased/host/Activator.java Mon Feb 4 08:31:44 2008
@@ -32,6 +32,7 @@
import org.apache.felix.framework.util.FelixConstants;
import org.apache.felix.framework.util.StringMap;
import org.apache.felix.framework.cache.BundleCache;
+import org.apache.felix.main.AutoActivator;
/**
* The activator of the host application bundle. The activator creates the
@@ -153,14 +154,18 @@
"org.osgi.util.tracker; version=1.3.2," +
"org.apache.felix.example.servicebased.host.service; version=1.0.0," +
"javax.swing");
- configMap.put(FelixConstants.AUTO_START_PROP + ".1",
+ configMap.put(AutoActivator.AUTO_START_PROP + ".1",
"file:../servicebased.circle/target/servicebased.circle-1.0.0.jar " +
"file:../servicebased.square/target/servicebased.square-1.0.0.jar " +
"file:../servicebased.triangle/target/servicebased.triangle-1.0.0.jar");
configMap.put(FelixConstants.LOG_LEVEL_PROP, "1");
configMap.put(BundleCache.CACHE_PROFILE_DIR_PROP, cachedir.getAbsolutePath());
+ // Create list to hold custom framework activators.
List list = new ArrayList();
+ // Add activator to process auto-start/install properties.
+ list.add(new AutoActivator(configMap));
+ // Add our own activator.
list.add(new Activator());
try