svn commit: r1387967 - in /rave/sandbox/content-services/rave-jcr-tools/src: main/java/org/apache/rave/tools/ImportExportTool.java test/java/org/apache/rave/tools/ImportExportToolTest.java

[ate]

Author: ate
Date: Thu Sep 20 11:01:18 2012
New Revision: 1387967

URL: http://svn.apache.org/viewvc?rev=1387967&view=rev
Log:
RAVE-696: rave-jcr-tools cleanup

Modified:
    
rave/sandbox/content-services/rave-jcr-tools/src/main/java/org/apache/rave/tools/ImportExportTool.java
    
rave/sandbox/content-services/rave-jcr-tools/src/test/java/org/apache/rave/tools/ImportExportToolTest.java

Modified: 
rave/sandbox/content-services/rave-jcr-tools/src/main/java/org/apache/rave/tools/ImportExportTool.java
URL: 
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-tools/src/main/java/org/apache/rave/tools/ImportExportTool.java?rev=1387967&r1=1387966&r2=1387967&view=diff
==============================================================================
--- 
rave/sandbox/content-services/rave-jcr-tools/src/main/java/org/apache/rave/tools/ImportExportTool.java
 (original)
+++ 
rave/sandbox/content-services/rave-jcr-tools/src/main/java/org/apache/rave/tools/ImportExportTool.java
 Thu Sep 20 11:01:18 2012
@@ -32,6 +32,7 @@ import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.SimpleCredentials;
 
+import org.apache.jackrabbit.core.RepositoryImpl;
 import org.apache.jackrabbit.core.TransientRepository;
 import org.apache.rave.jcr.exporting.ContentExporter;
 import org.apache.rave.jcr.importing.ContentImporter;
@@ -117,7 +118,9 @@ public class ImportExportTool {
 
     private void closeSession(Session session) {
         if (session != null) {
+            RepositoryImpl rep = (RepositoryImpl)session.getRepository();
             session.logout();
+            rep.shutdown();
         }
     }
 

Modified: 
rave/sandbox/content-services/rave-jcr-tools/src/test/java/org/apache/rave/tools/ImportExportToolTest.java
URL: 
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-jcr-tools/src/test/java/org/apache/rave/tools/ImportExportToolTest.java?rev=1387967&r1=1387966&r2=1387967&view=diff
==============================================================================
--- 
rave/sandbox/content-services/rave-jcr-tools/src/test/java/org/apache/rave/tools/ImportExportToolTest.java
 (original)
+++ 
rave/sandbox/content-services/rave-jcr-tools/src/test/java/org/apache/rave/tools/ImportExportToolTest.java
 Thu Sep 20 11:01:18 2012
@@ -38,7 +38,7 @@ public class ImportExportToolTest {
     @Test
     public void testImport() throws Exception {
 
-        ImportExportTool tool = new 
ImportExportTool("repository/repository.xml", "repository", FILE_NAME);
+        ImportExportTool tool = new 
ImportExportTool("src/test/repository/repository.xml", "target/repository", 
FILE_NAME);
         tool.setPassword("admin");
         tool.setUsername("admin");
         tool.importData("/", "testnode");
@@ -48,12 +48,12 @@ public class ImportExportToolTest {
 
     @Test
     public void testExport() throws Exception {
-        ImportExportTool tool = new 
ImportExportTool("repository/repository.xml", "repository", FILE_NAME);
+        ImportExportTool tool = new 
ImportExportTool("src/test/repository/repository.xml", "target/repository", 
FILE_NAME);
         tool.setPassword("admin");
         tool.setUsername("admin");
         tool.importData("/", "testnode");
         assertTrue("no errors should be thrown", true);
-        tool = new ImportExportTool("repository/repository.xml", "repository", 
null);
+        tool = new ImportExportTool("src/test/repository/repository.xml", 
"target/repository", null);
         final StringWriter writer = new StringWriter();
         tool.exportData("/testnode", writer);
         assertTrue("no errors should be thrown", true);