You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2007/01/18 01:02:02 UTC
svn commit: r497260 - in
/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console:
derbylogmanager/DerbyLogHelper.java internaldb/DBViewerPortlet.java
internaldb/RunSQLPortlet.java
Author: jdillon
Date: Wed Jan 17 16:02:01 2007
New Revision: 497260
URL: http://svn.apache.org/viewvc?view=rev&rev=497260
Log:
(GERONIMO-2748) Use DerbyConnectionUtil.getDerbyHome() instead of relying on system properties to find the bits under var/derby
Modified:
geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/derbylogmanager/DerbyLogHelper.java
geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/internaldb/DBViewerPortlet.java
geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/internaldb/RunSQLPortlet.java
Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/derbylogmanager/DerbyLogHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/derbylogmanager/DerbyLogHelper.java?view=diff&rev=497260&r1=497259&r2=497260
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/derbylogmanager/DerbyLogHelper.java (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/derbylogmanager/DerbyLogHelper.java Wed Jan 17 16:02:01 2007
@@ -28,6 +28,8 @@
import org.apache.geronimo.console.util.KernelHelper;
+import org.apache.geronimo.console.internaldb.DerbyConnectionUtil;
+
public class DerbyLogHelper extends KernelHelper {
private static ArrayList logs = new ArrayList();
@@ -35,8 +37,6 @@
private static int lineCount = 0;
- private static final String DERBY_SYSTEM_HOME = "derby.system.home";
-
private static final String LOG_FILENAME = "derby.log";
public static Collection getLogs() throws IOException {
@@ -70,8 +70,7 @@
}
public static String getSystemHome() {
- return System.getProperty(DERBY_SYSTEM_HOME);
+ return DerbyConnectionUtil.getDerbyHome();
}
-
}
Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/internaldb/DBViewerPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/internaldb/DBViewerPortlet.java?view=diff&rev=497260&r1=497259&r2=497260
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/internaldb/DBViewerPortlet.java (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/internaldb/DBViewerPortlet.java Wed Jan 17 16:02:01 2007
@@ -56,8 +56,6 @@
private static final String VIEWTBLCONTENTS_ACTION = "viewTableContents";
- private static final String DERBY_HOME = System.getProperty("derby.system.home");
-
private static DBViewerHelper helper = new DBViewerHelper();
private PortletRequestDispatcher maximizedView;
@@ -113,7 +111,7 @@
// Check is database & table is valid
if (LISTTBLS_ACTION.equals(action)
|| VIEWTBLCONTENTS_ACTION.equals(action)) {
- if (!helper.isDBValid(DERBY_HOME, db)) {
+ if (!helper.isDBValid(DerbyConnectionUtil.getDerbyHome(), db)) {
// DB not valid
log.error("Database is not valid: " + db);
action = "";
@@ -144,7 +142,7 @@
viewTableContentsView.include(renderRequest, renderResponse);
} else {
renderRequest.setAttribute("databases", helper
- .getDerbyDatabases(DERBY_HOME));
+ .getDerbyDatabases(DerbyConnectionUtil.getDerbyHome()));
listDatabasesView.include(renderRequest, renderResponse);
}
} else {
Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/internaldb/RunSQLPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/internaldb/RunSQLPortlet.java?view=diff&rev=497260&r1=497259&r2=497260
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/internaldb/RunSQLPortlet.java (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/internaldb/RunSQLPortlet.java Wed Jan 17 16:02:01 2007
@@ -53,8 +53,6 @@
private static DBViewerHelper dbHelper = new DBViewerHelper();
- private static String derbyHome = System.getProperty("derby.system.home");
-
private PortletRequestDispatcher normalView;
private PortletRequestDispatcher maximizedView;
@@ -93,13 +91,13 @@
if (CREATEDB_ACTION.equals(action)) {
actionResult = sqlHelper.createDB(createDB);
} else if (DELETEDB_ACTION.equals(action)) {
- actionResult = sqlHelper.deleteDB(derbyHome, deleteDB);
+ actionResult = sqlHelper.deleteDB(DerbyConnectionUtil.getDerbyHome(), deleteDB);
} else if (RUNSQL_ACTION.equals(action)) {
actionResult = sqlHelper.runSQL(useDB, sqlStmts);
} else if (BACKUPDB_ACTION.equals(action)) {
- actionResult = sqlHelper.backupDB(derbyHome, backupDB);
+ actionResult = sqlHelper.backupDB(DerbyConnectionUtil.getDerbyHome(), backupDB);
} else if (RESTOREDB_ACTION.equals(action)) {
- actionResult = sqlHelper.restoreDB(derbyHome, restoreDB);
+ actionResult = sqlHelper.restoreDB(DerbyConnectionUtil.getDerbyHome(), restoreDB);
}
}
@@ -111,7 +109,7 @@
String singleSelectStmt;
if (WindowState.NORMAL.equals(renderRequest.getWindowState())) {
- databases = dbHelper.getDerbyDatabases(derbyHome);
+ databases = dbHelper.getDerbyDatabases(DerbyConnectionUtil.getDerbyHome());
renderRequest.setAttribute("databases", databases);
if (RUNSQL_ACTION.equals(action)) {
// check if it's a single Select statement
@@ -156,7 +154,7 @@
MAXIMIZEDVIEW_JSP);
helpView = portletConfig.getPortletContext().getRequestDispatcher(
HELPVIEW_JSP);
- databases = dbHelper.getDerbyDatabases(derbyHome);
+ databases = dbHelper.getDerbyDatabases(DerbyConnectionUtil.getDerbyHome());
}
public void destroy() {