From 32d17447a258188b2d534bcb0bf65a659ba7b7d0 Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 29 Aug 2008 12:11:34 +0000
Subject: Initial import.

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@1 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../src/main/webapp/WEB-INF/applicationContext.xml | 69 ++++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 BKULocal/src/main/webapp/WEB-INF/applicationContext.xml

(limited to 'BKULocal/src/main/webapp/WEB-INF/applicationContext.xml')

diff --git a/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml b/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
new file mode 100644
index 00000000..c0ffc927
--- /dev/null
+++ b/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Copyright 2008 Federal Chancellery Austria and
+  Graz University of Technology
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx"
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
+  <bean id="STALFactory" class="at.gv.egiz.bku.local.stal.SMCCSTALFactory"
+    scope="singleton" />
+  <bean id="commandInvoker" class="at.gv.egiz.bku.binding.SLCommandInvokerImpl" />
+  <bean id="bindingProcessorManager" class="at.gv.egiz.bku.binding.BindingProcessorManagerImpl"
+    scope="singleton">
+    <constructor-arg ref="STALFactory"></constructor-arg>
+    <constructor-arg ref="commandInvoker"></constructor-arg>
+  </bean>
+  <bean
+    class="org.springframework.web.context.support.ServletContextAttributeExporter">
+    <property name="attributes">
+      <map>
+        <entry key="bindingProcessorManager">
+          <ref bean="bindingProcessorManager" />
+        </entry>
+      </map>
+    </property>
+  </bean>
+  
+  <!-- Configure Configuration -->
+  <bean id="configurator" class="at.gv.egiz.bku.local.conf.Configurator"
+    scope="singleton">
+  </bean>
+  
+  <!-- Configure timer to check config update -->
+  <bean id="configUpdater"
+    class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
+    <property name="targetObject" ref="configurator" />
+    <property name="targetMethod" value="checkUpdate" />
+  </bean>
+  <bean id="configTrigger"
+    class="org.springframework.scheduling.quartz.SimpleTriggerBean">
+    <property name="jobDetail" ref="configUpdater"></property>
+    <property name="startDelay" value="10000"></property>
+    <property name="repeatInterval" value="30000"></property>
+  </bean>
+  <bean class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
+    <property name="triggers">
+      <list>
+        <ref bean="configTrigger" />
+      </list>
+    </property>
+    <property name="quartzProperties">
+      <props>
+        <prop key="org.quartz.threadPool.threadCount">1</prop>
+      </props>
+    </property>
+  </bean>
+</beans>
\ No newline at end of file
-- 
cgit v1.2.3


From c5e7fe66617ab4b0d54350f8248d281b76cc5055 Mon Sep 17 00:00:00 2001
From: wbauer <wbauer@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 18 Sep 2008 12:05:03 +0000
Subject: git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@49
 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4

---
 .../src/main/webapp/WEB-INF/applicationContext.xml | 42 ++++++++--------------
 1 file changed, 15 insertions(+), 27 deletions(-)

(limited to 'BKULocal/src/main/webapp/WEB-INF/applicationContext.xml')

diff --git a/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml b/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
index c0ffc927..c6a5088a 100644
--- a/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
@@ -20,7 +20,7 @@
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
   <bean id="STALFactory" class="at.gv.egiz.bku.local.stal.SMCCSTALFactory"
     scope="singleton" />
-  <bean id="commandInvoker" class="at.gv.egiz.bku.binding.SLCommandInvokerImpl" />
+  
   <bean id="bindingProcessorManager" class="at.gv.egiz.bku.binding.BindingProcessorManagerImpl"
     scope="singleton">
     <constructor-arg ref="STALFactory"></constructor-arg>
@@ -37,33 +37,21 @@
     </property>
   </bean>
   
-  <!-- Configure Configuration -->
-  <bean id="configurator" class="at.gv.egiz.bku.local.conf.Configurator"
-    scope="singleton">
+  <bean id="accessController" class="at.gv.egiz.bku.local.accesscontroller.SpringSecurityManager"
+    scope="singleton" init-method="init">
+    <property name="config" ref="configurator"/>
+    </bean>
+
+  <bean id="commandInvoker" class="at.gv.egiz.bku.binding.SLCommandInvokerImpl">
+    <property name="securityManager" ref="accessController" />
   </bean>
   
