Author: mgrigorov
Date: Mon Dec 19 12:49:00 2011
New Revision: 1220722
URL: http://svn.apache.org/viewvc?rev=1220722&view=rev
Log:
WICKET-4281
Simplify Maven build for development
merge r1220682 and r1220690 from 1.5.x
Added:
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/SlowTests.java
- copied unchanged from r1220690,
wicket/branches/wicket-1.5.x/wicket-util/src/main/java/org/apache/wicket/util/SlowTests.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/
- copied from r1220690,
wicket/branches/wicket-1.5.x/wicket-util/src/main/java/org/apache/wicket/util/license/
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
- copied unchanged from r1220690,
wicket/branches/wicket-1.5.x/wicket-util/src/main/java/org/apache/wicket/util/license/AbstractLicenseHeaderHandler.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java
- copied unchanged from r1220690,
wicket/branches/wicket-1.5.x/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenceHeaderTest.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java
- copied unchanged from r1220690,
wicket/branches/wicket-1.5.x/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java
- copied unchanged from r1220690,
wicket/branches/wicket-1.5.x/wicket-util/src/main/java/org/apache/wicket/util/license/CssLicenseHeaderHandler.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/HtmlLicenseHeaderHandler.java
- copied unchanged from r1220690,
wicket/branches/wicket-1.5.x/wicket-util/src/main/java/org/apache/wicket/util/license/HtmlLicenseHeaderHandler.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/ILicenseHeaderHandler.java
- copied unchanged from r1220690,
wicket/branches/wicket-1.5.x/wicket-util/src/main/java/org/apache/wicket/util/license/ILicenseHeaderHandler.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
- copied unchanged from r1220690,
wicket/branches/wicket-1.5.x/wicket-util/src/main/java/org/apache/wicket/util/license/JavaLicenseHeaderHandler.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/JavaScriptLicenseHeaderHandler.java
- copied unchanged from r1220690,
wicket/branches/wicket-1.5.x/wicket-util/src/main/java/org/apache/wicket/util/license/JavaScriptLicenseHeaderHandler.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java
- copied unchanged from r1220690,
wicket/branches/wicket-1.5.x/wicket-util/src/main/java/org/apache/wicket/util/license/PropertiesLicenseHeaderHandler.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java
- copied unchanged from r1220690,
wicket/branches/wicket-1.5.x/wicket-util/src/main/java/org/apache/wicket/util/license/VelocityLicenseHeaderHandler.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
- copied unchanged from r1220690,
wicket/branches/wicket-1.5.x/wicket-util/src/main/java/org/apache/wicket/util/license/XmlLicenseHeaderHandler.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/XmlPrologHeaderHandler.java
- copied unchanged from r1220690,
wicket/branches/wicket-1.5.x/wicket-util/src/main/java/org/apache/wicket/util/license/XmlPrologHeaderHandler.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/cssLicense.txt
- copied unchanged from r1220690,
wicket/branches/wicket-1.5.x/wicket-util/src/main/java/org/apache/wicket/util/license/cssLicense.txt
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/javaLicense.txt
- copied unchanged from r1220690,
wicket/branches/wicket-1.5.x/wicket-util/src/main/java/org/apache/wicket/util/license/javaLicense.txt
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/javaScriptLicense.txt
- copied unchanged from r1220690,
wicket/branches/wicket-1.5.x/wicket-util/src/main/java/org/apache/wicket/util/license/javaScriptLicense.txt
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/propertiesLicense.txt
- copied unchanged from r1220690,
wicket/branches/wicket-1.5.x/wicket-util/src/main/java/org/apache/wicket/util/license/propertiesLicense.txt
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/velocityLicense.txt
- copied unchanged from r1220690,
wicket/branches/wicket-1.5.x/wicket-util/src/main/java/org/apache/wicket/util/license/velocityLicense.txt
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/license/xmlLicense.txt
- copied unchanged from r1220690,
wicket/branches/wicket-1.5.x/wicket-util/src/main/java/org/apache/wicket/util/license/xmlLicense.txt
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/
- copied from r1220690,
wicket/branches/wicket-1.5.x/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java
- copied unchanged from r1220690,
wicket/branches/wicket-1.5.x/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/xhtml-lat1.ent
- copied unchanged from r1220690,
wicket/branches/wicket-1.5.x/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/xhtml-lat1.ent
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/xhtml-special.ent
- copied unchanged from r1220690,
wicket/branches/wicket-1.5.x/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/xhtml-special.ent
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/xhtml-symbol.ent
- copied unchanged from r1220690,
wicket/branches/wicket-1.5.x/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/xhtml-symbol.ent
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/xhtml1-strict.dtd
- copied unchanged from r1220690,
wicket/branches/wicket-1.5.x/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/xhtml1-strict.dtd
wicket/trunk/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/xhtml1-transitional.dtd
- copied unchanged from r1220690,
wicket/branches/wicket-1.5.x/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/xhtml1-transitional.dtd
Removed:
wicket/trunk/wicket-util/src/test/java/org/apache/wicket/util/license/
wicket/trunk/wicket-util/src/test/java/org/apache/wicket/util/markup/xhtml/
Modified:
wicket/trunk/ (props changed)
wicket/trunk/pom.xml
wicket/trunk/testing/wicket-threadtest/pom.xml
wicket/trunk/wicket-auth-roles/pom.xml
wicket/trunk/wicket-core/ (props changed)
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/page/PageAccessSynchronizerTest.java
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/protocol/http/StoredResponsesMapTest.java
wicket/trunk/wicket-datetime/pom.xml
wicket/trunk/wicket-devutils/pom.xml (contents, props changed)
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/
(props changed)
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/stateless/
(props changed)
wicket/trunk/wicket-devutils/src/test/java/org/apache/wicket/devutils/stateless/
(props changed)
wicket/trunk/wicket-examples/ (props changed)
wicket/trunk/wicket-extensions/ (props changed)
wicket/trunk/wicket-extensions/pom.xml
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js
(props changed)
wicket/trunk/wicket-guice/pom.xml
wicket/trunk/wicket-ioc/pom.xml
wicket/trunk/wicket-jmx/pom.xml
wicket/trunk/wicket-request/pom.xml
wicket/trunk/wicket-spring/pom.xml
wicket/trunk/wicket-util/pom.xml
wicket/trunk/wicket-velocity/pom.xml
Propchange: wicket/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 19 12:49:00 2011
@@ -1,4 +1,4 @@
/wicket/branches/wicket-1.4.x:963681,1027877
-/wicket/branches/wicket-1.5.x:1208735,1209203,1210042,1210691,1211532
+/wicket/branches/wicket-1.5.x:1208735,1209203,1210042,1210691,1211532,1220682,1220690
/wicket/sandbox/jthomerson/experimental/wicket-devutils:760296-760351,760353-760355
/wicket/trunk/wicket-devutils:760352
Modified: wicket/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/pom.xml?rev=1220722&r1=1220721&r2=1220722&view=diff
==============================================================================
--- wicket/trunk/pom.xml (original)
+++ wicket/trunk/pom.xml Mon Dec 19 12:49:00 2011
@@ -32,54 +32,43 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jetty.version>7.4.2.v20110526</jetty.version>
<spring.version>3.0.6.RELEASE</spring.version>
+ <maven.javadoc.version>2.8</maven.javadoc.version>
+ <maven.surefire.version>2.11</maven.surefire.version>
</properties>
+
+ <modules>
+ <module>wicket</module>
+ <module>wicket-core</module>
+ <module>wicket-util</module>
+ <module>wicket-datetime</module>
+ <module>wicket-request</module>
+ <module>wicket-devutils</module>
+ <module>wicket-extensions</module>
+ <module>wicket-ioc</module>
+ <module>wicket-spring</module>
+ <module>wicket-velocity</module>
+ <module>wicket-auth-roles</module>
+ <module>wicket-guice</module>
+ <module>wicket-jmx</module>
+ <module>wicket-objectssizeof-agent</module>
+ <module>wicket-examples</module>
+ <module>archetypes/quickstart</module>
+ </modules>
+
<profiles>
<profile>
<id>release</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
- <!--
- modules parent and parent are defined not to
process their
- submodules: their release profile is empty.
This way we can
- define which projects to release with a Wicket
release from
- the parent.
- -->
- <modules>
- <module>wicket</module>
- <module>wicket-core</module>
- <module>wicket-util</module>
- <module>wicket-datetime</module>
- <module>wicket-request</module>
- <module>wicket-devutils</module>
- <module>wicket-extensions</module>
- <module>wicket-ioc</module>
- <module>wicket-spring</module>
- <module>wicket-velocity</module>
- <module>wicket-auth-roles</module>
- <module>wicket-guice</module>
- <module>wicket-jmx</module>
- <module>wicket-objectssizeof-agent</module>
- <module>wicket-examples</module>
- <module>archetypes/quickstart</module>
- </modules>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-assembly-plugin</artifactId>
- <inherited>true</inherited>
- </plugin>
- <plugin>
-
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
-
<artifactId>maven-remote-resources-plugin</artifactId>
- <inherited>true</inherited>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<inherited>true</inherited>
@@ -87,21 +76,6 @@
<aggregate>true</aggregate>
</configuration>
</plugin>
- <plugin>
-
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-source-plugin</artifactId>
- <inherited>true</inherited>
- </plugin>
- <plugin>
-
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-surefire-plugin</artifactId>
- <inherited>true</inherited>
- </plugin>
- <plugin>
-
<groupId>org.apache.felix</groupId>
-
<artifactId>maven-bundle-plugin</artifactId>
- <inherited>true</inherited>
- </plugin>
</plugins>
</build>
<distributionManagement>
@@ -116,84 +90,50 @@
<activation>
<activeByDefault>false</activeByDefault>
</activation>
- <modules>
- <module>wicket</module>
- <module>wicket-core</module>
- <module>wicket-util</module>
- <module>wicket-datetime</module>
- <module>wicket-request</module>
- <module>wicket-devutils</module>
- <module>wicket-extensions</module>
- <module>wicket-ioc</module>
- <module>wicket-spring</module>
- <module>wicket-velocity</module>
- <module>wicket-auth-roles</module>
- <module>wicket-guice</module>
- <module>wicket-jmx</module>
- <module>wicket-objectssizeof-agent</module>
- <module>wicket-examples</module>
- <module>archetypes/quickstart</module>
- </modules>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-assembly-plugin</artifactId>
- <inherited>true</inherited>
- </plugin>
- <plugin>
-
<artifactId>maven-remote-resources-plugin</artifactId>
+
<artifactId>maven-javadoc-plugin</artifactId>
<inherited>true</inherited>
</plugin>
+ </plugins>
+ </build>
+ <!-- distribution management is inherited from the
parent pom -->
+ </profile>
+ <profile>
+ <id>all</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ </profile>
+ <profile>
+ <id>fast</id>
+ <build>
+ <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-javadoc-plugin</artifactId>
- <inherited>true</inherited>
+
<artifactId>maven-surefire-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+
<excludedGroups>org.apache.wicket.util.SlowTests</excludedGroups>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
- <inherited>true</inherited>
+ <inherited>false</inherited>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
-
<artifactId>maven-surefire-plugin</artifactId>
- <inherited>true</inherited>
- </plugin>
- <plugin>
-
<groupId>org.apache.felix</groupId>
-
<artifactId>maven-bundle-plugin</artifactId>
- <inherited>true</inherited>
+
<artifactId>maven-javadoc-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
</plugin>
</plugins>
</build>
- <!-- distribution management is inherited from the
parent pom -->
- </profile>
- <profile>
- <id>all</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>wicket</module>
- <module>wicket-core</module>
- <module>wicket-util</module>
- <module>wicket-datetime</module>
- <module>wicket-request</module>
- <module>wicket-devutils</module>
- <module>wicket-extensions</module>
- <module>wicket-ioc</module>
- <module>wicket-spring</module>
- <module>wicket-velocity</module>
- <module>wicket-auth-roles</module>
- <module>wicket-guice</module>
- <module>wicket-jmx</module>
- <module>wicket-objectssizeof-agent</module>
- <module>wicket-examples</module>
- <module>archetypes/quickstart</module>
- <module>testing/wicket-threadtest</module>
- </modules>
- <!-- distribution management is inherited from the
parent pom -->
</profile>
</profiles>
<url>http://wicket.apache.org/${project.artifactId}</url>
@@ -547,11 +487,25 @@
</testResources>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <inherited>true</inherited>
+ </plugin>
+ <plugin>
+
<artifactId>maven-remote-resources-plugin</artifactId>
+ <inherited>true</inherited>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <inherited>true</inherited>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>clirr-maven-plugin</artifactId>
<version>2.3</version>
<configuration>
-
<comparisonVersion>1.5.2</comparisonVersion>
+
<comparisonVersion>1.5.3</comparisonVersion>
<failOnError>false</failOnError>
<logResults>true</logResults>
<!-- disabled until we start the
release candidates -->
@@ -570,11 +524,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <inherited>true</inherited>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<inherited>true</inherited>
</plugin>
@@ -593,6 +542,12 @@
<artifactId>maven-bundle-plugin</artifactId>
<inherited>true</inherited>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${maven.javadoc.version}</version>
+ <inherited>true</inherited>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
@@ -681,21 +636,11 @@
</manifestEntries>
</archive>
</configuration>
- <executions>
- <execution>
- <goals>
-
<goal>test-jar</goal>
- </goals>
- <configuration>
-
<useDefaultManifestFile>false</useDefaultManifestFile>
- </configuration>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8</version>
+
<version>${maven.javadoc.version}</version>
<configuration>
<minmemory>128m</minmemory>
<maxmemory>256m</maxmemory>
@@ -736,17 +681,24 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.10</version>
+
<version>${maven.surefire.version}</version>
<configuration>
<includes>
<include>**/*Test.java</include>
</includes>
</configuration>
+ <dependencies>
+ <dependency> <!-- force 4.7
runner to enable excludedGroups on Categories (& parallel) -->
+
<groupId>org.apache.maven.surefire</groupId>
+
<artifactId>surefire-junit47</artifactId>
+
<version>${maven.surefire.version}</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.10</version>
+
<version>${maven.surefire.version}</version>
</plugin>
<plugin>
<groupId>org.mortbay.jetty</groupId>
@@ -828,7 +780,7 @@
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8</version>
+ <version>${maven.javadoc.version}</version>
</plugin>
</plugins>
</reporting>
Modified: wicket/trunk/testing/wicket-threadtest/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/testing/wicket-threadtest/pom.xml?rev=1220722&r1=1220721&r2=1220722&view=diff
==============================================================================
--- wicket/trunk/testing/wicket-threadtest/pom.xml (original)
+++ wicket/trunk/testing/wicket-threadtest/pom.xml Mon Dec 19 12:49:00 2011
@@ -37,13 +37,6 @@
<artifactId>wicket-extensions</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-util</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>org.eclipse.jetty.aggregate</groupId>
<artifactId>jetty-all-server</artifactId>
</dependency>
Modified: wicket/trunk/wicket-auth-roles/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-auth-roles/pom.xml?rev=1220722&r1=1220721&r2=1220722&view=diff
==============================================================================
--- wicket/trunk/wicket-auth-roles/pom.xml (original)
+++ wicket/trunk/wicket-auth-roles/pom.xml Mon Dec 19 12:49:00 2011
@@ -35,12 +35,5 @@
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-util</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
- <version>${project.version}</version>
- </dependency>
</dependencies>
</project>
Propchange: wicket/trunk/wicket-core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 19 12:49:00 2011
@@ -1,6 +1,6 @@
/wicket/branches/wicket-1.3.x/jdk-1.4/wicket:653208,653212,653215,653226,653231,654304,655446,655466,655786,658141,658189,659118,659120,662360,663058,671549,671885,687144-688996,698530-698577,701132-701133,701843,701850-701877,704231,708127,722099-722105,726536,728467-728490,731960,734478,739647,739951,745468-745497,749817,755171-755176,759905,760374,764756,769389,769440,774373,781715,781719,790879
/wicket/branches/wicket-1.4.x/wicket:963681,998663,1005194-1005196,1005201,1005205,1024347,1027877
-/wicket/branches/wicket-1.5.x/wicket-core:1208735,1209203,1211532
+/wicket/branches/wicket-1.5.x/wicket-core:1208735,1209203,1211532,1220682,1220690
/wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket:760296-760351,760353-760355
/wicket/trunk/wicket:1005201
/wicket/trunk/wicket-devutils/wicket:760352
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/page/PageAccessSynchronizerTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/page/PageAccessSynchronizerTest.java?rev=1220722&r1=1220721&r2=1220722&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/page/PageAccessSynchronizerTest.java
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/page/PageAccessSynchronizerTest.java
Mon Dec 19 12:49:00 2011
@@ -23,12 +23,14 @@ import java.util.concurrent.atomic.Atomi
import org.apache.wicket.MockPage;
import org.apache.wicket.mock.MockPageManager;
import org.apache.wicket.page.PageAccessSynchronizer.PageLock;
+import org.apache.wicket.util.SlowTests;
import org.apache.wicket.util.lang.WicketObjects;
import org.apache.wicket.util.time.Duration;
import org.apache.wicket.util.time.Time;
import org.junit.Assert;
import org.junit.Rule;
import org.junit.Test;
+import org.junit.experimental.categories.Category;
import org.junit.rules.MethodRule;
import org.junit.rules.Timeout;
import org.slf4j.Logger;
@@ -36,6 +38,7 @@ import org.slf4j.LoggerFactory;
/**
*/
+@Category(SlowTests.class)
public class PageAccessSynchronizerTest extends Assert
{
private static final Logger logger =
LoggerFactory.getLogger(PageAccessSynchronizerTest.class);
Modified:
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/protocol/http/StoredResponsesMapTest.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/protocol/http/StoredResponsesMapTest.java?rev=1220722&r1=1220721&r2=1220722&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/protocol/http/StoredResponsesMapTest.java
(original)
+++
wicket/trunk/wicket-core/src/test/java/org/apache/wicket/protocol/http/StoredResponsesMapTest.java
Mon Dec 19 12:49:00 2011
@@ -22,6 +22,7 @@ import java.util.concurrent.CopyOnWriteA
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+import org.apache.wicket.util.SlowTests;
import org.apache.wicket.util.time.Duration;
import org.junit.Assert;
import org.junit.Ignore;
@@ -31,6 +32,7 @@ import org.junit.experimental.categories
/**
* @see <a
href="https://issues.apache.org/jira/browse/WICKET-3209";>WICKET-3209</a>
*/
+@Category(SlowTests.class)
public class StoredResponsesMapTest extends Assert
{
/**
@@ -92,7 +94,6 @@ public class StoredResponsesMapTest exte
* @throws InterruptedException
*/
@Test
- @Ignore
public void heavyLoad() throws InterruptedException
{
final int numberOfThreads = 100;
Modified: wicket/trunk/wicket-datetime/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-datetime/pom.xml?rev=1220722&r1=1220721&r2=1220722&view=diff
==============================================================================
--- wicket/trunk/wicket-datetime/pom.xml (original)
+++ wicket/trunk/wicket-datetime/pom.xml Mon Dec 19 12:49:00 2011
@@ -37,13 +37,6 @@
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-util</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
- <version>${project.version}</version>
- </dependency>
</dependencies>
<build>
<plugins>
Modified: wicket/trunk/wicket-devutils/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-devutils/pom.xml?rev=1220722&r1=1220721&r2=1220722&view=diff
==============================================================================
--- wicket/trunk/wicket-devutils/pom.xml (original)
+++ wicket/trunk/wicket-devutils/pom.xml Mon Dec 19 12:49:00 2011
@@ -40,12 +40,5 @@
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-extensions</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-util</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
- <version>${project.version}</version>
- </dependency>
</dependencies>
</project>
Propchange: wicket/trunk/wicket-devutils/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 19 12:49:00 2011
@@ -1,4 +1,5 @@
/wicket/branches/wicket-1.3.x/jdk-1.4/wicket-extensions/pom.xml:659248,661657,662360,677853,688992,698612,700502,701879,725634
/wicket/branches/wicket-1.4.x/wicket-devutils/pom.xml:963681
+/wicket/branches/wicket-1.5.x/wicket-devutils/pom.xml:1220682,1220690
/wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/pom.xml:760353-760355
/wicket/trunk/wicket-devutils/wicket-devutils/pom.xml:760352
Propchange:
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 19 12:49:00 2011
@@ -1,4 +1,5 @@
/wicket/branches/wicket-1.3.x/jdk-1.5/wicket-examples/src/main/java/org/apache/wicket/examples/debug:653211
/wicket/branches/wicket-1.4.x/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector:963681
+/wicket/branches/wicket-1.5.x/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector:1220682,1220690
/wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector:760353-760355
/wicket/trunk/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector:760352
Propchange:
wicket/trunk/wicket-devutils/src/main/java/org/apache/wicket/devutils/stateless/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 19 12:49:00 2011
@@ -1,4 +1,5 @@
/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/main/java/org/apache/wicket/annotations:653208,653212,653215,653226,653231,654304,655446,655466,655786,658141,658189,659118,659120,662360,663058,671549,671885,687144-688996,698530-698577,701132-701133,701843,701850-701877,704231,708127,722099-722105,726536,728467-728490,731960,734478,739647,739951,745468-745497,749817,755171-755176,759905
/wicket/branches/wicket-1.4.x/wicket-devutils/src/main/java/org/apache/wicket/devutils/stateless:963681
+/wicket/branches/wicket-1.5.x/wicket-devutils/src/main/java/org/apache/wicket/devutils/stateless:1220682,1220690
/wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/stateless:760353-760355
/wicket/trunk/wicket-devutils/wicket-devutils/src/main/java/org/apache/wicket/devutils/stateless:760352
Propchange:
wicket/trunk/wicket-devutils/src/test/java/org/apache/wicket/devutils/stateless/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 19 12:49:00 2011
@@ -1,4 +1,5 @@
/wicket/branches/wicket-1.3.x/jdk-1.4/wicket/src/test/java/org/apache/wicket/annotations:653208,653212,653215,653226,653231,654304,655446,655466,655786,658141,658189,659118,659120,662360,663058,671549,671885,687144-688996,698530-698577,701132-701133,701843,701850-701877,704231,708127,722099-722105,726536,728467-728490,731960,734478,739647,739951,745468-745497,749817,755171-755176,759905
/wicket/branches/wicket-1.4.x/wicket-devutils/src/test/java/org/apache/wicket/devutils/stateless:963681
+/wicket/branches/wicket-1.5.x/wicket-devutils/src/test/java/org/apache/wicket/devutils/stateless:1220682,1220690
/wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-devutils/src/test/java/org/apache/wicket/devutils/stateless:760353-760355
/wicket/trunk/wicket-devutils/wicket-devutils/src/test/java/org/apache/wicket/devutils/stateless:760352
Propchange: wicket/trunk/wicket-examples/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 19 12:49:00 2011
@@ -1,5 +1,5 @@
/wicket/branches/wicket-1.3.x/jdk-1.5/wicket-examples:653211
/wicket/branches/wicket-1.4.x/wicket-examples:963681,1027877
-/wicket/branches/wicket-1.5.x/wicket-examples:1210042
+/wicket/branches/wicket-1.5.x/wicket-examples:1210042,1220682,1220690
/wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-examples:760296-760351,760353-760355
/wicket/trunk/wicket-devutils/wicket-examples:760352
Propchange: wicket/trunk/wicket-extensions/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 19 12:49:00 2011
@@ -1,5 +1,5 @@
/wicket/branches/wicket-1.3.x/jdk-1.4/wicket-extensions:659248,661657,662360,677853,688992,698612,700502,701879,725634,760368,769440,772653,786424,790850
/wicket/branches/wicket-1.4.x/wicket-extensions:963681,1206142,1206154,1214748
-/wicket/branches/wicket-1.5.x/wicket-extensions:1204465,1206145,1206158,1214750
+/wicket/branches/wicket-1.5.x/wicket-extensions:1204465,1206145,1206158,1214750,1220682,1220690
/wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-extensions:760296-760351,760353-760355
/wicket/trunk/wicket-devutils/wicket-extensions:760352
Modified: wicket/trunk/wicket-extensions/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/pom.xml?rev=1220722&r1=1220721&r2=1220722&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/pom.xml (original)
+++ wicket/trunk/wicket-extensions/pom.xml Mon Dec 19 12:49:00 2011
@@ -33,13 +33,6 @@
<artifactId>wicket-core</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-util</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
- <version>${project.version}</version>
- </dependency>
- <dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>1.8.5</version>
Propchange:
wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 19 12:49:00 2011
@@ -1,5 +1,5 @@
/wicket/branches/wicket-1.3.x/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js:659248,661657,662360,677853,688992,698612,700502,701879,725634,760368,769440,772653,786424,790850
/wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js:806204-1055573
-/wicket/branches/wicket-1.5.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js:1205846,1205853,1205857,1205860,1205874,1205876,1205900,1206223,1206701,1206703,1206715
+/wicket/branches/wicket-1.5.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js:1205846,1205853,1205857,1205860,1205874,1205876,1205900,1206223,1206701,1206703,1206715,1220682,1220690
/wicket/sandbox/jthomerson/experimental/wicket-devutils/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js:760296-760351,760353-760355
/wicket/trunk/wicket-devutils/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/form/upload/progressbar.js:760352
Modified: wicket/trunk/wicket-guice/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-guice/pom.xml?rev=1220722&r1=1220721&r2=1220722&view=diff
==============================================================================
--- wicket/trunk/wicket-guice/pom.xml (original)
+++ wicket/trunk/wicket-guice/pom.xml Mon Dec 19 12:49:00 2011
@@ -43,12 +43,5 @@
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-util</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
- <version>${project.version}</version>
- </dependency>
</dependencies>
</project>
Modified: wicket/trunk/wicket-ioc/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-ioc/pom.xml?rev=1220722&r1=1220721&r2=1220722&view=diff
==============================================================================
--- wicket/trunk/wicket-ioc/pom.xml (original)
+++ wicket/trunk/wicket-ioc/pom.xml Mon Dec 19 12:49:00 2011
@@ -44,12 +44,5 @@
<groupId>easymock</groupId>
<artifactId>easymock</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-util</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
- <version>${project.version}</version>
- </dependency>
</dependencies>
</project>
Modified: wicket/trunk/wicket-jmx/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-jmx/pom.xml?rev=1220722&r1=1220721&r2=1220722&view=diff
==============================================================================
--- wicket/trunk/wicket-jmx/pom.xml (original)
+++ wicket/trunk/wicket-jmx/pom.xml Mon Dec 19 12:49:00 2011
@@ -32,12 +32,5 @@
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-util</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
- <version>${project.version}</version>
- </dependency>
</dependencies>
</project>
Modified: wicket/trunk/wicket-request/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-request/pom.xml?rev=1220722&r1=1220721&r2=1220722&view=diff
==============================================================================
--- wicket/trunk/wicket-request/pom.xml (original)
+++ wicket/trunk/wicket-request/pom.xml Mon Dec 19 12:49:00 2011
@@ -15,27 +15,23 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<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>
- <parent>
- <artifactId>wicket-parent</artifactId>
- <groupId>org.apache.wicket</groupId>
- <version>6.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>wicket-request</artifactId>
- <name>Wicket Request</name>
- <dependencies>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-util</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-util</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";
xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>wicket-parent</artifactId>
+ <groupId>org.apache.wicket</groupId>
+ <version>1.5-SNAPSHOT</version>
+ </parent>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-request</artifactId>
+ <version>1.5-SNAPSHOT</version>
+ <name>Wicket Request</name>
+ <url>http://maven.apache.org</url>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.wicket</groupId>
+ <artifactId>wicket-util</artifactId>
+ </dependency>
+ </dependencies>
</project>
Modified: wicket/trunk/wicket-spring/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-spring/pom.xml?rev=1220722&r1=1220721&r2=1220722&view=diff
==============================================================================
--- wicket/trunk/wicket-spring/pom.xml (original)
+++ wicket/trunk/wicket-spring/pom.xml Mon Dec 19 12:49:00 2011
@@ -46,12 +46,5 @@
<groupId>easymock</groupId>
<artifactId>easymock</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-util</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
- <version>${project.version}</version>
- </dependency>
</dependencies>
</project>
Modified: wicket/trunk/wicket-util/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-util/pom.xml?rev=1220722&r1=1220721&r2=1220722&view=diff
==============================================================================
--- wicket/trunk/wicket-util/pom.xml (original)
+++ wicket/trunk/wicket-util/pom.xml Mon Dec 19 12:49:00 2011
@@ -25,4 +25,11 @@
</parent>
<artifactId>wicket-util</artifactId>
<name>Wicket Util</name>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
</project>
Modified: wicket/trunk/wicket-velocity/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-velocity/pom.xml?rev=1220722&r1=1220721&r2=1220722&view=diff
==============================================================================
--- wicket/trunk/wicket-velocity/pom.xml (original)
+++ wicket/trunk/wicket-velocity/pom.xml Mon Dec 19 12:49:00 2011
@@ -41,12 +41,5 @@
<artifactId>velocity</artifactId>
<version>1.7</version>
</dependency>
- <dependency>
- <groupId>org.apache.wicket</groupId>
- <artifactId>wicket-util</artifactId>
- <classifier>tests</classifier>
- <scope>test</scope>
- <version>${project.version}</version>
- </dependency>
</dependencies>
</project>
