[jboss-osgi-commits] JBoss-OSGI SVN: r94496 - in projects/jboss-osgi/trunk: distribution/installer/src/main/resources/runtime/conf and 6 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-10-07 23:49:49 -0400 (Wed, 07 Oct 2009) New Revision: 94496 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-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/server/conf/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-all.properties projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-default.properties projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-minimal.properties projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-web.properties projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/META-INF/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/jboss-osgi-felix.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/jboss-osgi-equinox.properties projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties Log: Add org.apache.log4j;version=1.2 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 2009-10-08 03:42:53 UTC (rev 94495) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml 2009-10-08 03:49:49 UTC (rev 94496) @@ -32,7 +32,7 @@ org.xml.sax, <!-- log4j --> - org.apache.log4j, + org.apache.log4j;version=1.2, <!-- jboss-osgi --> org.jboss.osgi.spi;version=1.0, 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 2009-10-08 03:42:53 UTC (rev 94495) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml 2009-10-08 03:49:49 UTC (rev 94496) @@ -31,7 +31,7 @@ org.jnp.interfaces;version=5.0, <!-- log4j --> - org.apache.log4j, + org.apache.log4j;version=1.2, <!-- jboss-osgi --> org.jboss.osgi.jbossxb;version=2.0, 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 2009-10-08 03:42:53 UTC (rev 94495) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2009-10-08 03:49:49 UTC (rev 94496) @@ -22,7 +22,7 @@ <entry><key>org.osgi.framework.system.packages.extra</key><value> <!-- log4j --> - org.apache.log4j, + org.apache.log4j;version=1.2, <!-- jboss --> org.jboss.beans.metadata.plugins;version=2.0, 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 2009-10-08 03:42:53 UTC (rev 94495) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties 2009-10-08 03:49:49 UTC (rev 94496) @@ -58,7 +58,7 @@ javax.xml.transform.dom, \ javax.xml.transform.sax, \ javax.xml.transform.stream, \ - org.apache.log4j, \ + org.apache.log4j;version=1.2, \ org.jboss.logging, \ org.jboss.net.protocol, \ org.jboss.osgi.spi;version=1.0, \ 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 2009-10-08 03:42:53 UTC (rev 94495) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2009-10-08 03:49:49 UTC (rev 94496) @@ -23,7 +23,7 @@ com.sun.xml.internal.bind.v2, <!-- log4j --> - org.apache.log4j, + org.apache.log4j;version=1.2, <!-- jboss --> org.jboss.beans.metadata.plugins;version=2.0, Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-all.properties =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-all.properties 2009-10-08 03:42:53 UTC (rev 94495) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-all.properties 2009-10-08 03:49:49 UTC (rev 94496) @@ -27,7 +27,7 @@ # Extra System Packages org.osgi.framework.system.packages.extra=\ - org.apache.log4j, \ + org.apache.log4j;version=1.2, \ org.jboss.logging, \ org.jboss.net.protocol, \ org.jboss.osgi.spi;version=1.0, \ Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-default.properties =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-default.properties 2009-10-08 03:42:53 UTC (rev 94495) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-default.properties 2009-10-08 03:49:49 UTC (rev 94496) @@ -21,7 +21,7 @@ # Extra System Packages org.osgi.framework.system.packages.extra=\ - org.apache.log4j, \ + org.apache.log4j;version=1.2, \ org.jboss.logging, \ org.jboss.net.protocol, \ org.jboss.osgi.spi;version=1.0, \ Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-minimal.properties =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-minimal.properties 2009-10-08 03:42:53 UTC (rev 94495) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-minimal.properties 2009-10-08 03:49:49 UTC (rev 94496) @@ -8,7 +8,7 @@ # Extra System Packages org.osgi.framework.system.packages.extra=\ - org.apache.log4j, \ + org.apache.log4j;version=1.2, \ org.jboss.logging, \ org.jboss.osgi.spi;version=1.0, \ org.jboss.osgi.spi.capability;version=1.0, \ Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-web.properties =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-web.properties 2009-10-08 03:42:53 UTC (rev 94495) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-web.properties 2009-10-08 03:49:49 UTC (rev 94496) @@ -27,7 +27,7 @@ # Extra System Packages org.osgi.framework.system.packages.extra=\ - org.apache.log4j, \ + org.apache.log4j;version=1.2, \ org.jboss.logging, \ org.jboss.net.protocol, \ org.jboss.osgi.spi;version=1.0, \ Modified: projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/META-INF/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-10-08 03:42:53 UTC (rev 94495) +++ projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-10-08 03:49:49 UTC (rev 94496) @@ -18,9 +18,14 @@ <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> + <!-- [JBOSGI-145] JAXB classes are loaded from the system classpath --> com.sun.xml.internal.bind.v2, + + <!-- log4j --> + org.apache.log4j;version=1.2, + <!-- 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, @@ -29,6 +34,7 @@ org.jboss.kernel.spi.dependency;version=2.0, org.jboss.logging;version=2.0, + <!-- 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, Modified: projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/jboss-osgi-felix.properties =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/jboss-osgi-felix.properties 2009-10-08 03:42:53 UTC (rev 94495) +++ projects/jboss-osgi/trunk/reactor/blueprint/testsuite/src/test/resources/jboss-osgi-felix.properties 2009-10-08 03:49:49 UTC (rev 94496) @@ -16,6 +16,7 @@ # Extra System Packages org.osgi.framework.system.packages.extra=\ + org.apache.log4j;version=1.2, \ org.jboss.logging, \ org.jboss.osgi.spi;version=1.0, \ org.jboss.osgi.spi.capability;version=1.0, \ 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 2009-10-08 03:42:53 UTC (rev 94495) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/META-INF/jboss-osgi-bootstrap.xml 2009-10-08 03:49:49 UTC (rev 94496) @@ -19,13 +19,13 @@ <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> <entry><key>org.osgi.framework.system.packages.extra</key><value> - org.apache.log4j, - org.apache.log4j.spi, - org.apache.log4j.xml, - <!-- [JBOSGI-145] JAXB classes are loaded from the system classpath --> com.sun.xml.internal.bind.v2, + <!-- log4j --> + org.apache.log4j;version=1.2, + + <!-- 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, @@ -34,6 +34,7 @@ org.jboss.kernel.spi.dependency;version=2.0, org.jboss.logging;version=2.0, + <!-- 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, Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties 2009-10-08 03:42:53 UTC (rev 94495) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-equinox.properties 2009-10-08 03:49:49 UTC (rev 94496) @@ -13,6 +13,7 @@ # 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.spi;version=1.0, \ Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties 2009-10-08 03:42:53 UTC (rev 94495) +++ projects/jboss-osgi/trunk/testsuite/example/src/test/resources/jboss-osgi-felix.properties 2009-10-08 03:49:49 UTC (rev 94496) @@ -16,6 +16,7 @@ # 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.common.log;version=1.0, \ Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties 2009-10-08 03:42:53 UTC (rev 94495) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-equinox.properties 2009-10-08 03:49:49 UTC (rev 94496) @@ -14,7 +14,7 @@ # Extra System Packages org.osgi.framework.system.packages=\ javax.management, \ - org.apache.log4j, \ + org.apache.log4j;version=1.2, \ org.jboss.logging, \ org.jboss.net.protocol, \ org.jboss.osgi.spi;version=1.0, \ Modified: projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties 2009-10-08 03:42:53 UTC (rev 94495) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/resources/jboss-osgi-felix.properties 2009-10-08 03:49:49 UTC (rev 94496) @@ -13,7 +13,7 @@ # Extra System Packages org.osgi.framework.system.packages.extra=\ - org.apache.log4j, \ + org.apache.log4j;version=1.2, \ org.jboss.logging, \ org.jboss.net.protocol, \ org.jboss.osgi.spi;version=1.0, \