-  <!-- Configure timer to check config update -->
-  <bean id="configUpdater"
-    class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
-    <property name="targetObject" ref="configurator" />
-    <property name="targetMethod" value="checkUpdate" />
-  </bean>
-  <bean id="configTrigger"
-    class="org.springframework.scheduling.quartz.SimpleTriggerBean">
-    <property name="jobDetail" ref="configUpdater"></property>
-    <property name="startDelay" value="10000"></property>
-    <property name="repeatInterval" value="30000"></property>
-  </bean>
-  <bean class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
-    <property name="triggers">
-      <list>
-        <ref bean="configTrigger" />
-      </list>
-    </property>
-    <property name="quartzProperties">
-      <props>
-        <prop key="org.quartz.threadPool.threadCount">1</prop>
-      </props>
-    </property>
+  <!-- Configure Configuration -->
+  <bean id="configurator" factory-method="getInstance" class="at.gv.egiz.bku.local.conf.SpringConfigurator"
+     init-method="configure">
+    <!-- <property name="resource" value="classpath:at/gv/egiz/bku/local/conf/defaultConf.properties"/>  -->
+    <property name="resource" value="classpath:at/gv/egiz/bku/local/conf/defaultConf.properties"/>
   </bean>
+ 
+ 
 </beans>
\ No newline at end of file
-- 
cgit v1.2.3


From 7d3f6235a46f70323defa9910da240e61ca684b3 Mon Sep 17 00:00:00 2001
From: wbauer <wbauer@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Wed, 1 Oct 2008 07:30:55 +0000
Subject: Moved main parts of the configuration to bkucommon

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@78 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKULocal/src/main/webapp/WEB-INF/applicationContext.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'BKULocal/src/main/webapp/WEB-INF/applicationContext.xml')

diff --git a/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml b/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
index c6a5088a..a4003a2a 100644
--- a/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
@@ -21,6 +21,7 @@
   <bean id="STALFactory" class="at.gv.egiz.bku.local.stal.SMCCSTALFactory"
     scope="singleton" />
   
+   
   <bean id="bindingProcessorManager" class="at.gv.egiz.bku.binding.BindingProcessorManagerImpl"
     scope="singleton">
     <constructor-arg ref="STALFactory"></constructor-arg>
@@ -47,10 +48,11 @@
   </bean>
   
   <!-- Configure Configuration -->
-  <bean id="configurator" factory-method="getInstance" class="at.gv.egiz.bku.local.conf.SpringConfigurator"
+  
+  <bean id="configurator" class="at.gv.egiz.bku.local.conf.SpringConfigurator"
      init-method="configure">
     <!-- <property name="resource" value="classpath:at/gv/egiz/bku/local/conf/defaultConf.properties"/>  -->
-    <property name="resource" value="classpath:at/gv/egiz/bku/local/conf/defaultConf.properties"/>
+    <property name="resource" value="file:${user.home}/.mocca/conf/defaultConf.properties"/>
   </bean>
  
  
-- 
cgit v1.2.3


From 27d91275555207f9e152c2867d52fbbf83f92ba7 Mon Sep 17 00:00:00 2001
From: wbauer <wbauer@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Wed, 8 Oct 2008 08:39:17 +0000
Subject: changed ssl certificate validation, now using iaik_pki

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@83 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKULocal/src/main/webapp/WEB-INF/applicationContext.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'BKULocal/src/main/webapp/WEB-INF/applicationContext.xml')

diff --git a/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml b/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
index a4003a2a..a951f056 100644
--- a/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
@@ -48,11 +48,13 @@
   </bean>
   
   <!-- Configure Configuration -->
+  <bean id="certValidator" class="at.gv.egiz.bku.conf.CertValidatorImpl"></bean>
   
   <bean id="configurator" class="at.gv.egiz.bku.local.conf.SpringConfigurator"
      init-method="configure">
     <!-- <property name="resource" value="classpath:at/gv/egiz/bku/local/conf/defaultConf.properties"/>  -->
     <property name="resource" value="file:${user.home}/.mocca/conf/defaultConf.properties"/>
+    <property name="certValidator" ref="certValidator"></property>
   </bean>
  
  
-- 
cgit v1.2.3


From 9829de9c9b19dcca15676aaf9737195cc059a66c Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Mon, 3 Nov 2008 09:37:14 +0000
Subject: local HelpListener DesktopAPI

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@138 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../src/main/webapp/WEB-INF/applicationContext.xml | 36 ++++++++++++----------
 1 file changed, 19 insertions(+), 17 deletions(-)

(limited to 'BKULocal/src/main/webapp/WEB-INF/applicationContext.xml')

diff --git a/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml b/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
index a951f056..3191f82f 100644
--- a/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
@@ -1,25 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
-  Copyright 2008 Federal Chancellery Austria and
-  Graz University of Technology
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
--->
+<!--
+  Copyright 2008 Federal Chancellery Austria and
+  Graz University of Technology
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
 <beans xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
   <bean id="STALFactory" class="at.gv.egiz.bku.local.stal.SMCCSTALFactory"
