jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From juanpa...@apache.org
Subject svn commit: r1363135 - in /incubator/jspwiki/trunk: .classpath build.xml doc/Compiling.txt lib/ tests/lib/
Date Wed, 18 Jul 2012 21:45:22 GMT
Author: juanpablo
Date: Wed Jul 18 21:45:22 2012
New Revision: 1363135

URL: http://svn.apache.org/viewvc?rev=1363135&view=rev
Log:
JSPWIKI-738: moving dependencies outside of source.

init target from build.xml downloads project dependencies if they're not present
updated eclipse .classpath file
updated doc/Compiling.txt to reflect the fact that Ant's init target must be called at least
once in order to be able to develop.

Removed:
    incubator/jspwiki/trunk/lib/
    incubator/jspwiki/trunk/tests/lib/
Modified:
    incubator/jspwiki/trunk/.classpath
    incubator/jspwiki/trunk/build.xml
    incubator/jspwiki/trunk/doc/Compiling.txt

Modified: incubator/jspwiki/trunk/.classpath
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.classpath?rev=1363135&r1=1363134&r2=1363135&view=diff
==============================================================================
--- incubator/jspwiki/trunk/.classpath (original)
+++ incubator/jspwiki/trunk/.classpath Wed Jul 18 21:45:22 2012
@@ -2,28 +2,28 @@
 <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.3.jar"/>
-	<classpathentry kind="lib" path="lib/commons-logging-api.jar"/>
-	<classpathentry kind="lib" path="lib/ecs.jar"/>
-	<classpathentry kind="lib" path="lib/jdom.jar"/>
+	<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.jar" sourcepath="/Users/jalkanen/Java/xmlrpc-2.0.1/xmlrpc-2.0.1-sources.jar"/>
-	<classpathentry kind="lib" path="lib/jrcs-diff.jar"/>
+	<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.jar"/>
-	<classpathentry kind="lib" path="lib/oscache.jar" sourcepath="/Users/jalkanen/Java/oscache-2.2/src/java"/>
-	<classpathentry kind="lib" path="lib/oro.jar"/>
-	<classpathentry kind="lib" path="lib/nekohtml.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.jar"/>
+	<classpathentry kind="lib" path="tests/lib/junit-3.8.2.jar"/>
 	<classpathentry kind="lib" path="tests/etc"/>
-	<classpathentry kind="lib" path="lib/jaxen.jar"/>
+	<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.jar"/>
-	<classpathentry kind="lib" path="lib/activation.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"/>
@@ -32,13 +32,13 @@
 	<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.jar"/>
+	<classpathentry kind="lib" path="tests/lib/hsqldb-1.8.0.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.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"/>

Modified: incubator/jspwiki/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=1363135&r1=1363134&r2=1363135&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Wed Jul 18 21:45:22 2012
@@ -105,7 +105,9 @@
   <property name="tests.build" value="tests/build" />
   <property name="tests.reports" value="tests/reports" />
 	
-  <!-- dir holding optional libs -->
+  <!-- dirs holding libs -->
+  <property name="libs.main" value="lib" />
+  <property name="libs.tests" value="tests/lib" />
   <property name="libs.opt" value="${tests.build}/libs-opt" />
   
   <!-- Web unit test properties -->
@@ -181,6 +183,66 @@
      <mkdir dir="${tests.build}" />
      <mkdir dir="${tests.reports}" />
      <mkdir dir="${@tests.pagedir@}" />
