[jboss-osgi-commits] JBoss-OSGI SVN: r93516 - in projects/jboss-osgi/trunk: hudson/hudson-home/jobs/jbossosgi-matrix-equinox and 2 other directories.
jboss-osgi-commits at lists.jboss.org
jboss-osgi-commits at lists.jboss.org
Tue Sep 15 04:24:50 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-09-15 04:24:49 -0400 (Tue, 15 Sep 2009)
New Revision: 93516
Added:
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/ant-actions-spec.xml
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/ant-jbossas-integration.xml
Modified:
projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-equinox/config.xml
projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-felix/config.xml
projects/jboss-osgi/trunk/testsuite/functional/pom.xml
Log:
Add support for IzPack Ant script.
Exclude jboss600/jdk1.5 from all matrix runs.
Disable functional tests for equinox.
Added: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/ant-actions-spec.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/ant-actions-spec.xml (rev 0)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/ant-actions-spec.xml 2009-09-15 08:24:49 UTC (rev 93516)
@@ -0,0 +1,10 @@
+<antactions>
+ <pack name="JBossAS Integration">
+ <antcall order="beforepack" buildresource="antBuild.xml" quiet="yes" verbose="no">
+ <property name="frameworkSelection" value="${frameworkSelection}"/>
+ <property name="jbossInstallPath" value="${jbossInstallPath}"/>
+ <property name="jbossSelection" value="${jbossSelection}"/>
+ <target name="delete-resources"/>
+ </antcall>
+ </pack>
+</antactions>
\ No newline at end of file
Property changes on: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/ant-actions-spec.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/ant-jbossas-integration.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/ant-jbossas-integration.xml (rev 0)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/ant-jbossas-integration.xml 2009-09-15 08:24:49 UTC (rev 93516)
@@ -0,0 +1,31 @@
+<?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>
+
+ <target name="delete-resources" depends="init,delete-jboss600-jbossmc">
+ </target>
+
+ <target name="init">
+ <condition property="jboss.jboss600.jbossmc">
+ <and>
+ <equals arg1="${frameworkSelection}" arg2="jbossmc"/>
+ <equals arg1="${jbossSelection}" arg2="jboss600"/>
+ </and>
+ </condition>
+ </target>
+
+ <target name="delete-jboss600-jbossmc" if="jboss.jboss600.jbossmc">
+ </target>
+
+</project>
Property changes on: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/ant-jbossas-integration.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-09-15 07:18:21 UTC (rev 93515)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-09-15 08:24:49 UTC (rev 93516)
@@ -19,9 +19,20 @@
<locale>
<langpack iso3="eng" />
</locale>
+
+ <!-- jars -->
+ <jar src="@{deploy.artifacts.dir}/lib/ant.jar" stage="both" />
+ <jar src="@{deploy.artifacts.dir}/lib/ant-launcher.jar" stage="both" />
+
+ <!-- Listeners -->
+ <listeners>
+ <listener installer="AntActionInstallerListener" uninstaller="AntActionUninstallerListener" />
+ </listeners>
<!-- Resources -->
<resources>
+ <res id="AntActionsSpec.xml" src="@{filtered.resources.dir}/ant-actions-spec.xml" />
+ <res id="antBuild.xml" src="@{filtered.resources.dir}/ant-jbossas-integration.xml" type="ant"/>
<res id="userInputSpec.xml" src="@{filtered.resources.dir}/user-input-spec.xml" />
<res id="TargetPanel.dir" src="@{filtered.resources.dir}/target-panel-dir.txt" />
</resources>
@@ -57,8 +68,8 @@
<value>jbossmc</value>
</condition>
<condition type="or" id="isFelixOrEquinox">
- <condition type="ref" refid="isFelix"/>
- <condition type="ref" refid="isEquinox"/>
+ <condition type="ref" refid="isFelix" />
+ <condition type="ref" refid="isEquinox" />
</condition>
<condition type="variable" id="isJBoss501">
<name>jbossSelection</name>
@@ -87,9 +98,9 @@
<panel classname="HelloPanel" />
<panel classname="TargetPanel" />
<panel classname="TreePacksPanel" />
- <panel classname="UserInputPanel" id="framework.select"/>
- <panel classname="UserInputPanel" id="jbossas.select.felix.equinox" condition="isFelixOrEquinox"/>
- <panel classname="UserInputPanel" id="jbossas.select.jbossmc" condition="isJBossMC"/>
+ <panel classname="UserInputPanel" id="framework.select" />
+ <panel classname="UserInputPanel" id="jbossas.select.felix.equinox" condition="isFelixOrEquinox" />
+ <panel classname="UserInputPanel" id="jbossas.select.jbossmc" condition="isJBossMC" />
<panel classname="UserInputPanel" id="jboss.home.select" />
<panel classname="SummaryPanel" />
<panel classname="InstallPanel" />
@@ -98,32 +109,32 @@
<!-- Packs -->
<packs>
-
- <!--
- ********************************
- * *
- * JBossOSGi Distribution *
- * *
- ********************************
+
+ <!--
+ ********************************
+ *
+ * JBossOSGi Distribution
+ *
+ ********************************
-->
-
+
<pack name="JBossOSGi Distribution" required="yes">
-
+
<description>Documentation, Binary Artifacts and Sources</description>
<!-- JBossOSGi -->
<fileset dir="@{deploy.artifacts.dir}/etc" targetdir="$INSTALL_PATH" override="true">
<include name="JBossORG-EULA.txt" />
- <include name="ReleaseNotes.html"/>
+ <include name="ReleaseNotes.html" />
</fileset>
-
+
<!-- JBossOSGi Docs -->
- <fileset dir="@{deploy.artifacts.dir}/docs/userguide" targetdir="$INSTALL_PATH/docs/userguide" override="true"/>
- <file src="@{deploy.artifacts.dir}/lib/jboss-osgi-javadoc-javadoc.jar" targetdir="$INSTALL_PATH/docs/apidocs" unpack="true" override="true"/>
-
+ <fileset dir="@{deploy.artifacts.dir}/docs/userguide" targetdir="$INSTALL_PATH/docs/userguide" override="true" />
+ <file src="@{deploy.artifacts.dir}/lib/jboss-osgi-javadoc-javadoc.jar" targetdir="$INSTALL_PATH/docs/apidocs" unpack="true" override="true" />
+
<!-- JBossOSGi Examples -->
<file src="@{deploy.artifacts.dir}/lib/jboss-osgi-testsuite-example.zip" targetdir="$INSTALL_PATH" unpack="true" override="true" />
-
+
<!-- JBossOSGi Source -->
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/source" override="true">
<include name="jboss-common-core-sources.jar" />
@@ -148,30 +159,30 @@
<include name="jboss-osgi-webconsole-sources.jar" />
<include name="jboss-osgi-xml-binding-sources.jar" />
</fileset>
-
+
</pack>
-
- <!--
- ********************************
- * *
- * JBossOSGi Runtime *
- * *
- ********************************
+
+ <!--
+ ********************************
+ *
+ * JBossOSGi Runtime
+ *
+ ********************************
-->
-
+
<pack name="JBossOSGi Runtime" required="no" preselected="yes">
-
+
<description>Standalone JBossOSGi Runtime</description>
<!-- JBossOSGi Bin -->
- <fileset dir="@{runtime.dir}/bin" targetdir="$INSTALL_PATH/runtime/bin" override="true"/>
- <executable targetfile="$INSTALL_PATH/runtime/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/conf/META-INF/services" override="true">
<include name="org.jboss.osgi.spi.framework.OSGiBootstrapProvider" />
</fileset>
-
+
<!-- JBossOSGi Lib -->
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/lib" override="true">
<include name="args4j.jar" />
@@ -182,17 +193,17 @@
<include name="jboss-vfs.jar" />
<include name="log4j.jar" />
</fileset>
-
+
<!-- Server Minimal -->
- <file src="@{runtime.dir}/server/conf/log4j.xml" targetdir="$INSTALL_PATH/runtime/server/minimal/conf" override="true"/>
+ <file src="@{runtime.dir}/server/conf/log4j.xml" targetdir="$INSTALL_PATH/runtime/server/minimal/conf" override="true" />
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/minimal/deploy" override="true">
<include name="org.apache.felix.log.jar" />
<include name="jboss-osgi-common.jar" />
<include name="jboss-osgi-hotdeploy.jar" />
</fileset>
-
+
<!-- Server Default -->
- <file src="@{runtime.dir}/server/conf/log4j.xml" targetdir="$INSTALL_PATH/runtime/server/default/conf" override="true"/>
+ <file src="@{runtime.dir}/server/conf/log4j.xml" targetdir="$INSTALL_PATH/runtime/server/default/conf" override="true" />
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/default/deploy" override="true">
<!-- default -->
<include name="jboss-osgi-common-core.jar" />
@@ -201,41 +212,46 @@
</fileset>
<!-- Server Web -->
- <file src="@{runtime.dir}/server/conf/log4j.xml" targetdir="$INSTALL_PATH/runtime/server/web/conf" override="true"/>
+ <file src="@{runtime.dir}/server/conf/log4j.xml" targetdir="$INSTALL_PATH/runtime/server/web/conf" override="true" />
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/web/deploy" override="true">
<!-- default -->
<include name="jboss-osgi-common-core.jar" />
<include name="jboss-osgi-jmx.jar" />
<include name="jboss-osgi-jndi.jar" />
- <!-- web -->
+ <!-- web -->
<include name="jboss-osgi-webconsole.jar" />
<include name="org.apache.felix.http.jetty.jar" />
</fileset>
<!-- Server All -->
- <file src="@{runtime.dir}/server/conf/log4j.xml" targetdir="$INSTALL_PATH/runtime/server/all/conf" override="true"/>
+ <file src="@{runtime.dir}/server/conf/log4j.xml" targetdir="$INSTALL_PATH/runtime/server/all/conf" override="true" />
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/all/deploy" override="true">
<!-- default -->
<include name="jboss-osgi-common-core.jar" />
<include name="jboss-osgi-jmx.jar" />
<include name="jboss-osgi-jndi.jar" />
- <!-- web -->
+ <!-- web -->
<include name="jboss-osgi-webconsole.jar" />
<include name="org.apache.felix.http.jetty.jar" />
- <!-- all -->
+ <!-- all -->
<include name="jboss-osgi-apache-xerces.jar" />
<include name="jboss-osgi-blueprint.jar" />
<include name="jboss-osgi-jaxb.jar" />
<include name="jboss-osgi-xml-binding.jar" />
</fileset>
-
+
<!-- Felix Integration -->
-
- <singlefile condition="isFelix" src="@{runtime.dir}/conf/jboss-osgi-felix.properties" target="$INSTALL_PATH/runtime/conf/jboss-osgi-framework.properties" override="true"/>
- <singlefile condition="isFelix" src="@{runtime.dir}/server/conf/jboss-osgi-felix-minimal.properties" target="$INSTALL_PATH/runtime/server/minimal/conf/jboss-osgi-extra.properties" override="true"/>
- <singlefile condition="isFelix" src="@{runtime.dir}/server/conf/jboss-osgi-felix-default.properties" target="$INSTALL_PATH/runtime/server/default/conf/jboss-osgi-extra.properties" override="true"/>
- <singlefile condition="isFelix" src="@{runtime.dir}/server/conf/jboss-osgi-felix-web.properties" target="$INSTALL_PATH/runtime/server/web/conf/jboss-osgi-extra.properties" override="true"/>
- <singlefile condition="isFelix" src="@{runtime.dir}/server/conf/jboss-osgi-felix-all.properties" target="$INSTALL_PATH/runtime/server/all/conf/jboss-osgi-extra.properties" override="true"/>
+
+ <singlefile condition="isFelix" src="@{runtime.dir}/conf/jboss-osgi-felix.properties" target="$INSTALL_PATH/runtime/conf/jboss-osgi-framework.properties"
+ override="true" />
+ <singlefile condition="isFelix" src="@{runtime.dir}/server/conf/jboss-osgi-felix-minimal.properties" target="$INSTALL_PATH/runtime/server/minimal/conf/jboss-osgi-extra.properties"
+ override="true" />
+ <singlefile condition="isFelix" src="@{runtime.dir}/server/conf/jboss-osgi-felix-default.properties" target="$INSTALL_PATH/runtime/server/default/conf/jboss-osgi-extra.properties"
+ override="true" />
+ <singlefile condition="isFelix" src="@{runtime.dir}/server/conf/jboss-osgi-felix-web.properties" target="$INSTALL_PATH/runtime/server/web/conf/jboss-osgi-extra.properties"
+ override="true" />
+ <singlefile condition="isFelix" src="@{runtime.dir}/server/conf/jboss-osgi-felix-all.properties" target="$INSTALL_PATH/runtime/server/all/conf/jboss-osgi-extra.properties"
+ override="true" />
<fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/lib" override="true">
<include name="jboss-osgi-runtime-felix.jar" />
<include name="org.apache.felix.framework.jar" />
@@ -248,10 +264,11 @@
<include name="org.apache.felix.metatype.jar" />
<include name="jboss-osgi-microcontainer.jar" />
</fileset>
-
+
<!-- Equinox Integration -->
-
- <singlefile condition="isEquinox" src="@{runtime.dir}/conf/jboss-osgi-equinox.properties" target="$INSTALL_PATH/runtime/conf/jboss-osgi-framework.properties" 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" />
@@ -264,13 +281,17 @@
<include name="org.apache.felix.metatype.jar" />
<include name="jboss-osgi-microcontainer.jar" />
</fileset>
-
+
<!-- JBossMC Integration -->
-
- <singlefile condition="isJBossMC" src="@{runtime.dir}/server/conf/jboss-osgi-bootstrap.xml" target="$INSTALL_PATH/runtime/server/minimal/conf/jboss-osgi-bootstrap.xml" override="true"/>
- <singlefile condition="isJBossMC" src="@{runtime.dir}/server/conf/jboss-osgi-bootstrap.xml" target="$INSTALL_PATH/runtime/server/default/conf/jboss-osgi-bootstrap.xml" override="true"/>
- <singlefile condition="isJBossMC" src="@{runtime.dir}/server/conf/jboss-osgi-bootstrap.xml" target="$INSTALL_PATH/runtime/server/web/conf/jboss-osgi-bootstrap.xml" override="true"/>
- <singlefile condition="isJBossMC" src="@{runtime.dir}/server/conf/jboss-osgi-bootstrap.xml" target="$INSTALL_PATH/runtime/server/all/conf/jboss-osgi-bootstrap.xml" override="true"/>
+
+ <singlefile condition="isJBossMC" src="@{runtime.dir}/server/conf/jboss-osgi-bootstrap.xml" target="$INSTALL_PATH/runtime/server/minimal/conf/jboss-osgi-bootstrap.xml"
+ override="true" />
+ <singlefile condition="isJBossMC" src="@{runtime.dir}/server/conf/jboss-osgi-bootstrap.xml" target="$INSTALL_PATH/runtime/server/default/conf/jboss-osgi-bootstrap.xml"
+ override="true" />
+ <singlefile condition="isJBossMC" src="@{runtime.dir}/server/conf/jboss-osgi-bootstrap.xml" target="$INSTALL_PATH/runtime/server/web/conf/jboss-osgi-bootstrap.xml"
+ override="true" />
+ <singlefile condition="isJBossMC" src="@{runtime.dir}/server/conf/jboss-osgi-bootstrap.xml" target="$INSTALL_PATH/runtime/server/all/conf/jboss-osgi-bootstrap.xml"
+ override="true" />
<fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/lib" override="true">
<include name="jaxb-api.jar" />
<include name="jboss-classloader.jar" />
@@ -303,32 +324,33 @@
<fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib/org.osgi" targetdir="$INSTALL_PATH/runtime/server/minimal/deploy" override="true">
<include name="org.osgi.compendium.jar" />
</fileset>
-
+
</pack>
-
- <!--
- ********************************
- * *
- * JBossAS Integration *
- * *
- ********************************
+
+ <!--
+ *********************************
+ *
+ * JBossAS Integration
+ *
+ *********************************
-->
-
+
<pack name="JBossAS Integration" required="no" preselected="yes">
-
+
<description>Integration with an existing JBossAS instance</description>
<!-- https://jira.jboss.org/jira/browse/JBOSGI-94 -->
- <fileset condition="isJBoss501" dir="@{deploy.artifacts.dir}/resources/jbossas-config" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers" override="true">
+ <fileset condition="isJBoss501" dir="@{deploy.artifacts.dir}/resources/jbossas-config" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers"
+ override="true">
<include name="metadata-deployer-jboss-beans.xml" />
</fileset>
-
+
<!-- deployers/osgi.deployer -->
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true">
<include name="jboss-osgi-deployers.jar" />
<include name="jboss-osgi-spi.jar" />
</fileset>
-
+
<!-- deploy/osgi -->
<fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true">
<include name="jboss-osgi-apache-xerces.jar" />
@@ -340,38 +362,43 @@
<include name="org.apache.felix.http.jetty.jar" />
<include name="org.apache.felix.log.jar" />
</fileset>
-
+
<!-- Felix Integration -->
-
- <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true">
+
+ <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer"
+ override="true">
<include name="jboss-osgi-runtime-felix.jar" />
<include name="jboss-osgi-runtime-jbossas.jar" />
<include name="org.apache.felix.framework.jar" />
</fileset>
- <singlefile condition="isFelix" src="@{deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-felix.xml"
- target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml" override="true"/>
- <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true">
+ <singlefile condition="isFelix" src="@{deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-felix.xml" target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml"
+ override="true" />
+ <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer"
+ override="true">
<include name="jboss-osgi-runtime-jbossas.jar" />
</fileset>
<fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true">
<include name="org.apache.felix.configadmin.jar" />
<include name="org.apache.felix.metatype.jar" />
</fileset>
- <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib/org.apache.felix" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true">
+ <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib/org.apache.felix" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi"
+ override="true">
<include name="org.osgi.compendium.jar" />
</fileset>
-
+
<!-- Equinox Integration -->
-
- <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true">
+
+ <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer"
+ override="true">
<include name="jboss-osgi-runtime-equinox.jar" />
<include name="jboss-osgi-runtime-jbossas.jar" />
<include name="org.apache.equinox.framework.jar" />
- <include name="org.eclipse.osgi.jar"/>
+ <include name="org.eclipse.osgi.jar" />
</fileset>
- <singlefile condition="isEquinox" src="@{deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-equinox.xml"
- target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml" override="true"/>
- <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true">
+ <singlefile condition="isEquinox" src="@{deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-equinox.xml" target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml"
+ override="true" />
+ <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer"
+ override="true">
<include name="jboss-osgi-runtime-jbossas.jar" />
</fileset>
<fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true">
@@ -379,29 +406,35 @@
<include name="org.apache.felix.metatype.jar" />
<include name="org.eclipse.osgi.services.jar" />
</fileset>
-
+
<!-- JBossMC Integration -->
-
- <fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true">
+
+ <fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer"
+ override="true">
<include name="jboss-osgi-runtime-microcontainer.jar" />
</fileset>
- <singlefile condition="isJBossMC" src="@{deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-jbossmc.xml"
- target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml" override="true"/>
+ <singlefile condition="isJBossMC" src="@{deploy.artifacts.dir}/resources/jbossas-config/jboss-beans-jbossmc.xml" target="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF/jboss-osgi-jboss-beans.xml"
+ override="true" />
<fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/lib" override="true">
<include name="jboss-classloader.jar" />
<include name="jboss-classloading.jar" />
<include name="jboss-dependency.jar" />
</fileset>
- <fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib/org.osgi" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer" override="true">
+ <fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib/org.osgi" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer"
+ override="true">
<include name="org.osgi.core.jar" />
</fileset>
- <fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib/org.osgi" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true">
+ <fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib/org.osgi" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi"
+ override="true">
<include name="org.osgi.compendium.jar" />
+ </fileset>
+ <fileset condition="isJBossMC" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi"
+ override="true">
<include name="jboss-osgi-common-core.jar" />
<include name="jboss-osgi-jmx.jar" />
<include name="jboss-osgi-jndi.jar" />
</fileset>
-
+
</pack>
</packs>
Modified: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-equinox/config.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-equinox/config.xml 2009-09-15 07:18:21 UTC (rev 93515)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-equinox/config.xml 2009-09-15 08:24:49 UTC (rev 93516)
@@ -55,6 +55,7 @@
</values>
</axis>
</axes>
+ <combinationFilter>!(container=='jboss600' && jdk=='jdk1.5')</combinationFilter>
<builders>
<hudson.tasks.Shell>
<command>
Modified: projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-felix/config.xml
===================================================================
--- projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-felix/config.xml 2009-09-15 07:18:21 UTC (rev 93515)
+++ projects/jboss-osgi/trunk/hudson/hudson-home/jobs/jbossosgi-matrix-felix/config.xml 2009-09-15 08:24:49 UTC (rev 93516)
@@ -55,6 +55,7 @@
</values>
</axis>
</axes>
+ <combinationFilter>!(container=='jboss600' && jdk=='jdk1.5')</combinationFilter>
<builders>
<hudson.tasks.Shell>
<command>
Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-09-15 07:18:21 UTC (rev 93515)
+++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-09-15 08:24:49 UTC (rev 93516)
@@ -135,7 +135,9 @@
<exclude>org/jboss/test/osgi/jbosgi99/**</exclude>
<exclude>org/jboss/test/osgi/jbosgi108/**</exclude>
<exclude>org/jboss/test/osgi/jbosgi112/**</exclude>
+ <exclude>org/jboss/test/osgi/jbosgi142/**</exclude>
<exclude>org/jboss/test/osgi/jbosgi143/**</exclude>
+ <exclude>org/jboss/test/osgi/jbosgi151/**</exclude>
<exclude>org/jboss/test/osgi/service/microcontainer/**</exclude>
<exclude>org/jboss/test/osgi/service/startlevel/**</exclude>
</excludes>
More information about the jboss-osgi-commits
mailing list