Author: thomas.diesler(a)jboss.com Date: 2010-02-13 07:09:55 -0500 (Sat, 13 Feb 2010) New Revision: 100930 Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/etc/osgitck/jboss-osgi-bootstrap.xml projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/bootstrap/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-all.properties projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-default.properties projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-minimal.properties projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-web.properties projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/testsuite/example/src/test/resources/log4j.xml projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/log4j.xml Log: Allign org.osgi.framework.system.packages.extra Use log4j.append.file=true Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/etc/osgitck/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/etc/osgitck/jboss-osgi-bootstrap.xml 2010-02-13 11:27:48 UTC (rev 100929) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/etc/osgitck/jboss-osgi-bootstrap.xml 2010-02-13 12:09:55 UTC (rev 100930) @@ -19,25 +19,26 @@ <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> <entry><key>org.osgi.framework.system.packages.extra</key><value> - junit.framework;version=3.8.1, + <!-- logging --> + org.apache.log4j;version=1.2, + org.jboss.logging;version=2.1, - org.jboss.logging;version=2.0, + <!-- jboss --> + org.jboss.beans.metadata.plugins;version=2.2, + org.jboss.beans.metadata.plugins.builder;version=2.2, + org.jboss.beans.metadata.spi;version=2.2, + org.jboss.beans.metadata.spi.builder;version=2.2, + org.jboss.dependency.spi;version=2.2, + org.jboss.kernel.spi.dependency;version=2.2, + + <!-- jboss-osgi --> + org.jboss.osgi.spi;version=1.0, org.jboss.osgi.spi.capability;version=1.0, - org.jboss.osgi.spi.logging;version=1.0, + org.jboss.osgi.spi.framework;version=1.0, org.jboss.osgi.spi.management;version=1.0, org.jboss.osgi.spi.service;version=1.0, - org.jboss.osgi.testing;version=1.0, org.jboss.osgi.spi.util;version=1.0, - - org.osgi.framework, - org.osgi.framework.launch, - org.osgi.framework.hooks.service, - org.osgi.service.condpermadmin, - org.osgi.service.packageadmin, - org.osgi.service.permissionadmin, - org.osgi.service.startlevel, - org.osgi.service.url, - org.osgi.util.tracker, + org.jboss.osgi.testing;version=1.0 </value></entry> </map> </property> Modified: projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/bootstrap/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/bootstrap/jboss-osgi-bootstrap.xml 2010-02-13 11:27:48 UTC (rev 100929) +++ projects/jboss-osgi/projects/runtime/framework/trunk/src/test/resources/bootstrap/jboss-osgi-bootstrap.xml 2010-02-13 12:09:55 UTC (rev 100930) @@ -19,18 +19,26 @@ <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> <entry><key>org.osgi.framework.system.packages.extra</key><value> - org.jboss.logging;version=2.0, + <!-- logging --> + org.apache.log4j;version=1.2, + org.jboss.logging;version=2.1, + <!-- jboss --> + org.jboss.beans.metadata.plugins;version=2.2, + org.jboss.beans.metadata.plugins.builder;version=2.2, + org.jboss.beans.metadata.spi;version=2.2, + org.jboss.beans.metadata.spi.builder;version=2.2, + org.jboss.dependency.spi;version=2.2, + org.jboss.kernel.spi.dependency;version=2.2, + + <!-- jboss-osgi --> org.jboss.osgi.spi;version=1.0, org.jboss.osgi.spi.capability;version=1.0, + org.jboss.osgi.spi.framework;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, - - org.osgi.framework, - org.osgi.framework.launch, - org.osgi.service.startlevel, - org.osgi.service.packageadmin + org.jboss.osgi.testing;version=1.0 </value></entry> </map> </property> Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml 2010-02-13 11:27:48 UTC (rev 100929) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml 2010-02-13 12:09:55 UTC (rev 100930) @@ -26,35 +26,35 @@ <entry> <key>org.osgi.framework.system.packages.extra</key> <value> - <!-- log4j --> + <!-- system --> + javax.transaction;version=1.0, + javax.xml.bind.annotation;version=2.1, + org.apache.xerces.dom;version=2.9, + org.jnp.interfaces;version=5.0, + + <!-- logging --> org.apache.log4j;version=1.2, - - <!-- jboss-osgi --> + org.jboss.logging;version=2.1, + + <!-- jboss --> + org.jboss.net.protocol, + org.jboss.virtual;version=2.1, + org.jboss.virtual.plugins.registry;version=2.1, + org.jboss.virtual.plugins.context.jar;version=2.1, + org.jboss.virtual.plugins.vfs.helpers;version=2.1, + org.jboss.virtual.protocol;version=2.1, + + <!-- jboss-osgi --> org.jboss.osgi.deployment.common;version=1.0, org.jboss.osgi.deployment.deployer;version=1.0, org.jboss.osgi.deployment.interceptor;version=1.0, - org.jboss.osgi.microcontainer;version=1.0, org.jboss.osgi.spi;version=1.0, org.jboss.osgi.spi.capability;version=1.0, + org.jboss.osgi.spi.framework;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, - - <!-- jboss --> - org.jboss.beans.metadata.plugins;version=2.0, - org.jboss.beans.metadata.plugins.builder;version=2.0, - org.jboss.beans.metadata.spi.builder;version=2.0, - org.jboss.beans.metadata.spi;version=2.0, - org.jboss.dependency.spi;version=2.0, - org.jboss.kernel.spi.dependency;version=2.0, - org.jboss.logging, - org.jboss.reflect.spi;version=2.0, - org.jboss.util.xml;version=2.2, - org.jboss.virtual;version=2.1, - org.jboss.virtual.plugins.registry;version=2.1, - org.jboss.virtual.plugins.context.jar;version=2.1, - org.jboss.virtual.plugins.vfs.helpers;version=2.1, - org.jboss.virtual.protocol;version=2.1 + org.jboss.osgi.spi.util;version=1.0, + org.osgi.framework;version=1.5 </value> </entry> <!-- Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2010-02-13 11:27:48 UTC (rev 100929) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2010-02-13 12:09:55 UTC (rev 100930) @@ -31,35 +31,30 @@ javax.xml.bind.annotation;version=2.1, org.apache.xerces.dom;version=2.9, org.jnp.interfaces;version=5.0, - - <!-- log4j --> + + <!-- logging --> org.apache.log4j;version=1.2, - - <!-- jboss-osgi --> + org.jboss.logging;version=2.1, + + <!-- jboss --> + org.jboss.net.protocol, + org.jboss.virtual;version=2.1, + org.jboss.virtual.plugins.registry;version=2.1, + org.jboss.virtual.plugins.context.jar;version=2.1, + org.jboss.virtual.plugins.vfs.helpers;version=2.1, + org.jboss.virtual.protocol;version=2.1, + + <!-- jboss-osgi --> + org.jboss.osgi.deployment.common;version=1.0, org.jboss.osgi.deployment.deployer;version=1.0, org.jboss.osgi.deployment.interceptor;version=1.0, - org.jboss.osgi.microcontainer;version=1.0, org.jboss.osgi.spi;version=1.0, org.jboss.osgi.spi.capability;version=1.0, + org.jboss.osgi.spi.framework;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, - - <!-- jboss --> - org.jboss.beans.metadata.plugins;version=2.0, - org.jboss.beans.metadata.plugins.builder;version=2.0, - org.jboss.beans.metadata.spi.builder;version=2.0, - org.jboss.beans.metadata.spi;version=2.0, - org.jboss.dependency.spi;version=2.0, - org.jboss.kernel.spi.dependency;version=2.0, - org.jboss.logging, - org.jboss.reflect.spi;version=2.0, - org.jboss.util.xml;version=2.2, - org.jboss.virtual;version=2.1, - org.jboss.virtual.plugins.registry;version=2.1, - org.jboss.virtual.plugins.context.jar;version=2.1, - org.jboss.virtual.plugins.vfs.helpers;version=2.1, - org.jboss.virtual.protocol;version=2.1, + org.jboss.osgi.spi.util;version=1.0, + org.osgi.framework;version=1.5 </value> </entry> <!-- Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2010-02-13 11:27:48 UTC (rev 100929) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2010-02-13 12:09:55 UTC (rev 100930) @@ -21,27 +21,22 @@ <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> <entry><key>org.osgi.framework.system.packages.extra</key><value> - <!-- loging --> - org.apache.log4j;version=1.2, - org.slf4j;version=1.5, - - <!-- jboss --> - org.jboss.beans.metadata.plugins;version=2.0, - org.jboss.beans.metadata.plugins.builder;version=2.0, - org.jboss.beans.metadata.spi;version=2.0, - org.jboss.beans.metadata.spi.builder;version=2.0, - org.jboss.dependency.spi;version=2.0, - org.jboss.kernel.spi.dependency;version=2.0, - org.jboss.logging, - org.jboss.util, - org.jboss.util.collection, - org.jboss.util.propertyeditor, - org.jboss.util.xml, - <!-- jnp naming --> org.jnp.interfaces, org.jnp.server, + <!-- logging --> + org.apache.log4j;version=1.2, + org.jboss.logging;version=2.1, + + <!-- jboss --> + org.jboss.beans.metadata.plugins;version=2.2, + org.jboss.beans.metadata.plugins.builder;version=2.2, + org.jboss.beans.metadata.spi;version=2.2, + org.jboss.beans.metadata.spi.builder;version=2.2, + org.jboss.dependency.spi;version=2.2, + org.jboss.kernel.spi.dependency;version=2.2, + <!-- jboss-osgi --> org.jboss.osgi.spi;version=1.0, org.jboss.osgi.spi.capability;version=1.0, @@ -49,6 +44,7 @@ org.jboss.osgi.spi.management;version=1.0, org.jboss.osgi.spi.service;version=1.0, org.jboss.osgi.spi.util;version=1.0, + org.jboss.osgi.testing;version=1.0 </value></entry> <!-- Husky socket connector properties --> <entry><key>org.jboss.osgi.husky.runtime.connector.host</key><value>${jboss.bind.address}</value></entry> Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties 2010-02-13 11:27:48 UTC (rev 100929) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties 2010-02-13 12:09:55 UTC (rev 100930) @@ -14,6 +14,27 @@ # Hot Deployement org.jboss.osgi.hotdeploy.scandir=${osgi.server.home}/deploy +# Extra System Packages +org.osgi.framework.system.packages.extra=\ + org.apache.log4j;version=1.2, \ + org.jboss.logging;version=2.1, \ + org.jboss.net.protocol, \ + org.jboss.osgi.deployment.common;version=1.0, \ + org.jboss.osgi.deployment.deployer;version=1.0, \ + org.jboss.osgi.deployment.interceptor;version=1.0, \ + org.jboss.osgi.spi;version=1.0, \ + org.jboss.osgi.spi.capability;version=1.0, \ + org.jboss.osgi.spi.framework;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, \ + org.jboss.virtual;version=2.1, \ + org.jboss.virtual.plugins.registry;version=2.1, \ + org.jboss.virtual.plugins.context.jar;version=2.1, \ + org.jboss.virtual.plugins.vfs.helpers;version=2.1, \ + org.jboss.virtual.protocol;version=2.1, \ + org.osgi.framework;version=1.5 + # Bundles that need to be installed with the Framework automatically org.jboss.osgi.spi.framework.autoInstall=\ file://${osgi.home}/server/minimal/deploy/org.eclipse.osgi.services.jar \ Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties 2010-02-13 11:27:48 UTC (rev 100929) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties 2010-02-13 12:09:55 UTC (rev 100930) @@ -14,6 +14,27 @@ # Hot Deployement org.jboss.osgi.hotdeploy.scandir=${osgi.server.home}/deploy +# Extra System Packages +org.osgi.framework.system.packages.extra=\ + org.apache.log4j;version=1.2, \ + org.jboss.logging;version=2.1, \ + org.jboss.net.protocol, \ + org.jboss.osgi.deployment.common;version=1.0, \ + org.jboss.osgi.deployment.deployer;version=1.0, \ + org.jboss.osgi.deployment.interceptor;version=1.0, \ + org.jboss.osgi.spi;version=1.0, \ + org.jboss.osgi.spi.capability;version=1.0, \ + org.jboss.osgi.spi.framework;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, \ + org.jboss.virtual;version=2.1, \ + org.jboss.virtual.plugins.registry;version=2.1, \ + org.jboss.virtual.plugins.context.jar;version=2.1, \ + org.jboss.virtual.plugins.vfs.helpers;version=2.1, \ + org.jboss.virtual.protocol;version=2.1, \ + org.osgi.framework;version=1.5 + # Bundles that need to be installed with the Framework automatically org.jboss.osgi.spi.framework.autoInstall=\ file://${osgi.home}/server/minimal/deploy/org.osgi.compendium.jar Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2010-02-13 11:27:48 UTC (rev 100929) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2010-02-13 12:09:55 UTC (rev 100930) @@ -22,18 +22,17 @@ <!-- [JBOSGI-145] JAXB classes are loaded from the system classpath --> com.sun.xml.internal.bind.v2, - <!-- loging --> + <!-- logging --> org.apache.log4j;version=1.2, - org.slf4j;version=1.5, + org.jboss.logging;version=2.1, <!-- jboss --> - org.jboss.beans.metadata.plugins;version=2.0, - org.jboss.beans.metadata.plugins.builder;version=2.0, - org.jboss.beans.metadata.spi;version=2.0, - org.jboss.beans.metadata.spi.builder;version=2.0, - org.jboss.dependency.spi;version=2.0, - org.jboss.kernel.spi.dependency;version=2.0, - org.jboss.logging;version=2.0, + org.jboss.beans.metadata.plugins;version=2.2, + org.jboss.beans.metadata.plugins.builder;version=2.2, + org.jboss.beans.metadata.spi;version=2.2, + org.jboss.beans.metadata.spi.builder;version=2.2, + org.jboss.dependency.spi;version=2.2, + org.jboss.kernel.spi.dependency;version=2.2, <!-- jboss-osgi --> org.jboss.osgi.spi;version=1.0, @@ -42,6 +41,7 @@ org.jboss.osgi.spi.management;version=1.0, org.jboss.osgi.spi.service;version=1.0, org.jboss.osgi.spi.util;version=1.0, + org.jboss.osgi.testing;version=1.0 </value></entry> <!-- Hot Deployment --> <entry><key>org.jboss.osgi.hotdeploy.scandir</key><value>${osgi.server.home}/deploy</value></entry> Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-all.properties =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-all.properties 2010-02-13 11:27:48 UTC (rev 100929) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-all.properties 2010-02-13 12:09:55 UTC (rev 100930) @@ -27,23 +27,3 @@ # JTA ObjectStore com.arjuna.ats.arjuna.objectstore.objectStoreDir=${osgi.server.home}/data/ObjectStore - -# Extra System Packages -org.osgi.framework.system.packages.extra=\ - org.apache.log4j;version=1.2, \ - org.jboss.logging, \ - org.jboss.net.protocol, \ - org.jboss.osgi.deployment.deployer;version=1.0, \ - org.jboss.osgi.deployment.interceptor;version=1.0, \ - org.jboss.osgi.deployment.internal;version=1.0, \ - org.jboss.osgi.spi;version=1.0, \ - org.jboss.osgi.spi.capability;version=1.0, \ - org.jboss.osgi.spi.framework;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, \ - org.jboss.virtual;version=2.1, \ - org.jboss.virtual.plugins.registry;version=2.1, \ - org.jboss.virtual.plugins.context.jar;version=2.1, \ - org.jboss.virtual.plugins.vfs.helpers;version=2.1, \ - org.jboss.virtual.protocol;version=2.1 \ No newline at end of file Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-default.properties =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-default.properties 2010-02-13 11:27:48 UTC (rev 100929) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-default.properties 2010-02-13 12:09:55 UTC (rev 100930) @@ -19,23 +19,4 @@ org.jboss.osgi.husky.runtime.connector.host=${jboss.bind.address} org.jboss.osgi.husky.runtime.connector.port=5401 -# Extra System Packages -org.osgi.framework.system.packages.extra=\ - org.apache.log4j;version=1.2, \ - org.jboss.logging, \ - org.jboss.net.protocol, \ - org.jboss.osgi.deployment.deployer;version=1.0, \ - org.jboss.osgi.deployment.interceptor;version=1.0, \ - org.jboss.osgi.spi;version=1.0, \ - org.jboss.osgi.spi.capability;version=1.0, \ - org.jboss.osgi.spi.framework;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, \ - org.jboss.virtual;version=2.1, \ - org.jboss.virtual.plugins.registry;version=2.1, \ - org.jboss.virtual.plugins.context.jar;version=2.1, \ - org.jboss.virtual.plugins.vfs.helpers;version=2.1, \ - org.jboss.virtual.protocol;version=2.1 - \ No newline at end of file Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-minimal.properties =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-minimal.properties 2010-02-13 11:27:48 UTC (rev 100929) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-minimal.properties 2010-02-13 12:09:55 UTC (rev 100930) @@ -6,16 +6,4 @@ # ####################################################################################### -# Extra System Packages -org.osgi.framework.system.packages.extra=\ - org.apache.log4j;version=1.2, \ - org.jboss.logging, \ - org.jboss.osgi.deployment.deployer;version=1.0, \ - org.jboss.osgi.deployment.interceptor;version=1.0, \ - org.jboss.osgi.spi;version=1.0, \ - org.jboss.osgi.spi.capability;version=1.0, \ - org.jboss.osgi.spi.framework;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 \ No newline at end of file Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-web.properties =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-web.properties 2010-02-13 11:27:48 UTC (rev 100929) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-extra-web.properties 2010-02-13 12:09:55 UTC (rev 100930) @@ -25,21 +25,3 @@ org.jboss.osgi.husky.runtime.connector.host=${jboss.bind.address} org.jboss.osgi.husky.runtime.connector.port=5401 -# Extra System Packages -org.osgi.framework.system.packages.extra=\ - org.apache.log4j;version=1.2, \ - org.jboss.logging, \ - org.jboss.net.protocol, \ - org.jboss.osgi.deployment.deployer;version=1.0, \ - org.jboss.osgi.deployment.interceptor;version=1.0, \ - org.jboss.osgi.spi;version=1.0, \ - org.jboss.osgi.spi.capability;version=1.0, \ - org.jboss.osgi.spi.framework;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, \ - org.jboss.virtual;version=2.1, \ - org.jboss.virtual.plugins.registry;version=2.1, \ - org.jboss.virtual.plugins.context.jar;version=2.1, \ - org.jboss.virtual.plugins.vfs.helpers;version=2.1, \ - org.jboss.virtual.protocol;version=2.1 Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-02-13 11:27:48 UTC (rev 100929) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-02-13 12:09:55 UTC (rev 100930) @@ -19,21 +19,18 @@ <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> <entry><key>org.osgi.framework.system.packages.extra</key><value> - <!-- loging --> + <!-- logging --> org.apache.log4j;version=1.2, - org.slf4j;version=1.5, + org.jboss.logging;version=2.1, <!-- jboss --> - org.jboss.beans.metadata.plugins;version=2.0, - org.jboss.beans.metadata.plugins.builder;version=2.0, - org.jboss.beans.metadata.spi;version=2.0, - org.jboss.beans.metadata.spi.builder;version=2.0, - org.jboss.dependency.spi;version=2.0, - org.jboss.kernel.spi.dependency;version=2.0, - org.jboss.logging;version=2.0, - org.jboss.reflect.spi;version=2.0, - org.jboss.util;version=2.2, - + org.jboss.beans.metadata.plugins;version=2.2, + org.jboss.beans.metadata.plugins.builder;version=2.2, + org.jboss.beans.metadata.spi;version=2.2, + org.jboss.beans.metadata.spi.builder;version=2.2, + org.jboss.dependency.spi;version=2.2, + org.jboss.kernel.spi.dependency;version=2.2, + <!-- jboss-osgi --> org.jboss.osgi.spi;version=1.0, org.jboss.osgi.spi.capability;version=1.0, @@ -41,6 +38,7 @@ org.jboss.osgi.spi.management;version=1.0, org.jboss.osgi.spi.service;version=1.0, org.jboss.osgi.spi.util;version=1.0, + org.jboss.osgi.testing;version=1.0 </value></entry> </map> </property> Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/log4j.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/log4j.xml 2010-02-13 11:27:48 UTC (rev 100929) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/log4j.xml 2010-02-13 12:09:55 UTC (rev 100930) @@ -9,7 +9,7 @@ <appender name="FILE" class="org.apache.log4j.FileAppender"> <param name="File" value="${log4j.output.dir}/test.log"/> - <param name="Append" value="false"/> + <param name="Append" value="true"/> <layout class="org.apache.log4j.PatternLayout"> <!-- The default pattern: Date Priority [Category] Message\n --> <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/> Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-02-13 11:27:48 UTC (rev 100929) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2010-02-13 12:09:55 UTC (rev 100930) @@ -19,18 +19,17 @@ <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> <entry><key>org.osgi.framework.system.packages.extra</key><value> - <!-- loging --> + <!-- logging --> org.apache.log4j;version=1.2, - org.slf4j;version=1.5, + org.jboss.logging;version=2.1, <!-- jboss --> - org.jboss.beans.metadata.plugins;version=2.0, - org.jboss.beans.metadata.plugins.builder;version=2.0, - org.jboss.beans.metadata.spi;version=2.0, - org.jboss.beans.metadata.spi.builder;version=2.0, - org.jboss.dependency.spi;version=2.0, - org.jboss.kernel.spi.dependency;version=2.0, - org.jboss.logging;version=2.0, + org.jboss.beans.metadata.plugins;version=2.2, + org.jboss.beans.metadata.plugins.builder;version=2.2, + org.jboss.beans.metadata.spi;version=2.2, + org.jboss.beans.metadata.spi.builder;version=2.2, + org.jboss.dependency.spi;version=2.2, + org.jboss.kernel.spi.dependency;version=2.2, <!-- jboss-osgi --> org.jboss.osgi.spi;version=1.0, @@ -39,7 +38,7 @@ org.jboss.osgi.spi.management;version=1.0, org.jboss.osgi.spi.service;version=1.0, org.jboss.osgi.spi.util;version=1.0, - org.jboss.osgi.testing, + org.jboss.osgi.testing;version=1.0 </value></entry> </map> </property> Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/log4j.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/log4j.xml 2010-02-13 11:27:48 UTC (rev 100929) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/log4j.xml 2010-02-13 12:09:55 UTC (rev 100930) @@ -9,7 +9,7 @@ <appender name="FILE" class="org.apache.log4j.FileAppender"> <param name="File" value="${log4j.output.dir}/test.log"/> - <param name="Append" value="false"/> + <param name="Append" value="true"/> <layout class="org.apache.log4j.PatternLayout"> <!-- The default pattern: Date Priority [Category] Message\n --> <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>