TODO: CardReaderFactory.setConfiguration(SMCCConfiguration)

Issue #MOCCA-759 - disablePinpad not configurable

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

4 files changed, 76 insertions, 62 deletions

diff --git a/BKULocal/pom.xml b/BKULocal/pom.xml
index df322955..ce2c5326 100644
--- a/BKULocal/pom.xml
+++ b/BKULocal/pom.xml
@@ -8,7 +8,7 @@
 	<groupId>at.gv.egiz</groupId>
 	<artifactId>BKULocal</artifactId>
 	<packaging>war</packaging>
-	<name>BKU Local</name>
+	<name>MOCCA Local</name>
 	<version>1.3.4-SNAPSHOT</version>
 
 	<description>MOCCA Local</description>
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/spring/SMCCConfigurationFactoryBean.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/spring/SMCCConfigurationFactoryBean.java
new file mode 100644
index 00000000..904e2647
--- /dev/null
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/spring/SMCCConfigurationFactoryBean.java
@@ -0,0 +1,67 @@
+/*
+ * 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.
+ */
+
+package at.gv.egiz.bku.local.spring;
+
+import at.gv.egiz.bku.conf.MoccaConfigurationFacade;
+import at.gv.egiz.smcc.conf.SMCCConfiguration;
+import org.apache.commons.configuration.Configuration;
+import org.springframework.beans.factory.FactoryBean;
+
+/**
+ *
+ * @author clemens
+ */
+public class SMCCConfigurationFactoryBean implements FactoryBean {
+
+    SMCCConfiguration config;
+
+    protected final ConfigurationFacade configurationFacade = new ConfigurationFacade();
+
+    public class ConfigurationFacade implements MoccaConfigurationFacade {
+
+        private Configuration configuration;
+        public static final String DISABLE_PINPAD = "CCID.disablePinpad";
+
+        public boolean isDisablePinapad() {
+            return configuration.getBoolean(DISABLE_PINPAD, false);
+        }
+    }
+
+    public void setConfiguration(Configuration configuration) {
+        configurationFacade.configuration = configuration;
+    }
+
+    @Override
+    public Object getObject() throws Exception {
+        if (config == null) {
+            config = new SMCCConfiguration();
+            config.setDisablePinpad(configurationFacade.isDisablePinapad());
+        }
+        return config;
+    }
+
+    @Override
+    public Class getObjectType() {
+        return SMCCConfiguration.class;
+    }
+
+    @Override
+    public boolean isSingleton() {
+        return true;
+    }
+}
diff --git a/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/defaultConf.properties b/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/defaultConf.properties
deleted file mode 100644
index 8ae5bf6d..00000000
--- a/BKULocal/src/main/resources/at/gv/egiz/bku/local/conf/defaultConf.properties
+++ /dev/null
@@ -1,61 +0,0 @@
-#

-# 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.

-#

-

-

-# Configuration for online CCE

-

-# security manager configuration

-AccessController.acceptUnmatched=false

-AccessController.policyResource=classpath:at/gv/egiz/bku/local/conf/accessControlConfig.xml

-

-# ------------BEGIN SSL Config --------------------

-# SSL configuration for connections to external

-# resources (e.g. data urls)

-

-# directory where certificates for 

-# chain constructions can be placed

-SSL.certDirectory=classpath:at/gv/egiz/bku/local/conf/certs/certStore

-

-# a LDAP repository

-SSL.ldapServer=    

-SSL.ldapPort=389      

-

-# Directory where trusted CA 

-# certificates are placed

-SSL.caDirectory=classpath:at/gv/egiz/bku/local/conf/certs/CACerts

-

-SSL.doRevocationChecking=true

-SSL.sslProtocol=TLS

-

-SSL.cache.lifetime=3600

-# use authority info access extension to find ca certs.

-SSL.useAIA=true

-

-#  Don't set to true in production environments

-#  Attention flag only used for debugging

-SSL.disableAllChecks=false

-# ------------ END SSL Config  --------------------

-

-ValidateHashDataInputs=true

-AppletTimeout=300000

-

-#HTTPProxyHost= 

-#HTTPProxyPort= 

-#DefaultSocketTimeout=200

-

-

-

diff --git a/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml b/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
index 62590257..fbbf1e1f 100644
--- a/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/BKULocal/src/main/webapp/WEB-INF/applicationContext.xml
@@ -25,6 +25,14 @@
 		<property name="configurationResource" ref="configurationResource" />

 	</bean>

 

+  <bean id="smccConfiguration" class="at.gv.egiz.bku.local.spring.SMCCConfigurationFactoryBean">

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

+  </bean>

+

+  <bean id="readerFactory" class="at.gv.egiz.smcc.reader.ReaderFactory">

+      <property name="configuration" ref="smccConfiguration"/>

+  </bean>

+  

   <bean id="sslPKIProfile" class="at.gv.egiz.bku.spring.PKIProfileFactoryBean">

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

     <property name="trustProfileId" value="SSL"/>