You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by pa...@apache.org on 2011/09/17 08:32:53 UTC
svn commit: r1171919 - in /incubator/airavata/trunk/modules/ws-messenger:
commons/src/main/java/org/apache/airavata/wsmg/commons/storage/
messagebox/src/main/org/apache/airavata/wsmg/msgbox/
messagebroker/src/main/java/org/apache/airavata/wsmg/commons/...
Author: patanachai
Date: Sat Sep 17 06:32:52 2011
New Revision: 1171919
URL: http://svn.apache.org/viewvc?rev=1171919&view=rev
Log:
AIRAVATA-101 Clean up on Database check method
Modified:
incubator/airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/storage/DatabaseCreator.java
incubator/airavata/trunk/modules/ws-messenger/messagebox/src/main/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java
incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/commons/storage/WsmgPersistantStorage.java
Modified: incubator/airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/storage/DatabaseCreator.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/storage/DatabaseCreator.java?rev=1171919&r1=1171918&r2=1171919&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/storage/DatabaseCreator.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/commons/src/main/java/org/apache/airavata/wsmg/commons/storage/DatabaseCreator.java Sat Sep 17 06:32:52 2011
@@ -84,14 +84,14 @@ public class DatabaseCreator {
}
/**
- * Checks whether database tables are created.
+ * Checks whether database tables are created by using select * on given table name
*
- * @param checkSQL
- * SQL execute during check.
+ * @param tableName
+ * Table which should be existed
* @return <code>true</core> if checkSQL is success, else <code>false</code>
* .
*/
- public static boolean isDatabaseStructureCreated(String checkSQL, Connection conn) {
+ public static boolean isDatabaseStructureCreated(String tableName, Connection conn) {
try {
if (log.isTraceEnabled()) {
log.trace("Running a query to test the database tables existence.");
@@ -100,7 +100,7 @@ public class DatabaseCreator {
Statement statement = null;
try {
statement = conn.createStatement();
- ResultSet rs = statement.executeQuery(checkSQL);
+ ResultSet rs = statement.executeQuery("select * from " + tableName);
if (rs != null) {
rs.close();
}
Modified: incubator/airavata/trunk/modules/ws-messenger/messagebox/src/main/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebox/src/main/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java?rev=1171919&r1=1171918&r2=1171919&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebox/src/main/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebox/src/main/org/apache/airavata/wsmg/msgbox/MsgBoxServiceLifeCycle.java Sat Sep 17 06:32:52 2011
@@ -50,8 +50,10 @@ import org.slf4j.LoggerFactory;
*/
public class MsgBoxServiceLifeCycle implements org.apache.axis2.engine.ServiceLifeCycle {
- private static final String CONFIGURATION_FILE_NAME = "msgBox.properties";
+
private static final Logger logger = LoggerFactory.getLogger(MsgBoxServiceLifeCycle.class);
+ private static final String CONFIGURATION_FILE_NAME = "msgBox.properties";
+ private static final String TABLE_NAME_TO_CHECK = "msgbox";
private JdbcStorage db;
public void shutDown(ConfigurationContext configurationcontext, AxisService axisservice) {
@@ -88,7 +90,7 @@ public class MsgBoxServiceLifeCycle impl
* Check database
*/
Connection conn = db.connect();
- if (!DatabaseCreator.isDatabaseStructureCreated("SELECT * from subscription", conn)) {
+ if (!DatabaseCreator.isDatabaseStructureCreated(TABLE_NAME_TO_CHECK, conn)) {
DatabaseCreator.createMsgBoxDatabase(conn);
logger.info("New Database created for Message Box");
} else {
Modified: incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/commons/storage/WsmgPersistantStorage.java
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/commons/storage/WsmgPersistantStorage.java?rev=1171919&r1=1171918&r2=1171919&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/commons/storage/WsmgPersistantStorage.java (original)
+++ incubator/airavata/trunk/modules/ws-messenger/messagebroker/src/main/java/org/apache/airavata/wsmg/commons/storage/WsmgPersistantStorage.java Sat Sep 17 06:32:52 2011
@@ -59,6 +59,8 @@ import org.slf4j.LoggerFactory;
public class WsmgPersistantStorage implements WsmgStorage {
private static final Logger logger = LoggerFactory.getLogger(WsmgPersistantStorage.class);
+ private static final String TABLE_NAME_TO_CHECK = "subscription";
+
private Counter storeToDBCounter = new Counter();
private JdbcStorage db = null;
@@ -79,7 +81,7 @@ public class WsmgPersistantStorage imple
* Check database
*/
Connection conn = db.connect();
- if (!DatabaseCreator.isDatabaseStructureCreated("SELECT * from subscription", conn)) {
+ if (!DatabaseCreator.isDatabaseStructureCreated(TABLE_NAME_TO_CHECK, conn)) {
DatabaseCreator.createMsgBrokerDatabase(conn);
logger.info("New Database created for Message Broker");
} else {