-    scope="singleton" />
+    scope="singleton">
+    <property name="helpURL" value="http://localhost:3495/help"/>
+  </bean>
   
    
   <bean id="bindingProcessorManager" class="at.gv.egiz.bku.binding.BindingProcessorManagerImpl"
-- 
cgit v1.2.3


From f928669b7f791f9077fb04cc9a90d1e01ac31344 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 28 Nov 2008 10:33:13 +0000
Subject: LocalBKUWorker

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@223 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKULocal/src/main/webapp/WEB-INF/applicationContext.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'BKULocal/src/main/webapp/WEB-INF/applicationContext.xml')

diff --git a/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml b/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
index 3191f82f..1d09aa7e 100644
--- a/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
@@ -18,7 +18,7 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tx="http://www.springframework.org/schema/tx"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
-  <bean id="STALFactory" class="at.gv.egiz.bku.local.stal.SMCCSTALFactory"
+  <bean id="STALFactory" class="at.gv.egiz.bku.local.stal.LocalSTALFactory"
     scope="singleton">
     <property name="helpURL" value="http://localhost:3495/help"/>
   </bean>
-- 
cgit v1.2.3


From 3aadcf8f877a560bed75af7e0db918aa26ef2a03 Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 4 Dec 2008 10:00:31 +0000
Subject: Refactoring of infobox implementation.

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@232 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../src/main/webapp/WEB-INF/applicationContext.xml | 34 ++++++++++++++++++++++
 1 file changed, 34 insertions(+)

(limited to 'BKULocal/src/main/webapp/WEB-INF/applicationContext.xml')

diff --git a/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml b/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
index 1d09aa7e..5ac12ece 100644
--- a/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
@@ -48,6 +48,40 @@
   <bean id="commandInvoker" class="at.gv.egiz.bku.binding.SLCommandInvokerImpl">
     <property name="securityManager" ref="accessController" />
   </bean>
+
+  <bean id="slCommandFactory" class="at.gv.egiz.bku.slcommands.SLCommandFactory"
+    factory-method="getInstance">
+    <property name="commandImpl">
+      <map>
+        <entry
+          key="http://www.buergerkarte.at/namespaces/securitylayer/1.2#:NullOperationRequest"
+          value="at.gv.egiz.bku.slcommands.impl.NullOperationCommandImpl" />
+        <entry
+          key="http://www.buergerkarte.at/namespaces/securitylayer/1.2#:InfoboxReadRequest"
+          value="at.gv.egiz.bku.slcommands.impl.InfoboxReadCommandImpl" />
+        <entry
+          key="http://www.buergerkarte.at/namespaces/securitylayer/1.2#:CreateXMLSignatureRequest"
+          value="at.gv.egiz.bku.slcommands.impl.CreateXMLSignatureCommandImpl" />
+      </map>
+    </property>
+  </bean>
+
+  <bean id="infoboxFactory" class="at.gv.egiz.bku.slcommands.impl.InfoboxFactory"
+    factory-method="getInstance">
+    <property name="infoboxImpl">
+      <map>
+        <entry
+          key="Certificates"
+          value="at.gv.egiz.bku.slcommands.impl.CertificatesInfoboxImpl" />
+        <entry
+          key="IdentityLink"
+          value="at.gv.egiz.bku.slcommands.impl.IdentityLinkInfoboxImpl" />
+<!--        <entry-->
+<!--          key="CardChannel"-->
+<!--          value="at.gv.egiz.bku.slcommands.impl.CardChannelInfoboxImpl" />-->
+      </map>
+    </property>
+  </bean>
   
   <!-- Configure Configuration -->
   <bean id="certValidator" class="at.gv.egiz.bku.conf.CertValidatorImpl"></bean>
-- 
cgit v1.2.3


From 2df9621154ad057f6cace73efe49c9ef42515fde Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Tue, 9 Dec 2008 08:14:43 +0000
Subject: Refactored STAL interface. Additional infobox functionality.

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@236 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKULocal/src/main/webapp/WEB-INF/applicationContext.xml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'BKULocal/src/main/webapp/WEB-INF/applicationContext.xml')

diff --git a/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml b/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
index 5ac12ece..eb7d5b7a 100644
--- a/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
@@ -59,6 +59,9 @@
         <entry
           key="http://www.buergerkarte.at/namespaces/securitylayer/1.2#:InfoboxReadRequest"
           value="at.gv.egiz.bku.slcommands.impl.InfoboxReadCommandImpl" />
