[jboss-svn-commits] JBL Code SVN: r11691 - in labs/jbossrules/trunk/drools-repository/src: test/java/org/drools/repository and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: fmeyer
Date: 2007-05-04 14:18:23 -0400 (Fri, 04 May 2007)
New Revision: 11691

Added:
   labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RepositorySessionUtil.java
Removed:
   labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RepositorySessionUtil.java
Modified:
   labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/VersionableItem.java
Log:
Refactory on drools-repository, RepositorySessionUtil is used by both gwt hosted mode and tests. 

Copied: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RepositorySessionUtil.java (from rev 11686, labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RepositorySessionUtil.java)
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RepositorySessionUtil.java	                        (rev 0)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/RepositorySessionUtil.java	2007-05-04 18:18:23 UTC (rev 11691)
@@ -0,0 +1,75 @@
+package org.drools.repository;
+
+import java.io.File;
+
+import javax.jcr.Repository;
+import javax.jcr.Session;
+import javax.jcr.SimpleCredentials;
+
+//import junit.framework.Assert;
+
+/**
+ * This is a utility to simulate session behavior for the test suite.
+ * @author Michael Neale
+ *
+ */
+public class RepositorySessionUtil {
+
+    private static ThreadLocal repo = new ThreadLocal();
+
+    public static boolean deleteDir(File dir) {
+        
+        if (dir.isDirectory()) {
+            String[] children = dir.list();
+            for (int i=0; i<children.length; i++) {
+                boolean success = deleteDir(new File(dir, children[i]));
+                if (!success) {
+                    return false;
+                }
+            }
+        }
+    
+        // The directory is now empty so delete it
+        return dir.delete();
+    }    
+    
+    
+    public static RulesRepository getRepository() throws RulesRepositoryException {
+        Object repoInstance = repo.get();
+        if ( repoInstance == null ) {
+            
+            File dir = new File( "repository" );
+            System.out.println("DELETING test repo: " + dir.getAbsolutePath());
+            deleteDir( dir );
+            System.out.println("TEST repo was deleted.");
+            
+            JCRRepositoryConfigurator config = new JackrabbitRepositoryConfigurator();
+            
+            //create a repo instance (startup)
+            Repository repository = config.getJCRRepository(null);
+            
+            //create a session
+            Session session;
+            try {
+                session = repository.login(new SimpleCredentials("alan_parsons", "password".toCharArray()));
+                RulesRepositoryAdministrator admin = new RulesRepositoryAdministrator(session);
+                //clear out and setup
+                if (admin.isRepositoryInitialized()) {
+                    admin.clearRulesRepository();
+                }
+                config.setupRulesRepository( session );
+                
+                repoInstance = new RulesRepository( session );
+                repo.set( repoInstance );                
+            } catch ( Exception e) {
+                throw new RulesRepositoryException();
+                //Assert.fail("Unable to initialise repository :" + e.getMessage());
+            }
+            
+
+            
+        }
+        return (RulesRepository) repoInstance;        
+    }
+
+}

Modified: labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/VersionableItem.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/VersionableItem.java	2007-05-04 18:15:46 UTC (rev 11690)
+++ labs/jbossrules/trunk/drools-repository/src/main/java/org/drools/repository/VersionableItem.java	2007-05-04 18:18:23 UTC (rev 11691)
@@ -768,7 +768,6 @@
      * Test if the VersionableItem is archived 
      */
     public boolean isArchived() {
-    	checkout();
     	try {
     		return this.node.getProperty(CONTENT_PROPERTY_ARCHIVE_FLAG)
     				.getBoolean();

Deleted: labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RepositorySessionUtil.java
===================================================================
--- labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RepositorySessionUtil.java	2007-05-04 18:15:46 UTC (rev 11690)
+++ labs/jbossrules/trunk/drools-repository/src/test/java/org/drools/repository/RepositorySessionUtil.java	2007-05-04 18:18:23 UTC (rev 11691)
@@ -1,74 +0,0 @@
-package org.drools.repository;
-
-import java.io.File;
-
-import javax.jcr.Repository;
-import javax.jcr.Session;
-import javax.jcr.SimpleCredentials;
-
-import junit.framework.Assert;
-
-/**
- * This is a utility to simulate session behavior for the test suite.
- * @author Michael Neale
- *
- */
-public class RepositorySessionUtil {
-
-    private static ThreadLocal repo = new ThreadLocal();
-
-    public static boolean deleteDir(File dir) {
-        
-        if (dir.isDirectory()) {
-            String[] children = dir.list();
-            for (int i=0; i<children.length; i++) {
-                boolean success = deleteDir(new File(dir, children[i]));
-                if (!success) {
-                    return false;
-                }
-            }
-        }
-    
-        // The directory is now empty so delete it
-        return dir.delete();
-    }    
-    
-    
-    public static RulesRepository getRepository() {
-        Object repoInstance = repo.get();
-        if ( repoInstance == null ) {
-            
-            File dir = new File( "repository" );
-            System.out.println("DELETING test repo: " + dir.getAbsolutePath());
-            deleteDir( dir );
-            System.out.println("TEST repo was deleted.");
-            
-            JCRRepositoryConfigurator config = new JackrabbitRepositoryConfigurator();
-            
-            //create a repo instance (startup)
-            Repository repository = config.getJCRRepository(null);
-            
-            //create a session
-            Session session;
-            try {
-                session = repository.login(new SimpleCredentials("alan_parsons", "password".toCharArray()));
-                RulesRepositoryAdministrator admin = new RulesRepositoryAdministrator(session);
-                //clear out and setup
-                if (admin.isRepositoryInitialized()) {
-                    admin.clearRulesRepository();
-                }
-                config.setupRulesRepository( session );
-                
-                repoInstance = new RulesRepository( session );
-                repo.set( repoInstance );                
-            } catch ( Exception e) {
-                Assert.fail("Unable to initialise repository :" + e.getMessage());
-            }
-            
-
-            
-        }
-        return (RulesRepository) repoInstance;        
-    }
-
-}