svn commit: r649604 - in /lenya/branches/revolution/1.3.x: ./ lib/endorsed/ src/targets/

[email protected]
Newsgroups gmane.comp.cms.lenya.cvs
Message-ID <[email protected]>
Author: solprovider
Date: Fri Apr 18 09:45:29 2008
New Revision: 649604

URL: http://svn.apache.org/viewvc?rev=649604&view=rev
Log:
Fixed library issues (WrappedRuntimeException) with Cocoon-2.1.11 (caused by upgrading XalanJ) by requiring manual replacement before building Cocoon. (See Install instructions.)  Need to include Cocoon with Lenya-1.3 to remove steps from installation.

Added:
    lenya/branches/revolution/1.3.x/lib/endorsed/jakarta-bcel-20040329.jar   (with props)
    lenya/branches/revolution/1.3.x/lib/endorsed/jakarta-regexp-1.5.jar   (with props)
    lenya/branches/revolution/1.3.x/lib/endorsed/serializer-2.7.1.jar   (with props)
    lenya/branches/revolution/1.3.x/lib/endorsed/xalan-2.7.1.jar   (with props)
    lenya/branches/revolution/1.3.x/lib/endorsed/xercesImpl-2.7.1.jar   (with props)
    lenya/branches/revolution/1.3.x/lib/endorsed/xml-apis-1.3.04.jar   (with props)
Modified:
    lenya/branches/revolution/1.3.x/13INSTALL.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/13INSTALL.txt
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/13INSTALL.txt?rev=649604&r1=649603&r2=649604&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/13INSTALL.txt (original)
+++ lenya/branches/revolution/1.3.x/13INSTALL.txt Fri Apr 18 09:45:29 2008
@@ -1,41 +1,35 @@
 === Installing Lenya 1.3 ===
 
-The "cocoon-2.1.11" and "lenya-1.3" directories should be in the same directory for the easiest configuration.
+Create "cocoon-2.1.11" and "lenya-1.3" directories inside the same directory for the easiest configuration.
 
-Download Cocoon-2.1.11 from:
+1. Download Cocoon-2.1.11 from:
 http://cocoon.apache.org/mirror.cgi
 
-Use svn to checkout from:
+2. Use svn to checkout from:
 http://svn.apache.org/repos/asf/lenya/branches/revolution/1.3.x 
 
 
-Copy lenya-1.3/src/cocoon/
+3. Replace the files in:
+   cocoon-2.1.11/lib/endorsed/
+With the files from 
+   lenya-1.3/lib/endorsed/
+
+4. Replace :
+   cocoon-2.1.11/lib/core/xml-commons-resolver-1.1.jar
+With:
+   lenya-1.3/lib/xml-commons-resolver-1.2.jar
+
+5. Copy lenya-1.3/src/cocoon/
    local.blocks.properties
    local.build.properties
-To Cocoon-2.1.11/
-
-Run cocoon-2.1.11/build.bat
-
-Open lenya-1.3/build.properties and verify cocoon.src.dir
-Run lenya-1.3/build.bat (or build.sh)
-
-Check for duplicate libraries in directory:
-  lenya-1.3/build/lenya/webapp/WEB-INF/lib
+To cocoon-2.1.11/
 
-Move to the endorsed directory:
-   serializer-2.7.1.jar
+6. Run cocoon-2.1.11/build.bat (or build.sh)
 
-Do not delete files from the "lib/endorsed" directory.  Keep the latest version of each duplicate (except for quartz -- see below.)  These files may be safely deleted:
-  commons-httpclient-2.0.2.jar
-  commons-io-1.1.jar
-  log4j-1.2.14.jar
-  lucene-1.4.3.jar
-  xercesImpl-2.7.1.jar
-  xml-apis-2.7.1.jar
-  xml-commons-resolver-1.1.jar
+7. Open lenya-1.3/build.properties and verify cocoon.src.dir matches your directory.
 
-Note that quartx-1.6.0.jar will cause Cocoon to error so quartx-1.5.2.jar must be used.
+8. Run lenya-1.3/build.bat (or build.sh)
 
-Run lenya-1.3/lenya.bat (or lenya.sh)
+9. Run lenya-1.3/lenya.bat (or lenya.sh)
 
 

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=649604&r1=649603&r2=649604&view=diff
==============================================================================
--- lenya/branches/revolution/1.3.x/INSTALL-SRC.txt (original)
+++ lenya/branches/revolution/1.3.x/INSTALL-SRC.txt Fri Apr 18 09:45:29 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_07
+          Lenya 1.3 was developed with j2sdk1.4.2_15
 
-	* Apache Cocoon, version 2.1.9
+	* Apache Cocoon, version 2.1.11
 	  Available from http://cocoon.apache.org/mirror.cgi
 
 	* Apache Tomcat, version 5
