[jboss-cvs] JBossAS SVN: r108386 - in branches/JBPAPP_5_1/testsuite: imports and 8 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Sep 30 08:22:38 EDT 2010
Author: pskopek at redhat.com
Date: 2010-09-30 08:22:37 -0400 (Thu, 30 Sep 2010)
New Revision: 108386
Added:
branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/cc.keystore
branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/cc.password
branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/
branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/cacert.pem
branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/cakey.pem
branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/client.keystore
branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/jboss-log4j.xml
branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/localhost.keystore
branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/login-config.xml
branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/ssl-roles.properties
branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/ssl-users.properties
branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/sso-roles.properties
branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/sso-users.properties
branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/deploy/keystore.password
branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/deploy/security-service.xml
Modified:
branches/JBPAPP_5_1/testsuite/build.xml
branches/JBPAPP_5_1/testsuite/imports/sections/aop.xml
branches/JBPAPP_5_1/testsuite/imports/sections/security.xml
branches/JBPAPP_5_1/testsuite/imports/server-config.xml
branches/JBPAPP_5_1/testsuite/imports/test-jars.xml
branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/security/rmi/test/RMIOverHttpsTestCase.java
branches/JBPAPP_5_1/testsuite/src/resources/cc/cc.policy
branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/deploy/jbossweb.sar/server.xml
branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/deploy/servlet-invoker-service.xml
branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/deploy/servlet-invoker.war/WEB-INF/web.xml
branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/ssl.truststore
Log:
Changes regading CC testcases and config.
Modified: branches/JBPAPP_5_1/testsuite/build.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/build.xml 2010-09-30 12:00:45 UTC (rev 108385)
+++ branches/JBPAPP_5_1/testsuite/build.xml 2010-09-30 12:22:37 UTC (rev 108386)
@@ -1228,7 +1228,62 @@
<patternset id="cc.includes">
<include name="**/test/tm/test/TxTimeout*TestCase.class"/>
<include name="**/test/security/rmi/test/*TestCase.class"/>
+ <include name="org/jboss/test/security/test/CallerInfoUnitTestCase.class"/>
+ <include name="org.jboss.test.deployers.web.test.WEBDeploymentUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/SubjectContextUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/DeepCopySubjectUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/EJB3SpecUnitTestCase.class"/>
+ <include name="org/jboss/test/ejb3/jbpapp2473/unit/RunAsUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/EJBSpecUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/LoginContextUnitTestCas.class"/>
+ <include name="org/jboss/test/security/test/NamespacePermissionsUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/PermissionNameUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/WebConstraintsUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/WebResourcePermissionUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/WebUserDataPermissionUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/auth.AppCallbackHandlerUnitTestCase.class"/>
+ <include name="org/jboss/test/jmx/test/RMIAdaptorAuthorizationUnitTestCase.class"/>
+ <include name="org/jboss/test/jmx/testRMIAdaptorUnitTestCase.class"/>
+ <include name="org/jboss/test/web/test/ssl/SSLUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/ClientLoginModuleEJBUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/ClientLoginModuleUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/CustomPrincipalPropagationUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/DynamicLoginConfigServiceUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/EJBPermissionUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/JaasSecurityDomainUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/LoginModulesUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/MissingMethodUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/RoleMappingModuleUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/SAInheritableThreadLocalUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/SAThreadLocalUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/SecurityDomainLoginModuleOptionUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/SecurityMgrStressTestCase.class"/>
+ <include name="org/jboss/test/security/test/SecurityProxyUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/XMLLoginModulesUnitTestCase.class"/>
+ <include name="org/jboss/test/securitymgr/test/PolicyUnitTestCase.class"/>
+ <include name="org/jboss/test/web/test/WebIntegrationUnitTestCase.class"/>
+ <include name="org/jboss/test/web/security/CustomHeaderAuthTestCase.class"/>
+ <include name="org/jboss/test/web/test/FormAuthUnitTestCase.class"/>
+ <include name="org/jboss/test/web/test/SingleSignOnUnitTestCase.class"/>
+ <include name="org/jboss/test/web/test/UserInRoleUnitTestCase.class"/>
+ <include name="org/jboss/test/web/test/WebProgrammaticLoginTestCase.class"/>
+ <include name="org/jboss/test/jmx/test/SecureRMIAdaptorUnitTestCase.class"/>
+ <include name="org/jboss/test/security/rmi/test/RMIOverHttpsTestCase.class"/>
+ <include name="org/jboss/test/naming/test/SecurityUnitTestCase.class"/>
+ <include name="org/jboss/test/aop/test/SecurityUnitTestCase.class"/>
+ <include name="org/jboss/test/jbossts/ASCrashRecovery01/TestWithJPA.class"/>
+ <include name="org/jboss/test/jbossts/ASCrashRecovery01/WipeOutTxsInDoubt.class"/>
+ <include name="org/jboss/test/jbossts/ASCrashRecovery02/TestWithJMS.class"/>
+ <include name="org/jboss/test/tm/test/TxTimeoutAnnotUnitTestCase.class"/>
+ <include name="org/jboss/test/invokers/test/MultiInvokersUnitTestCase.class"/>
+ <include name="org/jboss/test/cluster/defaultcfg/test/HAInvokerUnitTestCase.class"/>
+ <include name="org/jboss/test/ws/jaxws/ejb3Integration/injection/InjectionTestCase.class"/>
</patternset>
+ <!-- pattern set for cc-audit configuration -->
+ <patternset id="cc-audit.includes">
+ <include name="org/jboss/test/scripts/test/ShutdownTestCase.class"/>
+ <include name="org/jboss/test/scripts/test/RunTestCase.class"/>
+ </patternset>
<!-- A patternset that requires jboss to run with a security manager -->
<patternset id="securitymgr.includes">
<include name="**/test/securitymgr/test/*TestCase.class"/>
@@ -1707,9 +1762,21 @@
<server:stop name="${conf}" />
</target>
- <!-- Tests for Common Criteria Evaluation. The JBoss server must be running with a security manager for those tests -->
+ <!--
+ | Tests for Common Criteria Evaluation. The JBoss server must be running with a security manager for those tests
+ | This target has to run with jboss.test.sign.jars property set to true.
+ -->
<target name="tests-common-criteria" description="Tests run against a jboss server configured according to CC Guide" depends="init">
+ <!--
+ <condition property="cc.java.security.debug" value="java.security.debug" else="java.security.NODEBUG">
+ <istrue value="${cc.sm.debug}"/>
+ </condition>
+ -->
+
+ <delete dir="${jboss.dist}${/}server${/}cc" quiet="true"/>
+ <delete dir="${jboss.dist}${/}server${/}cc-audit" quiet="true"/>
+
<create-config baseconf="production" newconf="cc">
<patternset>
<include name="conf/**" />
@@ -1721,14 +1788,36 @@
</patternset>
</create-config>
- <echo message="Starting CC with policy ${build.resources}/securitymgr/server.policy" />
+ <create-config baseconf="cc" newconf="cc-audit">
+ <patternset>
+ <include name="conf/**" />
+ <include name="deployers/**" />
+ <include name="deploy/**" />
+ <include name="deploy-hasingleton/**" />
+ <include name="farm/**" />
+ <include name="lib/**" />
+ </patternset>
+ </create-config>
+
+ <echo message="Starting CC with policy ${build.resources}/test-configs/cc/cc.policy" />
<echo message="jboss.home.dir=${jboss.dist}" />
<echo message="jboss.server.home.dir=${jboss.dist}${/}server${/}cc" />
<echo message="java.naming.provider.url=${node0.jndi.url}" />
<echo message="jbosstest.server.host=${node0}" />
-
+ <echo message="cc.java.security.debug=${cc.java.security.debug}" />
+
<server:start name="cc" />
+ <!--
+ <property name="javax.net.ssl.keyStore"
+ value="${build.resources}/test-configs/tomcat-ssl/conf/client.keystore"/>
+ <property name="javax.net.ssl.keyStorePassword" value="unit-tests-client"/>
+ <property name="javax.net.ssl.trustStore"
+ value="${build.resources}/test-configs/tomcat-ssl/conf/client.keystore"/>
+ <property name="javax.net.ssl.trustStorePassword" value="unit-tests-client"/>
+
+ -->
+
<junit dir="${module.output}" printsummary="true" haltonerror="false" haltonfailure="false" fork="true" timeout="${junit.timeout}" jvm="${junit.jvm}">
<jvmarg line="${junit.jvm.options}" />
@@ -1743,12 +1832,28 @@
<sysproperty key="java.security.auth.login.config" value="${build.resources}/security/auth.conf" />
<sysproperty key="build.testlog" value="${build.testlog}" />
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml" />
+
+ <!-- all entries from ${build.resources}/test-configs/tomcat-ssl/conf/client.keystore
+ were imported to ssl.truststore -->
<sysproperty key="javax.net.ssl.trustStore" value="${build.resources}/test-configs/cc/ssl.truststore" />
<sysproperty key="javax.net.ssl.trustStorePassword" value="123456" />
+ <!-- sysproperty key="javax.net.ssl.trustStore" value="${build.resources}/test-configs/tomcat-ssl/conf/client.keystore" />
+ <sysproperty key="javax.net.ssl.trustStorePassword" value="unit-tests-client" / -->
+ <sysproperty key="javax.net.ssl.keyStore" value="${build.resources}/test-configs/tomcat-ssl/conf/client.keystore" />
+ <sysproperty key="javax.net.ssl.keyStorePassword" value="unit-tests-client" />
+
+ <!-- tomcat-ssl tests -->
+ <sysproperty key="web.port" value="8081" />
+ <sysproperty key="secureweb.port" value="8443" />
+ <!-- RMI over http/s tests -->
+ <sysproperty key="rmi.over.web.port" value="8080" />
+ <sysproperty key="rmi.over.secureweb.port" value="8445" />
+
<sysproperty key="java.protocol.handler.pkgs" value="javax.net.ssl" />
<classpath>
<pathelement location="${build.resources}" />
+ <pathelement location="${build.resources}/security" />
<pathelement location="${build.classes}" />
<path refid="tests.classpath" />
</classpath>
@@ -1757,10 +1862,68 @@
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}" extension="-tests-security-manager.xml" />
<batchtest todir="${build.reports}" haltonerror="false" haltonfailure="false" fork="true">
+ <fileset dir="${build.classes}">
+ <!-- <include name="org/jboss/test/aop/test/SecurityUnitTestCase.class"/> -->
+ <!-- <exclude name="org/jboss/test/securitymgr/test/PolicyUnitTestCase.class" /> -->
+ <!-- include name="org/jboss/test/security/test/EJB3SpecUnitTestCase.class"/ -->
+ <!-- include name="org/jboss/test/security/test/EJBSpecUnitTestCase.class"/ -->
+
+ <include name="**/test/tm/test/TxTimeout*TestCase.class"/>
+ <include name="org/jboss/test/security/test/CallerInfoUnitTestCase.class"/>
+ <include name="org.jboss.test.deployers.web.test.WEBDeploymentUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/SubjectContextUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/DeepCopySubjectUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/EJB3SpecUnitTestCase.class"/>
+ <include name="org/jboss/test/ejb3/jbpapp2473/unit/RunAsUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/EJBSpecUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/LoginContextUnitTestCas.class"/>
+ <include name="org/jboss/test/security/test/NamespacePermissionsUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/PermissionNameUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/WebConstraintsUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/WebResourcePermissionUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/WebUserDataPermissionUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/auth.AppCallbackHandlerUnitTestCase.class"/>
+ <include name="org/jboss/test/jmx/test/RMIAdaptorAuthorizationUnitTestCase.class"/>
+ <include name="org/jboss/test/jmx/testRMIAdaptorUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/ClientLoginModuleEJBUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/ClientLoginModuleUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/CustomPrincipalPropagationUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/DynamicLoginConfigServiceUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/EJBPermissionUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/JaasSecurityDomainUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/LoginModulesUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/MissingMethodUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/RoleMappingModuleUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/SAInheritableThreadLocalUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/SAThreadLocalUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/SecurityDomainLoginModuleOptionUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/SecurityMgrStressTestCase.class"/>
+ <include name="org/jboss/test/security/test/SecurityProxyUnitTestCase.class"/>
+ <include name="org/jboss/test/security/test/XMLLoginModulesUnitTestCase.class"/>
+ <include name="org/jboss/test/securitymgr/test/PolicyUnitTestCase.class"/>
+ <include name="org/jboss/test/web/security/CustomHeaderAuthTestCase.class"/>
+ <include name="org/jboss/test/jmx/test/SecureRMIAdaptorUnitTestCase.class"/>
+ <include name="org/jboss/test/aop/test/SecurityUnitTestCase.class"/>
+ <include name="org/jboss/test/jbossts/ASCrashRecovery01/TestWithJPA.class"/>
+ <include name="org/jboss/test/jbossts/ASCrashRecovery01/WipeOutTxsInDoubt.class"/>
+ <include name="org/jboss/test/jbossts/ASCrashRecovery02/TestWithJMS.class"/>
+ <include name="org/jboss/test/tm/test/TxTimeoutAnnotUnitTestCase.class"/>
+ <include name="org/jboss/test/invokers/test/MultiInvokersUnitTestCase.class"/>
+ <include name="org/jboss/test/cluster/defaultcfg/test/HAInvokerUnitTestCase.class"/>
+ <include name="org/jboss/test/ws/jaxws/ejb3Integration/injection/InjectionTestCase.class"/>
- <fileset dir="${build.classes}">
- <exclude name="org/jboss/test/securitymgr/test/PolicyUnitTestCase.class" />
- <patternset refid="cc.includes"/>
+ <include name="org/jboss/test/web/test/FormAuthUnitTestCase.class"/>
+ <include name="org/jboss/test/web/test/SingleSignOnUnitTestCase.class"/>
+ <include name="org/jboss/test/web/test/UserInRoleUnitTestCase.class"/>
+ <include name="org/jboss/test/web/test/WebProgrammaticLoginTestCase.class"/>
+ <include name="org/jboss/test/web/test/WebIntegrationUnitTestCase.class"/>
+
+ <include name="org/jboss/test/security/rmi/test/RMIOverHttpsTestCase.class"/>
+ <include name="org/jboss/test/web/test/ssl/SSLUnitTestCase.class"/>
+
+ <include name="org/jboss/test/naming/test/SecurityUnitTestCase.class"/>
+
+ <!-- patternset refid="cc.includes"/ -->
</fileset>
</batchtest>
</junit>
Modified: branches/JBPAPP_5_1/testsuite/imports/sections/aop.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/imports/sections/aop.xml 2010-09-30 12:00:45 UTC (rev 108385)
+++ branches/JBPAPP_5_1/testsuite/imports/sections/aop.xml 2010-09-30 12:22:37 UTC (rev 108386)
@@ -127,6 +127,11 @@
</fileset>
</jar>
+
+ <antcall target="sign-file">
+ <param name="file" value="aoptest.aop"/>
+ </antcall>
+
<jar destfile="${build.lib}/aoptest.sar">
<fileset dir="${build.lib}">
<include name="aoptest.aop"/>
@@ -167,6 +172,10 @@
</fileset>
</jar>
+ <antcall target="sign-file">
+ <param name="file" value="aoptest.sar"/>
+ </antcall>
+
<jar destfile="${build.lib}/simpleejb.sar">
<fileset dir="${build.lib}">
<include name="aoptest.aop"/>
Modified: branches/JBPAPP_5_1/testsuite/imports/sections/security.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/imports/sections/security.xml 2010-09-30 12:00:45 UTC (rev 108385)
+++ branches/JBPAPP_5_1/testsuite/imports/sections/security.xml 2010-09-30 12:22:37 UTC (rev 108386)
@@ -89,6 +89,9 @@
<include name="security-spec.sar"/>
</fileset>
</jar>
+ <antcall target="sign-file">
+ <param name="file" value="security-spec.jar"/>
+ </antcall>
<!-- build security-srp.jar and security-srp.sar -->
<jar destfile="${build.lib}/security-srp.sar">
@@ -482,6 +485,9 @@
<include name="org/jboss/test/security/ejb3/*.class"/>
</fileset>
</jar>
+ <antcall target="sign-file">
+ <param name="file" value="security-ejb3.jar"/>
+ </antcall>
<!-- JBAS-1824:All Star Role jacc(create WebResourcePerm(url,null) -->
<war warfile="${build.lib}/jacc-allstarrole.war"
@@ -519,6 +525,9 @@
<include name="org/jboss/test/security/rmi/ejb3/*.class"/>
</fileset>
</jar>
-
+ <antcall target="sign-file">
+ <param name="file" value="rmi-over-https-test.jar"/>
+ </antcall>
+
</target>
</project>
\ No newline at end of file
Modified: branches/JBPAPP_5_1/testsuite/imports/server-config.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/imports/server-config.xml 2010-09-30 12:00:45 UTC (rev 108385)
+++ branches/JBPAPP_5_1/testsuite/imports/server-config.xml 2010-09-30 12:22:37 UTC (rev 108386)
@@ -11,6 +11,8 @@
-->
<property name="jboss.test.deploy.dir"
value="${project.root}${/}testsuite${/}output${/}lib"/>
+ <property name="jboss.test.resources.dir"
+ value="${project.root}${/}testsuite${/}src${/}resources"/>
<!-- Override for non-Sun compatible JDK layouts -->
<property name="javac.jar"
value="${env.JAVA_HOME}/lib/tools.jar"/>
@@ -233,17 +235,17 @@
</server>
<server name="cc" config="cc" host="${node0}">
<jvmarg value="${jpda.cmdline}" />
- <jvmarg value="-Xms128m" />
- <jvmarg value="-Xmx1024m" />
+ <jvmarg value="-Xms1024m" />
+ <jvmarg value="-Xmx1303m" />
<jvmarg value="-XX:MaxPermSize=512m" />
<jvmarg value="-XX:-UseGCOverheadLimit" />
<jvmarg value="-Djboss.home.dir=${jboss.dist}" />
<jvmarg value="-Djboss.server.home.dir=${jboss.dist}${/}server${/}cc" />
<jvmarg value="-Djboss.test.deploy.dir=${jboss.test.deploy.dir}" />
- <!-- <jvmarg value="-Djava.security.manager"/> -->
- <!-- <jvmarg value="-Djava.security.policy==${build.resources}/securitymgr/server.policy"/> -->
+ <jvmarg value="-Djava.security.manager"/>
+ <jvmarg value="-Djava.security.policy==${jboss.test.resources.dir}/cc/cc.policy"/>
+ <jvmarg value="-D${cc.java.security.debug}=access,failure"/>
<sysproperty key="java.protocol.handler.pkgs" value="org.jboss.handlers.stub"/>
- <!-- <jvmarg value="-Djava.security.debug=failure"/> -->
<!-- Replace for security manager debug verbose info
<jvmarg value="-Djava.security.debug=access,failure,policy"/>
@@ -252,6 +254,7 @@
<sysproperty key="java.net.preferIPv4Stack" value="true" />
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
<sysproperty key="xb.builder.useUnorderedSequence" value="true" />
+ <sysproperty key="jboss.server.log.threshold" value="${jboss.server.log.threshold}" />
</server>
<server name="scoped-aop-jdk50" host="${node0}">
<jvmarg value="-Xms128m" />
Modified: branches/JBPAPP_5_1/testsuite/imports/test-jars.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/imports/test-jars.xml 2010-09-30 12:00:45 UTC (rev 108385)
+++ branches/JBPAPP_5_1/testsuite/imports/test-jars.xml 2010-09-30 12:22:37 UTC (rev 108386)
@@ -184,6 +184,24 @@
</target>
<!--
+ | Sign test jar, ear, whatever if jboss.test.sign.jars is set to true.
+ | This is need in case we are running tests using Common Criteria policy (using Java Security Manager).
+ | We are not able to set proper permissions to vfsmemory:// deployed files.
+ -->
+ <target name="sign-file" if="jboss.test.sign.jars">
+ <signjar
+ keystore="${jboss.dist}${/}server${/}cc/cc.keystore"
+ storetype="jks"
+ alias="testsuite"
+ storepass="jbosseap">
+ <fileset dir="${build.lib}">
+ <include name="${file}" />
+ </fileset>
+ </signjar>
+ </target>
+
+
+ <!--
| Build Seam example files.
-->
<target name="seam" description="Builds Seam examples files." depends="compile, _jars-seam"/>
Modified: branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/security/rmi/test/RMIOverHttpsTestCase.java
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/security/rmi/test/RMIOverHttpsTestCase.java 2010-09-30 12:00:45 UTC (rev 108385)
+++ branches/JBPAPP_5_1/testsuite/src/main/org/jboss/test/security/rmi/test/RMIOverHttpsTestCase.java 2010-09-30 12:22:37 UTC (rev 108386)
@@ -52,6 +52,8 @@
super(name);
}
+ private static final int HTTP_PORT = Integer.getInteger("rmi.over.web.port", 8080).intValue();
+ private static final int HTTPS_PORT = Integer.getInteger("rmi.over.secureweb.port", 8443).intValue();
public static Test suite() throws Exception
{
@@ -83,8 +85,11 @@
Properties env = new Properties();
env.put("java.naming.factory.initial", "org.jboss.naming.HttpNamingContextFactory");
- env.put("java.naming.provider.url", "https://" + getServerHost() + ":8443/invoker/JNDIFactory");
+ env.put("java.naming.provider.url", "https://" + getServerHost() + ":" + HTTPS_PORT + "/invoker/JNDIFactory");
env.put("java.naming.factory.url.pkgs", "org.jboss.naming");
+
+ log.debug("java.naming.provider.url="+env.get("java.naming.provider.url"));
+
Context ctx = new InitialContext(env);
HelloWorld hwb = (HelloWorld) ctx.lookup("HelloWorldBean/remote-https");
@@ -103,8 +108,9 @@
Properties env = new Properties();
env.put("java.naming.factory.initial", "org.jboss.naming.HttpNamingContextFactory");
- env.put("java.naming.provider.url", "http://" + getServerHost() + ":8080/invoker/JNDIFactory");
+ env.put("java.naming.provider.url", "http://" + getServerHost() + ":" + HTTP_PORT + "/invoker/JNDIFactory");
env.put("java.naming.factory.url.pkgs", "org.jboss.naming");
+ log.debug("java.naming.provider.url="+env.get("java.naming.provider.url"));
Context ctx = new InitialContext(env);
HelloWorld hwb = (HelloWorld) ctx.lookup("HelloWorldBean/remote-http");
Modified: branches/JBPAPP_5_1/testsuite/src/resources/cc/cc.policy
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/cc/cc.policy 2010-09-30 12:00:45 UTC (rev 108385)
+++ branches/JBPAPP_5_1/testsuite/src/resources/cc/cc.policy 2010-09-30 12:22:37 UTC (rev 108386)
@@ -2,10 +2,10 @@
// Install with -Djava.security.policy==server.policy.cert
// and -Djboss.home.dir=path_to_jboss_distribution
-//keystore "file:${java.home}/lib/security/cacerts";
-keystore "file:${jboss.home.dir}/cc.keystore";
-keystorePasswordURL "file:${jboss.home.dir}/cc.password";
+keystore "file:${jboss.server.home.dir}/cc.keystore";
+keystorePasswordURL "file:${jboss.server.home.dir}/cc.password";
+
// ***************************************
// Trusted core Java code
//***************************************
@@ -65,23 +65,23 @@
permission java.security.AllPermission;
};
-grant codeBase "file:${jboss.server.home.dir}/work/jboss-web/localhost/admin-console/-" {
+grant codeBase "file:${jboss.server.home.dir}/work/jboss.web/localhost/admin-console/-" {
permission java.security.AllPermission;
};
-grant codeBase "file:${jboss.server.home.dir}/work/jboss-web/localhost/invoker/-" {
+grant codeBase "file:${jboss.server.home.dir}/work/jboss.web/localhost/invoker/-" {
permission java.security.AllPermission;
};
-grant codeBase "file:${jboss.server.home.dir}/work/jboss-web/localhost/jbossws/-" {
+grant codeBase "file:${jboss.server.home.dir}/work/jboss.web/localhost/jbossws/-" {
permission java.security.AllPermission;
};
-grant codeBase "file:${jboss.server.home.dir}/work/jboss-web/localhost/juddi/-" {
+grant codeBase "file:${jboss.server.home.dir}/work/jboss.web/localhost/juddi/-" {
permission java.security.AllPermission;
};
-grant codeBase "file:${jboss.server.home.dir}/work/jboss-web/localhost/web-console/-" {
+grant codeBase "file:${jboss.server.home.dir}/work/jboss.web/localhost/web-console/-" {
permission java.security.AllPermission;
};
@@ -107,3 +107,46 @@
permission java.util.PropertyPermission "*", "read";
permission java.lang.RuntimePermission "queuePrintJob";
};
+
+// ***************************************************************
+// testsuite permissions ... DO NOT USE IN PRODUCTION
+// ***************************************************************
+grant codeBase "file:${jboss.test.deploy.dir}/-" {
+ permission java.security.AllPermission;
+};
+
+grant signedBy "testsuite" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "file:${jboss.server.home.dir}/deploy/httpha-invoker.sar/invoker.war/-" {
+ permission java.lang.RuntimePermission "org.jboss.security.SecurityAssociation.getPrincipalInfo";
+ permission java.lang.RuntimePermission "org.jboss.security.getSecurityContext";
+ permission java.lang.RuntimePermission "org.jboss.security.plugins.JBossSecurityContext.getSubjectInfo";
+ permission javax.management.MBeanServerPermission "findMBeanServer";
+ permission javax.management.MBeanPermission "*", "queryNames";
+ permission javax.management.MBeanPermission "*", "invoke";
+};
+
+grant codeBase "file:${jboss.server.home.dir}/deploy/http-invoker.sar/invoker.war/-" {
+ permission java.lang.RuntimePermission "org.jboss.security.SecurityAssociation.getPrincipalInfo";
+ permission java.lang.RuntimePermission "org.jboss.security.getSecurityContext";
+ permission java.lang.RuntimePermission "org.jboss.security.plugins.JBossSecurityContext.getSubjectInfo";
+ permission javax.management.MBeanServerPermission "findMBeanServer";
+ permission javax.management.MBeanPermission "*", "queryNames";
+ permission javax.management.MBeanPermission "*", "invoke";
+};
+
+
+grant codeBase "file:${jboss.server.home.dir}/work/jboss.web/localhost/jbosstest/-" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "file:${jboss.server.home.dir}/work/jboss.web/localhost/manifest/-" {
+ permission java.security.AllPermission;
+};
+
+grant codeBase "vfsmemory://*" {
+ permission java.security.AllPermission;
+};
+
Added: branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/cc.keystore
===================================================================
(Binary files differ)
Property changes on: branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/cc.keystore
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/cc.password
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/cc.password (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/cc.password 2010-09-30 12:22:37 UTC (rev 108386)
@@ -0,0 +1 @@
+jbosseap
Added: branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/cacert.pem
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/cacert.pem (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/cacert.pem 2010-09-30 12:22:37 UTC (rev 108386)
@@ -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_5_1/testsuite/src/resources/test-configs/cc/conf/cakey.pem
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/cakey.pem (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/cakey.pem 2010-09-30 12:22:37 UTC (rev 108386)
@@ -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_5_1/testsuite/src/resources/test-configs/cc/conf/client.keystore
===================================================================
(Binary files differ)
Property changes on: branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/client.keystore
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/jboss-log4j.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/jboss-log4j.xml (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/jboss-log4j.xml 2010-09-30 12:22:37 UTC (rev 108386)
@@ -0,0 +1,403 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<!-- ===================================================================== -->
+<!-- -->
+<!-- Log4j Configuration -->
+<!-- -->
+<!-- ===================================================================== -->
+
+<!-- $Id: jboss-log4j.xml 87678 2009-04-22 16:47:08Z bstansberry at jboss.com $ -->
+
+<!--
+ | For more configuration information 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="true"/>
+ <!-- In AS 5.0.x the server log threshold was set by a system
+ property. In 5.1 and later we are instead using the system
+ property to set the priority on the root logger (see <root/> below)
+ <param name="Threshold" value="${jboss.server.log.threshold}"/>
+ -->
+
+ <!-- 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] (Thread) Message\n -->
+ <param name="ConversionPattern" value="%d %-5p [%c] (%t) %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 -->
+ <!-- ============================== -->
+
+ <!--
+ Console logger commented out to improve performance.
+ <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 -->
+ <!-- Will 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>
+ <category name="org.jgroups">
+ <priority value="WARN" />
+ <appender-ref ref="CLUSTER"/>
+ </category>
+ <category name="org.jboss.ha">
+ <priority value="INFO" />
+ <appender-ref ref="CLUSTER"/>
+ </category>
+
+ <!-- Security AUDIT Appender
+ <appender name="AUDIT" class="org.jboss.logging.appender.DailyRollingFileAppender">
+ <errorHandler class="org.jboss.logging.util.OnlyOnceErrorHandler"/>
+ <param name="File" value="${jboss.server.log.dir}/audit.log"/>
+ <param name="Append" value="true"/>
+ <param name="DatePattern" value="'.'yyyy-MM-dd"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d %-5p [%c] (%t:%x) %m%n"/>
+ </layout>
+ </appender>
+ -->
+
+ <!-- ================ -->
+ <!-- Limit categories -->
+ <!-- ================ -->
+ <category name="org.jboss.web">
+ <priority value="INFO" />
+ </category>
+ <category name="com.arjuna">
+ <priority value="INFO" />
+ </category>
+
+
+ <!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
+ <category name="org.apache">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- Limit the jacorb category to WARN as its INFO is verbose -->
+ <category name="jacorb">
+ <priority value="WARN"/>
+ </category>
+
+ <!-- Set the logging level of the JSF implementation that uses
+ | java.util.logging. The jdk logging levels can be controlled
+ | through the org.jboss.logging.log4j.JDKLevel class that
+ | in addition to the standard log4j levels it adds support for
+ | SEVERE, WARNING, CONFIG, FINE, FINER, FINEST
+ -->
+ <category name="javax.enterprise.resource.webcontainer.jsf">
+ <priority value="INFO" class="org.jboss.logging.log4j.JDKLevel"/>
+ </category>
+
+ <!-- Limit the org.jgroups category to WARN as its INFO is verbose -->
+ <category name="org.jgroups">
+ <priority value="WARN"/>
+ </category>
+
+ <category name="org.hibernate">
+ <priority value="INFO" />
+ </category>
+
+ <!-- Limit the org.quartz category to INFO as its DEBUG is verbose -->
+ <category name="org.quartz">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- Limit the com.sun category to INFO as its FINE is verbose -->
+ <category name="com.sun">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- Limit the sun category to INFO as its FINE is verbose -->
+ <category name="sun">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- Limit the javax.xml.bind category to INFO as its FINE is verbose -->
+ <category name="javax.xml.bind">
+ <priority value="INFO"/>
+ </category>
+
+ <!-- Limit the springframework category to WARN-->
+ <category name="org.springframework">
+ <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="INFO"/>
+ </category>
+
+ <!-- Limit the verbose facelets compiler -->
+ <category name="facelets.compiler">
+ <priority value="WARN"/>
+ </category>
+
+ <!-- Limit the verbose ajax4jsf cache initialization -->
+ <category name="org.ajax4jsf.cache">
+ <priority value="WARN"/>
+ </category>
+
+ <!-- Limit the verbose embedded jopr categories -->
+ <category name="org.rhq">
+ <priority value="WARN"/>
+ </category>
+
+ <!-- Limit the verbose seam categories -->
+ <category name="org.jboss.seam">
+ <priority value="WARN"/>
+ </category>
+
+ <!-- Limit the verbose MC4J EMS (lib used by admin-console) categories -->
+ <category name="org.mc4j.ems">
+ <priority value="WARN"/>
+ </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>
+ -->
+
+ <!-- Category specifically for Security Audit Provider
+ <category name="org.jboss.security.audit.providers.LogAuditProvider" additivity="false">
+ <priority value="TRACE"/>
+ <appender-ref ref="AUDIT"/>
+ </category>
+ -->
+
+ <!-- Limit the org.jboss.serial (jboss-serialization) to WARN as its INFO is verbose -->
+ <category name="org.jboss.serial">
+ <priority value="WARN"/>
+ </category>
+
+ <category name="org.jboss.security">
+ <priority value="TRACE"/>
+ </category>
+
+ <!-- Decrease the priority threshold for the org.jboss.varia category
+ <category name="org.jboss.varia">
+ <priority value="DEBUG"/>
+ </category>
+ -->
+
+ <!-- Enable JBossWS message tracing
+ <category name="org.jboss.ws.core.MessageTrace">
+ <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>
+ <!--
+ Set the root logger priority via a system property. Note this is parsed by log4j,
+ so the full JBoss system property format is not supported; e.g.
+ setting a default via ${jboss.server.log.threshold:WARN} will not work.
+ -->
+ <priority value="${jboss.server.log.threshold}"/>
+ <!-- appender-ref ref="CONSOLE"/ -->
+ <appender-ref ref="ASYNC"/>
+ </root>
+
+</log4j:configuration>
Added: branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/localhost.keystore
===================================================================
(Binary files differ)
Property changes on: branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/localhost.keystore
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/login-config.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/login-config.xml (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/login-config.xml 2010-09-30 12:22:37 UTC (rev 108386)
@@ -0,0 +1,171 @@
+<?xml version='1.0'?>
+
+<!-- The XML based JAAS login configuration read by the
+org.jboss.security.auth.login.XMLLoginConfig mbean. Add
+an application-policy element for each security domain.
+
+The outline of the application-policy is:
+<application-policy name="security-domain-name">
+ <authentication>
+ <login-module code="login.module1.class.name" flag="control_flag">
+ <module-option name = "option1-name">option1-value</module-option>
+ <module-option name = "option2-name">option2-value</module-option>
+ ...
+ </login-module>
+
+ <login-module code="login.module2.class.name" flag="control_flag">
+ ...
+ </login-module>
+ ...
+ </authentication>
+</application-policy>
+
+$Id: login-config.xml 87078 2009-04-09 14:23:47Z bstansberry at jboss.com $
+$Revision: 87078 $
+-->
+
+<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 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 = "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 = "jbosstest-sso">
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag = "required">
+ <module-option name="usersProperties">sso-users.properties</module-option>
+ <module-option name="rolesProperties">sso-roles.properties</module-option>
+ <module-option name="roleGroupSeperator">.</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <application-policy name = "jbosstest-web">
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag = "required">
+ <module-option name="usersProperties">sso-users.properties</module-option>
+ <module-option name="rolesProperties">sso-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_5_1/testsuite/src/resources/test-configs/cc/conf/ssl-roles.properties
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/ssl-roles.properties (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/ssl-roles.properties 2010-09-30 12:22:37 UTC (rev 108386)
@@ -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_5_1/testsuite/src/resources/test-configs/cc/conf/ssl-users.properties
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/ssl-users.properties (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/ssl-users.properties 2010-09-30 12:22:37 UTC (rev 108386)
@@ -0,0 +1 @@
+# An empty users file
Added: branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/sso-roles.properties
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/sso-roles.properties (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/sso-roles.properties 2010-09-30 12:22:37 UTC (rev 108386)
@@ -0,0 +1,2 @@
+# The roles for the sso users
+jduke=AuthorizedUser
Added: branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/sso-users.properties
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/sso-users.properties (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/conf/sso-users.properties 2010-09-30 12:22:37 UTC (rev 108386)
@@ -0,0 +1,2 @@
+# The users for the sso tests
+jduke=theduke
Modified: branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/deploy/jbossweb.sar/server.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/deploy/jbossweb.sar/server.xml 2010-09-30 12:00:45 UTC (rev 108385)
+++ branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/deploy/jbossweb.sar/server.xml 2010-09-30 12:22:37 UTC (rev 108386)
@@ -8,27 +8,71 @@
<Service name="jboss.web">
+
<!-- A HTTP/1.1 Connector on port 8080 -->
<Connector protocol="HTTP/1.1" port="8080" address="${jboss.bind.address}"
connectionTimeout="20000" redirectPort="8443" />
+ <Connector port="8081" address="${jboss.bind.address}"
+ maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
+ enableLookups="false" redirectPort="8443" acceptCount="100"
+ connectionTimeout="20000" disableUploadTimeout="true"/>
+
<!-- Add this option to the connector to avoid problems with
.NET clients that don't implement HTTP/1.1 correctly
restrictedUserAgents="^.*MS Web Services Client Protocol 1.1.4322.*$"
-->
- <!-- A AJP 1.3 Connector on port 8009 -->
+ <!-- A AJP 1.3 Connector on port 8009
<Connector protocol="AJP/1.3" port="8009" address="${jboss.bind.address}"
redirectPort="8443" />
-
+ -->
+
<!-- SSL/TLS Connector configuration using the admin devl guide keystore -->
<Connector protocol="HTTP/1.1" SSLEnabled="true"
- port="8443" address="${jboss.bind.address}"
+ port="8445" address="${jboss.bind.address}"
scheme="https" secure="true" clientAuth="false"
keystoreFile="${jboss.server.home.dir}/ssl.keystore"
keystorePass="secsec" sslProtocol = "TLS" />
+
+ <!-- SSL/TLS Connector configuration tomcat-ssl tests -->
+ <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="9081" 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"
+ sslProtocol = "TLS"
+ SSLEnabled="true"
+ 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
@@ -101,9 +145,9 @@
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.
Added: branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/deploy/keystore.password
===================================================================
(Binary files differ)
Property changes on: branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/deploy/keystore.password
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/deploy/security-service.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/deploy/security-service.xml (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/deploy/security-service.xml 2010-09-30 12:22:37 UTC (rev 108386)
@@ -0,0 +1,23 @@
+<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="TrustStoreURL">resource:localhost.keystore</attribute>
+ <attribute name="TrustStorePass">{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>
Modified: branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/deploy/servlet-invoker-service.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/deploy/servlet-invoker-service.xml 2010-09-30 12:00:45 UTC (rev 108385)
+++ branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/deploy/servlet-invoker-service.xml 2010-09-30 12:22:37 UTC (rev 108386)
@@ -17,7 +17,7 @@
<mbean code="org.jboss.remoting.transport.Connector" name="jboss.remoting:service=connector,transport=sslservlet"
display-name="Servlet transport Connector">
- <attribute name="InvokerLocator">sslservlet://${jboss.bind.address}:8443/servlet-invoker/SSLServerInvokerServlet</attribute>
+ <attribute name="InvokerLocator">sslservlet://${jboss.bind.address}:8445/servlet-invoker/SSLServerInvokerServlet</attribute>
<attribute name="Configuration">
<handlers>
<handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler>
Modified: branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/deploy/servlet-invoker.war/WEB-INF/web.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/deploy/servlet-invoker.war/WEB-INF/web.xml 2010-09-30 12:00:45 UTC (rev 108385)
+++ branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/deploy/servlet-invoker.war/WEB-INF/web.xml 2010-09-30 12:22:37 UTC (rev 108386)
@@ -36,7 +36,7 @@
<init-param>
<param-name>locatorUrl</param-name>
- <param-value>sslservlet://${jboss.bind.address}:8443/servlet-invoker/SSLServerInvokerServlet</param-value>
+ <param-value>sslservlet://${jboss.bind.address}:8445/servlet-invoker/SSLServerInvokerServlet</param-value>
<description>The servlet server invoker</description>
</init-param>
Modified: branches/JBPAPP_5_1/testsuite/src/resources/test-configs/cc/ssl.truststore
===================================================================
(Binary files differ)
More information about the jboss-cvs-commits
mailing list