[exo-jcr-commits] exo-jcr SVN: r3487 - in jcr/trunk/exo.jcr.component.ext/src: test/java/org/exoplatform/services/jcr/ext/metadata and 1 other directory.

[do-not-reply at jboss.org]

Author: tolusha
Date: 2010-11-22 02:16:33 -0500 (Mon, 22 Nov 2010)
New Revision: 3487

Modified:
   jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/metadata/AddMetadataAction.java
   jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/metadata/MetaDataActionTest.java
Log:
EXOJCR-1036: revert changes

Modified: jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/metadata/AddMetadataAction.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/metadata/AddMetadataAction.java	2010-11-22 07:12:01 UTC (rev 3486)
+++ jcr/trunk/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/metadata/AddMetadataAction.java	2010-11-22 07:16:33 UTC (rev 3487)
@@ -18,18 +18,6 @@
  */
 package org.exoplatform.services.jcr.ext.metadata;
 
-import java.io.InputStream;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.Properties;
-import java.util.Map.Entry;
-
-import javax.jcr.PathNotFoundException;
-import javax.jcr.Value;
-import javax.jcr.ValueFactory;
-import javax.jcr.ValueFormatException;
-
 import org.apache.commons.chain.Context;
 import org.exoplatform.commons.utils.QName;
 import org.exoplatform.container.ExoContainer;
@@ -47,6 +35,18 @@
 import org.exoplatform.services.log.ExoLogger;
 import org.exoplatform.services.log.Log;
 
+import java.io.InputStream;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.Map.Entry;
+import java.util.Properties;
+
+import javax.jcr.PathNotFoundException;
+import javax.jcr.Value;
+import javax.jcr.ValueFactory;
+import javax.jcr.ValueFormatException;
+
 /**
  * Created by The eXo Platform SAS .
  * 
@@ -63,7 +63,7 @@
    {
 
       PropertyImpl property = (PropertyImpl)ctx.get("currentItem");
-      NodeImpl parent = (NodeImpl)property.getParent();
+      NodeImpl parent = property.getParent();
       if (!parent.isNodeType("nt:resource"))
       {
          throw new Exception("incoming node is not nt:resource type");
@@ -104,14 +104,11 @@
             return false;
          }
 
-         // remove old "dc:elementSet" properties
-         if (parent.isNodeType("dc:elementSet"))
+         if (!parent.isNodeType("dc:elementSet"))
          {
-            parent.removeMixin("dc:elementSet");
+            parent.addMixin("dc:elementSet");
          }
 
-         parent.addMixin("dc:elementSet");
-
          DocumentReaderService readerService =
             (DocumentReaderService)((ExoContainer)ctx.get("exocontainer"))
                .getComponentInstanceOfType(DocumentReaderService.class);

Modified: jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/metadata/MetaDataActionTest.java
===================================================================
--- jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/metadata/MetaDataActionTest.java	2010-11-22 07:12:01 UTC (rev 3486)
+++ jcr/trunk/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/metadata/MetaDataActionTest.java	2010-11-22 07:16:33 UTC (rev 3487)
@@ -123,7 +123,7 @@
       assertFalse(contentNode.hasProperty("dc:creator"));
    }
    
-   public void testUpdatePDF() throws Exception
+   public void _testUpdatePDF() throws Exception
    {
       InputStream is = MetaDataActionTest.class.getResourceAsStream("/test_1.pdf");