From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 16 Sep 2016 11:16:41 +0000 (+0000)
Subject: Fix keyring configuration
X-Git-Tag: argeo-commons-2.1.46~13
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=f4e3b0d432b7666445ad0bbb5429d6a368a212f2;p=lgpl%2Fargeo-commons.git

Fix keyring configuration

git-svn-id: https://svn.argeo.org/commons/trunk@9179 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/org.argeo.cms.ui.workbench/META-INF/spring/common.xml b/org.argeo.cms.ui.workbench/META-INF/spring/common.xml
index f3b7ecb01..c89ca70b8 100644
--- a/org.argeo.cms.ui.workbench/META-INF/spring/common.xml
+++ b/org.argeo.cms.ui.workbench/META-INF/spring/common.xml
@@ -20,7 +20,7 @@
 		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
 		<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
 		<property name="locations">
-			<value>osgibundle:security-admin.properties</value>
+			<value>osgibundle:keyring.properties</value>
 		</property>
 	</bean>
 
diff --git a/org.argeo.cms.ui.workbench/META-INF/spring/keyring.xml b/org.argeo.cms.ui.workbench/META-INF/spring/keyring.xml
index 59c7c544b..0929524d8 100644
--- a/org.argeo.cms.ui.workbench/META-INF/spring/keyring.xml
+++ b/org.argeo.cms.ui.workbench/META-INF/spring/keyring.xml
@@ -4,15 +4,6 @@
 	xmlns:p="http://www.springframework.org/schema/p"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
         http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd">
-
-	<bean
-		class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-		<property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
-		<property name="locations">
-			<value>osgibundle:securityui.properties</value>
-		</property>
-	</bean>
-
 	<bean id="nodeSession" class="org.argeo.jcr.spring.ThreadBoundSession"
 		destroy-method="dispose">
 		<property name="repository" ref="nodeRepository" />
diff --git a/org.argeo.cms.ui.workbench/keyring.properties b/org.argeo.cms.ui.workbench/keyring.properties
new file mode 100644
index 000000000..0228d47ee
--- /dev/null
+++ b/org.argeo.cms.ui.workbench/keyring.properties
@@ -0,0 +1 @@
+argeo.keyring.secreteKeyLength=256
\ No newline at end of file
diff --git a/org.argeo.cms.ui.workbench/security-admin.properties b/org.argeo.cms.ui.workbench/security-admin.properties
deleted file mode 100644
index e69de29bb..000000000
diff --git a/org.argeo.cms.ui.workbench/securityui.properties b/org.argeo.cms.ui.workbench/securityui.properties
deleted file mode 100644
index 0228d47ee..000000000
--- a/org.argeo.cms.ui.workbench/securityui.properties
+++ /dev/null
@@ -1 +0,0 @@
-argeo.keyring.secreteKeyLength=256
\ No newline at end of file