[jboss-cvs] JBossAS SVN: r92858 - in projects/jboss-osgi/projects/runtime/microcontainer/trunk/src: test/resources/bootstrap and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: thomas.diesler at jboss.com
Date: 2009-08-27 06:58:32 -0400 (Thu, 27 Aug 2009)
New Revision: 92858

Modified:
   projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/plugins/SystemPackagesPluginImpl.java
   projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/resources/bootstrap/bootstrap.xml
Log:
Trim configured system packages

Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/plugins/SystemPackagesPluginImpl.java
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/plugins/SystemPackagesPluginImpl.java	2009-08-27 10:20:06 UTC (rev 92857)
+++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/main/java/org/jboss/osgi/plugins/facade/plugins/SystemPackagesPluginImpl.java	2009-08-27 10:58:32 UTC (rev 92858)
@@ -126,7 +126,7 @@
       List<String> result = new ArrayList<String>();
       for (String name : sysPackages.split(","))
       {
-         result.add(name);
+         result.add(name.trim());
       }
       return result;
    }

Modified: projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/resources/bootstrap/bootstrap.xml
===================================================================
--- projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/resources/bootstrap/bootstrap.xml	2009-08-27 10:20:06 UTC (rev 92857)
+++ projects/jboss-osgi/projects/runtime/microcontainer/trunk/src/test/resources/bootstrap/bootstrap.xml	2009-08-27 10:58:32 UTC (rev 92858)
@@ -14,16 +14,13 @@
       <map keyClass="java.lang.String" valueClass="java.lang.String">
         <entry><key>org.osgi.framework.storage</key><value>${log4j.output.dir}/osgi-store</value></entry>
         <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
-        <entry>
-          <key>org.osgi.framework.system.packages.extra</key>
-          <value>
+        <entry><key>org.osgi.framework.system.packages.extra</key><value>
           org.jboss.logging;version=2.0,
           org.jboss.osgi.spi.logging;version=1.0,
           org.jboss.osgi.spi.management;version=1.0,
           org.jboss.osgi.spi.service;version=1.0,
           org.jboss.osgi.spi.util;version=1.0
-          </value>
-        </entry>
+        </value></entry>
       </map>
     </property>
     <incallback method="addPlugin" />