Changed SLCommandFactory configuration mechanism and moved the actual configuration to spring's application context

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@231 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4

3 files changed, 30 insertions, 12 deletions

diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index 53025800..1ea2c1a1 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -37,7 +37,6 @@
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
-			<version>2.5.5</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.servlet</groupId>
diff --git a/BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml b/BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml
index 4069cdc9..9c7194dd 100644
--- a/BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml
@@ -18,15 +18,33 @@
 	<bean id="STALFactory" class="at.gv.egiz.stal.service.impl.RequestBrokerSTALFactory"

 		scope="singleton" />

 

-	<bean id="accessController" class="at.gv.egiz.bku.online.accesscontroller.SpringSecurityManager"

+	<bean id="accessController"

+		class="at.gv.egiz.bku.online.accesscontroller.SpringSecurityManager"

 		scope="singleton" init-method="init">

-		<property name="config" ref="configurator"/>

-		</bean>

+		<property name="config" ref="configurator" />

+	</bean>

 

 	<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="bindingProcessorManager" class="at.gv.egiz.bku.binding.BindingProcessorManagerImpl"

 		scope="singleton">

 		<constructor-arg ref="STALFactory"></constructor-arg>

@@ -46,16 +64,17 @@
 

 	<!-- Configure Configuration -->

 	<bean id="certValidator" class="at.gv.egiz.bku.conf.CertValidatorImpl"></bean>

-	

-	

+

+

 	<bean id="configurator" class="at.gv.egiz.bku.online.conf.SpringConfigurator"

-		 init-method="configure" scope="singleton">

-		<property name="resource" value="classpath:at/gv/egiz/bku/online/conf/defaultConf.properties"/>

+		init-method="configure" scope="singleton">

+		<property name="resource"

+			value="classpath:at/gv/egiz/bku/online/conf/defaultConf.properties" />

 		<property name="certValidator" ref="certValidator"></property>

 	</bean>

-	

+

 	<!-- Shutdown Event handler -->

-  <bean id="shutdown" class="at.gv.egiz.bku.online.webapp.ShutdownHandler">

-  <property name="bindingProcessorManager" ref="bindingProcessorManager"></property>

-  </bean>

+	<bean id="shutdown" class="at.gv.egiz.bku.online.webapp.ShutdownHandler">

+		<property name="bindingProcessorManager" ref="bindingProcessorManager"></property>

+	</bean>

 </beans>
\ No newline at end of file
diff --git a/BKUOnline/src/main/webapp/applet/BKUApplet-1.0.2-SNAPSHOT.jar b/BKUOnline/src/main/webapp/applet/BKUApplet-1.0.2-SNAPSHOT.jar
new file mode 100644
index 00000000..74f00509
--- /dev/null
+++ b/BKUOnline/src/main/webapp/applet/BKUApplet-1.0.2-SNAPSHOT.jar