Author: chathuri
Date: Wed Jan 9 21:42:26 2013
New Revision: 1431107
URL: http://svn.apache.org/viewvc?rev=1431107&view=rev
Log:
fixing AIRAVATA-710
Added:
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/NewRegistryUserDialog.java
- copied, changed from r1431009,
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/NewJCRRegistryUserDialog.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/RegistryWindow.java
- copied, changed from r1431009,
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/JCRRegistryWindow.java
Removed:
airavata/trunk/modules/distribution/airavata-server/src/main/resources/conf/airavata-client.properties
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/JCRRegistryWindow.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/NewJCRRegistryUserDialog.java
Modified:
airavata/trunk/modules/airavata-client/src/main/resources/airavata-client.properties
airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties
airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/conf/airavata-client.properties
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConstants.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RegistryMenuItem.java
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java
airavata/trunk/modules/xbaya-gui/src/main/resources/airavata-client.properties
Modified:
airavata/trunk/modules/airavata-client/src/main/resources/airavata-client.properties
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/airavata-client/src/main/resources/airavata-client.properties?rev=1431107&r1=1431106&r2=1431107&view=diff
==============================================================================
---
airavata/trunk/modules/airavata-client/src/main/resources/airavata-client.properties
(original)
+++
airavata/trunk/modules/airavata-client/src/main/resources/airavata-client.properties
Wed Jan 9 21:42:26 2013
@@ -48,8 +48,10 @@ default.registry.password=admin
default.registry.password.hash.method=SHA
default.registry.gateway=default
-#for rest [RegistryClient]
-#registry.jdbc.url=http://localhost:9080/airavata-services
+#for xbaya
+xbaya.registry.user=admin
+xbaya.registry.url=http://localhost:8080/airavata-registry/api
+xbaya.default.gateway=default
#user defined registry accessor classes
#class.provenance.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
Modified:
airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties?rev=1431107&r1=1431106&r2=1431107&view=diff
==============================================================================
---
airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties
(original)
+++
airavata/trunk/modules/distribution/airavata-client/src/main/resources/conf/airavata-client.properties
Wed Jan 9 21:42:26 2013
@@ -48,8 +48,10 @@ default.registry.password=admin
default.registry.password.hash.method=SHA
default.registry.gateway=default
-#for rest [RegistryClient]
-#registry.jdbc.url=http://localhost:9080/airavata-services
+#for xbaya
+xbaya.registry.user=admin
+xbaya.registry.url=http://localhost:8080/airavata-registry/api
+xbaya.default.gateway=default
#user defined registry accessor classes
#class.provenance.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
Modified:
airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/conf/airavata-client.properties
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/conf/airavata-client.properties?rev=1431107&r1=1431106&r2=1431107&view=diff
==============================================================================
---
airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/conf/airavata-client.properties
(original)
+++
airavata/trunk/modules/distribution/xbaya-gui/src/main/resources/conf/airavata-client.properties
Wed Jan 9 21:42:26 2013
@@ -48,8 +48,10 @@ default.registry.password=admin
default.registry.password.hash.method=SHA
default.registry.gateway=default
-#for rest [RegistryClient]
-#registry.jdbc.url=http://localhost:9080/airavata-services
+#for xbaya
+xbaya.registry.user=admin
+xbaya.registry.url=http://localhost:8080/airavata-registry/api
+xbaya.default.gateway=default
#user defined registry accessor classes
#class.provenance.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
Modified:
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConstants.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConstants.java?rev=1431107&r1=1431106&r2=1431107&view=diff
==============================================================================
---
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConstants.java
(original)
+++
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/XBayaConstants.java
Wed Jan 9 21:42:26 2013
@@ -191,6 +191,10 @@ public class XBayaConstants {
public static final String REGISTRY_TYPE_WORKFLOW = "workflow";
public static final String HTTP_SCHEMAS_AIRAVATA_APACHE_ORG_GFAC_TYPE =
"http://airavata.apache.org/schemas/gfac/2012/12";;
+ public static final String XBAYA_REGISTRY_USER = "xbaya.registry.user";
+ public static final String XBAYA_REGISTRY_URL = "xbaya.registry.url";
+ public static final String XBAYA_DEFAULT_GATEWAY = "xbaya.default.gateway";
+
/**
* XRegistry Resource Types for OGCE Resource
*/
Copied:
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/NewRegistryUserDialog.java
(from r1431009,
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/NewJCRRegistryUserDialog.java)
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/NewRegistryUserDialog.java?p2=airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/NewRegistryUserDialog.java&p1=airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/NewJCRRegistryUserDialog.java&r1=1431009&r2=1431107&rev=1431107&view=diff
==============================================================================
---
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/NewJCRRegistryUserDialog.java
(original)
+++
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/NewRegistryUserDialog.java
Wed Jan 9 21:42:26 2013
@@ -23,9 +23,7 @@ package org.apache.airavata.xbaya.ui.dia
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.net.MalformedURLException;
import java.net.URL;
-import java.util.Properties;
import javax.swing.*;
@@ -33,17 +31,14 @@ import org.apache.airavata.persistance.r
import org.apache.airavata.persistance.registry.jpa.ResourceUtils;
import org.apache.airavata.persistance.registry.jpa.resources.GatewayResource;
import org.apache.airavata.persistance.registry.jpa.resources.UserResource;
-import org.apache.airavata.persistance.registry.jpa.resources.Utils;
import org.apache.airavata.persistance.registry.jpa.resources.WorkerResource;
-import org.apache.airavata.registry.api.exception.RegistryException;
-import
org.apache.airavata.workflow.model.component.registry.JCRComponentRegistry;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.ui.dialogs.XBayaDialog;
import org.apache.airavata.xbaya.ui.widgets.GridPanel;
import org.apache.airavata.xbaya.ui.widgets.XBayaLabel;
import org.apache.airavata.xbaya.ui.widgets.XBayaTextField;
-public class NewJCRRegistryUserDialog {
+public class NewRegistryUserDialog {
private XBayaEngine engine;
@@ -70,22 +65,22 @@ public class NewJCRRegistryUserDialog {
private boolean userCreated = false;
// public static final String GATEWAY_ID = "gateway.id";
- public NewJCRRegistryUserDialog(XBayaEngine engine) {
+ public NewRegistryUserDialog(XBayaEngine engine) {
this(engine, null, null);
}
- public NewJCRRegistryUserDialog(XBayaEngine engine, URL url) {
+ public NewRegistryUserDialog(XBayaEngine engine, URL url) {
this(engine, url, null);
}
- public NewJCRRegistryUserDialog(XBayaEngine engine, String username) {
+ public NewRegistryUserDialog(XBayaEngine engine, String username) {
this(engine, null, username);
}
/**
* @param engine
*/
- public NewJCRRegistryUserDialog(XBayaEngine engine, URL url, String
username) {
+ public NewRegistryUserDialog(XBayaEngine engine, URL url, String username)
{
this.engine = engine;
setUrl(url);
setUsername(username);
Copied:
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/RegistryWindow.java
(from r1431009,
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/JCRRegistryWindow.java)
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/RegistryWindow.java?p2=airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/RegistryWindow.java&p1=airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/JCRRegistryWindow.java&r1=1431009&r2=1431107&rev=1431107&view=diff
==============================================================================
---
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/JCRRegistryWindow.java
(original)
+++
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/RegistryWindow.java
Wed Jan 9 21:42:26 2013
@@ -36,7 +36,10 @@ import javax.swing.JPasswordField;
import org.apache.airavata.client.AiravataAPIFactory;
import org.apache.airavata.client.api.AiravataAPI;
import org.apache.airavata.client.api.AiravataAPIInvocationException;
+import org.apache.airavata.common.exception.ApplicationSettingsException;
+import org.apache.airavata.common.utils.ClientSettings;
import org.apache.airavata.xbaya.XBayaConfiguration;
+import org.apache.airavata.xbaya.XBayaConstants;
import org.apache.airavata.xbaya.XBayaEngine;
import org.apache.airavata.xbaya.component.registry.ComponentRegistryLoader;
import org.apache.airavata.xbaya.registry.PasswordCallbackImpl;
@@ -48,7 +51,7 @@ import org.apache.airavata.xbaya.ui.widg
import org.apache.airavata.xbaya.ui.widgets.XBayaTextField;
import org.apache.airavata.xbaya.util.RegistryConstants;
-public class JCRRegistryWindow {
+public class RegistryWindow {
private XBayaEngine engine;
@@ -64,7 +67,7 @@ public class JCRRegistryWindow {
private XBayaLinkButton newUserButton;
- private NewJCRRegistryUserDialog newUserWindow;
+ private NewRegistryUserDialog newUserWindow;
private String userName;
@@ -77,7 +80,7 @@ public class JCRRegistryWindow {
/**
* @param engine
*/
- public JCRRegistryWindow(XBayaEngine engine) {
+ public RegistryWindow(XBayaEngine engine) {
this.engine = engine;
ComponentRegistryLoader.getLoader(this.engine,
RegistryConstants.REGISTRY_TYPE_JCR);
initGUI();
@@ -143,7 +146,7 @@ public class JCRRegistryWindow {
// the text box contains invalid url, we'll just ignore it
}
if (newUserWindow == null) {
- newUserWindow = new NewJCRRegistryUserDialog(engine);
+ newUserWindow = new NewRegistryUserDialog(engine);
}
// newUserWindow.setUrl(specifiedURL);
newUserWindow.setUsername(usernameTextField.getText());
@@ -164,9 +167,26 @@ public class JCRRegistryWindow {
this.gatewayTextField = new XBayaTextField();
this.usernameTextField = new XBayaTextField();
this.passwordTextField = new JPasswordField();
-
this.urlTextField.setText(engine.getConfiguration().getRegistryURL().toASCIIString());
-
this.gatewayTextField.setText(engine.getConfiguration().getDefaultGateway());
-
this.usernameTextField.setText(engine.getConfiguration().getRegistryUserName());
+ try {
+ if
(ClientSettings.isSettingDefined(XBayaConstants.XBAYA_REGISTRY_URL)){
+
this.urlTextField.setText(ClientSettings.getSetting(XBayaConstants.XBAYA_REGISTRY_URL));
+ } else {
+
this.urlTextField.setText(engine.getConfiguration().getRegistryURL().toASCIIString());
+ }
+ if
(ClientSettings.isSettingDefined(XBayaConstants.XBAYA_REGISTRY_USER)){
+
this.usernameTextField.setText(ClientSettings.getSetting(XBayaConstants.XBAYA_REGISTRY_USER));
+ } else {
+
this.usernameTextField.setText(engine.getConfiguration().getRegistryUserName());
+ }
+ if
(ClientSettings.isSettingDefined(XBayaConstants.XBAYA_DEFAULT_GATEWAY)){
+
this.gatewayTextField.setText(ClientSettings.getSetting(XBayaConstants.XBAYA_DEFAULT_GATEWAY));
+ } else {
+
this.gatewayTextField.setText(engine.getConfiguration().getDefaultGateway());
+ }
+ } catch (ApplicationSettingsException e) {
+ e.printStackTrace();
+ }
+
this.passwordTextField.setText(engine.getConfiguration().getRegistryPassphrase());
XBayaLabel urlLabel = new XBayaLabel("URL", this.urlTextField);
XBayaLabel gatewayLabel = new XBayaLabel("Gateway",
this.gatewayTextField);
Modified:
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RegistryMenuItem.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RegistryMenuItem.java?rev=1431107&r1=1431106&r2=1431107&view=diff
==============================================================================
---
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RegistryMenuItem.java
(original)
+++
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/menues/RegistryMenuItem.java
Wed Jan 9 21:42:26 2013
@@ -32,7 +32,6 @@ import org.apache.airavata.xbaya.XBayaCo
import org.apache.airavata.xbaya.XBayaConfiguration.XBayaExecutionMode;
import org.apache.airavata.xbaya.core.ide.XBayaExecutionModeListener;
import org.apache.airavata.xbaya.XBayaEngine;
-import org.apache.airavata.xbaya.ui.dialogs.registry.JCRRegistryWindow;
import org.apache.airavata.xbaya.ui.widgets.ToolbarButton;
import org.apache.airavata.xbaya.ui.widgets.XBayaToolBar;
import org.apache.airavata.xbaya.util.XBayaUtil;
Modified:
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java?rev=1431107&r1=1431106&r2=1431107&view=diff
==============================================================================
---
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java
(original)
+++
airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/XBayaUtil.java
Wed Jan 9 21:42:26 2013
@@ -58,7 +58,7 @@ import org.apache.airavata.xbaya.invoker
import org.apache.airavata.xbaya.invoker.Invoker;
import org.apache.airavata.xbaya.invoker.WorkflowInvokerWrapperForGFacInvoker;
import org.apache.airavata.xbaya.lead.LeadContextHeaderHelper;
-import org.apache.airavata.xbaya.ui.dialogs.registry.JCRRegistryWindow;
+import org.apache.airavata.xbaya.ui.dialogs.registry.RegistryWindow;
import org.apache.axis2.util.XMLUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -156,7 +156,7 @@ public class XBayaUtil {
}
public static void updateJCRRegistryInfo(XBayaEngine xbayaEngine) {
- JCRRegistryWindow window = new JCRRegistryWindow(xbayaEngine);
+ RegistryWindow window = new RegistryWindow(xbayaEngine);
window.show();
}
Modified:
airavata/trunk/modules/xbaya-gui/src/main/resources/airavata-client.properties
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/xbaya-gui/src/main/resources/airavata-client.properties?rev=1431107&r1=1431106&r2=1431107&view=diff
==============================================================================
---
airavata/trunk/modules/xbaya-gui/src/main/resources/airavata-client.properties
(original)
+++
airavata/trunk/modules/xbaya-gui/src/main/resources/airavata-client.properties
Wed Jan 9 21:42:26 2013
@@ -48,8 +48,10 @@ default.registry.password=admin
default.registry.password.hash.method=SHA
default.registry.gateway=default
-#for rest [RegistryClient]
-#registry.jdbc.url=http://localhost:9080/airavata-services
+#for xbaya
+xbaya.registry.user=admin
+xbaya.registry.url=http://localhost:8080/airavata-registry/api
+xbaya.default.gateway=default
#user defined registry accessor classes
#class.provenance.registry.accessor=org.apache.airavata.persistance.registry.jpa.impl.AiravataJPARegistry
