[jboss-cvs] JBossAS SVN: r80213 - in branches/JBPAPP_4_2_0_GA_CP/ejb3: src/resources/test-configs and 23 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Oct 29 14:56:06 EDT 2008
Author: pskopek at redhat.com
Date: 2008-10-29 14:56:06 -0400 (Wed, 29 Oct 2008)
New Revision: 80213
Added:
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc-db/
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc-db/conf/
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc-db/conf/login-config.xml
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc-db/deploy/
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc-db/deploy/dbauth-ds.xml
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc-ldap/
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc-ldap/conf/
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc-ldap/conf/login-config.xml
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc-none/
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/cacert.pem
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/cakey.pem
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/client.keystore
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/jboss-log4j.xml
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/localhost.keystore
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/login-config.xml
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/props/
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/props/jbossws-roles.properties
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/props/jbossws-users.properties
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/props/jmx-console-roles.properties
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/props/jmx-console-users.properties
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/ssl-roles.properties
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/ssl-users.properties
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/httpha-invoker.sar/
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/httpha-invoker.sar/META-INF/
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/httpha-invoker.sar/META-INF/jboss-service.xml
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/httpha-invoker.sar/invoker.war/
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/httpha-invoker.sar/invoker.war/WEB-INF/
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/httpha-invoker.sar/invoker.war/WEB-INF/jboss-web.xml
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/httpha-invoker.sar/invoker.war/WEB-INF/web.xml
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/jboss-web.deployer/
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/jboss-web.deployer/META-INF/
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/jboss-web.deployer/META-INF/jboss-service.xml
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/jboss-web.deployer/META-INF/webserver-xmbean.xml
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/jboss-web.deployer/conf/
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/jboss-web.deployer/conf/web.xml
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/jboss-web.deployer/server.xml
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/jmx-console.war/
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/jmx-console.war/WEB-INF/
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/jmx-console.war/WEB-INF/jboss-web.xml
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/jmx-console.war/WEB-INF/web.xml
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/jmx-invoker-service.xml
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/keystore.password
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/management/
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/management/console-mgr.sar/
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/management/console-mgr.sar/web-console.war/
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/management/console-mgr.sar/web-console.war/WEB-INF/
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/management/console-mgr.sar/web-console.war/WEB-INF/classes/
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/management/console-mgr.sar/web-console.war/WEB-INF/classes/web-console-roles.properties
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/management/console-mgr.sar/web-console.war/WEB-INF/classes/web-console-users.properties
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/management/console-mgr.sar/web-console.war/WEB-INF/jboss-web.xml
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/management/console-mgr.sar/web-console.war/WEB-INF/web.xml
branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/security-service.xml
Modified:
branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml
Log:
JBPAPP-1356: Integrate changes to EJB3 Test Suite for Common Criteria
Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml 2008-10-29 18:55:15 UTC (rev 80212)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml 2008-10-29 18:56:06 UTC (rev 80213)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE project [
<!ENTITY libraries SYSTEM "../thirdparty/libraries.ent">
- <!ENTITY modules SYSTEM "../tools/etc/buildmagic/modules.ent">
+<!ENTITY modules SYSTEM "../tools/etc/buildmagic/modules.ent">
]>
<!-- ====================================================================== -->
@@ -34,33 +34,33 @@
<property environment="env"/>
- <!-- Check if we need to build soa -->
- <condition property="build.soa.bits" value="true">
- <equals arg1="${build.soa}" arg2="true"/>
- </condition>
+ <!-- Check if we need to build soa -->
+ <condition property="build.soa.bits" value="true">
+ <equals arg1="${build.soa}" arg2="true"/>
+ </condition>
<!-- Some properties are set for ws 2.x that aren't for 1.2.x. We therefore
make the classpathrefid dynamic. This is a hack and can probably solved
better..
-->
<condition property="jboss.jbossws.common.classpath.refid.name" value="jboss.jbossws.common.classpath" else="jboss.jbossws.classpath">
- <isset property="build.soa.bits"/>
+ <isset property="build.soa.bits"/>
</condition>
<condition property="jboss.jbossws.spi.classpath.refid.name" value="jboss.jbossws.spi.classpath" else="jboss.jbossws.classpath">
- <isset property="build.soa.bits"/>
+ <isset property="build.soa.bits"/>
</condition>
<!-- TODO: integrate jboss.jms.provider and jboss.jms.product -->
-
+
<condition property="jboss.jms.provider" value="jbm" else="mq">
<isset property="build.soa.bits"/>
</condition>
-
+
<condition property="jboss.jms.product" value="messaging" else="mq">
<isset property="build.soa.bits"/>
</condition>
-
+
<!-- Set a hostname property based on COMPUTERNAME for win32, HOSTNAME
otherwise and initialize the node0/node1 cluster hostnames to localhost
and ${hostname} by default. If you cannot route multicast traffic between
@@ -99,14 +99,14 @@
<import file="../testsuite/imports/server-config.xml"/>
<!-- Propagate the dist directory as a jbosstest system property -->
<property name="ejb3.dist" value="${jboss.dist}"/>
-
+
<echo message="${ejb3.dist}"/>
<property name="jbosstest.dist" value="${ejb3.dist}"/>
<property name="ejb3.jboss.jvmargs" value="-Xmx128m"/>
-
+
<property name="ejbthree1504.jboss.jvmargs" value="-Dcom.sun.management.jmxremote"/>
-
+
<property name="endorsed.dirs" value="${ejb3.dist}/lib/endorsed/"/>
<macrodef name="wait-on-host">
@@ -227,7 +227,7 @@
<path refid="jboss.test.classpath"/>
<path refid="jboss.ejb3.classpath"/>
<!--path refid="jboss.webservices.classpath"/-->
- <path refid="jboss.jca.classpath"/>
+ <path refid="jboss.jca.classpath"/>
</path>
<!-- RMI Stub generation -->
@@ -302,9 +302,9 @@
<pathelement path="${ejb3.dist}/client/jaxb-impl.jar"/>
<pathelement path="${ejb3.dist}/client/wsdl4j.jar"/>
<pathelement path="${ejb3.dist}/client/jbossws-client.jar"/>
-
+
<!-- JBAS-4365 -->
- <path refid="apache.codec.classpath"/>
+ <path refid="apache.codec.classpath"/>
<!-- FIXME: Tempory hack for JBM not being in jbossall-client.jar -->
<pathelement path="${ejb3.dist}/server/all/lib/jboss-messaging-client.jar"/>
@@ -323,7 +323,7 @@
<!-- This test accesses some ejb3 classes directly -->
<path refid="jboss.ejb3.classpath"/>
</path>
-
+
<path id="dd.web.client.classpath">
<path refid="client.classpath"/>
<path refid="apache.httpclient.classpath"/>
@@ -333,7 +333,7 @@
<pathelement path="${resources}/test/iiop"/>
<path refid="client.classpath"/>
</path>
-
+
<!-- The classpath required to build javadocs. -->
<path id="javadoc.classpath">
<path refid="javac.classpath"/>
@@ -350,7 +350,7 @@
<import file="imports/build-mq2jbm.xml"/>
<import file="imports/build-simple.xml"/>
-
+
<target name="init">
<record name="${basedir}/build.log" append="yes" action="start" loglevel="error"/>
<!-- Setup the version 1 classes so the tests compile -->
@@ -495,7 +495,7 @@
</jar>
<build-jms-dd name="jca/inflow" descriptor="jmsmdbtest-service.xml"/>
-
+
<jar jarfile="${build.lib}/jmsinflowmdb.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/jca/inflowmdb/JMS*.class"/>
@@ -522,7 +522,7 @@
<include name="org/jboss/ejb3/test/jca/inflow/*.class"/>
</fileset>
</jar>
-
+
<jar jarfile="${build.lib}/jcainflow.rar">
<fileset dir="${build.lib}">
<include name="jcainflow.jar"/>
@@ -537,7 +537,7 @@
<include name="*.xml"/>
</fileset>
</copy>
-
+
</target>
<target name="cache"
@@ -665,7 +665,7 @@
<jar jarfile="${build.lib}/ear-session.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/ear/Facade*.class"/>
- <include name="org/jboss/ejb3/test/ear/Queue*.class"/>
+ <include name="org/jboss/ejb3/test/ear/Queue*.class"/>
</fileset>
<fileset dir="${resources}/test/ear/ejbref">
<include name="META-INF/persistence.xml"/>
@@ -695,15 +695,15 @@
<include name="earpu.jar"/>
</zipfileset>
</ear>
-
- <mq2jbm basedir="${resources}/test/ear"/>
-
- <copy todir="${build.lib}">
+
+ <mq2jbm basedir="${resources}/test/ear"/>
+
+ <copy todir="${build.lib}">
<fileset dir="${resources}/test/ear">
<include name="*-service.xml"/>
</fileset>
</copy>
-
+
</target>
<target name="dependency"
@@ -770,14 +770,14 @@
</fileset>
</jar>
- <jar jarfile="${build.lib}/yetanother.sar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/dependency/Another*.class"/>
- </fileset>
- <fileset dir="${resources}/test/dependency/session2">
- <include name="META-INF/jboss-service.xml"/>
- </fileset>
- </jar>
+ <jar jarfile="${build.lib}/yetanother.sar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/dependency/Another*.class"/>
+ </fileset>
+ <fileset dir="${resources}/test/dependency/session2">
+ <include name="META-INF/jboss-service.xml"/>
+ </fileset>
+ </jar>
<jar jarfile="${build.lib}/dependency-test.ear">
<fileset dir="${build.lib}">
<include name="ejbjar.jar"/>
@@ -894,10 +894,10 @@
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/webservices/jsr181/EJB3*.class"/>
<include name="org/jboss/ejb3/test/webservices/jsr181/Stateless*.class"/>
- <include name="org/jboss/ejb3/test/webservices/jsr181/Injected*.class"/>
+ <include name="org/jboss/ejb3/test/webservices/jsr181/Injected*.class"/>
</fileset>
<fileset dir="${resources}/test/webservices">
- <include name="META-INF/ejb-jar.xml"/>
+ <include name="META-INF/ejb-jar.xml"/>
<!-- TODO: Wolf: This is plain silly. I have to include the wsdl the container is about to generate to get injection to work. -->
<!--include name="META-INF/wsdl/*.wsdl"/-->
</fileset>
@@ -914,13 +914,13 @@
<include name="META-INF/wsdl/*.wsdl"/>
</fileset>
</jar>
-
- <ear earfile="${build.lib}/jsr181.ear" appxml="${resources}/test/webservices/application.xml">
- <zipfileset dir="${build.lib}">
- <include name="jsr181.jar"/>
- <include name="jsr181-client.jar"/>
- </zipfileset>
- </ear>
+
+ <ear earfile="${build.lib}/jsr181.ear" appxml="${resources}/test/webservices/application.xml">
+ <zipfileset dir="${build.lib}">
+ <include name="jsr181.jar"/>
+ <include name="jsr181-client.jar"/>
+ </zipfileset>
+ </ear>
</target>
<target name="interceptors"
@@ -1097,8 +1097,8 @@
<mkdir dir="${build.lib}"/>
- <delete file="${resources}/test/naming/META-INF/jboss.xml"/>
- <copy file="${resources}/test/naming/META-INF/jboss1.xml" tofile="${resources}/test/naming/META-INF/jboss.xml"/>
+ <delete file="${resources}/test/naming/META-INF/jboss.xml"/>
+ <copy file="${resources}/test/naming/META-INF/jboss1.xml" tofile="${resources}/test/naming/META-INF/jboss.xml"/>
<jar jarfile="${build.lib}/naming.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/naming/Test*.class"/>
@@ -1113,7 +1113,7 @@
</jar>
<delete file="${resources}/test/naming/META-INF/jboss.xml"/>
- <copy file="${resources}/test/naming/META-INF/jboss2.xml" tofile="${resources}/test/naming/META-INF/jboss.xml"/>
+ <copy file="${resources}/test/naming/META-INF/jboss2.xml" tofile="${resources}/test/naming/META-INF/jboss.xml"/>
<jar jarfile="${build.lib}/naming-test.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/naming/Stateful.class"/>
@@ -1173,7 +1173,7 @@
</fileset>
</jar>
- <jar jarfile="${build.lib}/jboss-validation.jar">
+ <jar jarfile="${build.lib}/jboss-validation.jar">
<fileset dir="${resources}/test/schema">
<include name="META-INF/jboss.xml"/>
</fileset>
@@ -1239,9 +1239,9 @@
<target name="unauthenticatedprincipal"
description="Builds all jar files."
depends="compile-classes">
-
+
<mkdir dir="${build.lib}"/>
-
+
<jar jarfile="${build.lib}/unauthenticatedprincipal.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/unauthenticatedprincipal/*.class"/>
@@ -1260,12 +1260,12 @@
<mkdir dir="${build.lib}"/>
- <delete file="${resources}/test/reference21_30/META-INF/ejb-jar.xml"/>
- <copy file="${resources}/test/reference21_30/META-INF/global-ejb-jar.xml" tofile="${resources}/test/reference21_30/META-INF/ejb-jar.xml"/>
- <delete file="${resources}/test/reference21_30/META-INF/jboss.xml"/>
- <copy file="${resources}/test/reference21_30/META-INF/jboss-reference.xml" tofile="${resources}/test/reference21_30/META-INF/jboss.xml"/>
+ <delete file="${resources}/test/reference21_30/META-INF/ejb-jar.xml"/>
+ <copy file="${resources}/test/reference21_30/META-INF/global-ejb-jar.xml" tofile="${resources}/test/reference21_30/META-INF/ejb-jar.xml"/>
+ <delete file="${resources}/test/reference21_30/META-INF/jboss.xml"/>
+ <copy file="${resources}/test/reference21_30/META-INF/jboss-reference.xml" tofile="${resources}/test/reference21_30/META-INF/jboss.xml"/>
- <jar jarfile="${build.lib}/globalReference.jar">
+ <jar jarfile="${build.lib}/globalReference.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/reference21_30/*21*.class"/>
</fileset>
@@ -1286,7 +1286,7 @@
<delete file="${resources}/test/reference21_30/META-INF/ejb-jar.xml"/>
<copy file="${resources}/test/reference21_30/META-INF/reference-ejb-jar.xml" tofile="${resources}/test/reference21_30/META-INF/ejb-jar.xml"/>
<delete file="${resources}/test/reference21_30/META-INF/jboss.xml"/>
- <copy file="${resources}/test/reference21_30/META-INF/jboss-reference2.xml" tofile="${resources}/test/reference21_30/META-INF/jboss.xml"/>
+ <copy file="${resources}/test/reference21_30/META-INF/jboss-reference2.xml" tofile="${resources}/test/reference21_30/META-INF/jboss.xml"/>
<jar jarfile="${build.lib}/reference.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/reference21_30/Local*.class"/>
@@ -1300,13 +1300,13 @@
<include name="users.properties"/>
<include name="roles.properties"/>
</fileset>
- </jar>
+ </jar>
- <delete file="${resources}/test/reference21_30/META-INF/ejb-jar.xml"/>
+ <delete file="${resources}/test/reference21_30/META-INF/ejb-jar.xml"/>
<copy file="${resources}/test/reference21_30/META-INF/ejb-jar2.xml" tofile="${resources}/test/reference21_30/META-INF/ejb-jar.xml"/>
<delete file="${resources}/test/reference21_30/META-INF/jboss.xml"/>
- <copy file="${resources}/test/reference21_30/META-INF/jboss2.xml" tofile="${resources}/test/reference21_30/META-INF/jboss.xml"/>
- <jar jarfile="${build.lib}/multideploy.jar">
+ <copy file="${resources}/test/reference21_30/META-INF/jboss2.xml" tofile="${resources}/test/reference21_30/META-INF/jboss.xml"/>
+ <jar jarfile="${build.lib}/multideploy.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/reference21_30/Test2*.class"/>
</fileset>
@@ -1314,13 +1314,13 @@
<include name="META-INF/ejb-jar.xml"/>
<include name="META-INF/jboss.xml"/>
</fileset>
- </jar>
+ </jar>
<delete file="${resources}/test/reference21_30/META-INF/ejb-jar.xml"/>
<copy file="${resources}/test/reference21_30/META-INF/ejb-jar3.xml" tofile="${resources}/test/reference21_30/META-INF/ejb-jar.xml"/>
<delete file="${resources}/test/reference21_30/META-INF/jboss.xml"/>
- <copy file="${resources}/test/reference21_30/META-INF/jboss3.xml" tofile="${resources}/test/reference21_30/META-INF/jboss.xml"/>
- <jar jarfile="${build.lib}/multideploy-ejb3.jar">
+ <copy file="${resources}/test/reference21_30/META-INF/jboss3.xml" tofile="${resources}/test/reference21_30/META-INF/jboss.xml"/>
+ <jar jarfile="${build.lib}/multideploy-ejb3.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/reference21_30/Test3*.class"/>
</fileset>
@@ -1328,19 +1328,19 @@
<include name="META-INF/ejb-jar.xml"/>
<include name="META-INF/jboss.xml"/>
</fileset>
- </jar>
+ </jar>
- <delete file="${resources}/test/reference21_30/META-INF/ejb-jar.xml"/>
- <delete file="${resources}/test/reference21_30/META-INF/jboss.xml"/>
+ <delete file="${resources}/test/reference21_30/META-INF/ejb-jar.xml"/>
+ <delete file="${resources}/test/reference21_30/META-INF/jboss.xml"/>
- <ear earfile="${build.lib}/multideploy.ear"
+ <ear earfile="${build.lib}/multideploy.ear"
appxml="${build.resources}/test/reference21_30/META-INF/application.xml">
- <fileset dir="${build.lib}">
- <include name="multideploy.jar"/>
- <include name="multideploy-ejb3.jar"/>
- </fileset>
- </ear>
+ <fileset dir="${build.lib}">
+ <include name="multideploy.jar"/>
+ <include name="multideploy-ejb3.jar"/>
+ </fileset>
+ </ear>
</target>
<!--target name="jca"
@@ -1389,7 +1389,7 @@
<include name="*.xml"/>
</fileset>
</copy>
-
+
<mq2jbm basedir="${resources}/test/dd/mdb"/>
</target>
@@ -1491,7 +1491,7 @@
<include name="*"/>
</webinf>
<lib dir="${build.resources}/test/dd/web/WEB-INF/lib">
- <!-- <include name="jbosstest-web-util.jar"/> -->
+ <!-- <include name="jbosstest-web-util.jar"/> -->
<include name="resources.jar"/>
</lib>
<classes dir="${build.classes}">
@@ -1584,10 +1584,10 @@
</fileset>
</jar>
</target>
-
+
<target name="classloader2" depends="compile-classes">
<mkdir dir="${build.lib}"/>
-
+
<jar jarfile="${build.lib}/classloader2.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/classloader2/**/*.class"/>
@@ -1596,7 +1596,7 @@
<include name="META-INF/jboss.xml"/>
</fileset>
</jar>
-
+
<ear earfile="${build.lib}/classloader2.ear"
appxml="${build.resources}/test/classloader2/META-INF/application.xml">
<fileset dir="${build.lib}">
@@ -1608,20 +1608,20 @@
</fileset>
</ear>
</target>
-
+
<target name="clusteredservice"
description="Builds all jar files."
depends="compile-classes">
-
+
<mkdir dir="${build.lib}"/>
-
+
<jar jarfile="${build.lib}/clusteredservice.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/clusteredservice/*.class"/>
<exclude name="org/jboss/ejb3/test/clusteredservice/ServiceWeb.class"/>
</fileset>
</jar>
-
+
<war warfile="${build.lib}/clusteredservice.war"
webxml="${build.resources}/test/clusteredservice/WEB-INF/web.xml">
<classes dir="${build.classes}">
@@ -1631,20 +1631,20 @@
</classes>
</war>
</target>
-
+
<target name="clusteredjms"
description="Builds all jar files."
depends="compile-classes">
-
+
<mkdir dir="${build.lib}"/>
-
+
<jar jarfile="${build.lib}/clusteredjms-test.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/clusteredjms/*.class"/>
</fileset>
</jar>
</target>
-
+
<target name="jaccpropagation"
description="Builds all jar files."
depends="compile-classes">
@@ -1671,7 +1671,7 @@
<include name="org/jboss/ejb3/test/jaccpropagation/servlets/**"/>
</classes>
</war>
-
+
<copy todir="${build.lib}">
<fileset dir="${resources}/test/jaccpropagation">
<include name="jaccpropagation-security-service.xml"/>
@@ -1728,7 +1728,7 @@
<include name="servlet-security-service.xml"/>
</fileset>
</ear>
-
+
<copy todir="${build.lib}">
<fileset dir="${resources}/test/servlet">
<include name="servlet-security-service.xml"/>
@@ -1897,7 +1897,7 @@
</fileset>
<zipfileset dir="${build.resources}/test/ejbthree724" includes="META-INF/persistence.xml"/>
</jar>
-
+
<ear earfile="${build.lib}/ejbthree724.ear" appxml="${build.resources}/test/ejbthree724/META-INF/application.xml">
<fileset dir="${build.lib}" includes="ejbthree724-*.jar"/>
</ear>
@@ -1921,11 +1921,11 @@
</fileset>
</jar>
</target>
-
+
<target name="ejbthree785" depends="compile-classes">
<build-simple-jar name="ejbthree785"/>
</target>
-
+
<!--target name="ejbthree786" depends="compile-classes">
<build-simple-jar name="ejbthree786"/>
</target-->
@@ -1957,7 +1957,7 @@
<fileset dir="${resources}/test/ejbthree921"/>
</jar>
</target>
-
+
<target name="epcpropagation"
description="Builds all jar files."
depends="compile-classes">
@@ -1982,28 +1982,28 @@
<target name="ejbthree963"
description="Builds a simple jar files."
depends="compile-classes">
-
+
<build-simple-jar name="ejbthree963"/>
</target>
<target name="ejbthree986"
description="Builds a simple jar files."
depends="compile-classes">
-
+
<build-simple-jar name="ejbthree986"/>
</target>
-
+
<target name="ejbthree987"
description="Builds a simple jar files."
depends="compile-classes">
-
+
<build-simple-jar name="ejbthree987"/>
</target>
-
+
<target name="ejbthree994"
description="Builds a simple jar files."
depends="compile-classes">
-
+
<build-simple-jar name="ejbthree994"/>
<copy todir="${build.lib}">
@@ -2028,23 +2028,23 @@
</fileset>
</jar>
- </target>
-
+ </target>
+
<target name="ejbthree1025"
description="Builds a simple jar files."
depends="compile-classes">
-
+
<build-simple-jar name="ejbthree1025"/>
</target>
<!--target name="ejbthree1057" depends="compile-classes">
<build-simple-jar name="ejbthree1057"/>
</target-->
-
+
<target name="ejbthree1062" depends="compile-classes">
<build-simple-jar name="ejbthree1062"/>
</target>
-
+
<target name="ejbthree1109"
description="Builds all jar files."
depends="compile-classes">
@@ -2058,14 +2058,14 @@
<zipfileset dir="${build.resources}/test/ejbthree1109" includes="*"/>
</jar>
</target>
-
+
<target name="ejbthree1239"
description="Builds a simple jar files."
depends="compile-classes">
-
+
<build-simple-jar name="ejbthree1239"/>
</target>
-
+
<target name="ejbthree1504"
description="Builds all jar files."
depends="compile-classes">
@@ -2078,17 +2078,17 @@
</fileset>
</jar>
</target>
-
+
<target name="jbas4489"
description="Builds a simple jar files."
depends="compile-classes">
-
+
<build-simple-jar name="jbas4489"/>
</target>
-
+
<target name="jbpapp999" depends="compile-classes">
<mkdir dir="${build.lib}"/>
-
+
<jar jarfile="${build.lib}/jbpapp999-ejb.jar">
<metainf dir="${build.resources}/test/jbpapp999">
<include name="ejb-jar.xml"/>
@@ -2097,13 +2097,13 @@
<include name="org/jboss/ejb3/test/jbpapp999/Greeter*.class"/>
</fileset>
</jar>
-
+
<jar jarfile="${build.lib}/jbpapp999-lib.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/jbpapp999/*Interceptor.class"/>
</fileset>
</jar>
-
+
<ear earfile="${build.lib}/jbpapp999.ear" appxml="${build.resources}/test/jbpapp999/application.xml">
<metainf dir="${build.resources}/test/jbpapp999">
<include name="jboss-app.xml"/>
@@ -2111,14 +2111,14 @@
<fileset dir="${build.lib}" includes="jbpapp999-*.jar"/>
</ear>
</target>
-
+
<target name="jbpapp1186"
description="Builds a simple jar files."
depends="compile-classes">
-
+
<build-simple-jar name="jbpapp1186"/>
</target>
-
+
<target name="jaxws"
description="Builds a simple jar."
depends="compile-classes">
@@ -2258,8 +2258,8 @@
<exclude name="org/jboss/ejb3/test/hbm/HBM2.class"/>
</fileset>
<fileset dir="${resources}/test/hbm">
- <include name="META-INF/hbm.hbm.xml"/>
- <include name="META-INF/persistence.xml"/>
+ <include name="META-INF/hbm.hbm.xml"/>
+ <include name="META-INF/persistence.xml"/>
</fileset>
</jar>
<jar jarfile="${build.lib}/hbm2-test.par">
@@ -2267,10 +2267,10 @@
<include name="org/jboss/ejb3/test/hbm/HBM2.class"/>
</fileset>
<fileset dir="${resources}/test/hbm">
- <include name="META-INF/hbm2.hbm.xml"/>
+ <include name="META-INF/hbm2.hbm.xml"/>
</fileset>
<fileset dir="${resources}/test/hbm/hbm2">
- <include name="META-INF/persistence.xml"/>
+ <include name="META-INF/persistence.xml"/>
</fileset>
</jar>
</target>
@@ -2375,7 +2375,7 @@
<include name="*.xml"/>
</fileset>
</copy>
-
+
<mq2jbm basedir="${resources}/test/strictpool"/>
</target>
@@ -2452,7 +2452,7 @@
</fileset>
</jar>
</target>
-
+
<target name="entityoptimisticlocking"
description="Builds all jar files."
depends="compile-classes">
@@ -2468,7 +2468,7 @@
</fileset>
</jar>
</target>
-
+
<target name="persistenceunits"
description="Builds all jar files."
depends="compile-classes">
@@ -2485,104 +2485,104 @@
<include name="*.jar"/>
</fileset>
</jar>
-
- <jar jarfile="${build.lib}/persistenceunitscope.jar">
+
+ <jar jarfile="${build.lib}/persistenceunitscope.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/persistenceunits/Entity*.class"/>
</fileset>
- <fileset dir="${resources}/test/persistenceunits">
- <include name="entity2-ds.xml"/>
+ <fileset dir="${resources}/test/persistenceunits">
+ <include name="entity2-ds.xml"/>
</fileset>
</jar>
-
- <jar jarfile="${build.lib}/persistenceunitscope1.jar">
+
+ <jar jarfile="${build.lib}/persistenceunitscope1.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/persistenceunits/Entity1.class"/>
- <include name="org/jboss/ejb3/test/persistenceunits/Entity2.class"/>
+ <include name="org/jboss/ejb3/test/persistenceunits/Entity2.class"/>
</fileset>
- <fileset dir="${resources}/test/persistenceunits">
- <include name="entity2-ds.xml"/>
- </fileset>
- <!--fileset dir="${resources}/test/persistenceunits">
+ <fileset dir="${resources}/test/persistenceunits">
+ <include name="entity2-ds.xml"/>
+ </fileset>
+ <!--fileset dir="${resources}/test/persistenceunits">
<include name="META-INF/persistence.xml"/>
</fileset-->
</jar>
-
- <jar jarfile="${build.lib}/persistenceunitscope2.jar">
+
+ <jar jarfile="${build.lib}/persistenceunitscope2.jar">
<fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/persistenceunits/Entity1.class"/>
- <include name="org/jboss/ejb3/test/persistenceunits/Entity2.class"/>
+ <include name="org/jboss/ejb3/test/persistenceunits/Entity1.class"/>
+ <include name="org/jboss/ejb3/test/persistenceunits/Entity2.class"/>
</fileset>
- <!--fileset dir="${resources}/test/persistenceunits">
+ <!--fileset dir="${resources}/test/persistenceunits">
<include name="META-INF/persistence.xml"/>
</fileset-->
</jar>
-
- <jar jarfile="${build.lib}/persistenceunitscope-slsb.jar">
+
+ <jar jarfile="${build.lib}/persistenceunitscope-slsb.jar">
<fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/persistenceunits/EntityTest*.class"/>
+ <include name="org/jboss/ejb3/test/persistenceunits/EntityTest*.class"/>
</fileset>
- <!--fileset dir="${resources}/test/persistenceunits">
+ <!--fileset dir="${resources}/test/persistenceunits">
<include name="META-INF/persistence.xml"/>
</fileset-->
</jar>
-
- <ear earfile="${build.lib}/persistenceunitscope-test.ear" appxml="${resources}/test/persistenceunits/application.xml">
+
+ <ear earfile="${build.lib}/persistenceunitscope-test.ear" appxml="${resources}/test/persistenceunits/application.xml">
<zipfileset dir="${build.lib}" prefix="lib">
<include name="persistenceunitscope.jar"/>
</zipfileset>
- <fileset dir="${resources}/test/persistenceunits">
+ <fileset dir="${resources}/test/persistenceunits">
<include name="META-INF/persistence.xml"/>
</fileset>
</ear>
-
- <ear earfile="${build.lib}/persistenceunitscope-test1.ear" appxml="${resources}/test/persistenceunits/application1.xml">
+
+ <ear earfile="${build.lib}/persistenceunitscope-test1.ear" appxml="${resources}/test/persistenceunits/application1.xml">
<zipfileset dir="${build.lib}" prefix="lib">
<include name="persistenceunitscope1.jar"/>
- <include name="persistenceunitscope-slsb.jar"/>
+ <include name="persistenceunitscope-slsb.jar"/>
</zipfileset>
- <fileset dir="${resources}/test/persistenceunits">
+ <fileset dir="${resources}/test/persistenceunits">
<include name="META-INF/persistence.xml"/>
</fileset>
</ear>
-
- <ear earfile="${build.lib}/persistenceunitscope-test2.ear" appxml="${resources}/test/persistenceunits/application2.xml">
+
+ <ear earfile="${build.lib}/persistenceunitscope-test2.ear" appxml="${resources}/test/persistenceunits/application2.xml">
<zipfileset dir="${build.lib}" prefix="lib">
<include name="persistenceunitscope2.jar"/>
- <include name="persistenceunitscope-slsb.jar"/>
+ <include name="persistenceunitscope-slsb.jar"/>
</zipfileset>
- <!--fileset dir="${resources}/test/persistenceunits">
+ <!--fileset dir="${resources}/test/persistenceunits">
<include name="META-INF/persistence.xml"/>
</fileset-->
</ear>
-
- <jar jarfile="${build.lib}/persistenceunitsharedentity1.jar">
+
+ <jar jarfile="${build.lib}/persistenceunitsharedentity1.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/persistenceunits/Entity*.class"/>
</fileset>
- <fileset dir="${resources}/test/persistenceunits">
- <include name="entity2-ds.xml"/>
- <include name="META-INF/persistence.xml"/>
+ <fileset dir="${resources}/test/persistenceunits">
+ <include name="entity2-ds.xml"/>
+ <include name="META-INF/persistence.xml"/>
</fileset>
</jar>
-
- <jar jarfile="${build.lib}/persistenceunitsharedentity2.jar">
+
+ <jar jarfile="${build.lib}/persistenceunitsharedentity2.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/persistenceunits/Service*.class"/>
</fileset>
- <fileset dir="${resources}/test/persistenceunits">
- <include name="META-INF/persistence.xml"/>
+ <fileset dir="${resources}/test/persistenceunits">
+ <include name="META-INF/persistence.xml"/>
</fileset>
</jar>
-
- <ear earfile="${build.lib}/persistenceunitsharedentity-test.ear" appxml="${resources}/test/persistenceunits/sharedEntityApplication.xml">
+
+ <ear earfile="${build.lib}/persistenceunitsharedentity-test.ear" appxml="${resources}/test/persistenceunits/sharedEntityApplication.xml">
<zipfileset dir="${build.lib}" prefix="lib">
<include name="persistenceunitsharedentity1.jar"/>
- <include name="persistenceunitsharedentity2.jar"/>
+ <include name="persistenceunitsharedentity2.jar"/>
</zipfileset>
</ear>
</target>
-
+
<target name="externalpersistenceunit"
description="Builds all jar files."
depends="compile-classes">
@@ -2594,20 +2594,20 @@
<include name="org/jboss/ejb3/test/externalpersistenceunit/*.class"/>
</fileset>
</jar>
-
- <jar jarfile="${build.lib}/externalpersistenceunit-pu.jar">
+
+ <jar jarfile="${build.lib}/externalpersistenceunit-pu.jar">
<fileset dir="${resources}/test/externalpersistenceunit">
<include name="META-INF/persistence.xml"/>
</fileset>
</jar>
</target>
-
+
<target name="mdbtransactions"
description="Builds all jar files."
depends="compile-classes">
-
+
<mkdir dir="${build.lib}"/>
-
+
<jar jarfile="${build.lib}/mdbtransactions-test.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/mdbtransactions/*.class"/>
@@ -2617,7 +2617,7 @@
<include name="META-INF/persistence.xml"/>
</fileset>
</jar>
-
+
<jar jarfile="${build.lib}/mdbtransactions21-test.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/mdbtransactions/*21.class"/>
@@ -2627,13 +2627,13 @@
<include name="META-INF/jboss.xml"/>
</fileset>
</jar>
-
+
<copy todir="${build.lib}">
<fileset dir="${resources}/test/mdbtransactions">
<include name="*.xml"/>
</fileset>
</copy>
-
+
<mq2jbm basedir="${resources}/test/mdbtransactions"/>
</target>
@@ -2711,7 +2711,7 @@
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/lob/*.class"/>
</fileset>
- <fileset dir="${resources}/test/lob">
+ <fileset dir="${resources}/test/lob">
<include name="META-INF/persistence.xml"/>
</fileset>
</jar>
@@ -2759,12 +2759,12 @@
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/singletableinheritance/*.class"/>
</fileset>
- <fileset dir="${resources}/test/singletable">
+ <fileset dir="${resources}/test/singletable">
<include name="META-INF/persistence.xml"/>
</fileset>
</jar>
</target>
-
+
<target name="invalidtxmdb"
description="Builds all jar files."
depends="compile-classes">
@@ -2780,7 +2780,7 @@
</fileset>
</jar>
</target>
-
+
<target name="mdbsessionpoolclear"
description="Builds all jar files."
depends="compile-classes">
@@ -2790,38 +2790,38 @@
<jar jarfile="${build.lib}/mdbsessionpoolclear-test.ejb3">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/mdbsessionpoolclear/TestStatus*.class"/>
- <include name="org/jboss/ejb3/test/mdbsessionpoolclear/Ejb3*.class"/>
+ <include name="org/jboss/ejb3/test/mdbsessionpoolclear/Ejb3*.class"/>
</fileset>
</jar>
-
+
<jar jarfile="${build.lib}/mdbsessionpoolclear-test.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/mdbsessionpoolclear/Ejb21*.class"/>
- <include name="org/jboss/ejb3/test/mdbsessionpoolclear/TestStatus.class"/>
+ <include name="org/jboss/ejb3/test/mdbsessionpoolclear/TestStatus.class"/>
</fileset>
<fileset dir="${resources}/test/mdbsessionpoolclear">
<include name="META-INF/ejb-jar.xml"/>
- <include name="META-INF/jboss.xml"/>
+ <include name="META-INF/jboss.xml"/>
</fileset>
</jar>
-
- <jar jarfile="${resources}/test-configs/mdbsessionpoolclear/lib/mdbsessionpoolclear.jar">
+
+ <jar jarfile="${resources}/test-configs/mdbsessionpoolclear/lib/mdbsessionpoolclear.jar">
<fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/mdbsessionpoolclear/TestServer*.class"/>
+ <include name="org/jboss/ejb3/test/mdbsessionpoolclear/TestServer*.class"/>
</fileset>
</jar>
-
- <jar jarfile="${build.lib}/test-jms-ra.jar">
+
+ <jar jarfile="${build.lib}/test-jms-ra.jar">
<fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/mdbsessionpoolclear/adapter/**/*.class"/>
+ <include name="org/jboss/ejb3/test/mdbsessionpoolclear/adapter/**/*.class"/>
</fileset>
</jar>
-
- <jar jarfile="${resources}/test-configs/mdbsessionpoolclear/deploy/jms/test-jms-ra.rar">
+
+ <jar jarfile="${resources}/test-configs/mdbsessionpoolclear/deploy/jms/test-jms-ra.rar">
<fileset dir="${build.lib}">
- <include name="test-jms-ra.jar"/>
+ <include name="test-jms-ra.jar"/>
</fileset>
- <fileset dir="${resources}/test/mdbsessionpoolclear">
+ <fileset dir="${resources}/test/mdbsessionpoolclear">
<include name="META-INF/ra.xml"/>
</fileset>
</jar>
@@ -2855,7 +2855,7 @@
<include name="META-INF/*.xml"/>
</fileset>
</jar>
-
+
<mq2jbm basedir="${resources}/test/mdb"/>
<copy todir="${build.lib}">
@@ -2863,7 +2863,7 @@
<include name="*.xml"/>
</fileset>
</copy>
-
+
</target>
<target name="mdbtopic"
@@ -2887,7 +2887,7 @@
</fileset>
-->
</jar>
-
+
<!--
<copy todir="${build.lib}/embeddable/standalone">
<fileset dir="${build.lib}">
@@ -2962,7 +2962,7 @@
</fileset>
</jar>
</target>
-
+
<!--target name="concurrent"
description="Builds all jar files."
depends="compile-classes">
@@ -3115,9 +3115,9 @@
<include name="roles.properties"/>
<include name="security-spec.sar"/>
</fileset>
- <fileset dir="${resources}/test/security">
- <include name="META-INF/ejb-jar.xml"/>
- </fileset>
+ <fileset dir="${resources}/test/security">
+ <include name="META-INF/ejb-jar.xml"/>
+ </fileset>
</jar>
<jar jarfile="${build.lib}/timer-runas-security.jar">
@@ -3202,7 +3202,7 @@
</fileset>
</copy>
</target>
-
+
<target name="stateless"
description="Builds all jar files."
depends="compile-classes">
@@ -3218,8 +3218,8 @@
<include name="roles.properties"/>
</fileset>
</jar>
-
- <copy file="${build.lib}/stateless-test.jar" tofile="${build.lib}/stateless-test.ejb3"/>
+
+ <copy file="${build.lib}/stateless-test.jar" tofile="${build.lib}/stateless-test.ejb3"/>
</target>
<target name="ejbthree1092"
@@ -3237,7 +3237,7 @@
</fileset>
</jar>
</target>
-
+
<target name="statelesscreation"
description="Builds all jar files."
depends="compile-classes">
@@ -3250,7 +3250,7 @@
</fileset>
</jar>
</target>
-
+
<target name="removedislocal"
description="Builds all jar files."
depends="compile-classes">
@@ -3263,7 +3263,7 @@
</fileset>
</jar>
</target>
-
+
<target name="defaultremotebindings"
description="Builds all jar files."
depends="compile-classes">
@@ -3279,7 +3279,7 @@
</fileset>
</jar>
</target>
-
+
<target name="localfromremote"
description="Builds all jar files."
depends="compile-classes">
@@ -3291,20 +3291,20 @@
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/localfromremote/*.class"/>
</fileset>
-
+
<fileset dir="${resources}/test/localfromremote">
<include name="jndi.properties"/>
</fileset>
</jar>
<delete file="${resources}/test/localfromremote/jndi.properties"/>
<copy file="${build.lib}/localfromremote-test1.jar" tofile="${resources}/test-configs/localfromremote1/deploy/localfromremote-test.jar"/>
-
+
<copy file="${resources}/test/localfromremote/jndi2.properties" tofile="${resources}/test/localfromremote/jndi.properties"/>
<jar jarfile="${build.lib}/localfromremote-test2.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/localfromremote/*.class"/>
</fileset>
-
+
<fileset dir="${resources}/test/localfromremote">
<include name="jndi.properties"/>
</fileset>
@@ -3312,7 +3312,7 @@
<delete file="${resources}/test/localfromremote/jndi.properties"/>
<copy file="${build.lib}/localfromremote-test2.jar" tofile="${resources}/test-configs/localfromremote2/deploy/localfromremote-test.jar"/>
</target>
-
+
<target name="concurrentnaming"
description="Builds all jar files."
depends="compile-classes">
@@ -3341,20 +3341,20 @@
<include name="*.xml"/>
</fileset>
</jar>
-
+
<copy todir="${build.lib}">
<fileset dir="${resources}/test/propertyreplacement">
<include name="*.xml"/>
</fileset>
</copy>
</target>
-
+
<target name="invoker"
description="Builds all jar files."
depends="compile-classes">
-
+
<mkdir dir="${build.lib}"/>
-
+
<jar jarfile="${build.lib}/invoker-test.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/invoker/*.class"/>
@@ -3404,7 +3404,7 @@
</jar>
<delete>
- <fileset dir="${build.classes}">
+ <fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/stateless14/**/*.class"/>
</fileset>
</delete>
@@ -3428,7 +3428,7 @@
</target>
<!-- TODO use the other jacc target once the jars from hibernate are updated (changes already made to hibernate) -->
- <target name="jacc"
+ <target name="jacc"
description="Builds all jar files."
depends="compile-classes">
@@ -3448,7 +3448,7 @@
</jar>
</target>
-<!--
+ <!--
<target name="jacc"
description="Builds all jar files."
depends="compile-classes">
@@ -3494,13 +3494,13 @@
<include name="META-INF/jboss-service.xml"/>
</fileset>
</jar>
-
+
<build-jms-dd name="service" descriptor="test-destination-service.xml"/>
-
+
<mkdir dir="${target.resources}/test/service/META-INF"/>
<copy file="${resources}/test/service/META-INF/jboss.xml" todir="${target.resources}/test/service/META-INF"/>
<replace file="${target.resources}/test/service/META-INF/jboss.xml" token="@@jboss.jms.product@@" value="${jboss.jms.product}"/>
-
+
<jar jarfile="${build.lib}/service-test.jar">
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/service/*.class"/>
@@ -3631,31 +3631,31 @@
</fileset>
</jar>
- <jar jarfile="${build.lib}/clusteredentity-classloader-test.ear">
- <fileset dir="${build.lib}">
- <include name="clusteredentity-classloader-test.jar"/>
- </fileset>
- <fileset dir="${resources}/test/clusteredentity/classloader">
- <include name="META-INF/application.xml"/>
- <include name="META-INF/jboss-app.xml"/>
- <include name="clusteredentity-ds.xml"/>
- </fileset>
- </jar>
+ <jar jarfile="${build.lib}/clusteredentity-classloader-test.ear">
+ <fileset dir="${build.lib}">
+ <include name="clusteredentity-classloader-test.jar"/>
+ </fileset>
+ <fileset dir="${resources}/test/clusteredentity/classloader">
+ <include name="META-INF/application.xml"/>
+ <include name="META-INF/jboss-app.xml"/>
+ <include name="clusteredentity-ds.xml"/>
+ </fileset>
+ </jar>
- <jar jarfile="${build.lib}/clusteredentity-classloader-optimistic-test.ear">
- <fileset dir="${build.lib}">
- <include name="clusteredentity-classloader-optimistic-test.jar"/>
- </fileset>
- <fileset dir="${resources}/test/clusteredentity/classloader">
- <include name="META-INF/jboss-app.xml"/>
- <include name="clusteredentity-ds.xml"/>
- </fileset>
- <fileset dir="${resources}/test/clusteredentity/classloader/optimistic">
- <include name="META-INF/application.xml"/>
- <include name="META-INF/jboss-app.xml"/>
- <include name="clusteredentity-ds.xml"/>
- </fileset>
- </jar>
+ <jar jarfile="${build.lib}/clusteredentity-classloader-optimistic-test.ear">
+ <fileset dir="${build.lib}">
+ <include name="clusteredentity-classloader-optimistic-test.jar"/>
+ </fileset>
+ <fileset dir="${resources}/test/clusteredentity/classloader">
+ <include name="META-INF/jboss-app.xml"/>
+ <include name="clusteredentity-ds.xml"/>
+ </fileset>
+ <fileset dir="${resources}/test/clusteredentity/classloader/optimistic">
+ <include name="META-INF/application.xml"/>
+ <include name="META-INF/jboss-app.xml"/>
+ <include name="clusteredentity-ds.xml"/>
+ </fileset>
+ </jar>
<jar jarfile="${build.lib}/clusteredentity-providedprefix-test.jar">
<fileset dir="${build.classes}">
@@ -3666,74 +3666,74 @@
</fileset>
</jar>
- <jar jarfile="${build.lib}/clusteredentity-providedprefix-test.ear">
- <fileset dir="${build.lib}">
- <include name="clusteredentity-providedprefix-test.jar"/>
- </fileset>
- <fileset dir="${resources}/test/clusteredentity/providedprefix">
- <include name="META-INF/application.xml"/>
- <include name="META-INF/jboss-app.xml"/>
- <include name="clusteredentity-ds.xml"/>
- </fileset>
- <fileset dir="${resources}/test/clusteredentity/classloader">
- <include name="clusteredentity-ds.xml"/>
- </fileset>
- </jar>
+ <jar jarfile="${build.lib}/clusteredentity-providedprefix-test.ear">
+ <fileset dir="${build.lib}">
+ <include name="clusteredentity-providedprefix-test.jar"/>
+ </fileset>
+ <fileset dir="${resources}/test/clusteredentity/providedprefix">
+ <include name="META-INF/application.xml"/>
+ <include name="META-INF/jboss-app.xml"/>
+ <include name="clusteredentity-ds.xml"/>
+ </fileset>
+ <fileset dir="${resources}/test/clusteredentity/classloader">
+ <include name="clusteredentity-ds.xml"/>
+ </fileset>
+ </jar>
- <jar jarfile="${build.lib}/clusteredentity-embeddedid-test.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/clusteredentity/embeddedid/*.class"/>
- </fileset>
- <fileset dir="${resources}/test/clusteredentity/classloader">
- <include name="META-INF/persistence.xml"/>
- <!--include name="META-INF/jboss.xml"/-->
- </fileset>
- </jar>
+ <jar jarfile="${build.lib}/clusteredentity-embeddedid-test.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/clusteredentity/embeddedid/*.class"/>
+ </fileset>
+ <fileset dir="${resources}/test/clusteredentity/classloader">
+ <include name="META-INF/persistence.xml"/>
+ <!--include name="META-INF/jboss.xml"/-->
+ </fileset>
+ </jar>
- <jar jarfile="${build.lib}/clusteredentity-embeddedid-optimistic-test.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/clusteredentity/embeddedid/*.class"/>
- </fileset>
- <fileset dir="${resources}/test/clusteredentity/classloader/optimistic">
- <include name="META-INF/persistence.xml"/>
- <!--include name="META-INF/jboss.xml"/-->
- </fileset>
- </jar>
+ <jar jarfile="${build.lib}/clusteredentity-embeddedid-optimistic-test.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/clusteredentity/embeddedid/*.class"/>
+ </fileset>
+ <fileset dir="${resources}/test/clusteredentity/classloader/optimistic">
+ <include name="META-INF/persistence.xml"/>
+ <!--include name="META-INF/jboss.xml"/-->
+ </fileset>
+ </jar>
- <jar jarfile="${build.lib}/clusteredentity-embeddedid-test.ear">
- <fileset dir="${build.lib}">
- <include name="clusteredentity-embeddedid-test.jar"/>
- </fileset>
- <fileset dir="${resources}/test/clusteredentity/classloader">
- <include name="META-INF/jboss-app.xml"/>
- <include name="clusteredentity-ds.xml"/>
- </fileset>
- <fileset dir="${resources}/test/clusteredentity/embeddedid">
- <include name="META-INF/application.xml"/>
- </fileset>
- </jar>
+ <jar jarfile="${build.lib}/clusteredentity-embeddedid-test.ear">
+ <fileset dir="${build.lib}">
+ <include name="clusteredentity-embeddedid-test.jar"/>
+ </fileset>
+ <fileset dir="${resources}/test/clusteredentity/classloader">
+ <include name="META-INF/jboss-app.xml"/>
+ <include name="clusteredentity-ds.xml"/>
+ </fileset>
+ <fileset dir="${resources}/test/clusteredentity/embeddedid">
+ <include name="META-INF/application.xml"/>
+ </fileset>
+ </jar>
- <jar jarfile="${build.lib}/clusteredentity-embeddedid-optimistic-test.ear">
- <fileset dir="${build.lib}">
- <include name="clusteredentity-embeddedid-optimistic-test.jar"/>
- </fileset>
- <fileset dir="${resources}/test/clusteredentity/classloader">
- <include name="META-INF/jboss-app.xml"/>
- <include name="clusteredentity-ds.xml"/>
- </fileset>
- <fileset dir="${resources}/test/clusteredentity/embeddedid/optimistic">
- <include name="META-INF/application.xml"/>
- </fileset>
- </jar>
-
- <!-- Copy the optimistic locking JBC config to ${build.lib} so we can deploy it -->
- <copy todir="${build.lib}">
- <fileset dir="${resources}/test/clusteredentity/optimistic">
- <include name="optimistic-entity-cache-*.xml"/>
- </fileset>
- </copy>
-
+ <jar jarfile="${build.lib}/clusteredentity-embeddedid-optimistic-test.ear">
+ <fileset dir="${build.lib}">
+ <include name="clusteredentity-embeddedid-optimistic-test.jar"/>
+ </fileset>
+ <fileset dir="${resources}/test/clusteredentity/classloader">
+ <include name="META-INF/jboss-app.xml"/>
+ <include name="clusteredentity-ds.xml"/>
+ </fileset>
+ <fileset dir="${resources}/test/clusteredentity/embeddedid/optimistic">
+ <include name="META-INF/application.xml"/>
+ </fileset>
+ </jar>
+
+ <!-- Copy the optimistic locking JBC config to ${build.lib} so we can deploy it -->
+ <copy todir="${build.lib}">
+ <fileset dir="${resources}/test/clusteredentity/optimistic">
+ <include name="optimistic-entity-cache-*.xml"/>
+ </fileset>
+ </copy>
+
</target>
<target name="clusteredsession"
@@ -3746,9 +3746,9 @@
<fileset dir="${build.classes}">
<include name="org/jboss/ejb3/test/clusteredsession/**/*.class"/>
</fileset>
- <fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/stateful/nested/base/**/*.class"/>
- </fileset>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/stateful/nested/base/**/*.class"/>
+ </fileset>
<fileset dir="${resources}/test/clusteredsession">
<include name="META-INF/*.xml"/>
</fileset>
@@ -3763,10 +3763,10 @@
</fileset>
<fileset dir="${resources}/test/clusteredsession">
<include name="META-INF/*.xml"/>
- <exclude name="META-INF/jboss.xml"/>
+ <exclude name="META-INF/jboss.xml"/>
</fileset>
<fileset dir="${resources}/test/clusteredsession/scoped">
- <include name="META-INF/*.xml"/>
+ <include name="META-INF/*.xml"/>
</fileset>
</jar>
@@ -3778,28 +3778,28 @@
<include name="META-INF/*.xml"/>
</fileset>
</jar>
-
- <copy todir="${build.lib}">
- <fileset dir="${resources}/test/clusteredsession/islocal/foreign">
- <include name="testlocal-service.xml"/>
- </fileset>
- </copy>
- <jar jarfile="${build.lib}/ejbthree1136.jar">
- <fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/ejbthree1136/DoNothing*.class"/>
- </fileset>
- </jar>
- <jar destfile="${build.lib}/ejbthree1136.sar">
- <metainf dir="${build.resources}/test/ejbthree1136">
- <include name="jboss-service.xml"/>
- </metainf>
- <fileset dir="${build.classes}">
- <include name="org/jboss/ejb3/test/ejbthree1136/SFSB*.class"/>
- </fileset>
- </jar>
+ <copy todir="${build.lib}">
+ <fileset dir="${resources}/test/clusteredsession/islocal/foreign">
+ <include name="testlocal-service.xml"/>
+ </fileset>
+ </copy>
+
+ <jar jarfile="${build.lib}/ejbthree1136.jar">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/ejbthree1136/DoNothing*.class"/>
+ </fileset>
+ </jar>
+ <jar destfile="${build.lib}/ejbthree1136.sar">
+ <metainf dir="${build.resources}/test/ejbthree1136">
+ <include name="jboss-service.xml"/>
+ </metainf>
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/ejb3/test/ejbthree1136/SFSB*.class"/>
+ </fileset>
+ </jar>
</target>
-
+
<target name="jars" depends="ejbthree1090, mdbsessionpoolclear, ejbthree1092, removedislocal, statelesscreation, defaultremotebindings, localfromremote, clusteredjms, entityoptimisticlocking, concurrentnaming, propertyreplacement, persistenceunits, invalidtxmdb, descriptortypo, libdeployment, homeinterface, servicexmbean, arjuna, mdbtransactions, unauthenticatedprincipal, clusteredservice, invoker, classloader,
circulardependency, jsp, timerdependency, servicedependency, servlet, stateless14, webservices, ear, ejbthree440,
ejbthree454, ejbthree653, ejbthree670, ejbthree712, ejbthree724, ejbthree751, ejbthree785, ejbthree832,
@@ -3838,11 +3838,11 @@
<!-- Remove the test.log so each run has a fresh log -->
<delete file="${build.testlog}/test.log"/>
- <!-- These tests need extra stuff on classpath -->
+ <!-- These tests need extra stuff on classpath -->
<condition property="client.run.classpath" value="security.client.classpath">
<equals arg1="${test}" arg2="jaccpropagation"/>
</condition>
- <condition property="client.run.classpath" value="security.client.classpath">
+ <condition property="client.run.classpath" value="security.client.classpath">
<equals arg1="${test}" arg2="security"/>
</condition>
<condition property="client.run.classpath" value="dd.web.client.classpath">
@@ -3854,7 +3854,7 @@
<condition property="client.run.classpath" value="iiop.client.classpath">
<equals arg1="${test}" arg2="iiop"/>
</condition>
- <condition property="client.run.classpath" value="dd.classpath">
+ <condition property="client.run.classpath" value="dd.classpath">
<equals arg1="${test}" arg2="threadlocal"/>
</condition>
<condition property="client.run.classpath" value="client.classpath">
@@ -3870,15 +3870,15 @@
</condition>
<condition property="jboss-junit-configuration" value="${test.extension}">
- <isset property="test.extension"/>
+ <isset property="test.extension"/>
</condition>
<condition property="jboss-junit-configuration" value="">
- <not>
- <isset property="test.extension"/>
- </not>
+ <not>
+ <isset property="test.extension"/>
+ </not>
</condition>
-
+
<junit dir="${module.output}"
printsummary="yes"
haltonerror="false"
@@ -3909,7 +3909,7 @@
<!-- for EAP 4.3, jboss.jms.provider must either be jbm or mq -->
<sysproperty key="jboss.jms.provider" value="${jboss.jms.provider}"/>
- <!-- MultiUnitBindTestCase needs to know the bind address to correctly
+ <!-- MultiUnitBindTestCase needs to know the bind address to correctly
test the assertion -->
<sysproperty key="jboss.bind.address" value="${node0}"/>
@@ -3932,15 +3932,15 @@
<path refid="jboss.aop.classpath"/>
<path refid="jboss.aspects.classpath"/>
<path refid="jboss.jbossxb.classpath"/>
- <!-- for Corba -->
+ <!-- for Corba -->
<path refid="jboss.iiop.classpath"/>
- <path refid="jacorb.jacorb.classpath"/>
- <path refid="apache.avalon.classpath"/>
- <path refid="apache.avalon.logkit.classpath"/>
+ <path refid="jacorb.jacorb.classpath"/>
+ <path refid="apache.avalon.classpath"/>
+ <path refid="apache.avalon.logkit.classpath"/>
<!-- EJBTHREE-485 needs javassist -->
<path refid="javassist.classpath"/>
-
+
<!-- For clustered entities -->
<path refid="hsqldb.hsqldb.classpath"/>
</classpath>
@@ -3948,7 +3948,7 @@
<formatter type="plain" usefile="true"/>
<formatter type="xml" usefile="true" unless="test.extension"/>
<!--formatter type="xml" extension="-${test.extension}.xml" usefile="true" if="test.extension"/-->
- <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
+ <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
extension="-${test.extension}.xml" usefile="true" if="test.extension"/>
@@ -3973,7 +3973,7 @@
<!-- Remove the test.log so each run has a fresh log -->
<delete file="${build.testlog}/test.log"/>
- <!-- These tests need extra stuff on classpath -->
+ <!-- These tests need extra stuff on classpath -->
<condition property="client.run.classpath" value="client.classpath">
<not>
<isset property="client.run.classpath"/>
@@ -4006,10 +4006,10 @@
<sysproperty key="jbosstest.cluster.node1.jndi.url" value="${node1.jndi.url}"/>
<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
- <!-- for EAP 4.3, jboss.jms.provider must either be jbm or mq -->
- <sysproperty key="jboss.jms.provider" value="${jboss.jms.provider}"/>
+ <!-- for EAP 4.3, jboss.jms.provider must either be jbm or mq -->
+ <sysproperty key="jboss.jms.provider" value="${jboss.jms.provider}"/>
- <!-- MultiUnitBindTestCase needs to know the bind address to correctly
+ <!-- MultiUnitBindTestCase needs to know the bind address to correctly
test the assertion -->
<sysproperty key="jboss.bind.address" value="${node0}"/>
@@ -4020,7 +4020,7 @@
<path refid="hibernate.hibernate.classpath"/>
<pathelement location="${build.classes}"/>
<pathelement location="${resources}/test"/>
- <path refid="${client.run.classpath}"/>
+ <path refid="${client.run.classpath}"/>
<path refid="jboss.jbossws.classpath"/>
<path refid="apache.xerces.classpath"/>
<path refid="glassfish.jaf.classpath"/>
@@ -4100,8 +4100,8 @@
</java>
</target>
-
+
<target name="run" depends="init" if="class"
description="Execute all tests in the given test directory.">
<java fork="true" classname="${class}">
@@ -4125,12 +4125,12 @@
<antcall target="invoker-test" inheritRefs="true"/>
<antcall target="iiop-tests" inheritRefs="true"/>
<antcall target="libdeployment-test" inheritRefs="true"/>
- <antcall target="externalpersistenceunit-test" inheritRefs="true"/>
- <antcall target="multi-instance-localfromremote-test" inheritRefs="true"/>
- <antcall target="statelesscreation-test" inheritRefs="true"/>
- <antcall target="removedislocal-test" inheritRefs="true"/>
- <antcall target="mdbsessionpoolclear-test" inheritRefs="true"/>
- <antcall target="ejbthree1504-test" inheritRefs="true"/>
+ <antcall target="externalpersistenceunit-test" inheritRefs="true"/>
+ <antcall target="multi-instance-localfromremote-test" inheritRefs="true"/>
+ <antcall target="statelesscreation-test" inheritRefs="true"/>
+ <antcall target="removedislocal-test" inheritRefs="true"/>
+ <antcall target="mdbsessionpoolclear-test" inheritRefs="true"/>
+ <antcall target="ejbthree1504-test" inheritRefs="true"/>
</target>
<target name="no-start-jboss-tests" depends="init" description="Execute all tests">
@@ -4167,16 +4167,15 @@
<wait-on-shutdown conf="all"/>
</target>
-
<target name="no-start-jboss-ejb-tests" depends="init" description="Execute all tests">
<antcall target="test" inheritRefs="true">
<param name="test" value="ejbthree1090"/>
</antcall>
- <!--antcall target="test" inheritRefs="true">
+ <!--antcall target="test" inheritRefs="true">
<param name="test" value="jaccpropagation"/>
</antcall-->
<antcall target="test" inheritRefs="true">
- <param name="test" value="ejbthree1092"/>
+ <param name="test" value="ejbthree1092"/>
</antcall>
<antcall target="test" inheritRefs="true">
<param name="test" value="arjuna"/>
@@ -4292,7 +4291,7 @@
<antcall target="test" inheritRefs="true">
<param name="test" value="stateless"/>
</antcall>
- <antcall target="test" inheritRefs="true">
+ <antcall target="test" inheritRefs="true">
<param name="test" value="defaultremotebindings"/>
</antcall>
<antcall target="test" inheritRefs="true">
@@ -4461,7 +4460,7 @@
</target>
<target name="no-start-jboss-entity-tests" depends="init" description="Execute all tests">
- <antcall target="test" inheritRefs="true">
+ <antcall target="test" inheritRefs="true">
<param name="test" value="epcpropagation"/>
</antcall>
<antcall target="test" inheritRefs="true">
@@ -4555,7 +4554,7 @@
</target>
<target name="clustered-one-test" depends="init, clusteredsession, clusteredentity, ejbthree921, ejbthree1109">
-<!--
+ <!--
-->
<antcall target="tests-clustering-startup"/>
<antcall target="tests-clustering-wait"/>
@@ -4574,7 +4573,7 @@
anyway as part of the tests, so simplest is to shut down the other from within
the test rather than figure out what to shut down here.
-->
-<!--
+ <!--
-->
<antcall target="tests-clustering-shutdown"/>
@@ -4588,7 +4587,7 @@
<antcall target="test-cluster-session"/>
<antcall target="tests-clustering-shutdown"/>
-
+
<!-- Rerun the tests with buddy replication turned off -->
<antcall target="clustered-buddyrepl-test"/>
@@ -4602,18 +4601,18 @@
<include name="lib/**"/>
</patternset>
</create-config>
-
+
<start-jboss conf="libdeployment" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
<wait-on-host/>
-
+
<antcall target="test" inheritRefs="true">
<param name="test" value="libdeployment"/>
</antcall>
-
+
<stop-jboss jboss.dist="${ejb3.dist}"/>
<wait-on-shutdown conf="libdeployment"/>
</target>
-
+
<target name="externalpersistenceunit-test" depends="init">
<create-config baseconf="all" newconf="externalpersistenceunit" jboss.dist="${ejb3.dist}">
<patternset>
@@ -4622,14 +4621,14 @@
<include name="lib/**"/>
</patternset>
</create-config>
-
+
<start-jboss conf="externalpersistenceunit" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
<wait-on-host/>
-
+
<antcall target="test" inheritRefs="true">
<param name="test" value="externalpersistenceunit"/>
</antcall>
-
+
<stop-jboss jboss.dist="${ejb3.dist}"/>
<wait-on-shutdown conf="externalpersistenceunit"/>
</target>
@@ -4642,18 +4641,18 @@
<include name="lib/**"/>
</patternset>
</create-config>
-
+
<start-jboss conf="mdbsessionpoolclear" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
<wait-on-host/>
-
+
<antcall target="test" inheritRefs="true">
<param name="test" value="mdbsessionpoolclear"/>
</antcall>
-
+
<stop-jboss jboss.dist="${ejb3.dist}"/>
<wait-on-shutdown conf="mdbsessionpoolclear"/>
</target>
-
+
<target name="ejbthree1504-test" depends="init">
<create-config baseconf="all" newconf="ejbthree1504" jboss.dist="${ejb3.dist}">
<patternset>
@@ -4662,20 +4661,20 @@
<include name="lib/**"/>
</patternset>
</create-config>
-
+
<start-jboss conf="ejbthree1504" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejbthree1504.jboss.jvmargs}"/>
<wait-on-host/>
-
+
<antcall target="test" inheritRefs="true">
<param name="test" value="ejbthree1504"/>
</antcall>
-
+
<stop-jboss jboss.dist="${ejb3.dist}"/>
<wait-on-shutdown conf="ejbthree1504"/>
</target>
-
+
<target name="ssl-simple-test" depends="init">
- <create-config baseconf="all" newconf="ejb3-ssl" jboss.dist="${ejb3.dist}">
+ <create-config baseconf="all" newconf="ejb3-ssl" jboss.dist="${ejb3.dist}">
<patternset>
<include name="conf/**"/>
<include name="deploy*/**"/>
@@ -4696,7 +4695,7 @@
<stop-jboss jboss.dist="${ejb3.dist}"/>
<wait-on-shutdown conf="ejb3-ssl"/>
</target>
-
+
<target name="no-start-jboss-ssl-tests" depends="init" description="Execute all ssl tests">
<property name="jvmargs" value="-Djavax.net.ssl.trustStore=${resources}/test/ssl/localhost.truststore -Djavax.net.ssl.trustStorePassword=opensource"/>
@@ -4707,7 +4706,7 @@
</target>
<target name="ssl-advanced-test" depends="init">
- <create-config baseconf="all" newconf="ejb3-ssl-advanced" jboss.dist="${ejb3.dist}">
+ <create-config baseconf="all" newconf="ejb3-ssl-advanced" jboss.dist="${ejb3.dist}">
<patternset>
<include name="conf/**"/>
<include name="deploy*/**"/>
@@ -4732,7 +4731,7 @@
<stop-jboss jboss.dist="${ejb3.dist}"/>
<wait-on-shutdown conf="ejb3-ssl-advanced"/>
</target>
-
+
<target name="invoker-test" depends="init">
<create-config baseconf="all" newconf="invoker" jboss.dist="${ejb3.dist}">
<patternset>
@@ -4741,20 +4740,20 @@
<include name="lib/**"/>
</patternset>
</create-config>
-
+
<property name="ssl-args" value="-Djavax.net.ssl.keyStore=${ejb3.dist}/server/invoker/conf/localhost.keystore -Djavax.net.ssl.keyStorePassword=opensource -Djava.protocol.handler.pkgs=javax.net.ssl ${ejb3.jboss.jvmargs}"/>
-
+
<start-jboss conf="invoker" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ssl-args}"/>
<wait-on-host/>
-
+
<!-- Tell client to use the supplied truststore -->
- <property name="jvmargs" value="-Djavax.net.ssl.trustStore=${resources}/test/ssl/localhost.truststore -Djavax.net.ssl.trustStorePassword=opensource -Djava.protocol.handler.pkgs=javax.net.ssl"/>
-
+ <property name="jvmargs" value="-Djavax.net.ssl.trustStore=${resources}/test/ssl/localhost.truststore -Djavax.net.ssl.trustStorePassword=opensource -Djava.protocol.handler.pkgs=javax.net.ssl"/>
+
<antcall target="test-with-jvmargs" inheritRefs="true">
<param name="test" value="invoker"/>
<param name="jvmargs" value="${jvmargs}"/>
</antcall>
-
+
<stop-jboss jboss.dist="${ejb3.dist}"/>
<wait-on-shutdown conf="invoker"/>
</target>
@@ -4791,142 +4790,142 @@
</target>
<target name="test-cluster-session">
-
- <property name="buddy-replication-extension" value="BR-disabled"/>
-
- <antcall target="test-with-jvmargs" inheritRefs="true">
- <param name="test" value="clusteredsession"/>
- <param name="jvmargs" value=""/>
- <param name="test.extension" value="${buddy-replication-extension}"/>
- <!--
+
+ <property name="buddy-replication-extension" value="BR-disabled"/>
+
+ <antcall target="test-with-jvmargs" inheritRefs="true">
+ <param name="test" value="clusteredsession"/>
+ <param name="jvmargs" value=""/>
+ <param name="test.extension" value="${buddy-replication-extension}"/>
+ <!--
<param name="jvmargs"
value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=n,suspend=n"/>
-->
- </antcall>
-
- <antcall target="test-with-jvmargs" inheritRefs="true">
- <param name="test" value="ejbthree921"/>
- <param name="jvmargs" value=""/>
- <param name="test.extension" value="${buddy-replication-extension}"/>
- </antcall>
-
+ </antcall>
+
<antcall target="test-with-jvmargs" inheritRefs="true">
+ <param name="test" value="ejbthree921"/>
+ <param name="jvmargs" value=""/>
+ <param name="test.extension" value="${buddy-replication-extension}"/>
+ </antcall>
+
+ <antcall target="test-with-jvmargs" inheritRefs="true">
<param name="test" value="ejbthree1136"/>
<param name="jvmargs" value=""/>
- <param name="test.extension" value="${buddy-replication-extension}"/>
+ <param name="test.extension" value="${buddy-replication-extension}"/>
</antcall>
<antcall target="test-with-jvmargs" inheritRefs="true">
<param name="test" value="ejbthree1109"/>
<param name="jvmargs" value=""/>
- <param name="test.extension" value="${buddy-replication-extension}"/>
+ <param name="test.extension" value="${buddy-replication-extension}"/>
</antcall>
-
+
</target>
-
+
<target name="statelesscreation-test">
<create-config baseconf="all" newconf="statelesscreation">
<patternset>
- <include name="conf/**"/>
- <include name="deploy*/**"/>
- <include name="lib/**"/>
+ <include name="conf/**"/>
+ <include name="deploy*/**"/>
+ <include name="lib/**"/>
</patternset>
</create-config>
-
+
<start-jboss conf="statelesscreation" host="${node0}" jvmargs="${ejb3.jboss.jvmargs}"/>
<wait-on-host/>
-
+
<antcall target="test-with-jvmargs" inheritRefs="true">
<param name="test" value="statelesscreation"/>
<param name="jvmargs" value=""/>
</antcall>
-
+
<stop-jboss url="${node0.jndi.url}" jboss.dist="${ejb3.dist}"/>
<wait-on-shutdown conf="statelesscreation"/>
</target>
-
+
<target name="removedislocal-test">
<create-config baseconf="all" newconf="removedislocal">
<patternset>
- <include name="conf/**"/>
- <include name="deploy*/**"/>
- <include name="lib/**"/>
+ <include name="conf/**"/>
+ <include name="deploy*/**"/>
+ <include name="lib/**"/>
</patternset>
</create-config>
-
+
<start-jboss conf="removedislocal" host="${node0}" jvmargs="${ejb3.jboss.jvmargs}"/>
<wait-on-host/>
-
+
<antcall target="test-with-jvmargs" inheritRefs="true">
<param name="test" value="removedislocal"/>
<param name="jvmargs" value=""/>
</antcall>
-
+
<stop-jboss url="${node0.jndi.url}" jboss.dist="${ejb3.dist}"/>
<wait-on-shutdown conf="removedislocal"/>
</target>
-
+
<target name="multi-instance-localfromremote-test">
<create-config baseconf="default" newconf="localfromremote1">
<patternset>
- <include name="conf/**"/>
- <include name="deploy*/**"/>
- <include name="lib/**"/>
+ <include name="conf/**"/>
+ <include name="deploy*/**"/>
+ <include name="lib/**"/>
</patternset>
</create-config>
<create-config baseconf="default" newconf="localfromremote2">
<patternset>
- <include name="conf/**"/>
- <include name="deploy*/**"/>
- <include name="lib/**"/>
+ <include name="conf/**"/>
+ <include name="deploy*/**"/>
+ <include name="lib/**"/>
</patternset>
</create-config>
-
+
<start-jboss conf="localfromremote1" host="${node0}" jvmargs="${ejb3.jboss.jvmargs}"/>
- <start-jboss conf="localfromremote2" host="${node0}" jvmargs="${ejb3.jboss.jvmargs}"/>
-
- <antcall target="tests-multi-instance-wait"/>
-
- <antcall target="test-with-jvmargs" inheritRefs="true">
+ <start-jboss conf="localfromremote2" host="${node0}" jvmargs="${ejb3.jboss.jvmargs}"/>
+
+ <antcall target="tests-multi-instance-wait"/>
+
+ <antcall target="test-with-jvmargs" inheritRefs="true">
<param name="test" value="localfromremote"/>
<param name="jvmargs" value=""/>
</antcall>
-
+
<stop-jboss url="${node0.jndi.url}" jboss.dist="${ejb3.dist}"/>
<stop-jboss url="${node0.jndi.port1.url}" jboss.dist="${ejb3.dist}"/>
<wait-on-shutdown conf="localfromremote1"/>
<wait-on-shutdown conf="localfromremote2"/>
</target>
-
+
<target name="clustered-jms-test">
<create-config baseconf="all" newconf="clusteredjms" jboss.dist="${ejb3.dist}">
<patternset>
- <include name="conf/**"/>
- <include name="deploy*/**"/>
- <include name="lib/**"/>
+ <include name="conf/**"/>
+ <include name="deploy*/**"/>
+ <include name="lib/**"/>
<include name="deploy-hasingleton/**"/>
</patternset>
</create-config>
<create-config baseconf="clusteredjms" newconf="clusteredjms2" jboss.dist="${ejb3.dist}">
<patternset>
- <include name="conf/**"/>
- <include name="deploy*/**"/>
- <include name="lib/**"/>
+ <include name="conf/**"/>
+ <include name="deploy*/**"/>
+ <include name="lib/**"/>
<include name="deploy-hasingleton/**"/>
</patternset>
</create-config>
-
- <start-jboss conf="clusteredjms2" host="${node1}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs} -Djgroups.bind_addr=${node1.jgroups.bind_addr}"/>
- <antcall target="tests-clusteredjms2-wait"/>
- <start-jboss conf="clusteredjms" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs} -Djgroups.bind_addr=${node0.jgroups.bind_addr}"/>
- <antcall target="tests-clusteredjms-wait"/>
-
- <antcall target="test-with-jvmargs" inheritRefs="true">
+
+ <start-jboss conf="clusteredjms2" host="${node1}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs} -Djgroups.bind_addr=${node1.jgroups.bind_addr}"/>
+ <antcall target="tests-clusteredjms2-wait"/>
+ <start-jboss conf="clusteredjms" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs} -Djgroups.bind_addr=${node0.jgroups.bind_addr}"/>
+ <antcall target="tests-clusteredjms-wait"/>
+
+ <antcall target="test-with-jvmargs" inheritRefs="true">
<param name="test" value="clusteredjms"/>
<param name="jvmargs" value=""/>
</antcall>
-
+
<stop-jboss url="${node0.jndi.url}" jboss.dist="${ejb3.dist}"/>
<stop-jboss url="${node1.jndi.url}" jboss.dist="${ejb3.dist}"/>
@@ -4959,7 +4958,7 @@
<fail message="Timeout waiting for nodes to start" if="cluster.timeout"/>
<echo message="Nodes have started, waiting for cluster to stablize..."/>
</target>
-
+
<target name="tests-clusteredjms-wait" unless="${tests.clustering.skip.startup}">
<echo message="Waiting for node to start..."/>
<waitfor maxwait="120" maxwaitunit="second"
@@ -4971,7 +4970,7 @@
<fail message="Timeout waiting for nodes to start" if="cluster.timeout"/>
<echo message="Nodes have started, waiting for cluster to stablize..."/>
</target>
-
+
<target name="tests-clusteredjms2-wait" unless="${tests.clustering.skip.startup}">
<echo message="Waiting for node to start..."/>
<waitfor maxwait="120" maxwaitunit="second"
@@ -5006,16 +5005,16 @@
<echo message="Overwriting config descriptors" />
<copy todir="@{jboss.dist}/server/@{conf}" overwrite="true" failonerror="false">
<fileset dir="${build.resources}/test-configs/@{conf-src}" />
- </copy>
- <antcall target="modify-ejb3-repl_sync">
- <param name="file_" value="${jboss.dist}/server/@{conf}/deploy/ejb3-clustered-sfsbcache-service.xml"/>
- </antcall>
+ </copy>
+ <antcall target="modify-ejb3-repl_sync">
+ <param name="file_" value="${jboss.dist}/server/@{conf}/deploy/ejb3-clustered-sfsbcache-service.xml"/>
+ </antcall>
</sequential>
</macrodef>
<target name="modify-ejb3-repl_sync">
- <echo message="Replacing the cache mode to REPL_SYNC in ${file_}"/>
- <replaceregexp file="${file_}" byline="yes" flags="is"
+ <echo message="Replacing the cache mode to REPL_SYNC in ${file_}"/>
+ <replaceregexp file="${file_}" byline="yes" flags="is"
match="REPL_ASYNC"
replace="REPL_SYNC"/>
</target>
@@ -5035,7 +5034,7 @@
<stop-jboss url="${node0.jndi.url}"/>
<stop-jboss url="${node1.jndi.url}"/>
-
+
<wait-on-shutdown conf="clustered-ejb3-BR-0"/>
<wait-on-shutdown conf="clustered-ejb3-BR-1"/>
@@ -5089,30 +5088,30 @@
</junitreport>
</target>
- <target name="tests-report-text" depends="tests-report-html">
- <mkdir dir="${build.reports}/text"/>
+ <target name="tests-report-text" depends="tests-report-html">
+ <mkdir dir="${build.reports}/text"/>
- <style basedir="${build.reports}"
+ <style basedir="${build.reports}"
destdir="${build.reports}/text"
extension=".txt"
style="${build.stylesheets}/summary1b.xsl"
includes="TESTS-TestSuites.xml">
- <param name="thedate" expression="${TIMENOW}"/>
- <param name="java_version" expression="${java.version}"/>
- <param name="java_vendor" expression="${java.vendor}"/>
- <param name="java_vm_specification_version" expression="${java.vm.specification.version}"/>
- <param name="java_vm_version" expression="${java.vm.version}"/>
- <param name="java_vm_name" expression="${java.vm.name}"/>
- <param name="java_vm_info" expression="${java.vm.info}"/>
- <param name="java_specification_version" expression="${java.specification.version}"/>
- <param name="java_class_version" expression="${java.class.version}"/>
- <param name="os_name" expression="${os.name}"/>
- <param name="os_arch" expression="${os.arch}"/>
- <param name="os_version" expression="${os.version}"/>
- <param name="builduid" expression="${TIMENOW}"/>
- <param name="results_web" expression="${results_web}"/>
- </style>
- </target>
+ <param name="thedate" expression="${TIMENOW}"/>
+ <param name="java_version" expression="${java.version}"/>
+ <param name="java_vendor" expression="${java.vendor}"/>
+ <param name="java_vm_specification_version" expression="${java.vm.specification.version}"/>
+ <param name="java_vm_version" expression="${java.vm.version}"/>
+ <param name="java_vm_name" expression="${java.vm.name}"/>
+ <param name="java_vm_info" expression="${java.vm.info}"/>
+ <param name="java_specification_version" expression="${java.specification.version}"/>
+ <param name="java_class_version" expression="${java.class.version}"/>
+ <param name="os_name" expression="${os.name}"/>
+ <param name="os_arch" expression="${os.arch}"/>
+ <param name="os_version" expression="${os.version}"/>
+ <param name="builduid" expression="${TIMENOW}"/>
+ <param name="results_web" expression="${results_web}"/>
+ </style>
+ </target>
<target name="tests-report-clean">
@@ -5128,7 +5127,7 @@
<param name="test" value="${test}"/>
<param name="test.extension" value="jacorb"/>
<param name="test.jndi.url" value="corbaloc::${node0}:3528/JBoss/Naming/root"/>
- <!-- using jacorb -->
+ <!-- using jacorb -->
<param name="jvmargs" value="${debugFlags}
-Djava.security.manager
-Djava.security.policy=${resources}/security/tst.policy
@@ -5171,5 +5170,176 @@
</antcall>
<!-- TODO: call sunorb-test, but the report gets overwritten -->
</target>
-
+
+ <target name="tests-cc" description="Executes tests related to CC certification">
+ <antcall target="tests-report-clean" inheritRefs="true"/>
+
+ <antcall target="main" inheritRefs="true"/>
+
+ <antcall target="calculate-md5"/>
+
+ <antcall target="run-cc-tests" inheritRefs="true">
+ <!-- This parameter controls junitreport to produce CC testify section. -->
+ <param name="cc-testify" value="true"/>
+ </antcall>
+
+ <antcall target="tests-report-html" inheritRefs="true"/>
+ </target>
+
+ <target name="run-cc-tests">
+ <!--<antcall target="ejb-tests" inheritRefs="true"/>-->
+ <antcall target="cc-tests" inheritRefs="true"/>
+ </target>
+
+ <target name="cc-tests" depends="init" description="Execute all tests">
+
+ <antcall target="create-cc-config">
+ <param name="alternate-config" value="cc-none"/>
+ </antcall>
+
+ <start-jboss conf="cc" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
+ <wait-on-host/>
+
+ <antcall target="no-start-jboss-cc-tests" inheritRefs="true"/>
+
+ <stop-jboss jboss.dist="${ejb3.dist}"/>
+ <wait-on-shutdown conf="cc"/>
+
+ </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="${project.root}/testsuite/output/classes"/>
+ </classpath>
+ <arg line="-base ${jboss.dist}/ -output ${build.reports}/html/allmd5sum.txt -d ${jboss.dist}/lib -d ${jboss.dist}/server/production/lib"/>
+ </java>
+
+ </target>
+
+ <!-- This target creates CC configuration -->
+ <target name="create-cc-config" description="Creates CC configuration">
+ <!-- Create the CC config starting with the pruduction config -->
+ <create-config baseconf="production" newconf="cc" newconf-src="cc">
+ <patternset>
+ <include name="**/*"/>
+ </patternset>
+ </create-config>
+
+ <!-- delete SNMP adapter, because it is not allowed in CC config -->
+ <delete dir="${jboss.dist}/server/cc/deploy/snmp-adaptor.sar"/>
+
+ <!-- copy alternate part of configuration (cc-none, cc-db, cc-ldap) -->
+ <!--
+ <copy todir="${jboss.dist}/server/cc" overwrite="true">
+ <fileset dir="${build.resources}/test-configs/${alternate-config}">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ -->
+
+ </target>
+
+ <target name="no-start-jboss-cc-tests" depends="init" description="Execute CC tests">
+ <antcall target="test" inheritRefs="true">
+ <param name="test" value="security" />
+ </antcall>
+
+ <antcall target="test" inheritRefs="true">
+ <param name="test" value="webservices" />
+ </antcall>
+
+ <antcall target="test" inheritRefs="true">
+ <param name="test" value="clientinterceptors" />
+ </antcall>
+ <antcall target="test" inheritRefs="true">
+ <param name="test" value="interceptors2" />
+ </antcall>
+ <antcall target="test" inheritRefs="true">
+ <param name="test" value="interceptors3" />
+ </antcall>
+ <antcall target="test" inheritRefs="true">
+ <param name="test" value="interceptors" />
+ </antcall>
+
+ <antcall target="test" inheritRefs="true">
+ <param name="test" value="jaxws" />
+ </antcall>
+
+ <antcall target="test" inheritRefs="true">
+ <param name="test" value="txexceptions" />
+ </antcall>
+
+ <antcall target="test" inheritRefs="true">
+ <param name="test" value="localcall" />
+ </antcall>
+
+ <antcall target="test" inheritRefs="true">
+ <param name="test" value="service" />
+ </antcall>
+ <antcall target="test" inheritRefs="true">
+ <param name="test" value="servicexmbean" />
+ </antcall>
+ <!--
+ <antcall target="test" inheritRefs="true">
+ <param name="test" value="stateful" />
+ </antcall>
+ -->
+ <antcall target="test" inheritRefs="true">
+ <param name="test" value="descriptortypo" />
+ </antcall>
+ <antcall target="test" inheritRefs="true">
+ <param name="test" value="aspectdomain" />
+ </antcall>
+ <antcall target="test" inheritRefs="true">
+ <param name="test" value="ejbcontext" />
+ </antcall>
+ <antcall target="test" inheritRefs="true">
+ <param name="test" value="initial" />
+ </antcall>
+
+ <antcall target="test" inheritRefs="true">
+ <param name="test" value="mdb" />
+ </antcall>
+ <antcall target="test" inheritRefs="true">
+ <param name="test" value="invalidtxmdb" />
+ </antcall>
+ <antcall target="test" inheritRefs="true">
+ <param name="test" value="mdbtransactions" />
+ </antcall>
+ <antcall target="test" inheritRefs="true">
+ <param name="test" value="consumer" />
+ </antcall>
+ <antcall target="test" inheritRefs="true">
+ <param name="test" value="cache" />
+ </antcall>
+
+ <antcall target="test" inheritRefs="true">
+ <param name="test" value="securitydomain" />
+ </antcall>
+
+ <antcall target="test" inheritRefs="true">
+ <param name="test" value="jca/inflowmdb" />
+ </antcall>
+ <antcall target="test" inheritRefs="true">
+ <param name="test" value="jms" />
+ </antcall>
+ <antcall target="test" inheritRefs="true">
+ <param name="test" value="jms/managed" />
+ </antcall>
+ <antcall target="test" inheritRefs="true">
+ <param name="test" value="enventry" />
+ </antcall>
+
+ <antcall target="test" inheritRefs="true">
+ <param name="test" value="servlet" />
+ </antcall>
+
+ </target>
+
</project>
Added: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/cacert.pem
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/cacert.pem (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/cacert.pem 2008-10-29 18:56:06 UTC (rev 80213)
@@ -0,0 +1,22 @@
+-----BEGIN CERTIFICATE-----
+MIIDnzCCAwigAwIBAgIJAKv1Uv9kGk3vMA0GCSqGSIb3DQEBBQUAMIGSMQswCQYD
+VQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEYMBYGA1UEBxMPU25vcXVhbG1p
+ZSBQYXNzMRMwEQYDVQQKEwpKQm9zcyBJbmMuMQswCQYDVQQLEwJRQTESMBAGA1UE
+AxMJamJvc3MuY29tMR4wHAYJKoZIhvcNAQkBFg9hZG1pbkBqYm9zcy5jb20wHhcN
+MDUwODAyMjA1MjA4WhcNMzIxMjE4MjA1MjA4WjCBkjELMAkGA1UEBhMCVVMxEzAR
+BgNVBAgTCldhc2hpbmd0b24xGDAWBgNVBAcTD1Nub3F1YWxtaWUgUGFzczETMBEG
+A1UEChMKSkJvc3MgSW5jLjELMAkGA1UECxMCUUExEjAQBgNVBAMTCWpib3NzLmNv
+bTEeMBwGCSqGSIb3DQEJARYPYWRtaW5AamJvc3MuY29tMIGfMA0GCSqGSIb3DQEB
+AQUAA4GNADCBiQKBgQDE0ykCaGFDXnF+4ASlGPTh6yPvUOEGCQWIr10B+0qPk9ct
+yGpJR8dxFqlRBQ/ORCx+SPASEJd/xt9QSScDFNeKIHClKq96k1DBJBflDCRTJQkn
+3d6VsxTlW1PGjFejnqEII0mtpoiUxS3jyHBY8lNf7izRuSCxbFS+LXeEiDX5iQID
+AQABo4H6MIH3MB0GA1UdDgQWBBRLldgXCGLsOtXZjfSSKwLzSvoWfjCBxwYDVR0j
+BIG/MIG8gBRLldgXCGLsOtXZjfSSKwLzSvoWfqGBmKSBlTCBkjELMAkGA1UEBhMC
+VVMxEzARBgNVBAgTCldhc2hpbmd0b24xGDAWBgNVBAcTD1Nub3F1YWxtaWUgUGFz
+czETMBEGA1UEChMKSkJvc3MgSW5jLjELMAkGA1UECxMCUUExEjAQBgNVBAMTCWpi
+b3NzLmNvbTEeMBwGCSqGSIb3DQEJARYPYWRtaW5AamJvc3MuY29tggkAq/VS/2Qa
+Te8wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQAg6c158cHl0pnwK4Ir
+QzmMbd4oWY4gSmkTAM+92G2KPU/ZiH0gCK3sZX9raKtIeOkf4EGxWyJ8/9D7aTlU
+/6bsKOX4WwdyzsSP4IcIoXN2sCZvyTNW9j9sqN+u1mMe0EpLfM/vQF8SXmN9wUXF
+vuVw26a3neK+p4W5O1QADLZ3OA==
+-----END CERTIFICATE-----
Added: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/cakey.pem
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/cakey.pem (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/cakey.pem 2008-10-29 18:56:06 UTC (rev 80213)
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICWwIBAAKBgQDE0ykCaGFDXnF+4ASlGPTh6yPvUOEGCQWIr10B+0qPk9ctyGpJ
+R8dxFqlRBQ/ORCx+SPASEJd/xt9QSScDFNeKIHClKq96k1DBJBflDCRTJQkn3d6V
+sxTlW1PGjFejnqEII0mtpoiUxS3jyHBY8lNf7izRuSCxbFS+LXeEiDX5iQIDAQAB
+AoGAK3jkJub9DI8wjDBYdkqj075GypXXjaiyczUgWs6w8jNaJH+Oki7raxvxO7bd
+fdZq6V2cwLCvdYZsTmRJ3JFe5X0J4g5/t2pdXY2BHL/EbKURQN7IeL+7e+Pw/wmi
+QKafjqhzdCZi5rM/TPqfbAzIIgX2eknfE3LYLcmZrWZlZC0CQQDhtv6B/AunQUD0
+eTOV4mWXD6pGlHn/gqYAnli1DwKme7HY9pdH7/pjXt58PMANZAYiXaiaVY/nH9/U
+e5YicI1TAkEA3zvVYLTikTaR371bDUpAJ9d257fEgexqaVGuqltjY9kNx2nNhmxe
+oyO2nZDyrkh0YED7KrCCI3blSMab5IKmMwJAO6JgfbE81vS7l5vKEEifdJjT8Q/b
+Z7F58GHlp/iOR7QYme0UrRHvQn/XIlXem+sYX84E9Lm0amkWdwor8W9xNwJASEJ3
++YvT4ymE4qXKuWyVg9ANH0ivBVdfwqO8JEzcyU9TVH99FcwyfiBrVmm7BItTkGy4
+YMMt/QjZg0s23ysjXQJAaw8M6Sk7kam0qtxBBByJcBWTqrpVV+Ihm2+bAUB1gGnS
+TYwoKQZevczRwlAKsg8eilH2eJkCptp/pNSeG89syg==
+-----END RSA PRIVATE KEY-----
Added: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/client.keystore
===================================================================
(Binary files differ)
Property changes on: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/client.keystore
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/jboss-log4j.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/jboss-log4j.xml (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/jboss-log4j.xml 2008-10-29 18:56:06 UTC (rev 80213)
@@ -0,0 +1,330 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Log4j Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<!-- $Id: jboss-log4j.xml 79553 2008-10-15 20:31:41Z rrajesh $ -->
+
+<!--
+ | For more configuration infromation and examples see the Jakarta Log4j
+ | owebsite: http://jakarta.apache.org/log4j
+ -->
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false">
+
+ <!-- ================================= -->
+ <!-- Preserve messages in a local file -->
+ <!-- ================================= -->
+
+ <!-- A time/date based rolling appender -->
+ <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="File" value="${jboss.server.log.dir}/server.log"/>
+ <param name="Append" value="false"/>
+
+ <!-- Rollover at midnight each day -->
+ <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+
+ <!-- Rollover at the top of each hour
+ <param name="DatePattern" value="'.'yyyy-MM-dd-HH"/>
+ -->
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <!-- The default pattern: Date Priority [Category] Message\n
+ <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+ -->
+ <!-- The full pattern: Date MS Priority [Category] (Thread:NDC) Message\n -->
+ <param name="ConversionPattern" value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
+
+ </layout>
+ </appender>
+
+ <!-- A size based file rolling appender
+ <appender name="FILE" class="org.jboss.logging.appender.RollingFileAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="File" value="${jboss.server.log.dir}/server.log"/>
+ <param name="Append" value="false"/>
+ <param name="MaxFileSize" value="500KB"/>
+ <param name="MaxBackupIndex" value="1"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+ </layout>
+ </appender>
+ -->
+
+ <!-- ============================== -->
+ <!-- Append messages to the console -->
+ <!-- ============================== -->
+
+ <!--
+ <appender name="CONSOLE" class="org.apache.log4j.ConsoleAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="Target" value="System.out"/>
+ <param name="Threshold" value="INFO"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{1}] %m%n"/>
+ </layout>
+ </appender>
+ -->
+
+ <!-- ====================== -->
+ <!-- More Appender examples -->
+ <!-- ====================== -->
+
+ <!-- Buffer events and log them asynchronously -->
+ <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <appender-ref ref="FILE"/>
+ <!--
+ <appender-ref ref="CONSOLE"/>
+ <appender-ref ref="SMTP"/>
+ -->
+ </appender>
+
+ <!-- EMail events to an administrator
+ <appender name="SMTP" class="org.apache.log4j.net.SMTPAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="Threshold" value="ERROR"/>
+ <param name="To" value="admin at myhost.domain.com"/>
+ <param name="From" value="nobody at myhost.domain.com"/>
+ <param name="Subject" value="JBoss Sever Errors"/>
+ <param name="SMTPHost" value="localhost"/>
+ <param name="BufferSize" value="10"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/>
+ </layout>
+ </appender>
+ -->
+
+ <!-- Syslog events
+ <appender name="SYSLOG" class="org.apache.log4j.net.SyslogAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="Facility" value="LOCAL7"/>
+ <param name="FacilityPrinting" value="true"/>
+ <param name="SyslogHost" value="localhost"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="[%d{ABSOLUTE},%c{1}] %m%n"/>
+ </layout>
+ </appender>
+ -->
+
+ <!-- Log events to JMS (requires a topic to be created)
+ <appender name="JMS" class="org.apache.log4j.net.JMSAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="Threshold" value="ERROR"/>
+ <param name="TopicConnectionFactoryBindingName" value="java:/ConnectionFactory"/>
+ <param name="TopicBindingName" value="topic/MyErrorsTopic"/>
+ </appender>
+ -->
+
+ <!-- Log events through SNMP
+ <appender name="TRAP_LOG" class="org.apache.log4j.ext.SNMPTrapAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="ImplementationClassName" value="org.apache.log4j.ext.JoeSNMPTrapSender"/>
+ <param name="ManagementHost" value="127.0.0.1"/>
+ <param name="ManagementHostTrapListenPort" value="162"/>
+ <param name="EnterpriseOID" value="1.3.6.1.4.1.24.0"/>
+ <param name="LocalIPAddress" value="127.0.0.1"/>
+ <param name="LocalTrapSendPort" value="161"/>
+ <param name="GenericTrapType" value="6"/>
+ <param name="SpecificTrapType" value="12345678"/>
+ <param name="CommunityString" value="public"/>
+ <param name="ForwardStackTraceWithTrap" value="true"/>
+ <param name="Threshold" value="DEBUG"/>
+ <param name="ApplicationTrapOID" value="1.3.6.1.4.1.24.12.10.22.64"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d,%p,[%t],[%c],%m%n"/>
+ </layout>
+ </appender>
+ -->
+
+ <!-- Emit events as JMX notifications
+ <appender name="JMX" class="org.jboss.monitor.services.JMXNotificationAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+
+ <param name="Threshold" value="WARN"/>
+ <param name="ObjectName" value="jboss.system:service=Logging,type=JMXNotificationAppender"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%c] %m"/>
+ </layout>
+ </appender>
+ -->
+
+ <!-- Clustering logging -->
+ <!-- Uncomment the following to redirect the org.jgroups and
+ org.jboss.ha categories to a cluster.log file. -->
+ <!--
+ <appender name="CLUSTER" class="org.jboss.logging.appender.RollingFileAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="File" value="${jboss.server.log.dir}/cluster.log"/>
+ <param name="Append" value="false"/>
+ <param name="MaxFileSize" value="500KB"/>
+ <param name="MaxBackupIndex" value="1"/>
+
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%c] %m%n"/>
+ </layout>
+ </appender>
+ -->
+
+ <!-- ================ -->
+ <!-- Limit categories -->
+ <!-- ================ -->
+
+ <category name="org.jboss.web">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.jboss.ha">
+ <priority value="INFO" />
+ </category>
+
+ <category name="com.arjuna">
+ <priority value="INFO" />
+ </category>
+
+ <category name="org.hibernate">
+ <priority value="INFO" />
+ </category>
+
+ <!-- Limit JSF logging to DEBUG. FINER and FINEST will not be logged -->
+ <category name="javax.enterprise.resource.webcontainer">
+ <priority value="INFO" />
+ </category>
+
+ <!-- Limit org.ajax4jsf to INFO as DEBUG is too verbose -->
+ <category name="org.ajax4jsf">
+ <priority value="INFO" />
+ </category>
+
+ <!-- Enable this to obtain EJB Based Applications Access Log Entries
+ <category name="org.jboss.ejb.plugins.SecurityInterceptor">
+ <priority value="TRACE"/>
+ </category>
+ -->
+
+
+ <!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
+ <category name="org.apache">
+
+ <priority value="WARN"/>
+ </category>
+
+ <!-- Limit the org.jboss.serial (jboss-serialization) to INFO as its DEBUG is verbose -->
+ <category name="org.jboss.serial">
+ <priority value="WARN"/>
+ </category>
+
+ <!-- Limit the org.jgroups category to WARN as its INFO is verbose -->
+ <category name="org.jgroups">
+ <priority value="WARN"/>
+ </category>
+
+ <!-- Limit the jacorb category to WARN as its INFO is verbose -->
+ <category name="jacorb">
+ <priority value="WARN"/>
+ </category>
+
+ <!-- Limit JBoss categories
+ <category name="org.jboss">
+ <priority value="INFO"/>
+ </category>
+ -->
+
+ <!-- Limit the JSR77 categories -->
+ <category name="org.jboss.management">
+ <priority value="WARN"/>
+ </category>
+
+ <!-- Limit seam logging -->
+ <category name="org.jboss.seam">
+ <priority value="WARN"/>
+ </category>
+
+ <!-- Enable JBossWS message tracing
+ <category name="org.jboss.ws.core.MessageTrace">
+ <priority value="TRACE"/>
+ </category>
+ -->
+
+ <!-- Decrease the priority threshold for the org.jboss.varia category
+ <category name="org.jboss.varia">
+ <priority value="DEBUG"/>
+ </category>
+ -->
+
+ <!-- Show the evolution of the DataSource pool in the logs [inUse/Available/Max]
+ <category name="org.jboss.resource.connectionmanager.JBossManagedConnectionPool">
+ <priority value="TRACE"/>
+ </category>
+ -->
+
+ <!--
+ | An example of enabling the custom TRACE level priority that is used
+ | by the JBoss internals to diagnose low level details. This example
+ | turns on TRACE level msgs for the org.jboss.ejb.plugins package and its
+ | subpackages. This will produce A LOT of logging output.
+ |
+ | Note: since jboss AS 4.2.x, the trace level is supported natively by
+ | log4j, so although the custom org.jboss.logging.XLevel priority will
+ | still work, there is no need to use it. The two examples that follow
+ | will both enable trace logging.
+ <category name="org.jboss.system">
+ <priority value="TRACE" class="org.jboss.logging.XLevel"/>
+ </category>
+ <category name="org.jboss.ejb.plugins">
+ <priority value="TRACE"/>
+ </category>
+ -->
+
+ <!--
+ | Logs these events to SNMP:
+ - server starts/stops
+ - cluster evolution (node death/startup)
+ - When an EJB archive is deployed (and associated verified messages)
+ - When an EAR archive is deployed
+
+ <category name="org.jboss.system.server.Server">
+ <priority value="INFO" />
+ <appender-ref ref="TRAP_LOG"/>
+ </category>
+
+ <category name="org.jboss.ha.framework.interfaces.HAPartition.lifecycle">
+ <priority value="INFO" />
+ <appender-ref ref="TRAP_LOG"/>
+ </category>
+
+ <category name="org.jboss.deployment.MainDeployer">
+ <priority value="ERROR" />
+ <appender-ref ref="TRAP_LOG"/>
+ </category>
+
+ <category name="org.jboss.ejb.EJBDeployer">
+ <priority value="INFO" />
+ <appender-ref ref="TRAP_LOG"/>
+ </category>
+
+ <category name="org.jboss.deployment.EARDeployer">
+ <priority value="INFO" />
+ <appender-ref ref="TRAP_LOG"/>
+ </category>
+
+ -->
+
+ <!-- ======================= -->
+ <!-- Setup the Root category -->
+ <!-- ======================= -->
+
+ <root>
+ <!-- <appender-ref ref="CONSOLE"/> -->
+ <appender-ref ref="ASYNC"/>
+ </root>
+
+</log4j:configuration>
Added: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/localhost.keystore
===================================================================
(Binary files differ)
Property changes on: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/localhost.keystore
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/login-config.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/login-config.xml (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/login-config.xml 2008-10-29 18:56:06 UTC (rev 80213)
@@ -0,0 +1,167 @@
+<?xml version='1.0'?>
+<!DOCTYPE policy PUBLIC
+ "-//JBoss//DTD JBOSS Security Config 3.0//EN"
+ "http://www.jboss.org/j2ee/dtd/security_config.dtd">
+
+
+<policy>
+ <!-- Used by clients within the application server VM such as
+ mbeans and servlets that access EJBs.
+ -->
+ <application-policy name = "client-login">
+ <authentication>
+ <login-module code = "org.jboss.security.ClientLoginModule"
+ flag = "required">
+ <!-- Any existing security context will be restored on logout -->
+ <module-option name="restore-login-identity">true</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <!-- Security domain for JBossMQ -->
+ <application-policy name = "jbossmq">
+ <authentication>
+ <login-module code = "org.jboss.security.auth.spi.DatabaseServerLoginModule"
+ flag = "required">
+ <module-option name = "unauthenticatedIdentity">guest</module-option>
+ <module-option name = "dsJndiName">java:/DefaultDS</module-option>
+ <module-option name = "principalsQuery">SELECT PASSWD FROM JMS_USERS WHERE USERID=?</module-option>
+ <module-option name = "rolesQuery">SELECT ROLEID, 'Roles' FROM JMS_ROLES WHERE USERID=?</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <!-- Security domain for JBossMQ when using file-state-service.xml
+ <application-policy name = "jbossmq">
+ <authentication>
+ <login-module code = "org.jboss.mq.sm.file.DynamicLoginModule"
+ flag = "required">
+ <module-option name = "unauthenticatedIdentity">guest</module-option>
+ <module-option name = "sm.objectname">jboss.mq:service=StateManager</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+ -->
+
+ <!-- Security domains for testing new jca framework -->
+ <application-policy name = "HsqlDbRealm">
+ <authentication>
+ <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule"
+ flag = "required">
+ <module-option name = "principal">sa</module-option>
+ <module-option name = "userName">sa</module-option>
+ <module-option name = "password"></module-option>
+ <module-option name = "managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=DefaultDS</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <application-policy name = "JmsXARealm">
+ <authentication>
+ <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule"
+ flag = "required">
+ <module-option name = "principal">guest</module-option>
+ <module-option name = "userName">guest</module-option>
+ <module-option name = "password">guest</module-option>
+ <module-option name = "managedConnectionFactoryName">jboss.jca:service=TxCM,name=JmsXA</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <!-- A template configuration for the jmx-console web application. This
+ defaults to the UsersRolesLoginModule the same as other and should be
+ changed to a stronger authentication mechanism as required.
+ -->
+ <application-policy name = "jmx-console">
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag = "required">
+ <module-option name="usersProperties">props/jmx-console-users.properties</module-option>
+ <module-option name="rolesProperties">props/jmx-console-roles.properties</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <!-- A template configuration for the web-console web application. This
+ defaults to the UsersRolesLoginModule the same as other and should be
+ changed to a stronger authentication mechanism as required.
+ -->
+ <application-policy name = "web-console">
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag = "required">
+ <module-option name="usersProperties">web-console-users.properties</module-option>
+ <module-option name="rolesProperties">web-console-roles.properties</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <!--
+ A template configuration for the JBossWS security domain.
+ This defaults to the UsersRolesLoginModule the same as other and should be
+ changed to a stronger authentication mechanism as required.
+ -->
+ <application-policy name="JBossWS">
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag="required">
+ <module-option name="usersProperties">props/jbossws-users.properties</module-option>
+ <module-option name="rolesProperties">props/jbossws-roles.properties</module-option>
+ <module-option name="unauthenticatedIdentity">anonymous</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <application-policy name="messaging">
+ <authentication>
+ <login-module code = "org.jboss.security.auth.spi.DatabaseServerLoginModule"
+ flag = "required">
+ <module-option name = "unauthenticatedIdentity">guest</module-option>
+ <module-option name = "dsJndiName">java:/DefaultDS</module-option>
+ <module-option name = "principalsQuery">SELECT PASSWD FROM JBM_USER WHERE USER_ID=?</module-option>
+ <module-option name = "rolesQuery">SELECT ROLE_ID, 'Roles' FROM JBM_ROLE WHERE USER_ID=?</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <application-policy name = "jbosstest-ssl">
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.BaseCertLoginModule"
+ flag = "required">
+ <module-option name="password-stacking">useFirstPass</module-option>
+ <module-option name="securityDomain">java:/jaas/jbosstest-ssl</module-option>
+ </login-module>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag = "required">
+ <module-option name="password-stacking">useFirstPass</module-option>
+ <module-option name="usersProperties">ssl-users.properties</module-option>
+ <module-option name="rolesProperties">ssl-roles.properties</module-option>
+ <module-option name="roleGroupSeperator">:</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <!-- The default login configuration used by any security domain that
+ does not have a application-policy entry with a matching name
+ -->
+ <application-policy name = "other">
+ <!-- A simple server login module, which can be used when the number
+ of users is relatively small. It uses two properties files:
+ users.properties, which holds users (key) and their password (value).
+ roles.properties, which holds users (key) and a comma-separated list of
+ their roles (value).
+ The unauthenticatedIdentity property defines the name of the principal
+ that will be used when a null username and password are presented as is
+ the case for an unuathenticated web client or MDB. If you want to
+ allow such users to be authenticated add the property, e.g.,
+ unauthenticatedIdentity="nobody"
+ -->
+ <authentication>
+ <login-module code = "org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag = "required" />
+ </authentication>
+ </application-policy>
+
+</policy>
+
+
Added: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/props/jbossws-roles.properties
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/props/jbossws-roles.properties (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/props/jbossws-roles.properties 2008-10-29 18:56:06 UTC (rev 80213)
@@ -0,0 +1,2 @@
+# A sample roles.properties file for use with the UsersRolesLoginModule
+kermit=friend
\ No newline at end of file
Added: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/props/jbossws-users.properties
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/props/jbossws-users.properties (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/props/jbossws-users.properties 2008-10-29 18:56:06 UTC (rev 80213)
@@ -0,0 +1,2 @@
+# A sample users.properties file for use with the UsersRolesLoginModule
+kermit=thefrog
\ No newline at end of file
Added: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/props/jmx-console-roles.properties
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/props/jmx-console-roles.properties (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/props/jmx-console-roles.properties 2008-10-29 18:56:06 UTC (rev 80213)
@@ -0,0 +1,2 @@
+# A sample roles.properties file for use with the UsersRolesLoginModule
+admin=JBossAdmin,HttpInvoker
Added: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/props/jmx-console-users.properties
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/props/jmx-console-users.properties (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/props/jmx-console-users.properties 2008-10-29 18:56:06 UTC (rev 80213)
@@ -0,0 +1,2 @@
+# A sample users.properties file for use with the UsersRolesLoginModule
+admin=admin
Added: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/ssl-roles.properties
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/ssl-roles.properties (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/ssl-roles.properties 2008-10-29 18:56:06 UTC (rev 80213)
@@ -0,0 +1,2 @@
+# A sample roles.properties file for use with the UsersRolesLoginModule
+CN\=unit-tests-client,\ OU\=JBoss\ Inc.,\ O\=JBoss\ Inc.,\ ST\=Washington,\ C\=US=AuthorizedUser
Added: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/ssl-users.properties
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/ssl-users.properties (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/conf/ssl-users.properties 2008-10-29 18:56:06 UTC (rev 80213)
@@ -0,0 +1 @@
+# An empty users file
Added: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/httpha-invoker.sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/httpha-invoker.sar/META-INF/jboss-service.xml (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/httpha-invoker.sar/META-INF/jboss-service.xml 2008-10-29 18:56:06 UTC (rev 80213)
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE server>
+<!-- $Id: jboss-service.xml 35473 2005-08-30 17:38:39Z jmoran $ -->
+
+<server>
+
+ <!-- The HTTP invoker service configration
+ -->
+ <mbean code="org.jboss.invocation.http.server.HttpInvoker"
+ name="jboss:service=invoker,type=http">
+ <!-- Use a URL of the form http://<hostname>:8080/invoker/EJBInvokerServlet
+ where <hostname> is InetAddress.getHostname value on which the server
+ is running.
+ -->
+ <attribute name="InvokerURLPrefix">http://</attribute>
+ <attribute name="InvokerURLSuffix">:8080/invoker/EJBInvokerServlet</attribute>
+ <attribute name="UseHostName">true</attribute>
+ </mbean>
+
+ <mbean code="org.jboss.invocation.http.server.HttpInvokerHA"
+ name="jboss:service=invoker,type=httpHA">
+ <!-- Use a URL of the form http://<hostname>:8080/invoker/EJBInvokerHAServlet
+ where <hostname> is InetAddress.getHostname value on which the server
+ is running.
+ -->
+ <attribute name="InvokerURLPrefix">http://</attribute>
+ <attribute name="InvokerURLSuffix">:8080/invoker/EJBInvokerHAServlet</attribute>
+ <attribute name="UseHostName">true</attribute>
+ </mbean>
+
+ <!-- Expose the Naming service interface via HTTP -->
+ <mbean code="org.jboss.invocation.http.server.HttpProxyFactory"
+ name="jboss:service=invoker,type=http,target=Naming">
+ <!-- The Naming service we are proxying -->
+ <attribute name="InvokerName">jboss:service=Naming</attribute>
+ <!-- Compose the invoker URL from the cluster node address -->
+ <attribute name="InvokerURLPrefix">http://</attribute>
+ <attribute name="InvokerURLSuffix">:8080/invoker/JMXInvokerServlet</attribute>
+ <attribute name="UseHostName">true</attribute>
+ <attribute name="ExportedInterface">org.jnp.interfaces.Naming</attribute>
+ <attribute name="JndiName"></attribute>
+ <attribute name="ClientInterceptors">
+ <interceptors>
+ <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+ <interceptor>org.jboss.naming.interceptors.ExceptionInterceptor</interceptor>
+ <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+ </interceptors>
+ </attribute>
+ </mbean>
+
+ <!-- Expose the Naming service interface via clustered HTTP. This maps
+ to the ReadOnlyJNDIFactory servlet URL
+ -->
+ <mbean code="org.jboss.invocation.http.server.HttpProxyFactory"
+ name="jboss:service=invoker,type=http,target=Naming,readonly=true">
+ <attribute name="InvokerName">jboss:service=Naming</attribute>
+ <attribute name="InvokerURLPrefix">http://</attribute>
+ <attribute name="InvokerURLSuffix">:8080/invoker/readonly/JMXInvokerServlet</attribute>
+ <attribute name="UseHostName">true</attribute>
+ <attribute name="ExportedInterface">org.jnp.interfaces.Naming</attribute>
+ <attribute name="JndiName"></attribute>
+ <attribute name="ClientInterceptors">
+ <interceptors>
+ <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+ <interceptor>org.jboss.naming.interceptors.ExceptionInterceptor</interceptor>
+ <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+ </interceptors>
+ </attribute>
+ </mbean>
+
+ <!-- Expose the HA Naming service interface via HTTP -->
+ <mbean code="org.jboss.invocation.http.server.HttpProxyFactory"
+ name="jboss:service=invoker,type=http,target=HAJNDI">
+ <!-- The Naming service we are proxying -->
+ <attribute name="InvokerName">jboss:service=HAJNDI</attribute>
+ <!-- Compose the invoker URL from the cluster node address -->
+ <attribute name="InvokerURLPrefix">http://</attribute>
+ <attribute name="InvokerURLSuffix">:8080/invoker/JMXInvokerHAServlet</attribute>
+ <attribute name="UseHostName">true</attribute>
+ <attribute name="ExportedInterface">org.jnp.interfaces.Naming</attribute>
+ <attribute name="JndiName"></attribute>
+ <attribute name="ClientInterceptors">
+ <interceptors>
+ <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+ <interceptor>org.jboss.naming.interceptors.ExceptionInterceptor</interceptor>
+ <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+ </interceptors>
+ </attribute>
+ </mbean>
+</server>
Added: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/httpha-invoker.sar/invoker.war/WEB-INF/jboss-web.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/httpha-invoker.sar/invoker.war/WEB-INF/jboss-web.xml (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/httpha-invoker.sar/invoker.war/WEB-INF/jboss-web.xml 2008-10-29 18:56:06 UTC (rev 80213)
@@ -0,0 +1,3 @@
+<jboss-web>
+ <security-domain>java:/jaas/jmx-console</security-domain>
+</jboss-web>
Added: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/httpha-invoker.sar/invoker.war/WEB-INF/web.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/httpha-invoker.sar/invoker.war/WEB-INF/web.xml (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/httpha-invoker.sar/invoker.war/WEB-INF/web.xml 2008-10-29 18:56:06 UTC (rev 80213)
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<!-- The http-invoker.sar/invoker.war web.xml descriptor
+$Id: web.xml 65305 2007-09-11 21:15:24Z fnasser at redhat.com $
+-->
+<web-app>
+ <filter>
+ <filter-name>ReadOnlyAccessFilter</filter-name>
+ <filter-class>org.jboss.invocation.http.servlet.ReadOnlyAccessFilter</filter-class>
+ <init-param>
+ <param-name>readOnlyContext</param-name>
+ <param-value>readonly</param-value>
+ <description>The top level JNDI context the filter will enforce
+ read-only access on. If specified only Context.lookup operations
+ will be allowed on this context. Another other operations or lookups
+ on any other context will fail. Do not associate this filter with the
+ JMXInvokerServlets if you want unrestricted access.
+ </description>
+ </init-param>
+ <init-param>
+ <param-name>invokerName</param-name>
+ <param-value>jboss:service=Naming</param-value>
+ <description>The JMX ObjectName of the naming service mbean
+ </description>
+ </init-param>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>ReadOnlyAccessFilter</filter-name>
+ <url-pattern>/readonly/*</url-pattern>
+ </filter-mapping>
+
+<!-- ### Servlets -->
+ <servlet>
+ <servlet-name>EJBInvokerServlet</servlet-name>
+ <description>The EJBInvokerServlet receives posts containing serlized
+ MarshalledInvocation objects that are routed to the EJB invoker given by
+ the invokerName init-param. The return content is a serialized
+ MarshalledValue containg the return value of the inovocation, or any
+ exception that may have been thrown.
+ </description>
+ <servlet-class>org.jboss.invocation.http.servlet.InvokerServlet</servlet-class>
+ <init-param>
+ <param-name>invokerName</param-name>
+ <param-value>jboss:service=invoker,type=http</param-value>
+ <description>The RMI/HTTP EJB compatible invoker</description>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet>
+ <servlet-name>EJBInvokerHAServlet</servlet-name>
+ <description>The EJBInvokerHAServlet receives posts containing serlized
+ MarshalledInvocation objects that are routed to the EJB invoker given by
+ the invokerName init-param. The return content is a serialized
+ MarshalledValue containg the return value of the inovocation, or any
+ exception that may have been thrown.
+ </description>
+ <servlet-class>org.jboss.invocation.http.servlet.InvokerServlet</servlet-class>
+ <init-param>
+ <param-name>invokerName</param-name>
+ <param-value>jboss:service=invoker,type=httpHA</param-value>
+ <description>The HA-RMI/HTTP EJB compatible invoker</description>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet>
+ <servlet-name>JMXInvokerServlet</servlet-name>
+ <description>The JMXInvokerServlet receives posts containing serlized
+ MarshalledInvocation objects that are routed to the invoker given by
+ the the MBean whose object name hash is specified by the
+ invocation.getObjectName() value. The return content is a serialized
+ MarshalledValue containg the return value of the inovocation, or any
+ exception that may have been thrown.
+ </description>
+ <servlet-class>org.jboss.invocation.http.servlet.InvokerServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>JNDIFactory</servlet-name>
+ <description>A servlet that exposes the JBoss JNDI Naming service stub
+ through http. The return content is a serialized
+ MarshalledValue containg the org.jnp.interfaces.Naming stub. This
+ configuration handles requests for the standard JNDI naming service.
+ </description>
+ <servlet-class>org.jboss.invocation.http.servlet.NamingFactoryServlet</servlet-class>
+ <init-param>
+ <param-name>namingProxyMBean</param-name>
+ <param-value>jboss:service=invoker,type=http,target=Naming</param-value>
+ </init-param>
+ <init-param>
+ <param-name>proxyAttribute</param-name>
+ <param-value>Proxy</param-value>
+ </init-param>
+ <load-on-startup>2</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>HAJNDIFactory</servlet-name>
+ <description>A servlet that exposes the JBoss JNDI Naming service stub
+ through http, but only for a single read-only context. The return content
+ is a serialized MarshalledValue containg the org.jnp.interfaces.Naming
+ stub.
+ </description>
+ <servlet-class>org.jboss.invocation.http.servlet.NamingFactoryServlet</servlet-class>
+ <init-param>
+ <param-name>namingProxyMBean</param-name>
+ <param-value>jboss:service=invoker,type=http,target=HAJNDI</param-value>
+ </init-param>
+ <init-param>
+ <param-name>proxyAttribute</param-name>
+ <param-value>Proxy</param-value>
+ </init-param>
+ <load-on-startup>2</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>ReadOnlyJNDIFactory</servlet-name>
+ <description>A servlet that exposes the JBoss JNDI Naming service stub
+ through http, but only for a single read-only context. The return content
+ is a serialized MarshalledValue containg the org.jnp.interfaces.Naming
+ stub.
+ </description>
+ <servlet-class>org.jboss.invocation.http.servlet.NamingFactoryServlet</servlet-class>
+ <init-param>
+ <param-name>namingProxyMBean</param-name>
+ <param-value>jboss:service=invoker,type=http,target=Naming,readonly=true</param-value>
+ </init-param>
+ <init-param>
+ <param-name>proxyAttribute</param-name>
+ <param-value>Proxy</param-value>
+ </init-param>
+ <load-on-startup>2</load-on-startup>
+ </servlet>
+
+<!-- ### Servlet Mappings -->
+ <servlet-mapping>
+ <servlet-name>JNDIFactory</servlet-name>
+ <url-pattern>/JNDIFactory/*</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>HAJNDIFactory</servlet-name>
+ <url-pattern>/HAJNDIFactory/*</url-pattern>
+ </servlet-mapping>
+ <!-- A mapping for the NamingFactoryServlet that only allows invocations
+ of lookups under a read-only context. This is enforced by the
+ ReadOnlyAccessFilter
+ -->
+ <servlet-mapping>
+ <servlet-name>ReadOnlyJNDIFactory</servlet-name>
+ <url-pattern>/ReadOnlyJNDIFactory/*</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>EJBInvokerServlet</servlet-name>
+ <url-pattern>/EJBInvokerServlet/*</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>EJBInvokerHAServlet</servlet-name>
+ <url-pattern>/EJBInvokerHAServlet/*</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>JMXInvokerServlet</servlet-name>
+ <url-pattern>/JMXInvokerServlet/*</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>JMXInvokerServlet</servlet-name>
+ <url-pattern>/JMXInvokerHAServlet/*</url-pattern>
+ </servlet-mapping>
+ <!-- A mapping for the JMXInvokerServlet that only allows invocations
+ of lookups under a read-only context. This is enforced by the
+ ReadOnlyAccessFilter
+ -->
+ <servlet-mapping>
+ <servlet-name>JMXInvokerServlet</servlet-name>
+ <url-pattern>/readonly/JMXInvokerServlet/*</url-pattern>
+ </servlet-mapping>
+
+ <!-- Alternate mappings that place the servlets under the restricted
+ path to required authentication for access. Remove the unsecure mappings
+ if only authenticated users should be allowed.
+ -->
+ <servlet-mapping>
+ <servlet-name>JNDIFactory</servlet-name>
+ <url-pattern>/restricted/JNDIFactory/*</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>JMXInvokerServlet</servlet-name>
+ <url-pattern>/restricted/JMXInvokerServlet/*</url-pattern>
+ </servlet-mapping>
+
+ <!-- An example security constraint that restricts access to the HTTP invoker
+ to users with the role HttpInvoker Edit the roles to what you want and
+ configure the WEB-INF/jboss-web.xml/security-domain element to reference
+ the security domain you want. -->
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>HttpInvokers</web-resource-name>
+ <description>An example security config that only allows users with the
+ role HttpInvoker to access the HTTP invoker servlets
+ </description>
+ <url-pattern>/restricted/*</url-pattern>
+ <url-pattern>/JNDIFactory/*</url-pattern>
+ <url-pattern>/EJBInvokerServlet/*</url-pattern>
+ <url-pattern>/JMXInvokerServlet/*</url-pattern>
+ <http-method>GET</http-method>
+ <http-method>POST</http-method>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>HttpInvoker</role-name>
+ </auth-constraint>
+ </security-constraint>
+
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ <realm-name>JBoss HTTP Invoker</realm-name>
+ </login-config>
+
+ <security-role>
+ <role-name>HttpInvoker</role-name>
+ </security-role>
+</web-app>
Added: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/jboss-web.deployer/META-INF/jboss-service.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/jboss-web.deployer/META-INF/jboss-service.xml (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/jboss-web.deployer/META-INF/jboss-service.xml 2008-10-29 18:56:06 UTC (rev 80213)
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- $Id: jboss-service-all.xml 60489 2007-02-12 08:22:28Z scott.stark at jboss.org $ -->
+
+<server>
+ <!-- JBoss Web Service-->
+ <mbean code="org.jboss.web.tomcat.service.JBossWeb"
+ name="jboss.web:service=WebServer" xmbean-dd="META-INF/webserver-xmbean.xml">
+
+ <!-- You can configure a set of authenticators keyed by http-auth method used. This
+ will apply the same set of authenticators across all web applications. You can
+ override the set of authenticators at the web application level by adding
+ <authenticators> element to the respective jboss-web.xml -->
+ <!--
+ -->
+ <attribute name="Authenticators" serialDataType="jbxb">
+ <java:properties xmlns:java="urn:jboss:java-properties"
+ xmlns:xs="http://www.w3.org/2001/XMLSchema-instance"
+ xs:schemaLocation="urn:jboss:java-properties resource:java-properties_1_0.xsd">
+ <java:property>
+ <java:key>BASIC</java:key>
+ <java:value>org.apache.catalina.authenticator.BasicAuthenticator</java:value>
+ </java:property>
+ <java:property>
+ <java:key>CLIENT-CERT</java:key>
+ <java:value>org.apache.catalina.authenticator.SSLAuthenticator</java:value>
+ </java:property>
+ <java:property>
+ <java:key>DIGEST</java:key>
+ <java:value>org.apache.catalina.authenticator.DigestAuthenticator</java:value>
+ </java:property>
+ <java:property>
+ <java:key>FORM</java:key>
+ <java:value>org.apache.catalina.authenticator.FormAuthenticator</java:value>
+ </java:property>
+ <java:property>
+ <java:key>NONE</java:key>
+ <java:value>org.apache.catalina.authenticator.NonLoginAuthenticator</java:value>
+ </java:property>
+ </java:properties>
+ </attribute>
+
+ <!-- The JAAS security domain to use in the absense of an explicit
+ security-domain specification in the war WEB-INF/jboss-web.xml
+ -->
+ <attribute name="DefaultSecurityDomain">java:/jaas/other</attribute>
+
+ <!-- Get the flag indicating if the normal Java2 parent first class
+ loading model should be used over the servlet 2.3 web container first
+ model.
+ -->
+ <attribute name="Java2ClassLoadingCompliance">false</attribute>
+ <!-- A flag indicating if the JBoss Loader should be used. This loader
+ uses a unified class loader as the class loader rather than the tomcat
+ specific class loader.
+ The default is false to ensure that wars have isolated class loading
+ for duplicate jars and jsp files.
+ -->
+ <attribute name="UseJBossWebLoader">true</attribute>
+ <!-- The list of package names that should not be loaded without
+ delegating to the parent class loader before trying the web app
+ class loader. The packages listed here are those tha are used by
+ the web container implementation and cannot be overriden.
+ This only applies when UseJBossWebLoader=false.
+ -->
+ <attribute name="FilteredPackages">javax.servlet</attribute>
+
+ <attribute name="LenientEjbLink">true</attribute>
+
+ <!--Flag to delete the Work Dir on Context Destroy -->
+ <attribute name="DeleteWorkDirOnContextDestroy">false</attribute>
+
+ <!--
+ Class of the session manager (used if context is marked as 'distributable'. Currently allowed values:
+ - org.jboss.web.tomcat.service.session.JBossCacheManager
+ -->
+ <attribute name="ManagerClass">org.jboss.web.tomcat.service.session.JBossCacheManager</attribute>
+
+ <!-- The name of the request attribute under with the authenticated JAAS
+ Subject is stored on successful authentication. If null or empty then
+ the Subject will not be stored.
+ -->
+ <!--
+ <attribute name="SubjectAttributeName">j_subject</attribute>
+ -->
+
+ <!-- The SessionIdAlphabet is the set of characters used to create a session Id
+ It must be made up of exactly 65 unique characters
+ <attribute name="SessionIdAlphabet">ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-*</attribute>
+ -->
+ <attribute name="AllowSelfPrivilegedWebApps">false</attribute>
+
+ <!--
+ *******************************************************
+ ****************** CLUSTERING *************************
+ *******************************************************
+ In order to activate HTTP Session clustering for Tomcat
+ make sure you run JBoss's "all" configuration i.e.
+ "run -c all"
+ (the default configuration doesn't contain clustering)
+
+ Furthermore, you may change SnapshotMode and
+ SnapshotInterval attributes below to indicate when to
+ synchronize changes with the other node(s).
+
+ If you use Apache+mod_jk(2) you will most probably use
+ the AJP1.3 connector below. Thus, if you so wish,
+ you may comment (i.e. deactivate) the HTTP connector
+ as it won't be used anymore.
+
+ *******************************************************
+ *******************************************************
+ *******************************************************
+ -->
+
+ <!--
+ If you are using clustering, the following two attributes
+ define when the sessions are replicated to the other nodes.
+ The default value, "instant", synchronously replicates changes
+ to the other nodes at the end of requests. In this case, the
+ "SnapshotInterval" attribute is not used.
+ The "interval" mode, in association with the "SnapshotInterval"
+ attribute, indicates that modified sessions will only be replicated
+ every "SnapshotInterval" milliseconds at most.
+
+ Note that this attribute is not in effect if the replication-granularity
+ is set to FIELD. If it is FIELD, it will be per http request (that is,
+ "instant" mode.)
+ -->
+ <attribute name="SnapshotMode">instant</attribute> <!-- you may switch to "interval" -->
+ <attribute name="SnapshotInterval">2000</attribute>
+
+ <!--
+ Whether to use MOD_JK(2) for load balancing with sticky session
+ combined with JvmRoute. If set to true, it will insert a JvmRouteFilter
+ to intercept every request and replace the JvmRoute if it detects a
+ failover. In addition, you will need to set the JvmRoute inside
+ Tomcat, e.g.,
+ Engine name="jboss.web" jmvRoute="Node1" defaultHost="localhost"
+ in server.xml.
+
+ For clustering purpose only.
+ -->
+ <attribute name="UseJK">false</attribute>
+
+ <attribute name="Domain">jboss.web</attribute>
+
+ <depends>jboss.security:service=SecurityDomain</depends>
+ <depends>jboss.security:service=PBESecurityDomain</depends>
+ </mbean>
+
+</server>
+
Added: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/jboss-web.deployer/META-INF/webserver-xmbean.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/jboss-web.deployer/META-INF/webserver-xmbean.xml (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/jboss-web.deployer/META-INF/webserver-xmbean.xml 2008-10-29 18:56:06 UTC (rev 80213)
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mbean PUBLIC
+ "-//JBoss//DTD JBOSS XMBEAN 1.2//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss_xmbean_1_2.dtd">
+<!--
+ JBoss Web XMBean descriptor
+
+ $Id: webserver-xmbean.xml 59833 2007-01-19 15:45:42Z dimitris at jboss.org $
+-->
+<mbean>
+ <description>The JBoss Web Deployer responsible for war deployment</description>
+ <descriptors>
+ <interceptors>
+ <!-- comment out DynamicInterceptor to disable dynamic addition of interceptors -->
+ <interceptor code="org.jboss.mx.interceptor.DynamicInterceptor"/>
+ </interceptors>
+ </descriptors>
+ <class>org.jboss.web.tomcat.service.JBossWeb</class>
+
+ <!-- JBossWebMBean attributes -->
+
+ <attribute access="read-write" getMethod="getAuthenticators" setMethod="setAuthenticators">
+ <name>Authenticators</name>
+ <type>java.util.Properties</type>
+ </attribute>
+
+ <attribute access="read-write" getMethod="getUseJBossWebLoader" setMethod="setUseJBossWebLoader">
+ <name>UseJBossWebLoader</name>
+ <type>boolean</type>
+ </attribute>
+
+ <attribute access="read-write" getMethod="getAllowSelfPrivilegedWebApps" setMethod="setAllowSelfPrivilegedWebApps">
+ <name>AllowSelfPrivilegedWebApps</name>
+ <type>boolean</type>
+ </attribute>
+
+ <attribute access="read-write" getMethod="getDeleteWorkDirOnContextDestroy"
+ setMethod="setDeleteWorkDirOnContextDestroy">
+ <name>DeleteWorkDirOnContextDestroy</name>
+ <type>boolean</type>
+ </attribute>
+
+ <attribute access="read-write" getMethod="getHttpHeaderForSSOAuth"
+ setMethod="setHttpHeaderForSSOAuth">
+ <name>HttpHeaderForSSOAuth</name>
+ <type>java.lang.String</type>
+ </attribute>
+
+ <attribute access="read-write" getMethod="getSessionCookieForSSOAuth"
+ setMethod="setSessionCookieForSSOAuth">
+ <name>SessionCookieForSSOAuth</name>
+ <type>java.lang.String</type>
+ </attribute>
+
+ <attribute access="read-write" getMethod="getSubjectAttributeName" setMethod="setSubjectAttributeName">
+ <name>SubjectAttributeName</name>
+ <type>java.lang.String</type>
+ </attribute>
+
+ <attribute access="read-write" getMethod="getCacheName" setMethod="setCacheName">
+ <name>CacheName</name>
+ <type>java.lang.String</type>
+ </attribute>
+
+ <attribute access="read-write" getMethod="getUnpackWars" setMethod="setUnpackWars">
+ <name>UnpackWars</name>
+ <type>boolean</type>
+ </attribute>
+
+ <attribute access="read-write" getMethod="getAcceptNonWarDirs" setMethod="setAcceptNonWarDirs">
+ <name>AcceptNonWarDirs</name>
+ <type>boolean</type>
+ </attribute>
+
+ <attribute access="read-write" getMethod="getConfig" setMethod="setConfig">
+ <name>Config</name>
+ <type>org.w3c.dom.Element</type>
+ </attribute>
+
+ <attribute access="read-write" getMethod="getLenientEjbLink" setMethod="setLenientEjbLink">
+ <name>LenientEjbLink</name>
+ <type>boolean</type>
+ </attribute>
+
+ <attribute access="read-write" getMethod="isUseJK" setMethod="setUseJK">
+ <name>UseJK</name>
+ <type>boolean</type>
+ </attribute>
+
+ <attribute access="read-write" getMethod="getDomain" setMethod="setDomain">
+ <name>Domain</name>
+ <type>java.lang.String</type>
+ </attribute>
+
+ <attribute access="read-write" getMethod="getFilteredPackages" setMethod="setFilteredPackages">
+ <name>FilteredPackages</name>
+ <type>[Ljava.lang.String;</type>
+ </attribute>
+
+ <attribute access="read-write" getMethod="getJava2ClassLoadingCompliance" setMethod="setJava2ClassLoadingCompliance">
+ <name>Java2ClassLoadingCompliance</name>
+ <type>boolean</type>
+ </attribute>
+
+ <attribute access="read-write" getMethod="getDefaultSecurityDomain" setMethod="setDefaultSecurityDomain">
+ <name>DefaultSecurityDomain</name>
+ <type>java.lang.String</type>
+ </attribute>
+
+ <attribute access="read-write" getMethod="getSnapshotMode" setMethod="setSnapshotMode">
+ <name>SnapshotMode</name>
+ <type>java.lang.String</type>
+ </attribute>
+
+ <attribute access="read-write" getMethod="getSnapshotInterval" setMethod="setSnapshotInterval">
+ <name>SnapshotInterval</name>
+ <type>int</type>
+ </attribute>
+
+ <attribute access="read-write" getMethod="getConfigFile" setMethod="setConfigFile">
+ <name>ConfigFile</name>
+ <type>java.lang.String</type>
+ </attribute>
+
+ <attribute access="read-write" getMethod="getUseLocalCache" setMethod="setUseLocalCache">
+ <name>UseLocalCache</name>
+ <type>boolean</type>
+ </attribute>
+
+ <attribute access="read-write" getMethod="getSessionIdAlphabet" setMethod="setSessionIdAlphabet">
+ <name>SessionIdAlphabet</name>
+ <type>java.lang.String</type>
+ </attribute>
+
+ <attribute access="read-write" getMethod="getContextMBeanCode" setMethod="setContextMBeanCode">
+ <name>ContextMBeanCode</name>
+ <type>java.lang.String</type>
+ </attribute>
+
+ <attribute access="read-write" getMethod="getManagerClass" setMethod="setManagerClass">
+ <name>ManagerClass</name>
+ <type>java.lang.String</type>
+ </attribute>
+
+ <attribute access="read-only" getMethod="getDeployedApplications">
+ <name>DeployedApplications</name>
+ <type>java.util.Iterator</type>
+ </attribute>
+
+ <attribute access="write-only" setMethod="setSecurityManagerService">
+ <name>SecurityManagerService</name>
+ <type>org.jboss.security.plugins.JaasSecurityManagerServiceMBean</type>
+ </attribute>
+
+ <!-- SubDeployerExt attribute -->
+ <attribute access="read-write" getMethod="getEnhancedSuffixes" setMethod="setEnhancedSuffixes">
+ <description>Allow the override of supported suffixes and relative order</description>
+ <name>EnhancedSuffixes</name>
+ <type>[Ljava.lang.String;</type>
+ </attribute>
+
+ &deployerAttributes;
+ &defaultAttributes;
+
+ <!-- JBossWebMBean operations -->
+ <operation>
+ <description>See if a war is deployed</description>
+ <name>isDeployed</name>
+ <parameter>
+ <name>warUrl</name>
+ <type>java.lang.String</type>
+ </parameter>
+ <return-type>boolean</return-type>
+ </operation>
+
+ <operation>
+ <description>Start all connectors of the Domain</description>
+ <name>startConnectors</name>
+ </operation>
+
+ <operation>
+ <description>Stop all connectors of the Domain</description>
+ <name>stopConnectors</name>
+ </operation>
+
+ &deployerOperations;
+ &defaultOperations;
+ &interceptable;
+
+</mbean>
Added: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/jboss-web.deployer/conf/web.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/jboss-web.deployer/conf/web.xml (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/jboss-web.deployer/conf/web.xml 2008-10-29 18:56:06 UTC (rev 80213)
@@ -0,0 +1,1230 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+
+ <!-- ======================== Introduction ============================== -->
+ <!-- This document defines default values for *all* web applications -->
+ <!-- loaded into this instance of Tomcat. As each application is -->
+ <!-- deployed, this file is processed, followed by the -->
+ <!-- "/WEB-INF/web.xml" deployment descriptor from your own -->
+ <!-- applications. -->
+ <!-- -->
+ <!-- WARNING: Do not configure application-specific resources here! -->
+ <!-- They should go in the "/WEB-INF/web.xml" file in your application. -->
+
+ <!-- =========== Common Context Params ================================== -->
+ <!-- JBossInjectionProvider provides resource injection for managed beans. -->
+ <!-- See JSF 1.2 spec section 5.4 for details. -->
+ <context-param>
+ <param-name>com.sun.faces.injectionProvider</param-name>
+ <param-value>org.jboss.web.jsf.integration.injection.JBossInjectionProvider</param-value>
+ </context-param>
+
+ <!-- ================== Common filter Configuration ==================== -->
+ <filter>
+ <filter-name>CommonHeadersFilter</filter-name>
+ <filter-class>org.jboss.web.tomcat.filters.ReplyHeaderFilter</filter-class>
+ <init-param>
+ <param-name>X-Powered-By</param-name>
+ <param-value>Servlet 2.4; JBoss-4.3.0.GA (build: SVNTag=JBPAPP_4_3_0_GA date=200806260858)/Tomcat-5.5</param-value>
+ </init-param>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>CommonHeadersFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+ <!-- ================== Common Listener Configuration ==================== -->
+ <listener>
+ <listener-class>org.jboss.web.tomcat.security.SecurityFlushSessionListener</listener-class>
+ </listener>
+
+ <!-- Configures JSF for a web application if the javax.faces.webapp.FacesServlet is declared -->
+ <!-- in web.xml. -->
+ <listener>
+ <listener-class>org.jboss.web.jsf.integration.config.JBossJSFConfigureListener</listener-class>
+ </listener>
+
+ <!-- Listens to all web app lifecycle events so that @PreDestroy can be called on -->
+ <!-- JSF managed beans that go out of scope. You can comment this out if you -->
+ <!-- don't use JSF or you don't use annotations on your managed beans. -->
+ <listener>
+ <listener-class>com.sun.faces.application.WebappLifecycleListener</listener-class>
+ </listener>
+
+
+ <!-- ================== Built In Servlet Definitions ==================== -->
+
+
+ <!-- The default servlet for all web applications, that serves static -->
+ <!-- resources. It processes all requests that are not mapped to other -->
+ <!-- servlets with servlet mappings (defined either here or in your own -->
+ <!-- web.xml file. This servlet supports the following initialization -->
+ <!-- parameters (default values are in square brackets): -->
+ <!-- -->
+ <!-- debug Debugging detail level for messages logged -->
+ <!-- by this servlet. [0] -->
+ <!-- -->
+ <!-- fileEncoding Encoding to be used to read static resources -->
+ <!-- [platform default] -->
+ <!-- -->
+ <!-- input Input buffer size (in bytes) when reading -->
+ <!-- resources to be served. [2048] -->
+ <!-- -->
+ <!-- listings Should directory listings be produced if there -->
+ <!-- is no welcome file in this directory? [false] -->
+ <!-- WARNING: Listings for directories with many -->
+ <!-- entries can be slow and may consume -->
+ <!-- significant proportions of server resources. -->
+ <!-- -->
+ <!-- output Output buffer size (in bytes) when writing -->
+ <!-- resources to be served. [2048] -->
+ <!-- -->
+ <!-- readonly Is this context "read only", so HTTP -->
+ <!-- commands like PUT and DELETE are -->
+ <!-- rejected? [true] -->
+ <!-- -->
+ <!-- readmeFile File name to display with the directory -->
+ <!-- contents. [null] -->
+ <!-- -->
+ <!-- sendfileSize If the connector used supports sendfile, this -->
+ <!-- represents the minimal file size in KB for -->
+ <!-- which sendfile will be used. Use a negative -->
+ <!-- value to always disable sendfile. [48] -->
+ <!-- -->
+ <!-- For directory listing customization. Checks localXsltFile, then -->
+ <!-- globalXsltFile, then defaults to original behavior. -->
+ <!-- -->
+ <!-- localXsltFile Make directory listings an XML doc and -->
+ <!-- pass the result to this style sheet residing -->
+ <!-- in that directory. This overrides -->
+ <!-- globalXsltFile[null] -->
+ <!-- -->
+ <!-- globalXsltFile Site wide configuration version of -->
+ <!-- localXsltFile This argument is expected -->
+ <!-- to be a physical file. [null] -->
+ <!-- -->
+ <!-- -->
+
+ <servlet>
+ <servlet-name>default</servlet-name>
+ <servlet-class>org.apache.catalina.servlets.DefaultServlet</servlet-class>
+ <init-param>
+ <param-name>debug</param-name>
+ <param-value>0</param-value>
+ </init-param>
+ <init-param>
+ <param-name>listings</param-name>
+ <param-value>false</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+
+ <!-- The "invoker" servlet, which executes anonymous servlet classes -->
+ <!-- that have not been defined in a web.xml file. Traditionally, this -->
+ <!-- servlet is mapped to the URL pattern "/servlet/*", but you can map -->
+ <!-- it to other patterns as well. The extra path info portion of such a -->
+ <!-- request must be the fully qualified class name of a Java class that -->
+ <!-- implements Servlet (or extends HttpServlet), or the servlet name -->
+ <!-- of an existing servlet definition. This servlet supports the -->
+ <!-- following initialization parameters (default values are in square -->
+ <!-- brackets): -->
+ <!-- -->
+ <!-- debug Debugging detail level for messages logged -->
+ <!-- by this servlet. [0] -->
+
+<!--
+ <servlet>
+ <servlet-name>invoker</servlet-name>
+ <servlet-class>
+ org.apache.catalina.servlets.InvokerServlet
+ </servlet-class>
+ <init-param>
+ <param-name>debug</param-name>
+ <param-value>0</param-value>
+ </init-param>
+ <load-on-startup>2</load-on-startup>
+ </servlet>
+-->
+
+
+ <!-- The JSP page compiler and execution servlet, which is the mechanism -->
+ <!-- used by Tomcat to support JSP pages. Traditionally, this servlet -->
+ <!-- is mapped to the URL pattern "*.jsp". This servlet supports the -->
+ <!-- following initialization parameters (default values are in square -->
+ <!-- brackets): -->
+ <!-- -->
+ <!-- checkInterval If development is false and checkInterval is -->
+ <!-- greater than zero, background compilations are -->
+ <!-- enabled. checkInterval is the time in seconds -->
+ <!-- between checks to see if a JSP page needs to -->
+ <!-- be recompiled. [0] -->
+ <!-- -->
+ <!-- modificationTestInterval -->
+ <!-- Causes a JSP (and its dependent files) to not -->
+ <!-- be checked for modification during the -->
+ <!-- specified time interval (in seconds) from the -->
+ <!-- last time the JSP was checked for -->
+ <!-- modification. A value of 0 will cause the JSP -->
+ <!-- to be checked on every access. -->
+ <!-- Used in development mode only. [4] -->
+ <!-- -->
+ <!-- compiler Which compiler Ant should use to compile JSP -->
+ <!-- pages. See the Ant documentation for more -->
+ <!-- information. -->
+ <!-- -->
+ <!-- classdebuginfo Should the class file be compiled with -->
+ <!-- debugging information? [true] -->
+ <!-- -->
+ <!-- classpath What class path should I use while compiling -->
+ <!-- generated servlets? [Created dynamically -->
+ <!-- based on the current web application] -->
+ <!-- -->
+ <!-- development Is Jasper used in development mode? If true, -->
+ <!-- the frequency at which JSPs are checked for -->
+ <!-- modification may be specified via the -->
+ <!-- modificationTestInterval parameter. [true] -->
+ <!-- -->
+ <!-- enablePooling Determines whether tag handler pooling is -->
+ <!-- enabled [true] -->
+ <!-- -->
+ <!-- fork Tell Ant to fork compiles of JSP pages so that -->
+ <!-- a separate JVM is used for JSP page compiles -->
+ <!-- from the one Tomcat is running in. [true] -->
+ <!-- -->
+ <!-- ieClassId The class-id value to be sent to Internet -->
+ <!-- Explorer when using <jsp:plugin> tags. -->
+ <!-- [clsid:8AD9C840-044E-11D1-B3E9-00805F499D93] -->
+ <!-- -->
+ <!-- javaEncoding Java file encoding to use for generating java -->
+ <!-- source files. [UTF8] -->
+ <!-- -->
+ <!-- keepgenerated Should we keep the generated Java source code -->
+ <!-- for each page instead of deleting it? [true] -->
+ <!-- -->
+ <!-- mappedfile Should we generate static content with one -->
+ <!-- print statement per input line, to ease -->
+ <!-- debugging? [true] -->
+ <!-- -->
+ <!-- trimSpaces Should white spaces in template text between -->
+ <!-- actions or directives be trimmed? [false] -->
+ <!-- -->
+ <!-- suppressSmap Should the generation of SMAP info for JSR45 -->
+ <!-- debugging be suppressed? [false] -->
+ <!-- -->
+ <!-- dumpSmap Should the SMAP info for JSR45 debugging be -->
+ <!-- dumped to a file? [false] -->
+ <!-- False if suppressSmap is true -->
+ <!-- -->
+ <!-- genStrAsCharArray Should text strings be generated as char -->
+ <!-- arrays, to improve performance in some cases? -->
+ <!-- [false] -->
+ <!-- -->
+ <!-- errorOnUseBeanInvalidClassAttribute -->
+ <!-- Should Jasper issue an error when the value of -->
+ <!-- the class attribute in an useBean action is -->
+ <!-- not a valid bean class? [true] -->
+ <!-- -->
+ <!-- scratchdir What scratch directory should we use when -->
+ <!-- compiling JSP pages? [default work directory -->
+ <!-- for the current web application] -->
+ <!-- -->
+ <!-- xpoweredBy Determines whether X-Powered-By response -->
+ <!-- header is added by generated servlet [false] -->
+ <!-- -->
+ <!-- compilerTargetVM Compiler target VM -->
+ <!-- default is System.properties -->
+ <!-- java.specification.version > 1.4 -->
+ <!-- [1.5] else [1.4] -->
+ <!-- -->
+ <!-- compilerSourceVM Compiler source VM -->
+ <!-- default is System.properties -->
+ <!-- java.specification.version > 1.4 -->
+ <!-- [1.5] else [1.4] -->
+ <!-- -->
+ <!-- If you wish to use Jikes to compile JSP pages: -->
+ <!-- Please see the "Using Jikes" section of the Jasper-HowTo -->
+ <!-- page in the Tomcat documentation. -->
+
+ <servlet>
+ <servlet-name>jsp</servlet-name>
+ <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
+ <init-param>
+ <param-name>fork</param-name>
+ <param-value>false</param-value>
+ </init-param>
+ <init-param>
+ <param-name>xpoweredBy</param-name>
+ <param-value>false</param-value>
+ </init-param>
+
+ <!-- Use a custom options class to allow the shared tag lib descriptors
+ to be loaded from jars in the tomcat sar conf/tlds directory. The
+ standard options implementation can only find taglibs based on the
+ class loader classpath.
+ -->
+ <init-param>
+ <param-name>engineOptionsClass</param-name>
+ <param-value>org.jboss.web.tomcat.service.jasper.JspServletOptions</param-value>
+ </init-param>
+ <!-- Specify the jars relative to the jbossweb-tomcat6.sar that should
+ be scanned for common tag lib descriptors to include in every war
+ deployment.
+ -->
+ <init-param>
+ <description>JSF standard tlds</description>
+ <param-name>tagLibJar0</param-name>
+ <param-value>jsf-libs/jsf-impl.jar</param-value>
+ </init-param>
+ <init-param>
+ <description>JSTL standard tlds</description>
+ <param-name>tagLibJar1</param-name>
+ <param-value>jstl.jar</param-value>
+ </init-param>
+
+ <load-on-startup>3</load-on-startup>
+ </servlet>
+
+
+ <!-- NOTE: An SSI Filter is also available as an alternative SSI -->
+ <!-- implementation. Use either the Servlet or the Filter but NOT both. -->
+ <!-- -->
+ <!-- Server Side Includes processing servlet, which processes SSI -->
+ <!-- directives in HTML pages consistent with similar support in web -->
+ <!-- servers like Apache. Traditionally, this servlet is mapped to the -->
+ <!-- URL pattern "*.shtml". This servlet supports the following -->
+ <!-- initialization parameters (default values are in square brackets): -->
+ <!-- -->
+ <!-- buffered Should output from this servlet be buffered? -->
+ <!-- (0=false, 1=true) [0] -->
+ <!-- -->
+ <!-- debug Debugging detail level for messages logged -->
+ <!-- by this servlet. [0] -->
+ <!-- -->
+ <!-- expires The number of seconds before a page with SSI -->
+ <!-- directives will expire. [No default] -->
+ <!-- -->
+ <!-- isVirtualWebappRelative -->
+ <!-- Should "virtual" paths be interpreted as -->
+ <!-- relative to the context root, instead of -->
+ <!-- the server root? (0=false, 1=true) [0] -->
+ <!-- -->
+ <!-- inputEncoding The encoding to assume for SSI resources if -->
+ <!-- one is not available from the resource. -->
+ <!-- [Platform default] -->
+ <!-- -->
+ <!-- outputEncoding The encoding to use for the page that results -->
+ <!-- from the SSI processing. [UTF-8] -->
+ <!-- -->
+ <!-- -->
+ <!-- IMPORTANT: To use the SSI servlet, you also need to rename the -->
+ <!-- $CATALINA_HOME/server/lib/servlets-ssi.renametojar file -->
+ <!-- to $CATALINA_HOME/server/lib/servlets-ssi.jar -->
+
+<!--
+ <servlet>
+ <servlet-name>ssi</servlet-name>
+ <servlet-class>
+ org.apache.catalina.ssi.SSIServlet
+ </servlet-class>
+ <init-param>
+ <param-name>buffered</param-name>
+ <param-value>1</param-value>
+ </init-param>
+ <init-param>
+ <param-name>debug</param-name>
+ <param-value>0</param-value>
+ </init-param>
+ <init-param>
+ <param-name>expires</param-name>
+ <param-value>666</param-value>
+ </init-param>
+ <init-param>
+ <param-name>isVirtualWebappRelative</param-name>
+ <param-value>0</param-value>
+ </init-param>
+ <load-on-startup>4</load-on-startup>
+ </servlet>
+-->
+
+
+ <!-- Common Gateway Includes (CGI) processing servlet, which supports -->
+ <!-- execution of external applications that conform to the CGI spec -->
+ <!-- requirements. Typically, this servlet is mapped to the URL pattern -->
+ <!-- "/cgi-bin/*", which means that any CGI applications that are -->
+ <!-- executed must be present within the web application. This servlet -->
+ <!-- supports the following initialization parameters (default values -->
+ <!-- are in square brackets): -->
+ <!-- -->
+ <!-- cgiPathPrefix The CGI search path will start at -->
+ <!-- webAppRootDir + File.separator + this prefix. -->
+ <!-- [WEB-INF/cgi] -->
+ <!-- -->
+ <!-- debug Debugging detail level for messages logged -->
+ <!-- by this servlet. [0] -->
+ <!-- -->
+ <!-- executable Name of the exectuable used to run the -->
+ <!-- script. [perl] -->
+ <!-- -->
+ <!-- parameterEncoding Name of parameter encoding to be used with -->
+ <!-- CGI servlet. -->
+ <!-- [System.getProperty("file.encoding","UTF-8")] -->
+ <!-- -->
+ <!-- passShellEnvironment Should the shell environment variables (if -->
+ <!-- any) be passed to the CGI script? [false] -->
+ <!-- -->
+ <!-- IMPORTANT: To use the CGI servlet, you also need to rename the -->
+ <!-- $CATALINA_HOME/server/lib/servlets-cgi.renametojar file -->
+ <!-- to $CATALINA_HOME/server/lib/servlets-cgi.jar -->
+
+<!--
+ <servlet>
+ <servlet-name>cgi</servlet-name>
+ <servlet-class>org.apache.catalina.servlets.CGIServlet</servlet-class>
+ <init-param>
+ <param-name>debug</param-name>
+ <param-value>0</param-value>
+ </init-param>
+ <init-param>
+ <param-name>cgiPathPrefix</param-name>
+ <param-value>WEB-INF/cgi</param-value>
+ </init-param>
+ <load-on-startup>5</load-on-startup>
+ </servlet>
+-->
+
+
+ <!-- ================ Built In Servlet Mappings ========================= -->
+
+
+ <!-- The servlet mappings for the built in servlets defined above. Note -->
+ <!-- that, by default, the CGI and SSI servlets are *not* mapped. You -->
+ <!-- must uncomment these mappings (or add them to your application's own -->
+ <!-- web.xml deployment descriptor) to enable these services -->
+
+ <!-- The mapping for the default servlet -->
+ <servlet-mapping>
+ <servlet-name>default</servlet-name>
+ <url-pattern>/</url-pattern>
+ </servlet-mapping>
+
+ <!-- The mapping for the invoker servlet -->
+<!--
+ <servlet-mapping>
+ <servlet-name>invoker</servlet-name>
+ <url-pattern>/servlet/*</url-pattern>
+ </servlet-mapping>
+-->
+
+ <!-- The mapping for the JSP servlet -->
+ <servlet-mapping>
+ <servlet-name>jsp</servlet-name>
+ <url-pattern>*.jsp</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>jsp</servlet-name>
+ <url-pattern>*.jspx</url-pattern>
+ </servlet-mapping>
+
+ <!-- The mapping for the SSI servlet -->
+<!--
+ <servlet-mapping>
+ <servlet-name>ssi</servlet-name>
+ <url-pattern>*.shtml</url-pattern>
+ </servlet-mapping>
+-->
+
+ <!-- The mapping for the CGI Gateway servlet -->
+
+<!--
+ <servlet-mapping>
+ <servlet-name>cgi</servlet-name>
+ <url-pattern>/cgi-bin/*</url-pattern>
+ </servlet-mapping>
+-->
+
+
+ <!-- ================== Built In Filter Definitions ===================== -->
+
+ <!-- NOTE: An SSI Servlet is also available as an alternative SSI -->
+ <!-- implementation. Use either the Servlet or the Filter but NOT both. -->
+ <!-- -->
+ <!-- Server Side Includes processing filter, which processes SSI -->
+ <!-- directives in HTML pages consistent with similar support in web -->
+ <!-- servers like Apache. Traditionally, this filter is mapped to the -->
+ <!-- URL pattern "*.shtml", though it can be mapped to "*" as it will -->
+ <!-- selectively enable/disable SSI processing based on mime types. For -->
+ <!-- this to work you will need to uncomment the .shtml mime type -->
+ <!-- definition towards the bottom of this file. -->
+ <!-- The contentType init param allows you to apply SSI processing to JSP -->
+ <!-- pages, javascript, or any other content you wish. This filter -->
+ <!-- supports the following initialization parameters (default values are -->
+ <!-- in square brackets): -->
+ <!-- -->
+ <!-- contentType A regex pattern that must be matched before -->
+ <!-- SSI processing is applied. -->
+ <!-- [text/x-server-parsed-html(;.*)?] -->
+ <!-- -->
+ <!-- debug Debugging detail level for messages logged -->
+ <!-- by this servlet. [0] -->
+ <!-- -->
+ <!-- expires The number of seconds before a page with SSI -->
+ <!-- directives will expire. [No default] -->
+ <!-- -->
+ <!-- isVirtualWebappRelative -->
+ <!-- Should "virtual" paths be interpreted as -->
+ <!-- relative to the context root, instead of -->
+ <!-- the server root? (0=false, 1=true) [0] -->
+ <!-- -->
+ <!-- -->
+ <!-- IMPORTANT: To use the SSI filter, you also need to rename the -->
+ <!-- $CATALINA_HOME/server/lib/servlets-ssi.renametojar file -->
+ <!-- to $CATALINA_HOME/server/lib/servlets-ssi.jar -->
+
+<!--
+ <filter>
+ <filter-name>ssi</filter-name>
+ <filter-class>
+ org.apache.catalina.ssi.SSIFilter
+ </filter-class>
+ <init-param>
+ <param-name>contentType</param-name>
+ <param-value>text/x-server-parsed-html(;.*)?</param-value>
+ </init-param>
+ <init-param>
+ <param-name>debug</param-name>
+ <param-value>0</param-value>
+ </init-param>
+ <init-param>
+ <param-name>expires</param-name>
+ <param-value>666</param-value>
+ </init-param>
+ <init-param>
+ <param-name>isVirtualWebappRelative</param-name>
+ <param-value>0</param-value>
+ </init-param>
+ </filter>
+-->
+
+
+ <!-- ==================== Built In Filter Mappings ====================== -->
+
+ <!-- The mapping for the SSI Filter -->
+<!--
+ <filter-mapping>
+ <filter-name>ssi</filter-name>
+ <url-pattern>*.shtml</url-pattern>
+ </filter-mapping>
+-->
+
+
+ <!-- ==================== Default Session Configuration ================= -->
+ <!-- You can set the default session timeout (in minutes) for all newly -->
+ <!-- created sessions by modifying the value below. -->
+
+ <session-config>
+ <session-timeout>30</session-timeout>
+ </session-config>
+
+
+ <!-- ===================== Default MIME Type Mappings =================== -->
+ <!-- When serving static resources, Tomcat will automatically generate -->
+ <!-- a "Content-Type" header based on the resource's filename extension, -->
+ <!-- based on these mappings. Additional mappings can be added here (to -->
+ <!-- apply to all web applications), or in your own application's web.xml -->
+ <!-- deployment descriptor. -->
+
+ <mime-mapping>
+ <extension>abs</extension>
+ <mime-type>audio/x-mpeg</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>ai</extension>
+ <mime-type>application/postscript</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>aif</extension>
+ <mime-type>audio/x-aiff</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>aifc</extension>
+ <mime-type>audio/x-aiff</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>aiff</extension>
+ <mime-type>audio/x-aiff</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>aim</extension>
+ <mime-type>application/x-aim</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>art</extension>
+ <mime-type>image/x-jg</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>asf</extension>
+ <mime-type>video/x-ms-asf</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>asx</extension>
+ <mime-type>video/x-ms-asf</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>au</extension>
+ <mime-type>audio/basic</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>avi</extension>
+ <mime-type>video/x-msvideo</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>avx</extension>
+ <mime-type>video/x-rad-screenplay</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>bcpio</extension>
+ <mime-type>application/x-bcpio</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>bin</extension>
+ <mime-type>application/octet-stream</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>bmp</extension>
+ <mime-type>image/bmp</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>body</extension>
+ <mime-type>text/html</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>cdf</extension>
+ <mime-type>application/x-cdf</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>cer</extension>
+ <mime-type>application/x-x509-ca-cert</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>class</extension>
+ <mime-type>application/java</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>cpio</extension>
+ <mime-type>application/x-cpio</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>csh</extension>
+ <mime-type>application/x-csh</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>css</extension>
+ <mime-type>text/css</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>dib</extension>
+ <mime-type>image/bmp</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>doc</extension>
+ <mime-type>application/msword</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>dtd</extension>
+ <mime-type>application/xml-dtd</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>dv</extension>
+ <mime-type>video/x-dv</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>dvi</extension>
+ <mime-type>application/x-dvi</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>eps</extension>
+ <mime-type>application/postscript</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>etx</extension>
+ <mime-type>text/x-setext</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>exe</extension>
+ <mime-type>application/octet-stream</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>gif</extension>
+ <mime-type>image/gif</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>gtar</extension>
+ <mime-type>application/x-gtar</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>gz</extension>
+ <mime-type>application/x-gzip</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>hdf</extension>
+ <mime-type>application/x-hdf</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>hqx</extension>
+ <mime-type>application/mac-binhex40</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>htc</extension>
+ <mime-type>text/x-component</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>htm</extension>
+ <mime-type>text/html</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>html</extension>
+ <mime-type>text/html</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>hqx</extension>
+ <mime-type>application/mac-binhex40</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>ief</extension>
+ <mime-type>image/ief</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>jad</extension>
+ <mime-type>text/vnd.sun.j2me.app-descriptor</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>jar</extension>
+ <mime-type>application/java-archive</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>java</extension>
+ <mime-type>text/plain</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>jnlp</extension>
+ <mime-type>application/x-java-jnlp-file</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>jpe</extension>
+ <mime-type>image/jpeg</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>jpeg</extension>
+ <mime-type>image/jpeg</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>jpg</extension>
+ <mime-type>image/jpeg</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>js</extension>
+ <mime-type>text/javascript</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>jsf</extension>
+ <mime-type>text/plain</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>jspf</extension>
+ <mime-type>text/plain</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>kar</extension>
+ <mime-type>audio/x-midi</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>latex</extension>
+ <mime-type>application/x-latex</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>m3u</extension>
+ <mime-type>audio/x-mpegurl</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>mac</extension>
+ <mime-type>image/x-macpaint</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>man</extension>
+ <mime-type>application/x-troff-man</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>mathml</extension>
+ <mime-type>application/mathml+xml</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>me</extension>
+ <mime-type>application/x-troff-me</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>mid</extension>
+ <mime-type>audio/x-midi</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>midi</extension>
+ <mime-type>audio/x-midi</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>mif</extension>
+ <mime-type>application/x-mif</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>mov</extension>
+ <mime-type>video/quicktime</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>movie</extension>
+ <mime-type>video/x-sgi-movie</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>mp1</extension>
+ <mime-type>audio/x-mpeg</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>mp2</extension>
+ <mime-type>audio/x-mpeg</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>mp3</extension>
+ <mime-type>audio/x-mpeg</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>mpa</extension>
+ <mime-type>audio/x-mpeg</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>mpe</extension>
+ <mime-type>video/mpeg</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>mpeg</extension>
+ <mime-type>video/mpeg</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>mpega</extension>
+ <mime-type>audio/x-mpeg</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>mpg</extension>
+ <mime-type>video/mpeg</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>mpv2</extension>
+ <mime-type>video/mpeg2</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>ms</extension>
+ <mime-type>application/x-wais-source</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>nc</extension>
+ <mime-type>application/x-netcdf</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>oda</extension>
+ <mime-type>application/oda</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <!-- OpenDocument Database -->
+ <extension>odb</extension>
+ <mime-type>application/vnd.oasis.opendocument.database</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <!-- OpenDocument Chart -->
+ <extension>odc</extension>
+ <mime-type>application/vnd.oasis.opendocument.chart</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <!-- OpenDocument Formula -->
+ <extension>odf</extension>
+ <mime-type>application/vnd.oasis.opendocument.formula</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <!-- OpenDocument Drawing -->
+ <extension>odg</extension>
+ <mime-type>application/vnd.oasis.opendocument.graphics</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <!-- OpenDocument Image -->
+ <extension>odi</extension>
+ <mime-type>application/vnd.oasis.opendocument.image</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <!-- OpenDocument Master Document -->
+ <extension>odm</extension>
+ <mime-type>application/vnd.oasis.opendocument.text-master</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <!-- OpenDocument Presentation -->
+ <extension>odp</extension>
+ <mime-type>application/vnd.oasis.opendocument.presentation</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <!-- OpenDocument Spreadsheet -->
+ <extension>ods</extension>
+ <mime-type>application/vnd.oasis.opendocument.spreadsheet</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <!-- OpenDocument Text -->
+ <extension>odt</extension>
+ <mime-type>application/vnd.oasis.opendocument.text</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>ogg</extension>
+ <mime-type>application/ogg</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <!-- OpenDocument Drawing Template -->
+ <extension>otg </extension>
+ <mime-type>application/vnd.oasis.opendocument.graphics-template</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <!-- HTML Document Template -->
+ <extension>oth</extension>
+ <mime-type>application/vnd.oasis.opendocument.text-web</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <!-- OpenDocument Presentation Template -->
+ <extension>otp</extension>
+ <mime-type>application/vnd.oasis.opendocument.presentation-template</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <!-- OpenDocument Spreadsheet Template -->
+ <extension>ots</extension>
+ <mime-type>application/vnd.oasis.opendocument.spreadsheet-template </mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <!-- OpenDocument Text Template -->
+ <extension>ott</extension>
+ <mime-type>application/vnd.oasis.opendocument.text-template</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>pbm</extension>
+ <mime-type>image/x-portable-bitmap</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>pct</extension>
+ <mime-type>image/pict</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>pdf</extension>
+ <mime-type>application/pdf</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>pgm</extension>
+ <mime-type>image/x-portable-graymap</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>pic</extension>
+ <mime-type>image/pict</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>pict</extension>
+ <mime-type>image/pict</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>pls</extension>
+ <mime-type>audio/x-scpls</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>png</extension>
+ <mime-type>image/png</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>pnm</extension>
+ <mime-type>image/x-portable-anymap</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>pnt</extension>
+ <mime-type>image/x-macpaint</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>ppm</extension>
+ <mime-type>image/x-portable-pixmap</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>ppt</extension>
+ <mime-type>application/powerpoint</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>ps</extension>
+ <mime-type>application/postscript</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>psd</extension>
+ <mime-type>image/x-photoshop</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>qt</extension>
+ <mime-type>video/quicktime</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>qti</extension>
+ <mime-type>image/x-quicktime</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>qtif</extension>
+ <mime-type>image/x-quicktime</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>ras</extension>
+ <mime-type>image/x-cmu-raster</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>rdf</extension>
+ <mime-type>application/rdf+xml</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>rgb</extension>
+ <mime-type>image/x-rgb</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>rm</extension>
+ <mime-type>application/vnd.rn-realmedia</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>roff</extension>
+ <mime-type>application/x-troff</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>rtf</extension>
+ <mime-type>application/rtf</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>rtx</extension>
+ <mime-type>text/richtext</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>sh</extension>
+ <mime-type>application/x-sh</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>shar</extension>
+ <mime-type>application/x-shar</mime-type>
+ </mime-mapping>
+<!--
+ <mime-mapping>
+ <extension>shtml</extension>
+ <mime-type>text/x-server-parsed-html</mime-type>
+ </mime-mapping>
+-->
+ <mime-mapping>
+ <extension>smf</extension>
+ <mime-type>audio/x-midi</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>sit</extension>
+ <mime-type>application/x-stuffit</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>snd</extension>
+ <mime-type>audio/basic</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>src</extension>
+ <mime-type>application/x-wais-source</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>sv4cpio</extension>
+ <mime-type>application/x-sv4cpio</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>sv4crc</extension>
+ <mime-type>application/x-sv4crc</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>swf</extension>
+ <mime-type>application/x-shockwave-flash</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>t</extension>
+ <mime-type>application/x-troff</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>tar</extension>
+ <mime-type>application/x-tar</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>tcl</extension>
+ <mime-type>application/x-tcl</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>tex</extension>
+ <mime-type>application/x-tex</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>texi</extension>
+ <mime-type>application/x-texinfo</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>texinfo</extension>
+ <mime-type>application/x-texinfo</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>tif</extension>
+ <mime-type>image/tiff</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>tiff</extension>
+ <mime-type>image/tiff</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>tr</extension>
+ <mime-type>application/x-troff</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>tsv</extension>
+ <mime-type>text/tab-separated-values</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>txt</extension>
+ <mime-type>text/plain</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>ulw</extension>
+ <mime-type>audio/basic</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>ustar</extension>
+ <mime-type>application/x-ustar</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>vxml</extension>
+ <mime-type>application/voicexml+xml</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>xbm</extension>
+ <mime-type>image/x-xbitmap</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>xht</extension>
+ <mime-type>application/xhtml+xml</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>xhtml</extension>
+ <mime-type>application/xhtml+xml</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>xml</extension>
+ <mime-type>application/xml</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>xpm</extension>
+ <mime-type>image/x-xpixmap</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>xsl</extension>
+ <mime-type>application/xml</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>xslt</extension>
+ <mime-type>application/xslt+xml</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>xul</extension>
+ <mime-type>application/vnd.mozilla.xul+xml</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>xwd</extension>
+ <mime-type>image/x-xwindowdump</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>wav</extension>
+ <mime-type>audio/x-wav</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>svg</extension>
+ <mime-type>image/svg+xml</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>svgz</extension>
+ <mime-type>image/svg+xml</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>vsd</extension>
+ <mime-type>application/x-visio</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <!-- Wireless Bitmap -->
+ <extension>wbmp</extension>
+ <mime-type>image/vnd.wap.wbmp</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <!-- WML Source -->
+ <extension>wml</extension>
+ <mime-type>text/vnd.wap.wml</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <!-- Compiled WML -->
+ <extension>wmlc</extension>
+ <mime-type>application/vnd.wap.wmlc</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <!-- WML Script Source -->
+ <extension>wmls</extension>
+ <mime-type>text/vnd.wap.wmlscript</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <!-- Compiled WML Script -->
+ <extension>wmlscriptc</extension>
+ <mime-type>application/vnd.wap.wmlscriptc</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>wrl</extension>
+ <mime-type>x-world/x-vrml</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>Z</extension>
+ <mime-type>application/x-compress</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>z</extension>
+ <mime-type>application/x-compress</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>zip</extension>
+ <mime-type>application/zip</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>xls</extension>
+ <mime-type>application/vnd.ms-excel</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>doc</extension>
+ <mime-type>application/vnd.ms-word</mime-type>
+ </mime-mapping>
+ <mime-mapping>
+ <extension>ppt</extension>
+ <mime-type>application/vnd.ms-powerpoint</mime-type>
+ </mime-mapping>
+
+ <!-- ==================== Default Welcome File List ===================== -->
+ <!-- When a request URI refers to a directory, the default servlet looks -->
+ <!-- for a "welcome file" within that directory and, if present, -->
+ <!-- to the corresponding resource URI for display. If no welcome file -->
+ <!-- is present, the default servlet either serves a directory listing, -->
+ <!-- or returns a 404 status, depending on how it is configured. -->
+ <!-- -->
+ <!-- If you define welcome files in your own application's web.xml -->
+ <!-- deployment descriptor, that list *replaces* the list configured -->
+ <!-- here, so be sure that you include any of the default values that -->
+ <!-- you wish to include. -->
+
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.htm</welcome-file>
+ <welcome-file>index.jsp</welcome-file>
+ </welcome-file-list>
+
+</web-app>
Added: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/jboss-web.deployer/server.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/jboss-web.deployer/server.xml (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/jboss-web.deployer/server.xml 2008-10-29 18:56:06 UTC (rev 80213)
@@ -0,0 +1,181 @@
+<Server>
+
+ <!--APR library loader. Documentation at /docs/apr.html -->
+ <Listener className="org.apache.catalina.core.AprLifecycleListener" SSLEngine="on" />
+ <!--Initialize Jasper prior to webapps are loaded. Documentation at /docs/jasper-howto.html -->
+ <Listener className="org.apache.catalina.core.JasperListener" />
+
+ <!-- Use a custom version of StandardService that allows the
+ connectors to be started independent of the normal lifecycle
+ start to allow web apps to be deployed before starting the
+ connectors.
+ -->
+ <Service name="jboss.web">
+
+ <!-- A "Connector" represents an endpoint by which requests are received
+ and responses are returned. Documentation at :
+ Java HTTP Connector: /docs/config/http.html (blocking & non-blocking)
+ Java AJP Connector: /docs/config/ajp.html
+ APR (HTTP/AJP) Connector: /docs/apr.html
+ Define a non-SSL HTTP/1.1 Connector on port 8080
+ -->
+ <Connector port="8080" address="${jboss.bind.address}"
+ maxThreads="250" maxHttpHeaderSize="8192"
+ emptySessionPath="true" protocol="HTTP/1.1"
+ enableLookups="false" redirectPort="8443" acceptCount="100"
+ connectionTimeout="20000" disableUploadTimeout="true" />
+
+ <!-- SSL/TLS Connector configuration -->
+ <Connector port="8443" address="${jboss.bind.address}"
+ maxThreads="100" minSpareThreads="5" maxSpareThreads="15"
+ scheme="https" secure="true" clientAuth="true" SSLEnabled="true"
+ truststoreFile="${jboss.server.home.dir}/conf/localhost.keystore"
+ truststorePass="unit-tests-server"
+ keystoreFile="${jboss.server.home.dir}/conf/localhost.keystore"
+ keystorePass="unit-tests-server" sslProtocol = "TLS" />
+
+ <!-- A HTTP/1.1 Connector on port 9080 which redirects to 9443 for https -->
+ <Connector port="9080" address="${jboss.bind.address}"
+ maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
+ enableLookups="false" redirectPort="9443" acceptCount="100"
+ connectionTimeout="20000" disableUploadTimeout="true"/>
+ <!-- SSL/TLS Connector configuration -->
+ <Connector port="9443" address="${jboss.bind.address}"
+ maxThreads="100" minSpareThreads="5" maxSpareThreads="15"
+ scheme="https" secure="true" clientAuth="true" SSLEnabled="true"
+ sslProtocol = "TLS" securityDomain="java:/jaas/jbosstest-ssl"
+ SSLImplementation="org.jboss.net.ssl.JBossImplementation" />
+ <!-- SSL/TLS Connector with encrypted keystore password configuration -->
+ <Connector port="9943" address="${jboss.bind.address}"
+ maxThreads="100" minSpareThreads="5" maxSpareThreads="15"
+ scheme="https" secure="true" clientAuth="true" SSLEnabled="true"
+ sslProtocol = "TLS" securityDomain="java:/jaas/encrypt-keystore-password"
+ SSLImplementation="org.jboss.net.ssl.JBossImplementation" />
+
+
+ <Engine name="jboss.web" defaultHost="localhost">
+
+ <!-- The JAAS based authentication and authorization realm implementation
+ that is compatible with the jboss 3.2.x realm implementation.
+ - certificatePrincipal : the class name of the
+ org.jboss.security.auth.certs.CertificatePrincipal impl
+ used for mapping X509[] cert chains to a Princpal.
+ - allRolesMode : how to handle an auth-constraint with a role-name=*,
+ one of strict, authOnly, strictAuthOnly
+ + strict = Use the strict servlet spec interpretation which requires
+ that the user have one of the web-app/security-role/role-name
+ + authOnly = Allow any authenticated user
+ + strictAuthOnly = Allow any authenticated user only if there are no
+ web-app/security-roles
+ -->
+ <Realm className="org.jboss.web.tomcat.security.JBossSecurityMgrRealm"
+ certificatePrincipal="org.jboss.security.auth.certs.SubjectDNMapping"
+ allRolesMode="authOnly"
+ />
+ <!-- A subclass of JBossSecurityMgrRealm that uses the authentication
+ behavior of JBossSecurityMgrRealm, but overrides the authorization
+ checks to use JACC permissions with the current java.security.Policy
+ to determine authorized access.
+ - allRolesMode : how to handle an auth-constraint with a role-name=*,
+ one of strict, authOnly, strictAuthOnly
+ + strict = Use the strict servlet spec interpretation which requires
+ that the user have one of the web-app/security-role/role-name
+ + authOnly = Allow any authenticated user
+ + strictAuthOnly = Allow any authenticated user only if there are no
+ web-app/security-roles
+ <Realm className="org.jboss.web.tomcat.security.JaccAuthorizationRealm"
+ certificatePrincipal="org.jboss.security.auth.certs.SubjectDNMapping"
+ allRolesMode="authOnly"
+ />
+ -->
+
+ <Host name="localhost"
+ autoDeploy="false" deployOnStartup="false" deployXML="false"
+ configClass="org.jboss.web.tomcat.security.config.JBossContextConfig"
+ >
+
+ <!-- Uncomment to enable request dumper. This Valve "logs interesting
+ contents from the specified Request (before processing) and the
+ corresponding Response (after processing). It is especially useful
+ in debugging problems related to headers and cookies."
+ -->
+ <!--
+ <Valve className="org.apache.catalina.valves.RequestDumperValve" />
+ -->
+
+ <!-- Access logger -->
+ <!--
+ <Valve className="org.apache.catalina.valves.AccessLogValve"
+ prefix="localhost_access_log." suffix=".log"
+ pattern="common" directory="${jboss.server.home.dir}/log"
+ resolveHosts="false" />
+ -->
+
+ <!-- Uncomment to enable single sign-on across web apps
+ deployed to this host. Does not provide SSO across a cluster.
+
+ If this valve is used, do not use the JBoss ClusteredSingleSignOn
+ valve shown below.
+
+ A new configuration attribute is available beginning with
+ release 4.0.4:
+
+ cookieDomain configures the domain to which the SSO cookie
+ will be scoped (i.e. the set of hosts to
+ which the cookie will be presented). By default
+ the cookie is scoped to "/", meaning the host
+ that presented it. Set cookieDomain to a
+ wider domain (e.g. "xyz.com") to allow an SSO
+ to span more than one hostname.
+ -->
+ <!--
+ <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+ -->
+
+ <!-- Uncomment to enable single sign-on across web apps
+ deployed to this host AND to all other hosts in the cluster.
+
+ If this valve is used, do not use the standard Tomcat SingleSignOn
+ valve shown above.
+
+ Valve uses a JBossCache instance to support SSO credential
+ caching and replication across the cluster. The JBossCache
+ instance must be configured separately. By default, the valve
+ shares a JBossCache with the service that supports HttpSession
+ replication. See the "jboss-web-cluster-service.xml" file in the
+ server/all/deploy directory for cache configuration details.
+
+ Besides the attributes supported by the standard Tomcat
+ SingleSignOn valve (see the Tomcat docs), this version also
+ supports the following attributes:
+
+ cookieDomain see above
+
+ treeCacheName JMX ObjectName of the JBossCache MBean used to
+ support credential caching and replication across
+ the cluster. If not set, the default value is
+ "jboss.cache:service=TomcatClusteringCache", the
+ standard ObjectName of the JBossCache MBean used
+ to support session replication.
+ -->
+ <!-- -->
+ <Valve className="org.jboss.web.tomcat.service.sso.ClusteredSingleSignOn" />
+
+
+ <!-- Check for unclosed connections and transaction terminated checks
+ in servlets/jsps.
+
+ Important: The dependency on the CachedConnectionManager
+ in META-INF/jboss-service.xml must be uncommented, too
+ -->
+ <Valve className="org.jboss.web.tomcat.service.jca.CachedConnectionValve"
+ cachedConnectionManagerObjectName="jboss.jca:service=CachedConnectionManager"
+ transactionManagerObjectName="jboss:service=TransactionManager" />
+
+ </Host>
+
+ </Engine>
+
+ </Service>
+
+</Server>
Added: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/jmx-console.war/WEB-INF/jboss-web.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/jmx-console.war/WEB-INF/jboss-web.xml (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/jmx-console.war/WEB-INF/jboss-web.xml 2008-10-29 18:56:06 UTC (rev 80213)
@@ -0,0 +1,6 @@
+<jboss-web>
+ <!-- Uncomment the security-domain to enable security. You will
+ need to edit the htmladaptor login configuration to setup the
+ login modules used to authentication users. -->
+ <security-domain>java:/jaas/jmx-console</security-domain>
+</jboss-web>
Added: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/jmx-console.war/WEB-INF/web.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/jmx-console.war/WEB-INF/web.xml (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/jmx-console.war/WEB-INF/web.xml 2008-10-29 18:56:06 UTC (rev 80213)
@@ -0,0 +1,108 @@
+<?xml version="1.0"?>
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
+ <description>The standard web descriptor for the html adaptor</description>
+ <!--
+ <filter>
+ <filter-name>JmxOpsAccessControlFilter</filter-name>
+ <filter-class>org.jboss.jmx.adaptor.html.JMXOpsAccessControlFilter</filter-class>
+ <init-param>
+ <param-name>updateAttributes</param-name>
+ <param-value>UpdateAttributeRole</param-value>
+ <description>Comma-delimited Roles that define the JMX Operation denoting updation of Attributes</description>
+ </init-param>
+ <init-param>
+ <param-name>invokeOp</param-name>
+ <param-value>InvokeOpRole</param-value>
+ <description>Comma-delimited Roles that define the JMX Operation denoting Invocation of Operations</description>
+ </init-param>
+ </filter>
+ <filter-mapping>
+ <filter-name>JmxOpsAccessControlFilter</filter-name>
+ <servlet-name>HtmlAdaptor</servlet-name>
+ </filter-mapping>
+ -->
+ <servlet>
+ <servlet-name>HtmlAdaptor</servlet-name>
+ <servlet-class>org.jboss.jmx.adaptor.html.HtmlAdaptorServlet</servlet-class>
+ </servlet>
+ <servlet>
+ <servlet-name>ClusteredConsoleServlet</servlet-name>
+ <servlet-class>org.jboss.jmx.adaptor.html.ClusteredConsoleServlet</servlet-class>
+ <init-param>
+ <param-name>jgProps</param-name>
+ <param-value>UDP(ip_mcast=true;ip_ttl=16;loopback=false;mcast_addr=${jboss.partition.udpGroup:228.1.2.3};mcast_port=${jboss.hapartition.mcast_port:45566}):
+org.jboss.jmx.adaptor.control.FindView
+ </param-value>
+ <description>The JGroups protocol stack config</description>
+ </init-param>
+ </servlet>
+ <servlet>
+ <servlet-name>DisplayMBeans</servlet-name>
+ <jsp-file>/displayMBeans.jsp</jsp-file>
+ </servlet>
+ <servlet>
+ <servlet-name>InspectMBean</servlet-name>
+ <jsp-file>/inspectMBean.jsp</jsp-file>
+ </servlet>
+ <servlet>
+ <servlet-name>DisplayOpResult</servlet-name>
+ <jsp-file>/displayOpResult.jsp</jsp-file>
+ </servlet>
+ <servlet>
+ <servlet-name>ClusterView</servlet-name>
+ <jsp-file>/cluster/clusterView.jsp</jsp-file>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>HtmlAdaptor</servlet-name>
+ <url-pattern>/HtmlAdaptor</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>ClusteredConsoleServlet</servlet-name>
+ <url-pattern>/cluster/ClusteredConsole</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>DisplayMBeans</servlet-name>
+ <url-pattern>/DisplayMBeans</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>InspectMBean</servlet-name>
+ <url-pattern>/InspectMBean</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>DisplayOpResult</servlet-name>
+ <url-pattern>/DisplayOpResult</url-pattern>
+ </servlet-mapping>
+
+ <!-- A security constraint that restricts access to the HTML JMX console
+ to users with the role JBossAdmin. Edit the roles to what you want and
+ uncomment the WEB-INF/jboss-web.xml/security-domain element to enable
+ secured access to the HTML JMX console. -->
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>HtmlAdaptor</web-resource-name>
+ <description>An example security config that only allows users with the
+ role JBossAdmin to access the HTML JMX console web application
+ </description>
+ <url-pattern>/*</url-pattern>
+ <http-method>GET</http-method>
+ <http-method>POST</http-method>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>JBossAdmin</role-name>
+ </auth-constraint>
+ </security-constraint>
+
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ <realm-name>JBoss JMX Console</realm-name>
+ </login-config>
+
+ <security-role>
+ <role-name>JBossAdmin</role-name>
+ </security-role>
+</web-app>
Added: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/jmx-invoker-service.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/jmx-invoker-service.xml (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/jmx-invoker-service.xml 2008-10-29 18:56:06 UTC (rev 80213)
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id: jboss-service.xml 65305 2007-09-11 21:15:24Z fnasser at redhat.com $ -->
+<server>
+
+ <!-- The JRMP invoker proxy configuration for the InvokerAdaptorService -->
+ <mbean code="org.jboss.invocation.jrmp.server.JRMPProxyFactory"
+ name="jboss.jmx:type=adaptor,name=Invoker,protocol=jrmp,service=proxyFactory">
+ <!-- Use the standard JRMPInvoker from conf/jboss-service.xxml -->
+ <depends optional-attribute-name="InvokerName">jboss:service=invoker,type=jrmp</depends>
+ <!-- The target MBean is the InvokerAdaptorService configured below -->
+ <depends optional-attribute-name="TargetName">jboss.jmx:type=adaptor,name=Invoker</depends>
+ <!-- Where to bind the RMIAdaptor proxy -->
+ <attribute name="JndiName">jmx/invoker/RMIAdaptor</attribute>
+ <!-- The RMI compabitle MBeanServer interface -->
+ <attribute name="ExportedInterfaces">org.jboss.jmx.adaptor.rmi.RMIAdaptor,
+ org.jboss.jmx.adaptor.rmi.RMIAdaptorExt
+ </attribute>
+ <attribute name="ClientInterceptors">
+ <interceptors>
+ <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
+ <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
+ <interceptor>org.jboss.jmx.connector.invoker.client.InvokerAdaptorClientInterceptor</interceptor>
+ <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+ </interceptors>
+ </attribute>
+ <depends>jboss:service=Naming</depends>
+ </mbean>
+
+ <!--
+ Choose the remote proxy to expose mbean proxies over
+ -->
+ <mbean code="org.jboss.jmx.connector.invoker.MBeanProxyRemote"
+ name="jboss.jmx:type=adaptor,name=MBeanProxyRemote,protocol=jrmp">
+ <depends optional-attribute-name="MBeanServerConnection">jboss.jmx:type=adaptor,name=Invoker,protocol=jrmp,service=proxyFactory</depends>
+ </mbean>
+
+ <!-- Create a mapping from the legacy jmx-rmi-adaptor.sar binding to the
+ jmx-invoker-adaptor-server.sar JndiName specified above for backwards
+ portability.
+ -->
+ <mbean code="org.jboss.naming.NamingAlias" name="jboss.jmx:alias=jmx/rmi/RMIAdaptor">
+ <attribute name="FromName">jmx/rmi/RMIAdaptor</attribute>
+ <attribute name="ToName">jmx/invoker/RMIAdaptor</attribute>
+ <depends>jboss:service=Naming</depends>
+ </mbean>
+
+ <!-- This is the service that handles the RMIAdaptor invocations by routing
+ them to the MBeanServer the service is deployed under. -->
+ <mbean code="org.jboss.jmx.connector.invoker.InvokerAdaptorService"
+ name="jboss.jmx:type=adaptor,name=Invoker"
+ xmbean-dd="">
+ <xmbean>
+ <description>The JMX Detached Invoker Service</description>
+ <class>org.jboss.jmx.connector.invoker.InvokerAdaptorService</class>
+
+ <!-- Attributes -->
+ <attribute access="read-only" getMethod="getName">
+ <description>The class name of the MBean</description>
+ <name>Name</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute access="read-only" getMethod="getState">
+ <description>The status of the MBean</description>
+ <name>State</name>
+ <type>int</type>
+ </attribute>
+ <attribute access="read-only" getMethod="getStateString">
+ <description>The status of the MBean in text form</description>
+ <name>StateString</name>
+ <type>java.lang.String</type>
+ </attribute>
+ <attribute access="read-write" getMethod="getExportedInterfaces" setMethod="setExportedInterfaces">
+ <description>The interfaces the invoker proxy supports</description>
+ <name>ExportedInterfaces</name>
+ <type>[Ljava.lang.Class;</type>
+ </attribute>
+ <attribute access="read-only" getMethod="getMethodMap">
+ <description>Map(Long hash, Method) of the proxy interface methods</description>
+ <name>MethodMap</name>
+ <type>java.util.Map</type>
+ </attribute>
+ <!-- Operations -->
+ <operation>
+ <description>The start lifecycle operation</description>
+ <name>start</name>
+ </operation>
+ <operation>
+ <description>The stop lifecycle operation</description>
+ <name>stop</name>
+ </operation>
+ <operation>
+ <description>The detyped lifecycle operation (for internal use only)</description>
+ <name>jbossInternalLifecycle</name>
+ <parameter>
+ <description>The lifecycle operation</description>
+ <name>method</name>
+ <type>java.lang.String</type>
+ </parameter>
+ <return-type>void</return-type>
+ </operation>
+
+ <operation>
+ <description>The detached invoker entry point</description>
+ <name>invoke</name>
+ <parameter>
+ <description>The method invocation context</description>
+ <name>invocation</name>
+ <type>org.jboss.invocation.Invocation</type>
+ </parameter>
+ <return-type>java.lang.Object</return-type>
+ <descriptors>
+ <interceptors>
+ <!-- Uncomment to require authenticated users
+ <interceptor code="org.jboss.jmx.connector.invoker.AuthenticationInterceptor"
+ securityDomain="java:/jaas/jmx-console"/>
+ -->
+ <!-- Interceptor that deals with non-serializable results -->
+ <interceptor code="org.jboss.jmx.connector.invoker.SerializableInterceptor"
+ policyClass="StripModelMBeanInfoPolicy"/>
+ </interceptors>
+ </descriptors>
+ </operation>
+ </xmbean>
+
+ <attribute name="ExportedInterfaces">org.jboss.jmx.adaptor.rmi.RMIAdaptor,
+ org.jboss.jmx.adaptor.rmi.RMIAdaptorExt
+ </attribute>
+ </mbean>
+
+</server>
Added: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/keystore.password
===================================================================
(Binary files differ)
Property changes on: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/keystore.password
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/management/console-mgr.sar/web-console.war/WEB-INF/classes/web-console-roles.properties
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/management/console-mgr.sar/web-console.war/WEB-INF/classes/web-console-roles.properties (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/management/console-mgr.sar/web-console.war/WEB-INF/classes/web-console-roles.properties 2008-10-29 18:56:06 UTC (rev 80213)
@@ -0,0 +1,2 @@
+# A sample roles.properties file for use with the UsersRolesLoginModule
+admin=JBossAdmin
Added: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/management/console-mgr.sar/web-console.war/WEB-INF/classes/web-console-users.properties
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/management/console-mgr.sar/web-console.war/WEB-INF/classes/web-console-users.properties (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/management/console-mgr.sar/web-console.war/WEB-INF/classes/web-console-users.properties 2008-10-29 18:56:06 UTC (rev 80213)
@@ -0,0 +1,2 @@
+# A sample users.properties file for use with the UsersRolesLoginModule
+admin=admin
Added: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/management/console-mgr.sar/web-console.war/WEB-INF/jboss-web.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/management/console-mgr.sar/web-console.war/WEB-INF/jboss-web.xml (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/management/console-mgr.sar/web-console.war/WEB-INF/jboss-web.xml 2008-10-29 18:56:06 UTC (rev 80213)
@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8' ?>
+
+<!DOCTYPE jboss-web
+ PUBLIC "-//JBoss//DTD Web Application 2.3V2//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-web_3_2.dtd">
+
+<jboss-web>
+
+ <!-- Uncomment the security-domain to enable security. You will
+ need to edit the htmladaptor login configuration to setup the
+ login modules used to authentication users. -->
+ <security-domain>java:/jaas/web-console</security-domain>
+
+ <!-- The war depends on the -->
+ <depends>jboss.admin:service=PluginManager</depends>
+</jboss-web>
Added: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/management/console-mgr.sar/web-console.war/WEB-INF/web.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/management/console-mgr.sar/web-console.war/WEB-INF/web.xml (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/management/console-mgr.sar/web-console.war/WEB-INF/web.xml 2008-10-29 18:56:06 UTC (rev 80213)
@@ -0,0 +1,366 @@
+<?xml version="1.0"?>
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
+ <description>Web Admin Console</description>
+ <servlet>
+ <servlet-name>J2EEFolder</servlet-name>
+ <servlet-class>org.jboss.console.plugins.helpers.ServletPluginHelper</servlet-class>
+ <init-param>
+ <param-name>ScriptName</param-name>
+ <param-value>J2EEFolder.bsh</param-value>
+ </init-param>
+ <init-param>
+ <param-name>IsRootNode</param-name>
+ <param-value>true</param-value>
+ </init-param>
+ <init-param>
+ <param-name>ContextName</param-name>
+ <param-value>/web-console</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>SystemFolder</servlet-name>
+ <servlet-class>org.jboss.console.plugins.helpers.ServletPluginHelper</servlet-class>
+ <init-param>
+ <param-name>ScriptName</param-name>
+ <param-value>SystemFolder.bsh</param-value>
+ </init-param>
+ <init-param>
+ <param-name>IsRootNode</param-name>
+ <param-value>true</param-value>
+ </init-param>
+ <init-param>
+ <param-name>ContextName</param-name>
+ <param-value>/web-console</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>MonitorsFolder</servlet-name>
+ <servlet-class>org.jboss.console.plugins.helpers.ServletPluginHelper</servlet-class>
+ <init-param>
+ <param-name>WrapperClass</param-name>
+ <param-value>org.jboss.console.plugins.MonitorLister</param-value>
+ </init-param>
+ <init-param>
+ <param-name>IsRootNode</param-name>
+ <param-value>true</param-value>
+ </init-param>
+ <init-param>
+ <param-name>ContextName</param-name>
+ <param-value>/web-console</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>AOPFolder</servlet-name>
+ <servlet-class>org.jboss.console.plugins.helpers.ServletPluginHelper</servlet-class>
+ <init-param>
+ <param-name>WrapperClass</param-name>
+ <param-value>org.jboss.console.plugins.AOPLister</param-value>
+ </init-param>
+ <init-param>
+ <param-name>IsRootNode</param-name>
+ <param-value>true</param-value>
+ </init-param>
+ <init-param>
+ <param-name>ContextName</param-name>
+ <param-value>/web-console</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>JMS Message</servlet-name>
+ <servlet-class>org.jboss.console.plugins.helpers.ServletPluginHelper</servlet-class>
+ <init-param>
+ <param-name>WrapperClass</param-name>
+ <param-value>org.jboss.console.plugins.JMSLister</param-value>
+ </init-param>
+ <init-param>
+ <param-name>MBeanClass</param-name>
+ <param-value>org.jboss.management.j2ee.JMSResource</param-value>
+ </init-param>
+ <init-param>
+ <param-name>ContextName</param-name>
+ <param-value>/web-console</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <!--servlet>
+ <servlet-name>UCLs</servlet-name>
+ <servlet-class>org.jboss.console.plugins.helpers.ServletPluginHelper</servlet-class>
+ <init-param>
+ <param-name>ScriptName</param-name>
+ <param-value>Classloaders.bsh</param-value>
+ </init-param>
+ <init-param>
+ <param-name>FolderName</param-name>
+ <param-value>ROOT/System</param-value>
+ </init-param>
+ <init-param>
+ <param-name>ContextName</param-name>
+ <param-value>/web-console</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet-->
+
+ <servlet>
+ <servlet-name>UCLs</servlet-name>
+ <servlet-class>org.jboss.console.plugins.helpers.ServletPluginHelper</servlet-class>
+ <init-param>
+ <param-name>WrapperClass</param-name>
+ <param-value>org.jboss.console.plugins.UCLLister</param-value>
+ </init-param>
+ <init-param>
+ <param-name>FolderName</param-name>
+ <param-value>ROOT/System</param-value>
+ </init-param>
+ <init-param>
+ <param-name>ContextName</param-name>
+ <param-value>/web-console</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>MBeans</servlet-name>
+ <servlet-class>org.jboss.console.plugins.helpers.ServletPluginHelper</servlet-class>
+ <init-param>
+ <param-name>WrapperClass</param-name>
+ <param-value>org.jboss.console.plugins.MBeansLister</param-value>
+ </init-param>
+ <init-param>
+ <param-name>FolderName</param-name>
+ <param-value>ROOT/System</param-value>
+ </init-param>
+ <init-param>
+ <param-name>ContextName</param-name>
+ <param-value>/web-console</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>JSR77 Domains and Servers</servlet-name>
+ <servlet-class>org.jboss.console.plugins.helpers.ServletPluginHelper</servlet-class>
+ <init-param>
+ <param-name>WrapperClass</param-name>
+ <param-value>org.jboss.console.plugins.JSR77Lister</param-value>
+ </init-param>
+ <init-param>
+ <param-name>FolderName</param-name>
+ <param-value>ROOT/J2EE</param-value>
+ </init-param>
+ <init-param>
+ <param-name>ContextName</param-name>
+ <param-value>/web-console</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>JSR77 EJBModules and EJBs</servlet-name>
+ <servlet-class>org.jboss.console.plugins.helpers.ServletPluginHelper</servlet-class>
+ <init-param>
+ <param-name>WrapperClass</param-name>
+ <param-value>org.jboss.console.plugins.EJBModuleLister</param-value>
+ </init-param>
+ <init-param>
+ <param-name>MBeanClass</param-name>
+ <param-value>org.jboss.management.j2ee.EJBModule</param-value>
+ </init-param>
+ <init-param>
+ <param-name>ContextName</param-name>
+ <param-value>/web-console</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>JSR77 J2EE Apps</servlet-name>
+ <servlet-class>org.jboss.console.plugins.helpers.ServletPluginHelper</servlet-class>
+ <init-param>
+ <param-name>WrapperClass</param-name>
+ <param-value>org.jboss.console.plugins.J2EEAppLister</param-value>
+ </init-param>
+ <init-param>
+ <param-name>MBeanClass</param-name>
+ <param-value>org.jboss.management.j2ee.J2EEApplication</param-value>
+ </init-param>
+ <init-param>
+ <param-name>ContextName</param-name>
+ <param-value>/web-console</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>JSR77 WebModule</servlet-name>
+ <servlet-class>org.jboss.console.plugins.helpers.ServletPluginHelper</servlet-class>
+ <init-param>
+ <param-name>WrapperClass</param-name>
+ <param-value>org.jboss.console.plugins.WebModuleLister</param-value>
+ </init-param>
+ <init-param>
+ <param-name>MBeanClass</param-name>
+ <param-value>org.jboss.management.j2ee.WebModule</param-value>
+ </init-param>
+ <init-param>
+ <param-name>ContextName</param-name>
+ <param-value>/web-console</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>HTTP Invocation</servlet-name>
+ <servlet-class>org.jboss.console.remote.InvokerServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>Create Snapshot</servlet-name>
+ <servlet-class>org.jboss.console.plugins.monitor.CreateSnapshotServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>Manage Snapshot</servlet-name>
+ <servlet-class>org.jboss.console.plugins.monitor.ManageSnapshotServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>Create Threshold Monitor</servlet-name>
+ <servlet-class>org.jboss.console.plugins.monitor.CreateThresholdMonitorServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>Manage Threshold Monitor</servlet-name>
+ <servlet-class>org.jboss.console.plugins.monitor.ManageThresholdMonitorServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>Create String Threshold Monitor</servlet-name>
+ <servlet-class>org.jboss.console.plugins.monitor.CreateStringThresholdMonitorServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>Manage String Threshold Monitor</servlet-name>
+ <servlet-class>org.jboss.console.plugins.monitor.ManageStringThresholdMonitorServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>Clear Monitor Alerts</servlet-name>
+ <servlet-class>org.jboss.console.plugins.monitor.ClearMonitorAlertsServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>Acknowledge Active Alarms</servlet-name>
+ <servlet-class>org.jboss.console.plugins.monitor.AcknowledgeActiveAlarmsServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet>
+ <servlet-name>Status Servlet</servlet-name>
+ <servlet-class>org.jboss.web.tomcat.service.StatusServlet</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>Status Servlet</servlet-name>
+ <url-pattern>/status</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>HTTP Invocation</servlet-name>
+ <url-pattern>/Invoker/*</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Create Snapshot</servlet-name>
+ <url-pattern>/CreateSnapshot</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Manage Snapshot</servlet-name>
+ <url-pattern>/ManageSnapshot</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Create Threshold Monitor</servlet-name>
+ <url-pattern>/CreateThresholdMonitor</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Manage Threshold Monitor</servlet-name>
+ <url-pattern>/ManageThresholdMonitor</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Create String Threshold Monitor</servlet-name>
+ <url-pattern>/CreateStringThresholdMonitor</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Manage String Threshold Monitor</servlet-name>
+ <url-pattern>/ManageStringThresholdMonitor</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Clear Monitor Alerts</servlet-name>
+ <url-pattern>/ClearMonitorAlerts</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>Acknowledge Active Alarms</servlet-name>
+ <url-pattern>/AcknowledgeActiveAlarms</url-pattern>
+ </servlet-mapping>
+
+ <taglib>
+ <taglib-uri>/webconsole</taglib-uri>
+ <taglib-location>/WEB-INF/tlds/webconsole.tld</taglib-location>
+ </taglib>
+
+ <!-- A security constraint that restricts access to the HTML JMX console
+ to users with the role JBossAdmin. Edit the roles to what you want and
+ uncomment the WEB-INF/jboss-web.xml/security-domain element to enable
+ secured access to the HTML JMX console. -->
+
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>HtmlAdaptor</web-resource-name>
+ <description>An example security config that only allows users with the
+ role JBossAdmin to access the HTML JMX console web application
+ </description>
+ <url-pattern>/*</url-pattern>
+ <http-method>GET</http-method>
+ <http-method>POST</http-method>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>JBossAdmin</role-name>
+ </auth-constraint>
+ </security-constraint>
+
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ <realm-name>JBoss WEB Console</realm-name>
+ </login-config>
+
+ <security-role>
+ <role-name>JBossAdmin</role-name>
+ </security-role>
+</web-app>
Added: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/security-service.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/security-service.xml (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc/deploy/security-service.xml 2008-10-29 18:56:06 UTC (rev 80213)
@@ -0,0 +1,21 @@
+<server>
+ <mbean code="org.jboss.security.plugins.JaasSecurityDomain"
+ name="jboss.security:service=SecurityDomain">
+ <constructor>
+ <arg type="java.lang.String" value="jbosstest-ssl"/>
+ </constructor>
+ <attribute name="KeyStoreURL">resource:localhost.keystore</attribute>
+ <attribute name="KeyStorePass">unit-tests-server</attribute>
+ </mbean>
+
+ <mbean code="org.jboss.security.plugins.JaasSecurityDomain"
+ name="jboss.security:service=PBESecurityDomain">
+ <constructor>
+ <arg type="java.lang.String" value="encrypt-keystore-password"/>
+ </constructor>
+ <attribute name="KeyStoreURL">resource:localhost.keystore</attribute>
+ <attribute name="KeyStorePass">{CLASS}org.jboss.security.plugins.FilePassword:${jboss.server.home.dir}/deploy/keystore.password</attribute>
+ <attribute name="Salt">welcometojboss</attribute>
+ <attribute name="IterationCount">13</attribute>
+ </mbean>
+</server>
Added: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc-db/conf/login-config.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc-db/conf/login-config.xml (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc-db/conf/login-config.xml 2008-10-29 18:56:06 UTC (rev 80213)
@@ -0,0 +1,220 @@
+<?xml version='1.0'?>
+<!DOCTYPE policy PUBLIC
+ "-//JBoss//DTD JBOSS Security Config 3.0//EN"
+ "http://www.jboss.org/j2ee/dtd/security_config.dtd">
+
+<policy>
+ <!-- Used by clients within the application server VM such as
+ mbeans and servlets that access EJBs.
+ -->
+ <application-policy name = "client-login">
+ <authentication>
+ <login-module code = "org.jboss.security.ClientLoginModule"
+ flag = "required">
+ <!-- Any existing security context will be restored on logout -->
+ <module-option name="restore-login-identity">true</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <!-- Security domain for JBossMQ -->
+ <application-policy name = "jbossmq">
+ <authentication>
+ <login-module code = "org.jboss.security.auth.spi.DatabaseServerLoginModule"
+ flag = "required">
+ <module-option name = "unauthenticatedIdentity">guest</module-option>
+ <module-option name = "dsJndiName">java:/DefaultDS</module-option>
+ <module-option name = "principalsQuery">SELECT PASSWD FROM JMS_USERS WHERE USERID=?</module-option>
+ <module-option name = "rolesQuery">SELECT ROLEID, 'Roles' FROM JMS_ROLES WHERE USERID=?</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <!-- Security domain for JBossMQ when using file-state-service.xml
+ <application-policy name = "jbossmq">
+ <authentication>
+ <login-module code = "org.jboss.mq.sm.file.DynamicLoginModule"
+ flag = "required">
+ <module-option name = "unauthenticatedIdentity">guest</module-option>
+ <module-option name = "sm.objectname">jboss.mq:service=StateManager</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+ -->
+
+ <!-- Security domains for testing new jca framework -->
+ <application-policy name = "HsqlDbRealm">
+ <authentication>
+ <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule"
+ flag = "required">
+ <module-option name = "principal">sa</module-option>
+ <module-option name = "userName">sa</module-option>
+ <module-option name = "password"></module-option>
+ <module-option name = "managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=DefaultDS</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <application-policy name = "JmsXARealm">
+ <authentication>
+ <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule"
+ flag = "required">
+ <module-option name = "principal">guest</module-option>
+ <module-option name = "userName">guest</module-option>
+ <module-option name = "password">guest</module-option>
+ <module-option name = "managedConnectionFactoryName">jboss.jca:service=TxCM,name=JmsXA</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <!-- A template configuration for the jmx-console web application. This
+ defaults to the UsersRolesLoginModule the same as other and should be
+ changed to a stronger authentication mechanism as required.
+ -->
+ <application-policy name = "jmx-console">
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.DatabaseServerLoginModule"
+ flag="required">
+ <module-option name="dsJndiName">java:/dbauthDS</module-option>
+ <module-option name="principalsQuery">
+ select password from Principals where principalid=?</module-option>
+ <module-option name="rolesQuery">
+ select role, rolegroup from Roles where principalid=?</module-option>
+ </login-module>
+ </authentication>
+ <!--
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag = "required">
+ <module-option name="usersProperties">props/jmx-console-users.properties</module-option>
+ <module-option name="rolesProperties">props/jmx-console-roles.properties</module-option>
+ </login-module>
+ </authentication>
+ -->
+ </application-policy>
+
+ <!-- A template configuration for the web-console web application. This
+ defaults to the UsersRolesLoginModule the same as other and should be
+ changed to a stronger authentication mechanism as required.
+ -->
+ <application-policy name = "web-console">
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.DatabaseServerLoginModule"
+ flag="required">
+ <module-option name="dsJndiName">java:/dbauthDS</module-option>
+ <module-option name="principalsQuery">
+ select password from Principals where principalid=?</module-option>
+ <module-option name="rolesQuery">
+ select role, rolegroup from Roles where principalid=?</module-option>
+ </login-module>
+ </authentication>
+ <!--
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag = "required">
+ <module-option name="usersProperties">web-console-users.properties</module-option>
+ <module-option name="rolesProperties">web-console-roles.properties</module-option>
+ </login-module>
+ </authentication>
+ -->
+ </application-policy>
+
+ <!--
+ A template configuration for the JBossWS security domain.
+ This defaults to the UsersRolesLoginModule the same as other and should be
+ changed to a stronger authentication mechanism as required.
+ -->
+ <application-policy name="JBossWS">
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag="required">
+ <module-option name="usersProperties">props/jbossws-users.properties</module-option>
+ <module-option name="rolesProperties">props/jbossws-roles.properties</module-option>
+ <module-option name="unauthenticatedIdentity">anonymous</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <application-policy name="messaging">
+ <authentication>
+ <login-module code = "org.jboss.security.auth.spi.DatabaseServerLoginModule"
+ flag = "required">
+ <module-option name = "unauthenticatedIdentity">guest</module-option>
+ <module-option name = "dsJndiName">java:/DefaultDS</module-option>
+ <module-option name = "principalsQuery">SELECT PASSWD FROM JBM_USER WHERE USER_ID=?</module-option>
+ <module-option name = "rolesQuery">SELECT ROLE_ID, 'Roles' FROM JBM_ROLE WHERE USER_ID=?</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <application-policy name = "jbosstest-ssl">
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.BaseCertLoginModule"
+ flag = "required">
+ <module-option name="password-stacking">useFirstPass</module-option>
+ <module-option name="securityDomain">java:/jaas/jbosstest-ssl</module-option>
+ </login-module>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag = "required">
+ <module-option name="password-stacking">useFirstPass</module-option>
+ <module-option name="usersProperties">ssl-users.properties</module-option>
+ <module-option name="rolesProperties">ssl-roles.properties</module-option>
+ <module-option name="roleGroupSeperator">:</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <application-policy name="proxy-test">
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.DatabaseServerLoginModule"
+ flag="required">
+ <module-option name="dsJndiName">java:/dbauthDS</module-option>
+ <module-option name="principalsQuery">
+ select password from Principals where principalid=?</module-option>
+ <module-option name="rolesQuery">
+ select role, rolegroup from Roles where principalid=?</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+
+ <!-- The default login configuration used by any security domain that
+ does not have a application-policy entry with a matching name
+ -->
+ <application-policy name = "other">
+
+ <!--
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.DatabaseServerLoginModule"
+ flag="required">
+ <module-option name="dsJndiName">java:/dbauthDS</module-option>
+ <module-option name="principalsQuery">
+ select password from Principals where principalid=?</module-option>
+ <module-option name="rolesQuery">
+ select role, rolegroup from Roles where principalid=?</module-option>
+ </login-module>
+ </authentication>
+ -->
+ <!-- A simple server login module, which can be used when the number
+ of users is relatively small. It uses two properties files:
+ users.properties, which holds users (key) and their password (value).
+ roles.properties, which holds users (key) and a comma-separated list of
+ their roles (value).
+ The unauthenticatedIdentity property defines the name of the principal
+ that will be used when a null username and password are presented as is
+ the case for an unuathenticated web client or MDB. If you want to
+ allow such users to be authenticated add the property, e.g.,
+ unauthenticatedIdentity="nobody"
+ -->
+
+ <authentication>
+ <login-module code = "org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag = "required" />
+ </authentication>
+
+
+ </application-policy>
+
+</policy>
+
+
Added: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc-db/deploy/dbauth-ds.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc-db/deploy/dbauth-ds.xml (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc-db/deploy/dbauth-ds.xml 2008-10-29 18:56:06 UTC (rev 80213)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- JBoss Server Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<!-- $Id: oracle-ds.xml,v 1.6 2004/09/15 14:37:40 loubyansky Exp $ -->
+<!-- ==================================================================== -->
+<!-- Datasource config for Oracle originally from Steven Coy -->
+<!-- ==================================================================== -->
+
+
+<datasources>
+ <local-tx-datasource>
+ <jndi-name>dbauthDS</jndi-name>
+ <!-- <connection-url>jdbc:oracle:thin:@//localhost:1521/dev.db</connection-url> -->
+ <connection-url>jdbc:oracle:thin:@//dev68.qa.atl2.redhat.com:1521/qadb01.qa</connection-url>
+
+ <driver-class>oracle.jdbc.OracleDriver</driver-class>
+ <user-name>cctest</user-name>
+ <password>cc1248</password>
+
+
+ <!-- Uses the pingDatabase method to check a connection is still valid before handing it out from the pool -->
+ <!--valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleValidConnectionChecker</valid-connection-checker-class-name-->
+ <!-- Checks the Oracle error codes and messages for fatal errors -->
+ <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter</exception-sorter-class-name>
+ <!-- sql to call when connection is created
+ <new-connection-sql>some arbitrary sql</new-connection-sql>
+ -->
+
+ <!-- sql to call on an existing pooled connection when it is obtained from pool - the OracleValidConnectionChecker is prefered
+ <check-valid-connection-sql>some arbitrary sql</check-valid-connection-sql>
+ -->
+
+ <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
+ <metadata>
+ <type-mapping>Oracle9i</type-mapping>
+ </metadata>
+ </local-tx-datasource>
+
+</datasources>
Added: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc-ldap/conf/login-config.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc-ldap/conf/login-config.xml (rev 0)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/resources/test-configs/cc-ldap/conf/login-config.xml 2008-10-29 18:56:06 UTC (rev 80213)
@@ -0,0 +1,224 @@
+<?xml version='1.0'?>
+<!DOCTYPE policy PUBLIC
+ "-//JBoss//DTD JBOSS Security Config 3.0//EN"
+ "http://www.jboss.org/j2ee/dtd/security_config.dtd">
+
+<policy>
+ <!-- Used by clients within the application server VM such as
+ mbeans and servlets that access EJBs.
+ -->
+ <application-policy name = "client-login">
+ <authentication>
+ <login-module code = "org.jboss.security.ClientLoginModule"
+ flag = "required">
+ <!-- Any existing security context will be restored on logout -->
+ <module-option name="restore-login-identity">true</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <!-- Security domain for JBossMQ -->
+ <application-policy name = "jbossmq">
+ <authentication>
+ <login-module code = "org.jboss.security.auth.spi.DatabaseServerLoginModule"
+ flag = "required">
+ <module-option name = "unauthenticatedIdentity">guest</module-option>
+ <module-option name = "dsJndiName">java:/DefaultDS</module-option>
+ <module-option name = "principalsQuery">SELECT PASSWD FROM JMS_USERS WHERE USERID=?</module-option>
+ <module-option name = "rolesQuery">SELECT ROLEID, 'Roles' FROM JMS_ROLES WHERE USERID=?</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <!-- Security domain for JBossMQ when using file-state-service.xml
+ <application-policy name = "jbossmq">
+ <authentication>
+ <login-module code = "org.jboss.mq.sm.file.DynamicLoginModule"
+ flag = "required">
+ <module-option name = "unauthenticatedIdentity">guest</module-option>
+ <module-option name = "sm.objectname">jboss.mq:service=StateManager</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+ -->
+
+ <!-- Security domains for testing new jca framework -->
+ <application-policy name = "HsqlDbRealm">
+ <authentication>
+ <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule"
+ flag = "required">
+ <module-option name = "principal">sa</module-option>
+ <module-option name = "userName">sa</module-option>
+ <module-option name = "password"></module-option>
+ <module-option name = "managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=DefaultDS</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <application-policy name = "JmsXARealm">
+ <authentication>
+ <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule"
+ flag = "required">
+ <module-option name = "principal">guest</module-option>
+ <module-option name = "userName">guest</module-option>
+ <module-option name = "password">guest</module-option>
+ <module-option name = "managedConnectionFactoryName">jboss.jca:service=TxCM,name=JmsXA</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <!-- A template configuration for the jmx-console web application. This
+ defaults to the UsersRolesLoginModule the same as other and should be
+ changed to a stronger authentication mechanism as required.
+ -->
+
+ <application-policy name="jmx-console">
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.LdapLoginModule"
+ flag="required">
+ <module-option name="java.naming.factory.initial">com.sun.jndi.ldap.LdapCtxFactory</module-option>
+ <module-option name="java.naming.provider.url">ldap://dev39.qa.atl2.redhat.com:390/</module-option>
+ <module-option name="java.naming.security.authentication">simple</module-option>
+ <module-option name="principalDNPrefix">uid=</module-option>
+ <module-option name="principalDNSuffix">,ou=People,dc=my-domain,dc=com</module-option>
+ <module-option name="rolesCtxDN">ou=Roles,dc=my-domain,dc=com</module-option>
+ <module-option name="uidAttributeID">member</module-option>
+ <module-option name="matchOnUserDN">true</module-option>
+ <module-option name="roleAttributeID">cn</module-option>
+ <module-option name="roleAttributeIsDN">false</module-option>
+ <module-option name="searchTimeLimit">5000</module-option>
+ <module-option name="searchScope">ONELEVEL_SCOPE</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <!-- A template configuration for the web-console web application. This
+ defaults to the UsersRolesLoginModule the same as other and should be
+ changed to a stronger authentication mechanism as required.
+ -->
+ <application-policy name = "web-console">
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.LdapLoginModule"
+ flag="required">
+ <module-option name="java.naming.factory.initial">com.sun.jndi.ldap.LdapCtxFactory</module-option>
+ <module-option name="java.naming.provider.url">ldap://dev39.qa.atl2.redhat.com:390/</module-option>
+ <module-option name="java.naming.security.authentication">simple</module-option>
+ <module-option name="principalDNPrefix">uid=</module-option>
+ <module-option name="principalDNSuffix">,ou=People,dc=my-domain,dc=com</module-option>
+ <module-option name="rolesCtxDN">ou=Roles,dc=my-domain,dc=com</module-option>
+ <module-option name="uidAttributeID">member</module-option>
+ <module-option name="matchOnUserDN">true</module-option>
+ <module-option name="roleAttributeID">cn</module-option>
+ <module-option name="roleAttributeIsDN">false</module-option>
+ <module-option name="searchTimeLimit">5000</module-option>
+ <module-option name="searchScope">ONELEVEL_SCOPE</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <!--
+ A template configuration for the JBossWS security domain.
+ This defaults to the UsersRolesLoginModule the same as other and should be
+ changed to a stronger authentication mechanism as required.
+ -->
+ <application-policy name="JBossWS">
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag="required">
+ <module-option name="usersProperties">props/jbossws-users.properties</module-option>
+ <module-option name="rolesProperties">props/jbossws-roles.properties</module-option>
+ <module-option name="unauthenticatedIdentity">anonymous</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <application-policy name="messaging">
+ <authentication>
+ <login-module code = "org.jboss.security.auth.spi.DatabaseServerLoginModule"
+ flag = "required">
+ <module-option name = "unauthenticatedIdentity">guest</module-option>
+ <module-option name = "dsJndiName">java:/DefaultDS</module-option>
+ <module-option name = "principalsQuery">SELECT PASSWD FROM JBM_USER WHERE USER_ID=?</module-option>
+ <module-option name = "rolesQuery">SELECT ROLE_ID, 'Roles' FROM JBM_ROLE WHERE USER_ID=?</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <application-policy name = "jbosstest-ssl">
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.BaseCertLoginModule"
+ flag = "required">
+ <module-option name="password-stacking">useFirstPass</module-option>
+ <module-option name="securityDomain">java:/jaas/jbosstest-ssl</module-option>
+ </login-module>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag = "required">
+ <module-option name="password-stacking">useFirstPass</module-option>
+ <module-option name="usersProperties">ssl-users.properties</module-option>
+ <module-option name="rolesProperties">ssl-roles.properties</module-option>
+ <module-option name="roleGroupSeperator">:</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <application-policy name="proxy-test">
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.LdapLoginModule"
+ flag="required">
+ <module-option name="java.naming.factory.initial">com.sun.jndi.ldap.LdapCtxFactory</module-option>
+ <module-option name="java.naming.provider.url">ldap://dev39.qa.atl2.redhat.com:390/</module-option>
+ <module-option name="java.naming.security.authentication">simple</module-option>
+ <module-option name="principalDNPrefix">uid=</module-option>
+ <module-option name="principalDNSuffix">,ou=People,dc=my-domain,dc=com</module-option>
+ <module-option name="rolesCtxDN">ou=Roles,dc=my-domain,dc=com</module-option>
+ <module-option name="uidAttributeID">member</module-option>
+ <module-option name="matchOnUserDN">true</module-option>
+ <module-option name="roleAttributeID">cn</module-option>
+ <module-option name="roleAttributeIsDN">false</module-option>
+ <module-option name="searchTimeLimit">5000</module-option>
+ <module-option name="searchScope">ONELEVEL_SCOPE</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+
+ <!-- The default login configuration used by any security domain that
+ does not have a application-policy entry with a matching name
+ -->
+ <application-policy name = "other">
+
+ <!--
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.DatabaseServerLoginModule"
+ flag="required">
+ <module-option name="dsJndiName">java:/dbauthDS</module-option>
+ <module-option name="principalsQuery">
+ select password from Principals where principalid=?</module-option>
+ <module-option name="rolesQuery">
+ select role, rolegroup from Roles where principalid=?</module-option>
+ </login-module>
+ </authentication>
+ -->
+ <!-- A simple server login module, which can be used when the number
+ of users is relatively small. It uses two properties files:
+ users.properties, which holds users (key) and their password (value).
+ roles.properties, which holds users (key) and a comma-separated list of
+ their roles (value).
+ The unauthenticatedIdentity property defines the name of the principal
+ that will be used when a null username and password are presented as is
+ the case for an unuathenticated web client or MDB. If you want to
+ allow such users to be authenticated add the property, e.g.,
+ unauthenticatedIdentity="nobody"
+ -->
+
+ <authentication>
+ <login-module code = "org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag = "required" />
+ </authentication>
+
+
+ </application-policy>
+
+</policy>
+
+
More information about the jboss-cvs-commits
mailing list