You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xi...@apache.org on 2012/05/16 15:22:08 UTC
svn commit: r1339155 - in /geronimo/server/trunk: ./ framework/
framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/
framework/configs/karaf-framework/src/main/distribution/windows-text/bin/
framework/configs/karaf-framework/src/main...
Author: xiaming
Date: Wed May 16 13:22:05 2012
New Revision: 1339155
URL: http://svn.apache.org/viewvc?rev=1339155&view=rev
Log:
Merge 1333350,1333352,1334031,1334300,GERONIMO-6345,GERONIMO-6348 into trunk
Added:
geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/ConfiguredEncryption.java
- copied unchanged from r1334031, geronimo/server/branches/3.0-beta/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/ConfiguredEncryption.java
Modified:
geronimo/server/trunk/ (props changed)
geronimo/server/trunk/framework/ (props changed)
geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/client (props changed)
geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo (props changed)
geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/shutdown (props changed)
geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/client.bat (props changed)
geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat (props changed)
geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/shutdown.bat (props changed)
geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties (props changed)
geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/EncryptionManager.java
geronimo/server/trunk/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/ (props changed)
geronimo/server/trunk/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/ModuleConfigurer.java (props changed)
geronimo/server/trunk/framework/modules/geronimo-deploy-tool/ (props changed)
geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml (props changed)
geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/ (props changed)
geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.java (props changed)
geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java (props changed)
geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockRespository.java (props changed)
geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/SystemLog.java (props changed)
geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/impl/Log4jService.java (props changed)
geronimo/server/trunk/framework/modules/geronimo-rmi-loader/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java (props changed)
geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/ (props changed)
geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanRootSupport.java (props changed)
geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanSupport.java (props changed)
geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DeploymentConfigurationSupport.java (props changed)
geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/XmlBeanSupport.java (props changed)
geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/ (props changed)
geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/util/ConfiguredEncryption.java
geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/resources/ (props changed)
geronimo/server/trunk/plugins/ (props changed)
geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java (props changed)
geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/ (props changed)
geronimo/server/trunk/plugins/bval/bval-deployer/pom.xml
geronimo/server/trunk/plugins/bval/geronimo-bval/pom.xml
geronimo/server/trunk/plugins/bval/pom.xml
geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/ (props changed)
geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilder.java (props changed)
geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/ConfigurationNameBuilder.java (props changed)
geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilderTest.java (props changed)
geronimo/server/trunk/plugins/connector-1_6/ (props changed)
geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/ (props changed)
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/ (props changed)
geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/pom.xml
geronimo/server/trunk/plugins/console/console-filter/src/main/java/org/apache/geronimo/console/filter/XSRFHandler.java
geronimo/server/trunk/plugins/console/console-filter/src/main/java/org/apache/geronimo/console/filter/XSSXSRFFilter.java
geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/web.xml
geronimo/server/trunk/plugins/openejb/ (props changed)
geronimo/server/trunk/plugins/openjpa2/geronimo-aries-jpa/src/main/java/org/apache/geronimo/aries/jpa/PersistenceBundleHelper.java (props changed)
geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/ (props changed)
geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/pom.xml
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java (props changed)
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatEngine.java
geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/SecurityValve.java
geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java (props changed)
geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerConstants.java (props changed)
geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerEventDispatcher.java (props changed)
geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java (props changed)
geronimo/server/trunk/pom.xml
geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/src/main/filtered-resources/ (props changed)
geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/src/main/filtered-resources/ (props changed)
geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/filtered-resources/ (props changed)
geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/src/main/filtered-resources/ (props changed)
Propchange: geronimo/server/trunk/
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta:r1334031,1336818
Propchange: geronimo/server/trunk/framework/
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/framework:r1334031,1336818
Propchange: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/client
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/client:r1334031,1336818
Propchange: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/geronimo:r1334031,1336818
Propchange: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/shutdown
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/framework/configs/karaf-framework/src/main/distribution/unix-shell/bin/shutdown:r1334031,1336818
Propchange: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/client.bat
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/client.bat:r1334031,1336818
Propchange: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/geronimo.bat:r1334031,1336818
Propchange: geronimo/server/trunk/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/shutdown.bat
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/framework/configs/karaf-framework/src/main/distribution/windows-text/bin/shutdown.bat:r1334031,1336818
Propchange: geronimo/server/trunk/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/framework/configs/karaf-framework/src/main/filtered-resources/etc/config.properties:r1334031,1336818
Modified: geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/EncryptionManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/EncryptionManager.java?rev=1339155&r1=1339154&r2=1339155&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/EncryptionManager.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-crypto/src/main/java/org/apache/geronimo/crypto/EncryptionManager.java Wed May 16 13:22:05 2012
@@ -16,9 +16,13 @@
*/
package org.apache.geronimo.crypto;
+import java.util.Collections;
+import java.util.HashMap;
import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
import java.io.Serializable;
+import org.apache.geronimo.crypto.ConfiguredEncryption;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
/**
* A static class that uses registered Encryption instances to encypt and decrypt objects, typically strings.
@@ -40,16 +44,29 @@ import java.io.Serializable;
*/
public class EncryptionManager {
- private static final Map<String, Encryption> ENCRYPTORS = new ConcurrentHashMap<String, Encryption>();
+ private static final Map<String, Encryption> ENCRYPTORS = Collections.synchronizedMap(new HashMap<String, Encryption>());
private final static String SIMPLE_ENCRYPTION_PREFIX = "{Simple}";
+ private final static String CONFIGURED_ENCRYPTION_PREFIX = "{Configured}";
+ private final static Log log = LogFactory.getLog(EncryptionManager.class);
+ private static String activeEncryptionPrefix = SIMPLE_ENCRYPTION_PREFIX;
+ private static ConfiguredEncryption ce;
static {
ENCRYPTORS.put(SIMPLE_ENCRYPTION_PREFIX, SimpleEncryption.INSTANCE);
//login properties files used to have this
ENCRYPTORS.put("{Standard}", SimpleEncryption.INSTANCE);
- }
+ String keyFile = System.getProperty("org.apache.geronimo.security.encryption.keyfile");
+
+ if (keyFile != null && keyFile.length() != 0) {
+ try {
+ ce = new ConfiguredEncryption(keyFile);
+ } catch (Exception e) {
+ log.error("Can not handle "+keyFile, e);
+ }
+ setEncryptionPrefix(CONFIGURED_ENCRYPTION_PREFIX, ce);
+ }
- private static String activeEncryptionPrefix = SIMPLE_ENCRYPTION_PREFIX;
+ }
/**
* Encryption instances should call this to register themselves.
Propchange: geronimo/server/trunk/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi:r1334031,1336818
Propchange: geronimo/server/trunk/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/ModuleConfigurer.java
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/framework/modules/geronimo-deploy-config/src/main/java/org/apache/geronimo/deployment/spi/ModuleConfigurer.java:r1334031,1336818
Propchange: geronimo/server/trunk/framework/modules/geronimo-deploy-tool/
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/framework/modules/geronimo-deploy-tool:r1334031,1336818
Propchange: geronimo/server/trunk/framework/modules/geronimo-kernel/pom.xml
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/framework/modules/geronimo-kernel/pom.xml:r1334031,1336818
Propchange: geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi:r1334031,1336818
Propchange: geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.java
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundle.java:r1334031,1336818
Propchange: geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockBundleContext.java:r1334031,1336818
Propchange: geronimo/server/trunk/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockRespository.java
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/framework/modules/geronimo-kernel/src/test/java/org/apache/geronimo/kernel/osgi/MockRespository.java:r1334031,1336818
Propchange: geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/SystemLog.java
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/SystemLog.java:r1334031,1336818
Propchange: geronimo/server/trunk/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/impl/Log4jService.java
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/framework/modules/geronimo-pax-logging/src/main/java/org/apache/geronimo/logging/impl/Log4jService.java:r1334031,1336818
Propchange: geronimo/server/trunk/framework/modules/geronimo-rmi-loader/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/framework/modules/geronimo-rmi-loader/src/main/java/org/apache/geronimo/kernel/rmi/RMIClassLoaderSpiImpl.java:r1334031,1336818
Propchange: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean:r1334031,1336818
Propchange: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanRootSupport.java
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanRootSupport.java:r1334031,1336818
Propchange: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanSupport.java
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DConfigBeanSupport.java:r1334031,1336818
Propchange: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DeploymentConfigurationSupport.java
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/DeploymentConfigurationSupport.java:r1334031,1336818
Propchange: geronimo/server/trunk/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/XmlBeanSupport.java
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/framework/modules/geronimo-service-builder/src/main/java/org/apache/geronimo/deployment/dconfigbean/XmlBeanSupport.java:r1334031,1336818
Propchange: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi/
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/osgi:r1334031,1336818
Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/util/ConfiguredEncryption.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/util/ConfiguredEncryption.java?rev=1339155&r1=1339154&r2=1339155&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/util/ConfiguredEncryption.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/util/ConfiguredEncryption.java Wed May 16 13:22:05 2012
@@ -21,12 +21,7 @@
package org.apache.geronimo.system.util;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
-import java.security.SecureRandom;
import javax.crypto.spec.SecretKeySpec;
@@ -34,8 +29,6 @@ import org.apache.geronimo.gbean.GBeanIn
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.gbean.GBeanLifecycle;
import org.apache.geronimo.system.serverinfo.ServerInfo;
-import org.apache.geronimo.crypto.AbstractEncryption;
-import org.apache.geronimo.crypto.EncryptionManager;
/**
* Like SimpleEncryption except it uses a stored secret key. If the key file is missing, it makes up a new one.
@@ -52,54 +45,16 @@ import org.apache.geronimo.crypto.Encryp
*
* @version $Rev$ $Date$
*/
-public class ConfiguredEncryption extends AbstractEncryption implements GBeanLifecycle {
+public class ConfiguredEncryption implements GBeanLifecycle {
- private final SecretKeySpec spec;
+ private org.apache.geronimo.crypto.ConfiguredEncryption ce;
public ConfiguredEncryption(String path, ServerInfo serverInfo) throws IOException, ClassNotFoundException {
File location = serverInfo.resolve(path);
- if (location.exists()) {
- FileInputStream in = new FileInputStream(location);
- try {
- ObjectInputStream oin = new ObjectInputStream(in);
- try {
- spec = (SecretKeySpec) oin.readObject();
- } finally {
- oin.close();
- }
- } finally {
- in.close();
- }
- } else {
- SecureRandom random = new SecureRandom();
- random.setSeed(System.currentTimeMillis());
- byte[] bytes = new byte[16];
- random.nextBytes(bytes);
- spec = new SecretKeySpec(bytes, "AES");
- File dir = location.getParentFile();
- if (!dir.exists()) {
- dir.mkdirs();
- }
- if (!dir.exists() || !dir.isDirectory()) {
- throw new IllegalStateException("Could not create directory for secret key spec: " + dir);
- }
- FileOutputStream out = new FileOutputStream(location);
- try {
- ObjectOutputStream oout = new ObjectOutputStream(out);
- try {
- oout.writeObject(spec);
- oout.flush();
- } finally {
- oout.close();
- }
- } finally {
- out.close();
- }
- }
+ ce = new org.apache.geronimo.crypto.ConfiguredEncryption(location.getAbsolutePath());
}
public void doStart() throws Exception {
- EncryptionManager.setEncryptionPrefix("{Configured}", this);
}
public void doStop() throws Exception {
@@ -107,10 +62,6 @@ public class ConfiguredEncryption extend
public void doFail() {
}
-
- protected SecretKeySpec getSecretKeySpec() {
- return spec;
- }
public static final GBeanInfo GBEAN_INFO;
Propchange: geronimo/server/trunk/framework/modules/geronimo-upgrade/src/test/resources/
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/framework/modules/geronimo-upgrade/src/test/resources:r1334031,1336818
Propchange: geronimo/server/trunk/plugins/
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/plugins:r1334031,1336818
Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/plugins/aries/geronimo-aries-builder/src/main/java/org/apache/geronimo/aries/builder/ApplicationConfigBuilder.java:r1334031,1336818
Propchange: geronimo/server/trunk/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries/
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/plugins/aries/geronimo-aries/src/main/java/org/apache/geronimo/aries:r1334031,1336818
Modified: geronimo/server/trunk/plugins/bval/bval-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/bval/bval-deployer/pom.xml?rev=1339155&r1=1339154&r2=1339155&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/bval/bval-deployer/pom.xml (original)
+++ geronimo/server/trunk/plugins/bval/bval-deployer/pom.xml Wed May 16 13:22:05 2012
@@ -97,6 +97,11 @@
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>bval-jsr303</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
</dependencies>
<build>
Modified: geronimo/server/trunk/plugins/bval/geronimo-bval/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/bval/geronimo-bval/pom.xml?rev=1339155&r1=1339154&r2=1339155&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/bval/geronimo-bval/pom.xml (original)
+++ geronimo/server/trunk/plugins/bval/geronimo-bval/pom.xml Wed May 16 13:22:05 2012
@@ -66,7 +66,10 @@
<artifactId>bval-jsr303</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: geronimo/server/trunk/plugins/bval/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/bval/pom.xml?rev=1339155&r1=1339154&r2=1339155&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/bval/pom.xml (original)
+++ geronimo/server/trunk/plugins/bval/pom.xml Wed May 16 13:22:05 2012
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.apache.geronimo.bundles</groupId>
<artifactId>bval-jsr303</artifactId>
- <version>0.3_1-incubating</version>
+ <version>0.4_1</version>
<exclusions>
<exclusion>
<groupId>org.apache.bval</groupId>
Propchange: geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/plugins/clustering/geronimo-deploy-farm:r1334031,1336818
Propchange: geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilder.java
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilder.java:r1334031,1336818
Propchange: geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/ConfigurationNameBuilder.java
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/plugins/clustering/geronimo-deploy-farm/src/main/java/org/apache/geronimo/farm/deployment/ConfigurationNameBuilder.java:r1334031,1336818
Propchange: geronimo/server/trunk/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilderTest.java
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/plugins/clustering/geronimo-deploy-farm/src/test/java/org/apache/geronimo/farm/deployment/BasicConfigurationNameBuilderTest.java:r1334031,1336818
Propchange: geronimo/server/trunk/plugins/connector-1_6/
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/plugins/connector-1_6:r1334031,1336818
Propchange: geronimo/server/trunk/plugins/connector-1_6/connector-deployer-1_6/
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/plugins/connector-1_6/connector-deployer-1_6:r1334031,1336818
Propchange: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/plugins/connector-1_6/geronimo-connector-builder-1_6:r1334031,1336818
Modified: geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/pom.xml?rev=1339155&r1=1339154&r2=1339155&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/pom.xml (original)
+++ geronimo/server/trunk/plugins/connector-1_6/geronimo-connector-builder-1_6/pom.xml Wed May 16 13:22:05 2012
@@ -152,6 +152,12 @@
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
Modified: geronimo/server/trunk/plugins/console/console-filter/src/main/java/org/apache/geronimo/console/filter/XSRFHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-filter/src/main/java/org/apache/geronimo/console/filter/XSRFHandler.java?rev=1339155&r1=1339154&r2=1339155&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-filter/src/main/java/org/apache/geronimo/console/filter/XSRFHandler.java (original)
+++ geronimo/server/trunk/plugins/console/console-filter/src/main/java/org/apache/geronimo/console/filter/XSRFHandler.java Wed May 16 13:22:05 2012
@@ -21,8 +21,11 @@ import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.HashSet;
import java.util.Map;
import java.util.Random;
+import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import javax.servlet.http.HttpServletRequest;
@@ -51,6 +54,7 @@ public class XSRFHandler
private static final String NOXSS_HASH_OF_PAGE_TO_REDIRECT = "noxssPage";
private Map<String, String> sessionMap = new ConcurrentHashMap<String, String>();
+ private Set<String> ignoredPaths = new HashSet<String>();
private String xsrfJS;
private Random random = new Random();
@@ -63,6 +67,18 @@ public class XSRFHandler
log.debug("loaded xsrf file");
}
+ /**
+ * A comma separated list of resource paths that will be ignored during XSRF check.
+ *
+ * @param resourceList
+ */
+ public void setIgnorePaths(String pathList) {
+ String values[] = pathList.split(",");
+ for (String value : values) {
+ ignoredPaths.add(value.trim());
+ }
+ }
+
//----- Session handler routines -----
/**
@@ -85,21 +101,21 @@ public class XSRFHandler
return false;
}
+ if (isIgnoredPath(hreq)) {
+ log.debug("Skipped XSRF checking for requestURI=" + hreq.getRequestURI());
+ return false;
+ }
+
if ((hreq.getQueryString() != null && hreq.getQueryString().length() > 0)
|| (hreq.getParameterNames().hasMoreElements())) {
-
if (hreq.getParameterMap().keySet().size() == 1 && hreq.getParameter(NOXSS_SHOW_TREE) != null) {
-
return false;
-
}
if (hreq.getParameterMap().keySet().size() == 2 && hreq.getParameter(NOXSS_SHOW_TREE) != null
&& hreq.getParameter(NOXSS_HASH_OF_PAGE_TO_REDIRECT)!=null) {
-
return false;
-
}
String sesId = (String)hses.getAttribute(XSRF_UNIQUEID);
@@ -204,6 +220,17 @@ public class XSRFHandler
sessionMap.remove(sesId);
}
}
+
+ private boolean isIgnoredPath(HttpServletRequest hreq) {
+ if (!ignoredPaths.isEmpty() && "GET".equals(hreq.getMethod())) {
+ String path = hreq.getServletPath();
+ if (hreq.getPathInfo() != null) {
+ path = path + hreq.getPathInfo();
+ }
+ return ignoredPaths.contains(path);
+ }
+ return false;
+ }
//----- Response handler routines -----
/**
@@ -234,31 +261,30 @@ public class XSRFHandler
* @return String containing the JavaScript content, else null
*/
private String getFile(String filename) {
- StringBuilder sb = new StringBuilder();
InputStream is = getClass().getResourceAsStream(filename);
if (is != null) {
+ StringBuilder sb = new StringBuilder();
+ InputStreamReader reader = null;
try {
+ reader = new InputStreamReader(is, "UTF-8");
+ char[] buffer = new char[1024];
int i = 0;
- while ((i = is.read()) > 0) {
- sb.append((char) i);
+ while ((i = reader.read(buffer)) > 0) {
+ sb.append(buffer, 0, i);
}
- }
- catch (IOException ioe) {
+ } catch (IOException ioe) {
log.error("Could not read resource=" + filename, ioe);
- }
- finally {
- try {
- is.close();
- }
- catch (IOException ioe) {
+ } finally {
+ if (reader != null) {
+ try { reader.close(); } catch (IOException ignored) {}
}
+ try { is.close(); } catch (IOException ignored) {}
}
- }
- else {
+ return sb.toString();
+ } else {
log.error("Could not load required resource=" + filename);
return null;
}
- return sb.toString();
}
}
Modified: geronimo/server/trunk/plugins/console/console-filter/src/main/java/org/apache/geronimo/console/filter/XSSXSRFFilter.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-filter/src/main/java/org/apache/geronimo/console/filter/XSSXSRFFilter.java?rev=1339155&r1=1339154&r2=1339155&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-filter/src/main/java/org/apache/geronimo/console/filter/XSSXSRFFilter.java (original)
+++ geronimo/server/trunk/plugins/console/console-filter/src/main/java/org/apache/geronimo/console/filter/XSSXSRFFilter.java Wed May 16 13:22:05 2012
@@ -59,13 +59,19 @@ public class XSSXSRFFilter implements Fi
public void init(FilterConfig config) throws ServletException {
log.debug("init() called");
String parmEnableXSS = config.getInitParameter("enableXSS");
- String parmEnableXSRF = config.getInitParameter("enableXSRF");
- if ((parmEnableXSS != null) && (parmEnableXSS.equals("false"))) {
+ if ((parmEnableXSS != null) && (parmEnableXSS.equalsIgnoreCase("false"))) {
this.enableXSS = false;
}
- if ((parmEnableXSRF != null) && (parmEnableXSRF.equals("false"))) {
+
+ String parmEnableXSRF = config.getInitParameter("enableXSRF");
+ if ((parmEnableXSRF != null) && (parmEnableXSRF.equalsIgnoreCase("false"))) {
this.enableXSRF = false;
}
+
+ String ignoreResources = config.getInitParameter("xsrf.ignorePaths");
+ if (ignoreResources != null) {
+ xsrf.setIgnorePaths(ignoreResources);
+ }
}
/* (non-Javadoc)
@@ -93,6 +99,7 @@ public class XSSXSRFFilter implements Fi
HttpServletRequest hreq = (HttpServletRequest)request;
hreq.setCharacterEncoding("UTF-8");
String errStr = null;
+
//--------------------------------------------------------------
// Check the URI and QueryString for simple XSS attacks
// Validate any FORM submission with our XSRF protection code
@@ -100,15 +107,15 @@ public class XSSXSRFFilter implements Fi
// check the URI/Params first, as they get logged during the XSRF checks
if (enableXSS && xss.isInvalidURI(hreq)) {
// Block simple XSS attacks in GET request URIs
- errStr = new String("XSSXSRFFilter blocked HttpServletRequest due to invalid URI content.");
+ errStr = "XSSXSRFFilter blocked HttpServletRequest due to invalid URI content.";
}
else if (enableXSS && xss.isInvalidParameters(hreq)) {
// Block simple XSS attacks in POST parameters
- errStr = new String("XSSXSRFFilter blocked HttpServletRequest due to invalid POST content.");
+ errStr = "XSSXSRFFilter blocked HttpServletRequest due to invalid POST content.";
}
else if (enableXSRF && xsrf.isInvalidSession(hreq)) {
// Block simple XSRF attacks on our forms
- errStr = new String("XSSXSRFFilter blocked HttpServletRequest due to invalid FORM content.");
+ errStr = "XSSXSRFFilter blocked HttpServletRequest due to invalid FORM content.";
}
// if we found a problem, return a HTTP 400 error code and message
if (errStr != null) {
Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/web.xml?rev=1339155&r1=1339154&r2=1339155&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/web.xml Wed May 16 13:22:05 2012
@@ -35,6 +35,10 @@ limitations under the License.
<filter>
<filter-name>XSSXSRFFilter</filter-name>
<filter-class>org.apache.geronimo.console.filter.XSSXSRFFilter</filter-class>
+ <init-param>
+ <param-name>xsrf.ignorePaths</param-name>
+ <param-value>/dojo/dojo/resources/blank.html</param-value>
+ </init-param>
</filter>
<filter-mapping>
<filter-name>XSSXSRFFilter</filter-name>
Propchange: geronimo/server/trunk/plugins/openejb/
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/plugins/openejb:r1334031,1336818
Propchange: geronimo/server/trunk/plugins/openjpa2/geronimo-aries-jpa/src/main/java/org/apache/geronimo/aries/jpa/PersistenceBundleHelper.java
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/plugins/openjpa2/geronimo-aries-jpa/src/main/java/org/apache/geronimo/aries/jpa/PersistenceBundleHelper.java:r1334031,1336818
Propchange: geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20-builder/
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/plugins/openjpa2/geronimo-persistence-jpa20-builder:r1334031,1336818
Modified: geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/pom.xml?rev=1339155&r1=1339154&r2=1339155&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/pom.xml (original)
+++ geronimo/server/trunk/plugins/openjpa2/geronimo-persistence-jpa20/pom.xml Wed May 16 13:22:05 2012
@@ -86,6 +86,12 @@
<artifactId>commons-lang</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
Propchange: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/BundleDirContext.java:r1334031,1336818
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatEngine.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatEngine.java?rev=1339155&r1=1339154&r2=1339155&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatEngine.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatEngine.java Wed May 16 13:22:05 2012
@@ -28,14 +28,6 @@ public class TomcatEngine extends Standa
private static final long serialVersionUID = 3834312825844611385L;
public Realm getRealm() {
- if (realm != null)
- return realm;
-
- if (parent != null){
- Realm configured = parent.getRealm();
- if (configured != null)
- return configured;
- }
- return null;
+ return super.getRealm();
}
}
Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/SecurityValve.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/SecurityValve.java?rev=1339155&r1=1339154&r2=1339155&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/SecurityValve.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/security/SecurityValve.java Wed May 16 13:22:05 2012
@@ -125,6 +125,12 @@ public class SecurityValve extends Valve
return session == null? null: (UserIdentity)session.getNote(CACHED_IDENTITY_KEY);
}
+
+ @Override
+ public boolean authenticate(Request request, HttpServletResponse response)
+ throws IOException {
+ return authenticate(request, response, null);
+ }
@Override
public boolean authenticate(Request request, HttpServletResponse response, LoginConfig config) throws IOException {
Propchange: geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebApplication.java:r1334031,1336818
Propchange: geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerConstants.java
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerConstants.java:r1334031,1336818
Propchange: geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerEventDispatcher.java
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerEventDispatcher.java:r1334031,1336818
Propchange: geronimo/server/trunk/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/plugins/wab/geronimo-web-extender/src/main/java/org/apache/geronimo/osgi/web/extender/WebContainerExtender.java:r1334031,1336818
Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=1339155&r1=1339154&r2=1339155&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Wed May 16 13:22:05 2012
@@ -66,18 +66,18 @@
FIXME: STOP using properties for dependency versions unless you absolutly need them,
ie. you have a hundred dependencies that all use the same version.
-->
- <tomcatVersion>7.0.23.1</tomcatVersion>
+ <tomcatVersion>7.0.27.1</tomcatVersion>
<tomcatGroupId>org.apache.geronimo.ext.tomcat</tomcatGroupId>
<openejbVersion>4.0.0-beta-1</openejbVersion>
<openjpaVersion>2.1.1</openjpaVersion>
<openwebbeansVersion>1.1.1</openwebbeansVersion>
- <derbyVersion>10.6.1.0_1</derbyVersion>
+ <derbyVersion>10.8.2.2_1</derbyVersion>
<cxfVersion>2.1.10</cxfVersion>
<axis2Version>1.6.1_1</axis2Version>
<axiomVersion>1.2.12_1</axiomVersion>
<springVersion>2.5.6-SEC02</springVersion>
- <xbeanVersion>3.9</xbeanVersion>
+ <xbeanVersion>3.11</xbeanVersion>
<jetty>jetty8</jetty>
<jetty.version>8.0.0.M2</jetty.version>
<txmanagerVersion>3.1.1</txmanagerVersion>
@@ -371,7 +371,7 @@
<dependency>
<groupId>org.apache.geronimo.components</groupId>
<artifactId>geronimo-jaspi</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0.0</version>
<!--<exclusions>-->
<!--<exclusion>-->
<!--<groupId>org.apache.geronimo.bundles</groupId>-->
@@ -871,6 +871,13 @@
<version>2.6</version>
</dependency>
+ <!-- for bval 0.4 -->
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.1</version>
+ </dependency>
+
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
Propchange: geronimo/server/trunk/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/src/main/filtered-resources/
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/src/main/filtered-resources:r1334031,1336818
Propchange: geronimo/server/trunk/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/src/main/filtered-resources/
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/testsuite/corba-testsuite/corba-marshal/corba-marshal-client/src/main/filtered-resources:r1334031,1336818
Propchange: geronimo/server/trunk/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/filtered-resources/
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/testsuite/deployment-testsuite/jca-cms-tests/jca-cms-ear/src/main/filtered-resources:r1334031,1336818
Propchange: geronimo/server/trunk/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/src/main/filtered-resources/
------------------------------------------------------------------------------
Merged /geronimo/server/branches/3.0-beta/testsuite/deployment-testsuite/manifestcp-tests/manifestcp-ear/src/main/filtered-resources:r1334031,1336818