You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2011/10/31 21:56:46 UTC
svn commit: r1195667 [6/12] - 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/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=1195667&r1=1195666&r2=1195667&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 20:56:37 2011
@@ -108,7 +108,6 @@ public class WebResigtoryWindow {
JButton okButton = new JButton("OK");
okButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
ok();
}
@@ -116,7 +115,6 @@ 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=1195667&r1=1195666&r2=1195667&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 20:56:37 2011
@@ -21,6 +21,7 @@
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 {
@@ -47,5 +48,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=1195667&r1=1195666&r2=1195667&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 20:56:37 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,7 +70,6 @@ public class ComponentRegistryLoader imp
/**
* @see org.apache.airavata.xbaya.gui.Cancelable#cancel()
*/
- @Override
public void cancel() {
this.canceled = true;
this.loadThread.interrupt();
@@ -84,7 +83,7 @@ public class ComponentRegistryLoader imp
*/
public void load(final ComponentRegistry registry) {
this.canceled = false;
-
+
this.loadThread = new Thread() {
@Override
public void run() {
@@ -102,17 +101,16 @@ 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) {
@@ -134,38 +132,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=1195667&r1=1195666&r2=1195667&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 20:56:37 2011
@@ -68,7 +68,6 @@ 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=1195667&r1=1195666&r2=1195667&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 20:56:37 2011
@@ -28,6 +28,7 @@ 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;
@@ -46,7 +47,7 @@ public class JCRComponentRegistry extend
public JCRComponentRegistry(URI url, String username, String password) throws RepositoryException {
HashMap<String, String> map = new HashMap<String, String>();
- map.put("repository.uri", url.toString());
+ map.put("org.apache.jackrabbit.repository.uri", url.toString());
try {
this.registry = new JCRRegistry(url, "org.apache.jackrabbit.rmi.repository.RmiRepositoryFactory", username,
password, map);
@@ -75,7 +76,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=1195667&r1=1195666&r2=1195667&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 20:56:37 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=1195667&r1=1195666&r2=1195667&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 20:56:37 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=1195667&r1=1195666&r2=1195667&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 20:56:37 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=1195667&r1=1195666&r2=1195667&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 20:56:37 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=1195667&r1=1195666&r2=1195667&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 20:56:37 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=1195667&r1=1195666&r2=1195667&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 20:56:37 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=1195667&r1=1195666&r2=1195667&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 20:56:37 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=1195667&r1=1195666&r2=1195667&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 20:56:37 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=1195667&r1=1195666&r2=1195667&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 20:56:37 2011
@@ -17,16 +17,17 @@
* 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();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/concurrent/PredicatedTaskRunner.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/concurrent/PredicatedTaskRunner.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/concurrent/PredicatedTaskRunner.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/concurrent/PredicatedTaskRunner.java Mon Oct 31 20:56:37 2011
@@ -17,7 +17,7 @@
* specific language governing permissions and limitations
* under the License.
*
- */
+*/
package org.apache.airavata.xbaya.concurrent;
import java.util.concurrent.ConcurrentLinkedQueue;
@@ -26,123 +26,134 @@ import java.util.concurrent.Executors;
/**
* Used to run jobs that need to be started after a predicate is
- *
+ *
* @author Chathura Herath
*/
public class PredicatedTaskRunner {
- protected volatile ConcurrentLinkedQueue<PredicatedExecutable> jobQueue = new ConcurrentLinkedQueue<PredicatedExecutable>();
+ protected volatile ConcurrentLinkedQueue<PredicatedExecutable> jobQueue = new ConcurrentLinkedQueue<PredicatedExecutable>();
+
+ protected ExecutorService threadPool;
+
+ protected volatile boolean stop = false;
+
+ public PredicatedTaskRunner(int numberOfThreads) {
+ this.threadPool = Executors.newFixedThreadPool(numberOfThreads);
+ addIdleTask();
+ startCheckThread();
+
+ }
+
+ private void addIdleTask() {
+ PredicatedExecutable sleepTask = new PredicatedExecutable() {
+
+ @Override
+ public void run() {
+ synchronized (jobQueue) {
+ if (jobQueue.size() == 1) {
+ try {
+ jobQueue.wait();
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ }
+ } else if (allTasksAreWaiting(jobQueue)) {
+ try {
+ Thread.sleep(50);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ }
+ }
+ }
+
+ }
+
+ private boolean allTasksAreWaiting(
+ ConcurrentLinkedQueue<PredicatedExecutable> jobQueue) {
+ for (PredicatedExecutable predicatedExecutable : jobQueue) {
+ if (predicatedExecutable.isReady()) {
+ return false;
+ }
+ }
+ return true;
+
+ }
+
+ @Override
+ public boolean isReady() {
+ // TODO Auto-generated method stub
+ return true;
+ }
+ };
+
+ this.jobQueue.add(sleepTask);
+ }
+
+ private void startCheckThread() {
+ new Thread(new Runnable() {
+
+ @Override
+ public void run() {
+
+ while (!stop) {
+ try {
+
+
+
+
+
+ synchronized (jobQueue) {
+ while(jobQueue.size() == 0 || allTasksAreWaiting(jobQueue)){
+ jobQueue.wait(50);
+ }
+ }
+
+ PredicatedExecutable job = jobQueue.remove();
+ if (job.isReady()) {
+ // remove from front and execute and you are done
+ threadPool.execute(job);
+ } else {
+ // add to end if not ready to run
+ jobQueue.add(job);
+ }
+
+
+
+
+
+
+ } catch (Throwable e) {
+ // we go on no matter what
+ e.printStackTrace();
+ }
+ }
+
+ }
+ }).start();
+ }
+
+ private boolean allTasksAreWaiting(
+ ConcurrentLinkedQueue<PredicatedExecutable> jobQueue) {
+ for (PredicatedExecutable predicatedExecutable : jobQueue) {
+ if (predicatedExecutable.isReady()) {
+ return false;
+ }
+ }
+ return true;
+
+ }
+
+ public void scedule(PredicatedExecutable job) {
- protected ExecutorService threadPool;
+ synchronized (jobQueue) {
+ this.jobQueue.add(job);
+ this.jobQueue.notifyAll();
+ }
- protected volatile boolean stop = false;
+ }
- public PredicatedTaskRunner(int numberOfThreads) {
- this.threadPool = Executors.newFixedThreadPool(numberOfThreads);
- addIdleTask();
- startCheckThread();
-
- }
-
- private void addIdleTask() {
- PredicatedExecutable sleepTask = new PredicatedExecutable() {
-
- @Override
- public void run() {
- synchronized (jobQueue) {
- if (jobQueue.size() == 1) {
- try {
- jobQueue.wait();
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- }
- } else if (allTasksAreWaiting(jobQueue)) {
- try {
- Thread.sleep(50);
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- }
- }
- }
-
- }
-
- private boolean allTasksAreWaiting(ConcurrentLinkedQueue<PredicatedExecutable> jobQueue) {
- for (PredicatedExecutable predicatedExecutable : jobQueue) {
- if (predicatedExecutable.isReady()) {
- return false;
- }
- }
- return true;
-
- }
-
- @Override
- public boolean isReady() {
- // TODO Auto-generated method stub
- return true;
- }
- };
-
- this.jobQueue.add(sleepTask);
- }
-
- private void startCheckThread() {
- new Thread(new Runnable() {
-
- @Override
- public void run() {
-
- while (!stop) {
- try {
-
- synchronized (jobQueue) {
- while (jobQueue.size() == 0 || allTasksAreWaiting(jobQueue)) {
- jobQueue.wait(50);
- }
- }
-
- PredicatedExecutable job = jobQueue.remove();
- if (job.isReady()) {
- // remove from front and execute and you are done
- threadPool.execute(job);
- } else {
- // add to end if not ready to run
- jobQueue.add(job);
- }
-
- } catch (Throwable e) {
- // we go on no matter what
- e.printStackTrace();
- }
- }
-
- }
- }).start();
- }
-
- private boolean allTasksAreWaiting(ConcurrentLinkedQueue<PredicatedExecutable> jobQueue) {
- for (PredicatedExecutable predicatedExecutable : jobQueue) {
- if (predicatedExecutable.isReady()) {
- return false;
- }
- }
- return true;
-
- }
-
- public void scedule(PredicatedExecutable job) {
-
- synchronized (jobQueue) {
- this.jobQueue.add(job);
- this.jobQueue.notifyAll();
- }
-
- }
-
- public void shutDown() {
- this.threadPool.shutdown();
- this.stop = true;
- }
+ public void shutDown() {
+ this.threadPool.shutdown();
+ this.stop = true;
+ }
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/ExperimentMenu.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/ExperimentMenu.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/ExperimentMenu.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/ExperimentMenu.java Mon Oct 31 20:56:37 2011
@@ -32,6 +32,7 @@ import javax.swing.JMenuItem;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.XBayaRuntimeException;
import org.apache.airavata.xbaya.component.gui.JCRRegistryWindow;
+import org.apache.airavata.xbaya.ode.ODEDeploymentDescriptor;
import org.apache.airavata.xbaya.registry.RegistryAccesser;
public class ExperimentMenu {
@@ -103,7 +104,6 @@ public class ExperimentMenu {
configureRegistryItem.addActionListener(new AbstractAction() {
private JCRRegistryWindow window;
- @Override
public void actionPerformed(ActionEvent e) {
if (this.window == null) {
this.window = new JCRRegistryWindow(ExperimentMenu.this.engine);
@@ -116,7 +116,6 @@ public class ExperimentMenu {
private void createLoadWorkflowfromRegistryItem() {
this.loadWorkflowfromRegistryItem = new JMenuItem("Load Workflow from Registry");
this.loadWorkflowfromRegistryItem.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
new RegistryLoaderWindow(ExperimentMenu.this.engine).show();
@@ -128,7 +127,6 @@ public class ExperimentMenu {
this.saveWorkflowtoRegistryItem = new JMenuItem("Save Workflow to Registry");
this.saveWorkflowtoRegistryItem.setMnemonic(KeyEvent.VK_C);
this.saveWorkflowtoRegistryItem.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
ExperimentMenu.this.registryAccesser.saveWorkflow();
}
@@ -138,7 +136,6 @@ public class ExperimentMenu {
private void createDeleteWorkflowtoRegistryItem() {
this.deleteWorkflowfromRegistryItem = new JMenuItem("Delete Workflows in Registry");
this.deleteWorkflowfromRegistryItem.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
try {
ExperimentMenu.this.registryAccesser.deleteOGCEWorkflow(ExperimentMenu.this.engine.getWorkflow()
@@ -155,7 +152,6 @@ public class ExperimentMenu {
launchXBayaInterpreterItem.addActionListener(new AbstractAction() {
private WorkflowInterpreterLaunchWindow window;
- @Override
public void actionPerformed(ActionEvent e) {
if (this.window == null) {
this.window = new WorkflowInterpreterLaunchWindow(ExperimentMenu.this.engine);
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/RegistryLoaderWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/RegistryLoaderWindow.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/RegistryLoaderWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/RegistryLoaderWindow.java Mon Oct 31 20:56:37 2011
@@ -44,9 +44,9 @@ import org.apache.airavata.xbaya.gui.Err
import org.apache.airavata.xbaya.gui.GridPanel;
import org.apache.airavata.xbaya.gui.XBayaDialog;
import org.apache.airavata.xbaya.gui.XbayaEnhancedList;
-import org.apache.airavata.xbaya.registry.RegistryAccesser;
import org.apache.airavata.xbaya.util.XBayaUtil;
import org.apache.airavata.xbaya.wf.Workflow;
+import org.apache.airavata.xbaya.registry.RegistryAccesser;
public class RegistryLoaderWindow {
@@ -95,7 +95,6 @@ public class RegistryLoaderWindow {
final Set<QName> keys = resultList.keySet();
SwingUtilities.invokeLater(new Runnable() {
- @Override
public void run() {
if (resultList == null || resultList.size() == 0) {
/*
@@ -211,7 +210,6 @@ public class RegistryLoaderWindow {
JPanel buttonPanel = new JPanel();
this.okButton = new JButton("Load");
this.okButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
ok();
}
@@ -220,7 +218,6 @@ public class RegistryLoaderWindow {
this.deleteButton = new JButton("Delete");
this.deleteButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
delete();
}
@@ -229,7 +226,6 @@ public class RegistryLoaderWindow {
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/experiment/gui/RegistryWorkflowPublisherWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/RegistryWorkflowPublisherWindow.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/RegistryWorkflowPublisherWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/RegistryWorkflowPublisherWindow.java Mon Oct 31 20:56:37 2011
@@ -111,7 +111,6 @@ public class RegistryWorkflowPublisherWi
JPanel buttonPanel = new JPanel();
this.okButton = new JButton("OK");
this.okButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
ok();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/WorkflowInterpreterLaunchWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/WorkflowInterpreterLaunchWindow.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/WorkflowInterpreterLaunchWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/experiment/gui/WorkflowInterpreterLaunchWindow.java Mon Oct 31 20:56:37 2011
@@ -207,7 +207,6 @@ public class WorkflowInterpreterLaunchWi
JButton okButton = new JButton("OK");
okButton.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
execute();
}
@@ -215,7 +214,6 @@ public class WorkflowInterpreterLaunchWi
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/file/gui/FileMenu.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/FileMenu.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/FileMenu.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/file/gui/FileMenu.java Mon Oct 31 20:56:37 2011
@@ -32,6 +32,7 @@ import javax.swing.KeyStroke;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.XBayaException;
import org.apache.airavata.xbaya.ode.ODEDeploymentDescriptor;
+import org.apache.airavata.xbaya.wf.gui.WorkflowMenu;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -130,7 +131,6 @@ public class FileMenu {
this.openWorkflowItem = new JMenuItem("Open Workflow");
this.openWorkflowItem.setMnemonic(KeyEvent.VK_O);
this.openWorkflowItem.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent event) {
FileMenu.this.graphFiler.openWorkflow();
}
@@ -141,7 +141,6 @@ public class FileMenu {
this.saveWorkflowItem = new JMenuItem("Save Workflow");
this.saveWorkflowItem.setMnemonic(KeyEvent.VK_S);
this.saveWorkflowItem.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
FileMenu.this.graphFiler.saveWorkflow();
}
@@ -152,7 +151,6 @@ public class FileMenu {
this.importWorkflowItem = new JMenuItem("Import Workflow");
this.importWorkflowItem.setMnemonic(KeyEvent.VK_I);
this.importWorkflowItem.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
FileMenu.this.graphFiler.importWorkflow();
}
@@ -163,7 +161,6 @@ public class FileMenu {
this.exportJythonItem = new JMenuItem("Save as WS Jython Script");
this.exportJythonItem.setMnemonic(KeyEvent.VK_J);
this.exportJythonItem.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
FileMenu.this.jythonFiler.exportJythonScript();
}
@@ -174,7 +171,6 @@ public class FileMenu {
this.exportBpelItem = new JMenuItem("Save as BPEL2 Script");
this.exportBpelItem.setMnemonic(KeyEvent.VK_B);
this.exportBpelItem.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
FileMenu.this.bpelFiler.exportBPEL();
}
@@ -185,7 +181,6 @@ public class FileMenu {
this.saveImageItem = new JMenuItem("Save Workflow Image");
this.saveImageItem.setMnemonic(KeyEvent.VK_I);
this.saveImageItem.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
FileMenu.this.imageFiler.saveWorkflowImage();
}
@@ -205,7 +200,6 @@ public class FileMenu {
private void createExportODEScriptsItem() {
this.exportODEScriptsItem = new JMenuItem("Save as ODE Scripts");
this.exportODEScriptsItem.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent e) {
new ODEScriptFiler(FileMenu.this.engine).save();
@@ -218,7 +212,6 @@ public class FileMenu {
menuItem.setMnemonic(KeyEvent.VK_X);
menuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Q, ActionEvent.CTRL_MASK));
menuItem.addActionListener(new AbstractAction() {
- @Override
public void actionPerformed(ActionEvent event) {
try {
FileMenu.this.engine.dispose();
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/globus/FileTransferConstants.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/globus/FileTransferConstants.java?rev=1195667&r1=1195666&r2=1195667&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/globus/FileTransferConstants.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/globus/FileTransferConstants.java Mon Oct 31 20:56:37 2011
@@ -19,20 +19,20 @@
*
*/
-package org.apache.airavata.xbaya.globus;
-
-public class FileTransferConstants {
- public static final String DATA_TYPE = "DATA_TYPE";
- public static final String TRANSFER = "transfer";
- public static final String SUBMISSION_ID = "submission_id";
- public static final String TRANSFER_ITEM = "transfer_item";
- public static final String SOURCE_ENDPOINT = "source_endpoint";
- public static final String SOURCE_PATH = "source_path";
- public static final String DESTINATION_ENDPOINT = "destination_endpoint";
- public static final String DESTINATION_PATH = "destination_path";
- public static final String DATA = "DATA";
- public static final String SUBMISSION_ID_ENDPOINT = "/transfer/submission_id";
- public static final String VALUE = "value";
- public static final String TRANSFER_ENDPOINT = "/transfer";
- public static final String TASK_ID = "task_id";
-}
+package org.apache.airavata.xbaya.globus;
+
+public class FileTransferConstants {
+ public static final String DATA_TYPE = "DATA_TYPE";
+ public static final String TRANSFER = "transfer";
+ public static final String SUBMISSION_ID = "submission_id";
+ public static final String TRANSFER_ITEM = "transfer_item";
+ public static final String SOURCE_ENDPOINT = "source_endpoint";
+ public static final String SOURCE_PATH = "source_path";
+ public static final String DESTINATION_ENDPOINT = "destination_endpoint";
+ public static final String DESTINATION_PATH = "destination_path";
+ public static final String DATA = "DATA";
+ public static final String SUBMISSION_ID_ENDPOINT = "/transfer/submission_id";
+ public static final String VALUE = "value";
+ public static final String TRANSFER_ENDPOINT = "/transfer";
+ public static final String TASK_ID = "task_id";
+}