8:33 a.m.
Author: thomas.diesler(a)jboss.com
Date: 2009-07-14 09:33:53 -0400 (Tue, 14 Jul 2009)
New Revision: 91211
Modified:
projects/jboss-osgi/trunk/reactor/bundles/blueprint/testsuite/.classpath
projects/jboss-osgi/trunk/reactor/bundles/blueprint/testsuite/pom.xml
projects/jboss-osgi/trunk/testsuite/pom.xml
Log:
Disable blueprint tests for equinox and knopflerfish
Modified: projects/jboss-osgi/trunk/reactor/bundles/blueprint/testsuite/.classpath
===================================================================
--- projects/jboss-osgi/trunk/reactor/bundles/blueprint/testsuite/.classpath 2009-07-14
13:31:10 UTC (rev 91210)
+++ projects/jboss-osgi/trunk/reactor/bundles/blueprint/testsuite/.classpath 2009-07-14
13:33:53 UTC (rev 91211)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" output="target/test-classes"
path="src/test/java"/>
- <classpathentry excluding="**" kind="src"
output="target/test-classes" path="src/test/resources"/>
+ <classpathentry kind="src" path="src/test/java"/>
+ <classpathentry excluding="**" kind="src"
path="src/test/resources"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con"
path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
- <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="output" path="target/test-classes"/>
</classpath>
Modified: projects/jboss-osgi/trunk/reactor/bundles/blueprint/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/reactor/bundles/blueprint/testsuite/pom.xml 2009-07-14
13:31:10 UTC (rev 91210)
+++ projects/jboss-osgi/trunk/reactor/bundles/blueprint/testsuite/pom.xml 2009-07-14
13:33:53 UTC (rev 91211)
@@ -119,6 +119,53 @@
<!-- Profiles -->
<profiles>
+ <!--
+ Name: framework-equinox
+ Descr: Setup for Equinox framework integration testing
+ -->
+ <profile>
+ <id>framework-equinox</id>
+ <activation>
+ <property>
+ <name>framework</name>
+ <value>equinox</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <!--
+ Name: framework-knopflerfish
+ Descr: Setup for Knopflerfish framework integration testing
+ -->
+ <profile>
+ <id>framework-knopflerfish</id>
+ <activation>
+ <property>
+ <name>framework</name>
+ <value>knopflerfish</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skipTests>true</skipTests>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
Modified: projects/jboss-osgi/trunk/testsuite/pom.xml
===================================================================
--- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-07-14 13:31:10 UTC (rev 91210)
+++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-07-14 13:33:53 UTC (rev 91211)
@@ -1,16 +1,31 @@
<?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. -->
- <!-- -->
- <!-- ====================================================================== -->
+ <!--
+ ======================================================================
+ -->
+ <!--
+ -->
+ <!--
+ JBoss, the OpenSource J2EE webOS
+ -->
+ <!--
+ -->
+ <!--
+ Distributable under LGPL license.
+ -->
+ <!--
+ See terms of license at http://www.gnu.org.
+ -->
+ <!--
+ -->
+ <!--
+ ======================================================================
+ -->
- <!-- $Id$ -->
-
+ <!--
+ $Id$
+ -->
+
<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>
@@ -37,6 +52,7 @@
<version.javax.servlet>2.4</version.javax.servlet>
<version.jboss.naming>5.0.1.GA</version.jboss.naming>
<version.jboss.microcontainer>2.0.5.GA</version.jboss.microcontainer>
+ <version.jbossas.client>5.0.1.GA</version.jbossas.client>
</properties>
<!-- DependencyManagement -->
@@ -48,6 +64,11 @@
<version>${version.javax.servlet}</version>
</dependency>
<dependency>
+ <groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-as-client</artifactId>
+ <version>${version.jbossas.client}</version>
+ </dependency>
+ <dependency>
<groupId>org.jboss.microcontainer</groupId>
<artifactId>jboss-aop-mc-int</artifactId>
<version>${version.jboss.microcontainer}</version>
@@ -132,9 +153,9 @@
<profiles>
<!--
- Name: framework-default
- Descr: Setup for default framework integration testing
- -->
+ Name: framework-default Descr: Setup for default framework
+ integration testing
+ -->
<profile>
<id>framework-default</id>
<activation>
@@ -151,9 +172,9 @@
</profile>
<!--
- Name: framework-felix
- Descr: Setup for Felix framework integration testing
- -->
+ Name: framework-felix Descr: Setup for Felix framework integration
+ testing
+ -->
<profile>
<id>framework-felix</id>
<activation>
@@ -171,9 +192,9 @@
</profile>
<!--
- Name: framework-equinox
- Descr: Setup for Equinox framework integration testing
- -->
+ Name: framework-equinox Descr: Setup for Equinox framework
+ integration testing
+ -->
<profile>
<id>framework-equinox</id>
<activation>
@@ -204,9 +225,9 @@
</profile>
<!--
- Name: framework-knopflerfish
- Descr: Setup for Knopflerfish framework integration testing
- -->
+ Name: framework-knopflerfish Descr: Setup for Knopflerfish framework
+ integration testing
+ -->
<profile>
<id>framework-knopflerfish</id>
<activation>
@@ -237,9 +258,8 @@
</profile>
<!--
- Name: embedded-testing
- Descr: Setup for embedded integration testing
- -->
+ Name: embedded-testing Descr: Setup for embedded integration testing
+ -->
<profile>
<id>embedded-testing</id>
<activation>
@@ -263,9 +283,8 @@
</profile>
<!--
- Name: runtime-testing
- Descr: Setup for runtime integration testing
- -->
+ Name: runtime-testing Descr: Setup for runtime integration testing
+ -->
<profile>
<id>runtime-testing</id>
<activation>
@@ -290,9 +309,8 @@
</profile>
<!--
- Name: jboss501
- Descr: Setup for jboss501 integration testing
- -->
+ Name: jboss501 Descr: Setup for jboss501 integration testing
+ -->
<profile>
<id>jboss501</id>
<activation>
@@ -312,9 +330,8 @@
</profile>
<!--
- Name: jboss510
- Descr: Setup for jboss510 integration testing
- -->
+ Name: jboss510 Descr: Setup for jboss510 integration testing
+ -->
<profile>
<id>jboss510</id>
<activation>
@@ -334,9 +351,8 @@
</profile>
<!--
- Name: jboss600
- Descr: Setup for jboss600 integration testing
- -->
+ Name: jboss600 Descr: Setup for jboss600 integration testing
+ -->
<profile>
<id>jboss600</id>
<activation>