JBoss-OSGI SVN: r88468 - in projects/jboss-osgi/trunk/build/distribution: scripts and 1 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-05-08 12:47:29 -0400 (Fri, 08 May 2009)
New Revision: 88468
Modified:
projects/jboss-osgi/trunk/build/distribution/pom.xml
projects/jboss-osgi/trunk/build/distribution/scripts/antrun-installer.xml
projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml
Log:
Add some distro debug
Modified: projects/jboss-osgi/trunk/build/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-05-08 16:38:19 UTC (rev 88467)
+++ projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-05-08 16:47:29 UTC (rev 88468)
@@ -269,6 +269,7 @@
<tasks>
<property name="maven.runtime.classpath" refid="maven.runtime.classpath" />
<property name="framework" value="${framework}" />
+ <!-- ${jboss.home} is available in the hudson run -->
<property name="jboss.home" value="${jboss.home}" />
<property name="jboss501.home" value="${jboss501.home}" />
<property name="jboss510.home" value="${jboss510.home}" />
Modified: projects/jboss-osgi/trunk/build/distribution/scripts/antrun-installer.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/scripts/antrun-installer.xml 2009-05-08 16:38:19 UTC (rev 88467)
+++ projects/jboss-osgi/trunk/build/distribution/scripts/antrun-installer.xml 2009-05-08 16:47:29 UTC (rev 88468)
@@ -28,6 +28,10 @@
<!-- Initialization -->
<!-- ================================================================== -->
<target name="init">
+ <echo message="jboss.home=${jboss.home}"/>
+ <echo message="jboss501.home=${jboss501.home}"/>
+ <echo message="jboss510.home=${jboss510.home}"/>
+ <echo message="jboss600.home=${jboss600.home}"/>
</target>
<!-- ================================================================== -->
Modified: projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml 2009-05-08 16:38:19 UTC (rev 88467)
+++ projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml 2009-05-08 16:47:29 UTC (rev 88468)
@@ -31,7 +31,6 @@
<variable name="jboss501.home" value="@{jboss501.home}" />
<variable name="jboss510.home" value="@{jboss510.home}" />
<variable name="jboss600.home" value="@{jboss600.home}" />
- <variable name="runtime.available" value="@{runtime.available}" />
</variables>
<!-- Dynamic Variables -->
17 years, 2 months
- 1
- 0
JBoss-OSGI SVN: r88453 - projects/jboss-osgi/trunk/build/distribution/runtime/bin.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-05-08 12:00:01 -0400 (Fri, 08 May 2009)
New Revision: 88453
Modified:
projects/jboss-osgi/trunk/build/distribution/runtime/bin/run.sh
Log:
Improve runtime PID handling
Modified: projects/jboss-osgi/trunk/build/distribution/runtime/bin/run.sh
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/runtime/bin/run.sh 2009-05-08 15:51:44 UTC (rev 88452)
+++ projects/jboss-osgi/trunk/build/distribution/runtime/bin/run.sh 2009-05-08 16:00:01 UTC (rev 88453)
@@ -142,7 +142,31 @@
# Execute the JVM in the foreground
"$JAVA" $JAVA_OPTS \
-classpath "$OSGI_CLASSPATH" \
- org.jboss.osgi.spi.framework.OSGiBootstrap "$@" &> /dev/null &
- echo $! > $OSGI_HOME/bin/pid.txt
- fg
-OSGI_STATUS=$?
+ org.jboss.osgi.spi.framework.OSGiBootstrap "$@" &
+
+OSGI_PID=$!
+echo $OSGI_PID > $OSGI_HOME/bin/pid.txt
+
+# Trap common signals and relay them to the jboss process
+trap "kill -HUP $OSGI_PID" HUP
+trap "kill -TERM $OSGI_PID" INT
+trap "kill -QUIT $OSGI_PID" QUIT
+trap "kill -PIPE $OSGI_PID" PIPE
+trap "kill -TERM $OSGI_PID" TERM
+
+# Wait until the background process exits
+WAIT_STATUS=128
+while [ "$WAIT_STATUS" -ge 128 ]; do
+ wait $OSGI_PID 2>/dev/null
+ WAIT_STATUS=$?
+ if [ "${WAIT_STATUS}" -gt 128 ]; then
+ SIGNAL=`expr ${WAIT_STATUS} - 128`
+ SIGNAL_NAME=`kill -l ${SIGNAL}`
+ echo "*** OSGi Runtime process (${OSGI_PID}) received ${SIGNAL_NAME} signal ***" >&2
+ fi
+done
+if [ "${WAIT_STATUS}" -lt 127 ]; then
+ OSGI_STATUS=$WAIT_STATUS
+else
+ OSGI_STATUS=0
+fi
17 years, 2 months
- 1
- 0
JBoss-OSGI SVN: r88450 - projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-05-08 11:43:04 -0400 (Fri, 08 May 2009)
New Revision: 88450
Modified:
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiBootstrap.java
Log:
Provide jboss.bind.address with -b
Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiBootstrap.java
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiBootstrap.java 2009-05-08 15:32:50 UTC (rev 88449)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/framework/OSGiBootstrap.java 2009-05-08 15:43:04 UTC (rev 88450)
@@ -107,7 +107,7 @@
public static void main(String[] args)
{
- initSystemProperties();
+ initSystemProperties(args);
OSGiBootstrapProvider bootProvider = getBootstrapProvider();
OSGiFramework framework = bootProvider.getFramework();
@@ -119,7 +119,7 @@
thread.start();
}
- private static void initSystemProperties()
+ private static void initSystemProperties(String[] args)
{
log.debug("initSystemProperties");
@@ -127,6 +127,12 @@
defaults.setProperty("jboss.bind.address", "localhost");
defaults.setProperty("java.protocol.handler.pkgs", "org.jboss.net.protocol|org.jboss.virtual.protocol");
+ // [TODO] use args4j
+ if (args != null && args.length == 2 && args[0].equals("-b"))
+ {
+ defaults.setProperty("jboss.bind.address", args[1]);
+ }
+
Enumeration<?> defaultNames = defaults.propertyNames();
while(defaultNames.hasMoreElements())
{
17 years, 2 months
- 1
- 0
JBoss-OSGI SVN: r88446 - projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-05-08 11:21:04 -0400 (Fri, 08 May 2009)
New Revision: 88446
Modified:
projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/jboss-osgi-beans.xml
Log:
Fix knopflerfish startup
Modified: projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/jboss-osgi-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/jboss-osgi-beans.xml 2009-05-08 15:09:23 UTC (rev 88445)
+++ projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/resources/jboss-osgi-beans.xml 2009-05-08 15:21:04 UTC (rev 88446)
@@ -4,7 +4,7 @@
<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd" xmlns="urn:jboss:bean-deployer:2.0">
<!-- The OSGiFramework -->
- <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.knopflerfish.KnopflerfishIntegration">
+ <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.knopflerfish.framework.KnopflerfishIntegration">
<property name="properties">
<map keyClass="java.lang.String" valueClass="java.lang.String">
<entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
17 years, 2 months
- 1
- 0
JBoss-OSGI SVN: r88444 - in projects/jboss-osgi/trunk/build/hudson: hudson-home and 5 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-05-08 11:04:18 -0400 (Fri, 08 May 2009)
New Revision: 88444
Modified:
projects/jboss-osgi/trunk/build/hudson/
projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh
projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-5.1.0/config.xml
projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml
projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk15/config.xml
projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk16/config.xml
projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-matrix/config.xml
Log:
Refactor container startup - WIP
Property changes on: projects/jboss-osgi/trunk/build/hudson
___________________________________________________________________
Name: svn:mergeinfo
-
Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh 2009-05-08 14:54:31 UTC (rev 88443)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh 2009-05-08 15:04:18 UTC (rev 88444)
@@ -9,7 +9,8 @@
OSGIDIR=$WORKSPACE/jboss-osgi
DISTRODIR=$OSGIDIR/build/distribution/target
-HUDSON_HOME=$OSGIDIR/build/hudson/hudson-home
+HUDSONDIR=$OSGIDIR/build/hudson
+HUDSONBIN=$HUDSONDIR/hudson-home/bin
case "$CONTAINER" in
'jboss501')
@@ -19,7 +20,7 @@
RUNTIME_LOG=$RUNTIME_HOME/server/$JBOSS_SERVER/log/server.log
rm -rf $RUNTIME_HOME; unzip -q $JBOSS_ZIP -d $WORKSPACE
cp $RUNTIME_HOME/bin/run.sh $RUNTIME_HOME/bin/run.sh.org
- cp $HUDSON_HOME/bin/run-with-pid.sh $RUNTIME_HOME/bin/run.sh
+ cp $HUDSONBIN/run-with-pid.sh $RUNTIME_HOME/bin/run.sh
;;
'jboss510')
JBOSS_BUILD=jboss-5.1.0.GA
@@ -28,7 +29,7 @@
RUNTIME_LOG=$RUNTIME_HOME/server/$JBOSS_SERVER/log/server.log
rm -rf $RUNTIME_HOME; unzip -q $JBOSS_ZIP -d $WORKSPACE
cp $RUNTIME_HOME/bin/run.sh $RUNTIME_HOME/bin/run.sh.org
- cp $HUDSON_HOME/bin/run-with-pid.sh $RUNTIME_HOME/bin/run.sh
+ cp $HUDSONBIN/run-with-pid.sh $RUNTIME_HOME/bin/run.sh
;;
'jboss600')
JBOSS_BUILD=jboss-6.0.0.Alpha1
@@ -37,7 +38,7 @@
RUNTIME_LOG=$RUNTIME_HOME/server/$JBOSS_SERVER/log/server.log
rm -rf $RUNTIME_HOME; unzip -q $JBOSS_ZIP -d $WORKSPACE
cp $RUNTIME_HOME/bin/run.sh $RUNTIME_HOME/bin/run.sh.org
- cp $HUDSON_HOME/bin/run-with-pid.sh $RUNTIME_HOME/bin/run.sh
+ cp $HUDSONBIN/run-with-pid.sh $RUNTIME_HOME/bin/run.sh
;;
'runtime')
RUNTIME_HOME=$DISTRODIR/auto-install-dest/runtime
@@ -79,13 +80,13 @@
#
# start jbossas
#
-$HUDSON_HOME/bin/startup.sh $RUNTIME_HOME start $JBOSS_BINDADDR
+$HUDSONBIN/startup.sh $RUNTIME_HOME start $JBOSS_BINDADDR
# Was it successfully started?
-$HUDSON_HOME/bin/http-spider.sh $JBOSS_BINDADDR:8090/jboss-osgi $WORKSPACE
+$HUDSONBIN/http-spider.sh $JBOSS_BINDADDR:8090/jboss-osgi $WORKSPACE
if [ -e $WORKSPACE/spider.failed ]; then
tail -n 200 $RUNTIME_LOG
- $HUDSON_HOME/bin/startup.sh $RUNTIME_HOME stop
+ $HUDSONBIN/startup.sh $RUNTIME_HOME stop
exit 1
fi
@@ -100,7 +101,7 @@
#
# stop jbossas
#
-$HUDSON_HOME/bin/startup.sh $RUNTIME_HOME stop
+$HUDSONBIN/startup.sh $RUNTIME_HOME stop
#
# copy test.log to workspace
Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-5.1.0/config.xml
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-5.1.0/config.xml 2009-05-08 14:54:31 UTC (rev 88443)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-5.1.0/config.xml 2009-05-08 15:04:18 UTC (rev 88444)
@@ -30,7 +30,8 @@
<hudson.tasks.Shell>
<command>
OSGIDIR=$WORKSPACE/jboss-osgi
-HUDSON_HOME=$OSGIDIR/build/hudson/hudson-home
+HUDSONDIR=$OSGIDIR/build/hudson
+HUDSONBIN=$HUDSONDIR/hudson-home/bin
JBOSS_VERSION=jboss-5.1.0.GA
@@ -48,16 +49,16 @@
# Start JBossAS
#
cp $JBOSS_HOME/bin/run.sh $JBOSS_HOME/bin/run.sh.org
-cp $HUDSON_HOME/bin/run-with-pid.sh $JBOSS_HOME/bin/run.sh
-$HUDSON_HOME/bin/startup.sh $JBOSS_HOME start $JBOSS_BINDADDR
+cp $HUDSONBIN/run-with-pid.sh $JBOSS_HOME/bin/run.sh
+$HUDSONBIN/startup.sh $JBOSS_HOME start $JBOSS_BINDADDR
#
# Was it successfully started?
#
-$HUDSON_HOME/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+$HUDSONBIN/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
if [ -e $WORKSPACE/spider.failed ]; then
tail -n 200 $JBOSS_HOME/server/default/log/server.log
- $HUDSON_HOME/bin/startup.sh $JBOSS_HOME stop
+ $HUDSONBIN/startup.sh $JBOSS_HOME stop
exit 1
fi
Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml 2009-05-08 14:54:31 UTC (rev 88443)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml 2009-05-08 15:04:18 UTC (rev 88444)
@@ -30,7 +30,8 @@
<hudson.tasks.Shell>
<command>
OSGIDIR=$WORKSPACE/jboss-osgi
-HUDSON_HOME=$OSGIDIR/build/hudson/hudson-home
+HUDSONDIR=$OSGIDIR/build/hudson
+HUDSONBIN=$HUDSONDIR/hudson-home/bin
JBOSS_VERSION=jboss-6.0.0.Alpha1
@@ -48,16 +49,16 @@
# Start JBossAS
#
cp $JBOSS_HOME/bin/run.sh $JBOSS_HOME/bin/run.sh.org
-cp $HUDSON_HOME/bin/run-with-pid.sh $JBOSS_HOME/bin/run.sh
-$HUDSON_HOME/bin/startup.sh $JBOSS_HOME start $JBOSS_BINDADDR
+cp $HUDSONBIN/run-with-pid.sh $JBOSS_HOME/bin/run.sh
+$HUDSONBIN/startup.sh $JBOSS_HOME start $JBOSS_BINDADDR
#
# Was it successfully started?
#
-$HUDSON_HOME/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+$HUDSONBIN/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
if [ -e $WORKSPACE/spider.failed ]; then
tail -n 200 $JBOSS_HOME/server/default/log/server.log
- $HUDSON_HOME/bin/startup.sh $JBOSS_HOME stop
+ $HUDSONBIN/startup.sh $JBOSS_HOME stop
exit 1
fi
Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk15/config.xml
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk15/config.xml 2009-05-08 14:54:31 UTC (rev 88443)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk15/config.xml 2009-05-08 15:04:18 UTC (rev 88444)
@@ -44,7 +44,7 @@
<hudson.tasks.Shell>
<command>
OSGIDIR=$WORKSPACE/jboss-osgi
-HUDSON_HOME=$OSGIDIR/build/hudson/hudson-home
+HUDSONDIR=$OSGIDIR/build/hudson
export JBOSS_BINDADDR=(a)jboss.bind.address@
@@ -54,7 +54,7 @@
#
# call command.sh
#
-/bin/sh $HUDSON_HOME/command.sh
+/bin/sh $HUDSONDIR/hudson-home/command.sh
</command>
</hudson.tasks.Shell>
</builders>
Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk16/config.xml
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk16/config.xml 2009-05-08 14:54:31 UTC (rev 88443)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk16/config.xml 2009-05-08 15:04:18 UTC (rev 88444)
@@ -44,7 +44,7 @@
<hudson.tasks.Shell>
<command>
OSGIDIR=$WORKSPACE/jboss-osgi
-HUDSON_HOME=$OSGIDIR/build/hudson/hudson-home
+HUDSONDIR=$OSGIDIR/build/hudson
export JBOSS_BINDADDR=(a)jboss.bind.address@
@@ -54,7 +54,7 @@
#
# call command.sh
#
-/bin/sh $HUDSON_HOME/command.sh
+/bin/sh $HUDSONDIR/hudson-home/command.sh
</command>
</hudson.tasks.Shell>
</builders>
Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-matrix/config.xml
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-matrix/config.xml 2009-05-08 14:54:31 UTC (rev 88443)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-matrix/config.xml 2009-05-08 15:04:18 UTC (rev 88444)
@@ -60,7 +60,7 @@
<hudson.tasks.Shell>
<command>
OSGIDIR=$WORKSPACE/jboss-osgi
-HUDSON_HOME=$OSGIDIR/build/hudson/hudson-home
+HUDSONDIR=$OSGIDIR/build/hudson
export FRAMEWORK=$framework
export CONTAINER=$container
@@ -73,7 +73,7 @@
#
# call command.sh
#
-/bin/sh $HUDSON_HOME/command.sh
+/bin/sh $HUDSONDIR/hudson-home/command.sh
</command>
</hudson.tasks.Shell>
</builders>
17 years, 2 months
- 1
- 0
JBoss-OSGI SVN: r88443 - in projects/jboss-osgi/trunk/build/hudson/hudson-home: jobs/JBoss-5.1.0 and 4 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-05-08 10:54:31 -0400 (Fri, 08 May 2009)
New Revision: 88443
Modified:
projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh
projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-5.1.0/config.xml
projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml
projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk15/config.xml
projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk16/config.xml
projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-matrix/config.xml
Log:
Refactor container startup - WIP
Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh 2009-05-08 14:36:20 UTC (rev 88442)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh 2009-05-08 14:54:31 UTC (rev 88443)
@@ -9,7 +9,7 @@
OSGIDIR=$WORKSPACE/jboss-osgi
DISTRODIR=$OSGIDIR/build/distribution/target
-HUDSONDIR=$OSGIDIR/build/hudson
+HUDSON_HOME=$OSGIDIR/build/hudson/hudson-home
case "$CONTAINER" in
'jboss501')
@@ -19,7 +19,7 @@
RUNTIME_LOG=$RUNTIME_HOME/server/$JBOSS_SERVER/log/server.log
rm -rf $RUNTIME_HOME; unzip -q $JBOSS_ZIP -d $WORKSPACE
cp $RUNTIME_HOME/bin/run.sh $RUNTIME_HOME/bin/run.sh.org
- cp $HUDSONDIR/bin/run-with-pid.sh $RUNTIME_HOME/bin/run.sh
+ cp $HUDSON_HOME/bin/run-with-pid.sh $RUNTIME_HOME/bin/run.sh
;;
'jboss510')
JBOSS_BUILD=jboss-5.1.0.GA
@@ -28,7 +28,7 @@
RUNTIME_LOG=$RUNTIME_HOME/server/$JBOSS_SERVER/log/server.log
rm -rf $RUNTIME_HOME; unzip -q $JBOSS_ZIP -d $WORKSPACE
cp $RUNTIME_HOME/bin/run.sh $RUNTIME_HOME/bin/run.sh.org
- cp $HUDSONDIR/bin/run-with-pid.sh $RUNTIME_HOME/bin/run.sh
+ cp $HUDSON_HOME/bin/run-with-pid.sh $RUNTIME_HOME/bin/run.sh
;;
'jboss600')
JBOSS_BUILD=jboss-6.0.0.Alpha1
@@ -37,7 +37,7 @@
RUNTIME_LOG=$RUNTIME_HOME/server/$JBOSS_SERVER/log/server.log
rm -rf $RUNTIME_HOME; unzip -q $JBOSS_ZIP -d $WORKSPACE
cp $RUNTIME_HOME/bin/run.sh $RUNTIME_HOME/bin/run.sh.org
- cp $HUDSONDIR/bin/run-with-pid.sh $RUNTIME_HOME/bin/run.sh
+ cp $HUDSON_HOME/bin/run-with-pid.sh $RUNTIME_HOME/bin/run.sh
;;
'runtime')
RUNTIME_HOME=$DISTRODIR/auto-install-dest/runtime
@@ -79,13 +79,13 @@
#
# start jbossas
#
-$HUDSONDIR/bin/startup.sh $RUNTIME_HOME start $JBOSS_BINDADDR
+$HUDSON_HOME/bin/startup.sh $RUNTIME_HOME start $JBOSS_BINDADDR
# Was it successfully started?
-$HUDSONDIR/bin/http-spider.sh $JBOSS_BINDADDR:8090/jboss-osgi $WORKSPACE
+$HUDSON_HOME/bin/http-spider.sh $JBOSS_BINDADDR:8090/jboss-osgi $WORKSPACE
if [ -e $WORKSPACE/spider.failed ]; then
tail -n 200 $RUNTIME_LOG
- $HUDSONDIR/bin/startup.sh $RUNTIME_HOME stop
+ $HUDSON_HOME/bin/startup.sh $RUNTIME_HOME stop
exit 1
fi
@@ -100,7 +100,7 @@
#
# stop jbossas
#
-$HUDSONDIR/bin/startup.sh $RUNTIME_HOME stop
+$HUDSON_HOME/bin/startup.sh $RUNTIME_HOME stop
#
# copy test.log to workspace
Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-5.1.0/config.xml
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-5.1.0/config.xml 2009-05-08 14:36:20 UTC (rev 88442)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-5.1.0/config.xml 2009-05-08 14:54:31 UTC (rev 88443)
@@ -29,7 +29,8 @@
<builders>
<hudson.tasks.Shell>
<command>
-HUDSONDIR=$WORKSPACE/jboss-osgi//build/hudson
+OSGIDIR=$WORKSPACE/jboss-osgi
+HUDSON_HOME=$OSGIDIR/build/hudson/hudson-home
JBOSS_VERSION=jboss-5.1.0.GA
@@ -47,16 +48,16 @@
# Start JBossAS
#
cp $JBOSS_HOME/bin/run.sh $JBOSS_HOME/bin/run.sh.org
-cp $HUDSONDIR/bin/run-with-pid.sh $JBOSS_HOME/bin/run.sh
-$HUDSONDIR/bin/startup.sh $JBOSS_HOME start $JBOSS_BINDADDR
+cp $HUDSON_HOME/bin/run-with-pid.sh $JBOSS_HOME/bin/run.sh
+$HUDSON_HOME/bin/startup.sh $JBOSS_HOME start $JBOSS_BINDADDR
#
# Was it successfully started?
#
-$HUDSONDIR/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+$HUDSON_HOME/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
if [ -e $WORKSPACE/spider.failed ]; then
tail -n 200 $JBOSS_HOME/server/default/log/server.log
- $HUDSONDIR/bin/startup.sh $JBOSS_HOME stop
+ $HUDSON_HOME/bin/startup.sh $JBOSS_HOME stop
exit 1
fi
Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml 2009-05-08 14:36:20 UTC (rev 88442)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml 2009-05-08 14:54:31 UTC (rev 88443)
@@ -29,7 +29,8 @@
<builders>
<hudson.tasks.Shell>
<command>
-HUDSONDIR=$WORKSPACE/jboss-osgi//build/hudson
+OSGIDIR=$WORKSPACE/jboss-osgi
+HUDSON_HOME=$OSGIDIR/build/hudson/hudson-home
JBOSS_VERSION=jboss-6.0.0.Alpha1
@@ -47,16 +48,16 @@
# Start JBossAS
#
cp $JBOSS_HOME/bin/run.sh $JBOSS_HOME/bin/run.sh.org
-cp $HUDSONDIR/bin/run-with-pid.sh $JBOSS_HOME/bin/run.sh
-$HUDSONDIR/bin/startup.sh $JBOSS_HOME start $JBOSS_BINDADDR
+cp $HUDSON_HOME/bin/run-with-pid.sh $JBOSS_HOME/bin/run.sh
+$HUDSON_HOME/bin/startup.sh $JBOSS_HOME start $JBOSS_BINDADDR
#
# Was it successfully started?
#
-$HUDSONDIR/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+$HUDSON_HOME/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
if [ -e $WORKSPACE/spider.failed ]; then
tail -n 200 $JBOSS_HOME/server/default/log/server.log
- $HUDSONDIR/bin/startup.sh $JBOSS_HOME stop
+ $HUDSON_HOME/bin/startup.sh $JBOSS_HOME stop
exit 1
fi
Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk15/config.xml
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk15/config.xml 2009-05-08 14:36:20 UTC (rev 88442)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk15/config.xml 2009-05-08 14:54:31 UTC (rev 88443)
@@ -44,7 +44,7 @@
<hudson.tasks.Shell>
<command>
OSGIDIR=$WORKSPACE/jboss-osgi
-HUDSONDIR=$OSGIDIR/build/hudson
+HUDSON_HOME=$OSGIDIR/build/hudson/hudson-home
export JBOSS_BINDADDR=(a)jboss.bind.address@
@@ -54,7 +54,7 @@
#
# call command.sh
#
-/bin/sh $HUDSONDIR/hudson-home/command.sh
+/bin/sh $HUDSON_HOME/command.sh
</command>
</hudson.tasks.Shell>
</builders>
Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk16/config.xml
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk16/config.xml 2009-05-08 14:36:20 UTC (rev 88442)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk16/config.xml 2009-05-08 14:54:31 UTC (rev 88443)
@@ -44,7 +44,7 @@
<hudson.tasks.Shell>
<command>
OSGIDIR=$WORKSPACE/jboss-osgi
-HUDSONDIR=$OSGIDIR/build/hudson
+HUDSON_HOME=$OSGIDIR/build/hudson/hudson-home
export JBOSS_BINDADDR=(a)jboss.bind.address@
@@ -54,7 +54,7 @@
#
# call command.sh
#
-/bin/sh $HUDSONDIR/hudson-home/command.sh
+/bin/sh $HUDSON_HOME/command.sh
</command>
</hudson.tasks.Shell>
</builders>
Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-matrix/config.xml
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-matrix/config.xml 2009-05-08 14:36:20 UTC (rev 88442)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-matrix/config.xml 2009-05-08 14:54:31 UTC (rev 88443)
@@ -60,7 +60,7 @@
<hudson.tasks.Shell>
<command>
OSGIDIR=$WORKSPACE/jboss-osgi
-HUDSONDIR=$OSGIDIR/build/hudson
+HUDSON_HOME=$OSGIDIR/build/hudson/hudson-home
export FRAMEWORK=$framework
export CONTAINER=$container
@@ -73,7 +73,7 @@
#
# call command.sh
#
-/bin/sh $HUDSONDIR/hudson-home/command.sh
+/bin/sh $HUDSON_HOME/command.sh
</command>
</hudson.tasks.Shell>
</builders>
17 years, 2 months
- 1
- 0
JBoss-OSGI SVN: r88442 - in projects/jboss-osgi/trunk/build/hudson/hudson-home: bin and 2 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-05-08 10:36:20 -0400 (Fri, 08 May 2009)
New Revision: 88442
Added:
projects/jboss-osgi/trunk/build/hudson/hudson-home/bin/startup.sh
Removed:
projects/jboss-osgi/trunk/build/hudson/hudson-home/bin/runtime.sh
Modified:
projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh
projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-5.1.0/config.xml
projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml
Log:
refactor container startup
Deleted: projects/jboss-osgi/trunk/build/hudson/hudson-home/bin/runtime.sh
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/bin/runtime.sh 2009-05-08 14:30:43 UTC (rev 88441)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/bin/runtime.sh 2009-05-08 14:36:20 UTC (rev 88442)
@@ -1,51 +0,0 @@
-#!/bin/sh
-
-PROGNAME=`basename $0`
-DIRNAME=`dirname $0`
-RUNTIME_HOME="$1"
-BINDADDR="$3"
-CMD="$2"
-
-export RUNTIME_HOME
-
-#
-# Helper to complain.
-#
-warn() {
- echo "$PROGNAME: $*"
-}
-
-if [ ! -f "$RUNTIME_HOME/bin/run.sh" ]; then
- warn "Cannot find: $RUNTIME_HOME/bin/run.sh"
- exit 1
-fi
-
-case "$CMD" in
-start)
- # This version of run.sh obtains the pid of the JVM and saves it as jboss.pid
- # It relies on bash specific features
- /bin/bash $RUNTIME_HOME/bin/run.sh -b $BINDADDR &
- ;;
-stop)
- pidfile="$RUNTIME_HOME/bin/pid.txt"
- if [ -f "$pidfile" ]; then
- pid=`cat "$pidfile"`
- echo "kill pid: $pid"
- kill $pid
- if [ "$?" -eq 0 ]; then
- # process exists, wait for it to die, and force if not
- sleep 20
- kill -9 $pid &> /dev/null
- fi
- rm "$pidfile"
- else
- warn "No pid found!"
- fi
- ;;
-restart)
- $0 stop
- $0 start
- ;;
-*)
- echo "usage: $0 jboss_home (start|stop|restart|help)"
-esac
Copied: projects/jboss-osgi/trunk/build/hudson/hudson-home/bin/startup.sh (from rev 88441, projects/jboss-osgi/trunk/build/hudson/hudson-home/bin/runtime.sh)
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/bin/startup.sh (rev 0)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/bin/startup.sh 2009-05-08 14:36:20 UTC (rev 88442)
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+PROGNAME=`basename $0`
+DIRNAME=`dirname $0`
+RUNTIME_HOME="$1"
+BINDADDR="$3"
+CMD="$2"
+
+export RUNTIME_HOME
+
+#
+# Helper to complain.
+#
+warn() {
+ echo "$PROGNAME: $*"
+}
+
+if [ ! -f "$RUNTIME_HOME/bin/run.sh" ]; then
+ warn "Cannot find: $RUNTIME_HOME/bin/run.sh"
+ exit 1
+fi
+
+case "$CMD" in
+start)
+ # This version of run.sh obtains the pid of the JVM and saves it as jboss.pid
+ # It relies on bash specific features
+ /bin/bash $RUNTIME_HOME/bin/run.sh -b $BINDADDR &
+ ;;
+stop)
+ pidfile="$RUNTIME_HOME/bin/pid.txt"
+ if [ -f "$pidfile" ]; then
+ pid=`cat "$pidfile"`
+ echo "kill pid: $pid"
+ kill $pid
+ if [ "$?" -eq 0 ]; then
+ # process exists, wait for it to die, and force if not
+ sleep 20
+ kill -9 $pid &> /dev/null
+ fi
+ rm "$pidfile"
+ else
+ warn "No pid found!"
+ fi
+ ;;
+restart)
+ $0 stop
+ $0 start
+ ;;
+*)
+ echo "usage: $0 jboss_home (start|stop|restart|help)"
+esac
Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh 2009-05-08 14:30:43 UTC (rev 88441)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh 2009-05-08 14:36:20 UTC (rev 88442)
@@ -79,13 +79,13 @@
#
# start jbossas
#
-$HUDSONDIR/bin/runtime.sh $RUNTIME_HOME start $JBOSS_BINDADDR
+$HUDSONDIR/bin/startup.sh $RUNTIME_HOME start $JBOSS_BINDADDR
# Was it successfully started?
$HUDSONDIR/bin/http-spider.sh $JBOSS_BINDADDR:8090/jboss-osgi $WORKSPACE
if [ -e $WORKSPACE/spider.failed ]; then
tail -n 200 $RUNTIME_LOG
- $HUDSONDIR/bin/runtime.sh $RUNTIME_HOME stop
+ $HUDSONDIR/bin/startup.sh $RUNTIME_HOME stop
exit 1
fi
@@ -100,7 +100,7 @@
#
# stop jbossas
#
-$HUDSONDIR/bin/runtime.sh $RUNTIME_HOME stop
+$HUDSONDIR/bin/startup.sh $RUNTIME_HOME stop
#
# copy test.log to workspace
Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-5.1.0/config.xml
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-5.1.0/config.xml 2009-05-08 14:30:43 UTC (rev 88441)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-5.1.0/config.xml 2009-05-08 14:36:20 UTC (rev 88442)
@@ -46,15 +46,17 @@
#
# Start JBossAS
#
-$HUDSONDIR/jboss/bin/jboss.sh $JBOSS_HOME start $JBOSS_BINDADDR
+cp $JBOSS_HOME/bin/run.sh $JBOSS_HOME/bin/run.sh.org
+cp $HUDSONDIR/bin/run-with-pid.sh $JBOSS_HOME/bin/run.sh
+$HUDSONDIR/bin/startup.sh $JBOSS_HOME start $JBOSS_BINDADDR
#
# Was it successfully started?
#
-$HUDSONDIR/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+$HUDSONDIR/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
if [ -e $WORKSPACE/spider.failed ]; then
tail -n 200 $JBOSS_HOME/server/default/log/server.log
- $HUDSONDIR/jboss/bin/jboss.sh $JBOSS_HOME stop $JBOSS_BINDADDR
+ $HUDSONDIR/bin/startup.sh $JBOSS_HOME stop
exit 1
fi
Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml 2009-05-08 14:30:43 UTC (rev 88441)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/JBoss-6.0.0/config.xml 2009-05-08 14:36:20 UTC (rev 88442)
@@ -46,15 +46,17 @@
#
# Start JBossAS
#
-$HUDSONDIR/jboss/bin/jboss.sh $JBOSS_HOME start $JBOSS_BINDADDR
+cp $JBOSS_HOME/bin/run.sh $JBOSS_HOME/bin/run.sh.org
+cp $HUDSONDIR/bin/run-with-pid.sh $JBOSS_HOME/bin/run.sh
+$HUDSONDIR/bin/startup.sh $JBOSS_HOME start $JBOSS_BINDADDR
#
# Was it successfully started?
#
-$HUDSONDIR/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
+$HUDSONDIR/bin/http-spider.sh $JBOSS_BINDADDR:8080 $WORKSPACE
if [ -e $WORKSPACE/spider.failed ]; then
tail -n 200 $JBOSS_HOME/server/default/log/server.log
- $HUDSONDIR/jboss/bin/jboss.sh $JBOSS_HOME stop $JBOSS_BINDADDR
+ $HUDSONDIR/bin/startup.sh $JBOSS_HOME stop
exit 1
fi
17 years, 2 months
- 1
- 0
JBoss-OSGI SVN: r88441 - in projects/jboss-osgi/trunk/build: distribution/runtime/conf and 3 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-05-08 10:30:43 -0400 (Fri, 08 May 2009)
New Revision: 88441
Added:
projects/jboss-osgi/trunk/build/hudson/hudson-home/bin/
projects/jboss-osgi/trunk/build/hudson/hudson-home/bin/run-with-pid.sh
projects/jboss-osgi/trunk/build/hudson/hudson-home/bin/runtime.sh
Removed:
projects/jboss-osgi/trunk/build/hudson/hudson-home/bin/jboss.sh
projects/jboss-osgi/trunk/build/hudson/hudson-home/bin/runjboss.sh
projects/jboss-osgi/trunk/build/hudson/jboss/
Modified:
projects/jboss-osgi/trunk/build/distribution/runtime/bin/run.sh
projects/jboss-osgi/trunk/build/distribution/runtime/conf/log4j.xml
projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh
Log:
refactor container startup
Modified: projects/jboss-osgi/trunk/build/distribution/runtime/bin/run.sh
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/runtime/bin/run.sh 2009-05-08 14:17:08 UTC (rev 88440)
+++ projects/jboss-osgi/trunk/build/distribution/runtime/bin/run.sh 2009-05-08 14:30:43 UTC (rev 88441)
@@ -142,5 +142,7 @@
# Execute the JVM in the foreground
"$JAVA" $JAVA_OPTS \
-classpath "$OSGI_CLASSPATH" \
- org.jboss.osgi.spi.framework.OSGiBootstrap "$@"
+ org.jboss.osgi.spi.framework.OSGiBootstrap "$@" &> /dev/null &
+ echo $! > $OSGI_HOME/bin/pid.txt
+ fg
OSGI_STATUS=$?
Modified: projects/jboss-osgi/trunk/build/distribution/runtime/conf/log4j.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/runtime/conf/log4j.xml 2009-05-08 14:17:08 UTC (rev 88440)
+++ projects/jboss-osgi/trunk/build/distribution/runtime/conf/log4j.xml 2009-05-08 14:30:43 UTC (rev 88441)
@@ -8,7 +8,7 @@
<!-- ================================= -->
<appender name="FILE" class="org.apache.log4j.FileAppender">
- <param name="File" value="${osgi.home}/log/test.log"/>
+ <param name="File" value="${osgi.home}/log/server.log"/>
<param name="Append" value="false"/>
<layout class="org.apache.log4j.PatternLayout">
<!-- The default pattern: Date Priority [Category] Message\n -->
Copied: projects/jboss-osgi/trunk/build/hudson/hudson-home/bin (from rev 88424, projects/jboss-osgi/trunk/build/hudson/jboss/bin)
Deleted: projects/jboss-osgi/trunk/build/hudson/hudson-home/bin/jboss.sh
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/jboss/bin/jboss.sh 2009-05-08 12:00:24 UTC (rev 88424)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/bin/jboss.sh 2009-05-08 14:30:43 UTC (rev 88441)
@@ -1,53 +0,0 @@
-#!/bin/sh
-
-PROGNAME=`basename $0`
-DIRNAME=`dirname $0`
-JBOSS_HOME="$1"
-BINDADDR="$3"
-CMD="$2"
-
-export JBOSS_HOME
-
-#
-# Helper to complain.
-#
-warn() {
- echo "$PROGNAME: $*"
-}
-
-if [ ! -f "$JBOSS_HOME/bin/run.sh" ]; then
- warn "Cannot find: $JBOSS_HOME/bin/run.sh"
- exit 1
-fi
-
-case "$CMD" in
-start)
- # This version of run.sh obtains the pid of the JVM and saves it as jboss.pid
- # It relies on bash specific features
- # Do you want to hide jboss output?
- /bin/bash $DIRNAME/runjboss.sh -b $BINDADDR &
- ;;
-stop)
- pidfile="$JBOSS_HOME/bin/jboss.pid"
- if [ -f "$pidfile" ]; then
- pid=`cat "$pidfile"`
- echo "kill pid: $pid"
- kill $pid
- if [ "$?" -eq 0 ]; then
- # process exists, wait for it to die, and force if not
- sleep 20
- kill -9 $pid &> /dev/null
- fi
- rm "$pidfile"
- else
- warn "No pid found, using shutdown"
- $JBOSS_HOME/bin/shutdown.sh -S > /dev/null &
- fi
- ;;
-restart)
- $0 stop
- $0 start
- ;;
-*)
- echo "usage: $0 jboss_instance (start|stop|restart|help)"
-esac
Copied: projects/jboss-osgi/trunk/build/hudson/hudson-home/bin/run-with-pid.sh (from rev 88424, projects/jboss-osgi/trunk/build/hudson/jboss/bin/runjboss.sh)
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/bin/run-with-pid.sh (rev 0)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/bin/run-with-pid.sh 2009-05-08 14:30:43 UTC (rev 88441)
@@ -0,0 +1,136 @@
+#!/bin/bash
+### ====================================================================== ###
+## ##
+## JBoss Bootstrap Script ##
+## ##
+### ====================================================================== ###
+
+### $Id$ ###
+
+DIRNAME=`dirname $0`
+PROGNAME=`basename $0`
+GREP="grep"
+
+# Use the maximum available, or set MAX_FD != -1 to use that
+MAX_FD="maximum"
+
+#
+# Helper to complain.
+#
+warn() {
+ echo "${PROGNAME}: $*"
+}
+
+#
+# Helper to puke.
+#
+die() {
+ warn $*
+ exit 1
+}
+
+# Setup JBOSS_HOME
+if [ "x$JBOSS_HOME" = "x" ]; then
+ # get the full path (without any relative bits)
+ JBOSS_HOME=`cd $DIRNAME/..; pwd`
+fi
+export JBOSS_HOME
+
+# Read an optional running configuration file
+if [ "x$RUN_CONF" = "x" ]; then
+ RUN_CONF="$JBOSS_HOME/bin/run.conf"
+fi
+if [ -r "$RUN_CONF" ]; then
+ . "$RUN_CONF"
+fi
+
+# Setup the JVM
+if [ "x$JAVA" = "x" ]; then
+ if [ "x$JAVA_HOME" != "x" ]; then
+ JAVA="$JAVA_HOME/bin/java"
+ else
+ JAVA="java"
+ fi
+fi
+
+# Setup the classpath
+runjar="$JBOSS_HOME/bin/run.jar"
+if [ ! -f "$runjar" ]; then
+ die "Missing required file: $runjar"
+fi
+JBOSS_BOOT_CLASSPATH="$runjar"
+
+# Include the JDK javac compiler for JSP pages. The default is for a Sun JDK
+# compatible distribution which JAVA_HOME points to
+if [ "x$JAVAC_JAR" = "x" ]; then
+ JAVAC_JAR="$JAVA_HOME/lib/tools.jar"
+fi
+if [ ! -f "$JAVAC_JAR" ]; then
+ warn "Missing file: $JAVAC_JAR"
+ warn "Unexpected results may occur. Make sure JAVA_HOME points to a JDK and not a JRE."
+fi
+
+if [ "x$JBOSS_CLASSPATH" = "x" ]; then
+ JBOSS_CLASSPATH="$JBOSS_BOOT_CLASSPATH:$JAVAC_JAR"
+else
+ JBOSS_CLASSPATH="$JBOSS_CLASSPATH:$JBOSS_BOOT_CLASSPATH:$JAVAC_JAR"
+fi
+
+# If -server not set in JAVA_OPTS, set it, if supported
+SERVER_SET=`echo $JAVA_OPTS | $GREP "\-server"`
+if [ "x$SERVER_SET" = "x" ]; then
+
+ # Check for SUN(tm) JVM w/ HotSpot support
+ if [ "x$HAS_HOTSPOT" = "x" ]; then
+ HAS_HOTSPOT=`"$JAVA" -version 2>&1 | $GREP -i HotSpot`
+ fi
+
+ # Enable -server if we have Hotspot, unless we can't
+ if [ "x$HAS_HOTSPOT" != "x" ]; then
+ JAVA_OPTS="-server $JAVA_OPTS"
+ fi
+fi
+
+# Setup JBoss sepecific properties
+JAVA_OPTS="-Dprogram.name=$PROGNAME $JAVA_OPTS"
+
+# Force IPv4 on Linux systems since IPv6 doesn't work correctly with jdk5 and lower
+JAVA_OPTS="$JAVA_OPTS -Djava.net.preferIPv4Stack=true"
+
+# This should be removed when JBoss configuration XML files can be validated JBAS-6744
+JAVA_OPTS="$JAVA_OPTS -Dxb.builder.useUnorderedSequence=true"
+
+# Setup the java endorsed dirs
+JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed"
+
+# Display our environment
+echo "========================================================================="
+echo ""
+echo " JBoss Bootstrap Environment"
+echo ""
+echo " JBOSS_HOME: $JBOSS_HOME"
+echo ""
+echo " JAVA: $JAVA"
+echo ""
+echo " JAVA_OPTS: $JAVA_OPTS"
+echo ""
+echo " CLASSPATH: $JBOSS_CLASSPATH"
+echo ""
+echo "========================================================================="
+echo ""
+# enable monitor mode (job control needed)
+set -m
+STATUS=10
+while [ $STATUS -eq 10 ]
+do
+# Execute the JVM
+ "$JAVA" $JAVA_OPTS \
+ -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \
+ -classpath "$JBOSS_CLASSPATH" \
+ org.jboss.Main "$@" &> /dev/null &
+ echo $! > $JBOSS_HOME/bin/pid.txt
+ fg
+ STATUS=$?
+ # if it doesn't work, you may want to take a look at this:
+ # http://developer.java.sun.com/developer/bugParade/bugs/4465334.html
+done
Deleted: projects/jboss-osgi/trunk/build/hudson/hudson-home/bin/runjboss.sh
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/jboss/bin/runjboss.sh 2009-05-08 12:00:24 UTC (rev 88424)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/bin/runjboss.sh 2009-05-08 14:30:43 UTC (rev 88441)
@@ -1,136 +0,0 @@
-#!/bin/bash
-### ====================================================================== ###
-## ##
-## JBoss Bootstrap Script ##
-## ##
-### ====================================================================== ###
-
-### $Id$ ###
-
-DIRNAME=`dirname $0`
-PROGNAME=`basename $0`
-GREP="grep"
-
-# Use the maximum available, or set MAX_FD != -1 to use that
-MAX_FD="maximum"
-
-#
-# Helper to complain.
-#
-warn() {
- echo "${PROGNAME}: $*"
-}
-
-#
-# Helper to puke.
-#
-die() {
- warn $*
- exit 1
-}
-
-# Setup JBOSS_HOME
-if [ "x$JBOSS_HOME" = "x" ]; then
- # get the full path (without any relative bits)
- JBOSS_HOME=`cd $DIRNAME/..; pwd`
-fi
-export JBOSS_HOME
-
-# Read an optional running configuration file
-if [ "x$RUN_CONF" = "x" ]; then
- RUN_CONF="$JBOSS_HOME/bin/run.conf"
-fi
-if [ -r "$RUN_CONF" ]; then
- . "$RUN_CONF"
-fi
-
-# Setup the JVM
-if [ "x$JAVA" = "x" ]; then
- if [ "x$JAVA_HOME" != "x" ]; then
- JAVA="$JAVA_HOME/bin/java"
- else
- JAVA="java"
- fi
-fi
-
-# Setup the classpath
-runjar="$JBOSS_HOME/bin/run.jar"
-if [ ! -f "$runjar" ]; then
- die "Missing required file: $runjar"
-fi
-JBOSS_BOOT_CLASSPATH="$runjar"
-
-# Include the JDK javac compiler for JSP pages. The default is for a Sun JDK
-# compatible distribution which JAVA_HOME points to
-if [ "x$JAVAC_JAR" = "x" ]; then
- JAVAC_JAR="$JAVA_HOME/lib/tools.jar"
-fi
-if [ ! -f "$JAVAC_JAR" ]; then
- warn "Missing file: $JAVAC_JAR"
- warn "Unexpected results may occur. Make sure JAVA_HOME points to a JDK and not a JRE."
-fi
-
-if [ "x$JBOSS_CLASSPATH" = "x" ]; then
- JBOSS_CLASSPATH="$JBOSS_BOOT_CLASSPATH:$JAVAC_JAR"
-else
- JBOSS_CLASSPATH="$JBOSS_CLASSPATH:$JBOSS_BOOT_CLASSPATH:$JAVAC_JAR"
-fi
-
-# If -server not set in JAVA_OPTS, set it, if supported
-SERVER_SET=`echo $JAVA_OPTS | $GREP "\-server"`
-if [ "x$SERVER_SET" = "x" ]; then
-
- # Check for SUN(tm) JVM w/ HotSpot support
- if [ "x$HAS_HOTSPOT" = "x" ]; then
- HAS_HOTSPOT=`"$JAVA" -version 2>&1 | $GREP -i HotSpot`
- fi
-
- # Enable -server if we have Hotspot, unless we can't
- if [ "x$HAS_HOTSPOT" != "x" ]; then
- JAVA_OPTS="-server $JAVA_OPTS"
- fi
-fi
-
-# Setup JBoss sepecific properties
-JAVA_OPTS="-Dprogram.name=$PROGNAME $JAVA_OPTS"
-
-# Force IPv4 on Linux systems since IPv6 doesn't work correctly with jdk5 and lower
-JAVA_OPTS="$JAVA_OPTS -Djava.net.preferIPv4Stack=true"
-
-# This should be removed when JBoss configuration XML files can be validated JBAS-6744
-JAVA_OPTS="$JAVA_OPTS -Dxb.builder.useUnorderedSequence=true"
-
-# Setup the java endorsed dirs
-JBOSS_ENDORSED_DIRS="$JBOSS_HOME/lib/endorsed"
-
-# Display our environment
-echo "========================================================================="
-echo ""
-echo " JBoss Bootstrap Environment"
-echo ""
-echo " JBOSS_HOME: $JBOSS_HOME"
-echo ""
-echo " JAVA: $JAVA"
-echo ""
-echo " JAVA_OPTS: $JAVA_OPTS"
-echo ""
-echo " CLASSPATH: $JBOSS_CLASSPATH"
-echo ""
-echo "========================================================================="
-echo ""
-# enable monitor mode (job control needed)
-set -m
-STATUS=10
-while [ $STATUS -eq 10 ]
-do
-# Execute the JVM
- "$JAVA" $JAVA_OPTS \
- -Djava.endorsed.dirs="$JBOSS_ENDORSED_DIRS" \
- -classpath "$JBOSS_CLASSPATH" \
- org.jboss.Main "$@" &> /dev/null &
- echo $! > $JBOSS_HOME/bin/jboss.pid
- fg
- STATUS=$?
- # if it doesn't work, you may want to take a look at this:
- # http://developer.java.sun.com/developer/bugParade/bugs/4465334.html
-done
Copied: projects/jboss-osgi/trunk/build/hudson/hudson-home/bin/runtime.sh (from rev 88424, projects/jboss-osgi/trunk/build/hudson/jboss/bin/jboss.sh)
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/bin/runtime.sh (rev 0)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/bin/runtime.sh 2009-05-08 14:30:43 UTC (rev 88441)
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+PROGNAME=`basename $0`
+DIRNAME=`dirname $0`
+RUNTIME_HOME="$1"
+BINDADDR="$3"
+CMD="$2"
+
+export RUNTIME_HOME
+
+#
+# Helper to complain.
+#
+warn() {
+ echo "$PROGNAME: $*"
+}
+
+if [ ! -f "$RUNTIME_HOME/bin/run.sh" ]; then
+ warn "Cannot find: $RUNTIME_HOME/bin/run.sh"
+ exit 1
+fi
+
+case "$CMD" in
+start)
+ # This version of run.sh obtains the pid of the JVM and saves it as jboss.pid
+ # It relies on bash specific features
+ /bin/bash $RUNTIME_HOME/bin/run.sh -b $BINDADDR &
+ ;;
+stop)
+ pidfile="$RUNTIME_HOME/bin/pid.txt"
+ if [ -f "$pidfile" ]; then
+ pid=`cat "$pidfile"`
+ echo "kill pid: $pid"
+ kill $pid
+ if [ "$?" -eq 0 ]; then
+ # process exists, wait for it to die, and force if not
+ sleep 20
+ kill -9 $pid &> /dev/null
+ fi
+ rm "$pidfile"
+ else
+ warn "No pid found!"
+ fi
+ ;;
+restart)
+ $0 stop
+ $0 start
+ ;;
+*)
+ echo "usage: $0 jboss_home (start|stop|restart|help)"
+esac
Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh 2009-05-08 14:17:08 UTC (rev 88440)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh 2009-05-08 14:30:43 UTC (rev 88441)
@@ -15,23 +15,33 @@
'jboss501')
JBOSS_BUILD=jboss-5.0.1.GA
JBOSS_ZIP=$HUDSON_HOME/../jboss/$JBOSS_BUILD.zip
- JBOSS_HOME=$WORKSPACE/$JBOSS_BUILD
- rm -rf $JBOSS_HOME; unzip -q $JBOSS_ZIP -d $WORKSPACE
+ RUNTIME_HOME=$WORKSPACE/$JBOSS_BUILD
+ RUNTIME_LOG=$RUNTIME_HOME/server/$JBOSS_SERVER/log/server.log
+ rm -rf $RUNTIME_HOME; unzip -q $JBOSS_ZIP -d $WORKSPACE
+ cp $RUNTIME_HOME/bin/run.sh $RUNTIME_HOME/bin/run.sh.org
+ cp $HUDSONDIR/bin/run-with-pid.sh $RUNTIME_HOME/bin/run.sh
;;
'jboss510')
JBOSS_BUILD=jboss-5.1.0.GA
JBOSS_ZIP=$HUDSON_HOME/../jboss/$JBOSS_BUILD.zip
- JBOSS_HOME=$WORKSPACE/$JBOSS_BUILD
- rm -rf $JBOSS_HOME; unzip -q $JBOSS_ZIP -d $WORKSPACE
+ RUNTIME_HOME=$WORKSPACE/$JBOSS_BUILD
+ RUNTIME_LOG=$RUNTIME_HOME/server/$JBOSS_SERVER/log/server.log
+ rm -rf $RUNTIME_HOME; unzip -q $JBOSS_ZIP -d $WORKSPACE
+ cp $RUNTIME_HOME/bin/run.sh $RUNTIME_HOME/bin/run.sh.org
+ cp $HUDSONDIR/bin/run-with-pid.sh $RUNTIME_HOME/bin/run.sh
;;
'jboss600')
JBOSS_BUILD=jboss-6.0.0.Alpha1
JBOSS_ZIP=$HUDSON_HOME/../jboss/$JBOSS_BUILD.zip
- JBOSS_HOME=$WORKSPACE/$JBOSS_BUILD
- rm -rf $JBOSS_HOME; unzip -q $JBOSS_ZIP -d $WORKSPACE
+ RUNTIME_HOME=$WORKSPACE/$JBOSS_BUILD
+ RUNTIME_LOG=$RUNTIME_HOME/server/$JBOSS_SERVER/log/server.log
+ rm -rf $RUNTIME_HOME; unzip -q $JBOSS_ZIP -d $WORKSPACE
+ cp $RUNTIME_HOME/bin/run.sh $RUNTIME_HOME/bin/run.sh.org
+ cp $HUDSONDIR/bin/run-with-pid.sh $RUNTIME_HOME/bin/run.sh
;;
'runtime')
- JBOSS_HOME=$DISTRODIR/auto-install-dest/runtime
+ RUNTIME_HOME=$DISTRODIR/auto-install-dest/runtime
+ RUNTIME_LOG=$RUNTIME_HOME/log/server.log
;;
*)
echo "Unsupported container: $CONTAINER"
@@ -39,7 +49,7 @@
;;
esac
-ENVIRONMENT="-Dframework=$FRAMEWORK -Dtarget.container=$CONTAINER -Djboss.home=$JBOSS_HOME -Djboss.bind.address=$JBOSS_BINDADDR"
+ENVIRONMENT="-Dframework=$FRAMEWORK -Dtarget.container=$CONTAINER -Djboss.home=$RUNTIME_HOME -Djboss.bind.address=$JBOSS_BINDADDR"
#
# Build distro
@@ -61,25 +71,25 @@
echo $JAVA_CMD; $JAVA_CMD
#
+# log dependency tree
+#
+MVN_CMD="mvn -o $ENVIRONMENT dependency:tree"
+echo $MVN_CMD; $MVN_CMD | tee $WORKSPACE/dependency-tree.txt
+
+#
# start jbossas
#
-$HUDSONDIR/jboss/bin/jboss.sh $JBOSS_HOME start $JBOSS_BINDADDR
+$HUDSONDIR/bin/runtime.sh $RUNTIME_HOME start $JBOSS_BINDADDR
# Was it successfully started?
-$HUDSONDIR/jboss/bin/http-spider.sh $JBOSS_BINDADDR:8090/jboss-osgi $WORKSPACE
+$HUDSONDIR/bin/http-spider.sh $JBOSS_BINDADDR:8090/jboss-osgi $WORKSPACE
if [ -e $WORKSPACE/spider.failed ]; then
- tail -n 200 $JBOSS_HOME/server/$JBOSS_SERVER/log/server.log
- $HUDSONDIR/jboss/bin/jboss.sh $JBOSS_HOME stop $JBOSS_BINDADDR
+ tail -n 200 $RUNTIME_LOG
+ $HUDSONDIR/bin/runtime.sh $RUNTIME_HOME stop
exit 1
fi
#
-# log dependency tree
-#
-MVN_CMD="mvn -o $ENVIRONMENT dependency:tree"
-echo $MVN_CMD; $MVN_CMD | tee $WORKSPACE/dependency-tree.txt
-
-#
# execute tests
#
MVN_CMD="mvn -o -fae $ENVIRONMENT test"
@@ -90,9 +100,7 @@
#
# stop jbossas
#
-$HUDSONDIR/jboss/bin/jboss.sh $JBOSS_HOME stop
-cp $JBOSS_HOME/server/$JBOSS_SERVER/log/boot.log $WORKSPACE/jboss-boot.log
-cp $JBOSS_HOME/server/$JBOSS_SERVER/log/server.log $WORKSPACE/jboss-server.log
+$HUDSONDIR/bin/runtime.sh $RUNTIME_HOME stop
#
# copy test.log to workspace
17 years, 2 months
- 1
- 0
JBoss-OSGI SVN: r88430 - in projects/jboss-osgi/trunk: build/distribution/runtime/conf and 9 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-05-08 09:28:39 -0400 (Fri, 08 May 2009)
New Revision: 88430
Added:
projects/jboss-osgi/trunk/build/distribution/runtime/conf/jboss-osgi-equinox.properties
projects/jboss-osgi/trunk/build/distribution/runtime/conf/jboss-osgi-felix.properties
projects/jboss-osgi/trunk/build/distribution/runtime/conf/jboss-osgi-knopflerfish.properties
projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/java/org/jboss/osgi/knopflerfish/framework/
projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/java/org/jboss/osgi/knopflerfish/framework/KnopflerfishIntegration.java
Removed:
projects/jboss-osgi/trunk/build/distribution/runtime/conf/jboss-osgi-framework.properties
projects/jboss-osgi/trunk/build/distribution/scripts/antrun-runtime.xml
projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/java/org/jboss/osgi/knopflerfish/KnopflerfishIntegration.java
Modified:
projects/jboss-osgi/trunk/build/distribution/pom.xml
projects/jboss-osgi/trunk/build/distribution/scripts/antrun-installer.xml
projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml
projects/jboss-osgi/trunk/runtime/equinox/src/main/java/org/jboss/osgi/equinox/framework/EquinoxIntegration.java
projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml
projects/jboss-osgi/trunk/runtime/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java
projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/osgi-deployers-jboss-beans.xml
projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/java/org/jboss/test/osgi/knopflerfish/SystemBundleTestCase.java
Log:
Switch to new runtime
Modified: projects/jboss-osgi/trunk/build/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-05-08 13:28:23 UTC (rev 88429)
+++ projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-05-08 13:28:39 UTC (rev 88430)
@@ -260,20 +260,6 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>runtime</id>
- <phase>package</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <property name="jboss501.home" value="${jboss501.home}" />
- <property name="project.version" value="${project.version}" />
- <ant antfile="scripts/antrun-runtime.xml" target="build-runtime" />
- </tasks>
- </configuration>
- </execution>
- <execution>
<id>izpack</id>
<phase>package</phase>
<goals>
Added: projects/jboss-osgi/trunk/build/distribution/runtime/conf/jboss-osgi-equinox.properties
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/runtime/conf/jboss-osgi-equinox.properties (rev 0)
+++ projects/jboss-osgi/trunk/build/distribution/runtime/conf/jboss-osgi-equinox.properties 2009-05-08 13:28:39 UTC (rev 88430)
@@ -0,0 +1,78 @@
+#
+# Properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider
+#
+# $Id$
+#
+
+# The OSGiFramework implementation
+org.jboss.osgi.spi.framework.impl=org.jboss.osgi.equinox.framework.EquinoxIntegration
+
+# Properties to configure the Framework
+org.osgi.framework.storage=${osgi.home}/data/osgi-store
+org.osgi.framework.storage.clean=onFirstInit
+
+# HTTP Service Port
+org.osgi.service.http.port=8090
+
+# Config Admin Service
+felix.cm.dir=${osgi.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
+
+# Extra System Packages
+org.osgi.framework.system.packages.extra=\
+ org.jboss.logging, \
+ org.jboss.net.protocol, \
+ org.jboss.osgi.spi, \
+ org.jboss.osgi.spi.logging, \
+ org.jboss.osgi.spi.management, \
+ org.jboss.virtual, \
+ org.jboss.virtual.plugins.registry, \
+ org.jboss.virtual.plugins.context.jar, \
+ org.jboss.virtual.plugins.vfs.helpers, \
+ org.jboss.virtual.protocol, \
+ org.apache.log4j, \
+ org.jboss.util, \
+ org.jboss.util.id, \
+ org.jboss.util.threadpool, \
+ org.jboss.util.propertyeditor
+
+# These are needed by jboss-remoting
+# org.apache.log4j, \
+# org.jboss.util, \
+# org.jboss.util.id, \
+# org.jboss.util.threadpool, \
+# org.jboss.util.propertyeditor
+
+# Bundles that need to be installed with the Framework automatically
+org.jboss.osgi.spi.framework.autoInstall=\
+ file://${osgi.home}/bundles/org.eclipse.osgi.services.jar
+
+# Bundles that need to be started automatically
+org.jboss.osgi.spi.framework.autoStart=\
+ file://${osgi.home}/bundles/org.apache.felix.log.jar \
+ file://${osgi.home}/bundles/apache-xerces-bundle.jar \
+ file://${osgi.home}/bundles/jboss-common-core-bundle.jar \
+ file://${osgi.home}/bundles/jaxb-bundle.jar \
+ file://${osgi.home}/bundles/jbossxb-bundle.jar \
+ file://${osgi.home}/bundles/jboss-osgi-common.jar \
+ file://${osgi.home}/bundles/jboss-osgi-logging.jar \
+ file://${osgi.home}/bundles/jboss-osgi-jndi.jar \
+ file://${osgi.home}/bundles/jboss-osgi-jmx.jar \
+ file://${osgi.home}/bundles/jboss-osgi-microcontainer.jar \
+ file://${osgi.home}/bundles/org.apache.felix.metatype.jar \
+ file://${osgi.home}/bundles/org.apache.felix.configadmin.jar \
+ file://${osgi.home}/bundles/org.apache.felix.http.jetty.jar \
+ file://${osgi.home}/bundles/jboss-osgi-webconsole.jar
Property changes on: projects/jboss-osgi/trunk/build/distribution/runtime/conf/jboss-osgi-equinox.properties
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Copied: projects/jboss-osgi/trunk/build/distribution/runtime/conf/jboss-osgi-felix.properties (from rev 88426, projects/jboss-osgi/trunk/build/distribution/runtime/conf/jboss-osgi-framework.properties)
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/runtime/conf/jboss-osgi-felix.properties (rev 0)
+++ projects/jboss-osgi/trunk/build/distribution/runtime/conf/jboss-osgi-felix.properties 2009-05-08 13:28:39 UTC (rev 88430)
@@ -0,0 +1,78 @@
+#
+# Properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider
+#
+# $Id: $
+#
+
+# The OSGiFramework implementation
+org.jboss.osgi.spi.framework.impl=org.jboss.osgi.felix.framework.FelixIntegration
+
+# Properties to configure the Framework
+org.osgi.framework.storage=${osgi.home}/data/osgi-store
+org.osgi.framework.storage.clean=onFirstInit
+
+# HTTP Service Port
+org.osgi.service.http.port=8090
+
+# Config Admin Service
+felix.cm.dir=${osgi.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
+
+# Extra System Packages
+org.osgi.framework.system.packages.extra=\
+ org.jboss.logging, \
+ org.jboss.net.protocol, \
+ org.jboss.osgi.spi, \
+ org.jboss.osgi.spi.logging, \
+ org.jboss.osgi.spi.management, \
+ org.jboss.virtual, \
+ org.jboss.virtual.plugins.registry, \
+ org.jboss.virtual.plugins.context.jar, \
+ org.jboss.virtual.plugins.vfs.helpers, \
+ org.jboss.virtual.protocol, \
+ org.apache.log4j, \
+ org.jboss.util, \
+ org.jboss.util.id, \
+ org.jboss.util.threadpool, \
+ org.jboss.util.propertyeditor
+
+# These are needed by jboss-remoting
+# org.apache.log4j, \
+# org.jboss.util, \
+# org.jboss.util.id, \
+# org.jboss.util.threadpool, \
+# org.jboss.util.propertyeditor
+
+# Bundles that need to be installed with the Framework automatically
+org.jboss.osgi.spi.framework.autoInstall=\
+ file://${osgi.home}/bundles/org.osgi.compendium.jar
+
+# Bundles that need to be started automatically
+org.jboss.osgi.spi.framework.autoStart=\
+ file://${osgi.home}/bundles/org.apache.felix.log.jar \
+ file://${osgi.home}/bundles/apache-xerces-bundle.jar \
+ file://${osgi.home}/bundles/jboss-common-core-bundle.jar \
+ file://${osgi.home}/bundles/jaxb-bundle.jar \
+ file://${osgi.home}/bundles/jbossxb-bundle.jar \
+ file://${osgi.home}/bundles/jboss-osgi-common.jar \
+ file://${osgi.home}/bundles/jboss-osgi-logging.jar \
+ file://${osgi.home}/bundles/jboss-osgi-jndi.jar \
+ file://${osgi.home}/bundles/jboss-osgi-jmx.jar \
+ file://${osgi.home}/bundles/jboss-osgi-microcontainer.jar \
+ file://${osgi.home}/bundles/org.apache.felix.metatype.jar \
+ file://${osgi.home}/bundles/org.apache.felix.configadmin.jar \
+ file://${osgi.home}/bundles/org.apache.felix.http.jetty.jar \
+ file://${osgi.home}/bundles/jboss-osgi-webconsole.jar
Deleted: projects/jboss-osgi/trunk/build/distribution/runtime/conf/jboss-osgi-framework.properties
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/runtime/conf/jboss-osgi-framework.properties 2009-05-08 13:28:23 UTC (rev 88429)
+++ projects/jboss-osgi/trunk/build/distribution/runtime/conf/jboss-osgi-framework.properties 2009-05-08 13:28:39 UTC (rev 88430)
@@ -1,78 +0,0 @@
-#
-# Properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider
-#
-# $Id: $
-#
-
-# The OSGiFramework implementation
-org.jboss.osgi.spi.framework.impl=org.jboss.osgi.felix.framework.FelixIntegration
-
-# Properties to configure the Framework
-org.osgi.framework.storage=${osgi.home}/data/osgi-store
-org.osgi.framework.storage.clean=onFirstInit
-
-# HTTP Service Port
-org.osgi.service.http.port=8090
-
-# Config Admin Service
-felix.cm.dir=${osgi.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
-
-# Extra System Packages
-org.osgi.framework.system.packages.extra=\
- org.jboss.logging, \
- org.jboss.net.protocol, \
- org.jboss.osgi.spi, \
- org.jboss.osgi.spi.logging, \
- org.jboss.osgi.spi.management, \
- org.jboss.virtual, \
- org.jboss.virtual.plugins.registry, \
- org.jboss.virtual.plugins.context.jar, \
- org.jboss.virtual.plugins.vfs.helpers, \
- org.jboss.virtual.protocol, \
- org.apache.log4j, \
- org.jboss.util, \
- org.jboss.util.id, \
- org.jboss.util.threadpool, \
- org.jboss.util.propertyeditor
-
-# These are needed by jboss-remoting
-# org.apache.log4j, \
-# org.jboss.util, \
-# org.jboss.util.id, \
-# org.jboss.util.threadpool, \
-# org.jboss.util.propertyeditor
-
-# Bundles that need to be installed with the Framework automatically
-org.jboss.osgi.spi.framework.autoInstall=\
- file://${osgi.home}/bundles/org.osgi.compendium.jar
-
-# Bundles that need to be started automatically
-org.jboss.osgi.spi.framework.autoStart=\
- file://${osgi.home}/bundles/org.apache.felix.log.jar \
- file://${osgi.home}/bundles/apache-xerces-bundle.jar \
- file://${osgi.home}/bundles/jboss-common-core-bundle.jar \
- file://${osgi.home}/bundles/jaxb-bundle.jar \
- file://${osgi.home}/bundles/jbossxb-bundle.jar \
- file://${osgi.home}/bundles/jboss-osgi-common.jar \
- file://${osgi.home}/bundles/jboss-osgi-logging.jar \
- file://${osgi.home}/bundles/jboss-osgi-jndi.jar \
- file://${osgi.home}/bundles/jboss-osgi-jmx.jar \
- file://${osgi.home}/bundles/jboss-osgi-microcontainer.jar \
- file://${osgi.home}/bundles/org.apache.felix.metatype.jar \
- file://${osgi.home}/bundles/org.apache.felix.configadmin.jar \
- file://${osgi.home}/bundles/org.apache.felix.http.jetty.jar \
- file://${osgi.home}/bundles/jboss-osgi-webconsole.jar
Added: projects/jboss-osgi/trunk/build/distribution/runtime/conf/jboss-osgi-knopflerfish.properties
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/runtime/conf/jboss-osgi-knopflerfish.properties (rev 0)
+++ projects/jboss-osgi/trunk/build/distribution/runtime/conf/jboss-osgi-knopflerfish.properties 2009-05-08 13:28:39 UTC (rev 88430)
@@ -0,0 +1,78 @@
+#
+# Properties read by the org.jboss.osgi.spi.framework.PropertiesBootstrapProvider
+#
+# $Id$
+#
+
+# The OSGiFramework implementation
+org.jboss.osgi.spi.framework.impl=org.jboss.osgi.knopflerfish.framework.KnopflerfishIntegration
+
+# Properties to configure the Framework
+org.osgi.framework.storage=${osgi.home}/data/osgi-store
+org.osgi.framework.storage.clean=onFirstInit
+
+# HTTP Service Port
+org.osgi.service.http.port=8090
+
+# Config Admin Service
+felix.cm.dir=${osgi.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
+
+# Extra System Packages
+org.osgi.framework.system.packages.extra=\
+ org.jboss.logging, \
+ org.jboss.net.protocol, \
+ org.jboss.osgi.spi, \
+ org.jboss.osgi.spi.logging, \
+ org.jboss.osgi.spi.management, \
+ org.jboss.virtual, \
+ org.jboss.virtual.plugins.registry, \
+ org.jboss.virtual.plugins.context.jar, \
+ org.jboss.virtual.plugins.vfs.helpers, \
+ org.jboss.virtual.protocol, \
+ org.apache.log4j, \
+ org.jboss.util, \
+ org.jboss.util.id, \
+ org.jboss.util.threadpool, \
+ org.jboss.util.propertyeditor
+
+# These are needed by jboss-remoting
+# org.apache.log4j, \
+# org.jboss.util, \
+# org.jboss.util.id, \
+# org.jboss.util.threadpool, \
+# org.jboss.util.propertyeditor
+
+# Bundles that need to be installed with the Framework automatically
+org.jboss.osgi.spi.framework.autoInstall=\
+ file://${osgi.home}/bundles/org.osgi.compendium.jar
+
+# Bundles that need to be started automatically
+org.jboss.osgi.spi.framework.autoStart=\
+ file://${osgi.home}/bundles/org.apache.felix.log.jar \
+ file://${osgi.home}/bundles/apache-xerces-bundle.jar \
+ file://${osgi.home}/bundles/jboss-common-core-bundle.jar \
+ file://${osgi.home}/bundles/jaxb-bundle.jar \
+ file://${osgi.home}/bundles/jbossxb-bundle.jar \
+ file://${osgi.home}/bundles/jboss-osgi-common.jar \
+ file://${osgi.home}/bundles/jboss-osgi-logging.jar \
+ file://${osgi.home}/bundles/jboss-osgi-jndi.jar \
+ file://${osgi.home}/bundles/jboss-osgi-jmx.jar \
+ file://${osgi.home}/bundles/jboss-osgi-microcontainer.jar \
+ file://${osgi.home}/bundles/org.apache.felix.metatype.jar \
+ file://${osgi.home}/bundles/org.apache.felix.configadmin.jar \
+ file://${osgi.home}/bundles/org.apache.felix.http.jetty.jar \
+ file://${osgi.home}/bundles/jboss-osgi-webconsole.jar
Property changes on: projects/jboss-osgi/trunk/build/distribution/runtime/conf/jboss-osgi-knopflerfish.properties
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: projects/jboss-osgi/trunk/build/distribution/scripts/antrun-installer.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/scripts/antrun-installer.xml 2009-05-08 13:28:23 UTC (rev 88429)
+++ projects/jboss-osgi/trunk/build/distribution/scripts/antrun-installer.xml 2009-05-08 13:28:39 UTC (rev 88430)
@@ -22,14 +22,12 @@
<property name="deploy.artifacts.dir" value="${output.dir}/deploy-artifacts" />
<property name="deploy.artifacts.lib" value="${deploy.artifacts.dir}/lib" />
<property name="deploy.artifacts.resources" value="${deploy.artifacts.dir}/resources" />
- <property name="jboss.runtime.dir" value="${output.dir}/jboss-osgi-runtime-${product.version}" />
<property name="runtime.dir" value="${basedir}/runtime" />
<!-- ================================================================== -->
<!-- Initialization -->
<!-- ================================================================== -->
<target name="init">
- <available property="runtime.available" file="${jboss.runtime.dir}/bin/run.sh" type="file" />
</target>
<!-- ================================================================== -->
Deleted: projects/jboss-osgi/trunk/build/distribution/scripts/antrun-runtime.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/scripts/antrun-runtime.xml 2009-05-08 13:28:23 UTC (rev 88429)
+++ projects/jboss-osgi/trunk/build/distribution/scripts/antrun-runtime.xml 2009-05-08 13:28:39 UTC (rev 88430)
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<!-- $Id$ -->
-<project default="build-runtime" basedir="..">
-
- <!-- ================================================================== -->
- <!-- Setup -->
- <!-- ================================================================== -->
- <property name="output.dir" value="${basedir}/target" />
- <property name="jboss.overwrite.dir" value="${basedir}/src/main/etc/jboss501" />
-
- <property name="jboss.source.dir" value="${jboss501.home}" />
- <property name="jboss.source.server.dir" value="${jboss.source.dir}/server/default" />
-
- <property name="jboss.target.name" value="jboss-osgi-runtime-${project.version}" />
- <property name="jboss.target.dir" value="${output.dir}/${jboss.target.name}" />
- <property name="jboss.target.server.dir" value="${jboss.target.dir}/server/default" />
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
- <target name="init">
- <available property="jboss.source.dir.available" file="${jboss.source.dir}" type="dir"/>
- <mkdir dir="${jboss.target.dir}"/>
- </target>
-
-
- <!-- ================================================================== -->
- <!-- Distribution -->
- <!-- ================================================================== -->
- <target name="check-runtime-available" depends="init" unless="jboss.source.dir.available">
- <echo/>
- <echo>***************************************</echo>
- <echo>* *</echo>
- <echo>* Building Installer without Runtime! *</echo>
- <echo>* Please define: ${jboss501.home} *</echo>
- <echo>* *</echo>
- <echo>***************************************</echo>
- </target>
-
- <target name="build-runtime" depends="check-runtime-available" if="jboss.source.dir.available">
-
- <echo/>
- <echo message="JBoss Source: ${jboss.source.dir}"/>
- <echo message="JBoss Target: ${jboss.target.dir}"/>
- <echo/>
-
- <mkdir dir="${jboss.target.server.dir}/lib"/>
-
- <!-- BIN -->
- <copy todir="${jboss.target.dir}">
- <fileset dir="${jboss.source.dir}">
- <include name="bin/run.*"/>
- </fileset>
- </copy>
- <chmod perm="+x">
- <fileset dir="${jboss.target.dir}/bin">
- <include name="*.sh"/>
- </fileset>
- </chmod>
-
- <!-- COMMON/LIB -->
- <copy todir="${jboss.target.dir}">
- <fileset dir="${jboss.source.dir}">
- <include name="common/lib/commons-logging.jar"/>
- <include name="common/lib/jboss-bindingservice.jar"/>
- <include name="common/lib/jboss-integration.jar"/>
- <include name="common/lib/jboss-javaee.jar"/>
- <include name="common/lib/jboss-jsr88.jar"/>
- <include name="common/lib/jboss-metadata.jar"/>
- <include name="common/lib/jboss-remoting.jar"/>
- <include name="common/lib/jboss-security-spi.jar"/>
- <include name="common/lib/jboss-serialization.jar"/>
- <include name="common/lib/jbossjta-integration.jar"/>
- <include name="common/lib/jbossjta.jar"/>
- <include name="common/lib/jbosssx.jar"/>
- <include name="common/lib/jbossts-common.jar"/>
- <include name="common/lib/jboss.jar"/>
- <include name="common/lib/jmx-adaptor-plugin.jar"/>
- <include name="common/lib/jnpserver.jar"/>
- <include name="common/lib/log4j.jar"/>
- </fileset>
- </copy>
-
- <!-- LIB -->
- <copy todir="${jboss.target.dir}">
- <fileset dir="${jboss.source.dir}">
- <include name="lib/endorsed/activation.jar"/>
- <include name="lib/endorsed/jaxb-api.jar"/>
- <include name="lib/endorsed/resolver.jar"/>
- <include name="lib/endorsed/serializer.jar"/>
- <include name="lib/endorsed/stax-api.jar"/>
- <include name="lib/endorsed/xalan.jar"/>
- <include name="lib/endorsed/xercesImpl.jar"/>
- <include name="lib/concurrent.jar"/>
- <include name="lib/dom4j.jar"/>
- <include name="lib/javassist.jar"/>
- <include name="lib/jaxb-impl.jar"/>
- <include name="lib/jboss-aop-asintegration-core.jar"/>
- <include name="lib/jboss-aop-asintegration-jmx.jar"/>
- <include name="lib/jboss-aop-asintegration-mc.jar"/>
- <include name="lib/jboss-aop-jboss5.jar"/>
- <include name="lib/jboss-aop-mc-int.jar"/>
- <include name="lib/jboss-aop.jar"/>
- <include name="lib/jboss-bootstrap.jar"/>
- <include name="lib/jboss-classloader.jar"/>
- <include name="lib/jboss-classloading-spi.jar"/>
- <include name="lib/jboss-classloading-vfs.jar"/>
- <include name="lib/jboss-classloading.jar"/>
- <include name="lib/jboss-common-core.jar"/>
- <include name="lib/jboss-dependency.jar"/>
- <include name="lib/jboss-deployers-client-spi.jar"/>
- <include name="lib/jboss-deployers-client.jar"/>
- <include name="lib/jboss-deployers-core-spi.jar"/>
- <include name="lib/jboss-deployers-core.jar"/>
- <include name="lib/jboss-deployers-impl.jar"/>
- <include name="lib/jboss-deployers-spi.jar"/>
- <include name="lib/jboss-deployers-structure-spi.jar"/>
- <include name="lib/jboss-deployers-vfs-spi.jar"/>
- <include name="lib/jboss-deployers-vfs.jar"/>
- <include name="lib/jboss-j2se.jar"/>
- <include name="lib/jboss-jmx.jar"/>
- <include name="lib/jboss-kernel.jar"/>
- <include name="lib/jboss-logging-jdk.jar"/>
- <include name="lib/jboss-logging-log4j.jar"/>
- <include name="lib/jboss-logging-spi.jar"/>
- <include name="lib/jboss-managed.jar"/>
- <include name="lib/jboss-mbeans.jar"/>
- <include name="lib/jboss-mdr.jar"/>
- <include name="lib/jboss-metatype.jar"/>
- <include name="lib/jboss-profileservice-spi.jar"/>
- <include name="lib/jboss-reflect.jar"/>
- <include name="lib/jboss-system-jmx.jar"/>
- <include name="lib/jboss-system.jar"/>
- <include name="lib/jboss-vfs.jar"/>
- <include name="lib/jboss-xml-binding.jar"/>
- <include name="lib/log4j-boot.jar"/>
- <include name="lib/trove.jar"/>
- <include name="lib/wstx.jar"/>
- </fileset>
- </copy>
-
- <!-- CONF -->
- <copy todir="${jboss.target.server.dir}">
- <fileset dir="${jboss.source.server.dir}">
- <include name="conf/bootstrap/aop.xml"/>
- <include name="conf/bootstrap/bindings.xml"/>
- <include name="conf/bootstrap/classloader.xml"/>
- <include name="conf/bootstrap/deployers.xml"/>
- <include name="conf/bootstrap/jmx.xml"/>
- <include name="conf/bootstrap/profile.xml"/>
- <include name="conf/bootstrap/vfs.xml"/>
- <include name="conf/xmdesc/ClientUserTransaction-xmbean.xml"/>
- <include name="conf/xmdesc/Log4jService-xmbean.xml"/>
- <include name="conf/xmdesc/NamingBean-xmbean.xml"/>
- <include name="conf/xmdesc/NamingService-xmbean.xml"/>
- <include name="conf/xmdesc/org.jboss.deployment.JARDeployer-xmbean.xml"/>
- <include name="conf/xmdesc/org.jboss.deployment.MainDeployer-xmbean.xml"/>
- <include name="conf/java.policy"/>
- <include name="conf/jbossjta-properties.xml"/>
- <include name="conf/jndi.properties"/>
- </fileset>
- <fileset dir="${jboss.overwrite.dir}/server">
- <include name="conf/bootstrap.xml"/>
- <include name="conf/jboss-log4j.xml"/>
- <include name="conf/jboss-service.xml"/>
- </fileset>
- </copy>
-
- <!-- DEPLOY -->
- <copy todir="${jboss.target.server.dir}">
- <fileset dir="${jboss.source.server.dir}">
- <include name="deploy/jmx-remoting.sar/META-INF/jboss-service.xml"/>
- <include name="deploy/jmx-remoting.sar/jbossas-jmx-remoting.jar"/>
- <include name="deploy/hdscanner-jboss-beans.xml"/>
- <include name="deploy/jmx-invoker-service.xml"/>
- <include name="deploy/legacy-invokers-service.xml"/>
- <include name="deploy/remoting-jboss-beans.xml"/>
- <include name="deploy/transaction-jboss-beans.xml"/>
- <include name="deploy/transaction-service.xml"/>
- <include name="deploy/vfs-jboss-beans.xml"/>
- </fileset>
- </copy>
-
- <!-- DEPLOYERS
- <copy todir="${jboss.target.server.dir}">
- <fileset dir="${jboss.source.server.dir}">
- </fileset>
- </copy>
- -->
-
- <!-- OSGi
- <copy todir="${jboss.target.server.dir}">
- <fileset dir="${jboss.source.server.dir}">
- <include name="deploy/osgi/**"/>
- <include name="deployers/osgi.deployer/**"/>
- </fileset>
- </copy>
- -->
-
- <!-- ZIP the Runtime distribution -->
- <zip destfile="${jboss.target.dir}.zip" basedir="${output.dir}" includes="${jboss.target.name}/**"/>
-
- </target>
-
- <!-- ================================================================== -->
- <!-- Miscelaneous -->
- <!-- ================================================================== -->
- <target name="clean" depends="init">
- <delete dir="${jboss.target.dir}"/>
- </target>
-
-</project>
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml 2009-05-08 13:28:23 UTC (rev 88429)
+++ projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml 2009-05-08 13:28:39 UTC (rev 88430)
@@ -67,10 +67,6 @@
<name>jbossSelection</name>
<value>jboss600</value>
</condition>
- <condition type="variable" id="installRuntime">
- <name>runtime.available</name>
- <value>true</value>
- </condition>
</conditions>
<!-- Panels -->
@@ -151,33 +147,32 @@
********************************
-->
- <pack name="JBossOSGi Runtime" required="no" preselected="yes" condition="installRuntime">
+ <pack name="JBossOSGi Runtime" required="no" preselected="yes">
- <description>Standalone JBossOSGi Runtime based on JBossAS</description>
+ <description>Standalone JBossOSGi Runtime</description>
- <!-- START: EXPERIMENTAL RUNTIME ****************************************************************** -->
-
<!-- JBossOSGi Bin -->
- <fileset dir="@{runtime.dir}/bin" targetdir="$INSTALL_PATH/runtime-new/bin" override="true"/>
- <executable targetfile="$INSTALL_PATH/runtime-new/bin/run.sh" stage="never" keep="true"/>
+ <fileset dir="@{runtime.dir}/bin" targetdir="$INSTALL_PATH/runtime/bin" override="true"/>
+ <executable targetfile="$INSTALL_PATH/runtime/bin/run.sh" stage="never" keep="true"/>
<!-- JBossOSGi conf -->
- <fileset dir="@{runtime.dir}/conf" targetdir="$INSTALL_PATH/runtime-new/conf" override="true"/>
+ <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 -->
- <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime-new/lib" override="true">
+ <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/lib" override="true">
<include name="jboss-common-core.jar" />
<include name="jboss-logging-spi.jar" />
<include name="jboss-logging-log4j.jar" />
- <include name="jboss-osgi-runtime-felix.jar" />
<include name="jboss-osgi-spi.jar" />
<include name="jboss-vfs.jar" />
<include name="log4j.jar" />
- <include name="org.apache.felix.framework.jar" />
</fileset>
<!-- JBossOSGi Bundles -->
- <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime-new/bundles" override="true">
+ <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/bundles" override="true">
<include name="apache-xerces-bundle.jar" />
<include name="jaxb-bundle.jar" />
<include name="jbossxb-bundle.jar" />
@@ -192,71 +187,43 @@
<include name="org.apache.felix.http.jetty.jar" />
<include name="org.apache.felix.log.jar" />
<include name="org.apache.felix.metatype.jar" />
- <include name="org.osgi.compendium.jar" />
</fileset>
- <!-- END: EXPERIMENTAL RUNTIME ****************************************************************** -->
-
- <!-- JBossOSGi Runtime -->
- <fileset dir="@{jboss.runtime.dir}" targetdir="$INSTALL_PATH/runtime" override="true"/>
- <executable targetfile="$INSTALL_PATH/runtime/bin/run.sh" stage="never" keep="true"/>
-
- <!-- JBossOSGi Runtime deployers/osgi.deployer -->
- <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer" override="true">
- <include name="jboss-osgi-runtime-deployer.jar" />
- <include name="jboss-osgi-spi.jar" />
- </fileset>
-
- <!-- JBossOSGi Runtime deploy/osgi -->
- <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/default/deploy/osgi" override="true">
- <include name="org.apache.felix.configadmin.jar" />
- <include name="org.apache.felix.http.jetty.jar" />
- <include name="org.apache.felix.log.jar" />
- <include name="org.apache.felix.metatype.jar" />
- <include name="jboss-osgi-common.jar" />
- <include name="jboss-osgi-logging.jar" />
- <include name="jboss-osgi-webconsole.jar" />
- </fileset>
-
<!-- Felix Integration -->
- <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer" override="true">
+ <!-- condition="isFelix" -->
+ <singlefile src="@{runtime.dir}/conf/jboss-osgi-felix.properties" target="$INSTALL_PATH/runtime/conf/jboss-osgi-framework.properties" override="true"/>
+ <fileset 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" />
- <include name="org.osgi.core.jar" />
</fileset>
- <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/resources/jboss-osgi-runtime-felix" targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer/META-INF" override="true">
- <include name="osgi-deployers-jboss-beans.xml" />
- </fileset>
- <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/default/deploy/osgi" override="true">
+ <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/bundles" override="true">
<include name="org.osgi.compendium.jar" />
</fileset>
- <!-- Equinox Integration -->
+ <!-- Equinox Integration
- <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer" override="true">
+ <singlefile condition="isEquinox" src="@{runtime.dir}/conf/jboss-osgi-equinox.properties" target="$INSTALL_PATH/runtime/conf/jboss-osgi-framework.properties" override="true"/>
+ <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/lib" override="true">
<include name="jboss-osgi-runtime-equinox.jar" />
<include name="org.eclipse.osgi.jar" />
</fileset>
- <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/resources/jboss-osgi-runtime-equinox" targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer/META-INF" override="true">
- <include name="osgi-deployers-jboss-beans.xml" />
- </fileset>
- <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/default/deploy/osgi" override="true">
+ <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/bundles" override="true">
<include name="org.eclipse.osgi.services.jar" />
</fileset>
+ -->
- <!-- Knopflerfish Integration -->
+ <!-- Knopflerfish Integration
- <fileset condition="isKnopflerfish" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer" override="true">
+ <singlefile condition="isKnopflerfish" src="@{runtime.dir}/conf/jboss-osgi-knopflerfish.properties" target="$INSTALL_PATH/runtime/conf/jboss-osgi-framework.properties" override="true"/>
+ <fileset condition="isKnopflerfish" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/lib" override="true">
<include name="jboss-osgi-runtime-knopflerfish.jar" />
<include name="org.knopflerfish.framework.jar" />
</fileset>
- <fileset condition="isKnopflerfish" dir="@{deploy.artifacts.dir}/resources/jboss-osgi-runtime-knopflerfish" targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer/META-INF" override="true">
- <include name="osgi-deployers-jboss-beans.xml" />
- </fileset>
- <fileset condition="isKnopflerfish" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/default/deploy/osgi" override="true">
+ <fileset condition="isKnopflerfish" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/bundles" override="true">
<include name="org.osgi.compendium.jar" />
</fileset>
+ -->
</pack>
Modified: projects/jboss-osgi/trunk/runtime/equinox/src/main/java/org/jboss/osgi/equinox/framework/EquinoxIntegration.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/src/main/java/org/jboss/osgi/equinox/framework/EquinoxIntegration.java 2009-05-08 13:28:23 UTC (rev 88429)
+++ projects/jboss-osgi/trunk/runtime/equinox/src/main/java/org/jboss/osgi/equinox/framework/EquinoxIntegration.java 2009-05-08 13:28:39 UTC (rev 88430)
@@ -89,6 +89,7 @@
public Bundle getBundle()
{
+ assertFrameworkStart();
return framework.getBundle(0);
}
@@ -127,6 +128,19 @@
framework.launch();
}
+ private void assertFrameworkCreate()
+ {
+ if (framework == null)
+ create();
+ }
+
+ private void assertFrameworkStart()
+ {
+ assertFrameworkCreate();
+ if ((framework.getBundle(0).getState() & Bundle.ACTIVE) == 0)
+ start();
+ }
+
public void start()
{
// Get system bundle context
Modified: projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml 2009-05-08 13:28:23 UTC (rev 88429)
+++ projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml 2009-05-08 13:28:39 UTC (rev 88430)
@@ -12,17 +12,14 @@
<entry><key>osgi.install.area</key><value>${jboss.server.data.dir}/equinox</value></entry>
<entry><key>felix.cm.dir</key><value>${jboss.server.data.dir}/osgi-configadmin</value></entry>
<entry>
- <key>org.osgi.framework.system.packages</key>
+ <key>org.osgi.framework.system.packages.extra</key>
<value>
- javax.management,
- javax.xml.parsers,
org.jboss.logging,
org.jboss.osgi.spi.service,
org.jboss.osgi.spi.management,
org.osgi.framework; version=1.4,
org.osgi.service.packageadmin; version=1.2,
org.osgi.service.startlevel; version=1.1,
- org.xml.sax
</value>
</entry>
<!--
Modified: projects/jboss-osgi/trunk/runtime/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java 2009-05-08 13:28:23 UTC (rev 88429)
+++ projects/jboss-osgi/trunk/runtime/felix/src/main/java/org/jboss/osgi/felix/framework/FelixIntegration.java 2009-05-08 13:28:39 UTC (rev 88430)
@@ -93,7 +93,6 @@
public BundleContext getBundleContext()
{
- assertFrameworkStart();
return getBundle().getBundleContext();
}
Deleted: projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/java/org/jboss/osgi/knopflerfish/KnopflerfishIntegration.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/java/org/jboss/osgi/knopflerfish/KnopflerfishIntegration.java 2009-05-08 13:28:23 UTC (rev 88429)
+++ projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/java/org/jboss/osgi/knopflerfish/KnopflerfishIntegration.java 2009-05-08 13:28:39 UTC (rev 88430)
@@ -1,209 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.osgi.knopflerfish;
-
-//$Id$
-
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.jboss.logging.Logger;
-import org.jboss.osgi.spi.FrameworkException;
-import org.jboss.osgi.spi.framework.OSGiFramework;
-import org.knopflerfish.framework.Framework;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleException;
-
-/**
- * The OSGiFramework for Makewave Knopflerfish
- *
- * @author thomas.diesler(a)jboss.com
- * @since 06-Apr-2009
- */
-public class KnopflerfishIntegration implements OSGiFramework
-{
- // Provide logging
- final Logger log = Logger.getLogger(KnopflerfishIntegration.class);
-
- private Map<String, Object> properties = new HashMap<String, Object>();
- private List<URL> autoInstall = new ArrayList<URL>();
- private List<URL> autoStart = new ArrayList<URL>();
-
- private Framework framework;
-
- public Map<String, Object> getProperties()
- {
- return properties;
- }
-
- public void setProperties(Map<String, Object> props)
- {
- this.properties = props;
- }
-
- public List<URL> getAutoInstall()
- {
- return autoInstall;
- }
-
- public void setAutoInstall(List<URL> autoInstall)
- {
- this.autoInstall = autoInstall;
- }
-
- public List<URL> getAutoStart()
- {
- return autoStart;
- }
-
- public void setAutoStart(List<URL> autoStart)
- {
- this.autoStart = autoStart;
- }
-
- public Bundle getBundle()
- {
- return framework.getSystemBundleContext().getBundle();
- }
-
- public BundleContext getBundleContext()
- {
- return getBundle().getBundleContext();
- }
-
- public void create()
- {
- String implVersion = getClass().getPackage().getImplementationVersion();
- log.info("OSGi Integration Knopflerfish - " + implVersion);
-
- // Push configured props to FrameworkProperties
- Iterator<String> itKeys = properties.keySet().iterator();
- while (itKeys.hasNext())
- {
- String key = itKeys.next();
- Object value = properties.get(key);
- if (value instanceof String)
- {
- Framework.setProperty(key, (String)value);
- }
- }
-
- // Prevent a NPE when the config area is not set
- if (Framework.getProperty("org.osgi.framework.dir") == null)
- {
- String userHome = Framework.getProperty("user.home");
- Framework.setProperty("org.osgi.framework.dir", userHome + "/knopflerfish");
- }
-
- // Cannot disable REGISTERSERVICEURLHANDLER
- // https://sourceforge.net/tracker/?func=detail&aid=2737425&group_id=82798&a...
- //
- // java.lang.Error: factory already defined
- // at java.net.URL.setURLStreamHandlerFactory(URL.java:1076)
- // at org.knopflerfish.framework.Framework.<init>(Framework.java:353)
- PrintStream sysOut = System.out;
- System.setOut(new PrintStream(new ByteArrayOutputStream()));
- PrintStream sysErr = System.err;
- System.setErr(new PrintStream(new ByteArrayOutputStream()));
-
- // Init & Start the Framework
- try
- {
- framework = new Framework(null);
- framework.launch(0);
- }
- catch (RuntimeException rte)
- {
- throw rte;
- }
- catch (Exception ex)
- {
- throw new FrameworkException("Cannot initialze system bundle", ex);
- }
- finally
- {
- System.setOut(sysOut);
- System.setErr(sysErr);
- }
- }
-
- public void start()
- {
- // Get system bundle context
- BundleContext context = getBundleContext();
- if (context == null)
- throw new FrameworkException("Cannot obtain system context");
-
- Map<URL, Bundle> autoBundles = new HashMap<URL, Bundle>();
-
- // Add the autoStart bundles to autoInstall
- for (URL bundleURL : autoStart)
- {
- autoInstall.add(bundleURL);
- }
-
- // Install autoInstall bundles
- for (URL bundleURL : autoInstall)
- {
- try
- {
- Bundle bundle = context.installBundle(bundleURL.toString());
- log.info("Installed bundle: " + bundle.getSymbolicName());
- autoBundles.put(bundleURL, bundle);
- }
- catch (BundleException ex)
- {
- log.error("Cannot install bundle: " + bundleURL, ex);
- }
- }
-
- // Start autoStart bundles
- for (URL bundleURL : autoStart)
- {
- try
- {
- Bundle bundle = autoBundles.get(bundleURL);
- bundle.start();
- log.info("Started bundle: " + bundle.getSymbolicName());
- }
- catch (BundleException ex)
- {
- log.error("Cannot start bundle: " + bundleURL, ex);
- }
- }
- }
-
- public void stop()
- {
- if (framework != null)
- {
- framework.shutdown();
- }
- }
-}
\ No newline at end of file
Copied: projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/java/org/jboss/osgi/knopflerfish/framework/KnopflerfishIntegration.java (from rev 88424, projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/java/org/jboss/osgi/knopflerfish/KnopflerfishIntegration.java)
===================================================================
--- projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/java/org/jboss/osgi/knopflerfish/framework/KnopflerfishIntegration.java (rev 0)
+++ projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/java/org/jboss/osgi/knopflerfish/framework/KnopflerfishIntegration.java 2009-05-08 13:28:39 UTC (rev 88430)
@@ -0,0 +1,223 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.osgi.knopflerfish.framework;
+
+//$Id$
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.jboss.logging.Logger;
+import org.jboss.osgi.spi.FrameworkException;
+import org.jboss.osgi.spi.framework.OSGiFramework;
+import org.knopflerfish.framework.Framework;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
+
+/**
+ * The OSGiFramework for Makewave Knopflerfish
+ *
+ * @author thomas.diesler(a)jboss.com
+ * @since 06-Apr-2009
+ */
+public class KnopflerfishIntegration implements OSGiFramework
+{
+ // Provide logging
+ final Logger log = Logger.getLogger(KnopflerfishIntegration.class);
+
+ private Map<String, Object> properties = new HashMap<String, Object>();
+ private List<URL> autoInstall = new ArrayList<URL>();
+ private List<URL> autoStart = new ArrayList<URL>();
+
+ private Framework framework;
+
+ public Map<String, Object> getProperties()
+ {
+ return properties;
+ }
+
+ public void setProperties(Map<String, Object> props)
+ {
+ this.properties = props;
+ }
+
+ public List<URL> getAutoInstall()
+ {
+ return autoInstall;
+ }
+
+ public void setAutoInstall(List<URL> autoInstall)
+ {
+ this.autoInstall = autoInstall;
+ }
+
+ public List<URL> getAutoStart()
+ {
+ return autoStart;
+ }
+
+ public void setAutoStart(List<URL> autoStart)
+ {
+ this.autoStart = autoStart;
+ }
+
+ public Bundle getBundle()
+ {
+ assertFrameworkStart();
+ return framework.getSystemBundleContext().getBundle();
+ }
+
+ public BundleContext getBundleContext()
+ {
+ return getBundle().getBundleContext();
+ }
+
+ private void assertFrameworkCreate()
+ {
+ if (framework == null)
+ create();
+ }
+
+ private void assertFrameworkStart()
+ {
+ assertFrameworkCreate();
+ if ((framework.getSystemBundleContext().getBundle().getState() & Bundle.ACTIVE) == 0)
+ start();
+ }
+
+ public void create()
+ {
+ String implVersion = getClass().getPackage().getImplementationVersion();
+ log.info("OSGi Integration Knopflerfish - " + implVersion);
+
+ // Push configured props to FrameworkProperties
+ Iterator<String> itKeys = properties.keySet().iterator();
+ while (itKeys.hasNext())
+ {
+ String key = itKeys.next();
+ Object value = properties.get(key);
+ if (value instanceof String)
+ {
+ Framework.setProperty(key, (String)value);
+ }
+ }
+
+ // Prevent a NPE when the config area is not set
+ if (Framework.getProperty("org.osgi.framework.dir") == null)
+ {
+ String userHome = Framework.getProperty("user.home");
+ Framework.setProperty("org.osgi.framework.dir", userHome + "/knopflerfish");
+ }
+
+ // Cannot disable REGISTERSERVICEURLHANDLER
+ // https://sourceforge.net/tracker/?func=detail&aid=2737425&group_id=82798&a...
+ //
+ // java.lang.Error: factory already defined
+ // at java.net.URL.setURLStreamHandlerFactory(URL.java:1076)
+ // at org.knopflerfish.framework.Framework.<init>(Framework.java:353)
+ PrintStream sysOut = System.out;
+ System.setOut(new PrintStream(new ByteArrayOutputStream()));
+ PrintStream sysErr = System.err;
+ System.setErr(new PrintStream(new ByteArrayOutputStream()));
+
+ // Init & Start the Framework
+ try
+ {
+ framework = new Framework(null);
+ framework.launch(0);
+ }
+ catch (RuntimeException rte)
+ {
+ throw rte;
+ }
+ catch (Exception ex)
+ {
+ throw new FrameworkException("Cannot initialze system bundle", ex);
+ }
+ finally
+ {
+ System.setOut(sysOut);
+ System.setErr(sysErr);
+ }
+ }
+
+ public void start()
+ {
+ // Get system bundle context
+ BundleContext context = getBundleContext();
+ if (context == null)
+ throw new FrameworkException("Cannot obtain system context");
+
+ Map<URL, Bundle> autoBundles = new HashMap<URL, Bundle>();
+
+ // Add the autoStart bundles to autoInstall
+ for (URL bundleURL : autoStart)
+ {
+ autoInstall.add(bundleURL);
+ }
+
+ // Install autoInstall bundles
+ for (URL bundleURL : autoInstall)
+ {
+ try
+ {
+ Bundle bundle = context.installBundle(bundleURL.toString());
+ log.info("Installed bundle: " + bundle.getSymbolicName());
+ autoBundles.put(bundleURL, bundle);
+ }
+ catch (BundleException ex)
+ {
+ log.error("Cannot install bundle: " + bundleURL, ex);
+ }
+ }
+
+ // Start autoStart bundles
+ for (URL bundleURL : autoStart)
+ {
+ try
+ {
+ Bundle bundle = autoBundles.get(bundleURL);
+ bundle.start();
+ log.info("Started bundle: " + bundle.getSymbolicName());
+ }
+ catch (BundleException ex)
+ {
+ log.error("Cannot start bundle: " + bundleURL, ex);
+ }
+ }
+ }
+
+ public void stop()
+ {
+ if (framework != null)
+ {
+ framework.shutdown();
+ }
+ }
+}
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/osgi-deployers-jboss-beans.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/osgi-deployers-jboss-beans.xml 2009-05-08 13:28:23 UTC (rev 88429)
+++ projects/jboss-osgi/trunk/runtime/knopflerfish/src/main/resources/osgi-deployers-jboss-beans.xml 2009-05-08 13:28:39 UTC (rev 88430)
@@ -3,7 +3,7 @@
<deployment xmlns="urn:jboss:bean-deployer:2.0">
<!-- The OSGiFramework -->
- <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.knopflerfish.KnopflerfishIntegration">
+ <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.knopflerfish.framework.KnopflerfishIntegration">
<property name="properties">
<map keyClass="java.lang.String" valueClass="java.lang.String">
<entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry>
@@ -11,17 +11,14 @@
<entry><key>org.osgi.framework.dir</key><value>${jboss.server.data.dir}/knopflerfish</value></entry>
<entry><key>felix.cm.dir</key><value>${jboss.server.data.dir}/osgi-configadmin</value></entry>
<entry>
- <key>org.osgi.framework.system.packages</key>
+ <key>org.osgi.framework.system.packages.extra</key>
<value>
- javax.management,
- javax.xml.parsers,
org.jboss.logging,
org.jboss.osgi.spi.service,
org.jboss.osgi.spi.management,
org.osgi.framework; version=1.4,
org.osgi.service.packageadmin; version=1.2,
org.osgi.service.startlevel; version=1.1,
- org.xml.sax
</value>
</entry>
<!--
Modified: projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/java/org/jboss/test/osgi/knopflerfish/SystemBundleTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/java/org/jboss/test/osgi/knopflerfish/SystemBundleTestCase.java 2009-05-08 13:28:23 UTC (rev 88429)
+++ projects/jboss-osgi/trunk/runtime/knopflerfish/src/test/java/org/jboss/test/osgi/knopflerfish/SystemBundleTestCase.java 2009-05-08 13:28:39 UTC (rev 88430)
@@ -23,7 +23,7 @@
//$Id$
-import org.jboss.osgi.knopflerfish.KnopflerfishIntegration;
+import org.jboss.osgi.knopflerfish.framework.KnopflerfishIntegration;
import org.jboss.osgi.spi.framework.OSGiBootstrap;
import org.jboss.osgi.spi.framework.OSGiBootstrapProvider;
import org.jboss.osgi.spi.framework.OSGiFramework;
17 years, 2 months
- 1
- 0
JBoss-OSGI SVN: r88426 - in projects/jboss-osgi/trunk: bundle/microcontainer and 1 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-05-08 08:33:38 -0400 (Fri, 08 May 2009)
New Revision: 88426
Modified:
projects/jboss-osgi/trunk/build/distribution/runtime/conf/jboss-osgi-framework.properties
projects/jboss-osgi/trunk/bundle/microcontainer/.classpath
projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/OSGiRuntimeImpl.java
Log:
All tests pass against runtime
Modified: projects/jboss-osgi/trunk/build/distribution/runtime/conf/jboss-osgi-framework.properties
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/runtime/conf/jboss-osgi-framework.properties 2009-05-08 12:19:19 UTC (rev 88425)
+++ projects/jboss-osgi/trunk/build/distribution/runtime/conf/jboss-osgi-framework.properties 2009-05-08 12:33:38 UTC (rev 88426)
@@ -33,34 +33,46 @@
# Extra System Packages
org.osgi.framework.system.packages.extra=\
- org.jboss.logging, \
- org.jboss.osgi.spi, \
- org.jboss.osgi.spi.management, \
- org.jboss.virtual, \
- org.jboss.virtual.plugins.registry, \
- org.jboss.virtual.plugins.context.jar, \
- org.jboss.virtual.plugins.vfs.helpers, \
- org.jboss.net.protocol, \
- org.jboss.virtual.protocol
+ org.jboss.logging, \
+ org.jboss.net.protocol, \
+ org.jboss.osgi.spi, \
+ org.jboss.osgi.spi.logging, \
+ org.jboss.osgi.spi.management, \
+ org.jboss.virtual, \
+ org.jboss.virtual.plugins.registry, \
+ org.jboss.virtual.plugins.context.jar, \
+ org.jboss.virtual.plugins.vfs.helpers, \
+ org.jboss.virtual.protocol, \
+ org.apache.log4j, \
+ org.jboss.util, \
+ org.jboss.util.id, \
+ org.jboss.util.threadpool, \
+ org.jboss.util.propertyeditor
+# These are needed by jboss-remoting
+# org.apache.log4j, \
+# org.jboss.util, \
+# org.jboss.util.id, \
+# org.jboss.util.threadpool, \
+# org.jboss.util.propertyeditor
+
# Bundles that need to be installed with the Framework automatically
org.jboss.osgi.spi.framework.autoInstall=\
file://${osgi.home}/bundles/org.osgi.compendium.jar
# Bundles that need to be started automatically
org.jboss.osgi.spi.framework.autoStart=\
- file://${osgi.home}/bundles/org.apache.felix.log.jar \
- file://${osgi.home}/bundles/apache-xerces-bundle.jar \
- file://${osgi.home}/bundles/jboss-common-core-bundle.jar \
- file://${osgi.home}/bundles/jaxb-bundle.jar \
- file://${osgi.home}/bundles/jbossxb-bundle.jar \
- file://${osgi.home}/bundles/jboss-osgi-common.jar \
- file://${osgi.home}/bundles/jboss-osgi-logging.jar \
- file://${osgi.home}/bundles/jboss-osgi-jndi.jar \
- file://${osgi.home}/bundles/jboss-osgi-jmx.jar \
- file://${osgi.home}/bundles/jboss-osgi-microcontainer.jar \
- file://${osgi.home}/bundles/org.apache.felix.metatype.jar \
- file://${osgi.home}/bundles/org.apache.felix.configadmin.jar \
- file://${osgi.home}/bundles/org.apache.felix.http.jetty.jar \
- file://${osgi.home}/bundles/jboss-osgi-webconsole.jar
-
\ No newline at end of file
+ file://${osgi.home}/bundles/org.apache.felix.log.jar \
+ file://${osgi.home}/bundles/apache-xerces-bundle.jar \
+ file://${osgi.home}/bundles/jboss-common-core-bundle.jar \
+ file://${osgi.home}/bundles/jaxb-bundle.jar \
+ file://${osgi.home}/bundles/jbossxb-bundle.jar \
+ file://${osgi.home}/bundles/jboss-osgi-common.jar \
+ file://${osgi.home}/bundles/jboss-osgi-logging.jar \
+ file://${osgi.home}/bundles/jboss-osgi-jndi.jar \
+ file://${osgi.home}/bundles/jboss-osgi-jmx.jar \
+ file://${osgi.home}/bundles/jboss-osgi-microcontainer.jar \
+ file://${osgi.home}/bundles/org.apache.felix.metatype.jar \
+ file://${osgi.home}/bundles/org.apache.felix.configadmin.jar \
+ file://${osgi.home}/bundles/org.apache.felix.http.jetty.jar \
+ file://${osgi.home}/bundles/jboss-osgi-webconsole.jar
Modified: projects/jboss-osgi/trunk/bundle/microcontainer/.classpath
===================================================================
--- projects/jboss-osgi/trunk/bundle/microcontainer/.classpath 2009-05-08 12:19:19 UTC (rev 88425)
+++ projects/jboss-osgi/trunk/bundle/microcontainer/.classpath 2009-05-08 12:33:38 UTC (rev 88426)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry excluding="**" kind="src" path="src/main/resources"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/OSGiRuntimeImpl.java
===================================================================
--- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/OSGiRuntimeImpl.java 2009-05-08 12:19:19 UTC (rev 88425)
+++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/internal/OSGiRuntimeImpl.java 2009-05-08 12:33:38 UTC (rev 88426)
@@ -152,7 +152,7 @@
private void invokeMainDeployer(String method, URL archiveURL) throws Exception
{
- ObjectName oname = new ObjectName("jboss.system:service=MainDeployer");
+ ObjectName oname = new ObjectName("jboss.osgi:service=MicrocontainerService");
getMBeanServer().invoke(oname, method, new Object[] { archiveURL }, new String[] { "java.net.URL" });
}
17 years, 2 months
- 1
- 0