[jboss-cvs] JBossAS SVN: r112246 - in branches/JBPAPP_5_1_0_Final_JBPAPP-7180/testsuite: src/main/org/jboss/test/ejb3 and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Sep 16 02:32:46 EDT 2011
Author: bmaxwell
Date: 2011-09-16 02:32:46 -0400 (Fri, 16 Sep 2011)
New Revision: 112246
Added:
branches/JBPAPP_5_1_0_Final_JBPAPP-7180/testsuite/src/main/org/jboss/test/ejb3/JBPAPP7128UnitTestCase.java
Modified:
branches/JBPAPP_5_1_0_Final_JBPAPP-7180/testsuite/build.xml
Log:
[JBPAPP-7180] adding testcase for JBPAPP-7128
Modified: branches/JBPAPP_5_1_0_Final_JBPAPP-7180/testsuite/build.xml
===================================================================
--- branches/JBPAPP_5_1_0_Final_JBPAPP-7180/testsuite/build.xml 2011-09-15 19:10:09 UTC (rev 112245)
+++ branches/JBPAPP_5_1_0_Final_JBPAPP-7180/testsuite/build.xml 2011-09-16 06:32:46 UTC (rev 112246)
@@ -79,6 +79,10 @@
<property name="node1.hajndi.url" value="jnp://${node1}:1100" />
<property name="node1.jndi.http.url" value="http://${node1}:8080/invoker/JNDIFactory" />
+ <!-- Client artefacts default -->
+ <property name="target.node" value="${node0}" />
+
+
<!-- UDP Group -->
<!-- The value of the -u option passed to jboss -->
<!-- A blank value will prevent the -u option from being passed -->
@@ -113,7 +117,7 @@
this is used in the security policy file property references and needs to
be valid for the platform.
-->
- <property name="version" value="${version.major}.${version.minor}.${version.revision}"/>
+ <property name="version" value="${version.major}.${version.minor}.${version.revision}.${version.tag}"/>
<property name="jboss.dist.default" value="${project.root}${/}build${/}output${/}jboss-${version}"/>
<condition property="jboss.dist" value="${jboss.dist.default}">
<not>
@@ -170,8 +174,11 @@
<path refid="jboss.jboss.ejb3.ext.api.classpath" />
<path refid="jboss.jboss.ejb3.proxy.impl.classpath" />
<path refid="jboss.jboss.ejb3.proxy.spi.classpath" />
+ <path refid="jboss.jboss.ejb3.transactions.classpath" />
<path refid="ejb3-persistence.classpath"/>
<path refid="org.jboss.ws.native.classpath"/>
+ <path refid="org.jboss.spec.javax.xml.rpc.classpath"/>
+ <path refid="saaj.api.classpath"/>
<path refid="org.jboss.ws.classpath"/>
<path refid="jboss.jbossxb.classpath"/>
<path refid="jboss.metadata.classpath"/>
@@ -320,9 +327,14 @@
<pathelement path="${jboss.dist.client}/jboss-remoting.jar" />
<!-- path refid="jboss.serialization.classpath"/ -->
<pathelement path="${jboss.dist.client}/jboss-serialization.jar" />
+ <!-- path refid="jboss.jboss.ejb3.context.base.classpath" / -->
+ <pathelement path="${jboss.dist.common.lib}/jboss-ejb3-context-base.jar" />
<!-- path refid="jboss.jboss.ejb3.core.classpath" / -->
<pathelement path="${jboss.dist.client}/jboss-ejb3-core-client.jar" />
<pathelement path="${jboss.dist.common.lib}/jboss-ejb3-core.jar" />
+ <!-- ejb3 deployer classpath -->
+ <pathelement path="${jboss.dist.server}/all/deployers/ejb3.deployer/jboss-ejb3-deployer.jar" />
+ <path refid="jboss.jboss.jpa.deployers.classpath" />
<!-- path refid="jboss.jboss.ejb3.ext.api.classpath" / -->
<pathelement path="${jboss.dist.client}/jboss-ejb3-ext-api.jar" />
<!-- path refid="jboss.jboss.ejb3.proxy.impl.classpath" / -->
@@ -338,12 +350,12 @@
<!-- path refid="org.jboss.ws.native.classpath"/ -->
<pathelement path="${jboss.dist.client}/jbossws-native-client.jar" />
<pathelement path="${jboss.dist.client}/jbossws-native-core.jar" />
- <pathelement path="${jboss.dist.client}/jbossws-native-jaxrpc.jar" />
<pathelement path="${jboss.dist.client}/jbossws-native-jaxws-ext.jar" />
<pathelement path="${jboss.dist.client}/jbossws-native-jaxws.jar" />
<pathelement path="${org.jboss.ws.native.lib}/jbossws-native-management.war" />
<pathelement path="${org.jboss.ws.native.lib}/jbossws-native-resources.jar" />
- <pathelement path="${jboss.dist.client}/jbossws-native-saaj.jar" />
+ <pathelement path="${org.jboss.spec.javax.xml.rpc.lib}/jboss-jaxrpc-api_1.1_spec.jar"/>
+ <pathelement path="${saaj.api.lib}/saaj-api.jar"/>
<!-- path refid="org.jboss.ws.classpath"/ -->
<pathelement path="${jboss.dist.client}/jbossws-common.jar" />
<pathelement path="${jboss.dist.client}/jbossws-framework.jar" />
@@ -684,6 +696,7 @@
<pathelement path="${project.tools}/lib/ant.jar"/>
<pathelement path="${project.tools}/lib/ant-junit.jar"/>
<path refid="jboss.ejb3.classpath"/>
+ <pathelement path="${jboss.dist.server}/all/deployers/ejb3.deployer/jboss-ejb3-deployer.jar" />
<path refid="jboss.jmx.classpath"/>
<path refid="jboss.jmx-remoting.classpath"/>
<path refid="jboss.test.classpath"/>
@@ -930,7 +943,7 @@
</target>
- <target name="compile-classes-only" depends="compile-annotated-classes-50">
+ <target name="compile-classes-only" depends="compile-annotated-classes-50,compile-jacorb-stubs">
<mkdir dir="${build.classes}"/>
<javac destdir="${build.classes}"
optimize="${javac.optimize}"
@@ -966,9 +979,26 @@
>
<classpath refid="tests.compile.classpath"/>
<patternset refid="rmic.includes" />
- </rmic>
+ </rmic>
</target>
+
+ <target name="compile-jacorb-stubs">
+ <!-- Create JacORB-based Stubs for JBPAPP-6462 -->
+ <taskdef name="jacidl" classname="org.jacorb.idl.JacIDL">
+ <classpath>
+ <pathelement location="../thirdparty/jacorb/lib/idl.jar"/>
+ <pathelement location="../thirdparty/apache-avalon-logkit/lib/logkit.jar"/>
+ </classpath>
+ </taskdef>
+ <jacidl srcdir="${source.java}/org/jboss/test/iiop/jbpapp6462/idl"
+ destdir="${source.java}"
+ includes="jbpapp6462.idl"
+ all="true">
+ <i2jpackage names=":org.jboss.test.iiop.jbpapp6462.generated"/>
+ </jacidl>
+ </target>
+
<!-- Compile resource files -->
<target name="compile-resources">
<mkdir dir="${build.resources}"/>
@@ -1044,7 +1074,52 @@
Use ant -projecthelp to list all documented targets.
</echo>
</target>
+
+ <!-- Unsigns all jars (rars, wars, ears) in JBoss AS located in ${jboss.dist},
+ original JBoss AS with signed jars (rars, wars, ears) is moved to ${jboss.dist}.signed.
+ Property unsign.supressBackup="true", disables backup of original signed JBoss AS. -->
+ <target name="unsign" description="Unsigns all jars in current JBoss AS.">
+ <taskdef resource="net/sf/antcontrib/antlib.xml"
+ classpath="${project.tools}/lib/ant-contrib-1.0b3.jar"/> <!-- ant-contrib jar location -->
+ <property name="sf" value="JBOSSCOD.SF"/>
+ <property name="rsa" value="JBOSSCOD.RSA"/>
+
+ <!-- Check if backup is needed -->
+ <if>
+ <not>
+ <equals arg1="${unsign.supressBackup}" arg2="true" />
+ </not>
+ <then>
+ <copy toDir="${jboss.dist}.signed">
+ <fileSet dir="${jboss.dist}"/>
+ </copy>
+ </then>
+ </if>
+ <for param="file">
+ <path>
+ <fileset dir="${jboss.dist}">
+ <include name="**/*.jar"/>
+ <include name="**/*.rar"/>
+ <include name="**/*.war"/>
+ <include name="**/*.ear"/>
+ </fileset>
+ </path>
+ <sequential>
+ <jar destfile="@{file}-unsigned">
+ <zipfileset src="@{file}">
+ <exclude name="**/*${sf}"/>
+ <exclude name="**/*${rsa}"/>
+ </zipfileset>
+ </jar>
+ <delete file="@{file}"/>
+ <move file="@{file}-unsigned" tofile="@{file}"/>
+ </sequential>
+ </for>
+
+ </target>
+
+
<!-- ================================================================== -->
<!-- Tests -->
<!-- ================================================================== -->
@@ -1222,8 +1297,68 @@
<exclude name="**/test/security/test/client/*UnitTestCase.class"/>
<exclude name="**/test/profileservice/testsecure/*UnitTestCase.class"/>
<exclude name="**/test/passwordinjection/test/*UnitTestCase.class"/>
- <exclude name="**/test/security/test/authorization/secured/*UnitTestCase.class"/>
+ <exclude name="**/test/security/test/authorization/secured/*.class"/>
</patternset>
+ <!-- A patternset required for Common Criteria certification -->
+ <patternset id="cc.includes">
+ <include name="**/test/tm/test/TxTimeout*TestCase.class"/>
+ <include name="**/test/security/rmi/test/*TestCase.class"/>
+ <include name="org/jboss/test/security/test/CallerInfoUnitTestCase.class"/>
+ <include name="org.jboss.test.deployers.web.test.WEBDeploymentUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/SubjectContextUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/DeepCopySubjectUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/EJB3SpecUnitTestCase.class"/>
+ <include name="org/jboss/test/ejb3/jbpapp2473/unit/RunAsUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/EJBSpecUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/LoginContextUnitTestCas.class"/>
+ <include name="org/jboss/test/security/test/NamespacePermissionsUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/PermissionNameUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/WebConstraintsUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/WebResourcePermissionUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/WebUserDataPermissionUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/auth.AppCallbackHandlerUnitTestCase.class"/>
+ <include name="org/jboss/test/jmx/test/RMIAdaptorAuthorizationUnitTestCase.class"/>
+ <include name="org/jboss/test/jmx/testRMIAdaptorUnitTestCase.class"/>
+ <include name="org/jboss/test/web/test/ssl/SSLUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/ClientLoginModuleEJBUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/ClientLoginModuleUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/CustomPrincipalPropagationUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/DynamicLoginConfigServiceUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/EJBPermissionUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/JaasSecurityDomainUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/LoginModulesUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/MissingMethodUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/RoleMappingModuleUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/SAInheritableThreadLocalUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/SAThreadLocalUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/SecurityDomainLoginModuleOptionUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/SecurityMgrStressTestCase.class"/>
+ <include name="org/jboss/test/security/test/SecurityProxyUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/XMLLoginModulesUnitTestCase.class"/>
+ <include name="org/jboss/test/securitymgr/test/PolicyUnitTestCase.class"/>
+ <include name="org/jboss/test/web/test/WebIntegrationUnitTestCase.class"/>
+ <include name="org/jboss/test/web/security/CustomHeaderAuthTestCase.class"/>
+ <include name="org/jboss/test/web/test/FormAuthUnitTestCase.class"/>
+ <include name="org/jboss/test/web/test/SingleSignOnUnitTestCase.class"/>
+ <include name="org/jboss/test/web/test/UserInRoleUnitTestCase.class"/>
+ <include name="org/jboss/test/web/test/WebProgrammaticLoginTestCase.class"/>
+ <include name="org/jboss/test/jmx/test/SecureRMIAdaptorUnitTestCase.class"/>
+ <include name="org/jboss/test/security/rmi/test/RMIOverHttpsTestCase.class"/>
+ <include name="org/jboss/test/naming/test/SecurityUnitTestCase.class"/>
+ <include name="org/jboss/test/aop/test/SecurityUnitTestCase.class"/>
+ <include name="org/jboss/test/jbossts/ASCrashRecovery01/TestWithJPA.class"/>
+ <include name="org/jboss/test/jbossts/ASCrashRecovery01/WipeOutTxsInDoubt.class"/>
+ <include name="org/jboss/test/jbossts/ASCrashRecovery02/TestWithJMS.class"/>
+ <include name="org/jboss/test/tm/test/TxTimeoutAnnotUnitTestCase.class"/>
+ <include name="org/jboss/test/invokers/test/MultiInvokersUnitTestCase.class"/>
+ <include name="org/jboss/test/cluster/defaultcfg/test/HAInvokerUnitTestCase.class"/>
+ <include name="org/jboss/test/ws/jaxws/ejb3Integration/injection/InjectionTestCase.class"/>
+ </patternset>
+ <!-- pattern set for cc-audit configuration -->
+ <patternset id="cc-audit.includes">
+ <include name="org/jboss/test/scripts/test/ShutdownTestCase.class"/>
+ <include name="org/jboss/test/scripts/test/RunTestCase.class"/>
+ </patternset>
<!-- A patternset that requires jboss to run with a security manager -->
<patternset id="securitymgr.includes">
<include name="**/test/securitymgr/test/*TestCase.class"/>
@@ -1382,6 +1517,7 @@
<exclude name="org/jboss/test/web/test/JSFInjectionUnitTestCase.class" if="build.ewp"/>
<exclude name="org/jboss/test/web/test/JSPAnnotationENCUnitTestCase.class" if="build.ewp"/>
<exclude name="org/jboss/test/web/test/WebIntegrationUnitTestCase.class" if="build.ewp"/>
+ <exclude name="org/jboss/test/web/jbas8318/unit/ResourceInjectionOnNonJavaEEComponentsTestCase.class" if="build.ewp"/>
<!-- EWP doesn't ships bsh.jar -->
<exclude name="org/jboss/test/deployers/seam/test/SeamDvdstoreExampleUnitTestCase.class" if="build.ewp"/>
@@ -1574,9 +1710,7 @@
<antcall target="tests-profileservice"/>
<antcall target="tests-bootstrap-dependencies"/>
<antcall target="tests-springdeployer"/>
-<!--
<antcall target="tests-security-manager"/>
--->
<antcall target="tests-clustering-all-stacks"/>
<antcall target="tomcat-ssl-tests"/>
<antcall target="tomcat-sso-tests"/>
@@ -1603,6 +1737,10 @@
<antcall target="tests-classloader-leak"/>
<antcall target="tests-clustered-classloader-leak"/>
-->
+
+ <antcall target="tests-jbpapp6517"/>
+ <antcall target="tests-jbpapp6469"/>
+ <antcall target="tests-jbpapp6523"/>
<antcall target="tests-report"/>
<!-- JBAS-5918 https://issues.apache.org/bugzilla/show_bug.cgi?id=41368
@@ -1674,10 +1812,536 @@
<antcall target="tests-iiop"/>
<antcall target="tests-scout-jaxr"/>
<antcall target="tests-webservice" />
+ <antcall target="tests-ws" />
<antcall target="tests-aspects"/>
<server:stop name="${conf}"/>
</target>
+ <target name="security-basic-tests"
+ description="The units tests which are run against the jboss all config" depends="init">
+
+
+ <!-- Default configuration to run the tests against -->
+ <property name="conf" value="all"/>
+
+ <echo message="Replacing hornetq-roles and hornetq-users.properties used for tests"/>
+
+ <copy file="${module.output}/resources/test-configs/jbossmessaging/conf/props/hornetq-roles.properties"
+ tofile="${jboss.dist}/server/${conf}/conf/props/hornetq-roles.properties" overwrite="true"/>
+
+ <copy file="${module.output}/resources/test-configs/jbossmessaging/conf/props/hornetq-users.properties"
+ tofile="${jboss.dist}/server/${conf}/conf/props/hornetq-users.properties" overwrite="true"/>
+
+ <server:start name="${conf}"/>
+
+ <antcall target="tests-security-basic-unit">
+ <param name="custom.excludes" value="ec2.excludes" />
+ </antcall>
+
+ <server:stop name="${conf}" />
+ </target>
+
+ <!-- Calculates MD5 sums for all libraries used while testing.
+ This will be used as proof of testing for CC evaluation.
+ -->
+ <target name="calculate-md5">
+ <mkdir dir="${build.reports}/html"/>
+
+ <java classname="org.jboss.test.util.CheckSumCalculator">
+ <classpath>
+ <pathelement location="${build.classes}" />
+ </classpath>
+ <arg line="-base ${jboss.dist}/ -output ${build.reports}/html/allmd5sum.txt -d ${jboss.dist}/lib -d ${jboss.dist}/server/cc/lib -d ${jboss.dist}/server/cc/deploy -d ${jboss.dist}/client"/>
+ </java>
+
+ </target>
+
+ <!-- This target creates CC configuration -->
+ <target name="create-cc-config" description="Creates CC configuration">
+
+ <delete dir="${jboss.dist}${/}server${/}cc" quiet="true"/>
+ <delete dir="${jboss.dist}${/}server${/}cc-audit" quiet="true"/>
+
+ <!-- Create the CC config starting with the production config -->
+ <create-config baseconf="production" newconf="cc">
+ <patternset>
+ <include name="conf/**" />
+ <include name="deployers/**" />
+ <include name="deploy/**" />
+ <include name="deploy-hasingleton/**" />
+ <include name="farm/**" />
+ <include name="lib/**" />
+ </patternset>
+ </create-config>
+
+ <!-- Additional cc config modifications -->
+ <copy file="${build.resources}/cc/cc.policy" todir="${jboss.dist}/server/cc" />
+
+ <!-- runs only when "cc.use.natives" property is set to true -->
+ <antcall target="modify-cc-to-natives"/>
+
+
+ <!-- delete SNMP adapter, because it is not allowed in CC config -->
+ <delete dir="${jboss.dist}/server/cc/deploy/snmp-adaptor.sar"/>
+
+ <!-- delete HSQL DB which is not allowed in CC config
+ Alternate configuration at test-configs/cc/deploy contains DefaultDS
+ file called oracle-ds.xml for default Oracle DB.
+ -->
+ <!-- delete file="${jboss.dist}/common/lib/hsqldb.jar"/ -->
+ <!-- delete file="${jboss.dist}/common/lib/hsqldb-plugin.jar"/ -->
+ <delete file="${jboss.dist}/server/cc/deploy/hsqldb-ds.xml"/>
+ <delete file="${jboss.dist}/server/cc/deploy/messaging/hsqldb-persistence-service.xml"/>
+
+ <!-- Disable Remote Method Invocation (RMI) under the Internet Inter-ORB Protocol (IIOP) -->
+ <delete file="${jboss.dist}/server/cc/conf/jacorb.properties"/>
+ <delete file="${jboss.dist}/server/cc/deploy/iiop-service.xml"/>
+ <delete file="${jboss.dist}/server/cc/lib/jacorb.jar"/>
+ <!-- delete file="${jboss.dist}/common/lib/jboss-iiop.jar"/ -->
+
+ <!-- copy alternate part of configuration with regards to DB -->
+ <copy todir="${jboss.dist}/server/cc/deploy" overwrite="true">
+ <fileset dir="${cc.db.config.home}/${cc.db.config}">
+ <include name="*"/>
+ </fileset>
+ </copy>
+
+ <!-- copy alternate part of configuration using property cc.login.config -->
+ <copy todir="${jboss.dist}/server/cc" overwrite="true">
+ <fileset dir="${build.resources}/cc/${cc.login.config}">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+
+ <!-- DB config patch (copy JDBC driver library) -->
+ <get src="http://reports.qa.atl.jboss.com/jdbc-drivers-products/EAP/5.1.0/${cc.path.jdbc.driver}/${cc.jdbc.driver}"
+ dest="${jboss.dist}/server/cc/lib/${cc.jdbc.driver}" />
+
+ <!-- create cc-audit as copy of cc -->
+ <create-config baseconf="cc" newconf="cc-audit">
+ <patternset>
+ <include name="conf/**" />
+ <include name="deployers/**" />
+ <include name="deploy/**" />
+ <include name="deploy-hasingleton/**" />
+ <include name="farm/**" />
+ <include name="lib/**" />
+ <include name="cc.*"/>
+ <include name="ssl.*"/>
+ <include name="localhost.*"/>
+ </patternset>
+ </create-config>
+
+ <!-- create cc-secured as copy of cc -->
+ <create-config baseconf="cc" newconf="cc-secured">
+ <patternset>
+ <include name="conf/**" />
+ <include name="deployers/**" />
+ <include name="deploy/**" />
+ <include name="deploy-hasingleton/**" />
+ <include name="farm/**" />
+ <include name="lib/**" />
+ <include name="cc.*"/>
+ <include name="ssl.*"/>
+ <include name="localhost.*"/>
+ </patternset>
+ </create-config>
+
+ <!-- create cc-cxf as copy of cc -->
+ <create-config baseconf="cc" newconf="cc-cxf">
+ <patternset>
+ <include name="conf/**" />
+ <include name="deployers/**" />
+ <include name="deploy/**" />
+ <include name="deploy-hasingleton/**" />
+ <include name="farm/**" />
+ <include name="lib/**" />
+ <include name="cc.*"/>
+ <include name="ssl.*"/>
+ <include name="localhost.*"/>
+ </patternset>
+ </create-config>
+
+ <!-- prepare run.conf for audit testing -->
+ <echo file="${jboss.dist}/server/cc-audit/run.conf">
+ JAVA_OPTS="-Xms128m -Xmx512m -XX:MaxPermSize=256m -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -Dsun.lang.ClassLoader.allowArraySyntax=true -Djboss.home.dir=${jboss.dist} -Djboss.server.home.dir=${jboss.dist}/server/cc-audit -Djava.security.manager -Djava.security.policy==${jboss.dist}/server/cc-audit/cc.policy -Dcc.jdbc.driver=${cc.jdbc.driver}"</echo>
+
+ <!-- prepare run.conf for later CXF testing -->
+ <echo file="${jboss.dist}/server/cc-cxf/run.conf">
+ JAVA_OPTS="-Xms128m -Xmx512m -XX:MaxPermSize=512m -Dorg.jboss.resolver.warning=true -Dsun.rmi.dgc.client.gcInterval=3600000 -Dsun.rmi.dgc.server.gcInterval=3600000 -Dsun.lang.ClassLoader.allowArraySyntax=true -Djboss.home.dir=${jboss.dist} -Djboss.server.home.dir=${jboss.dist}/server/cc-cxf -Djava.security.manager -Djava.security.policy==${jboss.dist}/server/cc-cxf/cc.policy -Dcc.jdbc.driver=${cc.jdbc.driver}"</echo>
+
+ <!-- JTA tests CC related config -->
+ <copy todir="${build.resources}/jbossts/scripts/imports/" overwrite="true">
+ <fileset dir="${build.resources}/cc/jta">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+
+ </target>
+
+ <!-- Modify default cc config to use jboss natives -->
+ <target name="modify-cc-to-natives" if="cc.use.natives">
+ <copy todir="${jboss.dist}/server/cc" overwrite="true">
+ <fileset dir="${build.resources}/test-configs/cc-native">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
+
+ <!--
+ | Tests for Common Criteria Evaluation. The JBoss server must be running with a security manager for those tests
+ | This target has to run with jboss.test.sign.jars property set to true.
+ -->
+ <target name="tests-common-criteria" description="Tests run against a jboss server configured according to CC Guide" depends="init">
+
+ <property name="cc-testify" value="true"/>
+
+ <antcall target="create-cc-config" />
+
+ <echo message="Starting CC with policy ${build.resources}/test-configs/cc/cc.policy" />
+ <echo message="jboss.home.dir=${jboss.dist}" />
+ <echo message="jboss.server.home.dir=${jboss.dist}${/}server${/}cc" />
+ <echo message="java.naming.provider.url=jnp://localhost:1099" />
+ <echo message="jbosstest.server.host=localhost" />
+ <echo message="cc.java.security.debug=${cc.java.security.debug}" />
+
+ <server:start name="cc" />
+
+
+ <junit dir="${module.output}" printsummary="true" haltonerror="false" haltonfailure="false" fork="true" timeout="${junit.timeout}" jvm="${junit.jvm}">
+
+ <jvmarg line="${junit.jvm.options}" />
+
+ <!-- sysproperty key="java.naming.provider.url" value="${node0.jndi.url}" />
+ <sysproperty key="jbosstest.server.host" value="${node0}" / -->
+ <sysproperty key="java.naming.provider.url" value="jnp://localhost:1099" />
+ <sysproperty key="jbosstest.server.host" value="localhost" />
+ <sysproperty key="jboss.home" file="${project.root}" />
+ <sysproperty key="jboss.thirdparty.dir" file="${project.root}/thirdparty" />
+ <sysproperty key="jboss.tools.dir" file="${project.root}/tools" />
+ <sysproperty key="jbosstest.deploy.dir" file="${build.lib}" />
+ <sysproperty key="jbosstest.secure" value="true" />
+ <sysproperty key="java.security.auth.login.config" value="${build.resources}/security/auth.conf" />
+ <sysproperty key="build.testlog" value="${build.testlog}" />
+ <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml" />
+
+ <!-- all entries from ${build.resources}/test-configs/tomcat-ssl/conf/client.keystore
+ were imported to ssl.truststore -->
+ <sysproperty key="javax.net.ssl.trustStore" value="${build.resources}/test-configs/cc/ssl.truststore" />
+ <sysproperty key="javax.net.ssl.trustStorePassword" value="123456" />
+ <sysproperty key="javax.net.ssl.keyStore" value="${build.resources}/test-configs/tomcat-ssl/conf/client.keystore" />
+ <sysproperty key="javax.net.ssl.keyStorePassword" value="unit-tests-client" />
+
+ <!-- Disable test -->
+ <sysproperty key="cc.disabled.test.methods" value="testSecurityDomain" />
+
+ <!-- tomcat-ssl tests -->
+ <sysproperty key="web.port" value="8081" />
+ <sysproperty key="secureweb.port" value="8443" />
+ <!-- RMI over http/s tests -->
+ <sysproperty key="rmi.over.web.port" value="8080" />
+ <sysproperty key="rmi.over.secureweb.port" value="8445" />
+
+ <sysproperty key="java.protocol.handler.pkgs" value="javax.net.ssl" />
+
+ <classpath>
+ <pathelement location="${build.resources}" />
+ <pathelement location="${build.resources}/security" />
+ <pathelement location="${build.classes}" />
+ <path refid="tests.classpath" />
+ </classpath>
+
+ <sysproperty key="jboss-junit-configuration" value="tests-security-manager" />
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}" extension="-tests-security-manager.xml" />
+
+ <batchtest todir="${build.reports}" haltonerror="false" haltonfailure="false" fork="true">
+ <fileset dir="${build.classes}">
+ <!-- <include name="org/jboss/test/aop/test/SecurityUnitTestCase.class"/> -->
+ <!-- <exclude name="org/jboss/test/securitymgr/test/PolicyUnitTestCase.class" /> -->
+ <!-- include name="org/jboss/test/security/test/EJB3SpecUnitTestCase.class"/ -->
+ <!-- include name="org/jboss/test/security/test/EJBSpecUnitTestCase.class"/ -->
+
+
+ <include name="org/jboss/test/jbossmessaging/test/Jms11UnitTest.class"/>
+ <include name="org/jboss/test/jbossmessaging/test/SecurityUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/EJB3SpecUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/EJBSpecUnitTestCase.class"/>
+ <include name="**/test/tm/test/TxTimeout*TestCase.class"/>
+ <include name="org.jboss.test.deployers.web.test.WEBDeploymentUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/SubjectContextUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/DeepCopySubjectUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/LoginContextUnitTestCas.class"/>
+ <include name="org/jboss/test/security/test/NamespacePermissionsUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/PermissionNameUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/WebConstraintsUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/WebResourcePermissionUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/WebUserDataPermissionUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/auth.AppCallbackHandlerUnitTestCase.class"/>
+ <include name="org/jboss/test/jmx/test/RMIAdaptorAuthorizationUnitTestCase.class"/>
+ <include name="org/jboss/test/jmx/testRMIAdaptorUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/ClientLoginModuleEJBUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/ClientLoginModuleUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/CustomPrincipalPropagationUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/DynamicLoginConfigServiceUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/EJBPermissionUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/JaasSecurityDomainUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/LoginModulesUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/MissingMethodUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/RoleMappingModuleUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/SAInheritableThreadLocalUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/SAThreadLocalUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/SecurityDomainLoginModuleOptionUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/SecurityMgrStressTestCase.class"/>
+ <include name="org/jboss/test/security/test/SecurityProxyUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/XMLLoginModulesUnitTestCase.class"/>
+ <include name="org/jboss/test/web/security/CustomHeaderAuthTestCase.class"/>
+ <include name="org/jboss/test/jmx/test/SecureRMIAdaptorUnitTestCase.class"/>
+ <include name="org/jboss/test/tm/test/TxTimeoutAnnotUnitTestCase.class"/>
+ <include name="org/jboss/test/invokers/test/MultiInvokersUnitTestCase.class"/>
+
+ <include name="org/jboss/test/web/test/FormAuthUnitTestCase.class"/>
+ <include name="org/jboss/test/web/test/SingleSignOnUnitTestCase.class"/>
+ <include name="org/jboss/test/web/test/UserInRoleUnitTestCase.class"/>
+ <include name="org/jboss/test/web/test/WebProgrammaticLoginTestCase.class"/>
+ <include name="org/jboss/test/web/test/WebIntegrationUnitTestCase.class"/>
+
+ <include name="org/jboss/test/security/rmi/test/RMIOverHttpsTestCase.class"/>
+ <include name="org/jboss/test/web/test/ssl/SSLUnitTestCase.class"/>
+
+ <include name="org/jboss/test/naming/test/SecurityUnitTestCase.class"/>
+
+ <include name="org/jboss/test/ejb3/jbpapp2473/unit/RunAsUnitTestCase.class"/>
+
+ <include name="org/jboss/test/aop/test/SecurityUnitTestCase.class"/>
+
+ </fileset>
+ </batchtest>
+ </junit>
+
+ <antcall target="cc-tests-ws"/>
+
+ <echo>Waiting for server to shutdown...</echo>
+ <server:stop name="cc"/>
+
+ <antcall target="cc-tests-secured"/>
+ <antcall target="cc-tests-cluster"/>
+
+ <antcall target="tests-cc-audit"/>
+
+ <!-- Because CXF tests could be run later, we have to split and call those targets in separate ant run at the end.
+ <antcall target="calculate-md5"/>
+ <antcall target="tests-report"/>
+ -->
+ </target>
+
+ <target name="cc-tests-secured" description="Tests run against secured configuration">
+
+
+ <server:start name="cc-secured" />
+
+
+ <junit dir="${module.output}" printsummary="true" haltonerror="false" haltonfailure="false" fork="true" timeout="${junit.timeout}" jvm="${junit.jvm}">
+
+ <jvmarg line="${junit.jvm.options}" />
+
+ <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}" />
+ <sysproperty key="jbosstest.server.host" value="${node0}" />
+ <sysproperty key="jboss.home" file="${project.root}" />
+ <sysproperty key="jboss.thirdparty.dir" file="${project.root}/thirdparty" />
+ <sysproperty key="jboss.tools.dir" file="${project.root}/tools" />
+ <sysproperty key="jbosstest.deploy.dir" file="${build.lib}" />
+ <sysproperty key="jbosstest.secure" value="true" />
+ <sysproperty key="java.security.auth.login.config" value="${build.resources}/security/auth.conf" />
+ <sysproperty key="build.testlog" value="${build.testlog}" />
+ <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml" />
+
+ <!-- all entries from ${build.resources}/test-configs/tomcat-ssl/conf/client.keystore
+ were imported to ssl.truststore -->
+ <sysproperty key="javax.net.ssl.trustStore" value="${build.resources}/test-configs/cc/ssl.truststore" />
+ <sysproperty key="javax.net.ssl.trustStorePassword" value="123456" />
+ <sysproperty key="javax.net.ssl.keyStore" value="${build.resources}/test-configs/tomcat-ssl/conf/client.keystore" />
+ <sysproperty key="javax.net.ssl.keyStorePassword" value="unit-tests-client" />
+
+ <!-- tomcat-ssl tests -->
+ <sysproperty key="web.port" value="8081" />
+ <sysproperty key="secureweb.port" value="8443" />
+ <!-- RMI over http/s tests -->
+ <sysproperty key="rmi.over.web.port" value="8080" />
+ <sysproperty key="rmi.over.secureweb.port" value="8445" />
+
+ <sysproperty key="java.protocol.handler.pkgs" value="javax.net.ssl" />
+
+ <classpath>
+ <pathelement location="${build.resources}" />
+ <pathelement location="${build.resources}/security" />
+ <pathelement location="${build.classes}" />
+ <path refid="tests.classpath" />
+ </classpath>
+
+ <sysproperty key="jboss-junit-configuration" value="tests-security-manager" />
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}" extension="-tests-security-manager.xml" />
+
+ <batchtest todir="${build.reports}" haltonerror="false" haltonfailure="false" fork="true">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/security/test/authorization/secured/*TestCase.class"/>
+ <exclude name="org/jboss/test/security/test/authorization/secured/HttpRequestWebConsoleAuthenticationUnitTestCase.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+
+ <echo>Waiting for server to shutdown...</echo>
+ <server:stop name="cc-secured"/>
+
+ </target>
+
+
+ <target name="cc-tests-cluster" description="Clustering tests for CC">
+
+ <delete dir="${jboss.dist}${/}server${/}cc-cluster-*" quiet="true"/>
+
+ <patternset id="cc-cluster-tests.includes">
+ <include name="org/jboss/test/cluster/defaultcfg/test/HAInvokerUnitTestCase.class"/>
+ <include name="org/jboss/test/ann/clustered/test/Ejb3ClusteredAnnTestCase.class"/>
+ </patternset>
+
+ <property name="jboss.default.jgroups.stack" value="tcp"/>
+
+ <antcall target="tests-clustering-configure" inheritRefs="true">
+ <param name="conf" value="cc-cluster"/>
+ <param name="baseconf" value="cc"/>
+ <param name="newconf-src" value="cc-none"/>
+ </antcall>
+
+ <server:start name="cc-cluster-0"/>
+ <server:start name="cc-cluster-1"/>
+
+ <antcall target="tests-clustering-unit">
+ <param name="cluster.includes.refid" value="cc-cluster-tests.includes"/>
+ <param name="jboss-junit-configuration" value="Default-${jboss.default.jgroups.stack}"/>
+ <param name="jbosstest.cluster.web.cache.config" value="standard-session-cache"/>
+ <param name="jbosstest.cluster.node0.config" value="cc-cluster-0"/>
+ <param name="jbosstest.cluster.node1.config" value="cc-cluster-1"/>
+ </antcall>
+
+ <server:stop name="cc-cluster-0"/>
+ <server:stop name="cc-cluster-1"/>
+ </target>
+
+
+
+ <target name="cc-tests-ws" description="WS tests for CC" unless="cc.run.cxf.tests">
+
+ <!-- WS tests have their own Security Manager, so we have to use new instance of JUNIT -->
+ <junit dir="${module.output}"
+ printsummary="${junit.printsummary}"
+ haltonerror="${junit.haltonerror}"
+ haltonfailure="${junit.haltonfailure}"
+ fork="${junit.fork}"
+ timeout="${junit.timeout}"
+ showoutput="${junit.showoutput}"
+ jvm="${junit.jvm}">
+
+ <jvmarg line="${junit.jvm.options}"/>
+ <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
+ <sysproperty key="jbosstest.secure" value="true"/>
+
+ <jvmarg value="-Djava.security.manager"/>
+ <sysproperty key="java.security.policy" value="${build.resources}/security/tst.policy"/>
+ <sysproperty key="java.security.auth.login.config" value="${build.resources}/security/auth.conf"/>
+ <!-- sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
+ <sysproperty key="jbosstest.server.host" value="${node0}"/ -->
+ <sysproperty key="java.naming.provider.url" value="jnp://localhost:1099" />
+ <sysproperty key="jbosstest.server.host" value="localhost" />
+
+ <!-- [JBAS-3969] IOException: unknown protocol: vfsfile -->
+ <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/>
+ <sysproperty key="build.testlog" value="${build.testlog}"/>
+ <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
+ <!-- Pass along any jbosstest.* system properties -->
+ <syspropertyset>
+ <propertyref prefix="jbosstest."/>
+ </syspropertyset>
+
+ <!-- The crimson parser cannot do schema validation, which we need for jaxrpc-mapping.xml -->
+ <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed"/>
+
+ <classpath>
+ <pathelement location="${build.classes}"/>
+ <pathelement location="${build.resources}/security"/>
+ <pathelement location="${build.resources}"/>
+ <path refid="tests.classpath"/>
+ </classpath>
+
+ <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
+ <sysproperty key="jboss-junit-configuration" value="tests-webservice"/>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ usefile="${junit.formatter.usefile}"
+ extension="-tests-ws.xml"/>
+ <formatter type="plain" usefile="${junit.formatter.usefile}"/>
+
+ <batchtest todir="${build.reports}"
+ haltonerror="${junit.batchtest.haltonerror}"
+ haltonfailure="${junit.batchtest.haltonfailure}"
+ fork="${junit.batchtest.fork}">
+
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/ws/jaxws/ejb3Integration/injection/InjectionTestCase.class"/>
+ <include name="org/jboss/test/webservice/endpoint/EndpointTestCase.class"/>
+ <include name="org/jboss/test/webservice/admindevel/ExampleTestCase.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+
+ </target>
+
+ <!-- Common Criteria Audit test -->
+ <target name="tests-cc-audit">
+ <mkdir dir="${build.reports}"/>
+ <mkdir dir="${build.testlog}"/>
+
+ <!-- script tests which start their own servers -->
+ <junit dir="${module.output}" printsummary="${junit.printsummary}" haltonerror="${junit.haltonerror}" haltonfailure="${junit.haltonfailure}" fork="${junit.fork}"
+ timeout="${junit.timeout}" jvm="${junit.jvm}">
+
+ <jvmarg value="${junit.jvm.options}"/>
+ <!-- Used for JGroups -->
+ <jvmarg value="-Dbind.address=${node0}"/>
+ <sysproperty key="jboss.dist" value="${jboss.dist}"/>
+ <sysproperty key="jbosstest.server.config" value="cc-audit"/>
+ <sysproperty key="jboss.server.home.dir" value="${jboss.dist}${/}server${/}cc-audit"/>
+ <sysproperty key="jbosstest.deploy.dir" value="${build.lib}"/>
+ <sysproperty key="build.testlog" value="${build.testlog}"/>
+ <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
+ <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
+ <sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
+ <!-- Pass along any jbosstest.* system properties -->
+ <syspropertyset>
+ <propertyref prefix="jbosstest."/>
+ </syspropertyset>
+ <classpath>
+ <pathelement location="${build.classes}"/>
+ <pathelement location="${build.resources}"/>
+ <path refid="tests.classpath"/>
+ </classpath>
+
+ <!--sysproperty key="jboss-junit-configuration" value="classloader-leak"/-->
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}" extension="-security-audit.xml"/>
+
+ <batchtest todir="${build.reports}" haltonerror="${junit.batchtest.haltonerror}" haltonfailure="${junit.batchtest.haltonfailure}" fork="${junit.batchtest.fork}">
+
+ <fileset dir="${build.classes}">
+ <include name="**/test/security/audit/test/SecurityAuditTestCase.class"/>
+ <!-- include name="**/test/scripts/test/RunTestCase.class"/>
+ <include name="**/test/scripts/test/ShutdownTestCase.class"/ -->
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
<target name="tests-cluster-ec2" description="Runs the various test targets, but against cluster-ec2 config" depends="init">
<record name="${basedir}/output/tests.log" append="no" action="start" loglevel="info"/>
<property name="conf" value="cluster-ec2"/>
@@ -2213,6 +2877,10 @@
<fileset dir="${build.classes}">
<include name="**/*UnitTestCase.class"/>
+
+ <!-- Tests should follow the pattern above, but this one doesn't. JBPAPP-5133 -->
+ <include name="**/test/ejb3/jbpapp4681/unit/TimerServiceRestoreTestCase.class"/>
+
<patternset refid="all.excludes"/>
<patternset refid="${custom.excludes}"/>
<exclude name="**/test/xa/test/XAUnitTestCase.class"/>
@@ -2420,9 +3088,10 @@
</fileset>
</batchtest>
</junit>
- <!--
+
<echo>Waiting for server to shutdown...</echo>
- <server:stop name="securitymgr"/> -->
+ <server:stop name="securitymgr"/>
+
</target>
<target name="tests-logmod-ldap"
@@ -3257,7 +3926,10 @@
<fileset dir="${build.classes}">
<include name="org/jboss/test/webservice/**/*TestCase.class"/>
+ <include name="org/jboss/test/web/jbas8318/**/*TestCase.class"/>
<exclude name="org/jboss/test/webservice/jbws309/**"/>
+ <!-- if we are testing EWP, we need to exclude some tests -->
+ <patternset refid="ewp.excludes"/>
</fileset>
</batchtest>
</junit>
@@ -3318,6 +3990,11 @@
<fileset dir="${build.classes}">
<include name="org/jboss/test/ws/**/*TestCase.class"/>
+ <!-- excluding tests which need to have node0 defined as 127.0.0.1, see JBPAPP-7113 -->
+ <exclude name="org/jboss/test/ws/jaxws/ejb3Integration/WebServiceTestCase.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/webserviceref/WebServiceRefClientTestCase.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/webserviceref/WebServiceRefEJB3TestCase.class"/>
+ <exclude name="org/jboss/test/ws/jaxws/webserviceref/WebServiceRefServletTestCase.class"/>
</fileset>
</batchtest>
</junit>
@@ -3758,6 +4435,7 @@
<fileset dir="${build.classes}">
<include name="**/test/scripts/test/TwiddleTestCase.class"/>
<include name="**/test/scripts/test/ProbeTestCase.class"/>
+ <include name="**/test/scripts/test/WsclientTestCase.class"/>
</fileset>
</batchtest>
</junit>
@@ -3812,6 +4490,10 @@
<fileset dir="${build.classes}">
<include name="**/test/scripts/test/RunTestCase.class"/>
<include name="**/test/scripts/test/ShutdownTestCase.class"/>
+ <include name="**/test/scripts/test/WsconsumeTestCase.class"/>
+ <include name="**/test/scripts/test/WsprovideTestCase.class"/>
+ <include name="**/test/scripts/test/WstoolsTestCase.class"/>
+ <include name="**/test/scripts/test/PasswordToolTestCase.class"/>
</fileset>
</batchtest>
</junit>
@@ -4183,6 +4865,8 @@
<jvmarg value="-Dorg.omg.PortableInterceptor.ORBInitializerClass.org.jboss.tm.iiop.TxClientInterceptorInitializer"/>
<jvmarg value="-Djava.security.manager"/>
<jvmarg value="-Djava.security.policy==${build.resources}/iiop/client.policy"/>
+ <jvmarg value="-Djava.naming.factory.url.pkgs=org.jboss.naming.client"/>
+ <jvmarg value="-Dj2ee.clientName=test"/>
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed"/>
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
@@ -4453,22 +5137,28 @@
<!-- testing interoperating with clients using the unified invokers over jboss remoting -->
<test-compatibility client-version="4_2_3_GA" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
- <test-compatibility client-version="4_2_3_GA" label="15c-16s" client-jdk="${jdk15}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
- <test-compatibility client-version="4_3_0_GA_CP06_EAP" label="15c-16s" client-jdk="${jdk15}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
<test-compatibility client-version="4_3_0_GA_CP06_EAP" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
+ <test-compatibility client-version="4_3_0_GA_CP07_EAP" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
+ <test-compatibility client-version="4_3_0_GA_CP08_EAP" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
+ <test-compatibility client-version="4_3_0_GA_CP09_EAP" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
<test-compatibility client-version="5_0_1_GA" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
<test-compatibility client-version="5_1_0_GA" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
<test-compatibility client-version="5_0_0_GA_EAP" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
<test-compatibility client-version="5_0_1_GA_EAP" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
+ <test-compatibility client-version="5_1_0_GA_EAP" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
+ <test-compatibility client-version="5_1_1_GA_EAP_ER1" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
<!-- testing interoperating with clients using the pooled invokers -->
<test-compatibility-pooled-invokers client-version="4_2_3_GA" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
- <test-compatibility-pooled-invokers client-version="4_2_3_GA" label="15c-16s" client-jdk="${jdk15}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
- <test-compatibility-pooled-invokers client-version="4_3_0_GA_CP06_EAP" label="15c-16s" client-jdk="${jdk15}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
<test-compatibility-pooled-invokers client-version="4_3_0_GA_CP06_EAP" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
+ <test-compatibility-pooled-invokers client-version="4_3_0_GA_CP07_EAP" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
+ <test-compatibility-pooled-invokers client-version="4_3_0_GA_CP08_EAP" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
+ <test-compatibility-pooled-invokers client-version="4_3_0_GA_CP09_EAP" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
<test-compatibility-pooled-invokers client-version="5_0_1_GA" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
<test-compatibility-pooled-invokers client-version="5_1_0_GA" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
<test-compatibility-pooled-invokers client-version="5_0_0_GA_EAP" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
<test-compatibility-pooled-invokers client-version="5_0_1_GA_EAP" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
+ <test-compatibility-pooled-invokers client-version="5_1_0_GA_EAP" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
+ <test-compatibility-pooled-invokers client-version="5_1_1_GA_EAP_ER1" label="16c-16s" client-jdk="${jdk16}" server-jdk="${jdk16}" client-serialization-flag="-Dnone" serialization-flag="-Dnone"/>
</target>
<macrodef name="test-compatibility-pooled-invokers">
@@ -4606,58 +5296,5 @@
</target>
<target name="check-build-type"><echo message="build.ewp is ${build.ewp} and version is ${version} and version.name is ${version.name}"/></target>
-
- <!-- Common Criteria Targets -->
- <target name="tests-cc-audit">
- <mkdir dir="${build.reports}"/>
- <mkdir dir="${build.testlog}"/>
-
- <create-config baseconf="default" newconf="cc-audit">
- <patternset>
- <include name="conf/**"/>
- <include name="deploy/**"/>
- <include name="deployers/**"/>
- <include name="lib/**"/>
- </patternset>
- </create-config>
-
- <!-- script tests which start their own servers -->
- <junit dir="${module.output}" printsummary="${junit.printsummary}" haltonerror="${junit.haltonerror}" haltonfailure="${junit.haltonfailure}" fork="${junit.fork}"
- timeout="${junit.timeout}" jvm="${junit.jvm}">
-
- <jvmarg value="${junit.jvm.options}"/>
- <!-- Used for JGroups -->
- <jvmarg value="-Dbind.address=${node0}"/>
- <sysproperty key="jboss.dist" value="${jboss.dist}"/>
- <sysproperty key="jbosstest.server.config" value="cc-audit"/>
- <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
- <sysproperty key="build.testlog" value="${build.testlog}"/>
- <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
- <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
- <sysproperty key="jbosstest.server.host" value="${node0}"/>
- <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
- <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
- <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
- <!-- Pass along any jbosstest.* system properties -->
- <syspropertyset>
- <propertyref prefix="jbosstest."/>
- </syspropertyset>
- <classpath>
- <pathelement location="${build.classes}"/>
- <pathelement location="${build.resources}"/>
- <path refid="tests.classpath"/>
- </classpath>
-
- <!--sysproperty key="jboss-junit-configuration" value="classloader-leak"/-->
- <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}" extension="-security-audit.xml"/>
-
- <batchtest todir="${build.reports}" haltonerror="${junit.batchtest.haltonerror}" haltonfailure="${junit.batchtest.haltonfailure}" fork="${junit.batchtest.fork}">
-
- <fileset dir="${build.classes}">
- <include name="**/test/security/audit/test/SecurityAuditTestCase.class"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
-
+
</project>
Added: branches/JBPAPP_5_1_0_Final_JBPAPP-7180/testsuite/src/main/org/jboss/test/ejb3/JBPAPP7128UnitTestCase.java
===================================================================
--- branches/JBPAPP_5_1_0_Final_JBPAPP-7180/testsuite/src/main/org/jboss/test/ejb3/JBPAPP7128UnitTestCase.java (rev 0)
+++ branches/JBPAPP_5_1_0_Final_JBPAPP-7180/testsuite/src/main/org/jboss/test/ejb3/JBPAPP7128UnitTestCase.java 2011-09-16 06:32:46 UTC (rev 112246)
@@ -0,0 +1,75 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.ejb3;
+
+import org.jboss.as.javaee.SimpleJavaEEModuleInformer;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.structure.spi.helpers.AbstractDeploymentContext;
+import org.jboss.deployers.structure.spi.helpers.AbstractDeploymentUnit;
+import org.jboss.metadata.ear.jboss.JBossAppMetaData;
+import org.jboss.test.JBossTestCase;
+
+/**
+ * @author bmaxwell
+ *
+ */
+public class JBPAPP7128UnitTestCase extends JBossTestCase
+{
+ private DeploymentUnit topLevelDeploymentUnit;
+ private DeploymentUnit nonTopLevelDeploymentUnit;
+
+ public JBPAPP7128UnitTestCase(String name)
+ {
+ super(name);
+ }
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+
+ String name = "TopLevelDeploymentUnitName";
+ String simpleName = "TopLevelDeploymentUnitNameSimpleName";
+ String relativePath = "TopLevelDeploymentUnitNameRelativePath";
+
+ nonTopLevelDeploymentUnit = new AbstractDeploymentUnit(new AbstractDeploymentContext("non"+name, "non"+simpleName, "non"+relativePath));
+
+ topLevelDeploymentUnit = new AbstractDeploymentUnit(new AbstractDeploymentContext(name, simpleName, relativePath));
+ topLevelDeploymentUnit.addAttachment(JBossAppMetaData.class, new JBossAppMetaData());
+ }
+
+ public void testGetModulePathTopLevelDeploymentUnit()
+ {
+ String modulePath = new SimpleJavaEEModuleInformer().getModulePath(topLevelDeploymentUnit);
+
+ if(!modulePath.equals(topLevelDeploymentUnit.getRelativePath()))
+ fail("SimpleJavaEEModuleInformer.getModulePath(DeploymentInfo) should return DeploymentInfo.getRelativePath()="+ topLevelDeploymentUnit.getRelativePath() + " for top level deployment not unit.getSimpleName(), modulePath="+ modulePath);
+ }
+
+ public void testGetModulePathNonTopLevelDeploymentUnit()
+ {
+ String modulePath = new SimpleJavaEEModuleInformer().getModulePath(nonTopLevelDeploymentUnit);
+
+ if(!modulePath.equals(nonTopLevelDeploymentUnit.getSimpleName()))
+ fail("SimpleJavaEEModuleInformer.getModulePath(DeploymentInfo) should return DeploymentInfo.getSimpleName()="+ nonTopLevelDeploymentUnit.getSimpleName() +" not unit.getRelativePath(), modulePath=" + modulePath);
+ }
+}
More information about the jboss-cvs-commits
mailing list