You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aries.apache.org by no...@apache.org on 2011/03/09 16:41:13 UTC
svn commit: r1079845 -
/aries/trunk/application/application-runtime-framework/src/main/java/org/apache/aries/application/runtime/framework/config/BundleFrameworkConfigurationFactoryImpl.java
Author: not
Date: Wed Mar 9 15:41:13 2011
New Revision: 1079845
URL: http://svn.apache.org/viewvc?rev=1079845&view=rev
Log:
ARIES-602 Set osgi.console to none to ensure we don't get problems starting the child framework if the parent framework has it set.
Modified:
aries/trunk/application/application-runtime-framework/src/main/java/org/apache/aries/application/runtime/framework/config/BundleFrameworkConfigurationFactoryImpl.java
Modified: aries/trunk/application/application-runtime-framework/src/main/java/org/apache/aries/application/runtime/framework/config/BundleFrameworkConfigurationFactoryImpl.java
URL: http://svn.apache.org/viewvc/aries/trunk/application/application-runtime-framework/src/main/java/org/apache/aries/application/runtime/framework/config/BundleFrameworkConfigurationFactoryImpl.java?rev=1079845&r1=1079844&r2=1079845&view=diff
==============================================================================
--- aries/trunk/application/application-runtime-framework/src/main/java/org/apache/aries/application/runtime/framework/config/BundleFrameworkConfigurationFactoryImpl.java (original)
+++ aries/trunk/application/application-runtime-framework/src/main/java/org/apache/aries/application/runtime/framework/config/BundleFrameworkConfigurationFactoryImpl.java Wed Mar 9 15:41:13 2011
@@ -46,6 +46,10 @@ public class BundleFrameworkConfiguratio
* Set up framework config properties
*/
Properties frameworkConfig = new Properties();
+ // Problems occur if the parent framework has osgi.console set because the child framework
+ // will also attempt to listen on the same port which will cause port clashs. Setting this
+ // to null essentially turns the console off.
+ frameworkConfig.put("osgi.console", "none");
String flowedSystemPackages = EquinoxFrameworkUtils.calculateSystemPackagesToFlow(
EquinoxFrameworkUtils.getSystemExtraPkgs(parentCtx), metadata.getImportPackage());
@@ -102,10 +106,12 @@ public class BundleFrameworkConfiguratio
{
BundleFrameworkConfiguration config = null;
- /**
- * Set up framework config properties
- */
+ // Set up framework config properties
Properties frameworkConfig = new Properties();
+ // Problems occur if the parent framework has osgi.console set because the child framework
+ // will also attempt to listen on the same port which will cause port clashs. Setting this
+ // to null essentially turns the console off.
+ frameworkConfig.put("osgi.console", "none");
if (parentCtx.getProperty(Constants.FRAMEWORK_SYSTEMPACKAGES_EXTRA) != null)
frameworkConfig.put(Constants.FRAMEWORK_SYSTEMPACKAGES_EXTRA, parentCtx