You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sm...@apache.org on 2011/10/22 21:30:07 UTC
svn commit: r1187758 [9/15] - in /incubator/airavata/trunk: ./
modules/commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/app/
modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/
modules/commons/registry-ap...
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/WSDLDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/WSDLDialog.java?rev=1187758&r1=1187757&r2=1187758&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/WSDLDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/appwrapper/WSDLDialog.java Sat Oct 22 19:29:52 2011
@@ -27,226 +27,230 @@ import org.apache.airavata.xbaya.XBayaEn
public class WSDLDialog extends JDialog {
- private final JPanel contentPanel = new JPanel();
- private String wsdl;
- private boolean wsdlChanged = false;
- private JTextPane txtWSDL;
- private String previousURL="";
- private File previousFile=null;
-
- private XBayaEngine engine;
-
-
- /**
- * Launch the application.
- */
- public static void main(String[] args) {
- try {
- WSDLDialog dialog = new WSDLDialog(null,"");
- dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
- dialog.setVisible(true);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- /**
- * Create the dialog.
- */
- public WSDLDialog(XBayaEngine engine,String wsdl) {
- setWsdl(wsdl);
- setEngine(engine);
- initGUI();
- }
-
- private void initGUI() {
- setModal(true);
- setTitle("WSDL Editor");
- setBounds(100, 100, 450, 300);
- setLocationRelativeTo(null);
- getContentPane().setLayout(new BorderLayout());
- contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
- getContentPane().add(contentPanel, BorderLayout.CENTER);
- contentPanel.setLayout(new BorderLayout(0, 0));
- {
- txtWSDL = new JTextPane();
- txtWSDL.addKeyListener(new KeyAdapter() {
- @Override
- public void keyReleased(KeyEvent arg0) {
- setWsdl(txtWSDL.getText());
- }
- });
- contentPanel.add(txtWSDL, BorderLayout.CENTER);
- }
- {
- JPanel panel = new JPanel();
- FlowLayout flowLayout = (FlowLayout) panel.getLayout();
- flowLayout.setAlignment(FlowLayout.RIGHT);
- contentPanel.add(panel, BorderLayout.SOUTH);
- {
- JButton btnUrl = new JButton("URL...");
- btnUrl.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- clickFromURL();
- }
- });
- panel.add(btnUrl);
- }
- {
- JButton btnLoadFromFile = new JButton("File...");
- btnLoadFromFile.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- clickFromFile();
- }
- });
- panel.add(btnLoadFromFile);
- }
- {
- JButton btnClear = new JButton("Clear");
- btnClear.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- txtWSDL.setText("");
- }
- });
- panel.add(btnClear);
- }
- }
- {
- JPanel buttonPane = new JPanel();
- buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
- getContentPane().add(buttonPane, BorderLayout.SOUTH);
- {
- JButton okButton = new JButton("Update");
- okButton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent arg0) {
- setWsdlChanged(true);
- close();
- }
- });
- okButton.setActionCommand("OK");
- buttonPane.add(okButton);
- getRootPane().setDefaultButton(okButton);
- }
- {
- JButton cancelButton = new JButton("Cancel");
- cancelButton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- setWsdlChanged(false);
- close();
- }
- });
- cancelButton.setActionCommand("Cancel");
- buttonPane.add(cancelButton);
- }
- }
- }
-
- private void clickFromURL() {
- while(true){
- String newWSDLUrl = JOptionPane.showInputDialog("What is the WSDL url",previousURL);
- if (newWSDLUrl!=null) {
- previousURL=newWSDLUrl;
- try {
- URL url = new URL(newWSDLUrl);
- setupWSDLFromURL(url);
- break;
- } catch (MalformedURLException e) {
- getEngine().getErrorWindow().error("Error in the specified URL "+newWSDLUrl+" : "+e.getLocalizedMessage(), e);
- }
- }else{
- break;
- }
- }
- }
-
- private void clickFromFile(){
- JFileChooser c = new JFileChooser();
- FileFilter fileFilter = new FileNameExtensionFilter("*.wsdl","*.WSDL");
- c.setFileFilter(fileFilter);
- c.setDialogTitle("WSDL file");
- c.setDialogType(JFileChooser.OPEN_DIALOG);
- while(true){
- if (previousFile!=null) {
- c.setSelectedFile(previousFile);
- }
- if (c.showOpenDialog(this)==JFileChooser.APPROVE_OPTION) {
- previousFile=c.getSelectedFile();
- try {
- URL url = previousFile.toURI().toURL();
- setupWSDLFromURL(url);
- break;
- } catch (MalformedURLException e) {
- getEngine().getErrorWindow().error("Error in the specified File "+previousFile.toString()+" : "+e.getLocalizedMessage(), e);
- }
- }else{
- break;
- }
- }
- }
-
- private void setupWSDLFromURL(URL url) {
- try {
- String contentFromURL = getContentFromURL(url);
- txtWSDL.setText(contentFromURL);
- setWsdl(txtWSDL.getText());
- } catch (Exception e) {
- getEngine().getErrorWindow().error("Error occured while trying to retrieve data from URL "+url.toString()+" : "+e.getLocalizedMessage(), e);
- }
- }
-
- public String getWsdl() {
- return wsdl;
- }
-
- public void setWsdl(String wsdl) {
- this.wsdl = wsdl;
- }
-
- public void close() {
- setVisible(false);
- }
-
- public void open() {
- setVisible(true);
- }
-
- public boolean isWsdlChanged() {
- return wsdlChanged;
- }
-
- public void setWsdlChanged(boolean wsdlChanged) {
- this.wsdlChanged = wsdlChanged;
- }
-
- private String getContentFromURL(URL url) throws IOException {
- InputStream in = url.openStream();
- ByteArrayOutputStream bais = new ByteArrayOutputStream();
- try {
-
- byte[] byteChunk = new byte[4096]; // Or whatever size you want to read in at a time.
- int n;
-
- while ( (n = in.read(byteChunk)) > 0 ) {
- bais.write(byteChunk, 0, n);
- }
-
- }finally{
- if (in!=null){
- try {
- in.close();
- } catch (IOException e) {
- //already closed
- }
- }
- }
- return bais.toString();
- }
-
- public XBayaEngine getEngine() {
- return engine;
- }
-
- public void setEngine(XBayaEngine engine) {
- this.engine = engine;
- }
+ private final JPanel contentPanel = new JPanel();
+ private String wsdl;
+ private boolean wsdlChanged = false;
+ private JTextPane txtWSDL;
+ private String previousURL = "";
+ private File previousFile = null;
+
+ private XBayaEngine engine;
+
+ /**
+ * Launch the application.
+ */
+ public static void main(String[] args) {
+ try {
+ WSDLDialog dialog = new WSDLDialog(null, "");
+ dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+ dialog.setVisible(true);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * Create the dialog.
+ */
+ public WSDLDialog(XBayaEngine engine, String wsdl) {
+ setWsdl(wsdl);
+ setEngine(engine);
+ initGUI();
+ }
+
+ private void initGUI() {
+ setModal(true);
+ setTitle("WSDL Editor");
+ setBounds(100, 100, 450, 300);
+ setLocationRelativeTo(null);
+ getContentPane().setLayout(new BorderLayout());
+ contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
+ getContentPane().add(contentPanel, BorderLayout.CENTER);
+ contentPanel.setLayout(new BorderLayout(0, 0));
+ {
+ txtWSDL = new JTextPane();
+ txtWSDL.addKeyListener(new KeyAdapter() {
+ @Override
+ public void keyReleased(KeyEvent arg0) {
+ setWsdl(txtWSDL.getText());
+ }
+ });
+ contentPanel.add(txtWSDL, BorderLayout.CENTER);
+ }
+ {
+ JPanel panel = new JPanel();
+ FlowLayout flowLayout = (FlowLayout) panel.getLayout();
+ flowLayout.setAlignment(FlowLayout.RIGHT);
+ contentPanel.add(panel, BorderLayout.SOUTH);
+ {
+ JButton btnUrl = new JButton("URL...");
+ btnUrl.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ clickFromURL();
+ }
+ });
+ panel.add(btnUrl);
+ }
+ {
+ JButton btnLoadFromFile = new JButton("File...");
+ btnLoadFromFile.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ clickFromFile();
+ }
+ });
+ panel.add(btnLoadFromFile);
+ }
+ {
+ JButton btnClear = new JButton("Clear");
+ btnClear.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ txtWSDL.setText("");
+ }
+ });
+ panel.add(btnClear);
+ }
+ }
+ {
+ JPanel buttonPane = new JPanel();
+ buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
+ getContentPane().add(buttonPane, BorderLayout.SOUTH);
+ {
+ JButton okButton = new JButton("Update");
+ okButton.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent arg0) {
+ setWsdlChanged(true);
+ close();
+ }
+ });
+ okButton.setActionCommand("OK");
+ buttonPane.add(okButton);
+ getRootPane().setDefaultButton(okButton);
+ }
+ {
+ JButton cancelButton = new JButton("Cancel");
+ cancelButton.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ setWsdlChanged(false);
+ close();
+ }
+ });
+ cancelButton.setActionCommand("Cancel");
+ buttonPane.add(cancelButton);
+ }
+ }
+ }
+
+ private void clickFromURL() {
+ while (true) {
+ String newWSDLUrl = JOptionPane.showInputDialog("What is the WSDL url", previousURL);
+ if (newWSDLUrl != null) {
+ previousURL = newWSDLUrl;
+ try {
+ URL url = new URL(newWSDLUrl);
+ setupWSDLFromURL(url);
+ break;
+ } catch (MalformedURLException e) {
+ getEngine().getErrorWindow().error(
+ "Error in the specified URL " + newWSDLUrl + " : " + e.getLocalizedMessage(), e);
+ }
+ } else {
+ break;
+ }
+ }
+ }
+
+ private void clickFromFile() {
+ JFileChooser c = new JFileChooser();
+ FileFilter fileFilter = new FileNameExtensionFilter("*.wsdl", "*.WSDL");
+ c.setFileFilter(fileFilter);
+ c.setDialogTitle("WSDL file");
+ c.setDialogType(JFileChooser.OPEN_DIALOG);
+ while (true) {
+ if (previousFile != null) {
+ c.setSelectedFile(previousFile);
+ }
+ if (c.showOpenDialog(this) == JFileChooser.APPROVE_OPTION) {
+ previousFile = c.getSelectedFile();
+ try {
+ URL url = previousFile.toURI().toURL();
+ setupWSDLFromURL(url);
+ break;
+ } catch (MalformedURLException e) {
+ getEngine().getErrorWindow().error(
+ "Error in the specified File " + previousFile.toString() + " : " + e.getLocalizedMessage(),
+ e);
+ }
+ } else {
+ break;
+ }
+ }
+ }
+
+ private void setupWSDLFromURL(URL url) {
+ try {
+ String contentFromURL = getContentFromURL(url);
+ txtWSDL.setText(contentFromURL);
+ setWsdl(txtWSDL.getText());
+ } catch (Exception e) {
+ getEngine().getErrorWindow().error(
+ "Error occured while trying to retrieve data from URL " + url.toString() + " : "
+ + e.getLocalizedMessage(), e);
+ }
+ }
+
+ public String getWsdl() {
+ return wsdl;
+ }
+
+ public void setWsdl(String wsdl) {
+ this.wsdl = wsdl;
+ }
+
+ public void close() {
+ setVisible(false);
+ }
+
+ public void open() {
+ setVisible(true);
+ }
+
+ public boolean isWsdlChanged() {
+ return wsdlChanged;
+ }
+
+ public void setWsdlChanged(boolean wsdlChanged) {
+ this.wsdlChanged = wsdlChanged;
+ }
+
+ private String getContentFromURL(URL url) throws IOException {
+ InputStream in = url.openStream();
+ ByteArrayOutputStream bais = new ByteArrayOutputStream();
+ try {
+
+ byte[] byteChunk = new byte[4096]; // Or whatever size you want to read in at a time.
+ int n;
+
+ while ((n = in.read(byteChunk)) > 0) {
+ bais.write(byteChunk, 0, n);
+ }
+
+ } finally {
+ if (in != null) {
+ try {
+ in.close();
+ } catch (IOException e) {
+ // already closed
+ }
+ }
+ }
+ return bais.toString();
+ }
+
+ public XBayaEngine getEngine() {
+ return engine;
+ }
+
+ public void setEngine(XBayaEngine engine) {
+ this.engine = engine;
+ }
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/ComponentMenu.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/ComponentMenu.java?rev=1187758&r1=1187757&r2=1187758&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/ComponentMenu.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/ComponentMenu.java Sat Oct 22 19:29:52 2011
@@ -45,269 +45,250 @@ import org.apache.airavata.xbaya.wf.Work
public class ComponentMenu {
- private XBayaEngine engine;
+ private XBayaEngine engine;
- private JMenu componentMenu;
+ private JMenu componentMenu;
- private JMenuItem fileRegistryItem;
+ private JMenuItem fileRegistryItem;
- private JMenuItem webItem;
+ private JMenuItem webItem;
- private JMenuItem urlItem;
+ private JMenuItem urlItem;
- private JMenuItem removeItem;
+ private JMenuItem removeItem;
- private JMenuItem refreshSelectedItem;
+ private JMenuItem refreshSelectedItem;
- private JMenuItem refreshAllItem;
+ private JMenuItem refreshAllItem;
- private JMenuItem xregistryItem;
+ private JMenuItem xregistryItem;
- private JMenuItem streamSourceItem;
+ private JMenuItem streamSourceItem;
- private JMenuItem workflowItem;
+ private JMenuItem workflowItem;
- private JMenuItem jcrRegistryItem;
+ private JMenuItem jcrRegistryItem;
- private JMenuItem globusFileTransferItem;
+ private JMenuItem globusFileTransferItem;
- /**
- * Constructs a ComponentMenu.
- *
- * @param engine
- *
- */
- public ComponentMenu(XBayaEngine engine) {
- this.engine = engine;
- createComponentMenu();
- }
+ /**
+ * Constructs a ComponentMenu.
+ *
+ * @param engine
+ *
+ */
+ public ComponentMenu(XBayaEngine engine) {
+ this.engine = engine;
+ createComponentMenu();
+ }
- /**
- * @return The component menu.
- */
- public JMenu getMenu() {
- return this.componentMenu;
- }
+ /**
+ * @return The component menu.
+ */
+ public JMenu getMenu() {
+ return this.componentMenu;
+ }
- private void createComponentMenu() {
- this.fileRegistryItem = createFileRegistryMenuItem();
+ private void createComponentMenu() {
+ this.fileRegistryItem = createFileRegistryMenuItem();
this.globusFileTransferItem = createGlobusFileTransferItem();
- this.jcrRegistryItem = createJCRRegistryItem();
- this.webItem = createWebRegistryItem();
- this.urlItem = createURLRegistryItem();
- this.workflowItem = createWorkflowItem();
- this.removeItem = createRemoveRegistryItem();
- this.refreshSelectedItem = createRefreshSelectedRegistryItem();
- this.refreshAllItem = createRefreshAllRegistriesItem();
- this.streamSourceItem = createStreamSourceItem();
- this.componentMenu = new JMenu("Component");
- this.componentMenu.setMnemonic(KeyEvent.VK_C);
- this.componentMenu.add(this.fileRegistryItem);
- this.componentMenu.add(this.jcrRegistryItem);
+ this.jcrRegistryItem = createJCRRegistryItem();
+ this.webItem = createWebRegistryItem();
+ this.urlItem = createURLRegistryItem();
+ this.workflowItem = createWorkflowItem();
+ this.removeItem = createRemoveRegistryItem();
+ this.refreshSelectedItem = createRefreshSelectedRegistryItem();
+ this.refreshAllItem = createRefreshAllRegistriesItem();
+ this.streamSourceItem = createStreamSourceItem();
+ this.componentMenu = new JMenu("Component");
+ this.componentMenu.setMnemonic(KeyEvent.VK_C);
+ this.componentMenu.add(this.fileRegistryItem);
+ this.componentMenu.add(this.jcrRegistryItem);
this.componentMenu.add(this.globusFileTransferItem);
- this.componentMenu.add(this.webItem);
- this.componentMenu.add(this.urlItem);
- this.componentMenu.add(this.workflowItem);
- this.componentMenu.addSeparator();
- this.componentMenu.add(this.removeItem);
- this.componentMenu.addSeparator();
- this.componentMenu.add(this.refreshSelectedItem);
- this.componentMenu.add(this.refreshAllItem);
- this.componentMenu.addSeparator();
- this.componentMenu.add(this.streamSourceItem);
- }
-
- /**
- * @return
- */
- private JMenuItem createWorkflowItem() {
- JMenuItem item = new JMenuItem("Load Workflow Component");
- item.addActionListener(new AbstractAction() {
- public void actionPerformed(ActionEvent event) {
- new Thread() {
- @Override
- public void run() {
- Workflow workflow = new WorkflowFiler(
- ComponentMenu.this.engine).getWorkflow();
- // //to normalize and build the scripts
- try {
- ComponentMenu.this.engine.addWorkflowComponent(
- workflow.getName(),
- SubWorkflowComponent.getInstance(workflow));
-
- } catch (ComponentException e) {
- ComponentMenu.this.engine.getErrorWindow().error(
- ErrorMessages.COMPONENT_LIST_LOAD_ERROR, e);
- } catch (RuntimeException e) {
- ComponentMenu.this.engine.getErrorWindow().error(
- ErrorMessages.COMPONENT_LIST_LOAD_ERROR, e);
- } catch (Error e) {
- ComponentMenu.this.engine.getErrorWindow().error(
- ErrorMessages.UNEXPECTED_ERROR, e);
- }
- }
- }.start();
- }
- });
- return item;
- }
-
- /**
- * @return
- */
- private JMenuItem createStreamSourceItem() {
- JMenuItem item = new JMenuItem("Load Stream Sources");
- item.addActionListener(new AbstractAction() {
- public void actionPerformed(ActionEvent event) {
- new Thread() {
- @Override
- public void run() {
- try {
- ComponentMenu.this.engine.getGUI()
- .addStreamSources(
- new StreamTableModel(
- ComponentMenu.this.engine));
- ComponentMenu.this.streamSourceItem
- .setEnabled(false);
- } catch (MalformedURLException e) {
- ComponentMenu.this.engine.getErrorWindow().error(e);
- }
- }
- }.start();
- }
- });
- return item;
- }
-
- private JMenuItem createRefreshSelectedRegistryItem() {
- JMenuItem item = new JMenuItem("Refresh Selected Registry");
- // this.refreshItem.setMnemonic(KeyEvent.VK_R);
- item.addActionListener(new AbstractAction() {
- public void actionPerformed(ActionEvent event) {
- new Thread() {
- @Override
- public void run() {
- try {
- ComponentMenu.this.engine.getGUI()
- .getComponentSelector()
- .updateSelectedRegistry();
- } catch (ComponentRegistryException e) {
- ComponentMenu.this.engine.getErrorWindow().error(
- ErrorMessages.COMPONENT_LIST_LOAD_ERROR, e);
- } catch (RuntimeException e) {
- ComponentMenu.this.engine.getErrorWindow().error(
- ErrorMessages.COMPONENT_LIST_LOAD_ERROR, e);
- } catch (Error e) {
- ComponentMenu.this.engine.getErrorWindow().error(
- ErrorMessages.UNEXPECTED_ERROR, e);
- }
- }
- }.start();
- }
- });
- return item;
- }
-
- private JMenuItem createRefreshAllRegistriesItem() {
- JMenuItem item = new JMenuItem("Refresh All Registries");
- // this.refreshItem.setMnemonic(KeyEvent.VK_E);
- item.addActionListener(new AbstractAction() {
- public void actionPerformed(ActionEvent event) {
- new Thread() {
- @Override
- public void run() {
- try {
- ComponentMenu.this.engine.getGUI()
- .getComponentSelector().update();
- } catch (ComponentRegistryException e) {
- ComponentMenu.this.engine.getErrorWindow().error(
- ErrorMessages.COMPONENT_LIST_LOAD_ERROR, e);
- } catch (RuntimeException e) {
- ComponentMenu.this.engine.getErrorWindow().error(
- ErrorMessages.COMPONENT_LIST_LOAD_ERROR, e);
- } catch (Error e) {
- ComponentMenu.this.engine.getErrorWindow().error(
- ErrorMessages.UNEXPECTED_ERROR, e);
- }
- }
- }.start();
- }
- });
- return item;
- }
-
- private JMenuItem createRemoveRegistryItem() {
- JMenuItem item = new JMenuItem("Remove Selected Registry");
- item.setMnemonic(KeyEvent.VK_R);
- item.addActionListener(new AbstractAction() {
- public void actionPerformed(ActionEvent event) {
- try {
- ComponentMenu.this.engine.getGUI().getComponentSelector()
- .removeSelectedRegistry();
- } catch (RuntimeException e) {
- ComponentMenu.this.engine.getErrorWindow().error(
- ErrorMessages.UNEXPECTED_ERROR, e);
- } catch (Error e) {
- ComponentMenu.this.engine.getErrorWindow().error(
- ErrorMessages.UNEXPECTED_ERROR, e);
- }
- }
- });
- return item;
- }
-
- private JMenuItem createWebRegistryItem() {
- JMenuItem item = new JMenuItem("Add Web Registry");
- item.setMnemonic(KeyEvent.VK_W);
- item.addActionListener(new AbstractAction() {
- private WebResigtoryWindow window;
-
- public void actionPerformed(ActionEvent e) {
- if (this.window == null) {
- this.window = new WebResigtoryWindow(
- ComponentMenu.this.engine);
- }
- this.window.show();
- }
- });
- return item;
- }
-
- private JMenuItem createURLRegistryItem() {
- JMenuItem item = new JMenuItem("Add WSDL by URL");
- item.setMnemonic(KeyEvent.VK_U);
- item.addActionListener(new AbstractAction() {
- private URLRegistryWindow window;
-
- public void actionPerformed(ActionEvent e) {
- if (this.window == null) {
- this.window = new URLRegistryWindow(
- ComponentMenu.this.engine);
- }
- this.window.show();
- }
- });
- return item;
- }
-
-
-
- private JMenuItem createJCRRegistryItem() {
- JMenuItem item = new JMenuItem("Add Registry");
- item.setMnemonic(KeyEvent.VK_J);
- item.addActionListener(new AbstractAction() {
- private JCRRegistryWindow window;
-
- public void actionPerformed(ActionEvent e) {
- if (this.window == null) {
- this.window = new JCRRegistryWindow(
- ComponentMenu.this.engine);
- }
- this.window.show();
- }
- });
- return item;
- }
+ this.componentMenu.add(this.webItem);
+ this.componentMenu.add(this.urlItem);
+ this.componentMenu.add(this.workflowItem);
+ this.componentMenu.addSeparator();
+ this.componentMenu.add(this.removeItem);
+ this.componentMenu.addSeparator();
+ this.componentMenu.add(this.refreshSelectedItem);
+ this.componentMenu.add(this.refreshAllItem);
+ this.componentMenu.addSeparator();
+ this.componentMenu.add(this.streamSourceItem);
+ }
+
+ /**
+ * @return
+ */
+ private JMenuItem createWorkflowItem() {
+ JMenuItem item = new JMenuItem("Load Workflow Component");
+ item.addActionListener(new AbstractAction() {
+ public void actionPerformed(ActionEvent event) {
+ new Thread() {
+ @Override
+ public void run() {
+ Workflow workflow = new WorkflowFiler(ComponentMenu.this.engine).getWorkflow();
+ // //to normalize and build the scripts
+ try {
+ ComponentMenu.this.engine.addWorkflowComponent(workflow.getName(),
+ SubWorkflowComponent.getInstance(workflow));
+
+ } catch (ComponentException e) {
+ ComponentMenu.this.engine.getErrorWindow()
+ .error(ErrorMessages.COMPONENT_LIST_LOAD_ERROR, e);
+ } catch (RuntimeException e) {
+ ComponentMenu.this.engine.getErrorWindow()
+ .error(ErrorMessages.COMPONENT_LIST_LOAD_ERROR, e);
+ } catch (Error e) {
+ ComponentMenu.this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
+ }
+ }
+ }.start();
+ }
+ });
+ return item;
+ }
+
+ /**
+ * @return
+ */
+ private JMenuItem createStreamSourceItem() {
+ JMenuItem item = new JMenuItem("Load Stream Sources");
+ item.addActionListener(new AbstractAction() {
+ public void actionPerformed(ActionEvent event) {
+ new Thread() {
+ @Override
+ public void run() {
+ try {
+ ComponentMenu.this.engine.getGUI().addStreamSources(
+ new StreamTableModel(ComponentMenu.this.engine));
+ ComponentMenu.this.streamSourceItem.setEnabled(false);
+ } catch (MalformedURLException e) {
+ ComponentMenu.this.engine.getErrorWindow().error(e);
+ }
+ }
+ }.start();
+ }
+ });
+ return item;
+ }
+
+ private JMenuItem createRefreshSelectedRegistryItem() {
+ JMenuItem item = new JMenuItem("Refresh Selected Registry");
+ // this.refreshItem.setMnemonic(KeyEvent.VK_R);
+ item.addActionListener(new AbstractAction() {
+ public void actionPerformed(ActionEvent event) {
+ new Thread() {
+ @Override
+ public void run() {
+ try {
+ ComponentMenu.this.engine.getGUI().getComponentSelector().updateSelectedRegistry();
+ } catch (ComponentRegistryException e) {
+ ComponentMenu.this.engine.getErrorWindow()
+ .error(ErrorMessages.COMPONENT_LIST_LOAD_ERROR, e);
+ } catch (RuntimeException e) {
+ ComponentMenu.this.engine.getErrorWindow()
+ .error(ErrorMessages.COMPONENT_LIST_LOAD_ERROR, e);
+ } catch (Error e) {
+ ComponentMenu.this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
+ }
+ }
+ }.start();
+ }
+ });
+ return item;
+ }
+
+ private JMenuItem createRefreshAllRegistriesItem() {
+ JMenuItem item = new JMenuItem("Refresh All Registries");
+ // this.refreshItem.setMnemonic(KeyEvent.VK_E);
+ item.addActionListener(new AbstractAction() {
+ public void actionPerformed(ActionEvent event) {
+ new Thread() {
+ @Override
+ public void run() {
+ try {
+ ComponentMenu.this.engine.getGUI().getComponentSelector().update();
+ } catch (ComponentRegistryException e) {
+ ComponentMenu.this.engine.getErrorWindow()
+ .error(ErrorMessages.COMPONENT_LIST_LOAD_ERROR, e);
+ } catch (RuntimeException e) {
+ ComponentMenu.this.engine.getErrorWindow()
+ .error(ErrorMessages.COMPONENT_LIST_LOAD_ERROR, e);
+ } catch (Error e) {
+ ComponentMenu.this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
+ }
+ }
+ }.start();
+ }
+ });
+ return item;
+ }
+
+ private JMenuItem createRemoveRegistryItem() {
+ JMenuItem item = new JMenuItem("Remove Selected Registry");
+ item.setMnemonic(KeyEvent.VK_R);
+ item.addActionListener(new AbstractAction() {
+ public void actionPerformed(ActionEvent event) {
+ try {
+ ComponentMenu.this.engine.getGUI().getComponentSelector().removeSelectedRegistry();
+ } catch (RuntimeException e) {
+ ComponentMenu.this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
+ } catch (Error e) {
+ ComponentMenu.this.engine.getErrorWindow().error(ErrorMessages.UNEXPECTED_ERROR, e);
+ }
+ }
+ });
+ return item;
+ }
+
+ private JMenuItem createWebRegistryItem() {
+ JMenuItem item = new JMenuItem("Add Web Registry");
+ item.setMnemonic(KeyEvent.VK_W);
+ item.addActionListener(new AbstractAction() {
+ private WebResigtoryWindow window;
+
+ public void actionPerformed(ActionEvent e) {
+ if (this.window == null) {
+ this.window = new WebResigtoryWindow(ComponentMenu.this.engine);
+ }
+ this.window.show();
+ }
+ });
+ return item;
+ }
+
+ private JMenuItem createURLRegistryItem() {
+ JMenuItem item = new JMenuItem("Add WSDL by URL");
+ item.setMnemonic(KeyEvent.VK_U);
+ item.addActionListener(new AbstractAction() {
+ private URLRegistryWindow window;
+
+ public void actionPerformed(ActionEvent e) {
+ if (this.window == null) {
+ this.window = new URLRegistryWindow(ComponentMenu.this.engine);
+ }
+ this.window.show();
+ }
+ });
+ return item;
+ }
+
+ private JMenuItem createJCRRegistryItem() {
+ JMenuItem item = new JMenuItem("Add Registry");
+ item.setMnemonic(KeyEvent.VK_J);
+ item.addActionListener(new AbstractAction() {
+ private JCRRegistryWindow window;
+
+ public void actionPerformed(ActionEvent e) {
+ if (this.window == null) {
+ this.window = new JCRRegistryWindow(ComponentMenu.this.engine);
+ }
+ this.window.show();
+ }
+ });
+ return item;
+ }
private JMenuItem createGlobusFileTransferItem() {
JMenuItem item = new JMenuItem("Globus File Transfer");
@@ -317,8 +298,7 @@ public class ComponentMenu {
public void actionPerformed(ActionEvent e) {
if (this.window == null) {
- this.window = new GlobusFileTransferWindow(
- ComponentMenu.this.engine);
+ this.window = new GlobusFileTransferWindow(ComponentMenu.this.engine);
}
this.window.show();
}
@@ -326,31 +306,27 @@ public class ComponentMenu {
return item;
}
- private JMenuItem createFileRegistryMenuItem() {
- JMenuItem item = new JMenuItem("Add Local Directory");
- item.setMnemonic(KeyEvent.VK_L);
- item.addActionListener(new AbstractAction() {
- public void actionPerformed(ActionEvent e) {
- registerComponentLocalDirectory();
- }
- });
- return item;
- }
-
- private void registerComponentLocalDirectory() {
- JFileChooser fileChooser = new JFileChooser(
- XBayaPathConstants.WSDL_DIRECTORY);
- fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
- int returnVal = fileChooser.showOpenDialog(this.engine.getGUI()
- .getFrame().getContentPane());
- if (returnVal == JFileChooser.APPROVE_OPTION) {
- File directory = fileChooser.getSelectedFile();
- LocalComponentRegistry registry = new LocalComponentRegistry(
- directory);
- // move to another thread using loader.
- ComponentRegistryLoader loader = new ComponentRegistryLoader(
- this.engine);
- loader.load(registry);
- }
- }
+ private JMenuItem createFileRegistryMenuItem() {
+ JMenuItem item = new JMenuItem("Add Local Directory");
+ item.setMnemonic(KeyEvent.VK_L);
+ item.addActionListener(new AbstractAction() {
+ public void actionPerformed(ActionEvent e) {
+ registerComponentLocalDirectory();
+ }
+ });
+ return item;
+ }
+
+ private void registerComponentLocalDirectory() {
+ JFileChooser fileChooser = new JFileChooser(XBayaPathConstants.WSDL_DIRECTORY);
+ fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+ int returnVal = fileChooser.showOpenDialog(this.engine.getGUI().getFrame().getContentPane());
+ if (returnVal == JFileChooser.APPROVE_OPTION) {
+ File directory = fileChooser.getSelectedFile();
+ LocalComponentRegistry registry = new LocalComponentRegistry(directory);
+ // move to another thread using loader.
+ ComponentRegistryLoader loader = new ComponentRegistryLoader(this.engine);
+ loader.load(registry);
+ }
+ }
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/GlobusFileTransferWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/GlobusFileTransferWindow.java?rev=1187758&r1=1187757&r2=1187758&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/GlobusFileTransferWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/GlobusFileTransferWindow.java Sat Oct 22 19:29:52 2011
@@ -26,22 +26,23 @@ public class GlobusFileTransferWindow {
private XBayaTextField caFileTextField;
- private XBayaTextField certFileTextField;
+ private XBayaTextField certFileTextField;
- private XBayaTextField keyFileTextField;
+ private XBayaTextField keyFileTextField;
- private XBayaTextField baseUrlTextField;
+ private XBayaTextField baseUrlTextField;
- private XBayaTextField sourceEndpointTextField;
+ private XBayaTextField sourceEndpointTextField;
- private XBayaTextField sourceFilePathTextField;
+ private XBayaTextField sourceFilePathTextField;
- private XBayaTextField destEndpointTextField;
+ private XBayaTextField destEndpointTextField;
- private XBayaTextField destFilePathTextField;
+ private XBayaTextField destFilePathTextField;
/**
- * @param engine XBaya workflow engine
+ * @param engine
+ * XBaya workflow engine
*/
public GlobusFileTransferWindow(XBayaEngine engine) {
this.engine = engine;
@@ -73,13 +74,12 @@ public class GlobusFileTransferWindow {
JSONTransferAPIClient c = null;
try {
- c = new JSONTransferAPIClient(username,
- caFile, certFile, keyFile, baseUrl);
+ c = new JSONTransferAPIClient(username, caFile, certFile, keyFile, baseUrl);
} catch (KeyManagementException e) {
- this.engine.getErrorWindow().error("Key Management Error.",e);
+ this.engine.getErrorWindow().error("Key Management Error.", e);
return;
} catch (NoSuchAlgorithmException e) {
- this.engine.getErrorWindow().error("No Such Algorithm Error.",e);
+ this.engine.getErrorWindow().error("No Such Algorithm Error.", e);
return;
}
System.out.println("base url: " + c.getBaseUrl());
@@ -87,13 +87,13 @@ public class GlobusFileTransferWindow {
try {
e.transfer(sourceEndpoint, sourceFilePath, destEndpoint, destFilePath);
} catch (IOException e1) {
- this.engine.getErrorWindow().error("IO Error.",e1);
+ this.engine.getErrorWindow().error("IO Error.", e1);
return;
} catch (JSONException e1) {
- this.engine.getErrorWindow().error("JSON Error.",e1);
+ this.engine.getErrorWindow().error("JSON Error.", e1);
return;
} catch (GeneralSecurityException e1) {
- this.engine.getErrorWindow().error("Key Management Error.",e1);
+ this.engine.getErrorWindow().error("Key Management Error.", e1);
return;
} catch (APIError apiError) {
this.engine.getErrorWindow().error("Globus Transfer API Calling Error.", apiError);
@@ -121,7 +121,8 @@ public class GlobusFileTransferWindow {
// Setting some sample values when the Window is loaded
this.usernameTextField.setText("heshan");
- this.caFileTextField.setText("/home/heshan/Dev/globusonline/transfer-api-client-java.git/trunk/ca/gd-bundle_ca.cert");
+ this.caFileTextField
+ .setText("/home/heshan/Dev/globusonline/transfer-api-client-java.git/trunk/ca/gd-bundle_ca.cert");
this.certFileTextField.setText("/tmp/x509up_u780936");
this.keyFileTextField.setText("/tmp/x509up_u780936");
this.baseUrlTextField = new XBayaTextField("https://transfer.api.globusonline.org/v0.10");
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/JCRRegistryWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/JCRRegistryWindow.java?rev=1187758&r1=1187757&r2=1187758&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/JCRRegistryWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/JCRRegistryWindow.java Sat Oct 22 19:29:52 2011
@@ -54,14 +54,14 @@ public class JCRRegistryWindow {
private XBayaDialog dialog;
private XBayaTextField urlTextField;
-
+
private XBayaTextField usernameTextField;
-
+
private JPasswordField passwordTextField;
- private XBayaLinkButton newUserButton;
+ private XBayaLinkButton newUserButton;
- private NewJCRRegistryUserDialog newUserWindow;
+ private NewJCRRegistryUserDialog newUserWindow;
/**
* @param engine
@@ -103,7 +103,7 @@ public class JCRRegistryWindow {
try {
registry = new JCRComponentRegistry(url, username, password);
} catch (Exception e) {
- this.engine.getErrorWindow().error(ErrorMessages.CREDENTIALS_WRONG,e);
+ this.engine.getErrorWindow().error(ErrorMessages.CREDENTIALS_WRONG, e);
return;
}
XBayaConfiguration configuration = this.engine.getConfiguration();
@@ -116,27 +116,27 @@ public class JCRRegistryWindow {
this.loader.load(registry);
}
- private void createNewUser(){
- URL specifiedURL = null;
- try {
- specifiedURL = new URL(urlTextField.getText());
- } catch (MalformedURLException e1) {
- //the text box contains invalid url, we'll just ignore it
- }
- if (newUserWindow == null) {
- newUserWindow = new NewJCRRegistryUserDialog(engine);
- }
- newUserWindow.setUrl(specifiedURL);
- newUserWindow.setUsername(usernameTextField.getText());
- newUserWindow.updateControlData();
- newUserWindow.show();
- if (newUserWindow.isUserCreated()){
- urlTextField.setText(newUserWindow.getUrl().toString());
- usernameTextField.setText(newUserWindow.getUrl().toString());
- passwordTextField.setText(newUserWindow.getPassword());
- }
+ private void createNewUser() {
+ URL specifiedURL = null;
+ try {
+ specifiedURL = new URL(urlTextField.getText());
+ } catch (MalformedURLException e1) {
+ // the text box contains invalid url, we'll just ignore it
+ }
+ if (newUserWindow == null) {
+ newUserWindow = new NewJCRRegistryUserDialog(engine);
+ }
+ newUserWindow.setUrl(specifiedURL);
+ newUserWindow.setUsername(usernameTextField.getText());
+ newUserWindow.updateControlData();
+ newUserWindow.show();
+ if (newUserWindow.isUserCreated()) {
+ urlTextField.setText(newUserWindow.getUrl().toString());
+ usernameTextField.setText(newUserWindow.getUrl().toString());
+ passwordTextField.setText(newUserWindow.getPassword());
+ }
}
-
+
/**
* Initializes the GUI.
*/
@@ -153,23 +153,23 @@ public class JCRRegistryWindow {
this.newUserButton = new XBayaLinkButton("Create new user...");
newUserButton.setHorizontalAlignment(XBayaLinkButton.RIGHT);
JLabel emptyLabel = new JLabel("");
-
+
newUserButton.addActionListener(new AbstractAction() {
public void actionPerformed(ActionEvent e) {
- createNewUser();
+ createNewUser();
}
});
-
+
GridPanel infoPanel = new GridPanel();
infoPanel.add(urlLabel);
infoPanel.add(this.urlTextField);
-// GridBagConstraints c = new GridBagConstraints();
-// c.fill = GridBagConstraints.HORIZONTAL;
-// c.gridwidth = 2;
-// c.gridx = 0;
-// c.gridy = 1;
-// infoPanel.getContentPanel().add(new JSeparator(SwingConstants.HORIZONTAL),c);
-// infoPanel.add(new JSeparator(SwingConstants.HORIZONTAL));
+ // GridBagConstraints c = new GridBagConstraints();
+ // c.fill = GridBagConstraints.HORIZONTAL;
+ // c.gridwidth = 2;
+ // c.gridx = 0;
+ // c.gridy = 1;
+ // infoPanel.getContentPanel().add(new JSeparator(SwingConstants.HORIZONTAL),c);
+ // infoPanel.add(new JSeparator(SwingConstants.HORIZONTAL));
infoPanel.add(nameLabel);
infoPanel.add(this.usernameTextField);
infoPanel.add(passLabel);
@@ -177,7 +177,7 @@ public class JCRRegistryWindow {
infoPanel.add(emptyLabel);
infoPanel.add(this.newUserButton);
infoPanel.layout(4, 2, GridPanel.WEIGHT_NONE, 1);
-
+
JButton okButton = new JButton("OK");
okButton.addActionListener(new AbstractAction() {
public void actionPerformed(ActionEvent e) {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/NewJCRRegistryUserDialog.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/NewJCRRegistryUserDialog.java?rev=1187758&r1=1187757&r2=1187758&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/NewJCRRegistryUserDialog.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/NewJCRRegistryUserDialog.java Sat Oct 22 19:29:52 2011
@@ -26,35 +26,35 @@ public class NewJCRRegistryUserDialog {
private XBayaDialog dialog;
private XBayaTextField urlTextField;
-
+
private XBayaTextField usernameTextField;
-
+
private JPasswordField passwordTextField;
- private String username;
-
- private URL url;
-
- private String password;
-
- private JPasswordField confirmPasswordTextField;
-
- private JButton okButton;
-
- private boolean userCreated=false;
-
+ private String username;
+
+ private URL url;
+
+ private String password;
+
+ private JPasswordField confirmPasswordTextField;
+
+ private JButton okButton;
+
+ private boolean userCreated = false;
+
public NewJCRRegistryUserDialog(XBayaEngine engine) {
- this(engine,null,null);
+ this(engine, null, null);
}
-
+
public NewJCRRegistryUserDialog(XBayaEngine engine, URL url) {
- this(engine,url,null);
+ this(engine, url, null);
}
-
+
public NewJCRRegistryUserDialog(XBayaEngine engine, String username) {
- this(engine,null,username);
+ this(engine, null, username);
}
-
+
/**
* @param engine
*/
@@ -73,53 +73,53 @@ public class NewJCRRegistryUserDialog {
}
private void hide() {
- setUserCreated(false);
+ setUserCreated(false);
this.dialog.hide();
}
- private void setData(){
- updateURL();
- updateUsername();
- updatePassword();
+ private void setData() {
+ updateURL();
+ updateUsername();
+ updatePassword();
}
-
+
private void ok() {
- setData();
- String status = updateStatus();
- if (status==null){
- try {
- JCRComponentRegistry registry = new JCRComponentRegistry(getUrl().toURI(), "anonymous", "");
- registry.getUserManager().createUser(getUsername(), getPassword());
- hide();
- setUserCreated(true);
- } catch (URISyntaxException e) {
- e.printStackTrace();
- engine.getErrorWindow().error(e.getMessage());
- } catch (AuthorizableExistsException e) {
- e.printStackTrace();
- engine.getErrorWindow().error(e.getMessage());
- } catch (RepositoryException e) {
- e.printStackTrace();
- engine.getErrorWindow().error(e.getMessage());
- }
- }else{
- engine.getErrorWindow().error(status);
- }
- }
-
- private String updateStatus(){
- String msg=null;
- if (getUrl()==null){
- msg="The url cannot be empty";
- } else if (getUsername()==null || getUsername().equals("")){
- msg="Username cannot be empty";
- } else if (getPassword()==null || getPassword().equals("")){
- msg="Passwords must match or cannot be empty";
- }
-// okButton.setEnabled(msg==null);
- return msg;
+ setData();
+ String status = updateStatus();
+ if (status == null) {
+ try {
+ JCRComponentRegistry registry = new JCRComponentRegistry(getUrl().toURI(), "anonymous", "");
+ registry.getUserManager().createUser(getUsername(), getPassword());
+ hide();
+ setUserCreated(true);
+ } catch (URISyntaxException e) {
+ e.printStackTrace();
+ engine.getErrorWindow().error(e.getMessage());
+ } catch (AuthorizableExistsException e) {
+ e.printStackTrace();
+ engine.getErrorWindow().error(e.getMessage());
+ } catch (RepositoryException e) {
+ e.printStackTrace();
+ engine.getErrorWindow().error(e.getMessage());
+ }
+ } else {
+ engine.getErrorWindow().error(status);
+ }
+ }
+
+ private String updateStatus() {
+ String msg = null;
+ if (getUrl() == null) {
+ msg = "The url cannot be empty";
+ } else if (getUsername() == null || getUsername().equals("")) {
+ msg = "Username cannot be empty";
+ } else if (getPassword() == null || getPassword().equals("")) {
+ msg = "Passwords must match or cannot be empty";
+ }
+ // okButton.setEnabled(msg==null);
+ return msg;
}
-
+
/**
* Initializes the GUI.
*/
@@ -132,7 +132,7 @@ public class NewJCRRegistryUserDialog {
XBayaLabel userLabel = new XBayaLabel("Username", this.usernameTextField);
XBayaLabel passLabel = new XBayaLabel("Password", this.passwordTextField);
XBayaLabel confirmPassLabel = new XBayaLabel("Confirm Password", this.confirmPasswordTextField);
-
+
GridPanel infoPanel = new GridPanel();
infoPanel.add(urlLabel);
infoPanel.add(this.urlTextField);
@@ -144,41 +144,41 @@ public class NewJCRRegistryUserDialog {
infoPanel.add(this.confirmPasswordTextField);
infoPanel.layout(4, 2, GridPanel.WEIGHT_NONE, 1);
-
- urlTextField.getSwingComponent().addActionListener(new ActionListener(){
- @Override
- public void actionPerformed(ActionEvent event) {
- updateURL();
- updateStatus();
- }
-
- });
-
- usernameTextField.getSwingComponent().addActionListener(new ActionListener(){
- @Override
- public void actionPerformed(ActionEvent event) {
- updateUsername();
- updateStatus();
- }
-
- });
-
- passwordTextField.addActionListener(new ActionListener(){
- @Override
- public void actionPerformed(ActionEvent event) {
- updatePassword();
- updateStatus();
- }
- });
-
- confirmPasswordTextField.addActionListener(new ActionListener(){
- @Override
- public void actionPerformed(ActionEvent event) {
- updatePassword();
- updateStatus();
- }
+
+ urlTextField.getSwingComponent().addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent event) {
+ updateURL();
+ updateStatus();
+ }
+
});
-
+
+ usernameTextField.getSwingComponent().addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent event) {
+ updateUsername();
+ updateStatus();
+ }
+
+ });
+
+ passwordTextField.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent event) {
+ updatePassword();
+ updateStatus();
+ }
+ });
+
+ confirmPasswordTextField.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent event) {
+ updatePassword();
+ updateStatus();
+ }
+ });
+
okButton = new JButton("OK");
okButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
@@ -202,68 +202,68 @@ public class NewJCRRegistryUserDialog {
updateControlData();
}
- public String getUsername() {
- return username;
- }
-
- public void setUsername(String username) {
- this.username = username;
- }
-
- public void updateControlData(){
- if (usernameTextField!=null && getUsername()!=null){
- usernameTextField.setText(getUsername());
- }
- if (urlTextField!=null && getUrl()!=null){
- urlTextField.setText(getUrl().toString());
- }
- }
-
- public URL getUrl() {
- return url;
- }
-
- public void setUrl(URL url) {
- this.url = url;
- }
-
- public String getPassword() {
- return password;
- }
-
- public void setPassword(String password) {
- this.password = password;
- }
-
- private void updateURL() {
- URL specifiedURL=null;
- try {
- specifiedURL = new URL(urlTextField.getText());
- } catch (MalformedURLException e) {
- //erroneious url, ignore it
- }
- setUrl(specifiedURL);
- }
-
- private void updateUsername() {
- setUsername(usernameTextField.getText());
- }
-
- private void updatePassword() {
- String password = null;
- String ptext = new String(passwordTextField.getPassword());
- String ctext = new String(confirmPasswordTextField.getPassword());
- if (ptext.equals(ctext)){
- password = ptext;
- }
- setPassword(password);
- }
-
- public boolean isUserCreated() {
- return userCreated;
- }
-
- public void setUserCreated(boolean userCreated) {
- this.userCreated = userCreated;
- }
+ public String getUsername() {
+ return username;
+ }
+
+ public void setUsername(String username) {
+ this.username = username;
+ }
+
+ public void updateControlData() {
+ if (usernameTextField != null && getUsername() != null) {
+ usernameTextField.setText(getUsername());
+ }
+ if (urlTextField != null && getUrl() != null) {
+ urlTextField.setText(getUrl().toString());
+ }
+ }
+
+ public URL getUrl() {
+ return url;
+ }
+
+ public void setUrl(URL url) {
+ this.url = url;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+ private void updateURL() {
+ URL specifiedURL = null;
+ try {
+ specifiedURL = new URL(urlTextField.getText());
+ } catch (MalformedURLException e) {
+ // erroneious url, ignore it
+ }
+ setUrl(specifiedURL);
+ }
+
+ private void updateUsername() {
+ setUsername(usernameTextField.getText());
+ }
+
+ private void updatePassword() {
+ String password = null;
+ String ptext = new String(passwordTextField.getPassword());
+ String ctext = new String(confirmPasswordTextField.getPassword());
+ if (ptext.equals(ctext)) {
+ password = ptext;
+ }
+ setPassword(password);
+ }
+
+ public boolean isUserCreated() {
+ return userCreated;
+ }
+
+ public void setUserCreated(boolean userCreated) {
+ this.userCreated = userCreated;
+ }
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/StreamSourceNodeGUI.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/StreamSourceNodeGUI.java?rev=1187758&r1=1187757&r2=1187758&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/StreamSourceNodeGUI.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/StreamSourceNodeGUI.java Sat Oct 22 19:29:52 2011
@@ -62,7 +62,6 @@ public class StreamSourceNodeGUI extends
this.configurationWindow.show();
}
-
protected void setSelectedFlag(boolean flag) {
this.selected = flag;
if (this.selected) {
@@ -72,5 +71,4 @@ public class StreamSourceNodeGUI extends
}
}
-
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/JCRComponentRegistry.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/JCRComponentRegistry.java?rev=1187758&r1=1187757&r2=1187758&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/JCRComponentRegistry.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/JCRComponentRegistry.java Sat Oct 22 19:29:52 2011
@@ -42,14 +42,14 @@ import org.apache.airavata.xbaya.compone
public class JCRComponentRegistry extends ComponentRegistry {
private static final String NAME = "JCR Components";
-
+
private JCRRegistry registry;
public JCRComponentRegistry(URI url, String username, String password) throws RepositoryException {
HashMap<String, String> map = new HashMap<String, String>();
map.put("org.apache.jackrabbit.repository.uri", url.toString());
try {
- this.registry = new JCRRegistry(url,"org.apache.jackrabbit.rmi.repository.RmiRepositoryFactory", username,
+ this.registry = new JCRRegistry(url, "org.apache.jackrabbit.rmi.repository.RmiRepositoryFactory", username,
password, map);
} catch (RepositoryException e) {
throw e;
@@ -59,17 +59,17 @@ public class JCRComponentRegistry extend
static {
registerUserManagers();
}
-
- /**
- * to manually trigger user manager registrations
- */
+
+ /**
+ * to manually trigger user manager registrations
+ */
private static void registerUserManagers() {
- try {
- Class.forName("org.apache.airavata.xbaya.component.registry.jackrabbit.user.JackRabbitUserManagerWrap");
- } catch (ClassNotFoundException e) {
- //error in registering user managers
- }
- }
+ try {
+ Class.forName("org.apache.airavata.xbaya.component.registry.jackrabbit.user.JackRabbitUserManagerWrap");
+ } catch (ClassNotFoundException e) {
+ // error in registering user managers
+ }
+ }
/**
* @see org.apache.airavata.xbaya.component.registry.ComponentRegistry#getComponentTree()
@@ -78,20 +78,20 @@ public class JCRComponentRegistry extend
public ComponentTreeNode getComponentTree() {
ComponentTreeNode tree = new ComponentTreeNode(this);
try {
- List<ServiceDescription> services = this.registry.searchServiceDescription("");
- for (ServiceDescription serviceDescription : services) {
- String serviceName = serviceDescription.getId();
- JCRComponentReference jcr = new JCRComponentReference(serviceName, registry.getWSDL(serviceName));
- tree.add(new ComponentTreeNode(jcr));
- }
- } catch (PathNotFoundException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- } catch (ServiceDescriptionRetrieveException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
-
+ List<ServiceDescription> services = this.registry.searchServiceDescription("");
+ for (ServiceDescription serviceDescription : services) {
+ String serviceName = serviceDescription.getId();
+ JCRComponentReference jcr = new JCRComponentReference(serviceName, registry.getWSDL(serviceName));
+ tree.add(new ComponentTreeNode(jcr));
+ }
+ } catch (PathNotFoundException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ } catch (ServiceDescriptionRetrieveException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
return tree;
}
@@ -103,60 +103,65 @@ public class JCRComponentRegistry extend
return NAME;
}
- public List<String> getGFacURLList(){
+ public List<String> getGFacURLList() {
return this.registry.getGFacDescriptorList();
}
- public UserManager getUserManager(){
- return registry.getUserManager();
+ public UserManager getUserManager() {
+ return registry.getUserManager();
}
-
- public String saveDeploymentDescription(String service, String host,
- ApplicationDeploymentDescription app){
+
+ public String saveDeploymentDescription(String service, String host, ApplicationDeploymentDescription app) {
// deploy the service on host
registry.deployServiceOnHost(service, host);
-
+
// save deployment description
- return registry.saveDeploymentDescription(service, host, app);
+ return registry.saveDeploymentDescription(service, host, app);
+ }
+
+ public String saveHostDescription(String name, HostDescription host) {
+ return registry.saveHostDescription(host);
+ }
+
+ public List<HostDescription> searchHostDescription(String nameRegEx) throws HostDescriptionRetrieveException,
+ PathNotFoundException {
+ return registry.searchHostDescription(nameRegEx);
+ }
+
+ public HostDescription getHostDescription(String nameRegEx) throws HostDescriptionRetrieveException,
+ PathNotFoundException {
+ return registry.getHostDescription(nameRegEx);
+ }
+
+ public List<ApplicationDeploymentDescription> searchApplicationDescription(String serviceName, String host)
+ throws HostDescriptionRetrieveException, PathNotFoundException, DeploymentDescriptionRetrieveException {
+ return registry.searchDeploymentDescription(serviceName, host);
+ }
+
+ public ApplicationDeploymentDescription getApplicationDescription(String serviceName, String host)
+ throws PathNotFoundException, DeploymentDescriptionRetrieveException {
+ return registry.getDeploymentDescription(serviceName, host);
+ }
+
+ public String saveServiceDescription(String name, ServiceDescription service) {
+ return registry.saveServiceDescription(service);
+ }
+
+ public ServiceDescription getServiceDescription(String serviceName) throws PathNotFoundException,
+ ServiceDescriptionRetrieveException {
+ return registry.getServiceDescription(serviceName);
+ }
+
+ public List<ServiceDescription> searchServiceDescription(String serviceName)
+ throws ServiceDescriptionRetrieveException, PathNotFoundException {
+ return registry.searchServiceDescription(serviceName);
+ }
+
+ public Registry getRegistry() {
+ return registry;
+ }
+
+ public String saveWSDL(ServiceDescription service) {
+ return registry.saveWSDL(service);
}
-
- public String saveHostDescription(String name, HostDescription host) {
- return registry.saveHostDescription(host);
- }
-
- public List<HostDescription> searchHostDescription(String nameRegEx) throws HostDescriptionRetrieveException, PathNotFoundException {
- return registry.searchHostDescription(nameRegEx);
- }
-
- public HostDescription getHostDescription(String nameRegEx) throws HostDescriptionRetrieveException, PathNotFoundException {
- return registry.getHostDescription(nameRegEx);
- }
-
- public List<ApplicationDeploymentDescription> searchApplicationDescription(String serviceName, String host) throws HostDescriptionRetrieveException, PathNotFoundException, DeploymentDescriptionRetrieveException {
- return registry.searchDeploymentDescription(serviceName, host);
- }
-
- public ApplicationDeploymentDescription getApplicationDescription(String serviceName, String host) throws PathNotFoundException, DeploymentDescriptionRetrieveException {
- return registry.getDeploymentDescription(serviceName, host);
- }
-
- public String saveServiceDescription(String name, ServiceDescription service) {
- return registry.saveServiceDescription(service);
- }
-
- public ServiceDescription getServiceDescription(String serviceName) throws PathNotFoundException, ServiceDescriptionRetrieveException {
- return registry.getServiceDescription(serviceName);
- }
-
- public List<ServiceDescription> searchServiceDescription(String serviceName) throws ServiceDescriptionRetrieveException, PathNotFoundException{
- return registry.searchServiceDescription(serviceName);
- }
-
- public Registry getRegistry() {
- return registry;
- }
-
- public String saveWSDL(ServiceDescription service) {
- return registry.saveWSDL(service);
- }
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/AbstractJackRabbitUMComponent.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/AbstractJackRabbitUMComponent.java?rev=1187758&r1=1187757&r2=1187758&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/AbstractJackRabbitUMComponent.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/AbstractJackRabbitUMComponent.java Sat Oct 22 19:29:52 2011
@@ -9,39 +9,37 @@ import org.apache.jackrabbit.api.securit
public class AbstractJackRabbitUMComponent {
- protected List<Group> getJRGroupList(
- Iterator<org.apache.airavata.registry.api.user.Group> airavataUMGroupList) {
- List<Group> groupList=new ArrayList<Group>();
- while(airavataUMGroupList.hasNext()){
- groupList.add(new JackRabbitGroup(airavataUMGroupList.next()));
- }
- return groupList;
- }
-
- protected List<org.apache.airavata.registry.api.user.Group> getGroupList(
- Iterator<Group> airavataUMGroupList) {
- List<org.apache.airavata.registry.api.user.Group> groupList=new ArrayList<org.apache.airavata.registry.api.user.Group>();
- while(airavataUMGroupList.hasNext()){
- groupList.add(new JackRabbitGroupWrap(airavataUMGroupList.next()));
- }
- return groupList;
- }
-
- protected List<Authorizable> getJRAuthorizableList(
- Iterator<org.apache.airavata.registry.api.user.Authorizable> jackRabbitAuthorizableList) {
- List<Authorizable> authorizableList = new ArrayList<Authorizable>();
- while(jackRabbitAuthorizableList.hasNext()) {
- authorizableList.add(new JackRabbitAuthorizable(jackRabbitAuthorizableList.next()));
- }
- return authorizableList;
- }
-
- protected List<org.apache.airavata.registry.api.user.Authorizable> getAuthorizableList(
- Iterator<Authorizable> jackRabbitAuthorizableList) {
- List<org.apache.airavata.registry.api.user.Authorizable> authorizableList = new ArrayList<org.apache.airavata.registry.api.user.Authorizable>();
- while(jackRabbitAuthorizableList.hasNext()) {
- authorizableList.add(new JackRabbitAuthorizableWrap(jackRabbitAuthorizableList.next()));
- }
- return authorizableList;
- }
+ protected List<Group> getJRGroupList(Iterator<org.apache.airavata.registry.api.user.Group> airavataUMGroupList) {
+ List<Group> groupList = new ArrayList<Group>();
+ while (airavataUMGroupList.hasNext()) {
+ groupList.add(new JackRabbitGroup(airavataUMGroupList.next()));
+ }
+ return groupList;
+ }
+
+ protected List<org.apache.airavata.registry.api.user.Group> getGroupList(Iterator<Group> airavataUMGroupList) {
+ List<org.apache.airavata.registry.api.user.Group> groupList = new ArrayList<org.apache.airavata.registry.api.user.Group>();
+ while (airavataUMGroupList.hasNext()) {
+ groupList.add(new JackRabbitGroupWrap(airavataUMGroupList.next()));
+ }
+ return groupList;
+ }
+
+ protected List<Authorizable> getJRAuthorizableList(
+ Iterator<org.apache.airavata.registry.api.user.Authorizable> jackRabbitAuthorizableList) {
+ List<Authorizable> authorizableList = new ArrayList<Authorizable>();
+ while (jackRabbitAuthorizableList.hasNext()) {
+ authorizableList.add(new JackRabbitAuthorizable(jackRabbitAuthorizableList.next()));
+ }
+ return authorizableList;
+ }
+
+ protected List<org.apache.airavata.registry.api.user.Authorizable> getAuthorizableList(
+ Iterator<Authorizable> jackRabbitAuthorizableList) {
+ List<org.apache.airavata.registry.api.user.Authorizable> authorizableList = new ArrayList<org.apache.airavata.registry.api.user.Authorizable>();
+ while (jackRabbitAuthorizableList.hasNext()) {
+ authorizableList.add(new JackRabbitAuthorizableWrap(jackRabbitAuthorizableList.next()));
+ }
+ return authorizableList;
+ }
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitAuthorizable.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitAuthorizable.java?rev=1187758&r1=1187757&r2=1187758&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitAuthorizable.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitAuthorizable.java Sat Oct 22 19:29:52 2011
@@ -11,81 +11,80 @@ import org.apache.jackrabbit.api.securit
import org.apache.jackrabbit.api.security.user.Group;
public class JackRabbitAuthorizable extends AbstractJackRabbitUMComponent implements Authorizable {
- private org.apache.airavata.registry.api.user.Authorizable authorizable;
-
- public JackRabbitAuthorizable(org.apache.airavata.registry.api.user.Authorizable authorizable) {
- this.authorizable=authorizable;
- }
-
- @Override
- public Iterator<Group> declaredMemberOf() throws RepositoryException {
- Iterator<org.apache.airavata.registry.api.user.Group> declaredMemberOfGroupList = authorizable.declaredMemberOf();
- List<Group> groupList = getJRGroupList(declaredMemberOfGroupList);
- return groupList.iterator();
- }
-
- @Override
- public String getID() throws RepositoryException {
- return authorizable.getID();
- }
-
- @Override
- public Principal getPrincipal() throws RepositoryException {
- return authorizable.getPrincipal();
- }
-
- @Override
- public Value[] getProperty(String name) throws RepositoryException {
- return authorizable.getProperty(name);
- }
-
- @Override
- public Iterator<String> getPropertyNames() throws RepositoryException {
- return authorizable.getPropertyNames();
- }
-
- @Override
- public Iterator<String> getPropertyNames(String name)
- throws RepositoryException {
- return authorizable.getPropertyNames(name);
- }
-
- @Override
- public boolean hasProperty(String name) throws RepositoryException {
- return authorizable.hasProperty(name);
- }
-
- @Override
- public boolean isGroup() {
- return authorizable.isGroup();
- }
-
- @Override
- public Iterator<Group> memberOf() throws RepositoryException {
- Iterator<org.apache.airavata.registry.api.user.Group> declaredMemberOfGroupList = authorizable.memberOf();
- List<Group> groupList = getJRGroupList(declaredMemberOfGroupList);
- return groupList.iterator();
- }
-
- @Override
- public void remove() throws RepositoryException {
- authorizable.remove();
- }
-
- @Override
- public boolean removeProperty(String name) throws RepositoryException {
- return authorizable.removeProperty(name);
- }
-
- @Override
- public void setProperty(String name, Value value) throws RepositoryException {
- authorizable.setProperty(name, value);
- }
-
- @Override
- public void setProperty(String name, Value[] value)
- throws RepositoryException {
- authorizable.setProperty(name, value);
- }
+ private org.apache.airavata.registry.api.user.Authorizable authorizable;
+
+ public JackRabbitAuthorizable(org.apache.airavata.registry.api.user.Authorizable authorizable) {
+ this.authorizable = authorizable;
+ }
+
+ @Override
+ public Iterator<Group> declaredMemberOf() throws RepositoryException {
+ Iterator<org.apache.airavata.registry.api.user.Group> declaredMemberOfGroupList = authorizable
+ .declaredMemberOf();
+ List<Group> groupList = getJRGroupList(declaredMemberOfGroupList);
+ return groupList.iterator();
+ }
+
+ @Override
+ public String getID() throws RepositoryException {
+ return authorizable.getID();
+ }
+
+ @Override
+ public Principal getPrincipal() throws RepositoryException {
+ return authorizable.getPrincipal();
+ }
+
+ @Override
+ public Value[] getProperty(String name) throws RepositoryException {
+ return authorizable.getProperty(name);
+ }
+
+ @Override
+ public Iterator<String> getPropertyNames() throws RepositoryException {
+ return authorizable.getPropertyNames();
+ }
+
+ @Override
+ public Iterator<String> getPropertyNames(String name) throws RepositoryException {
+ return authorizable.getPropertyNames(name);
+ }
+
+ @Override
+ public boolean hasProperty(String name) throws RepositoryException {
+ return authorizable.hasProperty(name);
+ }
+
+ @Override
+ public boolean isGroup() {
+ return authorizable.isGroup();
+ }
+
+ @Override
+ public Iterator<Group> memberOf() throws RepositoryException {
+ Iterator<org.apache.airavata.registry.api.user.Group> declaredMemberOfGroupList = authorizable.memberOf();
+ List<Group> groupList = getJRGroupList(declaredMemberOfGroupList);
+ return groupList.iterator();
+ }
+
+ @Override
+ public void remove() throws RepositoryException {
+ authorizable.remove();
+ }
+
+ @Override
+ public boolean removeProperty(String name) throws RepositoryException {
+ return authorizable.removeProperty(name);
+ }
+
+ @Override
+ public void setProperty(String name, Value value) throws RepositoryException {
+ authorizable.setProperty(name, value);
+ }
+
+ @Override
+ public void setProperty(String name, Value[] value) throws RepositoryException {
+ authorizable.setProperty(name, value);
+ }
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitAuthorizableWrap.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitAuthorizableWrap.java?rev=1187758&r1=1187757&r2=1187758&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitAuthorizableWrap.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitAuthorizableWrap.java Sat Oct 22 19:29:52 2011
@@ -10,80 +10,77 @@ import org.apache.airavata.registry.api.
import org.apache.airavata.registry.api.user.Group;
public class JackRabbitAuthorizableWrap extends AbstractJackRabbitUMComponent implements Authorizable {
- private org.apache.jackrabbit.api.security.user.Authorizable authorizable;
-
- public JackRabbitAuthorizableWrap(org.apache.jackrabbit.api.security.user.Authorizable authorizable) {
- this.authorizable=authorizable;
- }
-
- @Override
- public String getID() throws RepositoryException {
- return authorizable.getID();
- }
-
- @Override
- public boolean isGroup() {
- return authorizable.isGroup();
- }
-
- @Override
- public Principal getPrincipal() throws RepositoryException {
- return authorizable.getPrincipal();
- }
-
- @Override
- public void remove() throws RepositoryException {
- authorizable.remove();
- }
-
- @Override
- public Iterator<String> getPropertyNames() throws RepositoryException {
- return authorizable.getPropertyNames();
- }
-
- @Override
- public boolean hasProperty(String name) throws RepositoryException {
- return authorizable.hasProperty(name);
- }
-
- @Override
- public void setProperty(String name, Value value)
- throws RepositoryException {
- authorizable.setProperty(name, value);
- }
-
- @Override
- public void setProperty(String name, Value[] value)
- throws RepositoryException {
- authorizable.setProperty(name, value);
- }
-
- @Override
- public Value[] getProperty(String name) throws RepositoryException {
- return authorizable.getProperty(name);
- }
-
- @Override
- public boolean removeProperty(String name) throws RepositoryException {
- return authorizable.removeProperty(name);
- }
-
- @Override
- public Iterator<Group> declaredMemberOf() throws RepositoryException {
- Iterator<org.apache.jackrabbit.api.security.user.Group> declaredMemberOf = authorizable.declaredMemberOf();
- return getGroupList(declaredMemberOf).iterator();
- }
-
- @Override
- public Iterator<Group> memberOf() throws RepositoryException {
- Iterator<org.apache.jackrabbit.api.security.user.Group> declaredMemberOf = authorizable.memberOf();
- return getGroupList(declaredMemberOf).iterator();
- }
-
- @Override
- public Iterator<String> getPropertyNames(String name)
- throws RepositoryException {
- return authorizable.getPropertyNames(name);
- }
+ private org.apache.jackrabbit.api.security.user.Authorizable authorizable;
+
+ public JackRabbitAuthorizableWrap(org.apache.jackrabbit.api.security.user.Authorizable authorizable) {
+ this.authorizable = authorizable;
+ }
+
+ @Override
+ public String getID() throws RepositoryException {
+ return authorizable.getID();
+ }
+
+ @Override
+ public boolean isGroup() {
+ return authorizable.isGroup();
+ }
+
+ @Override
+ public Principal getPrincipal() throws RepositoryException {
+ return authorizable.getPrincipal();
+ }
+
+ @Override
+ public void remove() throws RepositoryException {
+ authorizable.remove();
+ }
+
+ @Override
+ public Iterator<String> getPropertyNames() throws RepositoryException {
+ return authorizable.getPropertyNames();
+ }
+
+ @Override
+ public boolean hasProperty(String name) throws RepositoryException {
+ return authorizable.hasProperty(name);
+ }
+
+ @Override
+ public void setProperty(String name, Value value) throws RepositoryException {
+ authorizable.setProperty(name, value);
+ }
+
+ @Override
+ public void setProperty(String name, Value[] value) throws RepositoryException {
+ authorizable.setProperty(name, value);
+ }
+
+ @Override
+ public Value[] getProperty(String name) throws RepositoryException {
+ return authorizable.getProperty(name);
+ }
+
+ @Override
+ public boolean removeProperty(String name) throws RepositoryException {
+ return authorizable.removeProperty(name);
+ }
+
+ @Override
+ public Iterator<Group> declaredMemberOf() throws RepositoryException {
+ Iterator<org.apache.jackrabbit.api.security.user.Group> declaredMemberOf = authorizable.declaredMemberOf();
+ return getGroupList(declaredMemberOf).iterator();
+ }
+
+ @Override
+ public Iterator<Group> memberOf() throws RepositoryException {
+ Iterator<org.apache.jackrabbit.api.security.user.Group> declaredMemberOf = authorizable.memberOf();
+ return getGroupList(declaredMemberOf).iterator();
+ }
+
+ @Override
+ public Iterator<String> getPropertyNames(String name) throws RepositoryException {
+ return authorizable.getPropertyNames(name);
+ }
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitGroup.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitGroup.java?rev=1187758&r1=1187757&r2=1187758&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitGroup.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitGroup.java Sat Oct 22 19:29:52 2011
@@ -9,116 +9,107 @@ import javax.jcr.Value;
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.Group;
-
public class JackRabbitGroup extends AbstractJackRabbitUMComponent implements Group {
- private org.apache.airavata.registry.api.user.Group group;
+ private org.apache.airavata.registry.api.user.Group group;
- public JackRabbitGroup(org.apache.airavata.registry.api.user.Group group) {
- this.group=group;
- }
-
- @Override
- public String getID() throws RepositoryException {
- return group.getID();
- }
-
- @Override
- public boolean isGroup() {
- return group.isGroup();
- }
-
- @Override
- public Principal getPrincipal() throws RepositoryException {
- return group.getPrincipal();
- }
-
- @Override
- public void remove() throws RepositoryException {
- group.remove();
- }
-
- @Override
- public Iterator<String> getPropertyNames() throws RepositoryException {
- return group.getPropertyNames();
- }
-
- @Override
- public boolean hasProperty(String name) throws RepositoryException {
- return group.hasProperty(name);
- }
-
- @Override
- public void setProperty(String name, Value value)
- throws RepositoryException {
- group.setProperty(name, value);
- }
-
- @Override
- public void setProperty(String name, Value[] value)
- throws RepositoryException {
- group.setProperty(name, value);
- }
-
- @Override
- public Value[] getProperty(String name) throws RepositoryException {
- return group.getProperty(name);
- }
-
- @Override
- public boolean removeProperty(String name) throws RepositoryException {
- return group.removeProperty(name);
- }
-
- @Override
- public Iterator<Authorizable> getDeclaredMembers()
- throws RepositoryException {
- Iterator<org.apache.airavata.registry.api.user.Authorizable> declaredMembers = group.getDeclaredMembers();
- return getJRAuthorizableList(declaredMembers).iterator();
- }
-
- @Override
- public Iterator<Authorizable> getMembers() throws RepositoryException {
- return getJRAuthorizableList(group.getMembers()).iterator();
- }
-
- @Override
- public boolean isMember(Authorizable authorizable)
- throws RepositoryException {
- return group.isMember(new JackRabbitAuthorizableWrap(authorizable));
- }
-
- @Override
- public boolean addMember(Authorizable authorizable)
- throws RepositoryException {
- return group.addMember(new JackRabbitAuthorizableWrap(authorizable));
- }
-
- @Override
- public boolean removeMember(Authorizable authorizable)
- throws RepositoryException {
- return group.removeMember(new JackRabbitAuthorizableWrap(authorizable));
- }
-
- @Override
- public Iterator<Group> declaredMemberOf() throws RepositoryException {
- return getJRGroupList(group.declaredMemberOf()).iterator();
- }
-
- @Override
- public Iterator<Group> memberOf() throws RepositoryException {
- return getJRGroupList(group.memberOf()).iterator();
- }
-
- @Override
- public Iterator<String> getPropertyNames(String name)
- throws RepositoryException {
- return group.getPropertyNames(name);
- }
-
- @Override
- public boolean isDeclaredMember(Authorizable authorizable)
- throws RepositoryException {
- return group.isDeclaredMember(new JackRabbitAuthorizableWrap(authorizable));
- }
+ public JackRabbitGroup(org.apache.airavata.registry.api.user.Group group) {
+ this.group = group;
+ }
+
+ @Override
+ public String getID() throws RepositoryException {
+ return group.getID();
+ }
+
+ @Override
+ public boolean isGroup() {
+ return group.isGroup();
+ }
+
+ @Override
+ public Principal getPrincipal() throws RepositoryException {
+ return group.getPrincipal();
+ }
+
+ @Override
+ public void remove() throws RepositoryException {
+ group.remove();
+ }
+
+ @Override
+ public Iterator<String> getPropertyNames() throws RepositoryException {
+ return group.getPropertyNames();
+ }
+
+ @Override
+ public boolean hasProperty(String name) throws RepositoryException {
+ return group.hasProperty(name);
+ }
+
+ @Override
+ public void setProperty(String name, Value value) throws RepositoryException {
+ group.setProperty(name, value);
+ }
+
+ @Override
+ public void setProperty(String name, Value[] value) throws RepositoryException {
+ group.setProperty(name, value);
+ }
+
+ @Override
+ public Value[] getProperty(String name) throws RepositoryException {
+ return group.getProperty(name);
+ }
+
+ @Override
+ public boolean removeProperty(String name) throws RepositoryException {
+ return group.removeProperty(name);
+ }
+
+ @Override
+ public Iterator<Authorizable> getDeclaredMembers() throws RepositoryException {
+ Iterator<org.apache.airavata.registry.api.user.Authorizable> declaredMembers = group.getDeclaredMembers();
+ return getJRAuthorizableList(declaredMembers).iterator();
+ }
+
+ @Override
+ public Iterator<Authorizable> getMembers() throws RepositoryException {
+ return getJRAuthorizableList(group.getMembers()).iterator();
+ }
+
+ @Override
+ public boolean isMember(Authorizable authorizable) throws RepositoryException {
+ return group.isMember(new JackRabbitAuthorizableWrap(authorizable));
+ }
+
+ @Override
+ public boolean addMember(Authorizable authorizable) throws RepositoryException {
+ return group.addMember(new JackRabbitAuthorizableWrap(authorizable));
+ }
+
+ @Override
+ public boolean removeMember(Authorizable authorizable) throws RepositoryException {
+ return group.removeMember(new JackRabbitAuthorizableWrap(authorizable));
+ }
+
+ @Override
+ public Iterator<Group> declaredMemberOf() throws RepositoryException {
+ return getJRGroupList(group.declaredMemberOf()).iterator();
+ }
+
+ @Override
+ public Iterator<Group> memberOf() throws RepositoryException {
+ return getJRGroupList(group.memberOf()).iterator();
+ }
+
+ @Override
+ public Iterator<String> getPropertyNames(String name) throws RepositoryException {
+ return group.getPropertyNames(name);
+ }
+
+ @Override
+ public boolean isDeclaredMember(Authorizable authorizable) throws RepositoryException {
+ return group.isDeclaredMember(new JackRabbitAuthorizableWrap(authorizable));
+ }
}