+     <mkdir dir="${libs.main}" />
+     <mkdir dir="${libs.tests}" />
+     <antcall target="download-deps" />
+  </target>
+  
+  <target name="test-file-exists">
+     <echo message="Testing  for ${download-file}" level="debug"/>
+     <available file="${download-file}" property="exists" />
+  </target>
+    
+  <target name="download-lib" unless="exists" depends="test-file-exists">
+     <get src="${svn.repository}/libs/${download-file}" dest="${download-file}" />
+  </target>
+  
+  <target name="download-deps">
+     <antcall target="download-lib"><param name="download-file" value="${libs.main}/activation-1.1.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.main}/akismet-java-1.02.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.main}/commons-codec-1.3.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.main}/commons-fileupload-1.2.1.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.main}/commons-httpclient-3.0.1.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.main}/commons-io-1.4.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.main}/commons-lang-2.6.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.main}/commons-logging-api-1.0.4.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.main}/ecs-1.4.2.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.main}/freshcookies-security-0.60.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.main}/jakarta-tablibs-standard-1.1.2.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.main}/jakarta-taglibs-jstl-1.1.2.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.main}/jaxen-1.1-beta-6.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.main}/jdom-1.0.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.main}/jrcs-diff-0.2.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.main}/jsonrpc-1.0.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.main}/jsp-api-2.0.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.main}/log4j-1.2.14.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.main}/lucene-core-3.6.0.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.main}/lucene-highlighter-3.6.0.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.main}/lucene-memory-3.6.0.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.main}/mail-1.4.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.main}/nekohtml-0.9.4.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.main}/oro-2.0.7.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.main}/oscache-2.3.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.main}/sandler-0.5.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.main}/servlet-api-2.4.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.main}/xmlrpc-2.0.1.jar"/></antcall>
+     
+     <antcall target="download-lib"><param name="download-file" value="${libs.tests}/commons-el-1.0.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.tests}/custom_rhino-0.4.3.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.tests}/hsqldb-1.8.0.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.tests}/jasper-compiler-5.5.25.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.tests}/jasper-runtime-5.5.25.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.tests}/jetty-jmx-5.1.14.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.tests}/jetty-plus-5.1.14.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.tests}/jetty-servlet-5.1.14.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.tests}/junit-3.8.2.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.tests}/maven-ant-tasks-2.1.3.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.tests}/selenium-java-client-driver-1.0-beta1.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.tests}/selenium-server-1.0-beta1.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.tests}/stripes-1.5.7.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.tests}/xercesImpl-2.6.2.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.tests}/xml-apis-1.0.b2.jar"/></antcall>
+     <antcall target="download-lib"><param name="download-file" value="${libs.tests}/yuicompressor-2.4.2.jar"/></antcall>
   </target>
 
   <target name="mkpropertyfile"

Modified: incubator/jspwiki/trunk/doc/Compiling.txt
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/doc/Compiling.txt?rev=1363135&r1=1363134&r2=1363135&view=diff
==============================================================================
--- incubator/jspwiki/trunk/doc/Compiling.txt (original)
+++ incubator/jspwiki/trunk/doc/Compiling.txt Wed Jul 18 21:45:22 2012
@@ -11,9 +11,11 @@ Requirements
 You'll need the following programs:
 
 - J2SDK 5.0 (I use the one from Sun Microsystems; I haven't tested any others.)
-- Jakarta Ant 1.5 (available from http://ant.apache.org)
+- Apache Ant 1.6 (available from http://ant.apache.org)
 - Servlet API 2.4 (servlet.jar, available from Sun Microsystems.)
-- JUnit 3.7 (from www.junit.org, required for running tests)
+- JUnit 3.8.2 (from www.junit.org, required for running tests)
+
+You'll also need Internet access in order to download JSPWiki's dependencies.
 
 
 Building
@@ -31,7 +33,7 @@ ant javadoc: builds the javadocs into do
 ant compile: just the basic compile, thankyouverymuch
 ant tests  : runs JUnit tests.
 ant jar    : builds the JSPWiki.jar into build/
-ant war  : builds the JSPWiki.war that can be deployed to your webcontainer
+ant war    : builds the JSPWiki.war that can be deployed to your webcontainer
 
 You can customize your compilation by changing the contents of the
 build.properties file, or better yet, make your own compilation
@@ -52,6 +54,7 @@ To get JSPWiki build from within Eclipse
 - then the sources should be compiled correctly
 - to run a build, switch to the Ant View and add the build.xml buildfile
 - then you can choose the Ant target by double clicking on it
+- the Ant "init" target must be called at least once in order to download the required dependencies
     
 
 Directory structure



Mime
View raw message