Author: ate
Date: Wed Nov 16 16:30:03 2005
New Revision: 345157
URL: http://svn.apache.org/viewcvs?rev=345157&view=rev
Log:
Moving jetspeed datasource JNDI setup into a separate component so that it also
can be used by SpringEngineHelper.
Added:
portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/jndi/JetspeedTestJNDIComponent.java
(with props)
Modified:
portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/util/DatasourceEnabledSpringTestCase.java
Added:
portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/jndi/JetspeedTestJNDIComponent.java
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/jndi/JetspeedTestJNDIComponent.java?rev=345157&view=auto
==============================================================================
---
portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/jndi/JetspeedTestJNDIComponent.java
(added)
+++
portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/jndi/JetspeedTestJNDIComponent.java
Wed Nov 16 16:30:03 2005
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2000-2001,2004 The Apache Software Foundation.
+ *
+ * Licensed 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.jetspeed.components.jndi;
+
+import org.apache.commons.pool.impl.GenericObjectPool;
+import org.apache.jetspeed.components.datasource.BoundDBCPDatasourceComponent;
+
+/**
+ * JetspeedDSTestJNDIComponent
+ * <p>
+ * Uses TyrexJNDIComponent to define a jetspeed Datasource for testing
purposes only.
+ * </p>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Scott T. Weaver</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Ate Douma</a>
+ * @version $Id$
+ */
+public class JetspeedTestJNDIComponent
+{
+ public static final String JNDI_DS_NAME = "jetspeed";
+
+ protected BoundDBCPDatasourceComponent datasourceComponent;
+ protected JNDIComponent jndi;
+
+ public void setup() throws Exception
+ {
+ jndi = new TyrexJNDIComponent();
+ String url = System.getProperty("org.apache.jetspeed.database.url");
+ String driver =
System.getProperty("org.apache.jetspeed.database.driver");
+ String user = System.getProperty("org.apache.jetspeed.database.user");
+ String password =
System.getProperty("org.apache.jetspeed.database.password");
+ datasourceComponent = new BoundDBCPDatasourceComponent(user, password,
driver, url, 20, 5000,
+ GenericObjectPool.WHEN_EXHAUSTED_GROW, true, JNDI_DS_NAME,
jndi);
+ datasourceComponent.start();
+ }
+
+ public void tearDown() throws Exception
+ {
+ jndi.unbindFromCurrentThread();
+ }
+}
Propchange:
portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/jndi/JetspeedTestJNDIComponent.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/util/DatasourceEnabledSpringTestCase.java
URL:
http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/util/DatasourceEnabledSpringTestCase.java?rev=345157&r1=345156&r2=345157&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/util/DatasourceEnabledSpringTestCase.java
(original)
+++
portals/jetspeed-2/trunk/components/rdbms/src/java/org/apache/jetspeed/components/util/DatasourceEnabledSpringTestCase.java
Wed Nov 16 16:30:03 2005
@@ -15,10 +15,7 @@
*/
package org.apache.jetspeed.components.util;
-import org.apache.commons.pool.impl.GenericObjectPool;
-import org.apache.jetspeed.components.datasource.BoundDBCPDatasourceComponent;
-import org.apache.jetspeed.components.jndi.JNDIComponent;
-import org.apache.jetspeed.components.jndi.TyrexJNDIComponent;
+import org.apache.jetspeed.components.jndi.JetspeedTestJNDIComponent;
import org.apache.jetspeed.components.test.AbstractSpringTestCase;
/**
@@ -34,27 +31,15 @@
*/
public abstract class DatasourceEnabledSpringTestCase extends
AbstractSpringTestCase
{
-
-
-
- protected BoundDBCPDatasourceComponent datasourceComponent;
- protected JNDIComponent jndi;
-
+ protected JetspeedTestJNDIComponent jndiDS;
+
/**
* @see junit.framework.TestCase#setUp()
*/
protected void setUp() throws Exception
{
-
- jndi = new TyrexJNDIComponent();
- String url = System.getProperty("org.apache.jetspeed.database.url");
- String driver =
System.getProperty("org.apache.jetspeed.database.driver");
- String user = System.getProperty("org.apache.jetspeed.database.user");
- String password =
System.getProperty("org.apache.jetspeed.database.password");
- datasourceComponent = new BoundDBCPDatasourceComponent(user, password,
driver, url, 20, 5000,
- GenericObjectPool.WHEN_EXHAUSTED_GROW, true, "jetspeed", jndi);
- datasourceComponent.start();
-
+ jndiDS = new JetspeedTestJNDIComponent();
+ jndiDS.setup();
super.setUp();
}
@@ -63,7 +48,7 @@
*/
protected void tearDown() throws Exception
{
- jndi.unbindFromCurrentThread();
+ jndiDS.tearDown();
super.tearDown();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
