You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sa...@apache.org on 2012/09/12 16:32:56 UTC
svn commit: r1383966 - in /incubator/airavata/trunk/modules:
commons/registry-api/src/main/java/org/apache/airavata/registry/api/
gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/
registry/airavata-jpa-registry/src/main/java/org/apac...
Author: samindaw
Date: Wed Sep 12 14:32:55 2012
New Revision: 1383966
URL: http://svn.apache.org/viewvc?rev=1383966&view=rev
Log:
adding isactive method nad removing closeconnection method
Modified:
incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistry2.java
incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataSubRegistry.java
incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java
incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java
incubator/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java
incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/JCRRegistryWindow.java
Modified: incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistry2.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistry2.java?rev=1383966&r1=1383965&r2=1383966&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistry2.java (original)
+++ incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataRegistry2.java Wed Sep 12 14:32:55 2012
@@ -52,7 +52,5 @@ public abstract class AiravataRegistry2
public void setUser(AiravataUser user) {
this.user = user;
}
-
- public abstract void closeConnection();
}
Modified: incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataSubRegistry.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataSubRegistry.java?rev=1383966&r1=1383965&r2=1383966&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataSubRegistry.java (original)
+++ incubator/airavata/trunk/modules/commons/registry-api/src/main/java/org/apache/airavata/registry/api/AiravataSubRegistry.java Wed Sep 12 14:32:55 2012
@@ -28,5 +28,12 @@ public interface AiravataSubRegistry {
public abstract void setAiravataUser(AiravataUser user);
public abstract void setGateway(Gateway gateway);
-
+
+ /**
+ * Determines whether this registry is active. If true the registry is ready to do the
+ * transaction
+ * @return
+ */
+ public abstract boolean isActive();
+
}
\ No newline at end of file
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java?rev=1383966&r1=1383965&r2=1383966&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImpl.java Wed Sep 12 14:32:55 2012
@@ -252,8 +252,6 @@ public class PropertiesBasedServiceImpl
@Override
public void postProcess(InvocationContext context) throws ServiceException {
- if(this.registryService != null)
- ((AiravataRegistry2)this.registryService).closeConnection();
}
/*
Modified: incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java?rev=1383966&r1=1383965&r2=1383966&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java (original)
+++ incubator/airavata/trunk/modules/registry/airavata-jpa-registry/src/main/java/org/apache/airavata/persistance/registry/jpa/impl/AiravataJPARegistry.java Wed Sep 12 14:32:55 2012
@@ -85,15 +85,21 @@ import org.slf4j.LoggerFactory;
public class AiravataJPARegistry extends AiravataRegistry2{
private final static Logger logger = LoggerFactory.getLogger(AiravataJPARegistry.class);
private JPAResourceAccessor jpa;
-
+ private boolean active=false;
+
@Override
protected void initialize() {
jpa = new JPAResourceAccessor(this);
+ //TODO check if the db connections are proper & accessible & the relevant db/tables are
+ //present
+ active=true;
}
+
- @Override
- public void closeConnection() {
- }
+ @Override
+ public boolean isActive() {
+ return active;
+ }
/**---------------------------------Configuration Registry----------------------------------**/
Modified: incubator/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java?rev=1383966&r1=1383965&r2=1383966&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebox/src/main/java/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java Wed Sep 12 14:32:55 2012
@@ -76,7 +76,6 @@ public class MsgBoxServiceLifeCycle impl
} catch (InterruptedException e) {
logger.info("Message box url update thread is interrupted");
}
- registry.closeConnection();
if (configurationcontext.getProperty(MsgBoxCommonConstants.MSGBOX_STORAGE) != null) {
MsgBoxStorage msgBoxStorage = (MsgBoxStorage) configurationcontext
.getProperty(MsgBoxCommonConstants.MSGBOX_STORAGE);
Modified: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java?rev=1383966&r1=1383965&r2=1383966&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/broker/BrokerServiceLifeCycle.java Wed Sep 12 14:32:55 2012
@@ -108,7 +108,6 @@ public class BrokerServiceLifeCycle impl
log.info("Message box url update thread is interrupted");
}
- (registry).closeConnection();
}
}
log.info("broker shut down");
Modified: incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/JCRRegistryWindow.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/JCRRegistryWindow.java?rev=1383966&r1=1383965&r2=1383966&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/JCRRegistryWindow.java (original)
+++ incubator/airavata/trunk/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/ui/dialogs/registry/JCRRegistryWindow.java Wed Sep 12 14:32:55 2012
@@ -162,15 +162,15 @@ public class JCRRegistryWindow {
});
GridPanel infoPanel = new GridPanel();
- infoPanel.add(urlLabel);
- infoPanel.add(this.urlTextField);
+// infoPanel.add(urlLabel);
+// infoPanel.add(this.urlTextField);
infoPanel.add(nameLabel);
infoPanel.add(this.usernameTextField);
infoPanel.add(passLabel);
infoPanel.add(this.passwordTextField);
infoPanel.add(emptyLabel);
infoPanel.add(this.newUserButton);
- infoPanel.layout(4, 2, GridPanel.WEIGHT_NONE, 1);
+ infoPanel.layout(3, 2, GridPanel.WEIGHT_NONE, 1);
infoPanel.getSwingComponent().setBorder(BorderFactory.createEtchedBorder());