[jboss-cvs] JBossAS SVN: r103891 - in trunk: testsuite and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Apr 13 05:37:38 EDT 2010
Author: thomas.diesler at jboss.com
Date: 2010-04-13 05:37:37 -0400 (Tue, 13 Apr 2010)
New Revision: 103891
Modified:
trunk/component-matrix/pom.xml
trunk/testsuite/build.xml
trunk/testsuite/imports/server-config.xml
Log:
[JBAS-7657] Integrate osgi tests in 'tests' target
Modified: trunk/component-matrix/pom.xml
===================================================================
--- trunk/component-matrix/pom.xml 2010-04-13 09:32:10 UTC (rev 103890)
+++ trunk/component-matrix/pom.xml 2010-04-13 09:37:37 UTC (rev 103891)
@@ -57,17 +57,17 @@
<version.jboss.osgi.blueprint>1.0.0.Beta2</version.jboss.osgi.blueprint>
<version.jboss.osgi.common>1.0.4</version.jboss.osgi.common>
<version.jboss.osgi.common.core>2.2.13.GA</version.jboss.osgi.common.core>
- <version.jboss.osgi.deployers>1.0.6</version.jboss.osgi.deployers>
+ <version.jboss.osgi.deployers>1.0.7</version.jboss.osgi.deployers>
<version.jboss.osgi.deployment>1.0.2</version.jboss.osgi.deployment>
<version.jboss.osgi.framework>1.0.0.Alpha4</version.jboss.osgi.framework>
<version.jboss.osgi.husky>1.0.4</version.jboss.osgi.husky>
<version.jboss.osgi.jaxb>2.1.10.SP4</version.jboss.osgi.jaxb>
<version.jboss.osgi.jbossas>1.0.3</version.jboss.osgi.jbossas>
- <version.jboss.osgi.jmx>1.0.4</version.jboss.osgi.jmx>
+ <version.jboss.osgi.jmx>1.0.5</version.jboss.osgi.jmx>
<version.jboss.osgi.jndi>1.0.3</version.jboss.osgi.jndi>
<version.jboss.osgi.jta>1.0.1</version.jboss.osgi.jta>
<version.jboss.osgi.reflect>2.2.0</version.jboss.osgi.reflect>
- <version.jboss.osgi.spi>1.0.5.SP1</version.jboss.osgi.spi>
+ <version.jboss.osgi.spi>1.0.6</version.jboss.osgi.spi>
<version.jboss.osgi.vfs>1.0.0</version.jboss.osgi.vfs>
<version.jboss.osgi.webapp>0.7.2.SP2</version.jboss.osgi.webapp>
<version.jboss.osgi.webconsole>1.0.3</version.jboss.osgi.webconsole>
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2010-04-13 09:32:10 UTC (rev 103890)
+++ trunk/testsuite/build.xml 2010-04-13 09:37:37 UTC (rev 103891)
@@ -1257,9 +1257,6 @@
<antcall target="tests-profileservice" inheritRefs="true"/>
<antcall target="tests-bootstrap-dependencies" inheritRefs="true"/>
<antcall target="tests-springdeployer" inheritRefs="true"/>
-
- <!-- <antcall target="tests-security-manager" inheritRefs="true"/> -->
-
<antcall target="tests-clustering-all-stacks" inheritRefs="true"/>
<antcall target="tomcat-ssl-tests" inheritRefs="true"/>
<antcall target="tomcat-sso-tests" inheritRefs="true"/>
@@ -1267,33 +1264,26 @@
<antcall target="tomcat-webctx-tests" inheritRefs="true"/>
<antcall target="tomcat-federation-tests" inheritRefs="true"/>
<antcall target="tests-binding-manager" inheritRefs="true"/>
-<!--
- <antcall target="tests-security-jaspi-unit"/>
--->
+ <!-- <antcall target="tests-security-manager" inheritRefs="true"/> -->
+ <!-- <antcall target="tests-security-jaspi-unit"/> -->
<antcall target="tests-hornetq" inheritRefs="true"/>
-<!-- JBAS-7154
- <antcall target="tests-compatibility" inheritRefs="true"/>
--->
+ <!-- JBAS-7154 <antcall target="tests-compatibility" inheritRefs="true"/> -->
<antcall target="tests-aop-scoped" inheritRefs="true"/>
<antcall target="jrmp-invoker-tests" inheritRefs="true"/>
<antcall target="tests-clustered-profileservice" inheritRefs="true"/>
- <!-- JBAS-7680 the current 'web' profile is not an EE6 web profile
- and doesn't include JPA, so these WebJPA tests are disabled
+ <!-- JBAS-7680 the current 'web' profile is not an EE6 web profile and doesn't include JPA, so these WebJPA tests are disabled
<antcall target="tests-web-profile" inheritRefs="true"/>
-->
<antcall target="tests-web-ondemand-disabled" inheritRefs="true"/>
<antcall target="tests-jts" inheritRefs="true"/>
-
- <antcall target="tests-jacc-security" inheritRefs="true"/>
+ <antcall target="tests-jacc-security" inheritRefs="true"/>
<antcall target="tests-jacc-security-allstarrole" inheritRefs="true"/>
<antcall target="tests-jacc-securitymgr" inheritRefs="true"/>
-
<antcall target="tests-mod_cluster" inheritRefs="true"/>
<antcall target="tests-ha-mod_cluster" inheritRefs="true"/>
-
+ <antcall target="tests-osgi" inheritRefs="true"/>
<!-- JBAS-7247 classloader leak tests have been moved out of this
target; see target tests-all-classloader-leak -->
-
<antcall target="tests-report" inheritRefs="true"/>
<!-- JBAS-5918 https://issues.apache.org/bugzilla/show_bug.cgi?id=41368
<record name="${basedir}/output/tests.log" action="stop"/>
@@ -2644,7 +2634,14 @@
</target>
<!-- Test the OSGi setup -->
- <target name="tests-osgi" depends="init" description="">
+ <target name="tests-osgi" depends="init"
+ description="A basic set of OSGi units tests which are run against the jboss osgi config">
+ <server:start name="osgi"/>
+ <antcall target="tests-osgi-raw" inheritRefs="true"/>
+ <server:stop name="osgi"/>
+ </target>
+
+ <target name="tests-osgi-raw" depends="init">
<mkdir dir="${build.reports}"/>
<mkdir dir="${build.testlog}"/>
<junit dir="${module.output}"
Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml 2010-04-13 09:32:10 UTC (rev 103890)
+++ trunk/testsuite/imports/server-config.xml 2010-04-13 09:37:37 UTC (rev 103891)
@@ -255,6 +255,14 @@
<sysproperty key="java.net.preferIPv4Stack" value="true" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
</server>
+ <server name="osgi" host="${node0}">
+ <jvmarg value="-Xms128m" />
+ <jvmarg value="-Xmx256m" />
+ <jvmarg value="-XX:MaxPermSize=512m" />
+ <jvmarg value="-XX:-UseGCOverheadLimit" />
+ <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
+ </server>
<server name="tomcat-webctx" host="${node0}">
<jvmarg value="${jpda.cmdline}" />
<jvmarg value="-Xms128m" />
More information about the jboss-cvs-commits
mailing list