+        <entry
+          key="http://www.buergerkarte.at/namespaces/securitylayer/1.2#:InfoboxUpdateRequest"
+          value="at.gv.egiz.bku.slcommands.impl.InfoboxUpdateCommandImpl" />
         <entry
           key="http://www.buergerkarte.at/namespaces/securitylayer/1.2#:CreateXMLSignatureRequest"
           value="at.gv.egiz.bku.slcommands.impl.CreateXMLSignatureCommandImpl" />
@@ -76,9 +79,9 @@
         <entry
           key="IdentityLink"
           value="at.gv.egiz.bku.slcommands.impl.IdentityLinkInfoboxImpl" />
-<!--        <entry-->
-<!--          key="CardChannel"-->
-<!--          value="at.gv.egiz.bku.slcommands.impl.CardChannelInfoboxImpl" />-->
+        <entry
+          key="CardChannel"
+          value="at.gv.egiz.bku.slcommands.impl.CardChannelInfoboxImpl" />
       </map>
     </property>
   </bean>
-- 
cgit v1.2.3


From 887f6727479f3ae3d89a08ba619f9382b450e4c1 Mon Sep 17 00:00:00 2001
From: mcentner <mcentner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 12 Dec 2008 11:48:47 +0000
Subject: Updated SMCC to support non-blocking PIN entry. Added
 SV-Personendaten infobox implementation.

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@248 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKULocal/src/main/webapp/WEB-INF/applicationContext.xml | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'BKULocal/src/main/webapp/WEB-INF/applicationContext.xml')

diff --git a/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml b/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
index eb7d5b7a..2ddd46a1 100644
--- a/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
@@ -82,6 +82,9 @@
         <entry
           key="CardChannel"
           value="at.gv.egiz.bku.slcommands.impl.CardChannelInfoboxImpl" />
+        <entry
+          key="SV-Personendaten"
+          value="at.gv.egiz.bku.slcommands.impl.SVPersonendatenInfoboxImpl" />
       </map>
     </property>
   </bean>
-- 
cgit v1.2.3


From e75f30d8d51fa33fc778c31c1b0312cf10de8e45 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 25 Jun 2009 17:01:14 +0000
Subject: disable pinpad

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@376 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKULocal/src/main/webapp/WEB-INF/applicationContext.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'BKULocal/src/main/webapp/WEB-INF/applicationContext.xml')

diff --git a/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml b/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
index 2ddd46a1..b219fdd8 100644
--- a/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
@@ -98,6 +98,11 @@
     <property name="resource" value="file:${user.home}/.mocca/conf/defaultConf.properties"/>
     <property name="certValidator" ref="certValidator"></property>
   </bean>
- 
- 
+
+  <!-- Begin MOCCA Configuration [REFACTORED]
+   |   Configuration beans (no conf properties file) should be injected directly to module configurators.
+   |   Currently, only the ReaderFactory configuration is considered.
+   |-->
+  <import resource="file:${user.home}/.mocca/conf/mocca-conf.xml"/>
+
 </beans>
\ No newline at end of file
-- 
cgit v1.2.3


From 51a02acc93ad80f349a60e226fffce1cd982d9fa Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 13 Aug 2009 09:27:34 +0000
Subject: [#427] No help in BKULocal

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@426 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKULocal/src/main/webapp/WEB-INF/applicationContext.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'BKULocal/src/main/webapp/WEB-INF/applicationContext.xml')

diff --git a/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml b/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
index b219fdd8..8b0f1204 100644
--- a/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
@@ -20,7 +20,7 @@
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.0.xsd">
   <bean id="STALFactory" class="at.gv.egiz.bku.local.stal.LocalSTALFactory"
     scope="singleton">
-    <property name="helpURL" value="http://localhost:3495/help"/>
+    <property name="helpURL" value="http://localhost:3495/help/"/>
   </bean>
   
    
-- 
cgit v1.2.3


From 9b77452c06a7bc02f05f7a46fb192ee3ba0dd952 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Fri, 14 Aug 2009 10:52:45 +0000
Subject: [#380] window close event not handled in mocca local dialog [#354]
 HTTPBindingProcessor: MAX_DATAURL_HOPS not configurable

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@432 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 BKULocal/src/main/webapp/WEB-INF/applicationContext.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'BKULocal/src/main/webapp/WEB-INF/applicationContext.xml')

diff --git a/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml b/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
index 8b0f1204..e96bd088 100644
--- a/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
@@ -28,6 +28,7 @@
     scope="singleton">
     <constructor-arg ref="STALFactory"></constructor-arg>
     <constructor-arg ref="commandInvoker"></constructor-arg>
+    <constructor-arg ref="configuration"></constructor-arg>
   </bean>
   <bean
     class="org.springframework.web.context.support.ServletContextAttributeExporter">
-- 
cgit v1.2.3