[jboss-cvs] JBossAS SVN: r88117 - in projects/fresh/trunk: fresh-shell/src/main/java/org/jboss/fresh/shell/commands/cms and 1 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Fri May 1 20:19:27 EDT 2009


Author: ctomc
Date: 2009-05-01 20:19:26 -0400 (Fri, 01 May 2009)
New Revision: 88117

Removed:
   projects/fresh/trunk/fresh-jar/src/main/resources/META-INF/fresh-service.xml
Modified:
   projects/fresh/trunk/fresh-jar/src/main/resources/META-INF/fresh-jboss-beans.xml
   projects/fresh/trunk/fresh-shell/src/main/java/org/jboss/fresh/shell/commands/cms/CtxDelegateExe.java
   projects/fresh/trunk/fresh-shell/src/main/java/org/jboss/fresh/shell/impl/ShellImpl.java
Log:
no more service file, fresh now deploy purly trough MC, but still exposed trough JMX

Modified: projects/fresh/trunk/fresh-jar/src/main/resources/META-INF/fresh-jboss-beans.xml
===================================================================
--- projects/fresh/trunk/fresh-jar/src/main/resources/META-INF/fresh-jboss-beans.xml	2009-05-01 23:45:41 UTC (rev 88116)
+++ projects/fresh/trunk/fresh-jar/src/main/resources/META-INF/fresh-jboss-beans.xml	2009-05-02 00:19:26 UTC (rev 88117)
@@ -1,27 +1,234 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
-  <bean name="BeanFactoryExecutableRegistry" class="org.jboss.fresh.shell.impl.BeanFactoryExecutableRegistry">
-    <constructor>
-      <parameter>
-        <map keyClass="java.lang.String" valueClass="org.jboss.beans.metadata.spi.factory.BeanFactory">
-          <entry>
-            <key>mcinvoke</key>
-            <value><inject bean="MCBeanInvokeExe"/></value>
-          </entry>
-          <entry>
-            <key>org.jboss.fresh.shell.commands.MCBeanInvokeExe</key>
-            <value><inject bean="MCBeanInvokeExe"/></value>
-          </entry>
-        </map>
-      </parameter>
-    </constructor>
-  </bean>
+    <bean name="FreshPoolService" class="org.jboss.fresh.deployer.PoolService">
+        <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="FRESH:service=ThreadPool",exposedInterface=org.jboss.fresh.deployer.PoolServiceMBean.class)</annotation>
+        <property name="JNDIName">java:/FRESH/ThreadPool</property>
+        <property name="factoryName">org.jboss.fresh.cpii.services.PoolRunnerFactory</property>
+        <property name="poolName">ThreadPool</property>
+        <property name="minSize">0</property>
+        <property name="maxSize">1000</property>
+        <property name="blocking">true</property>
+        <property name="blockingTimeout">10000</property>
+    </bean>
 
-  <beanfactory name="MCBeanInvokeExe" class="org.jboss.fresh.shell.commands.MCBeanInvokeExe">
-    <constructor>
-      <parameter><inject bean="jboss.kernel:service=KernelBus"/></parameter>      
-    </constructor>
-  </beanfactory>
+    <bean name="FreshContextBinder" class="org.jboss.fresh.deployer.ContextBinder">
+        <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="FRESH:service=GlobalContext",exposedInterface=org.jboss.fresh.deployer.ContextBinderMBean.class)</annotation>
+        <property name="JNDIName">java:/FRESH/GlobalContext</property>
+    </bean>
 
