From b1c8641a63a67e3c64d948f9e8dce5c01e11e2dd Mon Sep 17 00:00:00 2001 From: mcentner Date: Wed, 5 May 2010 15:29:01 +0000 Subject: Merged feature branch mocca-1.2.13-id@r724 back to trunk. git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@725 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4 --- .../gv/egiz/bku/local/conf/SpringConfigurator.java | 142 --------------------- 1 file changed, 142 deletions(-) delete mode 100644 BKULocal/src/main/java/at/gv/egiz/bku/local/conf/SpringConfigurator.java (limited to 'BKULocal/src/main/java/at/gv/egiz/bku/local/conf/SpringConfigurator.java') diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/conf/SpringConfigurator.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/conf/SpringConfigurator.java deleted file mode 100644 index 7b2641ff..00000000 --- a/BKULocal/src/main/java/at/gv/egiz/bku/local/conf/SpringConfigurator.java +++ /dev/null @@ -1,142 +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. - */ -package at.gv.egiz.bku.local.conf; - -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.util.Properties; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.springframework.context.ResourceLoaderAware; -import org.springframework.core.io.Resource; -import org.springframework.core.io.ResourceLoader; - -import at.gv.egiz.bku.conf.Configurator; -import at.gv.egiz.bku.local.webapp.SpringBKUServlet; -import at.gv.egiz.bku.slexceptions.SLRuntimeException; - -public class SpringConfigurator extends Configurator implements - ResourceLoaderAware { - - private final static Log log = LogFactory.getLog(SpringConfigurator.class); - - private ResourceLoader resourceLoader; - - public SpringConfigurator() { - // File configDir = new File(System.getProperty("user.home") + - // "/.bku/conf"); - // if (configDir.exists()) { - // log.debug("Found existing config directory: " + configDir); - // } else { - // log.info("Config dir not existing, creating new"); - // if (!configDir.mkdirs()) { - // log.error("Cannot create directory: " + configDir); - // } - // } - } - - public void setResource(Resource resource) { - log.debug("Loading config from: " + resource); - if (resource != null) { - Properties props = new Properties(); - try { - props.load(resource.getInputStream()); - super.setConfiguration(props); - } catch (IOException e) { - log.error("Cannot load config", e); - } - } else { - log.warn("Cannot load properties, resource: " + resource); - } - } - - @Override - public void configure() { - if (properties == null) { - defaultInit(); - } - super.configure(); - SpringBKUServlet.setConfigurator(this); - } - - public void defaultInit() { - Properties props = new Properties(); - try { - props.load(new FileInputStream(System.getProperty("user.home") - + "/.mocca/war/mocca.war")); - super.setConfiguration(props); - } catch (IOException e) { - log.error("Cannot load config", e); - } - } - - @Override - public void setResourceLoader(ResourceLoader loader) { - this.resourceLoader = loader; - } - - private File getDirectory(String property) { - property = property - .replace("${user.home}", System.getProperty("user.home")); - if (property != null) { - Resource certDirRes = resourceLoader.getResource(property); - File certDir; - try { - certDir = certDirRes.getFile(); - } catch (IOException e) { - log.error("Cannot get cert directory", e); - throw new SLRuntimeException(e); - } - if (!certDir.isDirectory()) { - log.error("Expecting directory as SSL.certDirectory parameter"); - throw new SLRuntimeException( - "Expecting directory as SSL.certDirectory parameter"); - } - return certDir; - } - return null; - - } - - @Override - protected File getCADir() { - String caDirectory = getProperty("SSL.caDirectory"); - return getDirectory(caDirectory); - } - - @Override - protected File getCertDir() { - String certDirectory = getProperty("SSL.certDirectory"); - return getDirectory(certDirectory); - } - - @Override - protected InputStream getManifest() { - Resource r = resourceLoader.getResource("META-INF/MANIFEST.MF"); - if ((r != null) && r.isReadable()) { - try { - return r.getInputStream(); - } catch (IOException e) { - log.error("Cannot read manifest data: " + e); - } - } - return null; - } -} \ No newline at end of file -- cgit v1.2.3