jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From marti...@apache.org
Subject svn commit: r810068 - in /jackrabbit/sandbox/JCR-1456/jackrabbit-core: ./ src/main/java/org/apache/jackrabbit/core/fs/db/ src/main/java/org/apache/jackrabbit/core/persistence/bundle/ src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ src...
Date Tue, 01 Sep 2009 14:20:45 GMT
Author: martijnh
Date: Tue Sep  1 14:20:44 2009
New Revision: 810068

URL: http://svn.apache.org/viewvc?rev=810068&view=rev
Log:
JCR-1456 Database connection pooling

* Some minor modifications such that tests can be run on Oracle (10g).
* Renamed the workspace-init-test workspace because Oracle identifiers have a max length of
30.
* Special Oracle blob support needs to unwrap the connection provided by the commons-dbcp
library.

Added:
    jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/wsp-init-test/
      - copied from r809496, jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/workspace-init-test/
    jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository/workspaces/wsp-init-test/
      - copied from r809496, jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository/workspaces/workspace-init-test/
Removed:
    jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/workspace-init-test/
    jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository/workspaces/workspace-init-test/
Modified:
    jackrabbit/sandbox/JCR-1456/jackrabbit-core/pom.xml
    jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/OracleFileSystem.java
    jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/Oracle9PersistenceManager.java
    jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/OraclePersistenceManager.java
    jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ConnectionFactory.java
    jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ConnectionHelper.java
    jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/Oracle10R1ConnectionHelper.java
    jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/OracleConnectionHelper.java
    jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/WorkspaceInitTest.java
    jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/wsp-init-test/workspace.xml
    jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository/workspaces/wsp-init-test/workspace.xml

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-core/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-core/pom.xml?rev=810068&r1=810067&r2=810068&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-core/pom.xml (original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-core/pom.xml Tue Sep  1 14:20:44 2009
@@ -279,7 +279,7 @@
         <config.db.journalclass>org.apache.jackrabbit.core.journal.MSSqlDatabaseJournal</config.db.journalclass>
         <config.db.schema>mssql</config.db.schema>
         <config.db.user>user</config.db.user>
-        <config.db.pwd>$pwd</config.db.pwd>
+        <config.db.pwd>pwd</config.db.pwd>
         <config.db.driver>net.sourceforge.jtds.jdbc.Driver</config.db.driver>
         <config.db.url>jdbc:jtds:sqlserver://localhost:2433/${config.db.name}</config.db.url>
         <config.db.metaurl>jdbc:jtds:sqlserver://localhost:2433/master</config.db.metaurl>
@@ -288,6 +288,24 @@
       </properties>
     </profile>
     <profile>
+      <id>oracle</id>
+      <properties>
+        <config.db.name>unused</config.db.name>
+        <config.db.fsclass>org.apache.jackrabbit.core.fs.db.OracleFileSystem</config.db.fsclass>
+        <config.db.dsclass>org.apache.jackrabbit.core.data.db.DbDataStore</config.db.dsclass>
+        <config.db.pmclass>org.apache.jackrabbit.core.persistence.bundle.OraclePersistenceManager</config.db.pmclass>
+        <config.db.journalclass>org.apache.jackrabbit.core.journal.OracleDatabaseJournal</config.db.journalclass>
+        <config.db.schema>oracle</config.db.schema>
+        <config.db.user>user</config.db.user>
+        <config.db.pwd>password</config.db.pwd>
+        <config.db.driver>oracle.jdbc.driver.OracleDriver</config.db.driver>
+        <config.db.url>jdbc:oracle:thin:@localhost:1521:xe</config.db.url>
+        <config.db.metaurl>unused</config.db.metaurl>
+        <config.db.dropcommand>unused</config.db.dropcommand>
+        <config.db.createcommand>unused</config.db.createcommand>
+      </properties>
+    </profile>
+    <profile>
       <id>use-descriptor-overlay</id>
       <build>
       <plugins>
@@ -354,7 +372,7 @@
                   <copy todir="${project.build.directory}/repository" overwrite="true">
                     <fileset dir="${basedir}/src/test/repository-descriptor-overlay" />
                     <filterset>
-                      <filter token="repo.id" value="R1" />
+                      <filter token="repo.id" value="A" />
                       <filter token="config.db.schema" value="${config.db.schema}" />
                       <filter token="config.db.driver" value="${config.db.driver}" />
                       <filter token="config.db.url" value="${config.db.url}" />
@@ -369,7 +387,7 @@
                   <copy todir="${project.build.directory}/repository-2" overwrite="true">
                     <fileset dir="${basedir}/src/test/repository-descriptor-overlay" />
                     <filterset>
-                      <filter token="repo.id" value="R2" />
+                      <filter token="repo.id" value="B" />
                       <filter token="config.db.schema" value="${config.db.schema}" />
                       <filter token="config.db.driver" value="${config.db.driver}" />
                       <filter token="config.db.url" value="${config.db.url}" />
@@ -412,6 +430,12 @@
           <version>1.2.2</version>
           <scope>test</scope>
         </dependency>
+        <dependency>
+          <groupId>com.oracle</groupId>
+          <artifactId>ojdbc14</artifactId>
+          <version>10.2.0.3.0</version>
+          <scope>test</scope>
+        </dependency>
       </dependencies>
     </profile>
   </profiles>

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/OracleFileSystem.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/OracleFileSystem.java?rev=810068&r1=810067&r2=810068&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/OracleFileSystem.java
(original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/fs/db/OracleFileSystem.java
Tue Sep  1 14:20:44 2009
@@ -22,6 +22,7 @@
 import org.apache.jackrabbit.core.fs.FileSystemException;
 import org.apache.jackrabbit.core.fs.FileSystemPathUtil;
 import org.apache.jackrabbit.core.fs.RandomAccessOutputStream;
+import org.apache.jackrabbit.core.persistence.bundle.util.ConnectionFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -154,6 +155,32 @@
     }
 
     /**
+     * Makes sure that <code>schemaObjectPrefix</code> does only consist of
+     * characters that are allowed in names on the target database. Illegal
+     * characters will be replaced by '_'.
+     *
+     * @throws Exception if an error occurs
+     */
+    @Override
+    protected void prepareSchemaObjectPrefix() throws Exception {
+        DatabaseMetaData metaData = con.getMetaData();
+        String legalChars = metaData.getExtraNameCharacters();
+        legalChars += "ABCDEFGHIJKLMNOPQRSTUVWXZY0123456789_";
+
+        String prefix = schemaObjectPrefix.toUpperCase();
+        StringBuffer escaped = new StringBuffer();
+        for (int i = 0; i < prefix.length(); i++) {
+            char c = prefix.charAt(i);
+            if (legalChars.indexOf(c) == -1) {
+                escaped.append("_");
+            } else {
+                escaped.append(c);
+            }
+        }
+        schemaObjectPrefix = escaped.toString();
+    }
+
+    /**
      * {@inheritDoc}
      * <p/>
      * Overridden in order to support multiple oracle schemas. Note that
@@ -569,7 +596,7 @@
         Method createTemporary = blobClass.getMethod("createTemporary",
                 new Class[]{Connection.class, Boolean.TYPE, Integer.TYPE});
         Object blob = createTemporary.invoke(null,
-                new Object[]{con, Boolean.FALSE, durationSessionConstant});
+                new Object[]{ConnectionFactory.unwrap(con), Boolean.FALSE, durationSessionConstant});
         Method open = blobClass.getMethod("open", new Class[]{Integer.TYPE});
         open.invoke(blob, new Object[]{modeReadWriteConstant});
         Method getBinaryOutputStream =

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/Oracle9PersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/Oracle9PersistenceManager.java?rev=810068&r1=810067&r2=810068&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/Oracle9PersistenceManager.java
(original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/Oracle9PersistenceManager.java
Tue Sep  1 14:20:44 2009
@@ -44,7 +44,7 @@
      */
     @Override
     protected ConnectionHelper createConnectionHelper(DataSource dataSrc) throws Exception
{
-        Oracle10R1ConnectionHelper helper = new Oracle10R1ConnectionHelper(dataSrc, user);
+        Oracle10R1ConnectionHelper helper = new Oracle10R1ConnectionHelper(dataSrc);
         helper.init();
         return helper;
     }

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/OraclePersistenceManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/OraclePersistenceManager.java?rev=810068&r1=810067&r2=810068&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/OraclePersistenceManager.java
(original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/OraclePersistenceManager.java
Tue Sep  1 14:20:44 2009
@@ -47,7 +47,7 @@
 public class OraclePersistenceManager extends BundleDbPersistenceManager {
 
     /** the Oracle table space to use */
-    protected String tableSpace;
+    protected String tableSpace = "";
 
     /**
      * Creates a new oracle persistence manager
@@ -111,7 +111,7 @@
      */
     @Override
     protected ConnectionHelper createConnectionHelper(DataSource dataSrc) throws Exception
{
-        OracleConnectionHelper helper = new OracleConnectionHelper(dataSrc, user);
+        OracleConnectionHelper helper = new OracleConnectionHelper(dataSrc);
         helper.init();
         return helper;
     }

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ConnectionFactory.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ConnectionFactory.java?rev=810068&r1=810067&r2=810068&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ConnectionFactory.java
(original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ConnectionFactory.java
Tue Sep  1 14:20:44 2009
@@ -16,6 +16,7 @@
  */
 package org.apache.jackrabbit.core.persistence.bundle.util;
 
+import java.lang.reflect.Field;
 import java.sql.Connection;
 import java.sql.SQLException;
 
@@ -25,6 +26,7 @@
 import javax.sql.DataSource;
 
 import org.apache.commons.dbcp.BasicDataSource;
+import org.apache.commons.dbcp.DelegatingConnection;
 
 /**
  * A factory for new database connections.
@@ -92,6 +94,31 @@
     }
 
     /**
+     * Needed for pre-10R2 Oracle blob support....:(
+     * 
+     * This method actually assumes that we are using commons DBCP 1.2.2.
+     * 
+     * @param con the commons-DBCP pooled connection to unwrap
+     * @return the unwrapped connection
+     */
+    public static Connection unwrap(Connection con) throws SQLException {
+        try {
+            Field f1 = con.getClass().getDeclaredField("delegate");
+            f1.setAccessible(true);
+            Object con2 = f1.get(con);
+            Field f2 = DelegatingConnection.class.getDeclaredField("_conn");
+            f2.setAccessible(true);
+            return (Connection) f2.get(con2);
+        } catch (IllegalArgumentException e) {
+            throw new SQLException("failed to unwrap connection: " + e.getMessage());
+        } catch (NoSuchFieldException e) {
+            throw new SQLException("failed to unwrap connection: " + e.getMessage());
+        } catch (IllegalAccessException e) {
+            throw new SQLException("failed to unwrap connection: " + e.getMessage());
+        }
+    }
+
+    /**
      * Loads and returns the given JDBC driver (or JNDI context) class.
      * Returns <code>null</code> if a class name is not given.
      *

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ConnectionHelper.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ConnectionHelper.java?rev=810068&r1=810067&r2=810068&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ConnectionHelper.java
(original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/ConnectionHelper.java
Tue Sep  1 14:20:44 2009
@@ -50,7 +50,7 @@
  */
 public class ConnectionHelper {
 
-    private final String userName;
+    private final boolean checkTablesWithUserName;
 
     protected final DataSource dataSource;
 
@@ -65,18 +65,18 @@
      */
     public ConnectionHelper(DataSource dataSrc) {
         dataSource = dataSrc;
-        userName = null;
+        checkTablesWithUserName = false;
     }
 
     /**
      * Constructor, typically used for Oracle subtypes.
      * 
      * @param dataSrc the {@link DataSource} on which this instance acts
-     * @param user the username which is to be used for the {@link #tableExists(String)}
method
+     * @param checkWithUserName whether the username is to be used for the {@link #tableExists(String)}
method
      */
-    protected ConnectionHelper(DataSource dataSrc, String user) {
+    protected ConnectionHelper(DataSource dataSrc, boolean checkWithUserName) {
         dataSource = dataSrc;
-        userName = user;
+        checkTablesWithUserName = checkWithUserName;
     }
     
     /**
@@ -156,6 +156,10 @@
             } else if (metaData.storesUpperCaseIdentifiers()) {
                 name = tableName.toUpperCase();
             }
+            String userName = null;
+            if (checkTablesWithUserName) {
+                userName = metaData.getUserName();
+            }
             rs = metaData.getTables(null, userName, name, null);
             schemaExists = rs.next();
         } finally {
@@ -217,17 +221,25 @@
     /**
      * Executes a general SQL statement and immediately closes all resources.
      * 
+     * Note: We use a Statement if there are no parameters to avoid a problem on
+     * the Oracle 10g JDBC driver w.r.t. :NEW and :OLD keywords that triggers ORA-17041.
+     *
      * @param sql an SQL statement string
      * @param params the parameters for the SQL statement
      * @throws SQLException on error
      */
     public final void exec(String sql, Object... params) throws SQLException {
         Connection con = null;
-        PreparedStatement stmt = null;
+        Statement stmt = null;
         try {
             con = getConnection();
-            stmt = con.prepareStatement(sql);
-            execute(stmt, params);
+            if (params == null || params.length == 0) {
+                stmt = con.createStatement();
+                stmt.execute(sql);
+            } else {
+                stmt = con.prepareStatement(sql);
+                execute((PreparedStatement) stmt, params);
+            }
         } finally {
             closeResources(con, stmt, null);
         }
@@ -335,10 +347,10 @@
     }
 
     /**
-     * This method is used by all methods of this class that execute SQL statements. This
default
-     * implementation sets all parameters and unwraps {@link StreamWrapper} instances. Subclasses
may override
-     * this method to do something special with the parameters. E.g., the {@code Oracle10R1ConnectionHelper}
-     * overrides it in order to add special blob handling.
+     * This method is used by all methods of this class that execute SQL statements with
parameters. This
+     * default implementation sets all parameters and unwraps {@link StreamWrapper} instances.
Subclasses may
+     * override this method to do something special with the parameters. E.g., the {@code
+     * Oracle10R1ConnectionHelper} overrides it in order to add special blob handling.
      * 
      * @param stmt the {@link PreparedStatement} to execute
      * @param params the parameters

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/Oracle10R1ConnectionHelper.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/Oracle10R1ConnectionHelper.java?rev=810068&r1=810067&r2=810068&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/Oracle10R1ConnectionHelper.java
(original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/Oracle10R1ConnectionHelper.java
Tue Sep  1 14:20:44 2009
@@ -53,8 +53,8 @@
      * @param dataSrc
      * @param userName
      */
-    public Oracle10R1ConnectionHelper(DataSource dataSrc, String userName) {
-        super(dataSrc, userName);
+    public Oracle10R1ConnectionHelper(DataSource dataSrc) {
+        super(dataSrc);
     }
 
     /**
@@ -135,7 +135,9 @@
          */
         Method createTemporary =
             blobClass.getMethod("createTemporary", new Class[]{Connection.class, Boolean.TYPE,
Integer.TYPE});
-        Object blob = createTemporary.invoke(null, new Object[]{con, Boolean.FALSE, durationSessionConstant});
+        Object blob =
+            createTemporary.invoke(null, new Object[]{ConnectionFactory.unwrap(con), Boolean.FALSE,
+                    durationSessionConstant});
         Method open = blobClass.getMethod("open", new Class[]{Integer.TYPE});
         open.invoke(blob, new Object[]{modeReadWriteConstant});
         Method getBinaryOutputStream = blobClass.getMethod("getBinaryOutputStream", new Class[0]);

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/OracleConnectionHelper.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/OracleConnectionHelper.java?rev=810068&r1=810067&r2=810068&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/OracleConnectionHelper.java
(original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/persistence/bundle/util/OracleConnectionHelper.java
Tue Sep  1 14:20:44 2009
@@ -37,10 +37,9 @@
 
     /**
      * @param dataSrc
-     * @param userName
      */
-    public OracleConnectionHelper(DataSource dataSrc, String userName) {
-        super(dataSrc, userName);
+    public OracleConnectionHelper(DataSource dataSrc) {
+        super(dataSrc, true);
     }
 
     public void init() throws Exception {
@@ -58,7 +57,7 @@
         } catch (SQLException e) {
             log.warn("Can not retrieve driver version", e);
         } finally {
-          DbUtility.close(connection, null, null);
+            DbUtility.close(connection, null, null);
         }
     }
 

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/WorkspaceInitTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/WorkspaceInitTest.java?rev=810068&r1=810067&r2=810068&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/WorkspaceInitTest.java
(original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/integration/WorkspaceInitTest.java
Tue Sep  1 14:20:44 2009
@@ -48,7 +48,7 @@
             Thread t = new Thread(new Runnable() {
                 public void run() {
                     try {
-                        getHelper().getSuperuserSession("workspace-init-test").logout();
+                        getHelper().getSuperuserSession("wsp-init-test").logout();
                     } catch (RepositoryException e) {
                         throw new RuntimeException(e);
                     }

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/wsp-init-test/workspace.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/wsp-init-test/workspace.xml?rev=810068&r1=809496&r2=810068&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/wsp-init-test/workspace.xml
(original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository-descriptor-overlay/workspaces/wsp-init-test/workspace.xml
Tue Sep  1 14:20:44 2009
@@ -15,7 +15,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
   -->
-<Workspace name="workspace-init-test">
+<Workspace name="wsp-init-test">
  
   <FileSystem class="@config.db.fsclass@">
     <param name="driver" value="@config.db.driver@" />

Modified: jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository/workspaces/wsp-init-test/workspace.xml
URL: http://svn.apache.org/viewvc/jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository/workspaces/wsp-init-test/workspace.xml?rev=810068&r1=809496&r2=810068&view=diff
==============================================================================
--- jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository/workspaces/wsp-init-test/workspace.xml
(original)
+++ jackrabbit/sandbox/JCR-1456/jackrabbit-core/src/test/repository/workspaces/wsp-init-test/workspace.xml
Tue Sep  1 14:20:44 2009
@@ -15,7 +15,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
   -->
-<Workspace name="workspace-init-test">
+<Workspace name="wsp-init-test">
   <!--
       virtual file system of the workspace:
       class: FQN of class implementing FileSystem interface



Mime
View raw message