[MOBY-guts] biomoby commit

[Eddie Kawas]

kawas
Tue Sep  2 14:48:23 EDT 2008
Update of /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard
In directory dev.open-bio.org:/tmp/cvs-serv23393/src/main/org/biomoby/service/dashboard

Modified Files:
	PerlMoSeSPanel.java 
Log Message:
added an option to generate async services
moby-live/Java/src/main/org/biomoby/service/dashboard PerlMoSeSPanel.java,1.12,1.13
===================================================================
RCS file: /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/PerlMoSeSPanel.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/PerlMoSeSPanel.java	2008/06/12 16:46:52	1.12
+++ /home/repository/moby/moby-live/Java/src/main/org/biomoby/service/dashboard/PerlMoSeSPanel.java	2008/09/02 18:48:23	1.13
@@ -87,6 +87,9 @@
     
     // boolean do we generate soap services
     static String PM_SOAP = "perl-moses-soap";
+    
+    // boolean do we generate async services
+    static String PM_ASYNC = "perl-moses-async";
 
     // boolean: are we currently updating the datatype cache
     static String PM_SYNC_DATATYPES = "perl-moses-sync-datatypes";
@@ -298,6 +301,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_ASYNC, new Boolean(false));
 
 	propertyChannel.put(PM_PERL_INSTALL_DIR, getPrefValue(PM_PERL_INSTALL_DIR, ""));
 	propertyChannel.put(PM_PERL_LIB_1, getPrefValue(PM_PERL_LIB_1, ""));
@@ -514,14 +518,16 @@
 		});
 	generateBtn.setEnabled(enable_moses_actions);
 	ButtonGroup group = new ButtonGroup();
-	JRadioButton genCgi, genSoap;
-	group.add (genCgi = createHowToButton ("Generate CGI Service", PM_CGI));
+	JRadioButton genCgi, genSoap, genAsync;
+	group.add (genCgi      = createHowToButton ("Generate CGI Service", PM_CGI));
 	group.add (genSoap     = createHowToButton ("Generate SOAP Service", PM_SOAP));
+	group.add (genAsync     = createHowToButton ("Generate ASYNC 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, generateBtn,  0, 3, 2, 1, HORI, 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);
 
 	// add to the main panel
 	int count = 0;
@@ -816,17 +822,20 @@
 	JRadioButton radio = new JRadioButton (title);
 	radio.setActionCommand (howTo);
 	radio.addActionListener (howToListener);
-	if (!howTo.equals(PM_CGI)) {
+	if (!howTo.equals(PM_CGI) && !howTo.equals(PM_ASYNC)) {
 	    radio.setSelected (true);
 	    radio.setEnabled (true);
+	    propertyChannel.put (PM_CGI, false);
+	    propertyChannel.put (PM_ASYNC, false);
 	}
-	propertyChannel.put (PM_CGI, false);
 	return radio;
     }
     private ActionListener howToListener = new ActionListener() {
 	    public void actionPerformed (ActionEvent e) {
 		String howTo = e.getActionCommand();
 		propertyChannel.put (PM_CGI, howTo.equals(PM_CGI));
+		propertyChannel.put (PM_ASYNC, howTo.equals(PM_ASYNC));
+		propertyChannel.put (PM_SOAP, howTo.equals(PM_SOAP));
 	    }
 	};
     private JPanel getServicesSelectionPanel() {
@@ -1097,7 +1106,10 @@
 			if (Boolean.parseBoolean(propertyChannel
 				.getString(PM_CGI))){
 			    command.add("-c");
-			}
+			} else if (Boolean.parseBoolean(propertyChannel
+				.getString(PM_ASYNC))){
+			    command.add("-A");
+			} 
 			command.add(authority);
 			// place command into com
 			String[] com = command.toArray(new String[] {});
@@ -1189,6 +1201,9 @@
 			if (Boolean.parseBoolean(propertyChannel
 				.getString(PM_CGI))){
 			    command.add("-c");
+			} else if (Boolean.parseBoolean(propertyChannel
+				.getString(PM_ASYNC))){
+			    command.add("-A");
 			}
 			command.add(auth);
 			command.add(name);