[exo-jcr-commits] exo-jcr SVN: r2197 - in jcr/tags/1.12.0-CP01/exo.jcr.component.core/src: test/java/org/exoplatform/services/jcr/api/observation and 1 other directory.

Author: dkatayev Date: 2010-03-31 06:10:49 -0400 (Wed, 31 Mar 2010) New Revision: 2197 Modified: jcr/tags/1.12.0-CP01/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/observation/ActionLauncher.java jcr/tags/1.12.0-CP01/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/observation/TestObservationManager.java Log: EXOJCR-620 merged changes from https://jira.jboss.org/jira/browse/EXOJCR-591 Modified: jcr/tags/1.12.0-CP01/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/observation/ActionLauncher.java =================================================================== --- jcr/tags/1.12.0-CP01/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/observation/ActionLauncher.java 2010-03-31 09:41:24 UTC (rev 2196) +++ jcr/tags/1.12.0-CP01/exo.jcr.component.core/src/main/java/org/exoplatform/services/jcr/impl/core/observation/ActionLauncher.java 2010-03-31 10:10:49 UTC (rev 2197) @@ -270,6 +270,6 @@ */ public boolean isTXAware() { - return true; + return false; } } Modified: jcr/tags/1.12.0-CP01/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/observation/TestObservationManager.java =================================================================== --- jcr/tags/1.12.0-CP01/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/observation/TestObservationManager.java 2010-03-31 09:41:24 UTC (rev 2196) +++ jcr/tags/1.12.0-CP01/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/observation/TestObservationManager.java 2010-03-31 10:10:49 UTC (rev 2197) @@ -19,6 +19,8 @@ package org.exoplatform.services.jcr.api.observation; import org.exoplatform.services.jcr.JcrAPIBaseTest; +import org.exoplatform.services.jcr.core.CredentialsImpl; +import org.exoplatform.services.jcr.impl.core.RepositoryImpl; import org.exoplatform.services.log.Log; import java.util.Calendar; @@ -277,6 +279,20 @@ } + public void testRemoveSourceNodeEvents() throws RepositoryException + { + ObservationManager observationManager = this.workspace.getObservationManager(); + testRoot.addNode("testRemoveSourceNode"); + EventListener listener = new RemoveDummyListener(this.log, this.repository, this.credentials); + observationManager.addEventListener(listener, Event.NODE_ADDED, "/", true, null, null, false); + root.save(); + Session session2 = repository.login(credentials, "ws2"); + Session session = repository.login(credentials, "ws"); + assertFalse(session.itemExists("/testRoot/testRemoveSourceNode")); + assertTrue(session2.itemExists("/testRemoveSourceNode")); + observationManager.removeEventListener(listener); + } + private void checkEventNumAndCleanCounter(int cnt) { assertEquals(cnt, counter); @@ -332,4 +348,48 @@ } } + private static class RemoveDummyListener implements EventListener + { + protected Log log; + + protected RepositoryImpl repository; + + protected CredentialsImpl credentials; + + public RemoveDummyListener(Log log, RepositoryImpl repository, CredentialsImpl credentials) + { + this.log = log; + this.repository = repository; + this.credentials = credentials; + } + + public void onEvent(EventIterator events) + { + while (events.hasNext()) + { + Event event = events.nextEvent(); + counter++; + try + { + String path = event.getPath(); + Session session2 = repository.login(credentials, "ws2"); + session2.getWorkspace().clone("ws", path, "/testRemoveSourceNode", true); + Session session = repository.login(credentials, "ws"); + session.getItem(path).remove(); + session.save(); + } + catch (RepositoryException re) + { + System.out.println(re.getMessage()); + if (log.isErrorEnabled()) + { + log.error(re.getMessage()); + } + } + if (log.isDebugEnabled()) + log.debug("EVENT fired by RemoveDummyListener " + event + " " + event.getType()); + } + } + } + }