Return-Path: X-Original-To: apmail-ace-commits-archive@www.apache.org Delivered-To: apmail-ace-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2E9489DE0 for ; Thu, 7 Jun 2012 13:37:08 +0000 (UTC) Received: (qmail 43317 invoked by uid 500); 7 Jun 2012 13:37:08 -0000 Delivered-To: apmail-ace-commits-archive@ace.apache.org Received: (qmail 43298 invoked by uid 500); 7 Jun 2012 13:37:08 -0000 Mailing-List: contact commits-help@ace.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ace.apache.org Delivered-To: mailing list commits@ace.apache.org Received: (qmail 43290 invoked by uid 99); 7 Jun 2012 13:37:08 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Jun 2012 13:37:08 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Jun 2012 13:37:05 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3BF1323889E0 for ; Thu, 7 Jun 2012 13:36:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1347613 - /ace/trunk/ace-launcher/src/main/java/org/apache/ace/launcher/Main.java Date: Thu, 07 Jun 2012 13:36:44 -0000 To: commits@ace.apache.org From: jawi@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120607133644.3BF1323889E0@eris.apache.org> Author: jawi Date: Thu Jun 7 13:36:43 2012 New Revision: 1347613 URL: http://svn.apache.org/viewvc?rev=1347613&view=rev Log: Make it configurable whether the MA should be isolated from the rest of the bundles. To disable isolation start the MA with the property '-DisolateMA='. Modified: ace/trunk/ace-launcher/src/main/java/org/apache/ace/launcher/Main.java Modified: ace/trunk/ace-launcher/src/main/java/org/apache/ace/launcher/Main.java URL: http://svn.apache.org/viewvc/ace/trunk/ace-launcher/src/main/java/org/apache/ace/launcher/Main.java?rev=1347613&r1=1347612&r2=1347613&view=diff ============================================================================== --- ace/trunk/ace-launcher/src/main/java/org/apache/ace/launcher/Main.java (original) +++ ace/trunk/ace-launcher/src/main/java/org/apache/ace/launcher/Main.java Thu Jun 7 13:36:43 2012 @@ -153,26 +153,49 @@ public class Main { activators.add(new Activator()); activators.addAll(m_additionalBundleActivators); + String[] extraSystemPackageArray = { + "org.osgi.service.deploymentadmin;version=\"1.0\"", + "org.osgi.service.deploymentadmin.spi;version=\"1.0\"", + "org.osgi.service.cm;version=\"1.3\"", + "org.osgi.service.event;version=\"1.2\"", + "org.osgi.service.log;version=\"1.3\"", + "org.osgi.service.metatype;version=\"1.1\"", + "org.apache.felix.dm;version=\"3.0\"", + "org.apache.felix.dm.tracker;version=\"3.0\"", + "org.apache.ace.log;version=\"0.8.1.SNAPSHOT\"", + "org.apache.ace.deployment.service;version=\"0.8.1.SNAPSHOT\"" + }; + + String extraSystemPackages = createExtraSystemPackages(extraSystemPackageArray); + Map frameworkProperties = new HashMap(); frameworkProperties.put("felix.systembundle.activators", activators); - frameworkProperties.put(Constants.FRAMEWORK_SYSTEMPACKAGES_EXTRA, - "org.osgi.service.deploymentadmin;managementagent=true;mandatory:=managementagent;version=\"1.0\"," - + "org.osgi.service.deploymentadmin.spi;managementagent=true;mandatory:=managementagent;version=\"1.0\"," - + "org.osgi.service.cm;managementagent=true;mandatory:=managementagent;version=\"1.3\"," - + "org.osgi.service.event;managementagent=true;mandatory:=managementagent;version=\"1.2\"," - + "org.osgi.service.log;managementagent=true;mandatory:=managementagent;version=\"1.3\"," - + "org.osgi.service.metatype;managementagent=true;mandatory:=managementagent;version=\"1.1\"," - + "org.apache.felix.dm;managementagent=true;mandatory:=managementagent;version=\"3.0\"," - + "org.apache.felix.dm.tracker;managementagent=true;mandatory:=managementagent;version=\"3.0\"," - + "org.apache.ace.log;managementagent=true;mandatory:=managementagent;version=\"0.8.1.SNAPSHOT\"," - + "org.apache.ace.deployment.service;managementagent=true;mandatory:=managementagent;version=\"0.8.1.SNAPSHOT\"" - ); - + frameworkProperties.put(Constants.FRAMEWORK_SYSTEMPACKAGES_EXTRA, extraSystemPackages); frameworkProperties.putAll(m_fwOptionHandler.getProperties()); factory.newFramework(frameworkProperties).start(); } + /** + * @param extraSystemPackages + * @return + */ + private String createExtraSystemPackages(String[] extraSystemPackages) { + String isolateMA = System.getProperty("isolateMA", "managementagent"); + + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < extraSystemPackages.length; i++) { + if (i > 0) { + sb.append(","); + } + sb.append(extraSystemPackages[i]); + if (isolateMA != null && !"".equals(isolateMA.trim())) { + sb.append(String.format(";%1$s=true;mandatory:=%1$s", isolateMA)); + } + } + return sb.toString(); + } + private void showHelp() { System.out.println("Apache ACE Launcher\n" + "Usage:\n"