From commits-return-4781-apmail-jackrabbit-commits-archive=jackrabbit.apache.org@jackrabbit.apache.org Tue Oct 30 09:56:27 2007 Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 79504 invoked from network); 30 Oct 2007 09:56:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 30 Oct 2007 09:56:27 -0000 Received: (qmail 88252 invoked by uid 500); 30 Oct 2007 09:56:14 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 88163 invoked by uid 500); 30 Oct 2007 09:56:14 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 88154 invoked by uid 99); 30 Oct 2007 09:56:14 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Oct 2007 02:56:14 -0700 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Oct 2007 09:56:26 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 239B21A9832; Tue, 30 Oct 2007 02:55:53 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r590012 - /jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/ Date: Tue, 30 Oct 2007 09:55:52 -0000 To: commits@jackrabbit.apache.org From: angela@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071030095553.239B21A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: angela Date: Tue Oct 30 02:55:51 2007 New Revision: 590012 URL: http://svn.apache.org/viewvc?rev=590012&view=rev Log: optimize imports Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/AbstractSAXEventGenerator.java jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/DocViewImportHandler.java jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/DocViewSAXEventGenerator.java jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/ImportHandler.java jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/Importer.java jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SessionImporter.java jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SysViewImportHandler.java jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/TargetImportHandler.java jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/WorkspaceContentHandler.java Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/AbstractSAXEventGenerator.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/AbstractSAXEventGenerator.java?rev=590012&r1=590011&r2=590012&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/AbstractSAXEventGenerator.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/AbstractSAXEventGenerator.java Tue Oct 30 02:55:51 2007 @@ -16,19 +16,18 @@ */ package org.apache.jackrabbit.jcr2spi.xml; -import org.apache.jackrabbit.spi.Name; -import org.apache.jackrabbit.namespace.SessionNamespaceResolver; -import org.apache.jackrabbit.namespace.NamespaceResolver; -import org.apache.jackrabbit.name.NameConstants; -import org.apache.jackrabbit.name.NameFactoryImpl; import org.apache.jackrabbit.conversion.NameResolver; import org.apache.jackrabbit.conversion.ParsingNameResolver; - +import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.name.NameFactoryImpl; +import org.apache.jackrabbit.namespace.NamespaceResolver; +import org.apache.jackrabbit.namespace.SessionNamespaceResolver; +import org.apache.jackrabbit.spi.Name; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; -import org.slf4j.LoggerFactory; -import org.slf4j.Logger; import javax.jcr.Node; import javax.jcr.NodeIterator; @@ -36,7 +35,6 @@ import javax.jcr.PropertyIterator; import javax.jcr.RepositoryException; import javax.jcr.Session; - import java.util.HashMap; import java.util.Map; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/DocViewImportHandler.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/DocViewImportHandler.java?rev=590012&r1=590011&r2=590012&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/DocViewImportHandler.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/DocViewImportHandler.java Tue Oct 30 02:55:51 2007 @@ -16,21 +16,20 @@ */ package org.apache.jackrabbit.jcr2spi.xml; +import org.apache.jackrabbit.conversion.NameResolver; +import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.namespace.NamespaceResolver; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.spi.NameFactory; -import org.apache.jackrabbit.name.NameConstants; -import org.apache.jackrabbit.conversion.NameResolver; import org.apache.jackrabbit.util.ISO9075; -import org.apache.jackrabbit.namespace.NamespaceResolver; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.xml.sax.Attributes; import org.xml.sax.SAXException; -import org.slf4j.LoggerFactory; -import org.slf4j.Logger; +import javax.jcr.NamespaceException; import javax.jcr.PropertyType; import javax.jcr.RepositoryException; -import javax.jcr.NamespaceException; - import java.io.IOException; import java.io.Reader; import java.util.ArrayList; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/DocViewSAXEventGenerator.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/DocViewSAXEventGenerator.java?rev=590012&r1=590011&r2=590012&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/DocViewSAXEventGenerator.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/DocViewSAXEventGenerator.java Tue Oct 30 02:55:51 2007 @@ -20,11 +20,11 @@ import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.util.ISO9075; import org.apache.jackrabbit.value.ValueHelper; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; -import org.slf4j.LoggerFactory; -import org.slf4j.Logger; import javax.jcr.Node; import javax.jcr.Property; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/ImportHandler.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/ImportHandler.java?rev=590012&r1=590011&r2=590012&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/ImportHandler.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/ImportHandler.java Tue Oct 30 02:55:51 2007 @@ -16,24 +16,24 @@ */ package org.apache.jackrabbit.jcr2spi.xml; +import org.apache.jackrabbit.conversion.NameResolver; +import org.apache.jackrabbit.conversion.ParsingNameResolver; import org.apache.jackrabbit.namespace.AbstractNamespaceResolver; import org.apache.jackrabbit.namespace.NamespaceResolver; import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.spi.NameFactory; -import org.apache.jackrabbit.conversion.NameResolver; -import org.apache.jackrabbit.conversion.ParsingNameResolver; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.xml.sax.Attributes; import org.xml.sax.ContentHandler; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; import org.xml.sax.helpers.DefaultHandler; import org.xml.sax.helpers.NamespaceSupport; -import org.slf4j.LoggerFactory; -import org.slf4j.Logger; import javax.jcr.NamespaceException; -import javax.jcr.RepositoryException; import javax.jcr.NamespaceRegistry; +import javax.jcr.RepositoryException; /** * An ImportHandler instance can be used to import serialized Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/Importer.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/Importer.java?rev=590012&r1=590011&r2=590012&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/Importer.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/Importer.java Tue Oct 30 02:55:51 2007 @@ -16,11 +16,10 @@ */ package org.apache.jackrabbit.jcr2spi.xml; -import org.apache.jackrabbit.spi.Name; import org.apache.jackrabbit.namespace.NamespaceResolver; +import org.apache.jackrabbit.spi.Name; import javax.jcr.RepositoryException; - import java.io.IOException; import java.io.Reader; import java.util.List; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SessionImporter.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SessionImporter.java?rev=590012&r1=590011&r2=590012&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SessionImporter.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SessionImporter.java Tue Oct 30 02:55:51 2007 @@ -16,66 +16,65 @@ */ package org.apache.jackrabbit.jcr2spi.xml; -import org.apache.jackrabbit.jcr2spi.state.NodeState; -import org.apache.jackrabbit.jcr2spi.state.PropertyState; -import org.apache.jackrabbit.jcr2spi.state.ItemState; -import org.apache.jackrabbit.jcr2spi.state.SessionItemStateManager; -import org.apache.jackrabbit.jcr2spi.state.ItemStateValidator; -import org.apache.jackrabbit.jcr2spi.state.Status; import org.apache.jackrabbit.jcr2spi.SessionImpl; import org.apache.jackrabbit.jcr2spi.SessionListener; +import org.apache.jackrabbit.jcr2spi.hierarchy.HierarchyEntry; import org.apache.jackrabbit.jcr2spi.hierarchy.NodeEntry; import org.apache.jackrabbit.jcr2spi.hierarchy.PropertyEntry; -import org.apache.jackrabbit.jcr2spi.hierarchy.HierarchyEntry; -import org.apache.jackrabbit.jcr2spi.util.ReferenceChangeTracker; -import org.apache.jackrabbit.jcr2spi.util.LogUtil; import org.apache.jackrabbit.jcr2spi.nodetype.EffectiveNodeType; -import org.apache.jackrabbit.nodetype.NodeTypeConflictException; import org.apache.jackrabbit.jcr2spi.nodetype.EffectiveNodeTypeProvider; import org.apache.jackrabbit.jcr2spi.operation.AddNode; -import org.apache.jackrabbit.jcr2spi.operation.Remove; import org.apache.jackrabbit.jcr2spi.operation.AddProperty; -import org.apache.jackrabbit.jcr2spi.operation.SetPropertyValue; -import org.apache.jackrabbit.jcr2spi.operation.SetMixin; import org.apache.jackrabbit.jcr2spi.operation.Operation; +import org.apache.jackrabbit.jcr2spi.operation.Remove; +import org.apache.jackrabbit.jcr2spi.operation.SetMixin; +import org.apache.jackrabbit.jcr2spi.operation.SetPropertyValue; +import org.apache.jackrabbit.jcr2spi.state.ItemState; +import org.apache.jackrabbit.jcr2spi.state.ItemStateValidator; +import org.apache.jackrabbit.jcr2spi.state.NodeState; +import org.apache.jackrabbit.jcr2spi.state.PropertyState; +import org.apache.jackrabbit.jcr2spi.state.SessionItemStateManager; +import org.apache.jackrabbit.jcr2spi.state.Status; +import org.apache.jackrabbit.jcr2spi.util.LogUtil; +import org.apache.jackrabbit.jcr2spi.util.ReferenceChangeTracker; +import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.namespace.NamespaceResolver; +import org.apache.jackrabbit.nodetype.NodeTypeConflictException; import org.apache.jackrabbit.spi.Name; +import org.apache.jackrabbit.spi.NodeId; +import org.apache.jackrabbit.spi.Path; +import org.apache.jackrabbit.spi.QNodeDefinition; +import org.apache.jackrabbit.spi.QPropertyDefinition; +import org.apache.jackrabbit.spi.QValue; import org.apache.jackrabbit.util.Base64; import org.apache.jackrabbit.util.TransientFileFactory; -import org.slf4j.LoggerFactory; +import org.apache.jackrabbit.uuid.UUID; +import org.apache.jackrabbit.value.ValueFormat; +import org.apache.jackrabbit.value.ValueHelper; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; -import javax.jcr.RepositoryException; import javax.jcr.ImportUUIDBehavior; import javax.jcr.ItemExistsException; import javax.jcr.ItemNotFoundException; -import javax.jcr.PropertyType; import javax.jcr.PathNotFoundException; +import javax.jcr.PropertyType; +import javax.jcr.RepositoryException; import javax.jcr.Session; import javax.jcr.Value; import javax.jcr.lock.LockException; -import javax.jcr.version.VersionException; import javax.jcr.nodetype.ConstraintViolationException; -import org.apache.jackrabbit.spi.Path; -import org.apache.jackrabbit.name.NameConstants; -import org.apache.jackrabbit.spi.QPropertyDefinition; -import org.apache.jackrabbit.spi.QNodeDefinition; -import org.apache.jackrabbit.spi.NodeId; -import org.apache.jackrabbit.spi.QValue; -import org.apache.jackrabbit.value.ValueHelper; -import org.apache.jackrabbit.value.ValueFormat; -import org.apache.jackrabbit.uuid.UUID; -import org.apache.jackrabbit.namespace.NamespaceResolver; - +import javax.jcr.version.VersionException; import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileOutputStream; -import java.io.Reader; import java.io.IOException; -import java.util.Stack; -import java.util.List; -import java.util.Iterator; -import java.util.Arrays; +import java.io.Reader; import java.util.ArrayList; +import java.util.Arrays; +import java.util.Iterator; +import java.util.List; +import java.util.Stack; /** * SessionImporter... Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SysViewImportHandler.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SysViewImportHandler.java?rev=590012&r1=590011&r2=590012&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SysViewImportHandler.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/SysViewImportHandler.java Tue Oct 30 02:55:51 2007 @@ -16,17 +16,17 @@ */ package org.apache.jackrabbit.jcr2spi.xml; -import org.apache.jackrabbit.spi.Name; -import org.apache.jackrabbit.name.NameConstants; import org.apache.jackrabbit.conversion.NameException; import org.apache.jackrabbit.conversion.NameResolver; +import org.apache.jackrabbit.name.NameConstants; +import org.apache.jackrabbit.spi.Name; import org.xml.sax.Attributes; import org.xml.sax.SAXException; import javax.jcr.InvalidSerializedDataException; +import javax.jcr.NamespaceException; import javax.jcr.PropertyType; import javax.jcr.RepositoryException; -import javax.jcr.NamespaceException; import java.io.IOException; import java.util.ArrayList; import java.util.Iterator; Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/TargetImportHandler.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/TargetImportHandler.java?rev=590012&r1=590011&r2=590012&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/TargetImportHandler.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/TargetImportHandler.java Tue Oct 30 02:55:51 2007 @@ -16,23 +16,23 @@ */ package org.apache.jackrabbit.jcr2spi.xml; -import org.apache.jackrabbit.util.TransientFileFactory; import org.apache.jackrabbit.conversion.NameResolver; import org.apache.jackrabbit.namespace.NamespaceResolver; -import org.xml.sax.helpers.DefaultHandler; -import org.xml.sax.SAXException; -import org.slf4j.LoggerFactory; +import org.apache.jackrabbit.util.TransientFileFactory; import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.xml.sax.SAXException; +import org.xml.sax.helpers.DefaultHandler; import javax.jcr.RepositoryException; import java.io.File; +import java.io.FileOutputStream; import java.io.FileReader; import java.io.IOException; +import java.io.OutputStreamWriter; import java.io.Reader; import java.io.StringReader; import java.io.Writer; -import java.io.FileOutputStream; -import java.io.OutputStreamWriter; /** * TargetImportHandler serves as the base class for the concrete Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/WorkspaceContentHandler.java URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/WorkspaceContentHandler.java?rev=590012&r1=590011&r2=590012&view=diff ============================================================================== --- jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/WorkspaceContentHandler.java (original) +++ jackrabbit/trunk/jackrabbit-jcr2spi/src/main/java/org/apache/jackrabbit/jcr2spi/xml/WorkspaceContentHandler.java Tue Oct 30 02:55:51 2007 @@ -15,34 +15,34 @@ */ package org.apache.jackrabbit.jcr2spi.xml; +import org.apache.jackrabbit.spi.Name; +import org.apache.jackrabbit.util.Text; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.xml.sax.Attributes; import org.xml.sax.ContentHandler; -import org.xml.sax.SAXException; import org.xml.sax.Locator; -import org.xml.sax.Attributes; -import org.xml.sax.helpers.DefaultHandler; +import org.xml.sax.SAXException; import org.xml.sax.helpers.AttributesImpl; -import org.apache.jackrabbit.util.Text; -import org.apache.jackrabbit.spi.Name; -import org.slf4j.LoggerFactory; -import org.slf4j.Logger; +import org.xml.sax.helpers.DefaultHandler; -import javax.jcr.Workspace; import javax.jcr.RepositoryException; +import javax.jcr.Workspace; +import javax.xml.transform.TransformerConfigurationException; +import javax.xml.transform.TransformerException; import javax.xml.transform.sax.SAXTransformerFactory; import javax.xml.transform.sax.TransformerHandler; import javax.xml.transform.stream.StreamResult; -import javax.xml.transform.TransformerConfigurationException; -import javax.xml.transform.TransformerException; import java.io.File; -import java.io.FileOutputStream; +import java.io.FileInputStream; import java.io.FileNotFoundException; +import java.io.FileOutputStream; import java.io.IOException; -import java.io.FileInputStream; import java.io.StringWriter; -import java.util.Map; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import java.util.ArrayList; +import java.util.Map; /** * WorkspaceContentHandler...