[jboss-osgi-commits] JBoss-OSGI SVN: r86670 - in projects/jboss-osgi/trunk: build/distribution/src/main/resources/installer and 3 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-04-02 08:49:12 -0400 (Thu, 02 Apr 2009) New Revision: 86670 Added: projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml Modified: projects/jboss-osgi/trunk/build/distribution/scripts/assembly-deploy-artifacts.xml projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/user-input-spec.xml projects/jboss-osgi/trunk/build/hudson/ant.properties.example projects/jboss-osgi/trunk/build/hudson/apache-tomcat/conf/server.xml projects/jboss-osgi/trunk/build/hudson/build.xml Log: Hudson requires FilePermissions - WIP Modified: projects/jboss-osgi/trunk/build/distribution/scripts/assembly-deploy-artifacts.xml =================================================================== --- projects/jboss-osgi/trunk/build/distribution/scripts/assembly-deploy-artifacts.xml 2009-04-02 12:49:09 UTC (rev 86669) +++ projects/jboss-osgi/trunk/build/distribution/scripts/assembly-deploy-artifacts.xml 2009-04-02 12:49:12 UTC (rev 86670) @@ -37,6 +37,14 @@ </includes> <unpack>true</unpack> </dependencySet> + <dependencySet> + <outputDirectory>resources/jboss-osgi-runtime-equinox</outputDirectory> + <useStrictFiltering>true</useStrictFiltering> + <includes> + <include>*:jboss-osgi-runtime-equinox:jar:config</include> + </includes> + <unpack>true</unpack> + </dependencySet> <!-- source --> <dependencySet> 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-04-02 12:49:09 UTC (rev 86669) +++ projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml 2009-04-02 12:49:12 UTC (rev 86670) @@ -43,6 +43,14 @@ <!-- Conditions --> <conditions> + <condition type="variable" id="isFelix"> + <name>runtimeSelection</name> + <value>felix</value> + </condition> + <condition type="variable" id="isEquinox"> + <name>runtimeSelection</name> + <value>equinox</value> + </condition> <condition type="variable" id="isJBoss501"> <name>jbossSelection</name> <value>jboss501</value> @@ -144,14 +152,9 @@ <!-- JBossOSGi Runtime deployers/osgi.deployer --> <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer" override="true"> <include name="jboss-osgi-runtime-deployer.jar" /> - <include name="jboss-osgi-runtime-felix.jar" /> <include name="jboss-osgi-runtime-spi.jar" /> - <include name="org.apache.felix.framework.jar" /> <include name="org.osgi.core.jar" /> </fileset> - <fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jboss-osgi-runtime-felix&quot; targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer/META-INF" override="true"> - <include name="osgi-deployers-jboss-beans.xml" /> - </fileset> <!-- JBossOSGi Runtime deploy/osgi --> <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="$INSTALL_PATH/runtime/server/default/deploy/osgi" override="true"> @@ -164,6 +167,28 @@ <include name="jboss-osgi-service-webconsole.jar" /> </fileset> + <!-- Felix Integration --> + + <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer" override="true" condition="isFelix"> + <include name="jboss-osgi-runtime-felix.jar" /> + <include name="org.apache.felix.framework.jar" /> + </fileset> + <fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jboss-osgi-runtime-felix&quot; targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer/META-INF" + override="true" condition="isFelix"> + <include name="osgi-deployers-jboss-beans.xml" /> + </fileset> + + <!-- Equinox Integration --> + + <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer" override="true" condition="isEquinox"> + <include name="jboss-osgi-runtime-equinox.jar" /> + <include name="osgi.jar" /> + </fileset> + <fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jboss-osgi-runtime-equinox&quot; targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer/META-INF" + override="true" condition="isEquinox"> + <include name="osgi-deployers-jboss-beans.xml" /> + </fileset> + </pack> <!-- @@ -206,6 +231,28 @@ <include name="jboss-osgi-service-webconsole.jar" /> </fileset> + <!-- Felix Integration --> + + <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true" condition="isFelix"> + <include name="jboss-osgi-runtime-felix.jar" /> + <include name="org.apache.felix.framework.jar" /> + </fileset> + <fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jboss-osgi-runtime-felix&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF" + override="true" condition="isFelix"> + <include name="osgi-deployers-jboss-beans.xml" /> + </fileset> + + <!-- Equinox Integration --> + + <fileset dir=&quot;(a){deploy.artifacts.dir}/lib&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true" condition="isEquinox"> + <include name="jboss-osgi-runtime-equinox.jar" /> + <include name="org.apache.equinox.framework.jar" /> + </fileset> + <fileset dir=&quot;(a){deploy.artifacts.dir}/resources/jboss-osgi-runtime-equinox&quot; targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF" + override="true" condition="isEquinox"> + <include name="osgi-deployers-jboss-beans.xml" /> + </fileset> + </pack> </packs> Modified: projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/user-input-spec.xml =================================================================== --- projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/user-input-spec.xml 2009-04-02 12:49:09 UTC (rev 86669) +++ projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/user-input-spec.xml 2009-04-02 12:49:12 UTC (rev 86670) @@ -1,5 +1,14 @@ <userInput> <panel order="0"> + <field type="radio" variable="frameworkSelection"> + <description align="left" txt="Please choose the OSGi Framework" /> + <spec> + <choice txt="Apache Felix" value="felix" set="true"/> + <choice txt="Eclipse Equinox" value="equinox"/> + </spec> + </field> + </panel> + <panel order="1"> <createForPack name="JBossOSGi Integration" /> <field type="radio" variable="jbossSelection"> <description align="left" txt="Please choose your target server" /> @@ -13,7 +22,7 @@ <spec txt="Server:" size="15" set="default" /> </field> </panel> - <panel order="1"> + <panel order="2"> <createForPack name="JBossOSGi Integration" /> <field type="dir" align="left" variable="jbossInstallPath"> <spec txt="JBoss Home:" size="25" set="${jboss.home}" /> Modified: projects/jboss-osgi/trunk/build/hudson/ant.properties.example =================================================================== --- projects/jboss-osgi/trunk/build/hudson/ant.properties.example 2009-04-02 12:49:09 UTC (rev 86669) +++ projects/jboss-osgi/trunk/build/hudson/ant.properties.example 2009-04-02 12:49:12 UTC (rev 86670) @@ -3,9 +3,6 @@ # # $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $ -# JBoss remote repository -jboss.repository=http://repository.jboss.org - # The JBoss settings jboss.server.instance=default jboss.bind.address=127.0.0.1 @@ -34,5 +31,5 @@ hudson.smtp.host=localhost # Hudson (1.290) -apache-tomcat=5.5.20 +apache-tomcat=6.0.18 sun-hudson=2402/128862 Modified: projects/jboss-osgi/trunk/build/hudson/apache-tomcat/conf/server.xml =================================================================== --- projects/jboss-osgi/trunk/build/hudson/apache-tomcat/conf/server.xml 2009-04-02 12:49:09 UTC (rev 86669) +++ projects/jboss-osgi/trunk/build/hudson/apache-tomcat/conf/server.xml 2009-04-02 12:49:12 UTC (rev 86670) @@ -1,57 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> <Server port=&quot;@hudson.admin.port(a)&quot; shutdown="SHUTDOWN"> - - <!-- Comment these entries out to disable JMX MBeans support used for the - administration web application --> - <Listener className="org.apache.catalina.core.AprLifecycleListener"/> - <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener"/> - <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"/> - <Listener className="org.apache.catalina.storeconfig.StoreConfigLifecycleListener"/> - - <!-- Global JNDI resources --> + <GlobalNamingResources> - - <!-- Test entry for demonstration purposes --> - <Environment name="simpleValue" type="java.lang.Integer" value="30"/> - - <!-- Editable user database that can also be used by - UserDatabaseRealm to authenticate users --> - <Resource name="UserDatabase" auth="Container" type="org.apache.catalina.UserDatabase" description="User database that can be updated and saved" - factory="org.apache.catalina.users.MemoryUserDatabaseFactory" pathname="conf/tomcat-users.xml"/> - + <!-- Used by Manager webapp --> + <Resource + name="UserDatabase" auth="Container" + type="org.apache.catalina.UserDatabase" + description="User database that can be updated and saved" + factory="org.apache.catalina.users.MemoryUserDatabaseFactory" + pathname="conf/tomcat-users.xml" /> </GlobalNamingResources> - - <!-- Define the Tomcat Stand-Alone Service --> + <Service name="Catalina"> - - <!-- Define a non-SSL HTTP/1.1 Connector on port 8080 --> - <Connector port=&quot;@hudson.http.port(a)&quot; maxHttpHeaderSize="8192" maxThreads="150" - minSpareThreads="25" maxSpareThreads="75" - enableLookups="false" redirectPort="8443" acceptCount="100" - connectionTimeout="20000" disableUploadTimeout="true"/> - - <!-- Define the top level container in our container hierarchy --> + + <Connector port=&quot;@hudson.http.port(a)&quot; /> + + <!-- This is here for compatibility only, not required --> + <Connector port="8009" protocol="AJP/1.3" /> + <Engine name="Catalina" defaultHost="localhost"> - - <!-- This Realm uses the UserDatabase configured in the global JNDI - resources under the key "UserDatabase". Any edits - that are performed against this UserDatabase are immediately - available for use by the Realm. --> - <Realm className="org.apache.catalina.realm.UserDatabaseRealm" resourceName="UserDatabase"/> - - <!-- Define the default virtual host - Note: XML Schema validation will not work with Xerces 2.2. - --> - <Host name="localhost" appBase="webapps" unpackWARs="true" autoDeploy="true" xmlValidation="false" xmlNamespaceAware="false"> - - <Context path="/hudson"> - <Environment description="" name="HUDSON_HOME" type="java.lang.String" value=&quot;@hudson.home(a)&quot;/&gt; - </Context> - - </Host> - + <Realm className="org.apache.catalina.realm.UserDatabaseRealm" resourceName="UserDatabase" /> + <Host name="localhost" appBase="webapps"/> </Engine> </Service> - -</Server> \ No newline at end of file +</Server> Modified: projects/jboss-osgi/trunk/build/hudson/build.xml =================================================================== --- projects/jboss-osgi/trunk/build/hudson/build.xml 2009-04-02 12:49:09 UTC (rev 86669) +++ projects/jboss-osgi/trunk/build/hudson/build.xml 2009-04-02 12:49:12 UTC (rev 86670) @@ -22,11 +22,11 @@ <!-- ================================================================== --> <macrodef name="copyjobs"> <sequential> - <copyjob prefix="${hudson.job.prefix}-" job="Container-Matrix"/> - <copyjob prefix="${hudson.job.prefix}-" job="Container-JDK1.5"/> - <copyjob prefix="${hudson.job.prefix}-" job="Container-JDK1.6"/> - <copyjob prefix="" job="JBoss-5.1.0"/> - <copyjob prefix="" job="JBoss-6.0.0"/> + <copyjob index="0" prefix="${hudson.job.prefix}" job="Container-Matrix"/> + <copyjob index="1" prefix="${hudson.job.prefix}" job="Container-JDK1.5"/> + <copyjob index="2" prefix="${hudson.job.prefix}" job="Container-JDK1.6"/> + <copyjob index="3" prefix="" job="JBoss-5.1.0"/> + <copyjob index="4" prefix="" job="JBoss-6.0.0"/> </sequential> </macrodef> @@ -83,7 +83,7 @@ <copy todir="${hudson.root}/jboss" file="${thirdparty.dir}/jboss-5.0.1.GA.zip"/> </target> <target name="get-tomcat" depends="init-thirdparty" unless="apache.tomcat.available"> - <get src="${jboss.repository}/apache-tomcat/${apache-tomcat}/lib/apache-tomcat.zip" dest="${thirdparty.dir}/apache-tomcat.zip" usetimestamp="true" verbose="true"/> + <get src="http://www.apache.org/dist/tomcat/tomcat-6/v${apache-tomcat}/bi... dest="${thirdparty.dir}/apache-tomcat.zip" usetimestamp="true" verbose="true"/> </target> <target name="get-hudson" depends="init-thirdparty" unless="sun.hudson.available"> <get src="https://hudson.dev.java.net/files/documents/${sun-hudson}/hudso... dest="${thirdparty.dir}/hudson.war" usetimestamp="true" verbose="true"/> @@ -144,6 +144,13 @@ <filter token="hudson.home" value="${hudson.home}"/> </filterset> </copy> + <concat destfile="${hudson.dir}/apache-tomcat/conf/catalina.policy" append="true"> + grant { + permission java.io.FilePermission "/tmp", "read"; + permission java.io.FilePermission "/tmp/*", "read"; + permission java.io.FilePermission "/tmp/surefire*", "read"; + }; + </concat> <!-- Configure Hudson Home --> <copy todir="${hudson.home}" overwrite="false"> @@ -190,7 +197,7 @@ <fail message="unset JBOSS_REPOSITORY=${env.JBOSS_REPOSITORY}" if="env.JBOSS_REPOSITORY"/> <exec executable="${hudson.tomcat}/bin/catalina.sh" failonerror="true" output="${hudson.target.dir}/hudson.log"> - <env key="CATALINA_OPTS" value="-Xmx512m -Djava.awt.headless=true"/> + <env key="CATALINA_OPTS" value="-Xmx512m -DHUDSON_HOME=${hudson.home} -Djava.awt.headless=true"/> <arg line="start"/> </exec> @@ -204,10 +211,19 @@ </target> <macrodef name="copyjob"> + <attribute name="index"/> <attribute name="prefix"/> <attribute name="job"/> <sequential> - <copy todir="${hudson.home}/jobs/@{prefix}@{job}" overwrite="true"> + <condition property="job.prefix.@{index}" value="@{prefix}-" else=""> + <and> + <available file="${hudson.home}/jobs/@{job}" type="dir"/> + <not> + <equals arg1="@{prefix}" arg2=""/> + </not> + </and> + </condition> + <copy todir="${hudson.home}/jobs/${job.prefix.@{index}}@{job}" overwrite="true"> <fileset dir="${hudson.dir}/hudson-home/jobs/@{job}"> <include name="config.xml"/> </fileset> Added: 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 (rev 0) +++ projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml 2009-04-02 12:49:12 UTC (rev 86670) @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<deployment xmlns="urn:jboss:bean-deployer:2.0"> + + <!-- The OSGiFramework --> + <bean name="jboss.osgi:service=Framework" class="org.jboss.osgi.equinox.framework.EquinoxIntegration"> + <property name="frameworkProperties"> + <map keyClass="java.lang.String" valueClass="java.lang.String"> + <entry><key>org.osgi.framework.storage.clean</key><value>onFirstInit</value></entry> + </map> + </property> + </bean> + + <!-- The Framework Management --> + <bean name="jboss.osgi:service=ManagedFramework" class="org.jboss.osgi.spi.management.ManagedFramework"> + <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> + </bean> + + <!-- A Service that gives access to the Microcontainer Kernel --> + <bean name="jboss.osgi:service=Microcontainer" class="org.jboss.osgi.service.MicrocontainerService"> + <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext"/></property> + <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> + <property name="kernel"><inject bean="jboss.kernel:service=Kernel" /></property> + </bean> + + <!-- The OSGi MetaData Deployer --> + <bean name="jboss.osgi:service=BundleMetaDataDeployer" class="org.jboss.osgi.deployer.BundleMetaDataDeployer" /> + + <!-- The OSGi Bundle Deployer --> + <bean name="jboss.osgi:service=BundleRealDeployer" class="org.jboss.osgi.deployer.BundleRealDeployer"> + <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property> + <property name="skipBundles"><inject bean="jboss.osgi:service=Framework" property="autoInstall" /></property> + </bean> + + <!-- The Bundle ClassLoader Deployer --> + <bean name="jboss.osgi:service=BundleClassLoaderDeployer" class="org.jboss.osgi.deployer.BundleClassLoaderDeployer"> + <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property> + </bean> + + <!-- The Bundle Start/Stop Deployer --> + <bean name="jboss.osgi:service=BundleStartStopDeployer" class="org.jboss.osgi.deployer.BundleStartStopDeployer"> + <property name="systemContext"><inject bean="jboss.osgi:service=Framework" property="systemBundleContext" /></property> + </bean> + + <!-- The Bundle Management Deployer --> + <bean name="jboss.osgi:service=BundleManagementDeployer" class="org.jboss.osgi.deployer.BundleManagementDeployer"> + <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property> + </bean> + +</deployment> \ No newline at end of file Property changes on: projects/jboss-osgi/trunk/runtime/equinox/src/main/resources/osgi-deployers-jboss-beans.xml ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF