Version, minor usability improvements

Author: Markus Binsteiner

pom.xml

@@ -4,9 +4,9 @@
 	<artifactId>grython</artifactId>
 	<groupId>grisu.frontend</groupId>
 	<name>Grython</name>
-	<version>0.8-SNAPSHOT</version>
+	<version>0.7.6-SNAPSHOT</version>
+
 
-	
 	<repositories>
 		<repository>
 			<id>bestgrid.public.release</id>
@@ -22,8 +22,8 @@
 				<checksumPolicy>fail</checksumPolicy>
 			</snapshots>
 		</repository>
-	</repositories>	
-	
+	</repositories>
+
 
 	<dependencies>
 		<dependency>
@@ -146,8 +146,8 @@
 					<tagNameFormat>@{project.version}</tagNameFormat>
 					<releaseProfiles>deb,rpm</releaseProfiles>
 				</configuration>
-			</plugin>				
-			
+			</plugin>
+
 		</plugins>
 	</build>
 
@@ -233,7 +233,7 @@
 										</replacement>
 									</replacements>
 								</configuration>
-							</execution>							
+							</execution>
 						</executions>
 					</plugin>
 
@@ -296,7 +296,7 @@
 												<filemode>755</filemode>
 											</mapper>
 										</data>
-										
+
 									</dataSet>
 
 								</configuration>
@@ -391,9 +391,9 @@
 							<preinstallScriptlet>
 								<script>echo "Installing Grython..."</script>
 							</preinstallScriptlet>
-							<!-- <postinstallScriptlet> <scriptFile>src/main/scripts/postinstall</scriptFile> 
-								<fileEncoding>utf-8</fileEncoding> </postinstallScriptlet> <preremoveScriptlet> 
-								<scriptFile>src/main/scripts/preremove</scriptFile> <fileEncoding>utf-8</fileEncoding> 
+							<!-- <postinstallScriptlet> <scriptFile>src/main/scripts/postinstall</scriptFile>
+								<fileEncoding>utf-8</fileEncoding> </postinstallScriptlet> <preremoveScriptlet>
+								<scriptFile>src/main/scripts/preremove</scriptFile> <fileEncoding>utf-8</fileEncoding>
 								</preremoveScriptlet> -->
 						</configuration>
 					</plugin>
@@ -412,6 +412,6 @@
 		<version>1.0</version>
 	</parent>
 	<properties>
-		<grisu.version>0.7</grisu.version>
+		<grisu.version>0.7.6-SNAPSHOT</grisu.version>
 	</properties>
-</project>
+</project>

src/main/java/grisu/Grython.java

@@ -4,32 +4,39 @@
 import grisu.frontend.control.login.LoginManager;
 import grisu.frontend.view.cli.GrisuCliClient;
 import grisu.frontend.view.cli.GrisuCliParameters;
+import grisu.model.FileManager;
+import grisu.model.GrisuRegistryManager;
+import grisu.model.UserEnvironmentManager;
 import grith.gridsession.SessionClient;
 import grith.jgrith.cred.Cred;
 import grith.jgrith.utils.CommandlineArgumentHelpers;
-
-import java.util.Arrays;
-import java.util.List;
-
 import org.python.util.jython;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.Arrays;
+import java.util.List;
+
 public class Grython extends GrisuCliClient<GrisuCliParameters> {
 
 	public static final Logger myLogger = LoggerFactory
 			.getLogger(SessionClient.class);
 
 	public static ServiceInterface serviceInterface = null;
 
+    public static FileManager filemanager = null;
+
+    public static UserEnvironmentManager userEnvironmentManager = null;
+
 	public static Cred credential = null;
 
 	public static boolean isLoggedIn = false;
-	
+
 	public static List<String> cli_parameters;
-	
+
 	public final String[] args;
 
+
 	/**
 	 * @param args
 	 */
@@ -38,7 +45,7 @@ public static void main(String[] args) {
 		LoginManager.initGrisuClient("grython");
 
 		GrisuCliParameters params = new GrisuCliParameters();
-		
+
 		Grython s = null;
 		try {
 			s = new Grython(params, args);
@@ -56,21 +63,24 @@ public Grython(GrisuCliParameters params, String[] args) throws Exception {
 		super(params, args);
 		this.args = args;
 		cli_parameters = Arrays.asList(CommandlineArgumentHelpers.extractNonGridParameters(new GrisuCliParameters(), args));
-		
-		
+
+
 	}
 
 	@Override
 	protected void run() {
 		try {
-			
+
 			if (getLoginParameters().isNologin()) {
 				jython.run(args);
 			} else {
 
 				credential = getCredential();
 				serviceInterface = getServiceInterface();
-			
+
+                filemanager = GrisuRegistryManager.getDefault(serviceInterface).getFileManager();
+                userEnvironmentManager = GrisuRegistryManager.getDefault(serviceInterface).getUserEnvironmentManager();
+
 				jython.run(cli_parameters.toArray(new String[]{}));
 			}
 

src/main/java/grisu/TestClass.java

@@ -2,22 +2,25 @@
 
 import grisu.frontend.view.cli.GrisuCliParameters;
 import grith.jgrith.utils.CommandlineArgumentHelpers;
+import org.apache.commons.lang.StringUtils;
 
 import java.util.Arrays;
 import java.util.List;
 
-import org.apache.commons.lang.StringUtils;
-
 public class TestClass {
-	
+
 	public static void main(String[] args) {
-		
+
 		GrisuCliParameters p = new GrisuCliParameters();
-		
+
 		String[] r = CommandlineArgumentHelpers.extractNonGridParameters(p, args);
 		List<String> l = Arrays.asList(r);
 		System.out.println(StringUtils.join(l, "|"));
-		
+
+        //FileManager fm = GrisuRegistryManager.getDefault(si).getFileManager();
+        //GridFile file = fm.ls('grid://sites/Auckland/gram.uoa.nesi.org.nz/home/markus.binsteiner');
+        //file.getChildren()
+
 	}
 
 }

src/main/jython/grisu/examples.old/simpleJob_short.py

@@ -1,7 +1,7 @@
 from grisu.frontend.control.login import LoginManager
 from grisu.frontend.model.job import JobObject
 
-si = LoginManager.loginCommandline("BeSTGRID-DEV")
+si = LoginManager.loginCommandline("BeSTGRID")
 
 print 'Logged in.'