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/11/01 19:48:15 UTC
svn commit: r1196200 - in
/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya:
component/gui/ component/registry/ gpel/component/gui/ graph/dynamic/gui/
util/
Author: lahiru
Date: Tue Nov 1 18:48:14 2011
New Revision: 1196200
URL: http://svn.apache.org/viewvc?rev=1196200&view=rev
Log:
https://issues.apache.org/jira/browse/AIRAVATA-180
Added:
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/RegistryConstants.java
Modified:
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/ComponentMenu.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/JCRRegistryWindow.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/URLRegistryWindow.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/WebResigtoryWindow.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/component/gui/GPELRegistryWindow.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicNodeWindow.java
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/ComponentMenu.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/ComponentMenu.java?rev=1196200&r1=1196199&r2=1196200&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/ComponentMenu.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/ComponentMenu.java Tue Nov 1 18:48:14 2011
@@ -41,6 +41,7 @@ import org.apache.airavata.xbaya.file.XB
import org.apache.airavata.xbaya.file.gui.WorkflowFiler;
import org.apache.airavata.xbaya.gui.ErrorMessages;
import org.apache.airavata.xbaya.streaming.StreamTableModel;
+import org.apache.airavata.xbaya.util.RegistryConstants;
import org.apache.airavata.xbaya.wf.Workflow;
public class ComponentMenu {
@@ -323,7 +324,7 @@ public class ComponentMenu {
File directory = fileChooser.getSelectedFile();
LocalComponentRegistry registry = new LocalComponentRegistry(directory);
// move to another thread using loader.
- ComponentRegistryLoader loader = new ComponentRegistryLoader(this.engine);
+ ComponentRegistryLoader loader = ComponentRegistryLoader.getLoader(this.engine, RegistryConstants.REGISTRY_TYPE_LOCAL);
loader.load(registry);
}
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/JCRRegistryWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/JCRRegistryWindow.java?rev=1196200&r1=1196199&r2=1196200&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/JCRRegistryWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/JCRRegistryWindow.java Tue Nov 1 18:48:14 2011
@@ -44,6 +44,7 @@ import org.apache.airavata.xbaya.gui.XBa
import org.apache.airavata.xbaya.gui.XBayaLabel;
import org.apache.airavata.xbaya.gui.XBayaLinkButton;
import org.apache.airavata.xbaya.gui.XBayaTextField;
+import org.apache.airavata.xbaya.util.RegistryConstants;
public class JCRRegistryWindow {
@@ -68,7 +69,7 @@ public class JCRRegistryWindow {
*/
public JCRRegistryWindow(XBayaEngine engine) {
this.engine = engine;
- this.loader = new ComponentRegistryLoader(engine);
+ this.loader = ComponentRegistryLoader.getLoader(this.engine, RegistryConstants.REGISTRY_TYPE_JCR);
initGUI();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/URLRegistryWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/URLRegistryWindow.java?rev=1196200&r1=1196199&r2=1196200&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/URLRegistryWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/gui/URLRegistryWindow.java Tue Nov 1 18:48:14 2011
@@ -37,6 +37,7 @@ import org.apache.airavata.xbaya.gui.Gri
import org.apache.airavata.xbaya.gui.XBayaDialog;
import org.apache.airavata.xbaya.gui.XBayaLabel;
import org.apache.airavata.xbaya.gui.XBayaTextField;
+import org.apache.airavata.xbaya.util.RegistryConstants;
public class URLRegistryWindow {
@@ -53,7 +54,7 @@ public class URLRegistryWindow {
*/
public URLRegistryWindow(XBayaEngine engine) {
this.engine = engine;
- this.loader = new ComponentRegistryLoader(engine);
+ this.loader = ComponentRegistryLoader.getLoader(this.engine, RegistryConstants.REGISTRY_TYPE_URL);
initGUI();
}
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=1196200&r1=1196199&r2=1196200&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 Tue Nov 1 18:48:14 2011
@@ -38,6 +38,7 @@ import org.apache.airavata.xbaya.gui.Gri
import org.apache.airavata.xbaya.gui.XBayaDialog;
import org.apache.airavata.xbaya.gui.XBayaLabel;
import org.apache.airavata.xbaya.gui.XBayaTextField;
+import org.apache.airavata.xbaya.util.RegistryConstants;
public class WebResigtoryWindow {
@@ -54,7 +55,7 @@ public class WebResigtoryWindow {
*/
public WebResigtoryWindow(XBayaEngine engine) {
this.engine = engine;
- this.loader = new ComponentRegistryLoader(engine);
+ this.loader = ComponentRegistryLoader.getLoader(this.engine, RegistryConstants.REGISTRY_TYPE_WEB);
initGUI();
}
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=1196200&r1=1196199&r2=1196200&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 Tue Nov 1 18:48:14 2011
@@ -54,12 +54,14 @@ public class ComponentRegistryLoader imp
private Map<String,ComponentTreeNode> componentTreeNodesMap;
+ private static Map<String, ComponentRegistryLoader> loaders;
+
/**
* Constructs a WorkflowLoader.
*
* @param engine
*/
- public ComponentRegistryLoader(XBayaEngine engine) {
+ private ComponentRegistryLoader(XBayaEngine engine) {
this.setEngine(engine);
this.loadingDialog = new WaitDialog(this, "Loading a Component List.", "Loading a Component List. "
@@ -166,4 +168,17 @@ public class ComponentRegistryLoader imp
return componentTreeNodesMap;
}
+ protected static Map<String, ComponentRegistryLoader> getLoaders() {
+ if (loaders==null){
+ loaders=new HashMap<String, ComponentRegistryLoader>();
+ }
+ return loaders;
+ }
+
+ public static ComponentRegistryLoader getLoader(XBayaEngine engine, String id){
+ if (!getLoaders().containsKey(id)){
+ getLoaders().put(id, new ComponentRegistryLoader(engine));
+ }
+ return getLoaders().get(id);
+ }
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/component/gui/GPELRegistryWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/component/gui/GPELRegistryWindow.java?rev=1196200&r1=1196199&r2=1196200&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/component/gui/GPELRegistryWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/gpel/component/gui/GPELRegistryWindow.java Tue Nov 1 18:48:14 2011
@@ -37,6 +37,7 @@ import org.apache.airavata.xbaya.gui.Gri
import org.apache.airavata.xbaya.gui.XBayaDialog;
import org.apache.airavata.xbaya.gui.XBayaLabel;
import org.apache.airavata.xbaya.gui.XBayaTextField;
+import org.apache.airavata.xbaya.util.RegistryConstants;
import org.apache.airavata.xbaya.workflow.WorkflowClient.WorkflowType;
public class GPELRegistryWindow {
@@ -58,7 +59,7 @@ public class GPELRegistryWindow {
*/
public GPELRegistryWindow(XBayaEngine engine) {
this.engine = engine;
- this.loader = new ComponentRegistryLoader(engine);
+ this.loader = ComponentRegistryLoader.getLoader(this.engine, RegistryConstants.REGISTRY_TYPE_GPEL);
initGUI();
}
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicNodeWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicNodeWindow.java?rev=1196200&r1=1196199&r2=1196200&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicNodeWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/graph/dynamic/gui/DynamicNodeWindow.java Tue Nov 1 18:48:14 2011
@@ -55,6 +55,7 @@ import org.apache.airavata.xbaya.gui.Gri
import org.apache.airavata.xbaya.gui.XBayaDialog;
import org.apache.airavata.xbaya.gui.XBayaLabel;
import org.apache.airavata.xbaya.gui.XBayaTextArea;
+import org.apache.airavata.xbaya.util.RegistryConstants;
import org.xmlpull.infoset.XmlElement;
import org.xmlpull.infoset.XmlNamespace;
import org.xmlpull.v1.builder.XmlBuilderException;
@@ -176,7 +177,7 @@ public class DynamicNodeWindow {
Thread.sleep(10000);
registry = new URLComponentRegistry(new URI("http://129.79.246.108:8080/axis2/services/"
+ getClassName(code) + "?wsdl"));
- new ComponentRegistryLoader(engine).load(registry);
+ ComponentRegistryLoader.getLoader(this.engine, RegistryConstants.REGISTRY_TYPE_URL).load(registry);
Node newNode = this.engine
.getGUI()
Added: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/RegistryConstants.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/RegistryConstants.java?rev=1196200&view=auto
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/RegistryConstants.java (added)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/util/RegistryConstants.java Tue Nov 1 18:48:14 2011
@@ -0,0 +1,30 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.airavata.xbaya.util;
+
+public class RegistryConstants {
+ public static final String REGISTRY_TYPE_JCR="registry.type.jcr";
+ public static final String REGISTRY_TYPE_LOCAL="registry.type.local";
+ public static final String REGISTRY_TYPE_URL="registry.type.url";
+ public static final String REGISTRY_TYPE_GPEL="registry.type.gpel";
+ public static final String REGISTRY_TYPE_WEB="registry.type.web";
+}