[jboss-cvs] JBossAS SVN: r99984 - projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer.

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

Author: thomas.diesler at jboss.com
Date: 2010-01-27 05:19:20 -0500 (Wed, 27 Jan 2010)
New Revision: 99984

Modified:
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
Log:
[JBOSGI-283] WebApp extender not installed by default

Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
===================================================================
--- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml	2010-01-27 10:18:45 UTC (rev 99983)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml	2010-01-27 10:19:20 UTC (rev 99984)
@@ -427,6 +427,7 @@
       <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true">
         <include name="org.apache.felix.configadmin.jar" />
         <include name="org.apache.felix.metatype.jar" />
+        <include name="pax-web-extender-war.jar" />
       </fileset>
       <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib/org.osgi" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi"
         override="true">
@@ -434,7 +435,6 @@
       </fileset>
       <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/resources/jbossas" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true">
         <include name="microcontainer-service-jboss-beans.xml" />
-        <include name="pax-web-extender-war.jar" />
       </fileset>
 
       <!-- Equinox Integration -->
@@ -452,10 +452,10 @@
         <include name="org.apache.felix.metatype.jar" />
         <include name="org.eclipse.osgi.services.jar" />
         <include name="org.eclipse.osgi.util.jar" />
+        <include name="pax-web-extender-war.jar" />
       </fileset>
       <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/resources/jbossas" targetdir="${jbossInstallPath}/server/${jbossTargetServer}/deploy/osgi" override="true">
         <include name="microcontainer-service-jboss-beans.xml" />
-        <include name="pax-web-extender-war.jar" />
       </fileset>
 
       <!-- JBossMC Integration -->