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 f3b7ecb01c1d94ef62be53ab317dcde9797a633a..c89ca70b855602bfb3bdbf036be3170aac109a9f 100644 (file)
--- 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">\r
                <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />\r
                <property name="locations">\r
-                       <value>osgibundle:security-admin.properties</value>\r
+                       <value>osgibundle:keyring.properties</value>\r
                </property>\r
        </bean>\r
 \r

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 59c7c544ba472e004d9a34a547d2064c337f3e9b..0929524d84fa980798f1c497a584152faafdd59d 100644 (file)
--- 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 (file)
index 0000000..0228d47
--- /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 (file)
index e69de29..0000000

diff --git a/org.argeo.cms.ui.workbench/securityui.properties b/org.argeo.cms.ui.workbench/securityui.properties
deleted file mode 100644 (file)
index 0228d47..0000000
--- a/org.argeo.cms.ui.workbench/securityui.properties
+++ /dev/null
@@ -1 +0,0 @@
-argeo.keyring.secreteKeyLength=256
\ No newline at end of file