-	  (optional, only if you don't want to use the built-in Jetty)
+	  Optional and untested replacement for Jetty (included with Lenya.)
 
   Don't install Tomcat in a location with spaces in the path!
   On Windows, put it directly in C:\tomcat rather than
@@ -33,28 +33,37 @@
 
 	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.9
+	2.	Unpack Cocoon in src/, thereby creating src/cocoon-2.1.11
 
-	3.	Unpack Lenya in src/, thereby creating src/lenya-1.3.x
+	3.	Unpack Lenya in src/, thereby creating src/lenya-1.3
 
   Build Cocoon
 
-	1.	Copy
+	1. 	Replace the files in:
+			cocoon-2.1.11/lib/endorsed/
+		With the files from 
+			lenya-1.3/lib/endorsed/
 
-			src/lenya-1.3.x/src/cocoon/local.build.properties
-			src/lenya-1.3.x/src/cocoon/local.blocks.properties
+	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
 
-		to	src/cocoon-2.1.9/
+	3.	Copy
 
-        2.      If Windows, fix the 4 batch files.
-                    src\cocoon-2.1.9\tools\bin
+			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
                     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.)
 
-	3.	Go to src/cocoon-2.1.9 and type
-
+	5.	Go to src/cocoon-2.1.11 and type
 			./build.sh on Unix
 			build.bat  on Windows
 
@@ -62,15 +71,14 @@
 
 	1.	Configure Lenya
 
-		In lenya-1.3.x, copy
-
+		In lenya-1.3, copy
 			build.properties
 
 		to	local.build.properties
  
 		Edit local.build.properties and make sure that
 
-			cocoon.src.dir=../cocoon-2.1.9
+			cocoon.src.dir=../cocoon-2.1.11
 			web.app.server=Jetty
 
 		If you want to upload files to your Lenya website
@@ -80,28 +88,24 @@
 
 	2.	Build Lenya 
 
-		In lenya-1.3.x, execute
-
+		In lenya-1.3, 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.x, type
-
+		In lenya-1.3, type
 			./lenya.sh servlet on Unix
 			lenya.bat servlet  on Windows
 
 	4.	Test the Installation
 
-		Point your browser to http://localhost:8888
+		Open your browser to http://localhost:8888
 
   End of standalone installation using the built-in Jetty
   ----
@@ -110,7 +114,7 @@
 
 	1.	Configure Lenya
 
-		In lenya-1.3.x, copy
+		In lenya-1.3, copy
 
 			build.properties
 
@@ -118,7 +122,7 @@
 
 		Edit local.build.properties and make sure that
 
-			cocoon.src.dir=../cocoon-2.1.9
+			cocoon.src.dir=../cocoon-2.1.11
 			web.app.server=Tomcat
 			tomcat.home.dir=[path_to_tomcat]
 
@@ -135,7 +139,7 @@
 
 	2.	Build Lenya
 
-		In lenya-1.3.x, execute
+		In lenya-1.3, execute
 
 			./build.sh on Unix
 			build.bat  on Windows

Added: lenya/branches/revolution/1.3.x/lib/endorsed/jakarta-bcel-20040329.jar
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/lib/endorsed/jakarta-bcel-20040329.jar?rev=649604&view=auto
==============================================================================
Binary file - no diff available.

Propchange: lenya/branches/revolution/1.3.x/lib/endorsed/jakarta-bcel-20040329.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: lenya/branches/revolution/1.3.x/lib/endorsed/jakarta-regexp-1.5.jar
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/lib/endorsed/jakarta-regexp-1.5.jar?rev=649604&view=auto
==============================================================================
Binary file - no diff available.

Propchange: lenya/branches/revolution/1.3.x/lib/endorsed/jakarta-regexp-1.5.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: lenya/branches/revolution/1.3.x/lib/endorsed/serializer-2.7.1.jar
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/lib/endorsed/serializer-2.7.1.jar?rev=649604&view=auto
==============================================================================
Binary file - no diff available.

Propchange: lenya/branches/revolution/1.3.x/lib/endorsed/serializer-2.7.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: lenya/branches/revolution/1.3.x/lib/endorsed/xalan-2.7.1.jar
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/lib/endorsed/xalan-2.7.1.jar?rev=649604&view=auto
==============================================================================
Binary file - no diff available.

Propchange: lenya/branches/revolution/1.3.x/lib/endorsed/xalan-2.7.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: lenya/branches/revolution/1.3.x/lib/endorsed/xercesImpl-2.7.1.jar
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/lib/endorsed/xercesImpl-2.7.1.jar?rev=649604&view=auto
==============================================================================
Binary file - no diff available.

Propchange: lenya/branches/revolution/1.3.x/lib/endorsed/xercesImpl-2.7.1.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: lenya/branches/revolution/1.3.x/lib/endorsed/xml-apis-1.3.04.jar
URL: http://svn.apache.org/viewvc/lenya/branches/revolution/1.3.x/lib/endorsed/xml-apis-1.3.04.jar?rev=649604&view=auto
==============================================================================
Binary file - no diff available.

Propchange: lenya/branches/revolution/1.3.x/lib/endorsed/xml-apis-1.3.04.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

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=649604&r1=649603&r2=649604&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 Fri Apr 18 09:45:29 2008
@@ -143,7 +143,14 @@
     <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 -->
@@ -154,6 +161,16 @@
       <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.