[MOBY-guts] biomoby commit

[Eddie Kawas]

kawas
Tue Apr  7 11:33:09 EDT 2009
Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard
In directory dev.open-bio.org:/tmp/cvs-serv2907/src/main/org/biomoby/service/dashboard

Modified Files:
	PerlMoSeSPanel.java 
Log Message:
added an option for generating Async HTTP POST services.
moby-live/Java/src/main/org/biomoby/service/dashboard PerlMoSeSPanel.java,1.14,1.15
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/PerlMoSeSPanel.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/PerlMoSeSPanel.java	2008/11/03 19:47:45	1.14
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/PerlMoSeSPanel.java	2009/04/07 15:33:09	1.15
@@ -79,28 +79,31 @@
     // String: set this for an information message
     static String PM_INFORMATION = "perl-moses-information";
 
-    // boolean - do we over write files
+    // String - do we over write files
     static String PM_OVERWRITE = "perl-moses-overwrite";
 
-    // boolean: do we generate cgi services
+    // String: do we generate cgi services
     static String PM_CGI = "perl-moses-cgi";
     
-    // boolean do we generate soap services
+    // String: do we generate soap services
     static String PM_SOAP = "perl-moses-soap";
     
-    // boolean do we generate async services
+    // String: do we generate async services
     static String PM_ASYNC = "perl-moses-async";
+    
+    // String: do we generate async cgi services
+    static String PM_CGI_ASYNC = "perl-moses-cgi-async";
 
-    // boolean: are we currently updating the datatype cache
+    // String:: are we currently updating the datatype cache
     static String PM_SYNC_DATATYPES = "perl-moses-sync-datatypes";
 
-    // boolean: are we currently updating the services cache
+    // String: are we currently updating the services cache
     static String PM_SYNC_SERVICES = "perl-moses-sync-services";
 
-    // boolean: are we generating services by name
+    // String: are we generating services by name
     static String PM_GENERATING_SPECIFIC_SERVICES = "perl-moses-generating-specific-services";
 
-    // boolean: are we generating services by authority
+    // String: are we generating services by authority
     static String PM_GENERATING_BY_AUTHORITY = "perl-moses-generating-by-authority";
 
     // N/A: set this to make the editor save the current file
@@ -301,6 +304,7 @@
 	propertyChannel.put(PM_SYNC_DATATYPES, new Boolean(false));
 	propertyChannel.put(PM_OVERWRITE, new Boolean(false));
 	propertyChannel.put(PM_CGI, new Boolean(false));
+	propertyChannel.put(PM_CGI_ASYNC, new Boolean(false));
 	propertyChannel.put(PM_ASYNC, new Boolean(false));
 
 	propertyChannel.put(PM_PERL_INSTALL_DIR, getPrefValue(PM_PERL_INSTALL_DIR, ""));
@@ -518,16 +522,18 @@
 		});
 	generateBtn.setEnabled(enable_moses_actions);
 	ButtonGroup group = new ButtonGroup();
-	JRadioButton genCgi, genSoap, genAsync;
+	JRadioButton genCgi, genCgiAsync, genSoap, genAsync;
 	group.add (genCgi      = createHowToButton ("Generate CGI Service", PM_CGI));
+	group.add (genCgiAsync = createHowToButton ("Generate ASYNC CGI Service", PM_CGI_ASYNC));
 	group.add (genSoap     = createHowToButton ("Generate SOAP Service", PM_SOAP));
-	group.add (genAsync     = createHowToButton ("Generate ASYNC Service", PM_ASYNC));
+	group.add (genAsync    = createHowToButton ("Generate ASYNC SOAP Service", PM_ASYNC));
 	
 	SwingUtils.addComponent(bPanel, genOverwrite, 0, 0, 1, 1, NONE, NWEST, 0.0, 0.0);
 	SwingUtils.addComponent(bPanel, genCgi,       0, 1, 2, 1, NONE, NWEST, 0.0, 0.0);
-	SwingUtils.addComponent(bPanel, genSoap,      0, 2, 2, 1, NONE, NWEST, 0.0, 0.0);
-	SwingUtils.addComponent(bPanel, genAsync,     0, 3, 2, 1, NONE, NWEST, 0.0, 0.0);
-	SwingUtils.addComponent(bPanel, generateBtn,  0, 4, 2, 1, HORI, NWEST, 0.0, 0.0);
+	SwingUtils.addComponent(bPanel, genCgiAsync,  0, 2, 2, 1, NONE, NWEST, 0.0, 0.0);
+	SwingUtils.addComponent(bPanel, genSoap,      0, 3, 2, 1, NONE, NWEST, 0.0, 0.0);
+	SwingUtils.addComponent(bPanel, genAsync,     0, 4, 2, 1, NONE, NWEST, 0.0, 0.0);
+	SwingUtils.addComponent(bPanel, generateBtn,  0, 5, 2, 1, HORI, NWEST, 0.0, 0.0);
 
 	// add to the main panel
 	int count = 0;
@@ -826,6 +832,7 @@
 	    radio.setSelected (true);
 	    radio.setEnabled (true);
 	    propertyChannel.put (PM_CGI, false);
+	    propertyChannel.put (PM_CGI_ASYNC, false);
 	    propertyChannel.put (PM_ASYNC, false);
 	}
 	return radio;
@@ -834,6 +841,7 @@
 	    public void actionPerformed (ActionEvent e) {
 		String howTo = e.getActionCommand();
 		propertyChannel.put (PM_CGI, howTo.equals(PM_CGI));
+		propertyChannel.put (PM_CGI_ASYNC, howTo.equals(PM_CGI_ASYNC));
 		propertyChannel.put (PM_ASYNC, howTo.equals(PM_ASYNC));
 		propertyChannel.put (PM_SOAP, howTo.equals(PM_SOAP));
 	    }
@@ -1110,6 +1118,9 @@
 			} else if (Boolean.parseBoolean(propertyChannel
 				.getString(PM_ASYNC))){
 			    command.add("-A");
+			} else if (Boolean.parseBoolean(propertyChannel
+				.getString(PM_CGI_ASYNC))){
+			    command.add("-C");
 			} 
 			command.add(authority);
 			// place command into com
@@ -1205,6 +1216,9 @@
 			} else if (Boolean.parseBoolean(propertyChannel
 				.getString(PM_ASYNC))){
 			    command.add("-A");
+			} else if (Boolean.parseBoolean(propertyChannel
+				.getString(PM_CGI_ASYNC))){
+			    command.add("-C");
 			}
 			command.add(auth);
 			command.add(name);