You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2012/08/29 23:04:06 UTC

svn commit: r1378725 - in /incubator/jspwiki/trunk: .classpath ChangeLog build.xml

Author: juanpablo
Date: Wed Aug 29 21:04:06 2012
New Revision: 1378725

URL: http://svn.apache.org/viewvc?rev=1378725&view=rev
Log:
2012-08-29  Juan Pablo Santos (juanpablo AT apache DOT org)
       
* no version bump
       
* JSPWIKI-745: Dependencies currently downloadable from Central repo

Modified:
    incubator/jspwiki/trunk/.classpath
    incubator/jspwiki/trunk/ChangeLog
    incubator/jspwiki/trunk/build.xml

Modified: incubator/jspwiki/trunk/.classpath
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.classpath?rev=1378725&r1=1378724&r2=1378725&view=diff
==============================================================================
--- incubator/jspwiki/trunk/.classpath (original)
+++ incubator/jspwiki/trunk/.classpath Wed Aug 29 21:04:06 2012
@@ -1,45 +1,45 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry excluding="**/package.html|images/|webdocs/|wikipages/" kind="src" output="build" path="src"/>
-	<classpathentry excluding="etc/|build/|reports/|lib/" kind="src" output="tests/build" path="tests"/>
-	<classpathentry kind="lib" path="lib/commons-lang-2.6.jar"/>
-	<classpathentry kind="lib" path="lib/commons-logging-api-1.0.4.jar"/>
-	<classpathentry kind="lib" path="lib/ecs-1.4.2.jar"/>
-	<classpathentry kind="lib" path="lib/jdom-1.0.jar"/>
-	<classpathentry kind="lib" path="lib/log4j-1.2.14.jar"/>
-	<classpathentry kind="lib" path="lib/akismet-java-1.02.jar"/>
-	<classpathentry kind="lib" path="lib/jsonrpc-1.0.jar" sourcepath="/Users/jalkanen/Java/json-rpc-java-1.0/src"/>
-	<classpathentry kind="lib" path="lib/xmlrpc-2.0.1.jar" sourcepath="/Users/jalkanen/Java/xmlrpc-2.0.1/xmlrpc-2.0.1-sources.jar"/>
-	<classpathentry kind="lib" path="lib/jrcs-diff-0.2.jar"/>
-	<classpathentry kind="lib" path="tests/lib/xercesImpl-2.6.2.jar"/>
-	<classpathentry kind="lib" path="lib/sandler-0.5.jar"/>
-	<classpathentry kind="lib" path="lib/oscache-2.3.jar" sourcepath="/Users/jalkanen/Java/oscache-2.3/src/java"/>
-	<classpathentry kind="lib" path="lib/oro-2.0.7.jar"/>
-	<classpathentry kind="lib" path="lib/nekohtml-0.9.4.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-core-3.6.0.jar"/>
-	<classpathentry kind="lib" path="tests/lib/junit-3.8.2.jar"/>
-	<classpathentry kind="lib" path="tests/etc"/>
-	<classpathentry kind="lib" path="lib/jaxen-1.1-beta-6.jar"/>
-	<classpathentry kind="lib" path="tests/lib/xml-apis-1.0.b2.jar"/>
-	<classpathentry kind="lib" path="lib/lucene-highlighter-3.6.0.jar"/>
-	<classpathentry kind="lib" path="lib/mail-1.4.jar"/>
-	<classpathentry kind="lib" path="lib/activation-1.1.jar"/>
-	<classpathentry kind="lib" path="etc/i18n"/>
-	<classpathentry kind="lib" path="lib/freshcookies-security-0.60.jar"/>
-	<classpathentry kind="lib" path="lib/commons-httpclient-3.0.1.jar"/>
-	<classpathentry kind="lib" path="lib/jakarta-taglibs-jstl-1.1.2.jar"/>
-	<classpathentry kind="lib" path="lib/jakarta-tablibs-standard-1.1.2.jar"/>
-	<classpathentry kind="lib" path="lib/commons-fileupload-1.2.1.jar"/>
-	<classpathentry kind="lib" path="lib/commons-codec-1.3.jar"/>
-	<classpathentry kind="lib" path="tests/lib/commons-el-1.0.jar"/>
-	<classpathentry kind="lib" path="tests/lib/hsqldb-1.8.0.10.jar"/>
-	<classpathentry kind="lib" path="tests/lib/jasper-compiler-5.5.25.jar"/>
-	<classpathentry kind="lib" path="tests/lib/jasper-runtime-5.5.25.jar"/>
-	<classpathentry kind="lib" path="tests/lib/jetty-jmx-5.1.14.jar"/>
-	<classpathentry kind="lib" path="tests/lib/jetty-plus-5.1.14.jar"/>
-	<classpathentry kind="lib" path="tests/lib/jetty-servlet-5.1.14.jar"/>
-	<classpathentry kind="lib" path="tests/lib/stripes-1.5.7.jar"/>
-	<classpathentry kind="lib" path="tests/lib/selenium-server-1.0-beta1.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="classes"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry excluding="**/package.html|images/|webdocs/|wikipages/" kind="src" output="build" path="src"/>
+	<classpathentry excluding="build/|etc/|lib/|libs-opt/|reports/" kind="src" output="tests/build" path="tests"/>
+	<classpathentry kind="lib" path="lib/commons-lang-2.6.jar"/>
+	<classpathentry kind="lib" path="lib/commons-logging-api-1.0.4.jar"/>
+	<classpathentry kind="lib" path="lib/ecs-1.4.2.jar"/>
+	<classpathentry kind="lib" path="lib/jdom-1.0.jar"/>
+	<classpathentry kind="lib" path="lib/log4j-1.2.14.jar"/>
+	<classpathentry kind="lib" path="lib/akismet-java-1.02.jar"/>
+	<classpathentry kind="lib" path="lib/jsonrpc-1.0.jar" sourcepath="/Users/jalkanen/Java/json-rpc-java-1.0/src"/>
+	<classpathentry kind="lib" path="lib/xmlrpc-2.0.1.jar" sourcepath="/Users/jalkanen/Java/xmlrpc-2.0.1/xmlrpc-2.0.1-sources.jar"/>
+	<classpathentry kind="lib" path="lib/jrcs-diff-0.2.jar"/>
+	<classpathentry kind="lib" path="tests/lib/xercesImpl-2.6.2.jar"/>
+	<classpathentry kind="lib" path="lib/sandler-0.5.jar"/>
+	<classpathentry kind="lib" path="lib/oscache-2.3.jar" sourcepath="/Users/jalkanen/Java/oscache-2.3/src/java"/>
+	<classpathentry kind="lib" path="lib/oro-2.0.7.jar"/>
+	<classpathentry kind="lib" path="lib/nekohtml-0.9.4.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-core-3.6.0.jar"/>
+	<classpathentry kind="lib" path="tests/lib/junit-3.8.2.jar"/>
+	<classpathentry kind="lib" path="tests/etc"/>
+	<classpathentry kind="lib" path="lib/jaxen-1.1-beta-6.jar"/>
+	<classpathentry kind="lib" path="tests/lib/xml-apis-1.0.b2.jar"/>
+	<classpathentry kind="lib" path="lib/lucene-highlighter-3.6.0.jar"/>
+	<classpathentry kind="lib" path="lib/mail-1.4.jar"/>
+	<classpathentry kind="lib" path="lib/activation-1.1.jar"/>
+	<classpathentry kind="lib" path="etc/i18n"/>
+	<classpathentry kind="lib" path="lib/freshcookies-security-0.60.jar"/>
+	<classpathentry kind="lib" path="lib/commons-httpclient-3.0.1.jar"/>
+	<classpathentry kind="lib" path="lib/jstl-1.1.2.jar"/>
+	<classpathentry kind="lib" path="lib/standard-1.1.2.jar"/>
+	<classpathentry kind="lib" path="lib/commons-fileupload-1.2.1.jar"/>
+	<classpathentry kind="lib" path="lib/commons-codec-1.3.jar"/>
+	<classpathentry kind="lib" path="tests/lib/commons-el-1.0.jar"/>
+	<classpathentry kind="lib" path="tests/lib/hsqldb-1.8.0.10.jar"/>
+	<classpathentry kind="lib" path="tests/lib/jasper-compiler-5.5.25.jar"/>
+	<classpathentry kind="lib" path="tests/lib/jasper-runtime-5.5.25.jar"/>
+	<classpathentry kind="lib" path="tests/lib/jetty-jmx-5.1.14.jar"/>
+	<classpathentry kind="lib" path="tests/lib/jetty-plus-5.1.14.jar"/>
+	<classpathentry kind="lib" path="tests/lib/jetty-servlet-5.1.14.jar"/>
+	<classpathentry kind="lib" path="tests/lib/stripes-1.5.7.jar"/>
+	<classpathentry kind="lib" path="tests/lib/selenium-server-1.0-beta1.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="output" path="classes"/>
+</classpath>

Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1378725&r1=1378724&r2=1378725&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Wed Aug 29 21:04:06 2012
@@ -1,3 +1,9 @@
+2012-08-29  Juan Pablo Santos (juanpablo AT apache DOT org)
+       
+       * no version bump
+       
+       * JSPWIKI-745: Dependencies currently downloadable from Central repo
+       
 2012-08-09  Juan Pablo Santos (juanpablo AT apache DOT org)
        
        * 2.9.0-incubating-10

