[jboss-cvs] JBossAS SVN: r88026 - in projects/fresh/trunk: etc/fresh/init and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Apr 29 17:04:13 EDT 2009
Author: mstruk
Date: 2009-04-29 17:04:12 -0400 (Wed, 29 Apr 2009)
New Revision: 88026
Added:
projects/fresh/trunk/fresh-ssh/src/main/java/org/jboss/fresh/deployer/
projects/fresh/trunk/fresh-ssh/src/main/java/org/jboss/fresh/deployer/SSHService.java
projects/fresh/trunk/fresh-ssh/src/main/java/org/jboss/fresh/deployer/SSHServiceMBean.java
Modified:
projects/fresh/trunk/etc/0055-cp2-staticinit-service.xml
projects/fresh/trunk/etc/0062-cp2-ssh-service.xml
projects/fresh/trunk/etc/fresh/init/init.rc
projects/fresh/trunk/etc/fresh/init/static-init.sh
projects/fresh/trunk/etc/fresh/ssh/hello.txt
projects/fresh/trunk/etc/fresh/ssh/platform.xml
projects/fresh/trunk/etc/fresh/ssh/server.xml
projects/fresh/trunk/fresh-ssh/src/main/java/org/jboss/fresh/ssh/cp2/SSHShell.java
Log:
Fixed ssh config, added missing SSHService
Modified: projects/fresh/trunk/etc/0055-cp2-staticinit-service.xml
===================================================================
--- projects/fresh/trunk/etc/0055-cp2-staticinit-service.xml 2009-04-29 20:47:30 UTC (rev 88025)
+++ projects/fresh/trunk/etc/0055-cp2-staticinit-service.xml 2009-04-29 21:04:12 UTC (rev 88026)
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
- <mbean code="org.jboss.fresh.deployer.deployer.ShellExecutorService" name="FRESH:service=ShellExecutor,name=StaticInit">
- <attribute name="BatchFile">../cp2/vfs/init/static-init.sh</attribute>
+ <mbean code="org.jboss.fresh.deployer.ShellExecutorService" name="FRESH:service=ShellExecutor,name=StaticInit">
+ <attribute name="BatchFile">../fresh/init/static-init.sh</attribute>
<attribute name="StopOnError">false</attribute>
- <attribute name="LogFile">../cp2/vfs/init/static-init.log</attribute>
+ <attribute name="LogFile">../fresh/init/static-init.log</attribute>
<attribute name="SvcName">java:/FRESH/SystemShell</attribute>
<attribute name="UseLocal">true</attribute>
<attribute name="ExecuteOnStart">true</attribute>
Modified: projects/fresh/trunk/etc/0062-cp2-ssh-service.xml
===================================================================
--- projects/fresh/trunk/etc/0062-cp2-ssh-service.xml 2009-04-29 20:47:30 UTC (rev 88025)
+++ projects/fresh/trunk/etc/0062-cp2-ssh-service.xml 2009-04-29 21:04:12 UTC (rev 88026)
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<server>
- <mbean code="org.jboss.fresh.deployer.deployer.SSHService" name="CP2:service=SSHServer">
- <attribute name="HomeDirectory">../cp2/ssh/</attribute>
- <depends>CP2:service=SystemShell</depends>
- <depends>CP2:service=VFS.Mem.Init</depends>
+ <mbean code="org.jboss.fresh.deployer.SSHService" name="FRESH:service=SSHServer">
+ <attribute name="HomeDirectory">../fresh/ssh/</attribute>
+ <depends>FRESH:service=SystemShell</depends>
+ <depends>FRESH:service=VFS.Mem.Init</depends>
</mbean>
</server>
\ No newline at end of file
Modified: projects/fresh/trunk/etc/fresh/init/init.rc
===================================================================
--- projects/fresh/trunk/etc/fresh/init/init.rc 2009-04-29 20:47:30 UTC (rev 88025)
+++ projects/fresh/trunk/etc/fresh/init/init.rc 2009-04-29 21:04:12 UTC (rev 88026)
@@ -1,9 +1,4 @@
-set PATH = .:/bin:/usr/local/cms
+set PATH = .:/bin
set SERIALIZE_MODE = true
-set SESSION_TIMEOUT = 1800000
-set PROCESS_TIMEOUT = 600000
-set BINARY_STORE = binstore
-set PRODUCTION_STORE = binstore
-set TEMPORARY_STORE = tmp
-reg -g java:/CP2/Deployment | ctx -b DeploymentService
-reg -g java:/CP2/Scripting | ctx -b ScriptingServices
+set SESSION_TIMEOUT = 180000
+set PROCESS_TIMEOUT = 60000
Modified: projects/fresh/trunk/etc/fresh/init/static-init.sh
===================================================================
--- projects/fresh/trunk/etc/fresh/init/static-init.sh 2009-04-29 20:47:30 UTC (rev 88025)
+++ projects/fresh/trunk/etc/fresh/init/static-init.sh 2009-04-29 21:04:12 UTC (rev 88026)
@@ -1,10 +1 @@
-
-mkdir /projects/laibach
-cat > /projects/laibach/project-init.rc &< ../cp2/laibach/init/project-init.rc
-
-mkdir /projects/adria
-cat > /projects/adria/project-init.rc &< ../cp2/adria/init/project-init.rc
-
-mkdir /projects/activita
-cat > /projects/activita/project-init.rc &< ../cp2/activita/init/project-init.rc
-
+echo "static-init.sh executed"
\ No newline at end of file
Modified: projects/fresh/trunk/etc/fresh/ssh/hello.txt
===================================================================
--- projects/fresh/trunk/etc/fresh/ssh/hello.txt 2009-04-29 20:47:30 UTC (rev 88025)
+++ projects/fresh/trunk/etc/fresh/ssh/hello.txt 2009-04-29 21:04:12 UTC (rev 88026)
@@ -1,3 +1,3 @@
-CP2 (c) 2.0 CR1 2002-2007 Parsek Ltd.
+FRESH - The JBoss Shell v1.0
Login:
Modified: projects/fresh/trunk/etc/fresh/ssh/platform.xml
===================================================================
--- projects/fresh/trunk/etc/fresh/ssh/platform.xml 2009-04-29 20:47:30 UTC (rev 88025)
+++ projects/fresh/trunk/etc/fresh/ssh/platform.xml 2009-04-29 21:04:12 UTC (rev 88026)
@@ -4,11 +4,11 @@
-->
<PlatformConfiguration>
<!-- The process provider for executing and redirecting a process -->
- <NativeProcessProvider>com.parsek.ssh.cp2.SSHShell</NativeProcessProvider>
+ <NativeProcessProvider>org.jboss.fresh.ssh.cp2.SSHShell</NativeProcessProvider>
<!-- The authentication provider for authenticating users and obtaining user information -->
- <NativeAuthenticationProvider>com.parsek.ssh.cp2.Cp2AuthenticationProvider</NativeAuthenticationProvider>
+ <NativeAuthenticationProvider>org.jboss.fresh.ssh.cp2.Cp2AuthenticationProvider</NativeAuthenticationProvider>
<!-- The file system provider for SFTP -->
- <NativeFileSystemProvider>com.parsek.vfs</NativeFileSystemProvider>
+ <NativeFileSystemProvider>org.jboss.fresh.vfs</NativeFileSystemProvider>
<!-- Native settings which may be used by the process or authentication provider -->
<!-- Add native settings here -->
<!-- <NativeSetting Name="AuthenticateOnDomain" Value="."/> -->
Modified: projects/fresh/trunk/etc/fresh/ssh/server.xml
===================================================================
--- projects/fresh/trunk/etc/fresh/ssh/server.xml 2009-04-29 20:47:30 UTC (rev 88025)
+++ projects/fresh/trunk/etc/fresh/ssh/server.xml 2009-04-29 21:04:12 UTC (rev 88026)
@@ -4,13 +4,13 @@
-->
<ServerConfiguration>
<!-- Path to server private key file - you need to generate it in advance of course. -->
- <ServerHostKey PrivateKeyFile="../cp2/ssh/priv.skk" />
+ <ServerHostKey PrivateKeyFile="../fresh/ssh/priv.skk" />
<!-- Possible values for these are: ... -->
<!--Subsytem Type="" Name="" Provider="" /-->
<!-- The file system provider for SFTP -->
- <AuthenticationBanner>../cp2/ssh/hello.txt</AuthenticationBanner>
+ <AuthenticationBanner>../fresh/ssh/hello.txt</AuthenticationBanner>
<MaxConnections>3</MaxConnections>
<MaxAuthentications>3</MaxAuthentications>
<ListenAddress>192.168.2.35</ListenAddress>
@@ -25,7 +25,7 @@
<RequiredAuthentication>password</RequiredAuthentication>
- <AuthorizationFile>../cp2/ssh/authorization.xml</AuthorizationFile>
+ <AuthorizationFile>../fresh/ssh/authorization.xml</AuthorizationFile>
<UserConfigDirectory>users</UserConfigDirectory>
<AllowTcpForwarding>false</AllowTcpForwarding>
Added: projects/fresh/trunk/fresh-ssh/src/main/java/org/jboss/fresh/deployer/SSHService.java
===================================================================
--- projects/fresh/trunk/fresh-ssh/src/main/java/org/jboss/fresh/deployer/SSHService.java (rev 0)
+++ projects/fresh/trunk/fresh-ssh/src/main/java/org/jboss/fresh/deployer/SSHService.java 2009-04-29 21:04:12 UTC (rev 88026)
@@ -0,0 +1,54 @@
+package org.jboss.fresh.deployer;
+
+
+public class SSHService extends ServiceModule implements SSHServiceMBean {
+ private Thread th = null;
+ private String home;
+ private String ssjndi;
+
+ public String getName() {
+ return "SSHService";
+ }
+
+ public void setHomeDirectory(String home) {
+ this.home = home;
+ }
+
+ public String getHomeDirectory() {
+ return home;
+ }
+
+ public void setSystemShellJNDI(String name) {
+ this.ssjndi = name;
+ }
+
+ public String getSystemShellJNDI() {
+ return ssjndi;
+ }
+
+ public void doStart() {
+ th = new Thread() {
+ public void run() {
+ //System.setProperty("sshtools.home", home);
+ //com.sshtools.j2ssh.SshServer.main(new String [] {"-start"});
+ try {
+ org.jboss.fresh.ssh.cp2.DaemonStarter.setConfigDir(home);
+ org.jboss.fresh.ssh.cp2.DaemonStarter.setSystemShellJNDI(ssjndi);
+ org.jboss.fresh.ssh.cp2.DaemonStarter.initialize();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
+ }
+ };
+ th.start();
+ }
+
+ public void doStop() {
+ try {
+ org.jboss.fresh.ssh.cp2.DaemonStarter.stop("Stop command issued");
+ } catch (java.io.IOException ex) {
+ throw new RuntimeException(ex);
+ }
+ }
+
+}
Added: projects/fresh/trunk/fresh-ssh/src/main/java/org/jboss/fresh/deployer/SSHServiceMBean.java
===================================================================
--- projects/fresh/trunk/fresh-ssh/src/main/java/org/jboss/fresh/deployer/SSHServiceMBean.java (rev 0)
+++ projects/fresh/trunk/fresh-ssh/src/main/java/org/jboss/fresh/deployer/SSHServiceMBean.java 2009-04-29 21:04:12 UTC (rev 88026)
@@ -0,0 +1,14 @@
+package org.jboss.fresh.deployer;
+
+
+public interface SSHServiceMBean extends ServiceModuleMBean {
+
+ public void setHomeDirectory(String home);
+ public String getHomeDirectory();
+
+ public void setSystemShellJNDI(String name);
+ public String getSystemShellJNDI();
+
+}
+
+
Modified: projects/fresh/trunk/fresh-ssh/src/main/java/org/jboss/fresh/ssh/cp2/SSHShell.java
===================================================================
--- projects/fresh/trunk/fresh-ssh/src/main/java/org/jboss/fresh/ssh/cp2/SSHShell.java 2009-04-29 20:47:30 UTC (rev 88025)
+++ projects/fresh/trunk/fresh-ssh/src/main/java/org/jboss/fresh/ssh/cp2/SSHShell.java 2009-04-29 21:04:12 UTC (rev 88026)
@@ -44,8 +44,8 @@
static final int OVERWRITE = 0;
static final int INSERT = 1;
- static private String ssjndi = "java:/CP2/SystemShell";
- static private String homeDir = "../cp2/users";
+ static private String ssjndi = "java:/FRESH/SystemShell";
+ static private String homeDir = "../fresh/users";
static private int MAX_HISTORY_SIZE = 200;
static final Logger log = Logger.getLogger(SSHShell.class);
More information about the jboss-cvs-commits
mailing list