incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdelacre...@apache.org
Subject svn commit: r832964 - in /sling/trunk: ./ bundles/commons/slingtest/ bundles/commons/slingtest/src/ bundles/commons/slingtest/src/main/ bundles/commons/slingtest/src/main/java/ bundles/commons/slingtest/src/main/java/org/ bundles/commons/slingtest/src/...
Date Thu, 05 Nov 2009 01:32:33 GMT
Author: bdelacretaz
Date: Thu Nov  5 01:32:33 2009
New Revision: 832964

URL: http://svn.apache.org/viewvc?rev=832964&view=rev
Log:
moved non-core parts of commons/testing to commons/slingtest to avoid cyclic dependencies

Added:
    sling/trunk/bundles/commons/slingtest/src/
    sling/trunk/bundles/commons/slingtest/src/main/
    sling/trunk/bundles/commons/slingtest/src/main/java/
    sling/trunk/bundles/commons/slingtest/src/main/java/org/
    sling/trunk/bundles/commons/slingtest/src/main/java/org/apache/
    sling/trunk/bundles/commons/slingtest/src/main/java/org/apache/sling/
    sling/trunk/bundles/commons/slingtest/src/main/java/org/apache/sling/commons/
    sling/trunk/bundles/commons/slingtest/src/main/java/org/apache/sling/commons/testing/
    sling/trunk/bundles/commons/slingtest/src/main/java/org/apache/sling/commons/testing/SlingTestHelper.java
      - copied unchanged from r832924, sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/SlingTestHelper.java
Removed:
    sling/trunk/bundles/commons/testing/src/main/java/org/apache/sling/commons/testing/SlingTestHelper.java
Modified:
    sling/trunk/bundles/commons/slingtest/   (props changed)
    sling/trunk/bundles/commons/slingtest/pom.xml
    sling/trunk/bundles/commons/testing/pom.xml
    sling/trunk/contrib/extensions/i18n/pom.xml
    sling/trunk/pom.xml

Propchange: sling/trunk/bundles/commons/slingtest/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Nov  5 01:32:33 2009
@@ -0,0 +1,15 @@
+target
+sling
+bin
+logs
+jackrabbit-repository
+derby.log
+*.iml
+*.ipr
+*.iws
+.settings
+.project
+.classpath
+.externalToolBuilders
+maven-eclipse.xml
+

Modified: sling/trunk/bundles/commons/slingtest/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/slingtest/pom.xml?rev=832964&r1=832963&r2=832964&view=diff
==============================================================================
--- sling/trunk/bundles/commons/slingtest/pom.xml (original)
+++ sling/trunk/bundles/commons/slingtest/pom.xml Thu Nov  5 01:32:33 2009
@@ -29,7 +29,7 @@
 
     <artifactId>org.apache.sling.commons.slingtest</artifactId>
     <packaging>jar</packaging>
-    <version>2.0.5-SNAPSHOT</version>
+    <version>0.9.1-SNAPSHOT</version>
 
     <name>Apache Sling Application-level Testing Utilities</name>
     <description>
@@ -50,23 +50,6 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.osgi.core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.osgi.compendium</artifactId>
-        </dependency>
-
-        <!--
-            Dependencies required for testing and provided
-            transitively to modules using this artifact
-        -->
-        <dependency>
             <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.api</artifactId>
             <version>2.0.8</version>
@@ -79,22 +62,9 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.jackrabbit</groupId>
-            <artifactId>jackrabbit-api</artifactId>
-            <version>1.4</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.jackrabbit</groupId>
-            <artifactId>jackrabbit-core</artifactId>
-            <version>1.4.6</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.adapter</artifactId>
-            <version>2.0.4</version>
-            <scope>compile</scope>
+            <artifactId>org.apache.sling.commons.testing</artifactId>
+            <version>2.0.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
@@ -102,49 +72,5 @@
             <version>2.0.6</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>rhino</groupId>
-            <artifactId>js</artifactId>
-            <version>1.6R6</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
-            <version>3.1</version>
-            <scope>compile</scope>
-            <exclusions>
-                <!-- 
-                    Same problem as JCR-683: commons-httpclient depends on commons-logging.
Since 
-                    this webapp uses log4j (see the slf4j-log4j12 dependency below), we need
to
-                    override this dependency with jcl-over-sflf4j, found below
-                -->
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        
-        <!-- Logging for tests -->
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-simple</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        
-        <!-- Basic Test Controller JUnit -->
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        
-        <!-- Provide for Test Mocks -->
-        <dependency>
-            <groupId>org.jmock</groupId>
-            <artifactId>jmock-junit4</artifactId>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 </project>

Modified: sling/trunk/bundles/commons/testing/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/commons/testing/pom.xml?rev=832964&r1=832963&r2=832964&view=diff
==============================================================================
--- sling/trunk/bundles/commons/testing/pom.xml (original)
+++ sling/trunk/bundles/commons/testing/pom.xml Thu Nov  5 01:32:33 2009
@@ -97,12 +97,6 @@
             <scope>compile</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.jcr.resource</artifactId>
-            <version>2.0.6</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
             <groupId>rhino</groupId>
             <artifactId>js</artifactId>
             <version>1.6R6</version>

Modified: sling/trunk/contrib/extensions/i18n/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/i18n/pom.xml?rev=832964&r1=832963&r2=832964&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/i18n/pom.xml (original)
+++ sling/trunk/contrib/extensions/i18n/pom.xml Thu Nov  5 01:32:33 2009
@@ -122,6 +122,12 @@
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.commons.slingtest</artifactId>
+            <version>0.9.1-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
             <artifactId>org.apache.sling.commons.testing</artifactId>
             <version>2.0.5-SNAPSHOT</version>
             <scope>test</scope>

Modified: sling/trunk/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/pom.xml?rev=832964&r1=832963&r2=832964&view=diff
==============================================================================
--- sling/trunk/pom.xml (original)
+++ sling/trunk/pom.xml Thu Nov  5 01:32:33 2009
@@ -76,6 +76,7 @@
         <module>bundles/commons/osgi</module>
         <module>bundles/commons/scheduler</module>
         <module>bundles/commons/testing</module>
+        <module>bundles/commons/slingtest</module>
         <module>bundles/commons/threads</module>
         
         <!-- The Sling Engine -->



Mime
View raw message