Tagging 1.2.2
git-svn-id: https://svn.apache.org/repos/asf/lenya/tags/RELEASE_1_2_2@155235 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/lenya.bat b/lenya.bat
index 5c5adcc..f04c82a 100644
--- a/lenya.bat
+++ b/lenya.bat
@@ -93,6 +93,7 @@
cd build\lenya\webapp
"%JAVA_HOME%\bin\jar.exe" -xf ..\..\..\lenya.war
cd ..\..\..
+mkdir build\lenya\webapp\WEB-INF\logs
:: ----- Check action ----------------------------------------------------------
:action
diff --git a/lenya.sh b/lenya.sh
index 69d82ab..102b097 100755
--- a/lenya.sh
+++ b/lenya.sh
@@ -158,6 +158,7 @@
cd build/lenya/webapp
$JAVA_HOME/bin/jar -xf lenya.war
cd ../../..
+ mkdir -p build/lenya/webapp/WEB-INF/logs
rm build/lenya/webapp/lenya.war
else
echo "INFO: No such war file lenya.war or build directory!"
diff --git a/src/targets/docs-build.xml b/src/targets/docs-build.xml
index d0226e6..38ca164 100644
--- a/src/targets/docs-build.xml
+++ b/src/targets/docs-build.xml
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: docs-build.xml,v 1.3 2004/03/21 18:35:15 gregor Exp $ -->
+<!-- $Id$ -->
<project name="documentation">
@@ -56,12 +56,27 @@
version="true"
use="false"
noindex="true"
+ breakiterator="true"
windowtitle="${Name} API - Version ${version}"
doctitle="${Name}"
bottom="Copyright © ${year} Apache Software Foundation. All Rights Reserved."
stylesheetfile="${resource.dir}/javadoc.css"
source="1.4">
- <classpath refid="classpath"/>
+ <!-- pass ant in the classpath to avoid class not found errors -->
+ <classpath>
+ <fileset dir="${lib.dir}">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="${cocoon.webapp.dir}/WEB-INF/lib">
+ <include name="*.jar"/>
+ </fileset>
+ <fileset dir="tools/jetty/lib">
+ <include name="servlet-2.3.jar"/>
+ </fileset>
+ <fileset dir="tools/lib">
+ <include name="*.jar"/>
+ </fileset>
+ </classpath>
</javadoc>
</target>
</project>
\ No newline at end of file
diff --git a/src/webapp/lenya/bin/crawl_and_index.sh b/src/webapp/lenya/bin/crawl_and_index.sh
index 948e944..4d88d1f 100644
--- a/src/webapp/lenya/bin/crawl_and_index.sh
+++ b/src/webapp/lenya/bin/crawl_and_index.sh
@@ -27,7 +27,7 @@
JAVA_XMX=64M
-CLASSPATH=$WEBAPP_DIR/WEB-INF/classes:$LIB_DIR/log4j-1.2.8.jar:$LIB_DIR/xercesImpl-2.6.1.jar:$LIB_DIR/xml-apis.jar:$LIB_DIR/excalibur-io-1.1.jar:$LIB_DIR/xml-commons-resolver-1.1.jar:$LIB_DIR/websphinx.jar
+CLASSPATH=$WEBAPP_DIR/WEB-INF/classes:$LIB_DIR/log4j-1.2.8.jar:$LIB_DIR/xercesImpl-2.6.1.jar:$LIB_DIR/xml-apis.jar:$LIB_DIR/excalibur-io-1.1.jar:$LIB_DIR/xml-commons-resolver-1.1.jar:$LIB_DIR/websphinx-0.5.jar
echo "INFO: classpath = $CLASSPATH"
@@ -57,7 +57,7 @@
echo "Target: $1"
echo "=========================================================="
echo ""
- CLASSPATH=$CLASSPATH:$LIB_DIR/lucene-1.4-rc3.jar
+ CLASSPATH=$CLASSPATH:$LIB_DIR/lucene-1.4.3.jar
INDEX_DIR=$2
WORD=$3
diff --git a/src/webapp/lenya/bin/crawl_and_index.xml b/src/webapp/lenya/bin/crawl_and_index.xml
index fb65773..b50290a 100644
--- a/src/webapp/lenya/bin/crawl_and_index.xml
+++ b/src/webapp/lenya/bin/crawl_and_index.xml
@@ -52,7 +52,7 @@
<pathelement path="${web-inf.dir}/lib/log4j-1.2.8.jar"/>
<pathelement path="${web-inf.dir}/lib/excalibur-io-1.1.jar"/>
<pathelement path="${web-inf.dir}/lib/lucene-1.4.1.jar"/>
- <pathelement path="${web-inf.dir}/lib/websphinx.jar"/>
+ <pathelement path="${web-inf.dir}/lib/websphinx-0.5.jar"/>
<pathelement path="${web-inf.dir}/lib/xml-commons-resolver-1.1.jar"/>
</path>
diff --git a/src/webapp/lenya/bin/download_feeds.xml b/src/webapp/lenya/bin/download_feeds.xml
index 2242d72..8f0fa83 100644
--- a/src/webapp/lenya/bin/download_feeds.xml
+++ b/src/webapp/lenya/bin/download_feeds.xml
@@ -29,6 +29,7 @@
<property name="pubs.dir" value="${lenya.dir}/pubs"/>
<echo>Pubs Directory ${pubs.dir}</echo>
+ <property file="local.feeds.properties"/>
<property file="feeds.properties"/>
<!-- [URL],[PATH],... -->
<!-- NOTE: No whitespace after and before colons -->
diff --git a/src/webapp/lenya/bin/feeds.properties.sample b/src/webapp/lenya/bin/feeds.properties
similarity index 100%
rename from src/webapp/lenya/bin/feeds.properties.sample
rename to src/webapp/lenya/bin/feeds.properties
diff --git a/src/webapp/lenya/content/rc/view.xsp b/src/webapp/lenya/content/rc/view.xsp
index 9f9284c..d2bb421 100644
--- a/src/webapp/lenya/content/rc/view.xsp
+++ b/src/webapp/lenya/content/rc/view.xsp
@@ -40,7 +40,7 @@
String rootDir=publication.getEnvironment().getPublicationPath();
String servletContextPath = publication.getServletContext().getCanonicalPath();
- String contextPath = "content";
+ String contextPath = Publication.CONTENT_PATH;
String area = <input:get-attribute module="page-envelope" as="string" name="area"/>;
String documentPath = <input:get-attribute module="page-envelope" as="string" name="document-path"/>;
String filename = "/" + contextPath + "/" + area + "/" + documentPath;
