svn commit: r593118 - in /incubator/sling/trunk: microsling/microsling-core/ microsling/microsling-core/src/test/java/org/apache/sling/microsling/scripting/helpers/ scripting/javascript/ scripting/javascript/src/test/ scripting/javascript/src/test/java...

[cz...@apache.org]

Author: cziegeler
Date: Thu Nov  8 02:34:09 2007
New Revision: 593118

URL: http://svn.apache.org/viewvc?rev=593118&view=rev
Log:
SLING-83 and SLING-98: Let microsling inherit sling parent pom, move test to javascript and fix dependencies.

Added:
    incubator/sling/trunk/scripting/javascript/src/test/
    incubator/sling/trunk/scripting/javascript/src/test/java/
    incubator/sling/trunk/scripting/javascript/src/test/java/org/
    incubator/sling/trunk/scripting/javascript/src/test/java/org/apache/
    incubator/sling/trunk/scripting/javascript/src/test/java/org/apache/sling/
    incubator/sling/trunk/scripting/javascript/src/test/java/org/apache/sling/scripting/
    incubator/sling/trunk/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/
    incubator/sling/trunk/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/EspReaderTest.java
      - copied, changed from r593112, incubator/sling/trunk/microsling/microsling-core/src/test/java/org/apache/sling/microsling/scripting/helpers/EspReaderTest.java
Removed:
    incubator/sling/trunk/microsling/microsling-core/src/test/java/org/apache/sling/microsling/scripting/helpers/EspReaderTest.java
Modified:
    incubator/sling/trunk/microsling/microsling-core/pom.xml
    incubator/sling/trunk/scripting/javascript/pom.xml

Modified: incubator/sling/trunk/microsling/microsling-core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/microsling/microsling-core/pom.xml?rev=593118&r1=593117&r2=593118&view=diff
==============================================================================
--- incubator/sling/trunk/microsling/microsling-core/pom.xml (original)
+++ incubator/sling/trunk/microsling/microsling-core/pom.xml Thu Nov  8 02:34:09 2007
@@ -23,6 +23,13 @@
 
   <modelVersion>4.0.0</modelVersion>
 
+  <parent>
+      <groupId>org.apache.sling</groupId>
+      <artifactId>sling</artifactId>
+      <version>1-incubator-SNAPSHOT</version>
+      <relativePath>../../parent/pom.xml</relativePath>
+  </parent>
+
   <groupId>org.apache.sling</groupId>
   <artifactId>microsling-core</artifactId>
   <packaging>war</packaging>
@@ -68,8 +75,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.2</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>

Modified: incubator/sling/trunk/scripting/javascript/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/javascript/pom.xml?rev=593118&r1=593117&r2=593118&view=diff
==============================================================================
--- incubator/sling/trunk/scripting/javascript/pom.xml (original)
+++ incubator/sling/trunk/scripting/javascript/pom.xml Thu Nov  8 02:34:09 2007
@@ -95,5 +95,15 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+    <!-- Testing -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 </project>

Copied: incubator/sling/trunk/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/EspReaderTest.java (from r593112, incubator/sling/trunk/microsling/microsling-core/src/test/java/org/apache/sling/microsling/scripting/helpers/EspReaderTest.java)
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/EspReaderTest.java?p2=incubator/sling/trunk/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/EspReaderTest.java&p1=incubator/sling/trunk/microsling/microsling-core/src/test/java/org/apache/sling/microsling/scripting/helpers/EspReaderTest.java&r1=593112&r2=593118&rev=593118&view=diff
==============================================================================
--- incubator/sling/trunk/microsling/microsling-core/src/test/java/org/apache/sling/microsling/scripting/helpers/EspReaderTest.java (original)
+++ incubator/sling/trunk/scripting/javascript/src/test/java/org/apache/sling/scripting/javascript/EspReaderTest.java Thu Nov  8 02:34:09 2007
@@ -16,15 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.sling.microsling.scripting.helpers;
+package org.apache.sling.scripting.javascript;
 
 import java.io.IOException;
 import java.io.Reader;
 import java.io.StringReader;
 
 import junit.framework.TestCase;
-
-import org.apache.sling.microsling.scripting.helpers.EspReader;
 
 /**
  * The <code>EspReaderTest</code> contains some simple test cases for the