You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cactus-dev@jakarta.apache.org by fe...@apache.org on 2006/04/15 03:19:44 UTC

svn commit: r394240 - in /jakarta/cactus/trunk: ./ framework/src/test/eclipse/ framework/src/test/eclipse/org/ framework/src/test/eclipse/org/apache/ framework/src/test/eclipse/org/apache/cactus/ integration/ant/ integration/ant/src/test/org/apache/cac...

Author: felipeal
Date: Fri Apr 14 18:19:39 2006
New Revision: 394240

URL: http://svn.apache.org/viewcvs?rev=394240&view=rev
Log:
eclipse: updated dependencies and added wrapper test suite

Added:
    jakarta/cactus/trunk/framework/src/test/eclipse/
    jakarta/cactus/trunk/framework/src/test/eclipse/org/
    jakarta/cactus/trunk/framework/src/test/eclipse/org/apache/
    jakarta/cactus/trunk/framework/src/test/eclipse/org/apache/cactus/
    jakarta/cactus/trunk/framework/src/test/eclipse/org/apache/cactus/TestAllOnEclipse.java
    jakarta/cactus/trunk/integration/ant/src/test/org/apache/cactus/integration/ant/TestAllOnEclipse.java
Modified:
    jakarta/cactus/trunk/.classpath
    jakarta/cactus/trunk/dependencies.xml.default
    jakarta/cactus/trunk/integration/ant/.classpath

Modified: jakarta/cactus/trunk/.classpath
URL: http://svn.apache.org/viewcvs/jakarta/cactus/trunk/.classpath?rev=394240&r1=394239&r2=394240&view=diff
==============================================================================
--- jakarta/cactus/trunk/.classpath (original)
+++ jakarta/cactus/trunk/.classpath Fri Apr 14 18:19:39 2006
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="documentation/src/java"/>
+	<classpathentry kind="src" path="framework/src/test/eclipse"/>
 	<classpathentry kind="src" path="framework/src/java/j2ee-13"/>
 	<classpathentry kind="src" path="framework/src/java/share-12-13-14"/>
 	<classpathentry kind="src" path="framework/src/java/share-13-14"/>
@@ -19,7 +20,6 @@
 	<classpathentry kind="src" path="integration/maven/src/plugin-test/testMultipleSrcDir/src/test-3"/>
 	<classpathentry kind="src" path="samples/servlet/src/java/j2ee13"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="MAVEN_REPO/j2ee/jars/j2ee.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/servletapi/jars/servletapi-2.3.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/ant/jars/ant-1.5.4.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/commons-jelly/jars/commons-jelly-1.0.jar"/>
@@ -28,7 +28,7 @@
 	<classpathentry kind="var" path="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.4.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/jetty/jars/org.mortbay.jetty-4.2.17.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar"/>
-	<classpathentry kind="var" path="MAVEN_REPO/cargo/jars/cargo-0.5.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/cargo/jars/cargo-0.8.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/aspectj/jars/aspectjrt-1.2.1.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/mockobjects/jars/mockobjects-core-0.09.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/httpunit/jars/httpunit-1.6.jar"/>
@@ -37,7 +37,8 @@
 	<classpathentry kind="var" path="MAVEN_REPO/jstl/jars/jstl-1.0.6.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/xerces/jars/xercesImpl-2.6.2.jar"/>
 	<classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.apache.ant_1.6.5/lib/ant-junit.jar"/>
-	<classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.apache.ant_1.6.5/lib/clover-1.2.3.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/xerces/jars/xmlParserAPIs-2.6.2.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/clover/jars/clover-ant-1.3_01.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/geronimo-spec/jars/geronimo-spec-j2ee-1.4-rc4.jar"/>
 	<classpathentry kind="output" path="integration/ant/target-13/classes/test"/>
 </classpath>

Modified: jakarta/cactus/trunk/dependencies.xml.default
URL: http://svn.apache.org/viewcvs/jakarta/cactus/trunk/dependencies.xml.default?rev=394240&r1=394239&r2=394240&view=diff
==============================================================================
--- jakarta/cactus/trunk/dependencies.xml.default (original)
+++ jakarta/cactus/trunk/dependencies.xml.default Fri Apr 14 18:19:39 2006
@@ -10,7 +10,7 @@
   <aspectj-tools project="aspectj"
       artifact="aspectjtools" version="1.2.1"/>
   <cargo project="cargo"
-      artifact="cargo" version="0.6"/>
+      artifact="cargo" version="0.8"/>
   <checkstyle project="checkstyle"
       artifact="checkstyle" version="3.4"/>
   <clover project="clover"
@@ -44,7 +44,7 @@
   <jsp.20 project="jspapi"
      artifact="jsp-api" version="2.0-20040521"/>
   <jstl project="jstl"
-      artifact="jstl" version="1.0.2"/>
+      artifact="jstl" version="1.0.6"/>
   <junit project="junit"
       artifact="junit" version="3.8.1"/>
   <log4j project="log4j"
