[jboss-cvs] JBossAS SVN: r94492 - in projects/jboss-osgi/trunk/distribution/installer/src/main/resources: runtime/conf and 1 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Oct 7 22:59:25 EDT 2009


Author: thomas.diesler at jboss.com
Date: 2009-10-07 22:59:25 -0400 (Wed, 07 Oct 2009)
New Revision: 94492

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/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-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
Log:
Add org.apache.log4j


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 02:40:16 UTC (rev 94491)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-equinox.xml	2009-10-08 02:59:25 UTC (rev 94492)
@@ -31,6 +31,9 @@
             javax.xml.parsers,
             org.xml.sax,
 
+            <!-- log4j -->
+            org.apache.log4j,
+            
             <!-- jboss-osgi -->
             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/jbossas/jboss-beans-felix.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml	2009-10-08 02:40:16 UTC (rev 94491)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-felix.xml	2009-10-08 02:59:25 UTC (rev 94492)
@@ -30,6 +30,9 @@
             org.apache.xerces.dom;version=2.9,
             org.jnp.interfaces;version=5.0,
             
+            <!-- log4j -->
+            org.apache.log4j,
+            
             <!-- jboss-osgi -->
             org.jboss.osgi.jbossxb;version=2.0,
             org.jboss.osgi.microcontainer;version=1.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 02:40:16 UTC (rev 94491)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml	2009-10-08 02:59:25 UTC (rev 94492)
@@ -21,6 +21,10 @@
         <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
         <entry><key>org.osgi.framework.system.packages.extra</key><value>
           
+          <!-- log4j -->
+          org.apache.log4j,
+            
+          <!-- 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,
@@ -33,9 +37,11 @@
           org.jboss.util.propertyeditor,
           org.jboss.util.xml,
           
+          <!-- jnp naming -->
           org.jnp.interfaces,
           org.jnp.server,
           
+          <!-- 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/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 02:40:16 UTC (rev 94491)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties	2009-10-08 02:59:25 UTC (rev 94492)
@@ -58,16 +58,7 @@
    javax.xml.transform.dom, \
    javax.xml.transform.sax, \
    javax.xml.transform.stream, \
-   org.w3c.dom, \
-   org.w3c.dom.bootstrap, \
-   org.w3c.dom.events, \
-   org.w3c.dom.ls, \
-   org.w3c.dom.ranges, \
-   org.w3c.dom.views, \
-   org.w3c.dom.traversal, \
-   org.xml.sax, \
-   org.xml.sax.ext, \
-   org.xml.sax.helpers, \
+   org.apache.log4j, \
    org.jboss.logging, \
    org.jboss.net.protocol, \
    org.jboss.osgi.spi;version=1.0, \
@@ -83,7 +74,17 @@
    org.jboss.virtual.plugins.vfs.helpers, \
    org.jboss.virtual.protocol, \
    org.osgi.service.prefs, \
-   org.osgi.util.xml;version=1.0
+   org.osgi.util.xml;version=1.0, \
+   org.w3c.dom, \
+   org.w3c.dom.bootstrap, \
+   org.w3c.dom.events, \
+   org.w3c.dom.ls, \
+   org.w3c.dom.ranges, \
+   org.w3c.dom.views, \
+   org.w3c.dom.traversal, \
+   org.xml.sax, \
+   org.xml.sax.ext, \
+   org.xml.sax.helpers
 
 # Bundles that need to be installed with the Framework automatically 
 org.jboss.osgi.spi.framework.autoInstall=\

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	2009-10-08 02:40:16 UTC (rev 94491)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties	2009-10-08 02:59:25 UTC (rev 94492)
@@ -1,7 +1,7 @@
 #
 # Properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider
 # 
-# $Id: $
+# $Id:$
 #
 
 # Extra server specific properties

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 02:40:16 UTC (rev 94491)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml	2009-10-08 02:59:25 UTC (rev 94492)
@@ -18,9 +18,14 @@
         <entry><key>org.osgi.framework.storage</key><value>${osgi.server.home}/data/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,
+          
+          <!-- 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/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 02:40:16 UTC (rev 94491)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-all.properties	2009-10-08 02:59:25 UTC (rev 94492)
@@ -27,6 +27,7 @@
 
 # Extra System Packages
 org.osgi.framework.system.packages.extra=\
+   org.apache.log4j, \
    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 02:40:16 UTC (rev 94491)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-default.properties	2009-10-08 02:59:25 UTC (rev 94492)
@@ -21,6 +21,7 @@
 
 # Extra System Packages
 org.osgi.framework.system.packages.extra=\
+   org.apache.log4j, \
    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 02:40:16 UTC (rev 94491)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-minimal.properties	2009-10-08 02:59:25 UTC (rev 94492)
@@ -8,6 +8,7 @@
 
 # Extra System Packages
 org.osgi.framework.system.packages.extra=\
+   org.apache.log4j, \
    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 02:40:16 UTC (rev 94491)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-felix-web.properties	2009-10-08 02:59:25 UTC (rev 94492)
@@ -27,6 +27,7 @@
 
 # Extra System Packages
 org.osgi.framework.system.packages.extra=\
+   org.apache.log4j, \
    org.jboss.logging, \
    org.jboss.net.protocol, \
    org.jboss.osgi.spi;version=1.0, \




More information about the jboss-cvs-commits mailing list