Author: angela
Date: Fri Jul 26 10:05:30 2013
New Revision: 1507249
URL: http://svn.apache.org/r1507249
Log:
OAK-127: move Importer interface to spi/xml and add some javadoc
Added:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/xml/Importer.java
(contents, props changed)
- copied, changed from r1507208,
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/Importer.java
Removed:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/Importer.java
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/BufferedStringValue.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/DocViewImportHandler.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImportHandler.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/SysViewImportHandler.java
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/TargetImportHandler.java
Copied:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/xml/Importer.java
(from r1507208,
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/Importer.java)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/xml/Importer.java?p2=jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/xml/Importer.java&p1=jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/Importer.java&r1=1507208&r2=1507249&rev=1507249&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/Importer.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/xml/Importer.java
Fri Jul 26 10:05:30 2013
@@ -14,15 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.oak.jcr.xml;
+package org.apache.jackrabbit.oak.spi.xml;
import java.util.List;
import javax.jcr.RepositoryException;
-import org.apache.jackrabbit.oak.spi.xml.NodeInfo;
-import org.apache.jackrabbit.oak.spi.xml.PropInfo;
-
/**
* Content importer. The XML import handlers use this interface to submit
* the parsed content to the repository. The implementation of this class
Propchange:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/xml/Importer.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/BufferedStringValue.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/BufferedStringValue.java?rev=1507249&r1=1507248&r2=1507249&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/BufferedStringValue.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/BufferedStringValue.java
Fri Jul 26 10:05:30 2013
@@ -93,6 +93,9 @@ class BufferedStringValue implements Tex
/**
* Constructs a new empty {@code BufferedStringValue}.
+ *
+ * @param valueFactory The value factory
+ * @param namePathMapper the name/path mapper
*/
protected BufferedStringValue(ValueFactory valueFactory, NamePathMapper
namePathMapper) {
buffer = new StringWriter();
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/DocViewImportHandler.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/DocViewImportHandler.java?rev=1507249&r1=1507248&r2=1507249&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/DocViewImportHandler.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/DocViewImportHandler.java
Fri Jul 26 10:05:30 2013
@@ -33,6 +33,7 @@ import com.google.common.collect.Lists;
import org.apache.jackrabbit.commons.NamespaceHelper;
import org.apache.jackrabbit.oak.namepath.JcrNameParser;
import org.apache.jackrabbit.oak.plugins.name.NamespaceConstants;
+import org.apache.jackrabbit.oak.spi.xml.Importer;
import org.apache.jackrabbit.oak.spi.xml.NodeInfo;
import org.apache.jackrabbit.oak.spi.xml.PropInfo;
import org.apache.jackrabbit.oak.spi.xml.TextValue;
@@ -64,6 +65,7 @@ class DocViewImportHandler extends Targe
*
* @param importer the importer
* @param valueFactory a value factory
+ * @param helper The namespace helper
*/
DocViewImportHandler(Importer importer, ValueFactory valueFactory,
NamespaceHelper helper) {
super(importer, valueFactory, helper);
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImportHandler.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImportHandler.java?rev=1507249&r1=1507248&r2=1507249&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImportHandler.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImportHandler.java
Fri Jul 26 10:05:30 2013
@@ -27,6 +27,7 @@ import org.apache.jackrabbit.oak.api.Roo
import org.apache.jackrabbit.oak.jcr.SessionContext;
import org.apache.jackrabbit.oak.jcr.delegate.SessionDelegate;
import org.apache.jackrabbit.oak.plugins.name.NamespaceConstants;
+import org.apache.jackrabbit.oak.spi.xml.Importer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.xml.sax.Attributes;
@@ -52,6 +53,7 @@ import org.xml.sax.helpers.DefaultHandle
* (i.e. default SAX2 Namespace processing).
*/
public class ImportHandler extends DefaultHandler {
+
private static final Logger log =
LoggerFactory.getLogger(ImportHandler.class);
private final Root root;
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java?rev=1507249&r1=1507248&r2=1507249&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/ImporterImpl.java
Fri Jul 26 10:05:30 2013
@@ -50,6 +50,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.nodetype.DefinitionProvider;
import org.apache.jackrabbit.oak.plugins.nodetype.EffectiveNodeTypeProvider;
import
org.apache.jackrabbit.oak.spi.security.authorization.permission.Permissions;
+import org.apache.jackrabbit.oak.spi.xml.Importer;
import org.apache.jackrabbit.oak.spi.xml.NodeInfo;
import org.apache.jackrabbit.oak.spi.xml.PropInfo;
import org.apache.jackrabbit.oak.spi.xml.ProtectedItemImporter;
@@ -91,7 +92,16 @@ public class ImporterImpl implements Imp
private ProtectedNodeImporter pnImporter;
/**
- * Creates a new {@code SessionImporter} instance.
+ * Creates a new importer instance.
+ * @param absPath The absolute JCR paths such as passed to the JCR call.
+ * @param sessionContext The context of the editing session
+ * @param root The write {@code Root}, which in case of a workspace import
+ * is different from the {@code Root} associated with the editing session.
+ * @param uuidBehavior The uuid behavior
+ * @param isWorkspaceImport {@code true} if this is a workspace import,
+ * {@code false} otherwise.
+ * @throws javax.jcr.RepositoryException If the initial validation of the
+ * path or the state of target node/session fails.
*/
public ImporterImpl(String absPath,
SessionContext sessionContext,
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/SysViewImportHandler.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/SysViewImportHandler.java?rev=1507249&r1=1507248&r2=1507249&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/SysViewImportHandler.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/SysViewImportHandler.java
Fri Jul 26 10:05:30 2013
@@ -29,6 +29,7 @@ import javax.jcr.ValueFactory;
import org.apache.jackrabbit.commons.NamespaceHelper;
import org.apache.jackrabbit.oak.plugins.name.NamespaceConstants;
+import org.apache.jackrabbit.oak.spi.xml.Importer;
import org.apache.jackrabbit.oak.spi.xml.NodeInfo;
import org.apache.jackrabbit.oak.spi.xml.PropInfo;
import org.apache.jackrabbit.oak.spi.xml.TextValue;
@@ -63,6 +64,7 @@ class SysViewImportHandler extends Targe
*
* @param importer the underlying importer
* @param valueFactory the value factory
+ * @param helper the namespace helper
*/
SysViewImportHandler(Importer importer, ValueFactory valueFactory,
NamespaceHelper helper) {
super(importer, valueFactory, helper);
Modified:
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/TargetImportHandler.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/TargetImportHandler.java?rev=1507249&r1=1507248&r2=1507249&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/TargetImportHandler.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/xml/TargetImportHandler.java
Fri Jul 26 10:05:30 2013
@@ -31,6 +31,7 @@ import org.apache.jackrabbit.commons.Nam
import org.apache.jackrabbit.oak.namepath.LocalNameMapper;
import org.apache.jackrabbit.oak.namepath.NamePathMapper;
import org.apache.jackrabbit.oak.namepath.NamePathMapperImpl;
+import org.apache.jackrabbit.oak.spi.xml.Importer;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
@@ -71,7 +72,7 @@ public abstract class TargetImportHandle
}
/**
- * Initializes the underlying {@link Importer} instance. This method
+ * Initializes the underlying {@link
org.apache.jackrabbit.oak.spi.xml.Importer} instance. This method
* is called by the XML parser when the XML document starts.
*
* @throws SAXException if the importer can not be initialized
@@ -87,7 +88,7 @@ public abstract class TargetImportHandle
}
/**
- * Closes the underlying {@link Importer} instance. This method
+ * Closes the underlying {@link
org.apache.jackrabbit.oak.spi.xml.Importer} instance. This method
* is called by the XML parser when the XML document ends.
*
* @throws SAXException if the importer can not be closed
