[jboss-cvs] JBossAS SVN: r99981 - in projects/jboss-osgi/trunk: testsuite/example and 1 other directories.

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

Author: thomas.diesler at jboss.com
Date: 2010-01-27 04:33:11 -0500 (Wed, 27 Jan 2010)
New Revision: 99981

Modified:
   projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml
   projects/jboss-osgi/trunk/testsuite/example/pom.xml
   projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppExtenderTestCase.java
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 06:37:36 UTC (rev 99980)
+++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml	2010-01-27 09:33:11 UTC (rev 99981)
@@ -270,6 +270,12 @@
       <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib/org.osgi" targetdir="$INSTALL_PATH/runtime/server/minimal/deploy" override="true">
         <include name="org.osgi.compendium.jar" />
       </fileset>
+      <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/web/deploy" override="true">
+        <include name="pax-web-extender-war.jar" />
+      </fileset>
+      <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/all/deploy" override="true">
+        <include name="pax-web-extender-war.jar" />
+      </fileset>
 
       <!-- Equinox Integration -->
 
@@ -291,6 +297,12 @@
         <include name="org.eclipse.osgi.services.jar" />
         <include name="org.eclipse.osgi.util.jar" />
       </fileset>
+      <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/web/deploy" override="true">
+        <include name="pax-web-extender-war.jar" />
+      </fileset>
+      <fileset condition="isEquinox" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/server/all/deploy" override="true">
+        <include name="pax-web-extender-war.jar" />
+      </fileset>
 
       <!-- JBossMC Integration -->
 
@@ -422,6 +434,7 @@
       </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 -->
@@ -442,6 +455,7 @@
       </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 -->

Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/pom.xml	2010-01-27 06:37:36 UTC (rev 99980)
+++ projects/jboss-osgi/trunk/testsuite/example/pom.xml	2010-01-27 09:33:11 UTC (rev 99981)
@@ -187,6 +187,7 @@
                 <!-- Functionality not supported in Equinox -->                
                 <exclude>org/jboss/test/osgi/example/interceptor/**</exclude>
                 <exclude>org/jboss/test/osgi/example/microcontainer/**</exclude>
+                <exclude>org/jboss/test/osgi/example/serviceloader/**</exclude>
                 <exclude>org/jboss/test/osgi/example/webapp/WebAppNegativeTestCase.class</exclude>
                 <exclude>org/jboss/test/osgi/example/webapp/WebAppInterceptorTestCase.class</exclude>
               </excludes>
@@ -241,6 +242,7 @@
                 <!-- Functionality not supported in Felix -->                
                 <exclude>org/jboss/test/osgi/example/interceptor/**</exclude>
                 <exclude>org/jboss/test/osgi/example/microcontainer/**</exclude>
+                <exclude>org/jboss/test/osgi/example/serviceloader/**</exclude>
               </excludes>
             </configuration>
           </plugin>

Modified: projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppExtenderTestCase.java
===================================================================
--- projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppExtenderTestCase.java	2010-01-27 06:37:36 UTC (rev 99980)
+++ projects/jboss-osgi/trunk/testsuite/example/src/test/java/org/jboss/test/osgi/example/webapp/WebAppExtenderTestCase.java	2010-01-27 09:33:11 UTC (rev 99981)
@@ -53,9 +53,6 @@
 
       runtime = osgiTestHelper.getDefaultRuntime();
       runtime.addCapability(new HttpServiceCapability());
-
-      runtime.installBundle("bundles/pax-web-extender-war.jar").start();
-
       runtime.installBundle("example-webapp.war").start();
    }