1 files changed, 15 insertions, 27 deletions
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