weaver 2004/02/27 09:49:39
Modified: components/rdbms/src/test/org/apache/jetspeed/components
TestRDBMS.java DatasourceEnabledTestSuite.java
Log:
removed all HSQL specific references from the project.
Building will now require the user to start the test HSQL server for "allBuild"
and the production server for inatallProductionDb and any deployment goals
Revision Changes Path
1.2 +0 -8
jakarta-jetspeed-2/components/rdbms/src/test/org/apache/jetspeed/components/TestRDBMS.java
Index: TestRDBMS.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/rdbms/src/test/org/apache/jetspeed/components/TestRDBMS.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestRDBMS.java 24 Feb 2004 00:38:47 -0000 1.1
+++ TestRDBMS.java 27 Feb 2004 17:49:39 -0000 1.2
@@ -89,14 +89,6 @@
{
super(name);
}
- public void testHSQL_1() throws Exception
- {
- Class.forName(jdbcDriver.class.getName());
- Connection conn =
DriverManager.getConnection("jdbc:hsqldb:hsql://127.0.0.1", "sa", "");
- assertNotNull(conn);
- assertFalse(conn.isClosed());
- conn.close();
- }
public void testDBCP_1() throws Exception
{
assertTrue(DatasourceComponent.class.isAssignableFrom(DBCPDatasourceComponent.class));
1.4 +2 -9
jakarta-jetspeed-2/components/rdbms/src/test/org/apache/jetspeed/components/DatasourceEnabledTestSuite.java
Index: DatasourceEnabledTestSuite.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/rdbms/src/test/org/apache/jetspeed/components/DatasourceEnabledTestSuite.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DatasourceEnabledTestSuite.java 26 Feb 2004 17:39:23 -0000 1.3
+++ DatasourceEnabledTestSuite.java 27 Feb 2004 17:49:39 -0000 1.4
@@ -17,7 +17,6 @@
import org.apache.jetspeed.components.ComponentManager;
import org.apache.jetspeed.components.datasource.DatasourceComponent;
-import org.apache.jetspeed.components.hsql.HSQLServerComponent;
import org.apache.jetspeed.components.jndi.JNDIComponent;
import org.picocontainer.MutablePicoContainer;
@@ -97,13 +96,7 @@
protected void initDatasource()throws Exception
{
- // Set the db script to be used, if not already set
- String scriptPath =
System.getProperty(HSQLServerComponent.SYS_PROP_HSQLDBSERVER_DB_PATH);
- if(scriptPath == null)
- {
- System.setProperty(HSQLServerComponent.SYS_PROP_HSQLDBSERVER_DB_PATH,
"../../portal/test/db/hsql/Registry");
- }
-
+ System.out.println("========= JDBC Driver
"+System.getProperty("org.apache.jetspeed.database.driver"));
System.out.println("========================= DatasourceEnabledTestSuite
start RDBMS container ");
Reader composition = new
InputStreamReader(Thread.currentThread().getContextClassLoader().getResourceAsStream(
script));
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
