X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=security%2Fplugins%2Forg.argeo.security.ui.rcp%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fui%2Frcp%2FAbstractSecureApplication.java;h=75184cbab6110c7848a040285dd78870bc00c0cf;hb=cd50e3711d3b86921f11d9e021fc6a43bef0d400;hp=3da1bc7b4474ebfa8f6dc4bc29e4680d324282b9;hpb=149023e5969377045847bbecf24b0898b18a67a9;p=lgpl%2Fargeo-commons.git

diff --git a/security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/AbstractSecureApplication.java b/security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/AbstractSecureApplication.java
index 3da1bc7b4..75184cbab 100644
--- a/security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/AbstractSecureApplication.java
+++ b/security/plugins/org.argeo.security.ui.rcp/src/main/java/org/argeo/security/ui/rcp/AbstractSecureApplication.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright (C) 2007-2012 Argeo GmbH
+ *
+ * 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.security.ui.rcp;
 
 import java.security.PrivilegedAction;
@@ -20,6 +35,8 @@ import org.eclipse.ui.application.WorkbenchAdvisor;
  * RCP workbench initialization
  */
 public abstract class AbstractSecureApplication implements IApplication {
+	final static String NODE_REPO_URI = "argeo.node.repo.uri";
+
 	private static final Log log = LogFactory
 			.getLog(AbstractSecureApplication.class);
 
@@ -29,23 +46,31 @@ public abstract class AbstractSecureApplication implements IApplication {
 
 	public Object start(IApplicationContext context) throws Exception {
 		// wait for the system to be initialized
-		try {
-			Thread.sleep(3000);
-		} catch (Exception e2) {
-			// silent
-		}
+		// try {
+		// Thread.sleep(3000);
+		// } catch (Exception e2) {
+		// // silent
+		// }
+
+		boolean remote = System.getProperty(NODE_REPO_URI) != null;
 
 		// choose login context
 		final ILoginContext loginContext;
-		if (OperatingSystem.os == OperatingSystem.WINDOWS)
+		if (remote) {
 			loginContext = SecureApplicationActivator
-					.createLoginContext(SecureApplicationActivator.CONTEXT_WINDOWS);
-		else
-			loginContext = SecureApplicationActivator
-					.createLoginContext(SecureApplicationActivator.CONTEXT_NIX);
+					.createLoginContext(SecureApplicationActivator.CONTEXT_REMOTE);
+		} else {
+			if (OperatingSystem.os == OperatingSystem.WINDOWS)
+				loginContext = SecureApplicationActivator
+						.createLoginContext(SecureApplicationActivator.CONTEXT_WINDOWS);
+			else
+				loginContext = SecureApplicationActivator
+						.createLoginContext(SecureApplicationActivator.CONTEXT_NIX);
+		}
 
 		final Display display = PlatformUI.createDisplay();
 
+		// login
 		Subject subject = null;
 		try {
 			loginContext.login();
@@ -68,12 +93,12 @@ public abstract class AbstractSecureApplication implements IApplication {
 				.getName();
 		if (log.isDebugEnabled())
 			log.debug(username + " logged in");
-		display.disposeExec(new Runnable() {
-			public void run() {
-				log.debug("Display disposed");
-				logout(loginContext, username);
-			}
-		});
+//		display.disposeExec(new Runnable() {
+//			public void run() {
+//				log.debug("Display disposed");
+//				logout(loginContext, username);
+//			}
+//		});
 
 		try {
 			PrivilegedAction<?> privilegedAction = new PrivilegedAction<Object>() {