[exo-jcr-commits] exo-jcr SVN: r4540 - in jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl: dataflow and 1 other directories.

Author: tolusha Date: 2011-06-15 03:48:46 -0400 (Wed, 15 Jun 2011) New Revision: 4540 Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataRestoreVisitor.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/ItemDataCloneVisitor.java jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/BaseXmlImporter.java Log: EXOJCR-1376: Add UUID into the exception message content of ItemExistsException Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataRestoreVisitor.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataRestoreVisitor.java 2011-06-15 07:45:55 UTC (rev 4539) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/version/ItemDataRestoreVisitor.java 2011-06-15 07:48:46 UTC (rev 4540) @@ -43,6 +43,7 @@ import org.exoplatform.services.jcr.impl.dataflow.TransientValueData; import org.exoplatform.services.jcr.impl.dataflow.session.SessionChangesLog; import org.exoplatform.services.jcr.impl.dataflow.version.VersionHistoryDataHelper; +import org.exoplatform.services.jcr.impl.storage.JCRItemExistsException; import org.exoplatform.services.jcr.util.IdGenerator; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; @@ -644,10 +645,10 @@ // instance of C becomes the child of the restored N. if (!removeExisting) { - throw new ItemExistsException("Item with the same UUID " + versionableIdentifier + throw new JCRItemExistsException("Item with the same UUID " + versionableIdentifier + " as versionable child node " + userSession.getLocationFactory().createJCRPath(versionable.getQPath()).getAsString(false) - + " already exists and removeExisting=false"); + + " already exists and removeExisting=false", versionableIdentifier); } // else - leaving existed unchanged } Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/ItemDataCloneVisitor.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/ItemDataCloneVisitor.java 2011-06-15 07:45:55 UTC (rev 4539) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/dataflow/ItemDataCloneVisitor.java 2011-06-15 07:48:46 UTC (rev 4540) @@ -29,12 +29,12 @@ import org.exoplatform.services.jcr.impl.core.ItemImpl; import org.exoplatform.services.jcr.impl.core.SessionDataManager; import org.exoplatform.services.jcr.impl.dataflow.session.SessionChangesLog; +import org.exoplatform.services.jcr.impl.storage.JCRItemExistsException; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import javax.jcr.ItemExistsException; import javax.jcr.RepositoryException; /** @@ -180,7 +180,8 @@ } else { - throw new ItemExistsException("Item exists id = " + identifier + " name " + relItem.getName()); + throw new JCRItemExistsException("Item exists id = " + identifier + " name " + relItem.getName(), + identifier); } } keepIdentifiers = true; Modified: jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/BaseXmlImporter.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/BaseXmlImporter.java 2011-06-15 07:45:55 UTC (rev 4539) +++ jcr/trunk/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/xml/importing/BaseXmlImporter.java 2011-06-15 07:48:46 UTC (rev 4540) @@ -42,6 +42,7 @@ import org.exoplatform.services.jcr.impl.core.value.ValueFactoryImpl; import org.exoplatform.services.jcr.impl.dataflow.ItemDataRemoveVisitor; import org.exoplatform.services.jcr.impl.dataflow.version.VersionHistoryDataHelper; +import org.exoplatform.services.jcr.impl.storage.JCRItemExistsException; import org.exoplatform.services.jcr.impl.xml.VersionHistoryRemover; import org.exoplatform.services.jcr.impl.xml.importing.dataflow.ImportItemData; import org.exoplatform.services.jcr.impl.xml.importing.dataflow.ImportNodeData; @@ -595,8 +596,8 @@ // If an incoming referenceable node has the same UUID as a node // already existing in the workspace then a SAXException is thrown // by the ContentHandler during deserialization. - throw new ItemExistsException("An incoming referenceable node has the same " - + "UUID as a node already existing in the workspace!"); + throw new JCRItemExistsException("An incoming referenceable node has the same " + + "UUID as a node already existing in the workspace! UUID:" + identifier, identifier); default : } }