You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by gm...@apache.org on 2013/03/16 15:45:51 UTC
svn commit: r1457259 - in /incubator/jspwiki/trunk: ChangeLog build.xml
pom.xml src/org/apache/wiki/providers/RCSFileProvider.java
Author: gmazza
Date: Sat Mar 16 14:45:50 2013
New Revision: 1457259
URL: http://svn.apache.org/r1457259
Log:
Switched JSTL location, better error message in RCSFileProvider.
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/build.xml
incubator/jspwiki/trunk/pom.xml
incubator/jspwiki/trunk/src/org/apache/wiki/providers/RCSFileProvider.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1457259&r1=1457258&r2=1457259&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sat Mar 16 14:45:50 2013
@@ -1,3 +1,12 @@
+2013-03-6 Glen Mazza (glenmazza AT apache DOT org)
+
+ * Upgraded Maven's tomcat plugin to latest version 2.1
+
+ * Placed in a more helpful error message in RCSFileProvider.java
+ to let newbies know RCS needs to be installed on their machine
+
+ * Updated location in build.xml and pom.xml for JSTL library.
+
2013-02-19 Juan Pablo Santos (juanpablo AT apache DOT org)
* 2.9.1-svn-29
Modified: incubator/jspwiki/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=1457259&r1=1457258&r2=1457259&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Sat Mar 16 14:45:50 2013
@@ -236,7 +236,7 @@
<get-element to-file="${libs.main}/freshcookies-security-0.60.jar"
url="${central.url}/org/freshcookies/freshcookies-security/0.60/freshcookies-security-0.60.jar" />
<get-element to-file="${libs.main}/standard-1.1.2.jar" url="${central.url}/taglibs/standard/1.1.2/standard-1.1.2.jar" />
- <get-element to-file="${libs.main}/jstl-1.1.2.jar" url="${central.url}/jstl/jstl/1.1.2/jstl-1.1.2.jar" />
+ <get-element to-file="${libs.main}/jstl-1.1.2.jar" url="${central.url}/javax/servlet/jstl/1.1.2/jstl-1.1.2.jar" />
<get-element to-file="${libs.main}/jaxen-1.1-beta-6.jar" url="${central.url}/jaxen/jaxen/1.1-beta-6/jaxen-1.1-beta-6.jar" />
<get-element to-file="${libs.main}/jdom-1.0.jar" url="${central.url}/jdom/jdom/1.0/jdom-1.0.jar" />
<get-element to-file="${libs.main}/jrcs-diff-0.4.2.jar"
Modified: incubator/jspwiki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/pom.xml?rev=1457259&r1=1457258&r2=1457259&view=diff
==============================================================================
--- incubator/jspwiki/trunk/pom.xml (original)
+++ incubator/jspwiki/trunk/pom.xml Sat Mar 16 14:45:50 2013
@@ -136,11 +136,6 @@
<version>3.1</version>
</dependency>
<dependency>
- <groupId>jstl</groupId>
- <artifactId>jstl</artifactId>
- <version>1.1.2</version>
- </dependency>
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>1.4</version>
@@ -254,7 +249,7 @@
<plugin>
<groupId>org.apache.tomcat.maven</groupId>
<artifactId>tomcat7-maven-plugin</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
<configuration>
<server>myTomcat</server>
<url>http://localhost:8080/manager/text</url>
@@ -343,6 +338,7 @@
<version>2.12.4</version>
<configuration>
<excludes>
+ <!-- time-consuming tests excluded by default -->
<exclude>**/StressTestVersioningProvider.java</exclude>
<exclude>**/StressTestSpeed.java</exclude>
</excludes>
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/providers/RCSFileProvider.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/providers/RCSFileProvider.java?rev=1457259&r1=1457258&r2=1457259&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/providers/RCSFileProvider.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/providers/RCSFileProvider.java Sat Mar 16 14:45:50 2013
@@ -421,8 +421,8 @@ public class RCSFileProvider
}
catch( Exception e )
{
- log.error("RCS checkin failed",e);
- ProviderException pe = new ProviderException("RCS checkin failed");
+ log.error("RCS checkin failed (Is RCS installed on computer?)",e);
+ ProviderException pe = new ProviderException("RCS checkin failed (Is RCS installed on computer?)");
pe.initCause(e);
throw pe;
}