cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject svn commit: r1331454 - in /cocoon/cocoon3/trunk: cocoon-sample-webapp/ cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ cocoon-sample-wicket-webapp/src/test/java/org/apache/cocoon/sample/wicket/it/ parent/
Date Fri, 27 Apr 2012 15:02:42 GMT
Author: ilgrosso
Date: Fri Apr 27 15:02:41 2012
New Revision: 1331454

URL: http://svn.apache.org/viewvc?rev=1331454&view=rev
Log:
Using cocoon-it-fw 1.0.0-RC1-SNAPSHOT

Modified:
    cocoon/cocoon3/trunk/cocoon-sample-webapp/pom.xml
    cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/AggregationTest.java
    cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/CachingOfPipelinesTest.java
    cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/CocoonHtmlUnitTestCase.java
    cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ControllerTest.java
    cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ErrorHandlingTest.java
    cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ExpressionLanguageTest.java
    cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/FOPTest.java
    cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/JAXRSTest.java
    cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/MatcherTest.java
    cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ObjectModelTest.java
    cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ProfilingTest.java
    cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ReaderTest.java
    cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/RedirectTest.java
    cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/SaxPipelineTest.java
    cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/SerializersTest.java
    cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ServletServiceTest.java
    cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/WicketTest.java
    cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/XSLTTest.java
    cocoon/cocoon3/trunk/cocoon-sample-wicket-webapp/src/test/java/org/apache/cocoon/sample/wicket/it/SitemapRequestTargetTest.java
    cocoon/cocoon3/trunk/parent/pom.xml

Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/pom.xml?rev=1331454&r1=1331453&r2=1331454&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/pom.xml (original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/pom.xml Fri Apr 27 15:02:41 2012
@@ -20,188 +20,188 @@
 <!-- $Id$ -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-    <modelVersion>4.0.0</modelVersion>
-    <packaging>war</packaging>
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>war</packaging>
 
-    <parent>
-        <groupId>org.apache.cocoon.parent</groupId>
-        <artifactId>cocoon-parent</artifactId>
-        <version>3.0.0-beta-1-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
-    </parent>
-
-    <groupId>org.apache.cocoon.sample-webapp</groupId>
-    <artifactId>cocoon-sample-webapp</artifactId>
-
-    <name>Apache Cocoon 3: Webapplication sample</name>
-    <description>A web application module that contains all samples.</description>
-
-    <build>
+  <parent>
+    <groupId>org.apache.cocoon.parent</groupId>
+    <artifactId>cocoon-parent</artifactId>
+    <version>3.0.0-beta-1-SNAPSHOT</version>
+    <relativePath>../parent/pom.xml</relativePath>
+  </parent>
+
+  <groupId>org.apache.cocoon.sample-webapp</groupId>
+  <artifactId>cocoon-sample-webapp</artifactId>
+
+  <name>Apache Cocoon 3: Webapplication sample</name>
+  <description>A web application module that contains all samples.</description>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>maven-jetty-plugin</artifactId>
+        <configuration>
+          <connectors>
+            <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+              <port>8890</port>
+              <maxIdleTime>30000</maxIdleTime>
+            </connector>
+          </connectors>
+          <webAppSourceDirectory>${project.build.directory}/${project.artifactId}-${project.version}</webAppSourceDirectory>
+          <contextPath>/</contextPath>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>**/cocoon/**</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.cocoon.sample</groupId>
+      <artifactId>cocoon-sample</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.cocoon</groupId>
+      <artifactId>cocoon-it-fw</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <profiles>
+    <profile>
+      <id>it</id>
+      <build>
         <plugins>
-            <plugin>
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>maven-jetty-plugin</artifactId>
+          <!-- Integration tests -->
+          <plugin>
+            <groupId>org.apache.cocoon</groupId>
+            <artifactId>cocoon-it-fw</artifactId>
+            <configuration>
+              <webAppDirectory>./target/cocoon-sample-webapp-${project.version}</webAppDirectory>
+            </configuration>
+            <executions>
+              <execution>
+                <id>jetty-start</id>
+                <goals>
+                  <goal>jetty-start</goal>
+                </goals>
+                <phase>pre-integration-test</phase>
+              </execution>
+              <execution>
+                <id>jetty-stop</id>
+                <goals>
+                  <goal>jetty-stop</goal>
+                </goals>
+                <phase>post-integration-test</phase>
+              </execution>
+            </executions>
+            <dependencies>
+              <dependency>
+                <groupId>net.sourceforge.cobertura</groupId>
+                <artifactId>cobertura</artifactId>
+                <version>1.9.4.1</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <excludes>
+                <exclude>**/cocoon/**</exclude>
+              </excludes>
+              <systemProperties>
+                <property>
+                  <name>htmlunit.base-url</name>
+                  <value>http://localhost:8888</value>
+                </property>
+              </systemProperties>
+            </configuration>
+            <executions>
+              <execution>
+                <id>integration-test</id>
+                <goals>
+                  <goal>test</goal>
+                </goals>
+                <phase>integration-test</phase>
                 <configuration>
-                    <connectors>
-                        <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-                            <port>8890</port>
-                            <maxIdleTime>30000</maxIdleTime>
-                        </connector>
-                    </connectors>
-                    <webAppSourceDirectory>${project.build.directory}/${project.artifactId}-${project.version}</webAppSourceDirectory>
-                    <contextPath>/</contextPath>
+                  <excludes>
+                    <exclude>none</exclude>
+                  </excludes>
+                  <includes>
+                    <include>**/cocoon/**</include>
+                  </includes>
                 </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-surefire-plugin</artifactId>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>cobertura-it</id>
+      <build>
+        <plugins>
+          <!-- Cobertura -->
+          <plugin>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <executions>
+              <execution>
+                <id>cobertura-instrumentation</id>
+                <phase>package</phase>
                 <configuration>
-                    <excludes>
-                        <exclude>**/cocoon/**</exclude>
-                    </excludes>
+                  <tasks>
+                    <property name="plugin_classpath" refid="maven.plugin.classpath"/>
+                    <property name="datafile" value="${basedir}/target/cobertura.ser"/>
+                    <ant antfile="${basedir}/cobertura-ant.xml">
+                      <target name="instrument"/>
+                    </ant>
+                  </tasks>
                 </configuration>
-            </plugin>
-            <plugin>
-                <artifactId>maven-deploy-plugin</artifactId>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+              <execution>
+                <id>cobertura-report</id>
+                <phase>post-integration-test</phase>
                 <configuration>
-                    <skip>true</skip>
+                  <tasks>
+                    <property name="plugin_classpath" refid="maven.plugin.classpath"/>
+                    <property name="datafile" value="${basedir}/target/cobertura.ser"/>
+                    <ant antfile="${basedir}/cobertura-ant.xml">
+                      <target name="report"/>
+                    </ant>
+                  </tasks>
                 </configuration>
-            </plugin>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+            </executions>
+            <dependencies>
+              <dependency>
+                <groupId>net.sourceforge.cobertura</groupId>
+                <artifactId>cobertura</artifactId>
+                <version>1.9.4.1</version>
+              </dependency>
+            </dependencies>
+          </plugin>
         </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.cocoon.sample</groupId>
-            <artifactId>cocoon-sample</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cocoon</groupId>
-            <artifactId>cocoon-it-fw</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <profiles>
-        <profile>
-            <id>it</id>
-            <build>
-                <plugins>
-                    <!-- Integration tests -->
-                    <plugin>
-                        <groupId>org.apache.cocoon</groupId>
-                        <artifactId>cocoon-it-fw</artifactId>
-                        <configuration>
-                            <webAppDirectory>./target/cocoon-sample-webapp-${project.version}</webAppDirectory>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>jetty-start</id>
-                                <goals>
-                                    <goal>jetty-start</goal>
-                                </goals>
-                                <phase>pre-integration-test</phase>
-                            </execution>
-                            <execution>
-                                <id>jetty-stop</id>
-                                <goals>
-                                    <goal>jetty-stop</goal>
-                                </goals>
-                                <phase>post-integration-test</phase>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>net.sourceforge.cobertura</groupId>
-                                <artifactId>cobertura</artifactId>
-                                <version>1.9.4.1</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <excludes>
-                                <exclude>**/cocoon/**</exclude>
-                            </excludes>
-                            <systemProperties>
-                                <property>
-                                    <name>htmlunit.base-url</name>
-                                    <value>http://localhost:8888</value>
-                                </property>
-                            </systemProperties>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>integration-test</id>
-                                <goals>
-                                    <goal>test</goal>
-                                </goals>
-                                <phase>integration-test</phase>
-                                <configuration>
-                                    <excludes>
-                                        <exclude>none</exclude>
-                                    </excludes>
-                                    <includes>
-                                        <include>**/cocoon/**</include>
-                                    </includes>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>cobertura-it</id>
-            <build>
-                <plugins>
-                    <!-- Cobertura -->
-                    <plugin>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>cobertura-instrumentation</id>
-                                <phase>package</phase>
-                                <configuration>
-                                    <tasks>
-                                        <property name="plugin_classpath" refid="maven.plugin.classpath"/>
-                                        <property name="datafile" value="${basedir}/target/cobertura.ser"/>
-                                        <ant antfile="${basedir}/cobertura-ant.xml">
-                                            <target name="instrument"/>
-                                        </ant>
-                                    </tasks>
-                                </configuration>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <id>cobertura-report</id>
-                                <phase>post-integration-test</phase>
-                                <configuration>
-                                    <tasks>
-                                        <property name="plugin_classpath" refid="maven.plugin.classpath"/>
-                                        <property name="datafile" value="${basedir}/target/cobertura.ser"/>
-                                        <ant antfile="${basedir}/cobertura-ant.xml">
-                                            <target name="report"/>
-                                        </ant>
-                                    </tasks>
-                                </configuration>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <dependencies>
-                            <dependency>
-                                <groupId>net.sourceforge.cobertura</groupId>
-                                <artifactId>cobertura</artifactId>
-                                <version>1.9.4.1</version>
-                            </dependency>
-                        </dependencies>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+      </build>
+    </profile>
+  </profiles>
 </project>

Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/AggregationTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/AggregationTest.java?rev=1331454&r1=1331453&r2=1331454&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/AggregationTest.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/AggregationTest.java
Fri Apr 27 15:02:41 2012
@@ -16,6 +16,8 @@
  */
 package org.apache.cocoon.it;
 
+import static org.junit.Assert.*;
+
 /**
  * Test aggregation.
  */

Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/CachingOfPipelinesTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/CachingOfPipelinesTest.java?rev=1331454&r1=1331453&r2=1331454&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/CachingOfPipelinesTest.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/CachingOfPipelinesTest.java
Fri Apr 27 15:02:41 2012
@@ -16,6 +16,7 @@
  */
 package org.apache.cocoon.it;
 
+import static org.junit.Assert.*;
 import org.apache.cocoon.sample.generation.CachingTimestampGenerator;
 import org.apache.cocoon.sample.generation.TimestampGenerator;
 

Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/CocoonHtmlUnitTestCase.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/CocoonHtmlUnitTestCase.java?rev=1331454&r1=1331453&r2=1331454&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/CocoonHtmlUnitTestCase.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/CocoonHtmlUnitTestCase.java
Fri Apr 27 15:02:41 2012
@@ -16,6 +16,8 @@
  */
 package org.apache.cocoon.it;
 
+import static org.junit.Assert.*;
+
 import com.gargoylesoftware.htmlunit.SubmitMethod;
 import com.gargoylesoftware.htmlunit.WebRequestSettings;
 import java.net.URL;

Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ControllerTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ControllerTest.java?rev=1331454&r1=1331453&r2=1331454&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ControllerTest.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ControllerTest.java
Fri Apr 27 15:02:41 2012
@@ -16,6 +16,7 @@
  */
 package org.apache.cocoon.it;
 
+import static org.junit.Assert.*;
 import org.apache.commons.httpclient.methods.HeadMethod;
 
 /**

Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ErrorHandlingTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ErrorHandlingTest.java?rev=1331454&r1=1331453&r2=1331454&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ErrorHandlingTest.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ErrorHandlingTest.java
Fri Apr 27 15:02:41 2012
@@ -16,6 +16,8 @@
  */
 package org.apache.cocoon.it;
 
+import static org.junit.Assert.*;
+
 /**
  * Test error handling of sitemaps.
  */

Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ExpressionLanguageTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ExpressionLanguageTest.java?rev=1331454&r1=1331453&r2=1331454&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ExpressionLanguageTest.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ExpressionLanguageTest.java
Fri Apr 27 15:02:41 2012
@@ -16,6 +16,8 @@
  */
 package org.apache.cocoon.it;
 
+import static org.junit.Assert.*;
+
 /**
  * Test expression language usage
  */

Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/FOPTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/FOPTest.java?rev=1331454&r1=1331453&r2=1331454&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/FOPTest.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/FOPTest.java
Fri Apr 27 15:02:41 2012
@@ -16,6 +16,7 @@
  */
 package org.apache.cocoon.it;
 
+import static org.junit.Assert.*;
 import org.apache.commons.io.IOUtils;
 
 /**

Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/JAXRSTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/JAXRSTest.java?rev=1331454&r1=1331453&r2=1331454&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/JAXRSTest.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/JAXRSTest.java
Fri Apr 27 15:02:41 2012
@@ -16,6 +16,8 @@
  */
 package org.apache.cocoon.it;
 
+import static org.junit.Assert.*;
+
 /**
  * Test the usage of JAX-RS services.
  */

Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/MatcherTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/MatcherTest.java?rev=1331454&r1=1331453&r2=1331454&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/MatcherTest.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/MatcherTest.java
Fri Apr 27 15:02:41 2012
@@ -16,6 +16,8 @@
  */
 package org.apache.cocoon.it;
 
+import static org.junit.Assert.*;
+
 /**
  * Testing advanced matching scenarios.
  */

Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ObjectModelTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ObjectModelTest.java?rev=1331454&r1=1331453&r2=1331454&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ObjectModelTest.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ObjectModelTest.java
Fri Apr 27 15:02:41 2012
@@ -16,6 +16,7 @@
  */
 package org.apache.cocoon.it;
 
+import static org.junit.Assert.*;
 import org.custommonkey.xmlunit.Diff;
 
 /**

Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ProfilingTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ProfilingTest.java?rev=1331454&r1=1331453&r2=1331454&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ProfilingTest.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ProfilingTest.java
Fri Apr 27 15:02:41 2012
@@ -16,6 +16,8 @@
  */
 package org.apache.cocoon.it;
 
+import static org.junit.Assert.*;
+
 /**
  * Test profiling.
  */

Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ReaderTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ReaderTest.java?rev=1331454&r1=1331453&r2=1331454&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ReaderTest.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ReaderTest.java
Fri Apr 27 15:02:41 2012
@@ -16,6 +16,8 @@
  */
 package org.apache.cocoon.it;
 
+import static org.junit.Assert.*;
+
 /**
  * Test readers
  */

Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/RedirectTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/RedirectTest.java?rev=1331454&r1=1331453&r2=1331454&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/RedirectTest.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/RedirectTest.java
Fri Apr 27 15:02:41 2012
@@ -16,6 +16,8 @@
  */
 package org.apache.cocoon.it;
 
+import static org.junit.Assert.*;
+
 /**
  * Test redirecting
  */

Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/SaxPipelineTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/SaxPipelineTest.java?rev=1331454&r1=1331453&r2=1331454&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/SaxPipelineTest.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/SaxPipelineTest.java
Fri Apr 27 15:02:41 2012
@@ -16,6 +16,7 @@
  */
 package org.apache.cocoon.it;
 
+import static org.junit.Assert.*;
 import org.apache.commons.httpclient.methods.HeadMethod;
 
 /**

Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/SerializersTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/SerializersTest.java?rev=1331454&r1=1331453&r2=1331454&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/SerializersTest.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/SerializersTest.java
Fri Apr 27 15:02:41 2012
@@ -16,6 +16,8 @@
  */
 package org.apache.cocoon.it;
 
+import static org.junit.Assert.*;
+
 /**
  * Test the serializers components.
  */

Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ServletServiceTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ServletServiceTest.java?rev=1331454&r1=1331453&r2=1331454&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ServletServiceTest.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/ServletServiceTest.java
Fri Apr 27 15:02:41 2012
@@ -16,6 +16,8 @@
  */
 package org.apache.cocoon.it;
 
+import static org.junit.Assert.*;
+
 /**
  * Test the usage of servlet services in Cocoon sitemaps.
  */

Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/WicketTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/WicketTest.java?rev=1331454&r1=1331453&r2=1331454&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/WicketTest.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/WicketTest.java
Fri Apr 27 15:02:41 2012
@@ -16,6 +16,8 @@
  */
 package org.apache.cocoon.it;
 
+import static org.junit.Assert.*;
+
 /**
  * Test the Cocoon-Wicket integration
  */

Modified: cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/XSLTTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/XSLTTest.java?rev=1331454&r1=1331453&r2=1331454&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/XSLTTest.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-sample-webapp/src/test/java/org/apache/cocoon/it/XSLTTest.java
Fri Apr 27 15:02:41 2012
@@ -16,6 +16,8 @@
  */
 package org.apache.cocoon.it;
 
+import static org.junit.Assert.*;
+
 /**
  * Test XSLT transformation.
  */

Modified: cocoon/cocoon3/trunk/cocoon-sample-wicket-webapp/src/test/java/org/apache/cocoon/sample/wicket/it/SitemapRequestTargetTest.java
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/cocoon-sample-wicket-webapp/src/test/java/org/apache/cocoon/sample/wicket/it/SitemapRequestTargetTest.java?rev=1331454&r1=1331453&r2=1331454&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/cocoon-sample-wicket-webapp/src/test/java/org/apache/cocoon/sample/wicket/it/SitemapRequestTargetTest.java
(original)
+++ cocoon/cocoon3/trunk/cocoon-sample-wicket-webapp/src/test/java/org/apache/cocoon/sample/wicket/it/SitemapRequestTargetTest.java
Fri Apr 27 15:02:41 2012
@@ -16,6 +16,8 @@
  */
 package org.apache.cocoon.sample.wicket.it;
 
+import static org.junit.Assert.*;
+
 /**
  * Wicket/Cocoon-Sitemap integration tests
  */

Modified: cocoon/cocoon3/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cocoon/cocoon3/trunk/parent/pom.xml?rev=1331454&r1=1331453&r2=1331454&view=diff
==============================================================================
--- cocoon/cocoon3/trunk/parent/pom.xml (original)
+++ cocoon/cocoon3/trunk/parent/pom.xml Fri Apr 27 15:02:41 2012
@@ -619,7 +619,7 @@
       <dependency>
         <groupId>org.apache.cocoon</groupId>
         <artifactId>cocoon-it-fw</artifactId>
-        <version>1.0.0-M1</version>
+        <version>1.0.0-RC1-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
       <dependency>



Mime
View raw message