You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by cc...@apache.org on 2009/02/20 20:42:06 UTC
svn commit: r746346 - in /servicemix/smx4:
kernel/trunk/etc/config.properties kernel/trunk/main/pom.xml
kernel/trunk/main/src/main/java/org/apache/servicemix/kernel/main/Main.java
kernel/trunk/pom.xml nmr/trunk/pom.xml
Author: ccustine
Date: Fri Feb 20 19:42:05 2009
New Revision: 746346
URL: http://svn.apache.org/viewvc?rev=746346&view=rev
Log:
SMX4KNL-179 - Upgrade Felix dependency
Modified:
servicemix/smx4/kernel/trunk/etc/config.properties
servicemix/smx4/kernel/trunk/main/pom.xml
servicemix/smx4/kernel/trunk/main/src/main/java/org/apache/servicemix/kernel/main/Main.java
servicemix/smx4/kernel/trunk/pom.xml
servicemix/smx4/nmr/trunk/pom.xml
Modified: servicemix/smx4/kernel/trunk/etc/config.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/etc/config.properties?rev=746346&r1=746345&r2=746346&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/etc/config.properties (original)
+++ servicemix/smx4/kernel/trunk/etc/config.properties Fri Feb 20 19:42:05 2009
@@ -21,24 +21,29 @@
# Framework config properties.
#
org.osgi.framework.system.packages=org.osgi.framework; version=1.4.0, \
+ org.osgi.framework.hooks.service; version=1.4.0, \
org.osgi.service.packageadmin; version=1.2.0, \
org.osgi.service.startlevel; version=1.1.0, \
org.osgi.service.url; version=1.0.0, \
org.apache.servicemix.kernel.main.spi; version=1.0.0, \
org.apache.servicemix.kernel.jaas.boot, \
+ org.osgi.util.tracker; version=1.3.3, \
org.apache.servicemix.kernel.version, \
${jre-${java.specification.version}}
-org.osgi.framework.bootdelegation=sun.*,com.sun.management*,
+org.osgi.framework.bootdelegation=sun.*,com.sun.management*
# To enable the use of the startup.properties file to control the start level:
felix.auto.start=startup.properties
#felix.auto.start=all
-felix.startlevel.framework=100
+org.osgi.framework.startlevel=100
felix.startlevel.bundle=60
-felix.cache.profiledir=${servicemix.base}/data/cache
#framework.service.urlhandlers=false
+# Only works on Felix 1.4+
+felix.fragment.validation=warning
+# felix.log.level=1
+
#
# Bundle config properties.
#
Modified: servicemix/smx4/kernel/trunk/main/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/main/pom.xml?rev=746346&r1=746345&r2=746346&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/main/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/main/pom.xml Fri Feb 20 19:42:05 2009
@@ -65,6 +65,8 @@
org.apache.servicemix.kernel.main;-split-package:=merge-first,
org.apache.felix.moduleloader.*;-split-package:=merge-first,
org.apache.felix.framework.*;-split-package:=merge-first,
+ org.osgi.framework.launch*,
+ org.osgi.framework.hooks*,
org.osgi.framework;-split-package:=merge-first,
org.osgi.service.packageadmin;-split-package:=merge-first,
org.osgi.service.startlevel;-split-package:=merge-first,
@@ -197,4 +199,4 @@
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
Modified: servicemix/smx4/kernel/trunk/main/src/main/java/org/apache/servicemix/kernel/main/Main.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/main/src/main/java/org/apache/servicemix/kernel/main/Main.java?rev=746346&r1=746345&r2=746346&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/main/src/main/java/org/apache/servicemix/kernel/main/Main.java (original)
+++ servicemix/smx4/kernel/trunk/main/src/main/java/org/apache/servicemix/kernel/main/Main.java Fri Feb 20 19:42:05 2009
@@ -48,6 +48,7 @@
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
import org.osgi.framework.ServiceReference;
+import org.osgi.framework.Constants;
import org.osgi.service.startlevel.StartLevel;
/**
@@ -167,14 +168,8 @@
processSecurityProperties(m_configProps);
- String profileName = m_configProps.getProperty(BundleCache.CACHE_PROFILE_PROP);
- String profileDirName = m_configProps.getProperty(BundleCache.CACHE_PROFILE_DIR_PROP);
-
- // A profile directory or name must be specified.
- if ((profileDirName == null) && (profileName == null || profileName.length() == 0)) {
- setExitCode(-1);
- throw new Exception("Invalid " + CONFIG_PROPERTIES_FILE_NAME + " configuration. The profile directory was not specified.");
- }
+ m_configProps.setProperty(BundleCache.CACHE_ROOTDIR_PROP, servicemixBase.getPath() + "/data");
+ m_configProps.setProperty(Constants.FRAMEWORK_STORAGE, "cache");
// Register the Main class so that other bundles can inspect the command line args.
BundleActivator activator = new BundleActivator() {
@@ -193,13 +188,15 @@
activations.add(this);
activations.add(activator);
+ m_configProps.put(FelixConstants.SYSTEMBUNDLE_ACTIVATORS_PROP, activations);
+
try {
- defaultStartLevel = Integer.parseInt(m_configProps.getProperty(FelixConstants.FRAMEWORK_STARTLEVEL_PROP));
+ defaultStartLevel = Integer.parseInt(m_configProps.getProperty(Constants.FRAMEWORK_BEGINNING_STARTLEVEL));
lockStartLevel = Integer.parseInt(m_configProps.getProperty(PROPERTY_LOCK_LEVEL, Integer.toString(lockStartLevel)));
lockDelay = Integer.parseInt(m_configProps.getProperty(PROPERTY_LOCK_DELAY, Integer.toString(lockDelay)));
- m_configProps.setProperty(FelixConstants.FRAMEWORK_STARTLEVEL_PROP, Integer.toString(lockStartLevel));
+ m_configProps.setProperty(Constants.FRAMEWORK_BEGINNING_STARTLEVEL, Integer.toString(lockStartLevel));
// Start up the OSGI framework
- m_felix = new Felix(new StringMap(m_configProps, false), activations);
+ m_felix = new Felix(new StringMap(m_configProps, false));
m_felix.start();
// Start lock monitor
new Thread() {
@@ -219,7 +216,7 @@
if (await) {
shutdown.await();
}
- m_felix.stopAndWait();
+ m_felix.stop();
} finally {
unlock();
}
Modified: servicemix/smx4/kernel/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/pom.xml?rev=746346&r1=746345&r2=746346&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/pom.xml Fri Feb 20 19:42:05 2009
@@ -77,9 +77,9 @@
<depends.maven.plugin.version>1.0</depends.maven.plugin.version>
<easymock.version>2.4</easymock.version>
<felix.configadmin.version>1.0.4</felix.configadmin.version>
- <felix.main.version>1.2.1</felix.main.version>
+ <felix.main.version>1.5.0-SNAPSHOT</felix.main.version>
<felix.plugin.version>1.4.3</felix.plugin.version>
- <felix.framework.version>1.2.2</felix.framework.version>
+ <felix.framework.version>1.5.0-SNAPSHOT</felix.framework.version>
<felix.osgi.version>1.2.0</felix.osgi.version>
<felix.compendium.version>1.2.0</felix.compendium.version>
<felix.bundlerepository.version>1.2.1</felix.bundlerepository.version>
@@ -120,7 +120,6 @@
</snapshots>
</repository>
<!-- Apache snapshots -->
- <!--
<repository>
<id>apache.snapshots</id>
<name>Apache Snapshots Repository</name>
@@ -132,7 +131,6 @@
<enabled>true</enabled>
</snapshots>
</repository>
- -->
<!-- ServiceMix repo -->
<repository>
<id>servicemix</id>
Modified: servicemix/smx4/nmr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=746346&r1=746345&r2=746346&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Fri Feb 20 19:42:05 2009
@@ -69,9 +69,9 @@
<commons.logging.version>1.1.1</commons.logging.version>
<depends.maven.plugin.version>1.0</depends.maven.plugin.version>
<felix.configadmin.version>1.0.4</felix.configadmin.version>
- <felix.main.version>1.2.1</felix.main.version>
- <felix.plugin.version>1.4.1</felix.plugin.version>
- <felix.framework.version>1.2.1</felix.framework.version>
+ <felix.main.version>1.5.0-SNAPSHOT</felix.main.version>
+ <felix.plugin.version>1.4.3</felix.plugin.version>
+ <felix.framework.version>1.5.0-SNAPSHOT</felix.framework.version>
<felix.osgi.version>1.2.0</felix.osgi.version>
<felix.compendium.version>1.2.0</felix.compendium.version>
<felix.bundlerepository.version>1.2.0</felix.bundlerepository.version>