[jboss-osgi-commits] JBoss-OSGI SVN: r86726 - in projects/jboss-osgi/trunk: build/distribution/scripts and 2 other directories.

[jboss-osgi-commits at lists.jboss.org]

Author: thomas.diesler at 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