From 486fea9bc088c9d7943139f981930df36f37d174 Mon Sep 17 00:00:00 2001
From: clemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>
Date: Thu, 18 Nov 2010 17:15:45 +0000
Subject: do not launch MBeanServer by default, remove old config
 defaultConf.properties

git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@844 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
---
 .../gv/egiz/bku/online/conf/defaultConf.properties | 56 ----------------------
 .../src/main/webapp/WEB-INF/applicationContext.xml |  4 +-
 2 files changed, 3 insertions(+), 57 deletions(-)
 delete mode 100644 BKUOnline/src/main/resources/at/gv/egiz/bku/online/conf/defaultConf.properties

(limited to 'BKUOnline/src/main')

diff --git a/BKUOnline/src/main/resources/at/gv/egiz/bku/online/conf/defaultConf.properties b/BKUOnline/src/main/resources/at/gv/egiz/bku/online/conf/defaultConf.properties
deleted file mode 100644
index b4ecfd86..00000000
--- a/BKUOnline/src/main/resources/at/gv/egiz/bku/online/conf/defaultConf.properties
+++ /dev/null
@@ -1,56 +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/online/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/online/conf/certs/certStore
-SSL.certDirectory=classpath:at/gv/egiz/bku/certs/certStore
-
-
-# Directory where trusted CA 
-# certificates are placed
-SSL.caDirectory=classpath:at/gv/egiz/bku/certs/trustStore
-SSL.sslProtocol=TLS
-
-# warning do not set the following property to true
-# its intended for debugging and testing only 
-SSL.disableAllChecks=false
-#SSL.disableHostnameVerification=true
-
-# ------------ END SSL Config  --------------------
-
-#UserAgent=citizen-card-environment/1.2 MOCCA/1.2
-#UserAgent=citizen-card-environment/1.2 trustDeskbasic/2.8.1
-
-ValidateHashDataInputs=true
-AppletTimeout=300000
-
-#HTTPProxyHost=taranis.iaik.tugraz.at
-#HTTPProxyPort=8888
-DefaultSocketTimeout=200
-#SignatureLayout=
\ No newline at end of file
diff --git a/BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml b/BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml
index ca5ffccc..31d0d24a 100644
--- a/BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml
+++ b/BKUOnline/src/main/webapp/WEB-INF/applicationContext.xml
@@ -227,7 +227,8 @@
 		<property name="bindingProcessorManager" ref="bindingProcessorManager" />
 	</bean>
 	
-	<!-- JMX -->
+  <!-- do not launch MBeanServer by default
+   |   (the contextPathFactoryBean requires Servlet 2.5)
 	<bean
     class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
     <property name="properties">
@@ -259,6 +260,7 @@
       </map>
     </property>
   </bean>
+  -->
 	
 
 </beans>
\ No newline at end of file
-- 
cgit v1.2.3