[jboss-osgi-commits] JBoss-OSGI SVN: r90922 - in projects/jboss-osgi/trunk/distribution: runtime/conf and 3 other directories.
jboss-osgi-commits at lists.jboss.org
jboss-osgi-commits at lists.jboss.org
Wed Jul 8 02:59:00 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-07-08 02:58:59 -0400 (Wed, 08 Jul 2009)
New Revision: 90922
Added:
projects/jboss-osgi/trunk/distribution/runtime/server/
projects/jboss-osgi/trunk/distribution/runtime/server/conf/
projects/jboss-osgi/trunk/distribution/runtime/server/conf/jboss-osgi-felix-all.properties
projects/jboss-osgi/trunk/distribution/runtime/server/conf/jboss-osgi-felix-default.properties
projects/jboss-osgi/trunk/distribution/runtime/server/conf/jboss-osgi-felix-minimal.properties
projects/jboss-osgi/trunk/distribution/runtime/server/conf/jboss-osgi-felix-web.properties
projects/jboss-osgi/trunk/distribution/runtime/server/conf/log4j.xml
Removed:
projects/jboss-osgi/trunk/distribution/runtime/conf/log4j.xml
Modified:
projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-felix.properties
projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml
Log:
[JBOSGI-98] Support configuration per profile
Modified: projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-felix.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-felix.properties 2009-07-08 06:03:51 UTC (rev 90921)
+++ projects/jboss-osgi/trunk/distribution/runtime/conf/jboss-osgi-felix.properties 2009-07-08 06:58:59 UTC (rev 90922)
@@ -7,6 +7,9 @@
# The OSGiFramework implementation
org.jboss.osgi.spi.framework.impl=org.jboss.osgi.felix.framework.FelixIntegration
+# Extra server specific properties
+org.jboss.osgi.spi.framework.extra=${osgi.server.home}/conf/jboss-osgi-extra.properties
+
# Properties to configure the Framework
org.osgi.framework.storage=${osgi.server.home}/data/osgi-store
org.osgi.framework.storage.clean=onFirstInit
@@ -14,47 +17,6 @@
# Hot Deployement
org.jboss.osgi.hotdeploy.scandir=${osgi.server.home}/deploy
-# HTTP Service Port
-org.osgi.service.http.port=8090
-
-# Config Admin Service
-felix.cm.dir=${osgi.server.home}/data/osgi-configadmin
-
-# JMX bundle properties
-org.jboss.osgi.jmx.host=${jboss.bind.address}
-org.jboss.osgi.jmx.rmi.port=1098
-
-# JNDI bundle properties
-org.jboss.osgi.jndi.host=${jboss.bind.address}
-org.jboss.osgi.jndi.rmi.port=1098
-org.jboss.osgi.jndi.port=1099
-
-# Remote Logging
-org.jboss.osgi.service.remote.log.sender=true
-org.jboss.osgi.service.remote.log.host=${jboss.bind.address}
-org.jboss.osgi.service.remote.log.port=5400
-
-# Husky socket connector properties
-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.jboss.logging, \
- org.jboss.net.protocol, \
- 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.management;version=1.0, \
- org.jboss.osgi.spi.service;version=1.0, \
- org.jboss.osgi.spi.testing;version=1.0, \
- org.jboss.osgi.spi.util;version=1.0, \
- org.jboss.virtual, \
- org.jboss.virtual.plugins.registry, \
- org.jboss.virtual.plugins.context.jar, \
- org.jboss.virtual.plugins.vfs.helpers, \
- org.jboss.virtual.protocol
-
# 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
@@ -63,4 +25,6 @@
org.jboss.osgi.spi.framework.autoStart=\
file://${osgi.home}/server/minimal/deploy/org.apache.felix.log.jar \
file://${osgi.home}/server/minimal/deploy/jboss-osgi-common.jar \
- file://${osgi.home}/server/minimal/deploy/jboss-osgi-hotdeploy.jar
\ No newline at end of file
+ file://${osgi.home}/server/minimal/deploy/jboss-osgi-hotdeploy.jar
+
+
\ No newline at end of file
Deleted: projects/jboss-osgi/trunk/distribution/runtime/conf/log4j.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/runtime/conf/log4j.xml 2009-07-08 06:03:51 UTC (rev 90921)
+++ projects/jboss-osgi/trunk/distribution/runtime/conf/log4j.xml 2009-07-08 06:58:59 UTC (rev 90922)
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
-
- <!-- ================================= -->
- <!-- Preserve messages in a local file -->
- <!-- ================================= -->
-
- <appender name="FILE" class="org.apache.log4j.FileAppender">
- <param name="File" value="${osgi.server.home}/log/server.log"/>
- <param name="Append" value="false"/>
- <layout class="org.apache.log4j.PatternLayout">
- <!-- The default pattern: Date Priority [Category] Message\n -->
- <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
- </layout>
- </appender>
-
- <!-- ============================== -->
- <!-- Append messages to the console -->
- <!-- ============================== -->
-
- <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
- <param name="Target" value="System.out" />
- <param name="Threshold" value="INFO" />
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n" />
- </layout>
- </appender>
-
- <!-- ================ -->
- <!-- Limit categories -->
- <!-- ================ -->
-
- <!-- Show jboss deployer tracesraces -->
- <category name="org.jboss.deployers">
- <priority value="TRACE" />
- </category>
-
- <!-- ======================= -->
- <!-- Setup the Root category -->
- <!-- ======================= -->
-
- <root>
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="FILE"/>
- </root>
-
-</log4j:configuration>
Added: projects/jboss-osgi/trunk/distribution/runtime/server/conf/jboss-osgi-felix-all.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/runtime/server/conf/jboss-osgi-felix-all.properties (rev 0)
+++ projects/jboss-osgi/trunk/distribution/runtime/server/conf/jboss-osgi-felix-all.properties 2009-07-08 06:58:59 UTC (rev 90922)
@@ -0,0 +1,48 @@
+#######################################################################################
+#
+# Extra properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider
+#
+# $Id: $
+#
+#######################################################################################
+
+# HTTP Service Port
+org.osgi.service.http.port=8090
+
+# Config Admin Service
+felix.cm.dir=${osgi.server.home}/data/osgi-configadmin
+
+# JMX bundle properties
+org.jboss.osgi.jmx.host=${jboss.bind.address}
+org.jboss.osgi.jmx.rmi.port=1098
+
+# JNDI bundle properties
+org.jboss.osgi.jndi.host=${jboss.bind.address}
+org.jboss.osgi.jndi.rmi.port=1098
+org.jboss.osgi.jndi.port=1099
+
+# Remote Logging
+org.jboss.osgi.service.remote.log.sender=true
+org.jboss.osgi.service.remote.log.host=${jboss.bind.address}
+org.jboss.osgi.service.remote.log.port=5400
+
+# Husky socket connector properties
+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.jboss.logging, \
+ org.jboss.net.protocol, \
+ 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.management;version=1.0, \
+ org.jboss.osgi.spi.service;version=1.0, \
+ org.jboss.osgi.spi.testing;version=1.0, \
+ org.jboss.osgi.spi.util;version=1.0, \
+ org.jboss.virtual, \
+ org.jboss.virtual.plugins.registry, \
+ org.jboss.virtual.plugins.context.jar, \
+ org.jboss.virtual.plugins.vfs.helpers, \
+ org.jboss.virtual.protocol
Added: projects/jboss-osgi/trunk/distribution/runtime/server/conf/jboss-osgi-felix-default.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/runtime/server/conf/jboss-osgi-felix-default.properties (rev 0)
+++ projects/jboss-osgi/trunk/distribution/runtime/server/conf/jboss-osgi-felix-default.properties 2009-07-08 06:58:59 UTC (rev 90922)
@@ -0,0 +1,39 @@
+#######################################################################################
+#
+# Extra properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider
+#
+# $Id: $
+#
+#######################################################################################
+
+# JMX bundle properties
+org.jboss.osgi.jmx.host=${jboss.bind.address}
+org.jboss.osgi.jmx.rmi.port=1098
+
+# JNDI bundle properties
+org.jboss.osgi.jndi.host=${jboss.bind.address}
+org.jboss.osgi.jndi.rmi.port=1098
+org.jboss.osgi.jndi.port=1099
+
+# Husky socket connector properties
+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.jboss.logging, \
+ org.jboss.net.protocol, \
+ 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.management;version=1.0, \
+ org.jboss.osgi.spi.service;version=1.0, \
+ org.jboss.osgi.spi.testing;version=1.0, \
+ org.jboss.osgi.spi.util;version=1.0, \
+ org.jboss.virtual, \
+ org.jboss.virtual.plugins.registry, \
+ org.jboss.virtual.plugins.context.jar, \
+ org.jboss.virtual.plugins.vfs.helpers, \
+ org.jboss.virtual.protocol
+
+
\ No newline at end of file
Added: projects/jboss-osgi/trunk/distribution/runtime/server/conf/jboss-osgi-felix-minimal.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/runtime/server/conf/jboss-osgi-felix-minimal.properties (rev 0)
+++ projects/jboss-osgi/trunk/distribution/runtime/server/conf/jboss-osgi-felix-minimal.properties 2009-07-08 06:58:59 UTC (rev 90922)
@@ -0,0 +1,16 @@
+#######################################################################################
+#
+# Extra properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider
+#
+# $Id: $
+#
+#######################################################################################
+
+# Extra System Packages
+org.osgi.framework.system.packages.extra=\
+ org.jboss.logging, \
+ org.jboss.osgi.spi;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
Added: projects/jboss-osgi/trunk/distribution/runtime/server/conf/jboss-osgi-felix-web.properties
===================================================================
--- projects/jboss-osgi/trunk/distribution/runtime/server/conf/jboss-osgi-felix-web.properties (rev 0)
+++ projects/jboss-osgi/trunk/distribution/runtime/server/conf/jboss-osgi-felix-web.properties 2009-07-08 06:58:59 UTC (rev 90922)
@@ -0,0 +1,43 @@
+#######################################################################################
+#
+# Extra properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider
+#
+# $Id: $
+#
+#######################################################################################
+
+# HTTP Service Port
+org.osgi.service.http.port=8090
+
+# Config Admin Service
+felix.cm.dir=${osgi.server.home}/data/osgi-configadmin
+
+# JMX bundle properties
+org.jboss.osgi.jmx.host=${jboss.bind.address}
+org.jboss.osgi.jmx.rmi.port=1098
+
+# JNDI bundle properties
+org.jboss.osgi.jndi.host=${jboss.bind.address}
+org.jboss.osgi.jndi.rmi.port=1098
+org.jboss.osgi.jndi.port=1099
+
+# Husky socket connector properties
+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.jboss.logging, \
+ org.jboss.net.protocol, \
+ 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.management;version=1.0, \
+ org.jboss.osgi.spi.service;version=1.0, \
+ org.jboss.osgi.spi.testing;version=1.0, \
+ org.jboss.osgi.spi.util;version=1.0, \
+ org.jboss.virtual, \
+ org.jboss.virtual.plugins.registry, \
+ org.jboss.virtual.plugins.context.jar, \
+ org.jboss.virtual.plugins.vfs.helpers, \
+ org.jboss.virtual.protocol
Added: projects/jboss-osgi/trunk/distribution/runtime/server/conf/log4j.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/runtime/server/conf/log4j.xml (rev 0)
+++ projects/jboss-osgi/trunk/distribution/runtime/server/conf/log4j.xml 2009-07-08 06:58:59 UTC (rev 90922)
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <!-- ================================= -->
+ <!-- Preserve messages in a local file -->
+ <!-- ================================= -->
+
+ <appender name="FILE" class="org.apache.log4j.FileAppender">
+ <param name="File" value="${osgi.server.home}/log/server.log"/>
+ <param name="Append" value="false"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n -->
+ <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- ============================== -->
+ <!-- Append messages to the console -->
+ <!-- ============================== -->
+
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <param name="Target" value="System.out" />
+ <param name="Threshold" value="INFO" />
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n" />
+ </layout>
+ </appender>
+
+ <!-- ================ -->
+ <!-- Limit categories -->
+ <!-- ================ -->
+
+ <!-- Show jboss deployer tracesraces -->
+ <category name="org.jboss.deployers">
+ <priority value="TRACE" />
+ </category>
+
+ <!-- ======================= -->
+ <!-- Setup the Root category -->
+ <!-- ======================= -->
+
+ <root>
+ <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="FILE"/>
+ </root>
+
+</log4j:configuration>
Property changes on: projects/jboss-osgi/trunk/distribution/runtime/server/conf/log4j.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml 2009-07-08 06:03:51 UTC (rev 90921)
+++ projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml 2009-07-08 06:58:59 UTC (rev 90922)
@@ -161,7 +161,6 @@
<!-- JBossOSGi conf -->
<fileset dir="@{runtime.dir}/conf" targetdir="$INSTALL_PATH/runtime/conf" override="true">
<include name="org.jboss.osgi.spi.framework.OSGiBootstrapProvider" />
- <include name="log4j.xml" />
</fileset>
<!-- JBossOSGi Lib -->
@@ -176,6 +175,7 @@
</fileset>
<!-- Server Minimal -->
+ <file src="@{runtime.dir}/server/conf/log4j.xml" targetdir="$INSTALL_PATH/runtime/server/minimal/conf" override="true"/>
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/minimal/deploy" override="true">
<include name="org.apache.felix.log.jar" />
<include name="jboss-osgi-common.jar" />
@@ -183,6 +183,7 @@
</fileset>
<!-- Server Default -->
+ <file src="@{runtime.dir}/server/conf/log4j.xml" targetdir="$INSTALL_PATH/runtime/server/default/conf" override="true"/>
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/default/deploy" override="true">
<!-- default -->
<include name="jboss-osgi-common-core.jar" />
@@ -191,6 +192,7 @@
</fileset>
<!-- Server Web -->
+ <file src="@{runtime.dir}/server/conf/log4j.xml" targetdir="$INSTALL_PATH/runtime/server/web/conf" override="true"/>
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/web/deploy" override="true">
<!-- default -->
<include name="jboss-osgi-common-core.jar" />
@@ -204,6 +206,7 @@
</fileset>
<!-- Server All -->
+ <file src="@{runtime.dir}/server/conf/log4j.xml" targetdir="$INSTALL_PATH/runtime/server/all/conf" override="true"/>
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/all/deploy" override="true">
<!-- default -->
<include name="jboss-osgi-common-core.jar" />
@@ -224,6 +227,10 @@
<!-- Felix Integration -->
<singlefile condition="isFelix" src="@{runtime.dir}/conf/jboss-osgi-felix.properties" target="$INSTALL_PATH/runtime/conf/jboss-osgi-framework.properties" override="true"/>
+ <singlefile condition="isFelix" src="@{runtime.dir}/server/conf/jboss-osgi-felix-minimal.properties" target="$INSTALL_PATH/runtime/server/minimal/conf/jboss-osgi-extra.properties" override="true"/>
+ <singlefile condition="isFelix" src="@{runtime.dir}/server/conf/jboss-osgi-felix-default.properties" target="$INSTALL_PATH/runtime/server/default/conf/jboss-osgi-extra.properties" override="true"/>
+ <singlefile condition="isFelix" src="@{runtime.dir}/server/conf/jboss-osgi-felix-web.properties" target="$INSTALL_PATH/runtime/server/web/conf/jboss-osgi-extra.properties" override="true"/>
+ <singlefile condition="isFelix" src="@{runtime.dir}/server/conf/jboss-osgi-felix-all.properties" target="$INSTALL_PATH/runtime/server/all/conf/jboss-osgi-extra.properties" override="true"/>
<fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/lib" override="true">
<include name="jboss-osgi-runtime-felix.jar" />
<include name="org.apache.felix.framework.jar" />
More information about the jboss-osgi-commits
mailing list