Author: solprovider
Date: Mon Sep 8 03:17:21 2008
New Revision: 693043
URL: http://svn.apache.org/viewvc?rev=693043&view=rev
Log:
Reverting bad library updates.
Added:
lenya/branches/revolution/1.3.x/lib/commons-io-1.1.jar
- copied unchanged from r639174, lenya/branches/revolution/1.3.x/lib/commons-io-1.1.jar
lenya/branches/revolution/1.3.x/lib/quartz-1.6.0.jar
- copied unchanged from r639174, lenya/branches/revolution/1.3.x/lib/quartz-1.6.0.jar
lenya/branches/revolution/1.3.x/lib/xalanj-2.7.0.jar
- copied unchanged from r639174, lenya/branches/revolution/1.3.x/lib/xalanj-2.7.0.jar
lenya/branches/revolution/1.3.x/lib/xercesImpl-2.7.0.jar
- copied unchanged from r639174, lenya/branches/revolution/1.3.x/lib/xercesImpl-2.7.0.jar
lenya/branches/revolution/1.3.x/lib/xml-apis-2.7.0.jar
- copied unchanged from r639174, lenya/branches/revolution/1.3.x/lib/xml-apis-2.7.0.jar
Removed:
lenya/branches/revolution/1.3.x/13INSTALL.txt
lenya/branches/revolution/1.3.x/lib/endorsed/jakarta-bcel-20040329.jar
lenya/branches/revolution/1.3.x/lib/endorsed/jakarta-regexp-1.5.jar
lenya/branches/revolution/1.3.x/lib/endorsed/serializer-2.7.1.jar
lenya/branches/revolution/1.3.x/lib/endorsed/xalan-2.7.1.jar
lenya/branches/revolution/1.3.x/lib/endorsed/xercesImpl-2.7.1.jar
lenya/branches/revolution/1.3.x/lib/endorsed/xml-apis-1.3.04.jar
lenya/branches/revolution/1.3.x/lib/serializer-2.7.1.jar
lenya/branches/revolution/1.3.x/lib/xalan-2.7.1.jar
lenya/branches/revolution/1.3.x/lib/xercesImpl-2.7.1.jar
lenya/branches/revolution/1.3.x/lib/xml-apis-2.7.1.jar
Modified:
lenya/branches/revolution/1.3.x/13Eclipse.txt
lenya/branches/revolution/1.3.x/INSTALL-SRC.txt
lenya/branches/revolution/1.3.x/src/targets/webapp-build.xml
Modified: lenya/branches/revolution/1.3.x/13Eclipse.txt
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/13Eclipse.txt?rev=693043&r1=693042&r2=693043&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/13Eclipse.txt (original)
+++ lenya/branches/revolution/1.3.x/13Eclipse.txt Mon Sep 8 03:17:21 2008
@@ -7,7 +7,7 @@
http://svn.apache.org/repos/asf/lenya/branches/revolution/1.3.x
(Committers should use https:.)
Next
-Click top choice matching the repository string.
+Click top choice matching the reposityory string.
Next
Finish
(New Project Wizard)
@@ -19,55 +19,31 @@
Next
Finish
--- Cocoon-2.1.11
-Lenya 1.3 uses Cocoon-2.1.11. A major bug from before Cocoon-2.1.6 survived through Cocoon-2.1.10 making those releases undesirable.
-Repeat for Cocoon:
-Download the Cocoon-2.1.11 release.
-
--- Cocoon in Eclipse
-These instructions attempt to make an Eclipse project for Cocoon. The instructions are incomplete because I could not discover the proper libraries to prevent errors. The code may just be incompatible with Eclipse's convention of all classes resolving without errors.
+Add lib Libraries to build path.
+Add tools/jetty/lib/servlet-2.3.jar to build path
-Project name: Cocoon-2.1.11
+Lenya 1.3 will use Cocoon-2.1.11 when it is released. A major bug from before Cocoon-2.1.6 survived through Cocoon-2.1.10 making those releases undesirable.
-Cocoon is missing several libraries. Download and add to Cocoon's build path:
- commons-httpclient-3.1.jar -
- commons-lang-2.3.jar -
- htmlunit-1.14.jar -
- jaxen-1.1.1.jar - http://jaxen.codehaus.org/releases.html
- jcr-1.0.jar - http://www.day.com/maven/jsr170/jars/jcr-1.0.jar (This jar is also found buried in a download from Sun with a misleading name.)
-Remove source from the build path.
- src/jdk1.3/java
- src/blocks/slop
-
-These may not be the correct libraries as Eclipse still finds errors.
+Repeat for Cocoon:
+http://svn.apache.org/repos/asf/cocoon/branches/BRANCH_2_1_X
+Project name: Cocoon21x
---- Java version error
JRE: Must be above 1.4 or will error:
Access restriction: the method ___ from the type ___ is not accessible due to restriction on required library rt.jar
-Install and configure j2sdk1.4.2_15
-
---- Finish Lenya in Eclipse
+Add to build path
+lib/core
+lib/endorsed
+tools/lib/ant.jar
Copy Lenya13x/src/cocoon/
local.blocks.properties
local.build.properties
-To Cocoon-2.1.11/
+To Cocoon21x/
-Run cocoon-2.1.11/build.bat
+Run Cocoon21x/build.bat
-Add libraries to build path from:
-lib/core
-lib/endorsed
-tools/jetty/lib/servlet-2.3.jar
-tools/lib/ant.jar
-cocoon-2.1.11/build/webapp/WEB-INF/lib/*
-
-Remove duplicate libraries keeping latest versions (higher numbers.)
-
-Open Lenya13x/build.properties and verify cocoon.src.dir
+Open Lenya13x/build.properties
+Verify cocoon.src.dir.
Run Lenya13x/build.bat
-Run Lenya13x/lenya.bat
-
-Change the Problems filter to "description" "doesn't contain" "deprecated" (unless you are fixing these warnings.)
\ No newline at end of file
Modified: lenya/branches/revolution/1.3.x/INSTALL-SRC.txt
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/INSTALL-SRC.txt?rev=693043&r1=693042&r2=693043&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/INSTALL-SRC.txt (original)
+++ lenya/branches/revolution/1.3.x/INSTALL-SRC.txt Mon Sep 8 03:17:21 2008
@@ -17,13 +17,13 @@
* Java 2 Platform, Standard Edition
version 1.4.2 or newer, 1.5.x works with some limitations
(see http://issues.apache.org/bugzilla/show_bug.cgi?id=32923)
- Lenya 1.3 was developed with j2sdk1.4.2_15
+ Lenya 1.3 was developed with j2sdk1.4.2_07
- * Apache Cocoon, version 2.1.11
+ * Apache Cocoon, version 2.1.9
Available from http://cocoon.apache.org/mirror.cgi
* Apache Tomcat, version 5
- Optional and untested replacement for Jetty (included with Lenya.)
+ (optional, only if you don't want to use the built-in Jetty)
Don't install Tomcat in a location with spaces in the path!
On Windows, put it directly in C:\tomcat rather than
@@ -33,37 +33,28 @@
1. Create a directory src/ in a location with no spaces in the path
- 2. Unpack Cocoon in src/, thereby creating src/cocoon-2.1.11
+ 2. Unpack Cocoon in src/, thereby creating src/cocoon-2.1.9
- 3. Unpack Lenya in src/, thereby creating src/lenya-1.3
+ 3. Unpack Lenya in src/, thereby creating src/lenya-1.3.x
Build Cocoon
- 1. Replace the files in:
- cocoon-2.1.11/lib/endorsed/
- With the files from
- lenya-1.3/lib/endorsed/
+ 1. Copy
- 2. Replace :
- cocoon-2.1.11/lib/core/xml-commons-resolver-1.1.jar
- With:
- lenya-1.3/lib/xml-commons-resolver-1.2.jar
+ src/lenya-1.3.x/src/cocoon/local.build.properties
+ src/lenya-1.3.x/src/cocoon/local.blocks.properties
- 3. Copy
+ to src/cocoon-2.1.9/
- src/lenya-1.3/src/cocoon/local.build.properties
- src/lenya-1.3/src/cocoon/local.blocks.properties
-
- to src/cocoon-2.1.11/
-
- 4. If Windows, fix the 4 batch files.
- src\cocoon-2.1.11\tools\bin
+ 2. If Windows, fix the 4 batch files.
+ src\cocoon-2.1.9\tools\bin
ant.bat antRun.bat appendcp.bat lcp.bat
Convert to DOS format.
Copy from src\lenya-1.3\tools\bin
OR Open each in Wordpad and save it.)
- 5. Go to src/cocoon-2.1.11 and type
+ 3. Go to src/cocoon-2.1.9 and type
+
./build.sh on Unix
build.bat on Windows
@@ -71,14 +62,15 @@
1. Configure Lenya
- In lenya-1.3, copy
+ In lenya-1.3.x, copy
+
build.properties
to local.build.properties
Edit local.build.properties and make sure that
- cocoon.src.dir=../cocoon-2.1.11
+ cocoon.src.dir=../cocoon-2.1.9
web.app.server=Jetty
If you want to upload files to your Lenya website
@@ -88,24 +80,28 @@
2. Build Lenya
- In lenya-1.3, execute
+ In lenya-1.3.x, execute
+
./build.sh on Unix
build.bat on Windows
If you need to re-build Lenya, issue
+
./build.sh clean on Unix
build.bat clean on Windows
+
to clear the build directory prior to your next build.
3. Start Lenya/Jetty
- In lenya-1.3, type
+ In lenya-1.3.x, type
+
./lenya.sh servlet on Unix
lenya.bat servlet on Windows
4. Test the Installation
- Open your browser to http://localhost:8888
+ Point your browser to http://localhost:8888
End of standalone installation using the built-in Jetty
----
@@ -114,7 +110,7 @@
1. Configure Lenya
- In lenya-1.3, copy
+ In lenya-1.3.x, copy
build.properties
@@ -122,7 +118,7 @@
Edit local.build.properties and make sure that
- cocoon.src.dir=../cocoon-2.1.11
+ cocoon.src.dir=../cocoon-2.1.9
web.app.server=Tomcat
tomcat.home.dir=[path_to_tomcat]
@@ -139,7 +135,7 @@
2. Build Lenya
- In lenya-1.3, execute
+ In lenya-1.3.x, execute
./build.sh on Unix
build.bat on Windows
Modified: lenya/branches/revolution/1.3.x/src/targets/webapp-build.xml
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/src/targets/webapp-build.xml?rev=693043&r1=693042&r2=693043&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/src/targets/webapp-build.xml (original)
+++ lenya/branches/revolution/1.3.x/src/targets/webapp-build.xml Mon Sep 8 03:17:21 2008
@@ -143,14 +143,7 @@
<copy todir="${build.webapp}/WEB-INF/lib/endorsed">
<fileset dir="${cocoon.endorsed.lib.dir}">
<include name="**/*"/>
-<!-- Lenya 1.3 Overrides BEGIN -->
- <exclude name="**/xercesImpl-2.9.1.jar"/>
</fileset>
- <fileset dir="${build.webapp}/WEB-INF/lib">
- <include name="serializer-2.7.1.jar"/>
- <include name="xercesImpl-2.7.1.jar"/>
- </fileset>
-<!-- Lenya 1.3 Overrides END -->
</copy>
<!-- Delete endorsed libraries from common webapp lib directory -->
@@ -161,16 +154,6 @@
<fileset dir="${build.webapp}/WEB-INF/lib">
<include name="xml-apis.jar"/>
<include name="xercesImpl-2.6.2.jar"/>
-<!-- Lenya 1.3 Overrides BEGIN -->
- <include name="commons-httpclient-2.0.2.jar"/>
- <include name="commons-io-1.1.jar"/>
- <include name="log4j-1.2.14.jar"/>
- <include name="lucene-1.4.3.jar"/>
- <include name="xercesImpl-2.7.1.jar"/>
- <include name="xercesImpl-2.9.1.jar"/>
- <include name="xml-apis-2.7.1.jar"/>
- <include name="xml-commons-resolver-1.1.jar"/>
-<!-- Lenya 1.3 Overrides END -->
</fileset>
</delete>
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.