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/31 07:48:31 UTC
svn commit: r1195355 [7/14] - in /incubator/airavata/trunk/modules:
commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/type/
commons/gfac-schema/src/main/java/org/apache/airavata/commons/gfac/wsdl/
commons/registry-api/src/main/java/org...
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=1195355&r1=1195354&r2=1195355&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 Mon Oct 31 06:48:11 2011
@@ -19,272 +19,274 @@
*
*/
-package org.apache.airavata.xbaya.component.gui;
-
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.net.MalformedURLException;
-import java.net.URISyntaxException;
-import java.net.URL;
-
-import javax.jcr.RepositoryException;
-import javax.swing.JButton;
-import javax.swing.JPanel;
-import javax.swing.JPasswordField;
-
-import org.apache.airavata.registry.api.user.AuthorizableExistsException;
-import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.component.registry.JCRComponentRegistry;
-import org.apache.airavata.xbaya.gui.GridPanel;
-import org.apache.airavata.xbaya.gui.XBayaDialog;
-import org.apache.airavata.xbaya.gui.XBayaLabel;
-import org.apache.airavata.xbaya.gui.XBayaTextField;
-
-public class NewJCRRegistryUserDialog {
-
- private XBayaEngine engine;
-
- 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;
-
- public NewJCRRegistryUserDialog(XBayaEngine engine) {
- this(engine, null, null);
- }
-
- public NewJCRRegistryUserDialog(XBayaEngine engine, URL url) {
- this(engine, url, null);
- }
-
- public NewJCRRegistryUserDialog(XBayaEngine engine, String username) {
- this(engine, null, username);
- }
-
- /**
- * @param engine
- */
- public NewJCRRegistryUserDialog(XBayaEngine engine, URL url, String username) {
- this.engine = engine;
- setUrl(url);
- setUsername(username);
- initGUI();
- }
-
- /**
- * Displays the dialog.
- */
- public void show() {
- this.dialog.show();
- }
-
- private void hide() {
- setUserCreated(false);
- this.dialog.hide();
- }
-
- 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;
- }
-
- /**
- * Initializes the GUI.
- */
- private void initGUI() {
- this.urlTextField = new XBayaTextField();
- this.usernameTextField = new XBayaTextField();
- this.passwordTextField = new JPasswordField();
- this.confirmPasswordTextField = new JPasswordField();
- XBayaLabel urlLabel = new XBayaLabel("URL", this.urlTextField);
- 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);
- infoPanel.add(userLabel);
- infoPanel.add(this.usernameTextField);
- infoPanel.add(passLabel);
- infoPanel.add(this.passwordTextField);
- infoPanel.add(confirmPassLabel);
- 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();
- }
- });
-
- okButton = new JButton("OK");
- okButton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- ok();
- }
- });
-
- JButton cancelButton = new JButton("Cancel");
- cancelButton.addActionListener(new ActionListener() {
- public void actionPerformed(ActionEvent e) {
- hide();
- }
- });
-
- JPanel buttonPanel = new JPanel();
- buttonPanel.add(okButton);
- buttonPanel.add(cancelButton);
-
- this.dialog = new XBayaDialog(this.engine, "JCR Registry New User", infoPanel, buttonPanel);
- this.dialog.setDefaultButton(okButton);
- 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;
- }
-}
+package org.apache.airavata.xbaya.component.gui;
+
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.net.MalformedURLException;
+import java.net.URISyntaxException;
+import java.net.URL;
+
+import javax.jcr.RepositoryException;
+import javax.swing.JButton;
+import javax.swing.JPanel;
+import javax.swing.JPasswordField;
+
+import org.apache.airavata.registry.api.user.AuthorizableExistsException;
+import org.apache.airavata.xbaya.XBayaEngine;
+import org.apache.airavata.xbaya.component.registry.JCRComponentRegistry;
+import org.apache.airavata.xbaya.gui.GridPanel;
+import org.apache.airavata.xbaya.gui.XBayaDialog;
+import org.apache.airavata.xbaya.gui.XBayaLabel;
+import org.apache.airavata.xbaya.gui.XBayaTextField;
+
+public class NewJCRRegistryUserDialog {
+
+ private XBayaEngine engine;
+
+ 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;
+
+ public NewJCRRegistryUserDialog(XBayaEngine engine) {
+ this(engine, null, null);
+ }
+
+ public NewJCRRegistryUserDialog(XBayaEngine engine, URL url) {
+ this(engine, url, null);
+ }
+
+ public NewJCRRegistryUserDialog(XBayaEngine engine, String username) {
+ this(engine, null, username);
+ }
+
+ /**
+ * @param engine
+ */
+ public NewJCRRegistryUserDialog(XBayaEngine engine, URL url, String username) {
+ this.engine = engine;
+ setUrl(url);
+ setUsername(username);
+ initGUI();
+ }
+
+ /**
+ * Displays the dialog.
+ */
+ public void show() {
+ this.dialog.show();
+ }
+
+ private void hide() {
+ setUserCreated(false);
+ this.dialog.hide();
+ }
+
+ 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;
+ }
+
+ /**
+ * Initializes the GUI.
+ */
+ private void initGUI() {
+ this.urlTextField = new XBayaTextField();
+ this.usernameTextField = new XBayaTextField();
+ this.passwordTextField = new JPasswordField();
+ this.confirmPasswordTextField = new JPasswordField();
+ XBayaLabel urlLabel = new XBayaLabel("URL", this.urlTextField);
+ 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);
+ infoPanel.add(userLabel);
+ infoPanel.add(this.usernameTextField);
+ infoPanel.add(passLabel);
+ infoPanel.add(this.passwordTextField);
+ infoPanel.add(confirmPassLabel);
+ 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();
+ }
+ });
+
+ okButton = new JButton("OK");
+ okButton.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ ok();
+ }
+ });
+
+ JButton cancelButton = new JButton("Cancel");
+ cancelButton.addActionListener(new ActionListener() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ hide();
+ }
+ });
+
+ JPanel buttonPanel = new JPanel();
+ buttonPanel.add(okButton);
+ buttonPanel.add(cancelButton);
+
+ this.dialog = new XBayaDialog(this.engine, "JCR Registry New User", infoPanel, buttonPanel);
+ this.dialog.setDefaultButton(okButton);
+ 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;
+ }
+}
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=1195355&r1=1195354&r2=1195355&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 Mon Oct 31 06:48:11 2011
@@ -62,6 +62,7 @@ public class StreamSourceNodeGUI extends
this.configurationWindow.show();
}
+ @Override
protected void setSelectedFlag(boolean flag) {
this.selected = flag;
if (this.selected) {
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/URLRegistryWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/URLRegistryWindow.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/URLRegistryWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/URLRegistryWindow.java Mon Oct 31 06:48:11 2011
@@ -104,6 +104,7 @@ public class URLRegistryWindow {
JButton okButton = new JButton("OK");
okButton.addActionListener(new AbstractAction() {
+ @Override
public void actionPerformed(ActionEvent e) {
ok();
}
@@ -111,6 +112,7 @@ public class URLRegistryWindow {
JButton cancelButton = new JButton("Cancel");
cancelButton.addActionListener(new AbstractAction() {
+ @Override
public void actionPerformed(ActionEvent e) {
hide();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/WebResigtoryWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/WebResigtoryWindow.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/WebResigtoryWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/WebResigtoryWindow.java Mon Oct 31 06:48:11 2011
@@ -108,6 +108,7 @@ public class WebResigtoryWindow {
JButton okButton = new JButton("OK");
okButton.addActionListener(new AbstractAction() {
+ @Override
public void actionPerformed(ActionEvent e) {
ok();
}
@@ -115,6 +116,7 @@ public class WebResigtoryWindow {
JButton cancelButton = new JButton("Cancel");
cancelButton.addActionListener(new AbstractAction() {
+ @Override
public void actionPerformed(ActionEvent e) {
hide();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistry.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistry.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistry.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistry.java Mon Oct 31 06:48:11 2011
@@ -21,7 +21,6 @@
package org.apache.airavata.xbaya.component.registry;
-import org.apache.airavata.registry.api.Registry;
import org.apache.airavata.xbaya.component.gui.ComponentTreeNode;
public abstract class ComponentRegistry {
@@ -48,5 +47,5 @@ public abstract class ComponentRegistry
* @return The name to show in the tree.
*/
public abstract String getName();
-
+
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java Mon Oct 31 06:48:11 2011
@@ -47,13 +47,13 @@ public class ComponentRegistryLoader imp
private boolean canceled;
private WaitDialog loadingDialog;
-
+
private ComponentTreeNode componentTree;
private Observable observableRegistry;
-
- private Map<String,ComponentTreeNode> componentTreeNodesMap;
-
+
+ private Map<String, ComponentTreeNode> componentTreeNodesMap;
+
/**
* Constructs a WorkflowLoader.
*
@@ -70,6 +70,7 @@ public class ComponentRegistryLoader imp
/**
* @see org.apache.airavata.xbaya.gui.Cancelable#cancel()
*/
+ @Override
public void cancel() {
this.canceled = true;
this.loadThread.interrupt();
@@ -83,7 +84,7 @@ public class ComponentRegistryLoader imp
*/
public void load(final ComponentRegistry registry) {
this.canceled = false;
-
+
this.loadThread = new Thread() {
@Override
public void run() {
@@ -101,16 +102,17 @@ public class ComponentRegistryLoader imp
*/
private void runInThread(ComponentRegistry registry) {
try {
- if (getComponentTreeNodesMap().containsKey(registry.getName())){
- this.getEngine().getGUI().getComponentSelector().removeComponentTree(getComponentTreeNodesMap().get(registry.getName()));
- getComponentTreeNodesMap().remove(registry.getName());
- }
+ if (getComponentTreeNodesMap().containsKey(registry.getName())) {
+ this.getEngine().getGUI().getComponentSelector()
+ .removeComponentTree(getComponentTreeNodesMap().get(registry.getName()));
+ getComponentTreeNodesMap().remove(registry.getName());
+ }
componentTree = registry.getComponentTree();
if (this.canceled) {
return;
}
this.getEngine().getGUI().getComponentSelector().addComponentTree(componentTree);
- getComponentTreeNodesMap().put(registry.getName(),componentTree);
+ getComponentTreeNodesMap().put(registry.getName(), componentTree);
this.loadingDialog.hide();
} catch (ComponentRegistryException e) {
if (this.canceled) {
@@ -132,38 +134,38 @@ public class ComponentRegistryLoader imp
}
}
- @Override
- public void update(Observable observable, Object o) {
- if ((observable instanceof XBayaConfiguration) && (o instanceof ComponentRegistry)){
- ComponentRegistry componentRegistry=(ComponentRegistry)o;
- if (observableRegistry!=null){
- observableRegistry.deleteObserver(this);
- }
- if (componentRegistry instanceof JCRComponentRegistry){
- Registry registry = ((JCRComponentRegistry)componentRegistry).getRegistry();
- if (registry!=null && registry instanceof Observable){
- (observableRegistry=(Observable)registry).addObserver(this);
- }
- }
- load(componentRegistry);
- }else if (observable instanceof Registry){
- load(getEngine().getConfiguration().getJcrComponentRegistry());
- }
- }
-
- public XBayaEngine getEngine() {
- return engine;
- }
-
- public void setEngine(XBayaEngine engine) {
- this.engine = engine;
- }
-
- public Map<String,ComponentTreeNode> getComponentTreeNodesMap() {
- if (componentTreeNodesMap==null){
- componentTreeNodesMap=new HashMap<String, ComponentTreeNode>();
- }
- return componentTreeNodesMap;
- }
+ @Override
+ public void update(Observable observable, Object o) {
+ if ((observable instanceof XBayaConfiguration) && (o instanceof ComponentRegistry)) {
+ ComponentRegistry componentRegistry = (ComponentRegistry) o;
+ if (observableRegistry != null) {
+ observableRegistry.deleteObserver(this);
+ }
+ if (componentRegistry instanceof JCRComponentRegistry) {
+ Registry registry = ((JCRComponentRegistry) componentRegistry).getRegistry();
+ if (registry != null && registry instanceof Observable) {
+ (observableRegistry = (Observable) registry).addObserver(this);
+ }
+ }
+ load(componentRegistry);
+ } else if (observable instanceof Registry) {
+ load(getEngine().getConfiguration().getJcrComponentRegistry());
+ }
+ }
+
+ public XBayaEngine getEngine() {
+ return engine;
+ }
+
+ public void setEngine(XBayaEngine engine) {
+ this.engine = engine;
+ }
+
+ public Map<String, ComponentTreeNode> getComponentTreeNodesMap() {
+ if (componentTreeNodesMap == null) {
+ componentTreeNodesMap = new HashMap<String, ComponentTreeNode>();
+ }
+ return componentTreeNodesMap;
+ }
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ExitComponent.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ExitComponent.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ExitComponent.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ExitComponent.java Mon Oct 31 06:48:11 2011
@@ -68,6 +68,7 @@ public class ExitComponent extends Syste
return exitNode;
}
+ @Override
protected void createPorts(NodeImpl node) {
for (ComponentDataPort input : getInputPorts()) {
DataPort port = input.createPort();
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=1195355&r1=1195354&r2=1195355&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 Mon Oct 31 06:48:11 2011
@@ -28,7 +28,6 @@ import java.util.List;
import javax.jcr.RepositoryException;
import org.apache.airavata.commons.gfac.type.ApplicationDeploymentDescription;
-import org.apache.airavata.commons.gfac.type.HostDescription;
import org.apache.airavata.commons.gfac.type.ServiceDescription;
import org.apache.airavata.registry.api.Registry;
import org.apache.airavata.registry.api.exception.RegistryException;
@@ -76,7 +75,7 @@ public class JCRComponentRegistry extend
*/
@Override
public ComponentTreeNode getComponentTree() {
- ComponentTreeNode tree = new ComponentTreeNode(this);
+ ComponentTreeNode tree = new ComponentTreeNode(this);
try {
List<ServiceDescription> services = this.registry.searchServiceDescription("");
for (ServiceDescription serviceDescription : services) {
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=1195355&r1=1195354&r2=1195355&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 Mon Oct 31 06:48:11 2011
@@ -19,48 +19,48 @@
*
*/
-package org.apache.airavata.xbaya.component.registry.jackrabbit.user;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.jackrabbit.api.security.user.Authorizable;
-import org.apache.jackrabbit.api.security.user.Group;
-
-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;
- }
-}
+package org.apache.airavata.xbaya.component.registry.jackrabbit.user;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.jackrabbit.api.security.user.Authorizable;
+import org.apache.jackrabbit.api.security.user.Group;
+
+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;
+ }
+}
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=1195355&r1=1195354&r2=1195355&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 Mon Oct 31 06:48:11 2011
@@ -19,93 +19,93 @@
*
*/
-package org.apache.airavata.xbaya.component.registry.jackrabbit.user;
-
-import java.security.Principal;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.jcr.RepositoryException;
-import javax.jcr.Value;
-
-import org.apache.jackrabbit.api.security.user.Authorizable;
-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);
- }
-
-}
+package org.apache.airavata.xbaya.component.registry.jackrabbit.user;
+
+import java.security.Principal;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.jcr.RepositoryException;
+import javax.jcr.Value;
+
+import org.apache.jackrabbit.api.security.user.Authorizable;
+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);
+ }
+
+}
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=1195355&r1=1195354&r2=1195355&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 Mon Oct 31 06:48:11 2011
@@ -19,89 +19,89 @@
*
*/
-package org.apache.airavata.xbaya.component.registry.jackrabbit.user;
-
-import java.security.Principal;
-import java.util.Iterator;
-
-import javax.jcr.RepositoryException;
-import javax.jcr.Value;
-
-import org.apache.airavata.registry.api.user.Authorizable;
-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);
- }
-
-}
+package org.apache.airavata.xbaya.component.registry.jackrabbit.user;
+
+import java.security.Principal;
+import java.util.Iterator;
+
+import javax.jcr.RepositoryException;
+import javax.jcr.Value;
+
+import org.apache.airavata.registry.api.user.Authorizable;
+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);
+ }
+
+}
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=1195355&r1=1195354&r2=1195355&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 Mon Oct 31 06:48:11 2011
@@ -19,118 +19,118 @@
*
*/
-package org.apache.airavata.xbaya.component.registry.jackrabbit.user;
-
-import java.security.Principal;
-import java.util.Iterator;
-
-import javax.jcr.RepositoryException;
-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;
-
- 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));
- }
-
-}
+package org.apache.airavata.xbaya.component.registry.jackrabbit.user;
+
+import java.security.Principal;
+import java.util.Iterator;
+
+import javax.jcr.RepositoryException;
+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;
+
+ 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));
+ }
+
+}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitGroupWrap.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitGroupWrap.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitGroupWrap.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitGroupWrap.java Mon Oct 31 06:48:11 2011
@@ -19,118 +19,118 @@
*
*/
-package org.apache.airavata.xbaya.component.registry.jackrabbit.user;
-
-import java.security.Principal;
-import java.util.Iterator;
-
-import javax.jcr.RepositoryException;
-import javax.jcr.Value;
-
-import org.apache.airavata.registry.api.user.Authorizable;
-import org.apache.airavata.registry.api.user.Group;
-
-public class JackRabbitGroupWrap extends AbstractJackRabbitUMComponent implements Group {
- private org.apache.jackrabbit.api.security.user.Group group;
-
- public JackRabbitGroupWrap(org.apache.jackrabbit.api.security.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.jackrabbit.api.security.user.Authorizable> declaredMembers = group.getDeclaredMembers();
- return getAuthorizableList(declaredMembers).iterator();
- }
-
- @Override
- public Iterator<Authorizable> getMembers() throws RepositoryException {
- return getAuthorizableList(group.getMembers()).iterator();
- }
-
- @Override
- public boolean isMember(Authorizable authorizable) throws RepositoryException {
- return group.isMember(new JackRabbitAuthorizable(authorizable));
- }
-
- @Override
- public boolean addMember(Authorizable authorizable) throws RepositoryException {
- return group.addMember(new JackRabbitAuthorizable(authorizable));
- }
-
- @Override
- public boolean removeMember(Authorizable authorizable) throws RepositoryException {
- return group.removeMember(new JackRabbitAuthorizable(authorizable));
- }
-
- @Override
- public Iterator<Group> declaredMemberOf() throws RepositoryException {
- return getGroupList(group.declaredMemberOf()).iterator();
- }
-
- @Override
- public Iterator<Group> memberOf() throws RepositoryException {
- return getGroupList(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 JackRabbitAuthorizable(authorizable));
- }
-
-}
+package org.apache.airavata.xbaya.component.registry.jackrabbit.user;
+
+import java.security.Principal;
+import java.util.Iterator;
+
+import javax.jcr.RepositoryException;
+import javax.jcr.Value;
+
+import org.apache.airavata.registry.api.user.Authorizable;
+import org.apache.airavata.registry.api.user.Group;
+
+public class JackRabbitGroupWrap extends AbstractJackRabbitUMComponent implements Group {
+ private org.apache.jackrabbit.api.security.user.Group group;
+
+ public JackRabbitGroupWrap(org.apache.jackrabbit.api.security.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.jackrabbit.api.security.user.Authorizable> declaredMembers = group.getDeclaredMembers();
+ return getAuthorizableList(declaredMembers).iterator();
+ }
+
+ @Override
+ public Iterator<Authorizable> getMembers() throws RepositoryException {
+ return getAuthorizableList(group.getMembers()).iterator();
+ }
+
+ @Override
+ public boolean isMember(Authorizable authorizable) throws RepositoryException {
+ return group.isMember(new JackRabbitAuthorizable(authorizable));
+ }
+
+ @Override
+ public boolean addMember(Authorizable authorizable) throws RepositoryException {
+ return group.addMember(new JackRabbitAuthorizable(authorizable));
+ }
+
+ @Override
+ public boolean removeMember(Authorizable authorizable) throws RepositoryException {
+ return group.removeMember(new JackRabbitAuthorizable(authorizable));
+ }
+
+ @Override
+ public Iterator<Group> declaredMemberOf() throws RepositoryException {
+ return getGroupList(group.declaredMemberOf()).iterator();
+ }
+
+ @Override
+ public Iterator<Group> memberOf() throws RepositoryException {
+ return getGroupList(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 JackRabbitAuthorizable(authorizable));
+ }
+
+}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitUserManagerWrap.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitUserManagerWrap.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitUserManagerWrap.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitUserManagerWrap.java Mon Oct 31 06:48:11 2011
@@ -19,143 +19,143 @@
*
*/
-package org.apache.airavata.xbaya.component.registry.jackrabbit.user;
-
-import java.security.Principal;
-import java.util.Iterator;
-
-import javax.jcr.AccessDeniedException;
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
-import javax.jcr.UnsupportedRepositoryOperationException;
-
-import org.apache.airavata.registry.api.impl.JCRRegistry;
-import org.apache.airavata.registry.api.user.Authorizable;
-import org.apache.airavata.registry.api.user.AuthorizableExistsException;
-import org.apache.airavata.registry.api.user.Group;
-import org.apache.airavata.registry.api.user.User;
-import org.apache.airavata.registry.api.user.UserManager;
-import org.apache.airavata.registry.api.user.UserManagerFactory;
-import org.apache.jackrabbit.api.JackrabbitSession;
-
-public class JackRabbitUserManagerWrap extends AbstractJackRabbitUMComponent implements UserManager {
- private JCRRegistry repository;
- private Session tempSession;
- static {
- UserManagerFactory.registerUserManager("Jackrabbit", JackRabbitUserManagerWrap.class);
- }
-
- @Override
- public User createUser(String userID, String password) throws AuthorizableExistsException, RepositoryException {
- createSession();
- org.apache.jackrabbit.api.security.user.User user = getJackRabbitUserManager().createUser(userID, password);
- closeSession();
- return new JackRabbitUserWrap(user);
- }
-
- @Override
- public User createUser(String userID, String password, Principal principal, String intermediatePath)
- throws AuthorizableExistsException, RepositoryException {
- createSession();
- org.apache.jackrabbit.api.security.user.User user = getJackRabbitUserManager().createUser(userID, password,
- principal, intermediatePath);
- closeSession();
- return new JackRabbitUserWrap(user);
- }
-
- @Override
- public Group createGroup(Principal principal) throws AuthorizableExistsException, RepositoryException {
- createSession();
- org.apache.jackrabbit.api.security.user.Group group = getJackRabbitUserManager().createGroup(principal);
- closeSession();
- return new JackRabbitGroupWrap(group);
- }
-
- @Override
- public Group createGroup(Principal principal, String intermediatePath) throws AuthorizableExistsException,
- RepositoryException {
- createSession();
- org.apache.jackrabbit.api.security.user.Group group = getJackRabbitUserManager().createGroup(principal,
- intermediatePath);
- closeSession();
- return new JackRabbitGroupWrap(group);
- }
-
- private org.apache.jackrabbit.api.security.user.UserManager getJackRabbitUserManager()
- throws AccessDeniedException, UnsupportedRepositoryOperationException, RepositoryException {
- return ((JackrabbitSession) tempSession).getUserManager();
- }
-
- @Override
- public Authorizable getAuthorizable(String id) throws RepositoryException {
- createSession();
- org.apache.jackrabbit.api.security.user.Authorizable authorizable = getJackRabbitUserManager().getAuthorizable(
- id);
- closeSession();
- return new JackRabbitAuthorizableWrap(authorizable);
- }
-
- @Override
- public Authorizable getAuthorizable(Principal principal) throws RepositoryException {
- createSession();
- org.apache.jackrabbit.api.security.user.Authorizable authorizable = getJackRabbitUserManager().getAuthorizable(
- principal);
- closeSession();
- return new JackRabbitAuthorizableWrap(authorizable);
- }
-
- @Override
- public Iterator<Authorizable> findAuthorizables(String propertyName, String value) throws RepositoryException {
- createSession();
- Iterator<org.apache.jackrabbit.api.security.user.Authorizable> authorizables = getJackRabbitUserManager()
- .findAuthorizables(propertyName, value);
- closeSession();
- return getAuthorizableList(authorizables).iterator();
- }
-
- @Override
- public Iterator<Authorizable> findAuthorizables(String propertyName, String value, int searchType)
- throws RepositoryException {
- createSession();
- Iterator<org.apache.jackrabbit.api.security.user.Authorizable> authorizables = getJackRabbitUserManager()
- .findAuthorizables(propertyName, value, searchType);
- closeSession();
- return getAuthorizableList(authorizables).iterator();
- }
-
- @Override
- public boolean isAutoSave() throws RepositoryException {
- createSession();
- boolean autoSave = getJackRabbitUserManager().isAutoSave();
- closeSession();
- return autoSave;
- }
-
- @Override
- public void autoSave(boolean enable) throws UnsupportedRepositoryOperationException, RepositoryException {
- createSession();
- getJackRabbitUserManager().autoSave(enable);
- closeSession();
- }
-
- @Override
- public void setRepository(JCRRegistry repository) {
- this.repository = repository;
- }
-
- @Override
- public JCRRegistry getRepository() {
- return repository;
- }
-
- private Session createSession() throws RepositoryException {
- tempSession = getRepository().getSession();
- return tempSession;
- }
-
- private void closeSession() {
- if (tempSession != null && tempSession.isLive()) {
- tempSession.logout();
- }
- }
-}
+package org.apache.airavata.xbaya.component.registry.jackrabbit.user;
+
+import java.security.Principal;
+import java.util.Iterator;
+
+import javax.jcr.AccessDeniedException;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.UnsupportedRepositoryOperationException;
+
+import org.apache.airavata.registry.api.impl.JCRRegistry;
+import org.apache.airavata.registry.api.user.Authorizable;
+import org.apache.airavata.registry.api.user.AuthorizableExistsException;
+import org.apache.airavata.registry.api.user.Group;
+import org.apache.airavata.registry.api.user.User;
+import org.apache.airavata.registry.api.user.UserManager;
+import org.apache.airavata.registry.api.user.UserManagerFactory;
+import org.apache.jackrabbit.api.JackrabbitSession;
+
+public class JackRabbitUserManagerWrap extends AbstractJackRabbitUMComponent implements UserManager {
+ private JCRRegistry repository;
+ private Session tempSession;
+ static {
+ UserManagerFactory.registerUserManager("Jackrabbit", JackRabbitUserManagerWrap.class);
+ }
+
+ @Override
+ public User createUser(String userID, String password) throws AuthorizableExistsException, RepositoryException {
+ createSession();
+ org.apache.jackrabbit.api.security.user.User user = getJackRabbitUserManager().createUser(userID, password);
+ closeSession();
+ return new JackRabbitUserWrap(user);
+ }
+
+ @Override
+ public User createUser(String userID, String password, Principal principal, String intermediatePath)
+ throws AuthorizableExistsException, RepositoryException {
+ createSession();
+ org.apache.jackrabbit.api.security.user.User user = getJackRabbitUserManager().createUser(userID, password,
+ principal, intermediatePath);
+ closeSession();
+ return new JackRabbitUserWrap(user);
+ }
+
+ @Override
+ public Group createGroup(Principal principal) throws AuthorizableExistsException, RepositoryException {
+ createSession();
+ org.apache.jackrabbit.api.security.user.Group group = getJackRabbitUserManager().createGroup(principal);
+ closeSession();
+ return new JackRabbitGroupWrap(group);
+ }
+
+ @Override
+ public Group createGroup(Principal principal, String intermediatePath) throws AuthorizableExistsException,
+ RepositoryException {
+ createSession();
+ org.apache.jackrabbit.api.security.user.Group group = getJackRabbitUserManager().createGroup(principal,
+ intermediatePath);
+ closeSession();
+ return new JackRabbitGroupWrap(group);
+ }
+
+ private org.apache.jackrabbit.api.security.user.UserManager getJackRabbitUserManager()
+ throws AccessDeniedException, UnsupportedRepositoryOperationException, RepositoryException {
+ return ((JackrabbitSession) tempSession).getUserManager();
+ }
+
+ @Override
+ public Authorizable getAuthorizable(String id) throws RepositoryException {
+ createSession();
+ org.apache.jackrabbit.api.security.user.Authorizable authorizable = getJackRabbitUserManager().getAuthorizable(
+ id);
+ closeSession();
+ return new JackRabbitAuthorizableWrap(authorizable);
+ }
+
+ @Override
+ public Authorizable getAuthorizable(Principal principal) throws RepositoryException {
+ createSession();
+ org.apache.jackrabbit.api.security.user.Authorizable authorizable = getJackRabbitUserManager().getAuthorizable(
+ principal);
+ closeSession();
+ return new JackRabbitAuthorizableWrap(authorizable);
+ }
+
+ @Override
+ public Iterator<Authorizable> findAuthorizables(String propertyName, String value) throws RepositoryException {
+ createSession();
+ Iterator<org.apache.jackrabbit.api.security.user.Authorizable> authorizables = getJackRabbitUserManager()
+ .findAuthorizables(propertyName, value);
+ closeSession();
+ return getAuthorizableList(authorizables).iterator();
+ }
+
+ @Override
+ public Iterator<Authorizable> findAuthorizables(String propertyName, String value, int searchType)
+ throws RepositoryException {
+ createSession();
+ Iterator<org.apache.jackrabbit.api.security.user.Authorizable> authorizables = getJackRabbitUserManager()
+ .findAuthorizables(propertyName, value, searchType);
+ closeSession();
+ return getAuthorizableList(authorizables).iterator();
+ }
+
+ @Override
+ public boolean isAutoSave() throws RepositoryException {
+ createSession();
+ boolean autoSave = getJackRabbitUserManager().isAutoSave();
+ closeSession();
+ return autoSave;
+ }
+
+ @Override
+ public void autoSave(boolean enable) throws UnsupportedRepositoryOperationException, RepositoryException {
+ createSession();
+ getJackRabbitUserManager().autoSave(enable);
+ closeSession();
+ }
+
+ @Override
+ public void setRepository(JCRRegistry repository) {
+ this.repository = repository;
+ }
+
+ @Override
+ public JCRRegistry getRepository() {
+ return repository;
+ }
+
+ private Session createSession() throws RepositoryException {
+ tempSession = getRepository().getSession();
+ return tempSession;
+ }
+
+ private void closeSession() {
+ if (tempSession != null && tempSession.isLive()) {
+ tempSession.logout();
+ }
+ }
+}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitUserWrap.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitUserWrap.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitUserWrap.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/jackrabbit/user/JackRabbitUserWrap.java Mon Oct 31 06:48:11 2011
@@ -19,106 +19,106 @@
*
*/
-package org.apache.airavata.xbaya.component.registry.jackrabbit.user;
-
-import java.security.Principal;
-import java.util.Iterator;
-
-import javax.jcr.Credentials;
-import javax.jcr.RepositoryException;
-import javax.jcr.Value;
-
-import org.apache.airavata.registry.api.user.Group;
-import org.apache.airavata.registry.api.user.User;
-
-public class JackRabbitUserWrap extends AbstractJackRabbitUMComponent implements User {
- private org.apache.jackrabbit.api.security.user.User user;
-
- public JackRabbitUserWrap(org.apache.jackrabbit.api.security.user.User user) {
- this.user = user;
- }
-
- @Override
- public String getID() throws RepositoryException {
- return user.getID();
- }
-
- @Override
- public boolean isGroup() {
- return user.isGroup();
- }
-
- @Override
- public Principal getPrincipal() throws RepositoryException {
- return user.getPrincipal();
- }
-
- @Override
- public void remove() throws RepositoryException {
- user.remove();
-
- }
-
- @Override
- public Iterator<String> getPropertyNames() throws RepositoryException {
- return user.getPropertyNames();
- }
-
- @Override
- public boolean hasProperty(String name) throws RepositoryException {
- return user.hasProperty(name);
- }
-
- @Override
- public void setProperty(String name, Value value) throws RepositoryException {
- user.setProperty(name, value);
- }
-
- @Override
- public void setProperty(String name, Value[] value) throws RepositoryException {
- user.setProperty(name, value);
- }
-
- @Override
- public Value[] getProperty(String name) throws RepositoryException {
- return user.getProperty(name);
- }
-
- @Override
- public boolean removeProperty(String name) throws RepositoryException {
- return user.removeProperty(name);
- }
-
- @Override
- public boolean isAdmin() {
- return user.isAdmin();
- }
-
- @Override
- public Credentials getCredentials() throws RepositoryException {
- return user.getCredentials();
- }
-
- @Override
- public void changePassword(String password) throws RepositoryException {
- user.changePassword(password);
- }
-
- @Override
- public Iterator<Group> declaredMemberOf() throws RepositoryException {
- Iterator<org.apache.jackrabbit.api.security.user.Group> declaredMemberOf = user.declaredMemberOf();
- return getGroupList(declaredMemberOf).iterator();
- }
-
- @Override
- public Iterator<Group> memberOf() throws RepositoryException {
- Iterator<org.apache.jackrabbit.api.security.user.Group> declaredMemberOf = user.memberOf();
- return getGroupList(declaredMemberOf).iterator();
- }
-
- @Override
- public Iterator<String> getPropertyNames(String name) throws RepositoryException {
- return user.getPropertyNames(name);
- }
-
-}
+package org.apache.airavata.xbaya.component.registry.jackrabbit.user;
+
+import java.security.Principal;
+import java.util.Iterator;
+
+import javax.jcr.Credentials;
+import javax.jcr.RepositoryException;
+import javax.jcr.Value;
+
+import org.apache.airavata.registry.api.user.Group;
+import org.apache.airavata.registry.api.user.User;
+
+public class JackRabbitUserWrap extends AbstractJackRabbitUMComponent implements User {
+ private org.apache.jackrabbit.api.security.user.User user;
+
+ public JackRabbitUserWrap(org.apache.jackrabbit.api.security.user.User user) {
+ this.user = user;
+ }
+
+ @Override
+ public String getID() throws RepositoryException {
+ return user.getID();
+ }
+
+ @Override
+ public boolean isGroup() {
+ return user.isGroup();
+ }
+
+ @Override
+ public Principal getPrincipal() throws RepositoryException {
+ return user.getPrincipal();
+ }
+
+ @Override
+ public void remove() throws RepositoryException {
+ user.remove();
+
+ }
+
+ @Override
+ public Iterator<String> getPropertyNames() throws RepositoryException {
+ return user.getPropertyNames();
+ }
+
+ @Override
+ public boolean hasProperty(String name) throws RepositoryException {
+ return user.hasProperty(name);
+ }
+
+ @Override
+ public void setProperty(String name, Value value) throws RepositoryException {
+ user.setProperty(name, value);
+ }
+
+ @Override
+ public void setProperty(String name, Value[] value) throws RepositoryException {
+ user.setProperty(name, value);
+ }
+
+ @Override
+ public Value[] getProperty(String name) throws RepositoryException {
+ return user.getProperty(name);
+ }
+
+ @Override
+ public boolean removeProperty(String name) throws RepositoryException {
+ return user.removeProperty(name);
+ }
+
+ @Override
+ public boolean isAdmin() {
+ return user.isAdmin();
+ }
+
+ @Override
+ public Credentials getCredentials() throws RepositoryException {
+ return user.getCredentials();
+ }
+
+ @Override
+ public void changePassword(String password) throws RepositoryException {
+ user.changePassword(password);
+ }
+
+ @Override
+ public Iterator<Group> declaredMemberOf() throws RepositoryException {
+ Iterator<org.apache.jackrabbit.api.security.user.Group> declaredMemberOf = user.declaredMemberOf();
+ return getGroupList(declaredMemberOf).iterator();
+ }
+
+ @Override
+ public Iterator<Group> memberOf() throws RepositoryException {
+ Iterator<org.apache.jackrabbit.api.security.user.Group> declaredMemberOf = user.memberOf();
+ return getGroupList(declaredMemberOf).iterator();
+ }
+
+ @Override
+ public Iterator<String> getPropertyNames(String name) throws RepositoryException {
+ return user.getPropertyNames(name);
+ }
+
+}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/ws/WSComponent.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/ws/WSComponent.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/ws/WSComponent.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/ws/WSComponent.java Mon Oct 31 06:48:11 2011
@@ -274,15 +274,15 @@ public class WSComponent extends Compone
buf.append("<h2>Operation: " + this.operationName + "</h2>\n");
- if (getInputPorts().size()>0) {
- buf.append("<h3>Input parameter(s)</h3>\n");
- messageToHtml(getInputPorts(), buf);
- }
- if (getOutputPorts().size()>0) {
- buf.append("<h3>Output parameter(s)</h3>\n");
- messageToHtml(getOutputPorts(), buf);
- }
- buf.append("</html>\n");
+ if (getInputPorts().size() > 0) {
+ buf.append("<h3>Input parameter(s)</h3>\n");
+ messageToHtml(getInputPorts(), buf);
+ }
+ if (getOutputPorts().size() > 0) {
+ buf.append("<h3>Output parameter(s)</h3>\n");
+ messageToHtml(getOutputPorts(), buf);
+ }
+ buf.append("</html>\n");
return buf.toString();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/concurrent/PredicatedExecutable.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/concurrent/PredicatedExecutable.java?rev=1195355&r1=1195354&r2=1195355&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/concurrent/PredicatedExecutable.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/concurrent/PredicatedExecutable.java Mon Oct 31 06:48:11 2011
@@ -17,17 +17,16 @@
* specific language governing permissions and limitations
* under the License.
*
-*/
+ */
package org.apache.airavata.xbaya.concurrent;
/**
- * Intended for jobs that are runnable; Way of determining
- * whether a given job is ready to be executed
- *
+ * Intended for jobs that are runnable; Way of determining whether a given job is ready to be executed
+ *
* @author Chathura Herath
*/
-public interface PredicatedExecutable extends Runnable{
+public interface PredicatedExecutable extends Runnable {
- public boolean isReady();
+ public boolean isReady();
}