You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2007/11/06 16:54:48 UTC
svn commit: r592468 - in /incubator/sling/trunk: ./ sling/event/
sling/event/src/main/java/org/apache/sling/event/impl/
sling/event/src/test/java/org/apache/sling/event/impl/
Author: cziegeler
Date: Tue Nov 6 07:54:47 2007
New Revision: 592468
URL: http://svn.apache.org/viewvc?rev=592468&view=rev
Log:
SLING-83: Add only some modules to parent pom and adapt event module to api changes.
Modified:
incubator/sling/trunk/pom.xml
incubator/sling/trunk/sling/event/pom.xml
incubator/sling/trunk/sling/event/src/main/java/org/apache/sling/event/impl/AbstractRepositoryEventHandler.java
incubator/sling/trunk/sling/event/src/test/java/org/apache/sling/event/impl/AbstractRepositoryEventHandlerTest.java
incubator/sling/trunk/sling/event/src/test/java/org/apache/sling/event/impl/RepositoryUtil.java
Modified: incubator/sling/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/pom.xml?rev=592468&r1=592467&r2=592468&view=diff
==============================================================================
--- incubator/sling/trunk/pom.xml (original)
+++ incubator/sling/trunk/pom.xml Tue Nov 6 07:54:47 2007
@@ -62,43 +62,19 @@
<!-- The real Sling Parent Project -->
<module>parent</module>
- <!-- JSP Core Support: Compiler and JSP plugin -->
- <module>jasper-sling</module>
-
- <!-- Core Plugins -->
- <module>maven-sling-plugin</module>
- <module>maven-jcrocm-plugin</module>
- <module>maven-jspc-plugin</module>
-
- <module>log</module>
- <module>assembly</module>
- <module>mime</module>
- <module>json</module>
-
- <module>jackrabbit-api</module>
- <module>jackrabbit-client</module>
- <module>jackrabbit-server</module>
- <module>jackrabbit-classloader</module>
-
- <module>component-api</module>
- <module>content</module>
- <module>core</module>
- <module>cache</module>
-
- <module>component-standard</module>
- <module>scripting-core</module>
- <module>scripting-jsp</module>
- <module>scripting-jsp-taglib</module>
-
- <module>event</module>
- <module>scheduler</module>
-
- <module>obr</module>
-
- <module>webmanager</module>
-
- <module>sling-app</module>
- <module>sling-servlet</module>
+ <!-- The Sling API -->
+ <module>api</module>
+ <!-- The commons sub project -->
+ <module>commons/json</module>
+ <module>commons/mime</module>
+
+ <!-- The JCR sub project -->
+ <module>jcr/api</module>
+
+ <!-- Sling -->
+ <module>sling/core</module>
+ <module>sling/event</module>
+ <module>sling/scheduler</module>
</modules>
</project>
Modified: incubator/sling/trunk/sling/event/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/event/pom.xml?rev=592468&r1=592467&r2=592468&view=diff
==============================================================================
--- incubator/sling/trunk/sling/event/pom.xml (original)
+++ incubator/sling/trunk/sling/event/pom.xml Tue Nov 6 07:54:47 2007
@@ -102,7 +102,7 @@
</dependency>
<dependency>
<groupId>org.apache.sling</groupId>
- <artifactId>sling-jackrabbit-api</artifactId>
+ <artifactId>jcr.api</artifactId>
<version>2.0.0-incubator-SNAPSHOT</version>
</dependency>
<dependency>
Modified: incubator/sling/trunk/sling/event/src/main/java/org/apache/sling/event/impl/AbstractRepositoryEventHandler.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/event/src/main/java/org/apache/sling/event/impl/AbstractRepositoryEventHandler.java?rev=592468&r1=592467&r2=592468&view=diff
==============================================================================
--- incubator/sling/trunk/sling/event/src/main/java/org/apache/sling/event/impl/AbstractRepositoryEventHandler.java (original)
+++ incubator/sling/trunk/sling/event/src/main/java/org/apache/sling/event/impl/AbstractRepositoryEventHandler.java Tue Nov 6 07:54:47 2007
@@ -38,7 +38,7 @@
import org.apache.jackrabbit.JcrConstants;
import org.apache.sling.core.Constants;
import org.apache.sling.event.EventUtil;
-import org.apache.sling.jcr.SlingRepository;
+import org.apache.sling.jcr.api.SlingRepository;
import org.osgi.service.component.ComponentContext;
import org.osgi.service.event.Event;
import org.osgi.service.event.EventAdmin;
Modified: incubator/sling/trunk/sling/event/src/test/java/org/apache/sling/event/impl/AbstractRepositoryEventHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/event/src/test/java/org/apache/sling/event/impl/AbstractRepositoryEventHandlerTest.java?rev=592468&r1=592467&r2=592468&view=diff
==============================================================================
--- incubator/sling/trunk/sling/event/src/test/java/org/apache/sling/event/impl/AbstractRepositoryEventHandlerTest.java (original)
+++ incubator/sling/trunk/sling/event/src/test/java/org/apache/sling/event/impl/AbstractRepositoryEventHandlerTest.java Tue Nov 6 07:54:47 2007
@@ -30,7 +30,7 @@
import javax.jcr.observation.EventListenerIterator;
import org.apache.sling.core.Constants;
-import org.apache.sling.jcr.SlingRepository;
+import org.apache.sling.jcr.api.SlingRepository;
import org.jmock.Expectations;
import org.jmock.Mockery;
import org.jmock.integration.junit4.JMock;
Modified: incubator/sling/trunk/sling/event/src/test/java/org/apache/sling/event/impl/RepositoryUtil.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/sling/event/src/test/java/org/apache/sling/event/impl/RepositoryUtil.java?rev=592468&r1=592467&r2=592468&view=diff
==============================================================================
--- incubator/sling/trunk/sling/event/src/test/java/org/apache/sling/event/impl/RepositoryUtil.java (original)
+++ incubator/sling/trunk/sling/event/src/test/java/org/apache/sling/event/impl/RepositoryUtil.java Tue Nov 6 07:54:47 2007
@@ -35,7 +35,7 @@
import org.apache.jackrabbit.api.JackrabbitNodeTypeManager;
import org.apache.jackrabbit.core.jndi.RegistryHelper;
-import org.apache.sling.jcr.SlingRepository;
+import org.apache.sling.jcr.api.SlingRepository;
/**
* Utility class for managing JCR repositories.