X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.support.simple%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fjsch%2FJschContextSession.java;h=0d3bddca16fbe812aca6d98fa6770f82c46f423a;hb=1fdb1b4e7b1d2b0cabb6483238301b857a6392fa;hp=5cfc2cde0221afc7f57fc71b191ac1fa2638acbb;hpb=42ccec04f34da0ff3b3040f693b1afc65ac5ca69;p=gpl%2Fargeo-slc.git diff --git a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/JschContextSession.java b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/JschContextSession.java index 5cfc2cde0..0d3bddca1 100644 --- a/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/JschContextSession.java +++ b/runtime/org.argeo.slc.support.simple/src/main/java/org/argeo/slc/jsch/JschContextSession.java @@ -1,8 +1,23 @@ +/* + * Copyright (C) 2010 Mathieu Baudier + * + * 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 org.argeo.slc.jsch; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.beans.factory.BeanNameAware; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.InitializingBean; @@ -10,12 +25,10 @@ import com.jcraft.jsch.Session; /** Caches a JSCH session in the the ssh target. */ public class JschContextSession extends AbstractJschTask implements - InitializingBean, DisposableBean, BeanNameAware { + InitializingBean, DisposableBean { private final static Log log = LogFactory.getLog(JschContextSession.class); private Boolean autoconnect = false; - private String beanName; - @Override void run(Session session) { // clear(); @@ -25,15 +38,15 @@ public class JschContextSession extends AbstractJschTask implements } public void afterPropertiesSet() throws Exception { - if (log.isDebugEnabled()) - log.debug(getClass() + ".afterPropertiesSet(), " + beanName + ", " - + this); + // if (log.isDebugEnabled()) + // log.debug(getClass() + ".afterPropertiesSet(), " + beanName + ", " + // + this); if (autoconnect) - run(); - } - - public void setBeanName(String name) { - this.beanName = name; + try { + run(); + } catch (Exception e) { + log.error("Could not automatically open session", e); + } } public void destroy() throws Exception {