+    <bean name="FreshVFSService" class="org.jboss.fresh.deployer.VFSService">
+        <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="FRESH:service=VFS.Mem",exposedInterface=org.jboss.fresh.deployer.VFSServiceMBean.class)</annotation>
+        <property name="JNDIName">java:/FRESH/VFSMem</property>
+        <property name="VFSImpl">org.jboss.fresh.vfs.impl.DefaultVFS</property>
+        <property name="metaClassFactory">org.jboss.fresh.vfs.impl.mem.MemVFSMetaFactory</property>
+        <property name="storeClassFactory">org.jboss.fresh.vfs.impl.mem.MemVFSStoreFactory</property>
+        <property name="metaPropertyString">memfs.name=root</property>
+        <property name="storePropertyString">memfs.name=root</property>
+        <property name="tagFactory">org.jboss.fresh.vfs.impl.TimeTagFactory</property>
+    </bean>
+
+
+    <bean name="FreshRootVFSService" class="org.jboss.fresh.deployer.RootVFSService">
+        <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="FRESH:service=VFS.Root",exposedInterface=org.jboss.fresh.deployer.RootVFSServiceMBean.class)</annotation>
+        <property name="JNDIName">java:/FRESH/VFS</property>
+        <property name="automount">/=java:/FRESH/VFSMem</property>
+        <depends>FreshVFSService</depends>
+    </bean>
+
+    <bean name="BeanFactoryExecutableRegistry" class="org.jboss.fresh.shell.impl.BeanFactoryExecutableRegistry">
+        <constructor>
+            <parameter>
+                <map keyClass="java.lang.String" valueClass="org.jboss.beans.metadata.spi.factory.BeanFactory">
+                    <entry>
+                        <key>mcinvoke</key>
+                        <value>
+                            <inject bean="MCBeanInvokeExe"/>
+                        </value>
+                    </entry>
+                    <entry>
+                        <key>org.jboss.fresh.shell.commands.MCBeanInvokeExe</key>
+                        <value>
+                            <inject bean="MCBeanInvokeExe"/>
+                        </value>
+                    </entry>
+                </map>
+            </parameter>
+        </constructor>
+    </bean>
+
+    <beanfactory name="MCBeanInvokeExe" class="org.jboss.fresh.shell.commands.MCBeanInvokeExe">
+        <constructor>
+            <parameter>
+                <inject bean="jboss.kernel:service=KernelBus"/>
+            </parameter>
+        </constructor>
+    </beanfactory>
+
+    <bean name="FreshSystemShell" class="org.jboss.fresh.deployer.SystemShellService" >
+        <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="FRESH:service=SystemShell",exposedInterface=org.jboss.fresh.deployer.SystemShellServiceMBean.class)</annotation>
+        <property name="JNDIName">java:/FRESH/SystemShell</property>
+        <property name="threadPoolJNDIName">java:/FRESH/ThreadPool</property>
+        <property name="VFSJNDIName">java:/FRESH/VFS</property>
+        <property name="GCInterval">10000</property>
+        <property name="executableRegistry"><inject bean="BeanFactoryExecutableRegistry"/></property>
+        <depends>FreshPoolService</depends>
+        <depends>FreshRootVFSService</depends>
+    </bean>
+
+     <bean name="FreshVFSInit" class="org.jboss.fresh.deployer.ShellExecutorService" >
+        <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="FRESH:service=VFS.Mem.Init",exposedInterface=org.jboss.fresh.deployer.ShellExecutorServiceMBean.class)</annotation>
+        <property name="batchCode">
+            mkdir /home
+            mkdir /home/admin
+            mkdir /bin
+            touch /bin/cd
+            setffld /bin/cd mime cp2-shell/executable
+            setattr /bin/cd Class org.jboss.fresh.shell.commands.CDExe
+            touch /bin/ls
+            setffld /bin/ls mime cp2-shell/executable
+            setattr /bin/ls Class org.jboss.fresh.shell.commands.LsExe
+            touch /bin/cat
+            setffld /bin/cat mime cp2-shell/executable
+            setattr /bin/cat Class org.jboss.fresh.shell.commands.CatExe
+            touch /bin/mkdir
+            setffld /bin/mkdir mime cp2-shell/executable
+            setattr /bin/mkdir Class org.jboss.fresh.shell.commands.MkDirExe
+            touch /bin/ln
+            setffld /bin/ln mime cp2-shell/executable
+            setattr /bin/ln Class org.jboss.fresh.shell.commands.LnExe
+            touch /bin/touch
+            setffld /bin/touch mime cp2-shell/executable
+            setattr /bin/touch Class org.jboss.fresh.shell.commands.TouchExe
+            touch /bin/rm
+            setffld /bin/rm mime cp2-shell/executable
+            setattr /bin/rm Class org.jboss.fresh.shell.commands.RmExe
+            touch /bin/setattr
+            setffld /bin/setattr mime cp2-shell/executable
+            setattr /bin/setattr Class org.jboss.fresh.shell.commands.SetAttrExe
+            touch /bin/info
+            setffld /bin/info mime cp2-shell/executable
+            setattr /bin/info Class org.jboss.fresh.shell.commands.InfoExe
+            touch /bin/cp
+            setffld /bin/cp mime cp2-shell/executable
+            setattr /bin/cp Class org.jboss.fresh.shell.commands.CpExe
+            touch /bin/mv
+            setffld /bin/mv mime cp2-shell/executable
+            setattr /bin/mv Class org.jboss.fresh.shell.commands.MvExe
+            touch /bin/run
+            setffld /bin/run mime cp2-shell/executable
+            setattr /bin/run Class org.jboss.fresh.shell.commands.RunExe
+            touch /bin/set
+            setffld /bin/set mime cp2-shell/executable
+            setattr /bin/set Class org.jboss.fresh.shell.commands.SetCommand
+            touch /bin/echo
+            setffld /bin/echo mime cp2-shell/executable
+            setattr /bin/echo Class org.jboss.fresh.shell.commands.EchoExe
+            touch /bin/ps
+            setffld /bin/ps mime cp2-shell/executable
+            setattr /bin/ps Class org.jboss.fresh.shell.commands.PsExe
+            touch /bin/setffld
+            setffld /bin/setffld mime cp2-shell/executable
+            setattr /bin/setffld Class org.jboss.fresh.shell.commands.SetFileFieldExe
+            touch /bin/lslns
+            setffld /bin/lslns mime cp2-shell/executable
+            setattr /bin/lslns Class org.jboss.fresh.shell.commands.LsLnsExe
+            touch /bin/echos
+            setffld /bin/echos mime cp2-shell/executable
+            setattr /bin/echos Class org.jboss.fresh.shell.commands.EchosExe
+            touch /bin/ctx
+            setffld /bin/ctx mime cp2-shell/executable
+            setattr /bin/ctx Class org.jboss.fresh.shell.commands.ContextExe
+            touch /bin/project
+            setffld /bin/project mime cp2-shell/executable
+            setattr /bin/project Class org.jboss.fresh.shell.commands.ProjectExe
+            touch /bin/exec
+            setffld /bin/exec mime cp2-shell/executable
+            setattr /bin/exec Class org.jboss.fresh.shell.commands.RunExe
+            touch /bin/sh
+            setffld /bin/sh mime cp2-shell/executable
+            setattr /bin/sh Class org.jboss.fresh.shell.commands.ScriptExe
+            touch /bin/jndi
+            setffld /bin/jndi mime cp2-shell/executable
+            setattr /bin/jndi Class org.jboss.fresh.shell.commands.JNDIExe
+            touch /bin/deploy
+            setffld /bin/deploy mime cp2-shell/executable
+            setattr /bin/deploy Class org.jboss.fresh.shell.commands.ProjectDeployExe
+            touch /bin/grep
+            setffld /bin/grep mime cp2-shell/executable
+            setattr /bin/grep Class org.jboss.fresh.shell.commands.GrepExe
+            touch /bin/reg
+            setffld /bin/reg mime cp2-shell/executable
+            setattr /bin/reg Class org.jboss.fresh.shell.commands.RegistryExe
+            touch /bin/ecquery
+            setffld /bin/ecquery mime cp2-shell/executable
+            setattr /bin/ecquery Class org.jboss.fresh.shell.commands.EventCentralQueryExe
+            touch /bin/wget
+            setffld /bin/wget mime cp2-shell/executable
+            setattr /bin/wget Class org.jboss.fresh.shell.commands.util.WebGetExe
+            touch /bin/history
+            setffld /bin/history mime cp2-shell/executable
+            setattr /bin/history Class org.jboss.fresh.shell.commands.HistoryExe
+            touch /bin/kill
+            setffld /bin/kill mime cp2-shell/executable
+            setattr /bin/kill Class org.jboss.fresh.shell.commands.KillExe
+            touch /bin/mbinvoke
+            setffld /bin/mbinvoke mime cp2-shell/executable
+            setattr /bin/mbinvoke Class org.jboss.fresh.shell.commands.MBeanInvokeExe
+            touch /bin/mbquery
+            setffld /bin/mbquery mime cp2-shell/executable
+            setattr /bin/mbquery Class org.jboss.fresh.shell.commands.MBeanQueryExe
+            touch /bin/mcinvoke
+            setffld /bin/mcinvoke mime cp2-shell/executable
+            setattr /bin/mcinvoke Class org.jboss.fresh.shell.commands.MCBeanInvokeExe
+            touch /bin/alias
+            setffld /bin/alias mime cp2-shell/executable
+            setattr /bin/alias Class org.jboss.fresh.shell.commands.AliasExe
+            mkdir /etc
+            mkdir /etc/shell
+            mkdir /usr
+            mkdir /usr/local
+            touch /usr/local/diag
+            setffld /usr/local/diag mime cp2-shell/executable
+            setattr /usr/local/diag Class org.jboss.fresh.shell.commands.util.DiagExe
+            mkdir /tmp
+            mkdir /projects
+
+
+        </property>
+        <property name="executeOnStart">true</property>
+        <property name="stopOnError">false</property>
+        <property name="useLocal">true</property>
+        <property name="svcName">java:/FRESH/SystemShell</property>
+        <depends>FreshSystemShell</depends>
+
+
+    </bean>
+
+
+    <bean name="FreshScripting" class="org.jboss.fresh.deployer.ScriptingService" >
+        <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="FRESH:service=Scripting",exposedInterface=org.jboss.fresh.deployer.ScriptingServiceMBean.class)</annotation>
+        <property name="JNDIName">java:/FRESH/Scripting</property>
+        <depends>FreshSystemShell</depends>
+        <depends>FreshVFSInit</depends>
+    </bean>
+    
+    <bean name="FreshShellInit" class="org.jboss.fresh.deployer.VFSFileService" >
+        <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="FRESH:service=init-rc",exposedInterface=org.jboss.fresh.deployer.VFSFileServiceMBean.class)</annotation>
+		<property name="file">/etc/shell/init.rc</property>
+		<property name="content">set PATH = .:/bin
+set SERIALIZE_MODE = true
+set SESSION_TIMEOUT = 1800000
+set PROCESS_TIMEOUT = 60000
+        </property>
+		<depends>FreshSystemShell</depends>
+        <depends>FreshVFSInit</depends>
+	</bean>
+
+
+    <bean name="FreshSSHServer" class="org.jboss.fresh.deployer.SSHService" >
+        <depends>FRESH:service=SystemShell</depends>
+        <depends>FRESH:service=VFS.Mem.Init</depends>
+    </bean>
+
 </deployment>

