[jboss-cvs] JBossAS SVN: r85828 - in projects/jboss-osgi/trunk: build/distribution and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Mar 13 11:16:37 EDT 2009
Author: thomas.diesler at jboss.com
Date: 2009-03-13 11:16:37 -0400 (Fri, 13 Mar 2009)
New Revision: 85828
Added:
projects/jboss-osgi/trunk/build/distribution/scripts/antrun-runtime.xml
projects/jboss-osgi/trunk/build/distribution/src/main/etc/ReleaseNotes.html
Removed:
projects/jboss-osgi/trunk/build/distribution/scripts/antrun-jboss501-osgi.xml
projects/jboss-osgi/trunk/build/distribution/src/main/etc/release.notes.html
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/scripts/assembly-deploy-artifacts.xml
projects/jboss-osgi/trunk/build/distribution/src/main/etc/jboss501/server/conf/jboss-service.xml
projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml
projects/jboss-osgi/trunk/pom.xml
Log:
Add minimal runtime to distribution
Modified: projects/jboss-osgi/trunk/build/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-03-13 14:23:21 UTC (rev 85827)
+++ projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-03-13 15:16:37 UTC (rev 85828)
@@ -47,7 +47,8 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-service-webconsole</artifactId>
+ <artifactId>jboss-osgi-runtime-deployer</artifactId>
+ <classifier>sources</classifier>
<version>${version}</version>
</dependency>
<dependency>
@@ -63,11 +64,54 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-felix</artifactId>
+ <classifier>sources</classifier>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-spi</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-spi</artifactId>
+ <classifier>sources</classifier>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-service-webconsole</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-service-webconsole</artifactId>
+ <classifier>sources</classifier>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-service-logging</artifactId>
<version>${version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-service-logging</artifactId>
+ <classifier>sources</classifier>
+ <version>${version}</version>
+ </dependency>
+ <!-- javadoc -->
<dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-spi</artifactId>
+ <classifier>javadoc</classifier>
+ <version>${version}</version>
+ </dependency>
+
+ <!-- felix -->
+ <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>javax.servlet</artifactId>
</dependency>
@@ -87,6 +131,8 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.metatype</artifactId>
</dependency>
+
+ <!-- izpack -->
<dependency>
<groupId>org.codehaus.izpack</groupId>
<artifactId>izpack-standalone-compiler</artifactId>
@@ -120,6 +166,20 @@
<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>
Modified: projects/jboss-osgi/trunk/build/distribution/scripts/antrun-installer.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/scripts/antrun-installer.xml 2009-03-13 14:23:21 UTC (rev 85827)
+++ projects/jboss-osgi/trunk/build/distribution/scripts/antrun-installer.xml 2009-03-13 15:16:37 UTC (rev 85828)
@@ -15,12 +15,15 @@
<!-- ================================================================== -->
<!-- Setup -->
<!-- ================================================================== -->
+
<property name="output.dir" value="${basedir}/target" />
<property name="resources.dir" value="${basedir}/src/main/resources" />
<property name="filtered.resources.dir" value="${output.dir}/resources" />
<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.version" value="jboss-osgi-runtime-${product.version}" />
+ <property name="jboss.runtime.dir" value="${output.dir}/${jboss.runtime.version}" />
<!-- ================================================================== -->
<!-- Initialization -->
Deleted: projects/jboss-osgi/trunk/build/distribution/scripts/antrun-jboss501-osgi.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/scripts/antrun-jboss501-osgi.xml 2009-03-13 14:23:21 UTC (rev 85827)
+++ projects/jboss-osgi/trunk/build/distribution/scripts/antrun-jboss501-osgi.xml 2009-03-13 15:16:37 UTC (rev 85828)
@@ -1,156 +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="main" basedir="..">
-
- <property name="jboss.source.dir" value="/home/tdiesler/svn/jbossas/branches/Branch_5_0/build/output/jboss-5.0.1.GA" />
-
- <!-- ================================================================== -->
- <!-- Setup -->
- <!-- ================================================================== -->
- <property name="output.dir" value="${basedir}/target" />
- <property name="source.dir" value="${basedir}/src/main/etc/jboss501" />
- <property name="source.server.conf" value="${source.dir}/server/conf" />
-
- <property name="jboss.source.dir" value="${jboss501.home}" />
- <property name="jboss.source.bin" value="${jboss.source.dir}/bin" />
- <property name="jboss.source.lib" value="${jboss.source.dir}/lib" />
- <property name="jboss.source.server" value="${jboss.source.dir}/server/default" />
- <property name="jboss.source.server.conf" value="${jboss.source.server}/conf" />
- <property name="jboss.source.server.deploy" value="${jboss.source.server}/deploy" />
- <property name="jboss.source.server.deployers" value="${jboss.source.server}/deployers" />
-
- <property name="jboss.target.dir" value="${output.dir}/jboss-osgi-5.0.1.GA" />
- <property name="jboss.target.bin" value="${jboss.target.dir}/bin" />
- <property name="jboss.target.lib" value="${jboss.target.dir}/lib" />
- <property name="jboss.target.server" value="${jboss.target.dir}/server/osgi" />
- <property name="jboss.target.server.conf" value="${jboss.target.server}/conf" />
- <property name="jboss.target.server.deploy" value="${jboss.target.server}/deploy" />
- <property name="jboss.target.server.deployers" value="${jboss.target.server}/deployers" />
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
- <target name="init">
- </target>
-
- <!-- ================================================================== -->
- <!-- Distribution -->
- <!-- ================================================================== -->
- <target name="build-jboss-osgi" depends="init">
-
- <echo/>
- <echo message="JBoss Source: ${jboss.source.dir}"/>
- <echo message="JBoss Target: ${jboss.target.dir}"/>
- <echo/>
-
- <mkdir dir="${jboss.target.bin}"/>
- <mkdir dir="${jboss.target.lib}"/>
- <mkdir dir="${jboss.target.server}"/>
- <mkdir dir="${jboss.target.server.deploy}"/>
-
- <!-- BIN -->
- <copy todir="${jboss.target.bin}">
- <fileset dir="${jboss.source.bin}">
- <include name="run.*"/>
- </fileset>
- </copy>
- <chmod perm="+x">
- <fileset dir="${jboss.target.bin}">
- <include name="*.sh"/>
- </fileset>
- </chmod>
-
- <!-- LIB -->
- <copy todir="${jboss.target.lib}">
- <fileset dir="${jboss.source.lib}">
-
- <include name="endorsed/activation.jar"/>
- <include name="endorsed/jaxb-api.jar"/>
- <include name="endorsed/resolver.jar"/>
- <include name="endorsed/serializer.jar"/>
- <include name="endorsed/stax-api.jar"/>
- <include name="endorsed/xalan.jar"/>
- <include name="endorsed/xercesImpl.jar"/>
-
- <include name="concurrent.jar"/>
- <include name="dom4j.jar"/>
- <include name="jaxb-impl.jar"/>
- <include name="jboss-bootstrap.jar"/>
- <include name="jboss-classloader.jar"/>
- <include name="jboss-classloading*.jar"/>
- <include name="jboss-common-core.jar"/>
- <include name="jboss-dependency.jar"/>
- <include name="jboss-deployers*.jar"/>
- <include name="jboss-j2se.jar"/>
- <include name="jboss-jmx.jar"/>
- <include name="jboss-kernel.jar"/>
- <include name="jboss-logging*.jar"/>
- <include name="jboss-managed.jar"/>
- <include name="jboss-mbeans.jar"/>
- <include name="jboss-metatype.jar"/>
- <include name="jboss-mdr.jar"/>
- <include name="jboss-profileservice-spi.jar"/>
- <include name="jboss-reflect.jar"/>
- <include name="jboss-system.jar"/>
- <include name="jboss-system-jmx.jar"/>
- <include name="jboss-vfs.jar"/>
- <include name="jboss-xml-binding.jar"/>
- <include name="log4j-boot.jar"/>
- <include name="wstx.jar"/>
- </fileset>
- </copy>
-
- <!-- SERVER/CONF -->
- <copy todir="${jboss.target.server.conf}">
- <fileset dir="${source.server.conf}">
- <include name="bootstrap.xml"/>
- <include name="jboss-log4j.xml"/>
- <include name="jboss-service.xml"/>
- <include name="bootstrap/deployers.xml"/>
- <include name="bootstrap/jmx.xml"/>
- </fileset>
- <fileset dir="${jboss.source.server.conf}">
- <include name="bootstrap/vfs.xml"/>
- <include name="bootstrap/classloader.xml"/>
- <include name="bootstrap/profile.xml"/>
- </fileset>
- </copy>
-
- <!-- SERVER/DEPLOYERS -->
- <copy todir="${jboss.target.server.deployers}">
- <fileset dir="${jboss.source.server.deployers}">
- <include name="osgi.deployer/**"/>
- </fileset>
- </copy>
-
- <!-- SERVER/DEPLOY
- <copy todir="${jboss.target.server.deploy}">
- <fileset dir="${jboss.source.server.deploy}">
- <include name="osgi/**"/>
- </fileset>
- </copy>
- -->
-
- </target>
-
- <!-- ================================================================== -->
- <!-- Miscelaneous -->
- <!-- ================================================================== -->
- <target name="clean" depends="init">
- <delete dir="${jboss.target.dir}"/>
- </target>
-
- <target name="main" depends="build-jboss-osgi">
- </target>
-
-</project>
\ No newline at end of file
Copied: projects/jboss-osgi/trunk/build/distribution/scripts/antrun-runtime.xml (from rev 85787, projects/jboss-osgi/trunk/build/distribution/scripts/antrun-jboss501-osgi.xml)
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/scripts/antrun-runtime.xml (rev 0)
+++ projects/jboss-osgi/trunk/build/distribution/scripts/antrun-runtime.xml 2009-03-13 15:16:37 UTC (rev 85828)
@@ -0,0 +1,166 @@
+<?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="source.dir" value="${basedir}/src/main/etc/jboss501" />
+ <property name="source.server.conf" value="${source.dir}/server/conf" />
+
+ <property name="jboss.source.dir" value="${jboss501.home}" />
+ <property name="jboss.source.bin" value="${jboss.source.dir}/bin" />
+ <property name="jboss.source.lib" value="${jboss.source.dir}/lib" />
+ <property name="jboss.source.common.lib" value="${jboss.source.dir}/common/lib" />
+ <property name="jboss.source.server" value="${jboss.source.dir}/server/default" />
+ <property name="jboss.source.server.conf" value="${jboss.source.server}/conf" />
+ <property name="jboss.source.server.deploy" value="${jboss.source.server}/deploy" />
+ <property name="jboss.source.server.deployers" value="${jboss.source.server}/deployers" />
+
+ <property name="jboss.runtime.version" value="jboss-osgi-runtime-${project.version}" />
+ <property name="jboss.target.dir" value="${output.dir}/${jboss.runtime.version}" />
+ <property name="jboss.target.bin" value="${jboss.target.dir}/bin" />
+ <property name="jboss.target.lib" value="${jboss.target.dir}/lib" />
+ <property name="jboss.target.common.lib" value="${jboss.target.dir}/common/lib" />
+ <property name="jboss.target.server" value="${jboss.target.dir}/server/default" />
+ <property name="jboss.target.server.conf" value="${jboss.target.server}/conf" />
+ <property name="jboss.target.server.deploy" value="${jboss.target.server}/deploy" />
+ <property name="jboss.target.server.deployers" value="${jboss.target.server}/deployers" />
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+ <target name="init">
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Distribution -->
+ <!-- ================================================================== -->
+ <target name="build-runtime" depends="init">
+
+ <echo/>
+ <echo message="JBoss Source: ${jboss.source.dir}"/>
+ <echo message="JBoss Target: ${jboss.target.dir}"/>
+ <echo/>
+
+ <mkdir dir="${jboss.target.bin}"/>
+ <mkdir dir="${jboss.target.lib}"/>
+ <mkdir dir="${jboss.target.common.lib}"/>
+ <mkdir dir="${jboss.target.server}"/>
+ <mkdir dir="${jboss.target.server.deploy}"/>
+
+ <!-- BIN -->
+ <copy todir="${jboss.target.bin}">
+ <fileset dir="${jboss.source.bin}">
+ <include name="run.*"/>
+ </fileset>
+ </copy>
+ <chmod perm="+x">
+ <fileset dir="${jboss.target.bin}">
+ <include name="*.sh"/>
+ </fileset>
+ </chmod>
+
+ <!-- COMMON/LIB -->
+ <copy todir="${jboss.target.common.lib}">
+ <fileset dir="${jboss.source.common.lib}">
+ <include name="jboss.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- LIB -->
+ <copy todir="${jboss.target.lib}">
+ <fileset dir="${jboss.source.lib}">
+
+ <include name="endorsed/activation.jar"/>
+ <include name="endorsed/jaxb-api.jar"/>
+ <include name="endorsed/resolver.jar"/>
+ <include name="endorsed/serializer.jar"/>
+ <include name="endorsed/stax-api.jar"/>
+ <include name="endorsed/xalan.jar"/>
+ <include name="endorsed/xercesImpl.jar"/>
+
+ <include name="concurrent.jar"/>
+ <include name="dom4j.jar"/>
+ <include name="jaxb-impl.jar"/>
+ <include name="jboss-bootstrap.jar"/>
+ <include name="jboss-classloader.jar"/>
+ <include name="jboss-classloading*.jar"/>
+ <include name="jboss-common-core.jar"/>
+ <include name="jboss-dependency.jar"/>
+ <include name="jboss-deployers*.jar"/>
+ <include name="jboss-j2se.jar"/>
+ <include name="jboss-jmx.jar"/>
+ <include name="jboss-kernel.jar"/>
+ <include name="jboss-logging*.jar"/>
+ <include name="jboss-managed.jar"/>
+ <include name="jboss-mbeans.jar"/>
+ <include name="jboss-metatype.jar"/>
+ <include name="jboss-mdr.jar"/>
+ <include name="jboss-profileservice-spi.jar"/>
+ <include name="jboss-reflect.jar"/>
+ <include name="jboss-system.jar"/>
+ <include name="jboss-system-jmx.jar"/>
+ <include name="jboss-vfs.jar"/>
+ <include name="jboss-xml-binding.jar"/>
+ <include name="log4j-boot.jar"/>
+ <include name="wstx.jar"/>
+ </fileset>
+ </copy>
+
+ <!-- SERVER/CONF -->
+ <copy todir="${jboss.target.server.conf}">
+ <fileset dir="${source.server.conf}">
+ <include name="bootstrap.xml"/>
+ <include name="jboss-log4j.xml"/>
+ <include name="jboss-service.xml"/>
+ <include name="bootstrap/deployers.xml"/>
+ <include name="bootstrap/jmx.xml"/>
+ </fileset>
+ <fileset dir="${jboss.source.server.conf}">
+ <include name="bootstrap/vfs.xml"/>
+ <include name="bootstrap/classloader.xml"/>
+ <include name="bootstrap/profile.xml"/>
+ </fileset>
+ </copy>
+
+ <!-- SERVER/DEPLOYERS
+ <copy todir="${jboss.target.server.deployers}">
+ <fileset dir="${jboss.source.server.deployers}">
+ <include name="osgi.deployer/**"/>
+ </fileset>
+ </copy>
+ -->
+
+ <!-- SERVER/DEPLOY
+ <copy todir="${jboss.target.server.deploy}">
+ <fileset dir="${jboss.source.server.deploy}">
+ <include name="osgi/**"/>
+ </fileset>
+ </copy>
+ -->
+
+ <!-- ZIP the Runtime distribution -->
+ <zip destfile="${jboss.target.dir}.zip" basedir="${output.dir}" includes="${jboss.runtime.version}/**"/>
+
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Miscelaneous -->
+ <!-- ================================================================== -->
+ <target name="clean" depends="init">
+ <delete dir="${jboss.target.dir}"/>
+ </target>
+
+</project>
\ No newline at end of file
Property changes on: projects/jboss-osgi/trunk/build/distribution/scripts/antrun-runtime.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:mergeinfo
+
Name: svn:eol-style
+ LF
Modified: projects/jboss-osgi/trunk/build/distribution/scripts/assembly-deploy-artifacts.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/scripts/assembly-deploy-artifacts.xml 2009-03-13 14:23:21 UTC (rev 85827)
+++ projects/jboss-osgi/trunk/build/distribution/scripts/assembly-deploy-artifacts.xml 2009-03-13 15:16:37 UTC (rev 85828)
@@ -10,6 +10,15 @@
<!-- Dependency Sets -->
<dependencySets>
+ <!-- docs -->
+ <dependencySet>
+ <outputDirectory>docs</outputDirectory>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>*:jboss-osgi-runtime-spi:jar:javadoc</include>
+ </includes>
+ </dependencySet>
+
<!-- lib -->
<dependencySet>
<outputDirectory>lib</outputDirectory>
@@ -37,6 +46,17 @@
<unpack>true</unpack>
</dependencySet>
+ <!-- source -->
+ <dependencySet>
+ <outputDirectory>source</outputDirectory>
+ <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
+ <useStrictFiltering>true</useStrictFiltering>
+ <includes>
+ <include>*:jboss-osgi-*:jar:sources</include>
+ </includes>
+ <unpack>false</unpack>
+ </dependencySet>
+
</dependencySets>
<fileSets>
@@ -46,7 +66,7 @@
<outputDirectory>/etc</outputDirectory>
<includes>
<include>JBossORG-EULA.txt</include>
- <include>release.notes.html</include>
+ <include>ReleaseNotes.html</include>
<include>jboss501/**</include>
</includes>
</fileSet>
Copied: projects/jboss-osgi/trunk/build/distribution/src/main/etc/ReleaseNotes.html (from rev 85787, projects/jboss-osgi/trunk/build/distribution/src/main/etc/release.notes.html)
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/src/main/etc/ReleaseNotes.html (rev 0)
+++ projects/jboss-osgi/trunk/build/distribution/src/main/etc/ReleaseNotes.html 2009-03-13 15:16:37 UTC (rev 85828)
@@ -0,0 +1,3 @@
+<body>
+<h1>JBossOSGi @version@ Release Notes</h1>
+</body>
\ No newline at end of file
Property changes on: projects/jboss-osgi/trunk/build/distribution/src/main/etc/ReleaseNotes.html
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: projects/jboss-osgi/trunk/build/distribution/src/main/etc/jboss501/server/conf/jboss-service.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/src/main/etc/jboss501/server/conf/jboss-service.xml 2009-03-13 14:23:21 UTC (rev 85827)
+++ projects/jboss-osgi/trunk/build/distribution/src/main/etc/jboss501/server/conf/jboss-service.xml 2009-03-13 15:16:37 UTC (rev 85828)
@@ -13,6 +13,7 @@
attribute.
-->
<classpath codebase="${jboss.server.lib.url}" archives="*"/>
+ <classpath codebase="${jboss.common.lib.url}" archives="*"/>
<!-- ==================================================================== -->
<!-- Log4j Initialization -->
Deleted: projects/jboss-osgi/trunk/build/distribution/src/main/etc/release.notes.html
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/src/main/etc/release.notes.html 2009-03-13 14:23:21 UTC (rev 85827)
+++ projects/jboss-osgi/trunk/build/distribution/src/main/etc/release.notes.html 2009-03-13 15:16:37 UTC (rev 85828)
@@ -1,2 +0,0 @@
-<body><h1>JBoss OSGi 1.0.0.Alpha1 Release Notes</h1>
-</body>
\ 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-03-13 14:23:21 UTC (rev 85827)
+++ projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml 2009-03-13 15:16:37 UTC (rev 85828)
@@ -75,6 +75,86 @@
<!--
********************************
* *
+ * JBoss OSGi Distribution *
+ * *
+ ********************************
+ -->
+
+ <pack name="JBossOSGi Distribution" required="yes">
+
+ <description>The JBossOSGi Distribution</description>
+
+ <!-- JBossOSGi -->
+ <fileset dir="@{deploy.artifacts.dir}/etc" targetdir="$INSTALL_PATH" override="true">
+ <include name="JBossORG-EULA.txt" />
+ <include name="ReleaseNotes.html"/>
+ </fileset>
+
+ <!-- JBossOSGi Docs -->
+ <file src="@{deploy.artifacts.dir}/lib/jboss-osgi-runtime-spi-javadoc.jar" targetdir="$INSTALL_PATH/docs/apidocs"
+ unpack="true" override="true" />
+
+ <!-- JBossOSGi Lib -->
+ <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/lib" 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="jboss-osgi-service-logging.jar" />
+ <include name="jboss-osgi-service-webconsole.jar" />
+ <include name="org.apache.felix.framework.jar" />
+ <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="org.osgi.compendium.jar" />
+ <include name="org.osgi.core.jar" />
+ </fileset>
+
+ <!-- JBossOSGi Source -->
+ <fileset dir="@{deploy.artifacts.dir}/source" targetdir="$INSTALL_PATH/source" override="true">
+ <include name="jboss-osgi-runtime-deployer-sources.jar" />
+ <include name="jboss-osgi-runtime-felix-sources.jar" />
+ <include name="jboss-osgi-runtime-spi-sources.jar" />
+ <include name="jboss-osgi-service-logging-sources.jar" />
+ <include name="jboss-osgi-service-webconsole-sources.jar" />
+ </fileset>
+
+ <!-- JBossOSGi Runtime -->
+ <fileset dir="@{jboss.runtime.dir}" targetdir="$INSTALL_PATH/runtime" override="true"/>
+
+ <!-- JBossOSGi Runtime deployers
+ <fileset dir="@{deploy.artifacts.dir}/etc/jboss501/server/deployers" targetdir="$INSTALL_PATH/runtime/server/default/deployers" override="true" condition="isJBoss501">
+ </fileset>
+ -->
+
+ <!-- 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-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="@{deploy.artifacts.dir}/resources/jboss-osgi-runtime-deployer-config" 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="@{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="org.osgi.compendium.jar" />
+ <include name="jboss-osgi-service-logging.jar" />
+ <include name="jboss-osgi-service-webconsole.jar" />
+ </fileset>
+
+ </pack>
+
+ <!--
+ ********************************
+ * *
* JBoss Integration *
* *
********************************
@@ -114,13 +194,5 @@
</pack>
- <!--
- ********************************
- * *
- * Optional Components *
- * *
- ********************************
- -->
-
</packs>
</installation>
\ No newline at end of file
Modified: projects/jboss-osgi/trunk/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/pom.xml 2009-03-13 14:23:21 UTC (rev 85827)
+++ projects/jboss-osgi/trunk/pom.xml 2009-03-13 15:16:37 UTC (rev 85828)
@@ -42,7 +42,7 @@
<version.felix.metatype>1.0.2</version.felix.metatype>
<version.felix.osgi.core>1.2.0</version.felix.osgi.core>
<version.felix.webconsole>1.2.2</version.felix.webconsole>
- <version.izpack>4.2.1</version.izpack>
+ <version.izpack>4.2.0</version.izpack>
<version.jbossas>5.0.1.GA</version.jbossas>
<version.jboss.aop>2.0.1.GA</version.jboss.aop>
<version.jboss.common.core>2.2.11.GA</version.jboss.common.core>
More information about the jboss-cvs-commits
mailing list