Author: areshetnyak Date: 2010-11-05 06:46:02 -0400 (Fri, 05 Nov 2010) New Revision: 3401 Modified: jcr/branches/1.12.x/exo.jcr.component.ext/pom.xml jcr/branches/1.12.x/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/metadata/AddMetadataAction.java jcr/branches/1.12.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/metadata/MetaDataActionTest.java Log: JCR-1487 : Problem with 'Empty metadata field not updated when re-uploading documents' was fixed Modified: jcr/branches/1.12.x/exo.jcr.component.ext/pom.xml =================================================================== --- jcr/branches/1.12.x/exo.jcr.component.ext/pom.xml 2010-11-05 07:57:05 UTC (rev 3400) +++ jcr/branches/1.12.x/exo.jcr.component.ext/pom.xml 2010-11-05 10:46:02 UTC (rev 3401) @@ -141,6 +141,7 @@ <testResource> <directory>src/test/resources</directory> <includes> + <include>**/*.pdf</include> <include>**/*.xml</include> <include>**/*.xls</include> <include>**/*.groovy</include> Modified: jcr/branches/1.12.x/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/metadata/AddMetadataAction.java =================================================================== --- jcr/branches/1.12.x/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/metadata/AddMetadataAction.java 2010-11-05 07:57:05 UTC (rev 3400) +++ jcr/branches/1.12.x/exo.jcr.component.ext/src/main/java/org/exoplatform/services/jcr/ext/metadata/AddMetadataAction.java 2010-11-05 10:46:02 UTC (rev 3401) @@ -18,6 +18,18 @@ */ 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; @@ -35,18 +47,6 @@ 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.Properties; -import java.util.Map.Entry; - -import javax.jcr.PathNotFoundException; -import javax.jcr.Value; -import javax.jcr.ValueFactory; -import javax.jcr.ValueFormatException; - /** * Created by The eXo Platform SAS . * @@ -104,11 +104,14 @@ return false; } - if (!parent.isNodeType("dc:elementSet")) + // remove old "dc:elementSet" properties + if (parent.isNodeType("dc:elementSet")) { - parent.addMixin("dc:elementSet"); + parent.removeMixin("dc:elementSet"); } + parent.addMixin("dc:elementSet"); + DocumentReaderService readerService = (DocumentReaderService)((ExoContainer)ctx.get("exocontainer")) .getComponentInstanceOfType(DocumentReaderService.class); Modified: jcr/branches/1.12.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/metadata/MetaDataActionTest.java =================================================================== --- jcr/branches/1.12.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/metadata/MetaDataActionTest.java 2010-11-05 07:57:05 UTC (rev 3400) +++ jcr/branches/1.12.x/exo.jcr.component.ext/src/test/java/org/exoplatform/services/jcr/ext/metadata/MetaDataActionTest.java 2010-11-05 10:46:02 UTC (rev 3401) @@ -18,13 +18,13 @@ */ package org.exoplatform.services.jcr.ext.metadata; -import org.exoplatform.services.jcr.ext.BaseStandaloneTest; - import java.io.InputStream; import java.util.Calendar; import javax.jcr.Node; +import org.exoplatform.services.jcr.ext.BaseStandaloneTest; + public class MetaDataActionTest extends BaseStandaloneTest { @@ -122,4 +122,43 @@ assertFalse(contentNode.hasProperty("dc:date")); assertFalse(contentNode.hasProperty("dc:creator")); } + + public void testUpdatePDF() throws Exception + { + InputStream is = MetaDataActionTest.class.getResourceAsStream("/test_1.pdf"); + + Node rootNode = session.getRootNode().addNode("MetaDataActionTest"); + Node contentNode = rootNode.addNode("testAddContent", "nt:resource"); + contentNode.setProperty("jcr:data", is); + contentNode.setProperty("jcr:encoding", "UTF-8"); + contentNode.setProperty("jcr:mimeType", "application/pdf"); + contentNode.setProperty("jcr:lastModified", Calendar.getInstance()); + session.save(); + + Node testNode = repository.getSystemSession().getRootNode().getNode("MetaDataActionTest/testAddContent"); + assertTrue(testNode.hasProperty("dc:title")); + assertTrue(testNode.hasProperty("dc:creator")); + assertEquals("Title_1", testNode.getProperty("dc:title").getValues()[0].getString()); + assertEquals("Author_1", testNode.getProperty("dc:creator").getValues()[0].getString()); + + // update #1 + is = MetaDataActionTest.class.getResourceAsStream("/test_2.pdf"); + contentNode.setProperty("jcr:data", is); + session.save(); + + testNode = repository.getSystemSession().getRootNode().getNode("MetaDataActionTest/testAddContent"); + assertTrue(testNode.hasProperty("dc:title")); + assertTrue(testNode.hasProperty("dc:creator")); + assertEquals("Title_2", testNode.getProperty("dc:title").getValues()[0].getString()); + assertEquals("Author_2", testNode.getProperty("dc:creator").getValues()[0].getString()); + + // update #2 + is = MetaDataActionTest.class.getResourceAsStream("/test_3.pdf"); + contentNode.setProperty("jcr:data", is); + session.save(); + + testNode = repository.getSystemSession().getRootNode().getNode("MetaDataActionTest/testAddContent"); + assertFalse(testNode.hasProperty("dc:title")); + assertFalse(testNode.hasProperty("dc:creator")); + } }