Deleted: projects/fresh/trunk/fresh-jar/src/main/resources/META-INF/fresh-service.xml
===================================================================
--- projects/fresh/trunk/fresh-jar/src/main/resources/META-INF/fresh-service.xml	2009-05-01 23:45:41 UTC (rev 88116)
+++ projects/fresh/trunk/fresh-jar/src/main/resources/META-INF/fresh-service.xml	2009-05-02 00:19:26 UTC (rev 88117)
@@ -1,199 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<server>
-   
-    <mbean code="org.jboss.fresh.deployer.ContextBinder" name="FRESH:service=GlobalContext">
-        <attribute name="JNDIName">java:/FRESH/GlobalContext</attribute>
-    </mbean>
-    <mbean code="org.jboss.fresh.deployer.PoolService" name="FRESH:service=ThreadPool">
-        <attribute name="JNDIName">java:/FRESH/ThreadPool</attribute>
-        <attribute name="FactoryName">org.jboss.fresh.cpii.services.PoolRunnerFactory</attribute>
-        <attribute name="PoolName">ThreadPool</attribute>
-        <attribute name="MinSize">0</attribute>
-        <attribute name="MaxSize">1000</attribute>
-        <attribute name="Blocking">true</attribute>
-        <attribute name="BlockingTimeout">10000</attribute>
-    </mbean>
-
-    <mbean code="org.jboss.fresh.deployer.VFSService" name="FRESH:service=VFS.Mem">
-        <attribute name="JNDIName">java:/FRESH/VFSMem</attribute>
-        <attribute name="VFSImpl">org.jboss.fresh.vfs.impl.DefaultVFS</attribute>
-        <attribute name="MetaClassFactory">org.jboss.fresh.vfs.impl.mem.MemVFSMetaFactory</attribute>
-        <attribute name="StoreClassFactory">org.jboss.fresh.vfs.impl.mem.MemVFSStoreFactory</attribute>
-        <attribute name="MetaPropertyString">memfs.name=root</attribute>
-        <attribute name="StorePropertyString">memfs.name=root</attribute>
-        <attribute name="TagFactory">org.jboss.fresh.vfs.impl.TimeTagFactory</attribute>        
-    </mbean>
-
-    <mbean code="org.jboss.fresh.deployer.RootVFSService" name="FRESH:service=VFS.Root">
-        <attribute name="JNDIName">java:/FRESH/VFS</attribute>
-        <attribute name="Automount">/=java:/FRESH/VFSMem</attribute>
-        <depends>FRESH:service=VFS.Mem</depends>
-    </mbean>
-
-
-
-
-
-
-    <mbean code="org.jboss.fresh.deployer.SystemShellService" name="FRESH:service=SystemShell">
-        <attribute name="JNDIName">java:/FRESH/SystemShell</attribute>
-        <attribute name="ThreadPoolJNDIName">java:/FRESH/ThreadPool</attribute>
-        <attribute name="VFSJNDIName">java:/FRESH/VFS</attribute>
-        <attribute name="GCInterval">10000</attribute>
-        <attribute name="ExecutableRegistry"><inject bean="BeanFactoryExecutableRegistry"/></attribute>
-        <depends>FRESH:service=ThreadPool</depends>
-        <depends>FRESH:service=VFS.Root</depends>
-    </mbean>
-    <mbean code="org.jboss.fresh.deployer.ScriptingService" name="FRESH:service=Scripting">
-        <attribute name="JNDIName">java:/FRESH/Scripting</attribute>
-        <depends>FRESH:service=SystemShell</depends>
-        <depends>FRESH:service=VFS.Mem.Init</depends>
-    </mbean>
-
-    <mbean code="org.jboss.fresh.deployer.ShellExecutorService" name="FRESH:service=VFS.Mem.Init">
-        <attribute name="BatchCode">
-            mkdir /home
-            mkdir /home/admin
-            mkdir /bin
-            touch /bin/cd
-            setffld /bin/cd mime cp2-shell/executable
-            setattr /bin/cd Class org.jboss.fresh.shell.commands.CDExe
-            touch /bin/ls
-            setffld /bin/ls mime cp2-shell/executable
-            setattr /bin/ls Class org.jboss.fresh.shell.commands.LsExe
-            touch /bin/cat
-            setffld /bin/cat mime cp2-shell/executable
-            setattr /bin/cat Class org.jboss.fresh.shell.commands.CatExe
-            touch /bin/mkdir
-            setffld /bin/mkdir mime cp2-shell/executable
-            setattr /bin/mkdir Class org.jboss.fresh.shell.commands.MkDirExe
-            touch /bin/ln
-            setffld /bin/ln mime cp2-shell/executable
-            setattr /bin/ln Class org.jboss.fresh.shell.commands.LnExe
-            touch /bin/touch
-            setffld /bin/touch mime cp2-shell/executable
-            setattr /bin/touch Class org.jboss.fresh.shell.commands.TouchExe
-            touch /bin/rm
-            setffld /bin/rm mime cp2-shell/executable
-            setattr /bin/rm Class org.jboss.fresh.shell.commands.RmExe
-            touch /bin/setattr
-            setffld /bin/setattr mime cp2-shell/executable
-            setattr /bin/setattr Class org.jboss.fresh.shell.commands.SetAttrExe
-            touch /bin/info
-            setffld /bin/info mime cp2-shell/executable
-            setattr /bin/info Class org.jboss.fresh.shell.commands.InfoExe
-            touch /bin/cp
-            setffld /bin/cp mime cp2-shell/executable
-            setattr /bin/cp Class org.jboss.fresh.shell.commands.CpExe
-            touch /bin/mv
-            setffld /bin/mv mime cp2-shell/executable
-            setattr /bin/mv Class org.jboss.fresh.shell.commands.MvExe
-            touch /bin/run
-            setffld /bin/run mime cp2-shell/executable
-            setattr /bin/run Class org.jboss.fresh.shell.commands.RunExe
-            touch /bin/set
-            setffld /bin/set mime cp2-shell/executable
-            setattr /bin/set Class org.jboss.fresh.shell.commands.SetCommand
-            touch /bin/echo
-            setffld /bin/echo mime cp2-shell/executable
-            setattr /bin/echo Class org.jboss.fresh.shell.commands.EchoExe
-            touch /bin/ps
-            setffld /bin/ps mime cp2-shell/executable
-            setattr /bin/ps Class org.jboss.fresh.shell.commands.PsExe
-            touch /bin/setffld
-            setffld /bin/setffld mime cp2-shell/executable
-            setattr /bin/setffld Class org.jboss.fresh.shell.commands.SetFileFieldExe
-            touch /bin/lslns
-            setffld /bin/lslns mime cp2-shell/executable
-            setattr /bin/lslns Class org.jboss.fresh.shell.commands.LsLnsExe
-            touch /bin/echos
-            setffld /bin/echos mime cp2-shell/executable
-            setattr /bin/echos Class org.jboss.fresh.shell.commands.EchosExe
-            touch /bin/ctx
-            setffld /bin/ctx mime cp2-shell/executable
-            setattr /bin/ctx Class org.jboss.fresh.shell.commands.ContextExe
-            touch /bin/project
-            setffld /bin/project mime cp2-shell/executable
-            setattr /bin/project Class org.jboss.fresh.shell.commands.ProjectExe
-            touch /bin/exec
-            setffld /bin/exec mime cp2-shell/executable
-            setattr /bin/exec Class org.jboss.fresh.shell.commands.RunExe
-            touch /bin/sh
-            setffld /bin/sh mime cp2-shell/executable
-            setattr /bin/sh Class org.jboss.fresh.shell.commands.ScriptExe
-            touch /bin/jndi
-            setffld /bin/jndi mime cp2-shell/executable
-            setattr /bin/jndi Class org.jboss.fresh.shell.commands.JNDIExe
-            touch /bin/deploy
-            setffld /bin/deploy mime cp2-shell/executable
-            setattr /bin/deploy Class org.jboss.fresh.shell.commands.ProjectDeployExe
-            touch /bin/grep
-            setffld /bin/grep mime cp2-shell/executable
-            setattr /bin/grep Class org.jboss.fresh.shell.commands.GrepExe
-            touch /bin/reg
-            setffld /bin/reg mime cp2-shell/executable
-            setattr /bin/reg Class org.jboss.fresh.shell.commands.RegistryExe
-            touch /bin/ecquery
-            setffld /bin/ecquery mime cp2-shell/executable
-            setattr /bin/ecquery Class org.jboss.fresh.shell.commands.EventCentralQueryExe
-            touch /bin/wget
-            setffld /bin/wget mime cp2-shell/executable
-            setattr /bin/wget Class org.jboss.fresh.shell.commands.util.WebGetExe
-            touch /bin/history
-            setffld /bin/history mime cp2-shell/executable
-            setattr /bin/history Class org.jboss.fresh.shell.commands.HistoryExe
-            touch /bin/kill
-            setffld /bin/kill mime cp2-shell/executable
-            setattr /bin/kill Class org.jboss.fresh.shell.commands.KillExe
-            touch /bin/mbinvoke
-            setffld /bin/mbinvoke mime cp2-shell/executable
-            setattr /bin/mbinvoke Class org.jboss.fresh.shell.commands.MBeanInvokeExe
-            touch /bin/mbquery
-            setffld /bin/mbquery mime cp2-shell/executable
-            setattr /bin/mbquery Class org.jboss.fresh.shell.commands.MBeanQueryExe
-            touch /bin/mcinvoke
-            setffld /bin/mcinvoke mime cp2-shell/executable
-            setattr /bin/mcinvoke Class org.jboss.fresh.shell.commands.MCBeanInvokeExe
-            touch /bin/alias
-            setffld /bin/alias mime cp2-shell/executable
-            setattr /bin/alias Class org.jboss.fresh.shell.commands.AliasExe
-            mkdir /etc
-            mkdir /etc/shell
-            mkdir /usr
-            mkdir /usr/local
-            touch /usr/local/diag
-            setffld /usr/local/diag mime cp2-shell/executable
-            setattr /usr/local/diag Class org.jboss.fresh.shell.commands.util.DiagExe
-            mkdir /tmp
-            mkdir /projects
-
-
-        </attribute>
-        <attribute name="ExecuteOnStart">true</attribute>
-        <attribute name="StopOnError">false</attribute>
-        <attribute name="UseLocal">true</attribute>
-        <attribute name="SvcName">java:/FRESH/SystemShell</attribute>
-        <depends>FRESH:service=SystemShell</depends>
-        
-
-    </mbean>
-    <mbean code="org.jboss.fresh.deployer.VFSFileService" name="FRESH:service=init-rc">
-		<attribute name="File">/etc/shell/init.rc</attribute>
-		<attribute name="Content">set PATH = .:/bin
-set SERIALIZE_MODE = true
-set SESSION_TIMEOUT = 1800000
-set PROCESS_TIMEOUT = 60000
-        </attribute>
-		<depends>FRESH:service=VFS.Root</depends>
-		<depends>FRESH:service=SystemShell</depends>
-		<depends>FRESH:service=VFS.Mem.Init</depends>
-	</mbean>
-
-
-    <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/fresh-shell/src/main/java/org/jboss/fresh/shell/commands/cms/CtxDelegateExe.java
===================================================================
--- projects/fresh/trunk/fresh-shell/src/main/java/org/jboss/fresh/shell/commands/cms/CtxDelegateExe.java	2009-05-01 23:45:41 UTC (rev 88116)
+++ projects/fresh/trunk/fresh-shell/src/main/java/org/jboss/fresh/shell/commands/cms/CtxDelegateExe.java	2009-05-02 00:19:26 UTC (rev 88117)
@@ -83,7 +83,7 @@
 
 			Context gctx = null;
 			try {
-				tmp = "java:/CP2/GlobalContext";
+				tmp = "java:/FRESH/GlobalContext";
 				gctx = (Context) ctx.lookup(tmp);
 			} catch (Exception ex) {
 				if (canThrowEx()) {

Modified: projects/fresh/trunk/fresh-shell/src/main/java/org/jboss/fresh/shell/impl/ShellImpl.java
===================================================================
--- projects/fresh/trunk/fresh-shell/src/main/java/org/jboss/fresh/shell/impl/ShellImpl.java	2009-05-01 23:45:41 UTC (rev 88116)
+++ projects/fresh/trunk/fresh-shell/src/main/java/org/jboss/fresh/shell/impl/ShellImpl.java	2009-05-02 00:19:26 UTC (rev 88117)
@@ -647,7 +647,7 @@
 
         // would be nice to have a wrapper that returns null and throws no exceptions
         try {
-            actx = (Context) new RegistryContext().lookup("java:/CP2/GlobalContext");
+            actx = (Context) new RegistryContext().lookup("java:/FRESH/GlobalContext");
         } catch(Exception ex) {
         }
 
@@ -704,14 +704,14 @@
 					c = (Context) ctx.get("AppContext");
 					if(c == null) {
 						try {
-							c = (Context) new RegistryContext().lookup("java:/CP2/GlobalContext");
+							c = (Context) new RegistryContext().lookup("java:/FRESH/GlobalContext");
 						} catch(Exception ex) {}
 						i++;
 					}
 				} else if(i==1) {
 
 					try {
-						c = (Context) new RegistryContext().lookup("java:/CP2/GlobalContext");
+						c = (Context) new RegistryContext().lookup("java:/FRESH/GlobalContext");
 					} catch(Exception ex) {}
 					if (c == null) {
 						i++;




More information about the jboss-cvs-commits mailing list