jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject svn commit: rev 56227 - in incubator/jackrabbit/trunk/src: conf java/org/apache/jackrabbit/core java/org/apache/jackrabbit/core/fs
Date Mon, 01 Nov 2004 11:36:27 GMT
Author: stefan
Date: Mon Nov  1 03:36:25 2004
New Revision: 56227

Modified:
   incubator/jackrabbit/trunk/src/conf/repository.xml
   incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/RepositoryImpl.java
   incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Test.java
   incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/WorkspaceImpl.java
   incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/fs/FileSystemResource.java
Log:
adding synchonized to a couple of FileSystemResource methods
and making some debug methods public

Modified: incubator/jackrabbit/trunk/src/conf/repository.xml
==============================================================================
--- incubator/jackrabbit/trunk/src/conf/repository.xml	(original)
+++ incubator/jackrabbit/trunk/src/conf/repository.xml	Mon Nov  1 03:36:25 2004
@@ -107,7 +107,8 @@
             persistence manager of the workspace:
             class: FQN of class implementing PersistenceManager interface
         -->
-        <PersistenceManager class="org.apache.jackrabbit.core.state.xml.XMLPersistenceManager">
+        <!-- <PersistenceManager class="org.apache.jackrabbit.core.state.xml.XMLPersistenceManager">
-->
+        <PersistenceManager class="org.apache.jackrabbit.core.state.obj.ObjectPersistenceManager">
             <!-- <param name="someParam" value="someValue"/> -->
         </PersistenceManager>
         <SearchIndex path="/index"/>

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/RepositoryImpl.java
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/RepositoryImpl.java	(original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/RepositoryImpl.java	Mon
Nov  1 03:36:25 2004
@@ -530,7 +530,7 @@
      *
      * @see Runtime#addShutdownHook(Thread)
      */
-    protected synchronized void shutdown() {
+    public synchronized void shutdown() {
         // check state
         if (disposed) {
             // there's nothing to do here because the repository has already been shut down

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Test.java
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Test.java	(original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/Test.java	Mon Nov  1 03:36:25
2004
@@ -243,7 +243,7 @@
             imported = root.getNode("imported");
         }
 
-        //importNode(new File("d:/dev/jsr170/jackrabbit/src/java"), imported);
+        importNode(new File("d:/dev/jsr170/jackrabbit/src/java"), imported);
 
         if (root.hasNode("foo")) {
             root.getNode("foo").remove();

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/WorkspaceImpl.java
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/WorkspaceImpl.java	(original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/WorkspaceImpl.java	Mon
Nov  1 03:36:25 2004
@@ -131,7 +131,7 @@
      * @param ps
      * @throws RepositoryException
      */
-    void dump(PrintStream ps) throws RepositoryException {
+    public void dump(PrintStream ps) throws RepositoryException {
         ps.println("Workspace: " + wspConfig.getName() + " (" + this + ")");
         ps.println();
         //persistentStateMgr.dump(ps);

Modified: incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/fs/FileSystemResource.java
==============================================================================
--- incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/fs/FileSystemResource.java
(original)
+++ incubator/jackrabbit/trunk/src/java/org/apache/jackrabbit/core/fs/FileSystemResource.java
Mon Nov  1 03:36:25 2004
@@ -89,7 +89,7 @@
      *
      * @throws FileSystemException
      */
-    public void makeParentDirs() throws FileSystemException {
+    public synchronized void makeParentDirs() throws FileSystemException {
         String parentDir = getParentDir();
         if (!fs.exists(parentDir)) {
             fs.createFolder(parentDir);
@@ -103,7 +103,7 @@
      * @see FileSystem#deleteFile
      */
     public void delete() throws FileSystemException {
-        fs.deleteFile(path);
+        delete(false);
     }
 
     /**
@@ -113,7 +113,7 @@
      *                             automatically be deleted
      * @see FileSystem#deleteFile
      */
-    public void delete(boolean pruneEmptyParentDirs) throws FileSystemException {
+    public synchronized void delete(boolean pruneEmptyParentDirs) throws FileSystemException
{
         fs.deleteFile(path);
         if (pruneEmptyParentDirs) {
             // prune empty parent folders

Mime
View raw message