[jboss-osgi-commits] JBoss-OSGI SVN: r89579 - in projects/jboss-osgi/trunk: hudson/hudson-home and 1 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-05-30 18:54:03 -0400 (Sat, 30 May 2009) New Revision: 89579 Modified: projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml projects/jboss-osgi/trunk/hudson/hudson-home/command.sh projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml Log: Disable web console for equinox Modified: projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml 2009-05-30 22:22:35 UTC (rev 89578) +++ projects/jboss-osgi/trunk/distribution/src/main/resources/installer/install-definition.xml 2009-05-30 22:54:03 UTC (rev 89579) @@ -285,7 +285,6 @@ <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-webconsole.jar" /> </fileset> <!-- Felix Integration --> @@ -298,6 +297,9 @@ <fileset condition="isFelix" dir=&quot;(a){deploy.artifacts.dir}/resources/jboss-osgi-runtime-felix&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF" override="true"> <include name="osgi-deployers-jboss-beans.xml" /> </fileset> + <fileset condition="isFelix" dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true"> + <include name="jboss-osgi-webconsole.jar" /> + </fileset> <!-- Equinox Integration --> @@ -310,6 +312,11 @@ <fileset condition="isEquinox" dir=&quot;(a){deploy.artifacts.dir}/resources/jboss-osgi-runtime-equinox&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF" override="true"> <include name="osgi-deployers-jboss-beans.xml" /> </fileset> + <!-- does not work with compendium in system classpath + <fileset condition="isEquinox" dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true"> + <include name="jboss-osgi-webconsole.jar" /> + </fileset + --> <!-- Knopflerfish Integration --> @@ -321,6 +328,9 @@ <fileset condition="isKnopflerfish" dir=&quot;(a){deploy.artifacts.dir}/resources/jboss-osgi-runtime-knopflerfish&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF" override="true"> <include name="osgi-deployers-jboss-beans.xml" /> </fileset> + <fileset condition="isKnopflerfish" dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true"> + <include name="jboss-osgi-webconsole.jar" /> + </fileset> </pack> Modified: projects/jboss-osgi/trunk/hudson/hudson-home/command.sh =================================================================== --- projects/jboss-osgi/trunk/hudson/hudson-home/command.sh 2009-05-30 22:22:35 UTC (rev 89578) +++ projects/jboss-osgi/trunk/hudson/hudson-home/command.sh 2009-05-30 22:54:03 UTC (rev 89579) @@ -59,6 +59,23 @@ ;; esac +case "$FRAMEWORK" in + 'felix') + WEB_CONSOLE_ADDRESS=$JBOSS_BINDADDR:8090/jboss-osgi + ;; + 'equinox') + # Equinox OSGi Console does does not work with compendium in system classpath + WEB_CONSOLE_ADDRESS=$JBOSS_BINDADDR:8080/jmx-console + ;; + 'knopflerfish') + WEB_CONSOLE_ADDRESS=$JBOSS_BINDADDR:8090/jboss-osgi + ;; + *) + echo "Unsupported framework: $FRAMEWORK" + exit 1 + ;; +esac + ENVIRONMENT="-Dframework=$FRAMEWORK -Dtarget.container=$CONTAINER -Djboss.home=$RUNTIME_HOME -Djboss.bind.address=$JBOSS_BINDADDR" # @@ -105,7 +122,7 @@ # Was it successfully started? # if [ "$CONTAINER" != "runtime" ]; then - $HUDSONBIN/http-spider.sh $JBOSS_BINDADDR:8090/jboss-osgi $WORKSPACE + $HUDSONBIN/http-spider.sh $WEB_CONSOLE_ADDRESS $WORKSPACE if [ -e $WORKSPACE/spider.failed ]; then tail -n 200 $RUNTIME_LOG $HUDSONBIN/startup.sh $RUNTIME_HOME stop 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-30 22:22:35 UTC (rev 89578) +++ projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml 2009-05-30 22:54:03 UTC (rev 89579) @@ -26,33 +26,7 @@ <entry> <key>org.osgi.framework.system.packages</key> <value> - <!-- system --> - javax.management, - javax.xml.parsers, - org.xml.sax, - - <!-- jboss --> - org.jboss.osgi.common.log;version=1.0, - org.jboss.osgi.common.service;version=1.0, - org.jboss.osgi.jbossas.integration, - org.jboss.osgi.spi;version=1.0, - org.jboss.osgi.spi.logging;version=1.0, - org.jboss.osgi.spi.management;version=1.0, - org.jboss.osgi.spi.testing;version=1.0, - org.jboss.osgi.spi.testing.capability;version=1.0, - org.jboss.xb.binding;version=2.0, - org.jboss.xb.binding.sunday.unmarshalling;version=2.0, - - <!-- compendium --> - org.osgi.service.event;version=1.1, - org.osgi.service.http;version=1.2, - org.osgi.service.log;version=1.3, - org.osgi.util.xml;version=1.0, - - <!-- core --> - org.osgi.framework;version=1.4, - org.osgi.service.packageadmin;version=1.2, - org.osgi.service.startlevel;version=1.1, + org.osgi.service.log </value> </entry> <!-- @@ -60,24 +34,13 @@ If set to 'false' bundles must be deployed in the order that is required to start them. --> <entry><key>org.jboss.osgi.deferred.start</key><value>true</value></entry> - <!-- - Setup remote logging - --> - <entry><key>org.jboss.osgi.service.remote.log.sender</key><value>true</value></entry> - <entry><key>org.jboss.osgi.service.remote.log.host</key><value>localhost</value></entry> - <entry><key>org.jboss.osgi.service.remote.log.port</key><value>5400</value></entry> - <!-- - Husky socket connector properties - --> - <entry><key>org.jboss.osgi.husky.runtime.connector.host</key><value>${jboss.bind.address}</value></entry> - <entry><key>org.jboss.osgi.husky.runtime.connector.port</key><value>5401</value></entry> </map> + </property> <property name="autoStart"> <list elementClass="java.net.URL"> <value>${jboss.server.home.url}/deploy/osgi/org.apache.felix.log.jar</value> </list> </property> - </property> </bean> <!-- The Framework Management -->