Author: olli
Date: Sun Dec 7 10:41:19 2014
New Revision: 1643658
URL: http://svn.apache.org/r1643658
Log:
SLING-4223 move ContentReader and ContentCreator to package
org.apache.sling.jcr.contentloader and export package with version 0.2
Added:
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/ContentCreator.java
- copied, changed from r1643657,
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/ContentCreator.java
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/ContentReader.java
- copied, changed from r1643578,
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/ContentReader.java
Removed:
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/ContentCreator.java
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/ContentReader.java
Modified:
sling/whiteboard/olli/contentloader/pom.xml
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/DefaultContentCreator.java
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/DefaultContentImporter.java
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/ImportProvider.java
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/Loader.java
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/JsonReader.java
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/XmlReader.java
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/ZipReader.java
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/package-info.java
sling/whiteboard/olli/contentloader/src/test/java/org/apache/sling/jcr/contentloader/internal/JsonReaderTest.java
sling/whiteboard/olli/contentloader/src/test/java/org/apache/sling/jcr/contentloader/internal/readers/XmlReaderTest.java
Modified: sling/whiteboard/olli/contentloader/pom.xml
URL:
http://svn.apache.org/viewvc/sling/whiteboard/olli/contentloader/pom.xml?rev=1643658&r1=1643657&r2=1643658&view=diff
==============================================================================
--- sling/whiteboard/olli/contentloader/pom.xml (original)
+++ sling/whiteboard/olli/contentloader/pom.xml Sun Dec 7 10:41:19 2014
@@ -25,7 +25,7 @@
<groupId>org.apache.sling</groupId>
<artifactId>sling</artifactId>
<version>22</version>
- <relativePath>../../../parent/pom.xml</relativePath>
+ <relativePath>../../trunk/parent/pom.xml</relativePath>
</parent>
<artifactId>org.apache.sling.jcr.contentloader</artifactId>
Copied:
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/ContentCreator.java
(from r1643657,
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/ContentCreator.java)
URL:
http://svn.apache.org/viewvc/sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/ContentCreator.java?p2=sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/ContentCreator.java&p1=sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/ContentCreator.java&r1=1643657&r2=1643658&rev=1643658&view=diff
==============================================================================
---
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/ContentCreator.java
(original)
+++
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/ContentCreator.java
Sun Dec 7 10:41:19 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.jcr.contentloader.internal;
+package org.apache.sling.jcr.contentloader;
import java.io.InputStream;
import java.util.Map;
@@ -25,7 +25,7 @@ import javax.jcr.RepositoryException;
/**
* The <code>ContentCreator</code>
- * is used by the {@link ContentReader} to create the actual content.
+ * is used by the {@link org.apache.sling.jcr.contentloader.ContentReader} to
create the actual content.
*
* @since 2.0.4
*/
@@ -133,8 +133,8 @@ public interface ContentCreator {
*/
boolean switchCurrentNode(String subPath, String newNodeType)
throws RepositoryException;
-
-
+
+
/**
* Create a User in the jackrabbit UserManager
* @param name the name of the user
@@ -144,7 +144,7 @@ public interface ContentCreator {
*/
void createUser(String name, String password, Map<String, Object>
extraProperties)
throws RepositoryException;
-
+
/**
* Create a Group in the jackrabbit UserManager
* @param name the name of the group
@@ -154,7 +154,7 @@ public interface ContentCreator {
*/
void createGroup(String name, String[] members, Map<String, Object>
extraProperties)
throws RepositoryException;
-
+
/**
* Creates an Access Control Entry for the current node for the specified
* principal and privileges.
Copied:
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/ContentReader.java
(from r1643578,
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/ContentReader.java)
URL:
http://svn.apache.org/viewvc/sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/ContentReader.java?p2=sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/ContentReader.java&p1=sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/ContentReader.java&r1=1643578&r2=1643658&rev=1643658&view=diff
==============================================================================
---
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/ContentReader.java
(original)
+++
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/ContentReader.java
Sun Dec 7 10:41:19 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.sling.jcr.contentloader.internal;
+package org.apache.sling.jcr.contentloader;
import java.io.IOException;
import java.io.InputStream;
@@ -24,9 +24,11 @@ import java.net.URL;
import javax.jcr.RepositoryException;
+import org.apache.sling.jcr.contentloader.ContentCreator;
+
/**
* The <code>ContentReader</code>
- * A content reader is provided by an {@link ImportProvider}.
+ * A content reader is provided by an {@link
org.apache.sling.jcr.contentloader.internal.ImportProvider}.
*/
public interface ContentReader {
@@ -45,5 +47,5 @@ public interface ContentReader {
* @throws IOException
*/
void parse(InputStream ins, ContentCreator contentCreator) throws
IOException, RepositoryException;
-
+
}
Modified:
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/DefaultContentCreator.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/DefaultContentCreator.java?rev=1643658&r1=1643657&r2=1643658&view=diff
==============================================================================
---
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/DefaultContentCreator.java
(original)
+++
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/DefaultContentCreator.java
Sun Dec 7 10:41:19 2014
@@ -53,6 +53,7 @@ import org.apache.jackrabbit.api.securit
import org.apache.jackrabbit.api.security.user.User;
import org.apache.jackrabbit.api.security.user.UserManager;
import org.apache.sling.jcr.base.util.AccessControlUtil;
+import org.apache.sling.jcr.contentloader.ContentCreator;
import org.apache.sling.jcr.contentloader.ContentImportListener;
import org.apache.sling.jcr.contentloader.ImportOptions;
import org.slf4j.Logger;
@@ -249,7 +250,7 @@ public class DefaultContentCreator imple
}
/**
- * @see
org.apache.sling.jcr.contentloader.internal.ContentCreator#createNode(java.lang.String,
java.lang.String, java.lang.String[])
+ * @see
org.apache.sling.jcr.contentloader.ContentCreator#createNode(java.lang.String,
java.lang.String, java.lang.String[])
*/
public void createNode(String name, String primaryNodeType, String[]
mixinNodeTypes) throws RepositoryException {
final Node parentNode = this.parentNodeStack.peek();
@@ -315,7 +316,7 @@ public class DefaultContentCreator imple
}
/**
- * @see
org.apache.sling.jcr.contentloader.internal.ContentCreator#createProperty(java.lang.String,
int, java.lang.String)
+ * @see
org.apache.sling.jcr.contentloader.ContentCreator#createProperty(java.lang.String,
int, java.lang.String)
*/
public void createProperty(String name, int propertyType, String value)
throws RepositoryException {
final Node node = this.parentNodeStack.peek();
@@ -369,7 +370,7 @@ public class DefaultContentCreator imple
}
/**
- * @see
org.apache.sling.jcr.contentloader.internal.ContentCreator#createProperty(java.lang.String,
int, java.lang.String[])
+ * @see
org.apache.sling.jcr.contentloader.ContentCreator#createProperty(java.lang.String,
int, java.lang.String[])
*/
public void createProperty(String name, int propertyType, String[] values)
throws RepositoryException {
final Node node = this.parentNodeStack.peek();
@@ -452,21 +453,21 @@ public class DefaultContentCreator imple
}
/**
- * @see
org.apache.sling.jcr.contentloader.internal.ContentCreator#createProperty(java.lang.String,
java.lang.Object)
+ * @see
org.apache.sling.jcr.contentloader.ContentCreator#createProperty(java.lang.String,
java.lang.Object)
*/
public void createProperty(String name, Object value) throws
RepositoryException {
createProperty(name, value, false);
}
/**
- * @see
org.apache.sling.jcr.contentloader.internal.ContentCreator#createProperty(java.lang.String,
java.lang.Object[])
+ * @see
org.apache.sling.jcr.contentloader.ContentCreator#createProperty(java.lang.String,
java.lang.Object[])
*/
public void createProperty(String name, Object[] values) throws
RepositoryException {
createProperty(name, values, false);
}
/**
- * @see
org.apache.sling.jcr.contentloader.internal.ContentCreator#finishNode()
+ * @see org.apache.sling.jcr.contentloader.ContentCreator#finishNode()
*/
public void finishNode() throws RepositoryException {
final Node node = this.parentNodeStack.pop();
@@ -684,7 +685,7 @@ public class DefaultContentCreator imple
}
/**
- * @see
org.apache.sling.jcr.contentloader.internal.ContentCreator#createFileAndResourceNode(java.lang.String,
java.io.InputStream, java.lang.String, long)
+ * @see
org.apache.sling.jcr.contentloader.ContentCreator#createFileAndResourceNode(java.lang.String,
java.io.InputStream, java.lang.String, long)
*/
public void createFileAndResourceNode(String name, InputStream data,
String mimeType, long lastModified) throws RepositoryException {
int lastSlash = name.lastIndexOf('/');
@@ -728,7 +729,7 @@ public class DefaultContentCreator imple
}
/**
- * @see
org.apache.sling.jcr.contentloader.internal.ContentCreator#switchCurrentNode(java.lang.String,
java.lang.String)
+ * @see
org.apache.sling.jcr.contentloader.ContentCreator#switchCurrentNode(java.lang.String,
java.lang.String)
*/
public boolean switchCurrentNode(String subPath, String newNodeType)
throws RepositoryException {
if (subPath.startsWith("/")) {
@@ -756,7 +757,7 @@ public class DefaultContentCreator imple
}
/* (non-Javadoc)
- * @see
org.apache.sling.jcr.contentloader.internal.ContentCreator#createGroup(java.lang.String,
java.lang.String[], java.util.Map)
+ * @see
org.apache.sling.jcr.contentloader.ContentCreator#createGroup(java.lang.String,
java.lang.String[], java.util.Map)
*/
public void createGroup(final String name, String[] members, Map<String,
Object> extraProperties) throws RepositoryException {
@@ -803,7 +804,7 @@ public class DefaultContentCreator imple
}
/* (non-Javadoc)
- * @see
org.apache.sling.jcr.contentloader.internal.ContentCreator#createUser(java.lang.String,
java.lang.String, java.util.Map)
+ * @see
org.apache.sling.jcr.contentloader.ContentCreator#createUser(java.lang.String,
java.lang.String, java.util.Map)
*/
public void createUser(final String name, String password, Map<String,
Object> extraProperties) throws RepositoryException {
final Node parentNode = this.parentNodeStack.peek();
@@ -860,7 +861,7 @@ public class DefaultContentCreator imple
}
/* (non-Javadoc)
- * @see
org.apache.sling.jcr.contentloader.internal.ContentCreator#createAce(java.lang.String,
java.lang.String, java.lang.String[], java.lang.String[])
+ * @see
org.apache.sling.jcr.contentloader.ContentCreator#createAce(java.lang.String,
java.lang.String, java.lang.String[], java.lang.String[])
*/
public void createAce(String principalId, String[] grantedPrivilegeNames,
String[] deniedPrivilegeNames, String order) throws RepositoryException {
final Node parentNode = this.parentNodeStack.peek();
Modified:
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/DefaultContentImporter.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/DefaultContentImporter.java?rev=1643658&r1=1643657&r2=1643658&view=diff
==============================================================================
---
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/DefaultContentImporter.java
(original)
+++
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/DefaultContentImporter.java
Sun Dec 7 10:41:19 2014
@@ -36,6 +36,7 @@ import org.apache.felix.scr.annotations.
import org.apache.sling.commons.mime.MimeTypeService;
import org.apache.sling.jcr.contentloader.ContentImportListener;
import org.apache.sling.jcr.contentloader.ContentImporter;
+import org.apache.sling.jcr.contentloader.ContentReader;
import org.apache.sling.jcr.contentloader.ImportOptions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/ImportProvider.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/ImportProvider.java?rev=1643658&r1=1643657&r2=1643658&view=diff
==============================================================================
---
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/ImportProvider.java
(original)
+++
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/ImportProvider.java
Sun Dec 7 10:41:19 2014
@@ -20,6 +20,8 @@ package org.apache.sling.jcr.contentload
import java.io.IOException;
+import org.apache.sling.jcr.contentloader.ContentReader;
+
public interface ImportProvider {
ContentReader getReader() throws IOException;
Modified:
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/Loader.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/Loader.java?rev=1643658&r1=1643657&r2=1643658&view=diff
==============================================================================
---
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/Loader.java
(original)
+++
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/Loader.java
Sun Dec 7 10:41:19 2014
@@ -42,6 +42,7 @@ import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
+import org.apache.sling.jcr.contentloader.ContentReader;
import org.osgi.framework.Bundle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified:
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/JsonReader.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/JsonReader.java?rev=1643658&r1=1643657&r2=1643658&view=diff
==============================================================================
---
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/JsonReader.java
(original)
+++
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/JsonReader.java
Sun Dec 7 10:41:19 2014
@@ -34,8 +34,8 @@ import javax.jcr.RepositoryException;
import org.apache.sling.commons.json.JSONArray;
import org.apache.sling.commons.json.JSONException;
import org.apache.sling.commons.json.JSONObject;
-import org.apache.sling.jcr.contentloader.internal.ContentCreator;
-import org.apache.sling.jcr.contentloader.internal.ContentReader;
+import org.apache.sling.jcr.contentloader.ContentCreator;
+import org.apache.sling.jcr.contentloader.ContentReader;
import org.apache.sling.jcr.contentloader.internal.ImportProvider;
/**
@@ -130,7 +130,7 @@ public class JsonReader implements Conte
};
/**
- * @see
org.apache.sling.jcr.contentloader.internal.ContentReader#parse(java.net.URL,
org.apache.sling.jcr.contentloader.internal.ContentCreator)
+ * @see
org.apache.sling.jcr.contentloader.ContentReader#parse(java.net.URL,
org.apache.sling.jcr.contentloader.ContentCreator)
*/
public void parse(java.net.URL url, ContentCreator contentCreator)
throws IOException, RepositoryException {
@@ -428,7 +428,7 @@ public class JsonReader implements Conte
}
String order = ace.optString("order", null);
-
+
//do the work.
contentCreator.createAce(principalID, grantedPrivileges,
deniedPrivileges, order);
}
Modified:
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/XmlReader.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/XmlReader.java?rev=1643658&r1=1643657&r2=1643658&view=diff
==============================================================================
---
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/XmlReader.java
(original)
+++
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/XmlReader.java
Sun Dec 7 10:41:19 2014
@@ -49,8 +49,8 @@ import javax.xml.transform.TransformerFa
import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.stream.StreamSource;
-import org.apache.sling.jcr.contentloader.internal.ContentCreator;
-import org.apache.sling.jcr.contentloader.internal.ContentReader;
+import org.apache.sling.jcr.contentloader.ContentCreator;
+import org.apache.sling.jcr.contentloader.ContentReader;
import org.apache.sling.jcr.contentloader.internal.ImportProvider;
import org.kxml2.io.KXmlParser;
import org.slf4j.Logger;
@@ -160,7 +160,7 @@ public class XmlReader implements Conten
/**
- * @see
org.apache.sling.jcr.contentloader.internal.ContentReader#parse(URL,
org.apache.sling.jcr.contentloader.internal.ContentCreator)
+ * @see org.apache.sling.jcr.contentloader.ContentReader#parse(URL,
org.apache.sling.jcr.contentloader.ContentCreator)
*/
public synchronized void parse(final URL url, final ContentCreator creator)
throws IOException, RepositoryException {
@@ -177,7 +177,7 @@ public class XmlReader implements Conten
}
/* (non-Javadoc)
- * @see
org.apache.sling.jcr.contentloader.internal.ContentReader#parse(java.io.InputStream,
org.apache.sling.jcr.contentloader.internal.ContentCreator)
+ * @see
org.apache.sling.jcr.contentloader.ContentReader#parse(java.io.InputStream,
org.apache.sling.jcr.contentloader.ContentCreator)
*/
public void parse(InputStream ins, ContentCreator creator)
throws IOException, RepositoryException {
Modified:
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/ZipReader.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/ZipReader.java?rev=1643658&r1=1643657&r2=1643658&view=diff
==============================================================================
---
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/ZipReader.java
(original)
+++
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/internal/readers/ZipReader.java
Sun Dec 7 10:41:19 2014
@@ -26,8 +26,8 @@ import java.util.zip.ZipInputStream;
import javax.jcr.RepositoryException;
import org.apache.commons.io.input.CloseShieldInputStream;
-import org.apache.sling.jcr.contentloader.internal.ContentCreator;
-import org.apache.sling.jcr.contentloader.internal.ContentReader;
+import org.apache.sling.jcr.contentloader.ContentCreator;
+import org.apache.sling.jcr.contentloader.ContentReader;
import org.apache.sling.jcr.contentloader.internal.ImportProvider;
@@ -70,7 +70,7 @@ public class ZipReader implements Conten
}
/**
- * @see
org.apache.sling.jcr.contentloader.internal.ContentReader#parse(java.net.URL,
org.apache.sling.jcr.contentloader.internal.ContentCreator)
+ * @see
org.apache.sling.jcr.contentloader.ContentReader#parse(java.net.URL,
org.apache.sling.jcr.contentloader.ContentCreator)
*/
public void parse(java.net.URL url, ContentCreator creator)
throws IOException, RepositoryException {
@@ -78,7 +78,7 @@ public class ZipReader implements Conten
}
/**
- * @see
org.apache.sling.jcr.contentloader.internal.ContentReader#parse(java.io.InputStream,
org.apache.sling.jcr.contentloader.internal.ContentCreator)
+ * @see
org.apache.sling.jcr.contentloader.ContentReader#parse(java.io.InputStream,
org.apache.sling.jcr.contentloader.ContentCreator)
*/
public void parse(InputStream ins, ContentCreator creator)
throws IOException, RepositoryException {
@@ -116,5 +116,5 @@ public class ZipReader implements Conten
}
}
}
-
+
}
Modified:
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/package-info.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/package-info.java?rev=1643658&r1=1643657&r2=1643658&view=diff
==============================================================================
---
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/package-info.java
(original)
+++
sling/whiteboard/olli/contentloader/src/main/java/org/apache/sling/jcr/contentloader/package-info.java
Sun Dec 7 10:41:19 2014
@@ -18,7 +18,7 @@
*/
@Export(optional = "provide:=true")
-@Version("0.1")
+@Version("0.2")
package org.apache.sling.jcr.contentloader;
import aQute.bnd.annotation.Export;
Modified:
sling/whiteboard/olli/contentloader/src/test/java/org/apache/sling/jcr/contentloader/internal/JsonReaderTest.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/olli/contentloader/src/test/java/org/apache/sling/jcr/contentloader/internal/JsonReaderTest.java?rev=1643658&r1=1643657&r2=1643658&view=diff
==============================================================================
---
sling/whiteboard/olli/contentloader/src/test/java/org/apache/sling/jcr/contentloader/internal/JsonReaderTest.java
(original)
+++
sling/whiteboard/olli/contentloader/src/test/java/org/apache/sling/jcr/contentloader/internal/JsonReaderTest.java
Sun Dec 7 10:41:19 2014
@@ -26,6 +26,7 @@ import javax.jcr.RepositoryException;
import org.apache.sling.commons.json.JSONArray;
import org.apache.sling.commons.json.JSONException;
+import org.apache.sling.jcr.contentloader.ContentCreator;
import org.apache.sling.jcr.contentloader.internal.readers.JsonReader;
import org.jmock.Expectations;
import org.jmock.Mockery;
Modified:
sling/whiteboard/olli/contentloader/src/test/java/org/apache/sling/jcr/contentloader/internal/readers/XmlReaderTest.java
URL:
http://svn.apache.org/viewvc/sling/whiteboard/olli/contentloader/src/test/java/org/apache/sling/jcr/contentloader/internal/readers/XmlReaderTest.java?rev=1643658&r1=1643657&r2=1643658&view=diff
==============================================================================
---
sling/whiteboard/olli/contentloader/src/test/java/org/apache/sling/jcr/contentloader/internal/readers/XmlReaderTest.java
(original)
+++
sling/whiteboard/olli/contentloader/src/test/java/org/apache/sling/jcr/contentloader/internal/readers/XmlReaderTest.java
Sun Dec 7 10:41:19 2014
@@ -34,7 +34,7 @@ import javax.jcr.RepositoryException;
import junit.framework.TestCase;
-import org.apache.sling.jcr.contentloader.internal.ContentCreator;
+import org.apache.sling.jcr.contentloader.ContentCreator;
public class XmlReaderTest extends TestCase {
@@ -71,7 +71,7 @@ public class XmlReaderTest extends TestC
assertEquals("Could not read file", "This is a test file.",
file.content);
}
-
+
public void testCreateFileWithNullLocation() throws Exception {
File input = new File("src/test/resources/reader/filesample.xml");
final FileInputStream ins = new FileInputStream(input);
