You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by gt...@apache.org on 2015/04/28 13:34:00 UTC
activemq git commit: https://issues.apache.org/jira/browse/AMQ-5744 -
fix up test refs to old spring jasypt
Repository: activemq
Updated Branches:
refs/heads/master c12905117 -> 81b8403f3
https://issues.apache.org/jira/browse/AMQ-5744 - fix up test refs to old spring jasypt
Project: http://git-wip-us.apache.org/repos/asf/activemq/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/81b8403f
Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/81b8403f
Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/81b8403f
Branch: refs/heads/master
Commit: 81b8403f334d28bc88a90dff7dc8b30ddd43667a
Parents: c129051
Author: gtully <ga...@gmail.com>
Authored: Tue Apr 28 12:33:29 2015 +0100
Committer: gtully <ga...@gmail.com>
Committed: Tue Apr 28 12:33:29 2015 +0100
----------------------------------------------------------------------
.../org/apache/activemq/security/simple-auth-broker-no-users.xml | 2 +-
.../org/apache/activemq/security/simple-auth-broker.xml | 4 ++--
.../org/apache/activemq/security/simple-auth-separator.xml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq/blob/81b8403f/activemq-unit-tests/src/test/resources/org/apache/activemq/security/simple-auth-broker-no-users.xml
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/resources/org/apache/activemq/security/simple-auth-broker-no-users.xml b/activemq-unit-tests/src/test/resources/org/apache/activemq/security/simple-auth-broker-no-users.xml
index b4485f0..a9c6286 100644
--- a/activemq-unit-tests/src/test/resources/org/apache/activemq/security/simple-auth-broker-no-users.xml
+++ b/activemq-unit-tests/src/test/resources/org/apache/activemq/security/simple-auth-broker-no-users.xml
@@ -30,7 +30,7 @@
<property name="password" value="activemq"/>
</bean>
- <bean id="propertyConfigurer" class="org.jasypt.spring.properties.EncryptablePropertyPlaceholderConfigurer">
+ <bean id="propertyConfigurer" class="org.jasypt.spring31.properties.EncryptablePropertyPlaceholderConfigurer">
<constructor-arg ref="configurationEncryptor" />
<property name="location" value="classpath:credentials.properties"/>
</bean>
http://git-wip-us.apache.org/repos/asf/activemq/blob/81b8403f/activemq-unit-tests/src/test/resources/org/apache/activemq/security/simple-auth-broker.xml
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/resources/org/apache/activemq/security/simple-auth-broker.xml b/activemq-unit-tests/src/test/resources/org/apache/activemq/security/simple-auth-broker.xml
index cb42730..c53e3f4 100644
--- a/activemq-unit-tests/src/test/resources/org/apache/activemq/security/simple-auth-broker.xml
+++ b/activemq-unit-tests/src/test/resources/org/apache/activemq/security/simple-auth-broker.xml
@@ -25,12 +25,12 @@
xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd">
- <bean id="configurationEncryptor" class="org.jasypt.encryption.pbe.StandardPBEStringEncryptor">
+ <bean id="configurationEncryptor" class="org.jasypt.encryption.pbe.StandardPBEStringEncryptor">
<property name="algorithm" value="PBEWithMD5AndDES"/>
<property name="password" value="activemq"/>
</bean>
- <bean id="propertyConfigurer" class="org.jasypt.spring.properties.EncryptablePropertyPlaceholderConfigurer">
+ <bean id="propertyConfigurer" class="org.jasypt.spring31.properties.EncryptablePropertyPlaceholderConfigurer">
<constructor-arg ref="configurationEncryptor" />
<property name="location" value="classpath:credentials.properties"/>
</bean>
http://git-wip-us.apache.org/repos/asf/activemq/blob/81b8403f/activemq-unit-tests/src/test/resources/org/apache/activemq/security/simple-auth-separator.xml
----------------------------------------------------------------------
diff --git a/activemq-unit-tests/src/test/resources/org/apache/activemq/security/simple-auth-separator.xml b/activemq-unit-tests/src/test/resources/org/apache/activemq/security/simple-auth-separator.xml
index 65ed691..d7bee31 100644
--- a/activemq-unit-tests/src/test/resources/org/apache/activemq/security/simple-auth-separator.xml
+++ b/activemq-unit-tests/src/test/resources/org/apache/activemq/security/simple-auth-separator.xml
@@ -30,7 +30,7 @@
<property name="password" value="activemq"/>
</bean>
- <bean id="propertyConfigurer" class="org.jasypt.spring.properties.EncryptablePropertyPlaceholderConfigurer">
+ <bean id="propertyConfigurer" class="org.jasypt.spring31.properties.EncryptablePropertyPlaceholderConfigurer">
<constructor-arg ref="configurationEncryptor" />
<property name="location" value="classpath:credentials.properties"/>
</bean>