@@ -62,7 +62,7 @@
   <servlet.24 project="servletapi"
      artifact="servlet-api" version="2.4-20040521"/>
   <standard project="taglibs"
-     artifact="standard" version="1.0.2"/>
+     artifact="standard" version="1.0.6"/>
   <xerces project="xerces"
       artifact="xercesImpl" version="2.6.2"/>
   <xmlapis project="xerces"

Added: jakarta/cactus/trunk/framework/src/test/eclipse/org/apache/cactus/TestAllOnEclipse.java
URL: http://svn.apache.org/viewcvs/jakarta/cactus/trunk/framework/src/test/eclipse/org/apache/cactus/TestAllOnEclipse.java?rev=394240&view=auto
==============================================================================
--- jakarta/cactus/trunk/framework/src/test/eclipse/org/apache/cactus/TestAllOnEclipse.java (added)
+++ jakarta/cactus/trunk/framework/src/test/eclipse/org/apache/cactus/TestAllOnEclipse.java Fri Apr 14 18:19:39 2006
@@ -0,0 +1,50 @@
+/* 
+ * ========================================================================
+ * 
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ * ========================================================================
+ */
+package org.apache.cactus;
+
+import java.io.File;
+
+import junit.framework.Test;
+
+/**
+ * Class used to run all tests under Eclipse.
+ *
+ * @version $Id: $
+ */
+public class TestAllOnEclipse
+{
+  /**
+   * Sets the testinput.dir property and calls TestAll.suite()
+   * @return a test suite (<code>TestSuite</code>) that includes all methods
+   *         starting with "test"
+   * @throws Exception prpagated from TestShareAll.suite()
+   */
+  public static Test suite() throws Exception
+  {
+    final String inputDir = System.getProperty("testinput.dir");
+    if (inputDir == null) 
+    {
+      final File dir = new File("./src/test-input");
+      final String path = dir.getAbsolutePath();
+      System.setProperty("testinput.dir", path);
+    }
+    return TestShareAll.suite();
+  }
+}

Modified: jakarta/cactus/trunk/integration/ant/.classpath
URL: http://svn.apache.org/viewcvs/jakarta/cactus/trunk/integration/ant/.classpath?rev=394240&r1=394239&r2=394240&view=diff
==============================================================================
--- jakarta/cactus/trunk/integration/ant/.classpath (original)
+++ jakarta/cactus/trunk/integration/ant/.classpath Fri Apr 14 18:19:39 2006
@@ -1,11 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry excluding="**/CVS/" kind="src" path="src/java"/>
+	<classpathentry kind="src" path="src/test"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="MAVEN_REPO/cargo/jars/cargo-0.5.jar"/>
 	<classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.apache.ant_1.6.5/lib/ant.jar"/>
 	<classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.apache.ant_1.6.5/lib/ant-junit.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/commons-logging/jars/commons-logging-1.0.4.jar"/>
 	<classpathentry kind="var" path="MAVEN_REPO/xerces/jars/xercesImpl-2.6.2.jar"/>
+	<classpathentry kind="var" path="JUNIT_HOME/junit.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/mockobjects/jars/mockobjects-core-0.09.jar"/>
+	<classpathentry kind="var" path="MAVEN_REPO/ant/jars/ant-launcher-1.6.5.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

Added: jakarta/cactus/trunk/integration/ant/src/test/org/apache/cactus/integration/ant/TestAllOnEclipse.java
URL: http://svn.apache.org/viewcvs/jakarta/cactus/trunk/integration/ant/src/test/org/apache/cactus/integration/ant/TestAllOnEclipse.java?rev=394240&view=auto
==============================================================================
--- jakarta/cactus/trunk/integration/ant/src/test/org/apache/cactus/integration/ant/TestAllOnEclipse.java (added)
+++ jakarta/cactus/trunk/integration/ant/src/test/org/apache/cactus/integration/ant/TestAllOnEclipse.java Fri Apr 14 18:19:39 2006
@@ -0,0 +1,51 @@
+/* 
+ * ========================================================================
+ * 
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ * ========================================================================
+ */
+package org.apache.cactus.integration.ant;
+
+import java.io.File;
+
+import junit.framework.Test;
+
+/**
+ * Class used to run all tests under Eclipse.
+ *
+ * @version $Id: $
+ */
+public class TestAllOnEclipse 
+{
+  
+  /**
+   * Sets the testinput.dir property and calls TestAll.suite()
+   * @return a test suite (<code>TestSuite</code>) that includes all methods
+   *         starting with "test"
+   */
+  public static Test suite()
+  {
+    final String inputDir = System.getProperty("testinput.dir");
+    if (inputDir == null) 
+    {
+      final File dir = new File("./src/test-input");
+      final String path = dir.getAbsolutePath();
+      System.setProperty("testinput.dir", path);
+    }
+    return TestAll.suite();
+  }
+
+}



---------------------------------------------------------------------
To unsubscribe, e-mail: cactus-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: cactus-dev-help@jakarta.apache.org