Modified: incubator/jspwiki/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=1378725&r1=1378724&r2=1378725&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Wed Aug 29 21:04:06 2012
@@ -232,12 +232,12 @@
         <get-element to-file="${libs.main}/commons-logging-api-1.0.4.jar" url="${central.url}/commons-logging/commons-logging-api/1.0.4/commons-logging-api-1.0.4.jar" />
         <get-element to-file="${libs.main}/ecs-1.4.2.jar" url="${central.url}/ecs/ecs/1.4.2/ecs-1.4.2.jar" />
         <get-element to-file="${libs.main}/freshcookies-security-0.60.jar" url="${svn.repository}/libs/${libs.main}/freshcookies-security-0.60.jar" />
-        <get-element to-file="${libs.main}/jakarta-tablibs-standard-1.1.2.jar" url="${svn.repository}/libs/${libs.main}/jakarta-tablibs-standard-1.1.2.jar" />
-        <get-element to-file="${libs.main}/jakarta-taglibs-jstl-1.1.2.jar" url="${svn.repository}/libs/${libs.main}/jakarta-taglibs-jstl-1.1.2.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}/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.2.jar" url="${svn.repository}/libs/${libs.main}/jrcs-diff-0.2.jar" />
-        <get-element to-file="${libs.main}/jsonrpc-1.0.jar" url="${svn.repository}/libs/${libs.main}/jsonrpc-1.0.jar" />
+        <get-element to-file="${libs.main}/jsonrpc-1.0.jar" url="${central.url}/com/metaparadigm/json-rpc/1.0/json-rpc-1.0.jar" />
         <get-element to-file="${libs.main}/jsp-api-2.0.jar" url="${central.url}/javax/servlet/jsp/jsp-api/2.0/jsp-api-2.0.jar" />
         <get-element to-file="${libs.main}/log4j-1.2.14.jar" url="${central.url}/log4j/log4j/1.2.14/log4j-1.2.14.jar" />
         <get-element to-file="${libs.main}/lucene-core-3.6.0.jar" url="${central.url}/org/apache/lucene/lucene-core/3.6.0/lucene-core-3.6.0.jar" />