[jboss-svn-commits] JBL Code SVN: r34933 - in labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor: client/rpc and 2 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: tsurdilovic
Date: 2010-08-30 15:14:49 -0400 (Mon, 30 Aug 2010)
New Revision: 34933

Modified:
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/processeditor/BusinessProcessEditor.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryService.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceAsync.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/EditorLauncher.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/RepositoryServiceServlet.java
   labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java
Log:
GUVNOR-613

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/processeditor/BusinessProcessEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/processeditor/BusinessProcessEditor.java	2010-08-30 16:02:05 UTC (rev 34932)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/processeditor/BusinessProcessEditor.java	2010-08-30 19:14:49 UTC (rev 34933)
@@ -17,8 +17,12 @@
 package org.drools.guvnor.client.processeditor;
 
 import org.drools.guvnor.client.common.DirtyableComposite;
+import org.drools.guvnor.client.common.GenericCallback;
+import org.drools.guvnor.client.rpc.RepositoryServiceAsync;
+import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
 import org.drools.guvnor.client.rpc.RuleAsset;
 import org.drools.guvnor.client.rpc.RuleFlowContentModel;
+import org.drools.guvnor.client.ruleeditor.EditorLauncher;
 import org.drools.guvnor.client.ruleeditor.SaveEventListener;
 
 import com.google.gwt.dom.client.Document;
@@ -42,8 +46,16 @@
         initWidgets();
     }
     
-    protected void initWidgets() {
-        String name = "/designer/editor";
+    private void initWidgets() {
+    	String name;
+    	if(EditorLauncher.HOSTED_MODE.booleanValue()) {
+    		// THIS IS A HACK TO GET DESIGNER WORKING ON HOSTED MODE
+    		// I will add ability to input where oryx designer is 
+    		// available in the admin section soon
+    		name = "http://localhost:8080/designer/editor";
+    	} else {
+    		name = "/designer/editor"; 
+    	}
         name += "?uuid=" + modelUUID;
         frame = new Frame(name);
         frame.getElement().setAttribute("domain", Document.get().getDomain());

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryService.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryService.java	2010-08-30 16:02:05 UTC (rev 34932)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryService.java	2010-08-30 19:14:49 UTC (rev 34933)
@@ -622,4 +622,6 @@
      * Load and process the repository configuration templates.
      */
      public String processTemplate(String name, Map<String, Object> data);
+     
+     public Boolean isHostedMode();
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceAsync.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceAsync.java	2010-08-30 16:02:05 UTC (rev 34932)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rpc/RepositoryServiceAsync.java	2010-08-30 19:14:49 UTC (rev 34933)
@@ -129,4 +129,5 @@
 	void unLockAsset(java.lang.String uuid, com.google.gwt.user.client.rpc.AsyncCallback<java.lang.Void> arg2);
 	void updateUserPermissions(java.lang.String userName, java.util.Map<java.lang.String, java.util.List<java.lang.String>> perms, com.google.gwt.user.client.rpc.AsyncCallback<java.lang.Void> arg3);
 	void processTemplate(java.lang.String name, java.util.Map<String, Object> data, com.google.gwt.user.client.rpc.AsyncCallback<java.lang.String> arg4);
+	void isHostedMode(com.google.gwt.user.client.rpc.AsyncCallback<java.lang.Boolean> arg1);
 }
\ No newline at end of file

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/EditorLauncher.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/EditorLauncher.java	2010-08-30 16:02:05 UTC (rev 34932)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/ruleeditor/EditorLauncher.java	2010-08-30 19:14:49 UTC (rev 34933)
@@ -37,6 +37,7 @@
 
 import org.drools.guvnor.client.common.AssetFormats;
 import org.drools.guvnor.client.common.DefaultContentUploadEditor;
+import org.drools.guvnor.client.common.GenericCallback;
 import org.drools.guvnor.client.common.RulePackageSelector;
 import org.drools.guvnor.client.decisiontable.DecisionTableXLSWidget;
 import org.drools.guvnor.client.decisiontable.GuidedDecisionTableWidget;
@@ -47,6 +48,8 @@
 import org.drools.guvnor.client.packages.ModelAttachmentFileWidget;
 import org.drools.guvnor.client.processeditor.BusinessProcessEditor;
 import org.drools.guvnor.client.qa.testscenarios.ScenarioWidget;
+import org.drools.guvnor.client.rpc.RepositoryServiceAsync;
+import org.drools.guvnor.client.rpc.RepositoryServiceFactory;
 import org.drools.guvnor.client.rpc.RuleAsset;
 
 import com.google.gwt.user.client.ui.Widget;
@@ -67,6 +70,18 @@
 public class EditorLauncher {
 
     public static final Map<String, String> TYPE_IMAGES = getTypeImages();
+    private static RepositoryServiceAsync SERVICE = RepositoryServiceFactory.getService();
+    public static Boolean HOSTED_MODE = Boolean.FALSE;
+    
+    static {
+    	SERVICE.isHostedMode( 
+    			new GenericCallback<Boolean>() {
+    	        	public void onSuccess(Boolean result) {
+    	        		if(result.booleanValue()) {
+    	        			HOSTED_MODE = Boolean.TRUE;
+    	        		}
+    	        }});
+    }
 
     /**
      * This will return the appropriate viewer for the asset.

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/RepositoryServiceServlet.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/RepositoryServiceServlet.java	2010-08-30 16:02:05 UTC (rev 34932)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/RepositoryServiceServlet.java	2010-08-30 19:14:49 UTC (rev 34933)
@@ -368,5 +368,9 @@
 	public String processTemplate(String p0, Map<String, Object> p1) {
 		return getService().processTemplate(p0, p1);
 	}
+	
+	public Boolean isHostedMode() {
+		return getService().isHostedMode();
+	}
 
 }

Modified: labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java
===================================================================
--- labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java	2010-08-30 16:02:05 UTC (rev 34932)
+++ labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java	2010-08-30 19:14:49 UTC (rev 34933)
@@ -2914,4 +2914,12 @@
  			return "";
  		}
      }
+     
+     /**
+      * Check to see if app context is active (not in hosted)
+      */
+     public Boolean isHostedMode() {
+    	 Boolean hm = Contexts.isApplicationContextActive() ? Boolean.FALSE : Boolean.TRUE;
+    	 return hm;
+     }
 }