95414474c13e9aa5c1c2e96508b2a870b5fc06ab - geronimo

commit	95414474c13e9aa5c1c2e96508b2a870b5fc06ab	[log] [tgz]
author	Ming Xia <xiaming@apache.org>	Wed May 16 13:22:05 2012 +0000
committer	Ming Xia <xiaming@apache.org>	Wed May 16 13:22:05 2012 +0000
tree	fbf255b3c5df9cfc1186ac5babe1199676f232a3
parent	cacca28c4af34b52b5f3bf265f0785fe75f536a5 [diff]

Merge 1333350,1333352,1334031,1334300,GERONIMO-6345,GERONIMO-6348 into trunk

git-svn-id: https://svn.apache.org/repos/asf/geronimo/server/trunk@1339155 13f79535-47bb-0310-9956-ffa450edef68

framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/ConfiguredEncryption.java[Added - diff]
framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/EncryptionManager.java[diff]
framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/util/ConfiguredEncryption.java[diff]
plugins/bval/bval-deployer/pom.xml[diff]
plugins/bval/geronimo-bval/pom.xml[diff]
plugins/bval/pom.xml[diff]
plugins/connector-1_6/geronimo-connector-builder-1_6/pom.xml[diff]
plugins/console/console-filter/src/main/java/org/apache/geronimo/console/filter/XSRFHandler.java[diff]
plugins/console/console-filter/src/main/java/org/apache/geronimo/console/filter/XSSXSRFFilter.java[diff]
plugins/console/console-portal-driver/src/main/webapp/WEB-INF/web.xml[diff]
plugins/openjpa2/geronimo-persistence-jpa20/pom.xml[diff]
plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatEngine.java[diff]
plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/SecurityValve.java[diff]
pom.xml[diff]

14 files changed

tree: fbf255b3c5df9cfc1186ac5babe1199676f232a3

assemblies/
framework/
plugingroups/
plugins/
src/
testsuite/
testsupport/
.gitignore
BUILDING.txt
LICENSE
NOTICE
pom.xml
README.txt
RELEASE_NOTES-3.0-SNAPSHOT.txt