JBoss-OSGI SVN: r86728 - projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-04-03 03:21:29 -0400 (Fri, 03 Apr 2009)
New Revision: 86728
Modified:
projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml
Log:
Install core/compendium for Felix only
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-03 07:16:04 UTC (rev 86727)
+++ projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml 2009-04-03 07:21:29 UTC (rev 86728)
@@ -76,6 +76,7 @@
<panel classname="TreePacksPanel" />
<panel classname="UserInputPanel" />
<panel classname="UserInputPanel" />
+ <panel classname="UserInputPanel" />
<panel classname="SummaryPanel" />
<panel classname="InstallPanel" />
<panel classname="FinishPanel" />
@@ -153,7 +154,6 @@
<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-spi.jar" />
- <include name="org.osgi.core.jar" />
</fileset>
<!-- JBossOSGi Runtime deploy/osgi -->
@@ -162,7 +162,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="org.osgi.compendium.jar" />
<include name="jboss-osgi-service-logging.jar" />
<include name="jboss-osgi-service-webconsole.jar" />
</fileset>
@@ -172,11 +171,15 @@
<fileset dir="@{deploy.artifacts.dir}/lib" 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" />
+ <include name="org.osgi.core.jar" />
</fileset>
<fileset dir="@{deploy.artifacts.dir}/resources/jboss-osgi-runtime-felix" targetdir="$INSTALL_PATH/runtime/server/default/deployers/osgi.deployer/META-INF"
override="true" condition="isFelix">
<include name="osgi-deployers-jboss-beans.xml" />
</fileset>
+ <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/default/deploy/osgi" override="true" condition="isFelix">
+ <include name="org.osgi.compendium.jar" />
+ </fileset>
<!-- Equinox Integration -->
@@ -226,7 +229,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="org.osgi.compendium.jar" />
<include name="jboss-osgi-service-logging.jar" />
<include name="jboss-osgi-service-webconsole.jar" />
</fileset>
@@ -241,6 +243,9 @@
override="true" condition="isFelix">
<include name="osgi-deployers-jboss-beans.xml" />
</fileset>
+ <fileset dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true" condition="isFelix">
+ <include name="org.osgi.compendium.jar" />
+ </fileset>
<!-- Equinox Integration -->
16 years, 8 months
JBoss-OSGI SVN: r86726 - in projects/jboss-osgi/trunk: build/distribution/scripts and 2 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-04-03 03:03:06 -0400 (Fri, 03 Apr 2009)
New Revision: 86726
Modified:
projects/jboss-osgi/trunk/build/distribution/pom.xml
projects/jboss-osgi/trunk/build/distribution/scripts/antrun-installer.xml
projects/jboss-osgi/trunk/runtime/equinox/src/
projects/jboss-osgi/trunk/runtime/felix/src/
Log:
Fix framework handling in auto-install
Modified: projects/jboss-osgi/trunk/build/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-04-03 06:38:24 UTC (rev 86725)
+++ projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-04-03 07:03:06 UTC (rev 86726)
@@ -211,6 +211,7 @@
<configuration>
<tasks>
<property name="maven.runtime.classpath" refid="maven.runtime.classpath" />
+ <property name="framework" value="${framework}" />
<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-04-03 06:38:24 UTC (rev 86725)
+++ projects/jboss-osgi/trunk/build/distribution/scripts/antrun-installer.xml 2009-04-03 07:03:06 UTC (rev 86726)
@@ -45,6 +45,7 @@
<copy todir="${filtered.resources.dir}" filtering="true" overwrite="true">
<fileset dir="${resources.dir}/installer" />
<filterset>
+ <filter token="framework" value="${framework}" />
<filter token="jboss.home" value="${jboss.home}" />
<filter token="jboss.integration" value="${jboss.integration}" />
<filter token="product.version" value="${product.version}" />
Property changes on: projects/jboss-osgi/trunk/runtime/equinox/src
___________________________________________________________________
Name: svn:ignore
+ testsuite
Property changes on: projects/jboss-osgi/trunk/runtime/felix/src
___________________________________________________________________
Name: svn:ignore
+ testsuite
16 years, 8 months
JBoss-OSGI SVN: r86724 - projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-04-03 02:36:54 -0400 (Fri, 03 Apr 2009)
New Revision: 86724
Modified:
projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/auto-install-template.xml
Log:
Fix frameworkSelection
Modified: projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/auto-install-template.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/auto-install-template.xml 2009-04-03 06:34:11 UTC (rev 86723)
+++ projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/auto-install-template.xml 2009-04-03 06:36:54 UTC (rev 86724)
@@ -10,7 +10,7 @@
</com.izforge.izpack.panels.TreePacksPanel>
<com.izforge.izpack.panels.UserInputPanel>
<userInput>
- <entry key="runtimeSelection" value="@runtime@" />
+ <entry key="frameworkSelection" value="@framework@" />
</userInput>
</com.izforge.izpack.panels.UserInputPanel>
<com.izforge.izpack.panels.UserInputPanel>
16 years, 8 months
JBoss-OSGI SVN: r86723 - in projects/jboss-osgi/trunk/build: hudson/hudson-home and 4 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-04-03 02:34:11 -0400 (Fri, 03 Apr 2009)
New Revision: 86723
Added:
projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk15/
projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk16/
projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-matrix/
Removed:
projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/Container-JDK1.5/
projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/Container-JDK1.6/
projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/Container-Matrix/
Modified:
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/hudson-home/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:
Add equinox to matrix
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-03 06:23:47 UTC (rev 86722)
+++ projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml 2009-04-03 06:34:11 UTC (rev 86723)
@@ -44,11 +44,11 @@
<!-- Conditions -->
<conditions>
<condition type="variable" id="isFelix">
- <name>runtimeSelection</name>
+ <name>frameworkSelection</name>
<value>felix</value>
</condition>
<condition type="variable" id="isEquinox">
- <name>runtimeSelection</name>
+ <name>frameworkSelection</name>
<value>equinox</value>
</condition>
<condition type="variable" id="isJBoss501">
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-03 06:23:47 UTC (rev 86722)
+++ projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/user-input-spec.xml 2009-04-03 06:34:11 UTC (rev 86723)
@@ -3,8 +3,8 @@
<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"/>
+ <choice txt="Felix" value="felix" set="true"/>
+ <choice txt="Equinox" value="equinox"/>
</spec>
</field>
</panel>
Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/config.xml
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/config.xml 2009-04-03 06:23:47 UTC (rev 86722)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/config.xml 2009-04-03 06:34:11 UTC (rev 86723)
@@ -10,9 +10,9 @@
<tr align="left"><th>Bind Addr</th><td>@jboss.bind.address@</td></tr>
<tr align="left"><th>JavaDoc</th><td><a href='job/Container-JDK1.6/javadoc/'>SPI</a></td></tr>
<tr align="left"><th>Userguide</th><td>
-<a href='job/Container-JDK1.6/ws/jboss-osgi/build/distribution/target/auto-install-dest/docs/userguide/pdf/JBossOSGi - Userguide.pdf'>PDF</a>
-<a href='job/Container-JDK1.6/ws/jboss-osgi/build/distribution/target/auto-install-dest/docs/userguide/html/index.html'>HTML</a>
-<a href='job/Container-JDK1.6/ws/jboss-osgi/build/distribution/target/auto-install-dest/docs/userguide/html_single/index.html'>HTML-Single</a>
+<a href='job/jbossosgi-jdk16/ws/jboss-osgi/build/distribution/target/auto-install-dest/docs/userguide/pdf/JBossOSGi - Userguide.pdf'>PDF</a>
+<a href='job/jbossosgi-jdk16/ws/jboss-osgi/build/distribution/target/auto-install-dest/docs/userguide/html/index.html'>HTML</a>
+<a href='job/jbossosgi-jdk16/ws/jboss-osgi/build/distribution/target/auto-install-dest/docs/userguide/html_single/index.html'>HTML-Single</a>
</td></tr>
</table>
]]>
Copied: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk15 (from rev 86719, projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/Container-JDK1.5)
Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk15/config.xml
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/Container-JDK1.5/config.xml 2009-04-03 05:45:11 UTC (rev 86719)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk15/config.xml 2009-04-03 06:34:11 UTC (rev 86723)
@@ -11,6 +11,11 @@
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
+ <name>FRAMEWORK</name>
+ <optional>false</optional>
+ <defaultValue>felix</defaultValue>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
<name>CONTAINER</name>
<optional>false</optional>
<defaultValue>jboss501</defaultValue>
Copied: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk16 (from rev 86719, projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/Container-JDK1.6)
Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk16/config.xml
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/Container-JDK1.6/config.xml 2009-04-03 05:45:11 UTC (rev 86719)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-jdk16/config.xml 2009-04-03 06:34:11 UTC (rev 86723)
@@ -11,6 +11,11 @@
<hudson.model.ParametersDefinitionProperty>
<parameterDefinitions>
<hudson.model.StringParameterDefinition>
+ <name>FRAMEWORK</name>
+ <optional>false</optional>
+ <defaultValue>felix</defaultValue>
+ </hudson.model.StringParameterDefinition>
+ <hudson.model.StringParameterDefinition>
<name>CONTAINER</name>
<optional>false</optional>
<defaultValue>jboss501</defaultValue>
Copied: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-matrix (from rev 86719, projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/Container-Matrix)
Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-matrix/config.xml
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/Container-Matrix/config.xml 2009-04-03 05:45:11 UTC (rev 86719)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/jobs/jbossosgi-matrix/config.xml 2009-04-03 06:34:11 UTC (rev 86723)
@@ -32,6 +32,12 @@
</triggers>
<axes>
<axis>
+ <name>framework</name>
+ <values>
+ <string>felix</string>
+ </values>
+ </axis>
+ <axis>
<name>container</name>
<values>
<string>jboss501</string>
@@ -54,6 +60,7 @@
OSGIDIR=$WORKSPACE/jboss-osgi
HUDSONDIR=$OSGIDIR/build/hudson
+export FRAMEWORK=$framework
export CONTAINER=$container
export JBOSS_BINDADDR=(a)jboss.bind.address@
16 years, 8 months
JBoss-OSGI SVN: r86722 - projects/jboss-osgi/trunk/build/hudson/hudson-home.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-04-03 02:23:47 -0400 (Fri, 03 Apr 2009)
New Revision: 86722
Modified:
projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh
Log:
Add framework parameter
Modified: projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh 2009-04-03 06:09:34 UTC (rev 86721)
+++ projects/jboss-osgi/trunk/build/hudson/hudson-home/command.sh 2009-04-03 06:23:47 UTC (rev 86722)
@@ -39,7 +39,7 @@
;;
esac
-ENVIRONMENT="-Dtarget.container=$CONTAINER -Djboss.home=$JBOSS_HOME -Djboss.bind.address=$JBOSS_BINDADDR"
+ENVIRONMENT="-Dframework=$FRAMEWORK -Dtarget.container=$CONTAINER -Djboss.home=$JBOSS_HOME -Djboss.bind.address=$JBOSS_BINDADDR"
#
# Build distro
16 years, 8 months
JBoss-OSGI SVN: r86720 - in projects/jboss-osgi/trunk: build/distribution/src/main/resources/installer and 4 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-04-03 02:02:34 -0400 (Fri, 03 Apr 2009)
New Revision: 86720
Added:
projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/jndi.properties
projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/tst.policy
projects/jboss-osgi/trunk/runtime/felix/src/test/resources/jndi.properties
projects/jboss-osgi/trunk/runtime/felix/src/test/resources/tst.policy
Removed:
projects/jboss-osgi/trunk/testsuite/src/test/resources/jndi.properties
projects/jboss-osgi/trunk/testsuite/src/test/resources/tst.policy
Modified:
projects/jboss-osgi/trunk/build/distribution/pom.xml
projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/auto-install-template.xml
projects/jboss-osgi/trunk/build/hudson/build.xml
Log:
Fix missing dependency on Equniox
Modified: projects/jboss-osgi/trunk/build/distribution/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-04-03 05:45:11 UTC (rev 86719)
+++ projects/jboss-osgi/trunk/build/distribution/pom.xml 2009-04-03 06:02:34 UTC (rev 86720)
@@ -53,6 +53,23 @@
</dependency>
<dependency>
<groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-equinox</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-equinox</artifactId>
+ <classifier>config</classifier>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-runtime-equinox</artifactId>
+ <classifier>sources</classifier>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-runtime-felix</artifactId>
<version>${version}</version>
</dependency>
Modified: projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/auto-install-template.xml
===================================================================
--- projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/auto-install-template.xml 2009-04-03 05:45:11 UTC (rev 86719)
+++ projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/auto-install-template.xml 2009-04-03 06:02:34 UTC (rev 86720)
@@ -10,6 +10,11 @@
</com.izforge.izpack.panels.TreePacksPanel>
<com.izforge.izpack.panels.UserInputPanel>
<userInput>
+ <entry key="runtimeSelection" value="@runtime@" />
+ </userInput>
+ </com.izforge.izpack.panels.UserInputPanel>
+ <com.izforge.izpack.panels.UserInputPanel>
+ <userInput>
<entry key="jbossTargetServer" value="default" />
<entry key="jbossSelection" value="@target.container@" />
</userInput>
Modified: projects/jboss-osgi/trunk/build/hudson/build.xml
===================================================================
--- projects/jboss-osgi/trunk/build/hudson/build.xml 2009-04-03 05:45:11 UTC (rev 86719)
+++ projects/jboss-osgi/trunk/build/hudson/build.xml 2009-04-03 06:02:34 UTC (rev 86720)
@@ -144,13 +144,6 @@
<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">
Added: projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/jndi.properties
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/jndi.properties (rev 0)
+++ projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/jndi.properties 2009-04-03 06:02:34 UTC (rev 86720)
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=jnp://@jboss.bind.address@:1099
Added: projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/tst.policy
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/tst.policy (rev 0)
+++ projects/jboss-osgi/trunk/runtime/equinox/src/test/resources/tst.policy 2009-04-03 06:02:34 UTC (rev 86720)
@@ -0,0 +1,4 @@
+grant {
+ permission java.security.AllPermission;
+};
+
Copied: projects/jboss-osgi/trunk/runtime/felix/src/test/resources/jndi.properties (from rev 86719, projects/jboss-osgi/trunk/testsuite/src/test/resources/jndi.properties)
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/src/test/resources/jndi.properties (rev 0)
+++ projects/jboss-osgi/trunk/runtime/felix/src/test/resources/jndi.properties 2009-04-03 06:02:34 UTC (rev 86720)
@@ -0,0 +1,3 @@
+java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
+java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
+java.naming.provider.url=jnp://@jboss.bind.address@:1099
Copied: projects/jboss-osgi/trunk/runtime/felix/src/test/resources/tst.policy (from rev 86719, projects/jboss-osgi/trunk/testsuite/src/test/resources/tst.policy)
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/src/test/resources/tst.policy (rev 0)
+++ projects/jboss-osgi/trunk/runtime/felix/src/test/resources/tst.policy 2009-04-03 06:02:34 UTC (rev 86720)
@@ -0,0 +1,4 @@
+grant {
+ permission java.security.AllPermission;
+};
+
Deleted: projects/jboss-osgi/trunk/testsuite/src/test/resources/jndi.properties
===================================================================
--- projects/jboss-osgi/trunk/testsuite/src/test/resources/jndi.properties 2009-04-03 05:45:11 UTC (rev 86719)
+++ projects/jboss-osgi/trunk/testsuite/src/test/resources/jndi.properties 2009-04-03 06:02:34 UTC (rev 86720)
@@ -1,3 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-java.naming.provider.url=jnp://@jboss.bind.address@:1099
Deleted: projects/jboss-osgi/trunk/testsuite/src/test/resources/tst.policy
===================================================================
--- projects/jboss-osgi/trunk/testsuite/src/test/resources/tst.policy 2009-04-03 05:45:11 UTC (rev 86719)
+++ projects/jboss-osgi/trunk/testsuite/src/test/resources/tst.policy 2009-04-03 06:02:34 UTC (rev 86720)
@@ -1,4 +0,0 @@
-grant {
- permission java.security.AllPermission;
-};
-
16 years, 8 months
JBoss-OSGI SVN: r86670 - in projects/jboss-osgi/trunk: build/distribution/src/main/resources/installer and 3 other directories.
by jboss-osgi-commits＠lists.jboss.org
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="@{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-felix" 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">
@@ -164,6 +167,28 @@
<include name="jboss-osgi-service-webconsole.jar" />
</fileset>
+ <!-- Felix Integration -->
+
+ <fileset dir="@{deploy.artifacts.dir}/lib" 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="@{deploy.artifacts.dir}/resources/jboss-osgi-runtime-felix" 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="@{deploy.artifacts.dir}/lib" 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="@{deploy.artifacts.dir}/resources/jboss-osgi-runtime-equinox" 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="@{deploy.artifacts.dir}/lib" 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="@{deploy.artifacts.dir}/resources/jboss-osgi-runtime-felix" 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="@{deploy.artifacts.dir}/lib" 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="@{deploy.artifacts.dir}/resources/jboss-osgi-runtime-equinox" 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="@hudson.admin.port@" 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="@hudson.http.port@" 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="@hudson.http.port@" />
+
+ <!-- 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="@hudson.home@"/>
- </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}/bin/apache-t..." 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}/hudson.war" 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
16 years, 8 months
JBoss-OSGI SVN: r86646 - in projects/jboss-osgi/trunk: runtime/equinox and 3 other directories.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-04-02 04:04:05 -0400 (Thu, 02 Apr 2009)
New Revision: 86646
Added:
projects/jboss-osgi/trunk/testsuite/scripts/assembly-testsuite.xml
Modified:
projects/jboss-osgi/trunk/build/docbook/pom.xml
projects/jboss-osgi/trunk/runtime/equinox/pom.xml
projects/jboss-osgi/trunk/runtime/felix/pom.xml
projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
Execute the testsuite as part of the framework module(s)
Modified: projects/jboss-osgi/trunk/build/docbook/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/build/docbook/pom.xml 2009-04-02 07:58:28 UTC (rev 86645)
+++ projects/jboss-osgi/trunk/build/docbook/pom.xml 2009-04-02 08:04:05 UTC (rev 86646)
@@ -35,7 +35,7 @@
-->
<resources>
<resource>
- <directory>${pom.basedir}/en</directory>
+ <directory>en</directory>
<filtering>true</filtering>
</resource>
</resources>
Modified: projects/jboss-osgi/trunk/runtime/equinox/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/equinox/pom.xml 2009-04-02 07:58:28 UTC (rev 86645)
+++ projects/jboss-osgi/trunk/runtime/equinox/pom.xml 2009-04-02 08:04:05 UTC (rev 86646)
@@ -17,8 +17,9 @@
<!-- Properties -->
<properties>
+ <surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/resources/tst.policy</surefire.security.args>
</properties>
-
+
<!-- Dependencies -->
<dependencies>
<dependency>
@@ -31,9 +32,19 @@
<artifactId>osgi</artifactId>
<version>3.4.3.R34x_v20081215-1030</version>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </dependency>
+
<!-- Test Dependencies -->
<dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-testsuite</artifactId>
+ <version>${version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -47,8 +58,35 @@
<!-- Build -->
<build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ <testResource>
+ <directory>src/testsuite/resources</directory>
+ </testResource>
+ </testResources>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-test-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>src/testsuite</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
@@ -67,6 +105,16 @@
</executions>
</plugin>
<plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>src/testsuite</directory>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<excludes>
@@ -77,4 +125,118 @@
</plugins>
</build>
+ <profiles>
+
+ <!--
+ Name: framework-equinox
+ Descr: Setup for Equinox integration testing
+ -->
+ <profile>
+ <id>framework-equinox</id>
+ <activation>
+ <property>
+ <name>framework</name>
+ <value>equinox</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-testsuite</artifactId>
+ <type>zip</type>
+ <outputDirectory>src/testsuite</outputDirectory>
+ <excludes>test-libs/**</excludes>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-testsuite</artifactId>
+ <type>zip</type>
+ <outputDirectory>target</outputDirectory>
+ <includes>test-libs/**</includes>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: embedded-tesing
+ Descr: Setup for embedded integration testing
+ -->
+ <profile>
+ <id>embedded-tesing</id>
+ <activation>
+ <property>
+ <name>!jboss.bind.address</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <!-- Exclude all testsuite tests -->
+ <exclude>org/jboss/test/osgi/jbosgi*/**</exclude>
+ <exclude>org/jboss/test/osgi/service/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: remote-tesing
+ Descr: Setup for remote integration testing
+ -->
+ <profile>
+ <id>remote-tesing</id>
+ <activation>
+ <property>
+ <name>jboss.bind.address</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-client</artifactId>
+ <scope>test</scope>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>${surefire.security.args}</argLine>
+ <excludes>
+ <!-- Exclude all testsuite tests -->
+ <exclude>org/jboss/test/osgi/jbosgi*/**</exclude>
+ <exclude>org/jboss/test/osgi/service/**</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ </profiles>
+
</project>
Modified: projects/jboss-osgi/trunk/runtime/felix/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-04-02 07:58:28 UTC (rev 86645)
+++ projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-04-02 08:04:05 UTC (rev 86646)
@@ -17,8 +17,9 @@
<!-- Properties -->
<properties>
+ <surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/resources/tst.policy</surefire.security.args>
</properties>
-
+
<!-- Dependencies -->
<dependencies>
<dependency>
@@ -30,9 +31,19 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </dependency>
+
<!-- Test Dependencies -->
<dependency>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-testsuite</artifactId>
+ <version>${version}</version>
+ <type>zip</type>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
@@ -46,8 +57,35 @@
<!-- Build -->
<build>
+ <testResources>
+ <testResource>
+ <directory>src/test/resources</directory>
+ <filtering>true</filtering>
+ </testResource>
+ <testResource>
+ <directory>src/testsuite/resources</directory>
+ </testResource>
+ </testResources>
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>add-test-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-test-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>src/testsuite</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
@@ -66,6 +104,16 @@
</executions>
</plugin>
<plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>src/testsuite</directory>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<excludes>
@@ -76,4 +124,172 @@
</plugins>
</build>
+ <!-- Profiles -->
+ <profiles>
+
+
+ <!--
+ Name: framework-default
+ Descr: Setup for default integration testing
+ -->
+ <profile>
+ <id>framework-default</id>
+ <activation>
+ <property>
+ <name>!framework</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-testsuite</artifactId>
+ <type>zip</type>
+ <outputDirectory>src/testsuite</outputDirectory>
+ <excludes>test-libs/**</excludes>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-testsuite</artifactId>
+ <type>zip</type>
+ <outputDirectory>target</outputDirectory>
+ <includes>test-libs/**</includes>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: framework-felix
+ Descr: Setup for Felix integration testing
+ -->
+ <profile>
+ <id>framework-felix</id>
+ <activation>
+ <property>
+ <name>framework</name>
+ <value>felix</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-testsuite</artifactId>
+ <type>zip</type>
+ <outputDirectory>src/testsuite</outputDirectory>
+ <excludes>test-libs/**</excludes>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.osgi</groupId>
+ <artifactId>jboss-osgi-testsuite</artifactId>
+ <type>zip</type>
+ <outputDirectory>target</outputDirectory>
+ <includes>test-libs/**</includes>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: embedded-tesing
+ Descr: Setup for embedded integration testing
+ -->
+ <profile>
+ <id>embedded-tesing</id>
+ <activation>
+ <property>
+ <name>!jboss.bind.address</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <!-- Exclude tests that require remote access -->
+ <exclude>org/jboss/test/osgi/**/*DeployerTestCase.java</exclude>
+ <exclude>org/jboss/test/osgi/service/http/junit/*TestCase.java</exclude>
+ <exclude>org/jboss/test/osgi/service/microcontainer/junit/*TestCase.java</exclude>
+ <!-- [JBOSGI-36] Bundle classes leak into system classloader -->
+ <exclude>org/jboss/test/osgi/jbosgi36/*TestCase.java</exclude>
+ <!-- [JBOSGI-39] Bundle gets wired to an already uninstalled bundle -->
+ <exclude>org/jboss/test/osgi/jbosgi39/*TestCase.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: remote-tesing
+ Descr: Setup for remote integration testing
+ -->
+ <profile>
+ <id>remote-tesing</id>
+ <activation>
+ <property>
+ <name>jboss.bind.address</name>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-client</artifactId>
+ <scope>test</scope>
+ <type>pom</type>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>${surefire.security.args}</argLine>
+ <excludes>
+ <!-- [JBOSGI-40] Cannot run embedded tests with SecurityManager -->
+ <exclude>org/jboss/test/osgi/**/*EmbeddedTestCase.java</exclude>
+ <!-- [JBOSGI-39] Bundle gets wired to an already uninstalled bundle -->
+ <exclude>org/jboss/test/osgi/jbosgi39/*TestCase.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ </profiles>
+
</project>
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-04-02 07:58:28 UTC (rev 86645)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-04-02 08:04:05 UTC (rev 86646)
@@ -2,6 +2,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <!--
+ ***************************************************************************************
+ * *
+ * The Testsuite module provides the test artifacts that can be reused by the various *
+ * supported OSGi Frameworks. The tests are not run as part of the Testsuite module. *
+ * *
+ ***************************************************************************************
+ -->
<name>JBossOSGi - Testsuite</name>
<description>JBossOSGi - Testsuite</description>
@@ -17,24 +25,24 @@
<!-- Properties -->
<properties>
- <surefire.security.args>-Djava.security.manager -Djava.security.policy=src/test/resources/tst.policy</surefire.security.args>
</properties>
<!-- Dependencies -->
<dependencies>
<dependency>
+ <groupId>biz.aQute</groupId>
+ <artifactId>bnd</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jboss.osgi</groupId>
<artifactId>jboss-osgi-runtime-deployer</artifactId>
<version>${version}</version>
+ <scope>provided</scope>
</dependency>
-
<dependency>
- <groupId>biz.aQute</groupId>
- <artifactId>bnd</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.microcontainer</groupId>
@@ -47,16 +55,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<!-- Build -->
@@ -69,6 +67,46 @@
</testResources>
<plugins>
<plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>testsuite</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>scripts/assembly-testsuite.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>target/${project.artifactId}-${project.version}.zip
+ </file>
+ <type>zip</type>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -87,161 +125,13 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
</plugins>
</build>
-
- <!-- Profiles -->
- <profiles>
-
- <!--
- Name: framework-default
- Descr: Setup for default framework testing
- -->
- <profile>
- <id>framework-default</id>
- <activation>
- <property>
- <name>!framework</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-felix</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-felix</artifactId>
- <version>${version}</version>
- <classifier>config</classifier>
- </dependency>
- </dependencies>
- </profile>
-
- <!--
- Name: framework-felix
- Descr: Setup for Felix framework testing
- -->
- <profile>
- <id>framework-felix</id>
- <activation>
- <property>
- <name>framework</name>
- <value>felix</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-felix</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-felix</artifactId>
- <version>${version}</version>
- <classifier>config</classifier>
- </dependency>
- </dependencies>
- </profile>
-
- <!--
- Name: framework-equinox
- Descr: Setup for Felix framework testing
- -->
- <profile>
- <id>framework-equinox</id>
- <activation>
- <property>
- <name>framework</name>
- <value>equinox</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-equinox</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.osgi</groupId>
- <artifactId>jboss-osgi-runtime-equinox</artifactId>
- <version>${version}</version>
- <classifier>config</classifier>
- </dependency>
- </dependencies>
- </profile>
-
- <!--
- Name: embedded-tesing
- Descr: Setup for embedded integration testing
- -->
- <profile>
- <id>embedded-tesing</id>
- <activation>
- <property>
- <name>!jboss.bind.address</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <!-- Exclude tests that require remote access -->
- <exclude>org/jboss/test/osgi/**/*DeployerTestCase.java</exclude>
- <exclude>org/jboss/test/osgi/service/http/junit/*TestCase.java</exclude>
- <exclude>org/jboss/test/osgi/service/microcontainer/junit/*TestCase.java</exclude>
- <!-- [JBOSGI-36] Bundle classes leak into system classloader -->
- <exclude>org/jboss/test/osgi/jbosgi36/*TestCase.java</exclude>
- <!-- [JBOSGI-39] Bundle gets wired to an already uninstalled bundle -->
- <exclude>org/jboss/test/osgi/jbosgi39/*TestCase.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <!--
- Name: remote-tesing
- Descr: Setup for remote integration testing
- -->
- <profile>
- <id>remote-tesing</id>
- <activation>
- <property>
- <name>jboss.bind.address</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-client</artifactId>
- <scope>test</scope>
- <type>pom</type>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>${surefire.security.args}</argLine>
- <excludes>
- <!-- [JBOSGI-40] Cannot run embedded tests with SecurityManager -->
- <exclude>org/jboss/test/osgi/**/*EmbeddedTestCase.java</exclude>
- <!-- [JBOSGI-39] Bundle gets wired to an already uninstalled bundle -->
- <exclude>org/jboss/test/osgi/jbosgi39/*TestCase.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- </profiles>
-
+
</project>
Added: projects/jboss-osgi/trunk/testsuite/scripts/assembly-testsuite.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/scripts/assembly-testsuite.xml (rev 0)
+++ projects/jboss-osgi/trunk/testsuite/scripts/assembly-testsuite.xml 2009-04-02 08:04:05 UTC (rev 86646)
@@ -0,0 +1,18 @@
+<assembly xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+ <id>testsuite</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>src/test</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ <fileSet>
+ <directory>target/test-libs</directory>
+ <outputDirectory>/test-libs</outputDirectory>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on: projects/jboss-osgi/trunk/testsuite/scripts/assembly-testsuite.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
16 years, 8 months
JBoss-OSGI SVN: r86590 - in projects/jboss-osgi/trunk: runtime/equinox/src/main/java/org/jboss/osgi/equinox/framework and 1 other directory.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-04-01 09:47:19 -0400 (Wed, 01 Apr 2009)
New Revision: 86590
Modified:
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
Log:
typos
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-01 13:41:10 UTC (rev 86589)
+++ projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml 2009-04-01 13:47:19 UTC (rev 86590)
@@ -79,7 +79,7 @@
<!--
********************************
* *
- * JBoss OSGi Distribution *
+ * JBossOSGi Distribution *
* *
********************************
-->
@@ -128,7 +128,7 @@
<!--
********************************
* *
- * JBoss OSGi Runtime *
+ * JBossOSGi Runtime *
* *
********************************
-->
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-04-01 13:41:10 UTC (rev 86589)
+++ projects/jboss-osgi/trunk/runtime/equinox/src/main/java/org/jboss/osgi/equinox/framework/EquinoxIntegration.java 2009-04-01 13:47:19 UTC (rev 86590)
@@ -29,7 +29,6 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Properties;
import org.eclipse.core.runtime.adaptor.LocationManager;
import org.eclipse.osgi.framework.internal.core.Framework;
16 years, 8 months
JBoss-OSGI SVN: r86589 - projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer.
by jboss-osgi-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2009-04-01 09:41:10 -0400 (Wed, 01 Apr 2009)
New Revision: 86589
Modified:
projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml
Log:
Fix osgi-deployers-jboss-beans.xml location
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-01 13:39:25 UTC (rev 86588)
+++ projects/jboss-osgi/trunk/build/distribution/src/main/resources/installer/install-definition.xml 2009-04-01 13:41:10 UTC (rev 86589)
@@ -191,7 +191,7 @@
<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="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF" override="true">
+ <fileset dir="@{deploy.artifacts.dir}/resources/jboss-osgi-runtime-felix" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deployers/osgi.deployer/META-INF" override="true">
<include name="osgi-deployers-jboss-beans.xml" />
</fileset>
16 years, 8 months