Author: cziegeler
Date: Fri Aug 13 15:32:27 2010
New Revision: 985245
URL: http://svn.apache.org/viewvc?rev=985245&view=rev
Log:
SLING-1488 : Move EventHelper from JCRInstall to Commons Testing
Removed:
sling/trunk/installer/jcr/jcrinstall/src/test/java/org/apache/sling/jcr/jcrinstall/impl/EventHelper.java
Modified:
sling/trunk/installer/jcr/jcrinstall/pom.xml
sling/trunk/installer/jcr/jcrinstall/src/test/java/org/apache/sling/jcr/jcrinstall/impl/ContentHelper.java
sling/trunk/installer/jcr/jcrinstall/src/test/java/org/apache/sling/jcr/jcrinstall/impl/FindPathsToWatchTest.java
sling/trunk/installer/jcr/jcrinstall/src/test/java/org/apache/sling/jcr/jcrinstall/impl/JcrInstallTestBase.java
sling/trunk/installer/jcr/jcrinstall/src/test/java/org/apache/sling/jcr/jcrinstall/impl/MiscUtil.java
sling/trunk/installer/jcr/jcrinstall/src/test/java/org/apache/sling/jcr/jcrinstall/impl/ScanningLoopTest.java
Modified: sling/trunk/installer/jcr/jcrinstall/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/jcr/jcrinstall/pom.xml?rev=985245&r1=985244&r2=985245&view=diff
==============================================================================
--- sling/trunk/installer/jcr/jcrinstall/pom.xml (original)
+++ sling/trunk/installer/jcr/jcrinstall/pom.xml Fri Aug 13 15:32:27 2010
@@ -99,7 +99,7 @@
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.commons.testing</artifactId>
- <version>2.0.4-incubator</version>
+ <version>2.0.5-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified:
sling/trunk/installer/jcr/jcrinstall/src/test/java/org/apache/sling/jcr/jcrinstall/impl/ContentHelper.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/jcr/jcrinstall/src/test/java/org/apache/sling/jcr/jcrinstall/impl/ContentHelper.java?rev=985245&r1=985244&r2=985245&view=diff
==============================================================================
---
sling/trunk/installer/jcr/jcrinstall/src/test/java/org/apache/sling/jcr/jcrinstall/impl/ContentHelper.java
(original)
+++
sling/trunk/installer/jcr/jcrinstall/src/test/java/org/apache/sling/jcr/jcrinstall/impl/ContentHelper.java
Fri Aug 13 15:32:27 2010
@@ -41,7 +41,7 @@ class ContentHelper {
public static final String JCR_MIMETYPE = "jcr:mimeType";
public static final String JCR_ENCODING = "jcr:encoding";
public static final String JCR_DATA = "jcr:data";
-
+
final String [] WATCHED_FOLDERS = {
"/libs/foo/bar/install",
"/libs/foo/wii/install",
@@ -52,7 +52,7 @@ class ContentHelper {
"/libs/foo/bar/installed",
"/apps/noninstall"
};
-
+
final String [] FAKE_RESOURCES = {
"/libs/foo/bar/install/bundle1.jar",
"/libs/foo/bar/install/cfg3.cfg",
@@ -60,38 +60,38 @@ class ContentHelper {
"/libs/foo/wii/install/cfg1.properties",
"/libs/foo/wii/install/cfg2.properties",
};
-
+
final String [] FAKE_CONFIGS = {
"/libs/foo/bar/install/cfgA",
"/libs/foo/wii/install/cfgB",
"/libs/foo/wii/install/cfgC"
};
-
+
private final Session session;
-
+
ContentHelper(Session s) throws RepositoryException, IOException {
session = s;
-
+
final NamespaceRegistry r =
session.getWorkspace().getNamespaceRegistry();
try {
r.registerNamespace("sling",
"http://sling.apache.org/jcr/sling/1.0";);
} catch(RepositoryException ignore) {
// don't fail if already registered
}
-
+
RepositoryUtil.registerNodeType(session,
this.getClass().getResourceAsStream("/SLING-INF/nodetypes/osgiconfig.cnd"));
}
void cleanupContent() throws Exception {
- final String [] paths = { "libs", "apps" };
+ final String [] paths = { "libs", "apps" };
for(String path : paths) {
if(session.getRootNode().hasNode(path)) {
session.getRootNode().getNode(path).remove();
}
}
}
-
+
void setupContent() throws Exception {
cleanupContent();
setupFolders();
@@ -102,7 +102,7 @@ class ContentHelper {
createConfig(path, null);
}
}
-
+
void setupFolders() throws Exception {
for(String folder : WATCHED_FOLDERS) {
createFolder(folder);
@@ -111,7 +111,7 @@ class ContentHelper {
createFolder(folder);
}
}
-
+
void createFolder(String path) throws Exception {
final String [] parts = relPath(path).split("/");
Node n = session.getRootNode();
@@ -124,26 +124,26 @@ class ContentHelper {
}
session.save();
}
-
+
void delete(String path) throws RepositoryException {
session.getItem(path).remove();
session.save();
}
-
+
void createOrUpdateFile(String path) throws RepositoryException {
createOrUpdateFile(path, null, System.currentTimeMillis());
}
-
+
void createOrUpdateFile(String path, MockInstallableResource d) throws
RepositoryException {
createOrUpdateFile(path, d.getInputStream(),
System.currentTimeMillis());
}
-
+
void createOrUpdateFile(String path, InputStream data, long lastModified)
throws RepositoryException {
if(data == null) {
final String content = "Fake data for " + path;
data = new ByteArrayInputStream(content.getBytes());
}
-
+
final String relPath = relPath(path);
Node f = null;
Node res = null;
@@ -154,31 +154,28 @@ class ContentHelper {
f = session.getRootNode().addNode(relPath,NT_FILE);
res = f.addNode(JCR_CONTENT,NT_RESOURCE);
}
-
+
final Calendar c = Calendar.getInstance();
c.setTimeInMillis(lastModified);
res.setProperty(JCR_LASTMODIFIED, c);
res.setProperty(JCR_DATA, data);
res.setProperty(JCR_MIMETYPE, "");
-
- f.getParent().save();
+
+ session.save();
}
-
+
String relPath(String path) {
if(path.startsWith("/")) {
return path.substring(1);
}
return path;
}
-
+
void createConfig(String path, Map<String, String> data) throws
RepositoryException {
path = relPath(path);
- Node cfg = null;
- if(session.getRootNode().hasNode(path)) {
- cfg = session.getRootNode().getNode(path);
- } else {
- cfg = session.getRootNode().addNode(path, "sling:OsgiConfig");
+ if( !session.getRootNode().hasNode(path)) {
+ session.getRootNode().addNode(path, "sling:OsgiConfig");
+ session.save();
}
- cfg.getParent().save();
}
}
\ No newline at end of file
Modified:
sling/trunk/installer/jcr/jcrinstall/src/test/java/org/apache/sling/jcr/jcrinstall/impl/FindPathsToWatchTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/jcr/jcrinstall/src/test/java/org/apache/sling/jcr/jcrinstall/impl/FindPathsToWatchTest.java?rev=985245&r1=985244&r2=985245&view=diff
==============================================================================
---
sling/trunk/installer/jcr/jcrinstall/src/test/java/org/apache/sling/jcr/jcrinstall/impl/FindPathsToWatchTest.java
(original)
+++
sling/trunk/installer/jcr/jcrinstall/src/test/java/org/apache/sling/jcr/jcrinstall/impl/FindPathsToWatchTest.java
Fri Aug 13 15:32:27 2010
@@ -22,6 +22,7 @@ import java.util.Collection;
import javax.jcr.Session;
+import org.apache.sling.commons.testing.jcr.EventHelper;
import org.apache.sling.commons.testing.jcr.RepositoryTestBase;
import org.apache.sling.jcr.api.SlingRepository;
Modified:
sling/trunk/installer/jcr/jcrinstall/src/test/java/org/apache/sling/jcr/jcrinstall/impl/JcrInstallTestBase.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/jcr/jcrinstall/src/test/java/org/apache/sling/jcr/jcrinstall/impl/JcrInstallTestBase.java?rev=985245&r1=985244&r2=985245&view=diff
==============================================================================
---
sling/trunk/installer/jcr/jcrinstall/src/test/java/org/apache/sling/jcr/jcrinstall/impl/JcrInstallTestBase.java
(original)
+++
sling/trunk/installer/jcr/jcrinstall/src/test/java/org/apache/sling/jcr/jcrinstall/impl/JcrInstallTestBase.java
Fri Aug 13 15:32:27 2010
@@ -20,6 +20,7 @@ package org.apache.sling.jcr.jcrinstall.
import javax.jcr.Session;
+import org.apache.sling.commons.testing.jcr.EventHelper;
import org.apache.sling.commons.testing.jcr.RepositoryTestBase;
import org.apache.sling.jcr.api.SlingRepository;
Modified:
sling/trunk/installer/jcr/jcrinstall/src/test/java/org/apache/sling/jcr/jcrinstall/impl/MiscUtil.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/jcr/jcrinstall/src/test/java/org/apache/sling/jcr/jcrinstall/impl/MiscUtil.java?rev=985245&r1=985244&r2=985245&view=diff
==============================================================================
---
sling/trunk/installer/jcr/jcrinstall/src/test/java/org/apache/sling/jcr/jcrinstall/impl/MiscUtil.java
(original)
+++
sling/trunk/installer/jcr/jcrinstall/src/test/java/org/apache/sling/jcr/jcrinstall/impl/MiscUtil.java
Fri Aug 13 15:32:27 2010
@@ -23,6 +23,7 @@ import java.util.Collection;
import java.util.Dictionary;
import java.util.Hashtable;
+import org.apache.sling.commons.testing.jcr.EventHelper;
import org.apache.sling.jcr.api.SlingRepository;
import org.apache.sling.osgi.installer.OsgiInstaller;
import org.jmock.Expectations;
Modified:
sling/trunk/installer/jcr/jcrinstall/src/test/java/org/apache/sling/jcr/jcrinstall/impl/ScanningLoopTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/installer/jcr/jcrinstall/src/test/java/org/apache/sling/jcr/jcrinstall/impl/ScanningLoopTest.java?rev=985245&r1=985244&r2=985245&view=diff
==============================================================================
---
sling/trunk/installer/jcr/jcrinstall/src/test/java/org/apache/sling/jcr/jcrinstall/impl/ScanningLoopTest.java
(original)
+++
sling/trunk/installer/jcr/jcrinstall/src/test/java/org/apache/sling/jcr/jcrinstall/impl/ScanningLoopTest.java
Fri Aug 13 15:32:27 2010
@@ -20,6 +20,7 @@ package org.apache.sling.jcr.jcrinstall.
import javax.jcr.Session;
+import org.apache.sling.commons.testing.jcr.EventHelper;
import org.apache.sling.commons.testing.jcr.RepositoryTestBase;
import org.apache.sling.jcr.api.SlingRepository;
import org.junit.Test;
