You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by gr...@apache.org on 2005/01/21 00:19:44 UTC

svn commit: r125854 - in lenya/branches/BRANCH_1_2_X: lib src/targets src/webapp/WEB-INF/lib

Author: gregor
Date: Thu Jan 20 15:19:43 2005
New Revision: 125854

URL: http://svn.apache.org/viewcvs?view=rev&rev=125854
Log:
Removed Lucene and log4j from Lenya (we now get them from Cocoon). Moved neko libraries to /lib, upgraded nekodtd to 0.1.11 and removed src/webapp/WEB-INF/lib
Added:
   lenya/branches/BRANCH_1_2_X/lib/nekodtd-0.1.11.jar   (contents, props changed)
   lenya/branches/BRANCH_1_2_X/lib/nekopull-0.2.4.jar
      - copied unchanged from r125191, lenya/branches/BRANCH_1_2_X/src/webapp/WEB-INF/lib/nekopull-0.2.4.jar
Removed:
   lenya/branches/BRANCH_1_2_X/src/webapp/WEB-INF/lib/lucene-1.4.1.jar
   lenya/branches/BRANCH_1_2_X/src/webapp/WEB-INF/lib/nekodtd-20020615.jar
   lenya/branches/BRANCH_1_2_X/src/webapp/WEB-INF/lib/nekopull-0.2.4.jar
Modified:
   lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml
   lenya/branches/BRANCH_1_2_X/src/targets/properties-build.xml

Added: lenya/branches/BRANCH_1_2_X/lib/nekodtd-0.1.11.jar
Url: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/lib/nekodtd-0.1.11.jar?view=auto&rev=125854
==============================================================================
Binary file. No diff available.

Copied: lenya/branches/BRANCH_1_2_X/lib/nekopull-0.2.4.jar (from r125191, lenya/branches/BRANCH_1_2_X/src/webapp/WEB-INF/lib/nekopull-0.2.4.jar)
Url: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/lib/nekopull-0.2.4.jar?view=diff&rev=125854&p1=lenya/branches/BRANCH_1_2_X/src/webapp/WEB-INF/lib/nekopull-0.2.4.jar&r1=125191&p2=lenya/branches/BRANCH_1_2_X/lib/nekopull-0.2.4.jar&r2=125854
==============================================================================

Modified: lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml
Url: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml?view=diff&rev=125854&p1=lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml&r1=125853&p2=lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml&r2=125854
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml	(original)
+++ lenya/branches/BRANCH_1_2_X/src/targets/init-build.xml	Thu Jan 20 15:19:43 2005
@@ -86,7 +86,6 @@
     <echo>INFO: exclude: WEB-INF/cocoon.xconf</echo>
     <echo>INFO: exclude: WEB-INF/logkit.xconf</echo>
     <echo>INFO: exclude: WEB-INF/web.xml</echo>
-    <echo>INFO: exclude: WEB-INF/lib/lucene**.jar</echo>
     <echo>INFO: exclude: **/javac.jar</echo>
     <echo>INFO: exclude: **/pizza*.jar</echo>
     <copy todir="${build.webapp}" filtering="off">
@@ -95,7 +94,6 @@
         <exclude name="WEB-INF/cocoon.xconf"/>
         <exclude name="WEB-INF/logkit.xconf"/>
         <exclude name="WEB-INF/web.xml"/>
-        <exclude name="WEB-INF/lib/lucene**.jar"/>
         <exclude name="**/javac.jar"/>
         <exclude name="**/pizza*.jar"/>
       </fileset>
@@ -139,14 +137,6 @@
       </xmlcatalog>
       <outputproperty name="indent" value="yes"/>
     </xslt>
-
-    <!-- patch lucene -->
-    <echo message="INFO: Use our own Lucene"/>
-    <copy todir="${build.webapp}" filtering="off">
-      <fileset dir="${src.webapp.dir}">
-        <include name="WEB-INF/lib/lucene**.jar"/>
-      </fileset>
-    </copy>
 
     <!-- Copy Entities
     <echo>INFO: Copy publication-specific entities to Cocoon catalog</echo>

Modified: lenya/branches/BRANCH_1_2_X/src/targets/properties-build.xml
Url: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/targets/properties-build.xml?view=diff&rev=125854&p1=lenya/branches/BRANCH_1_2_X/src/targets/properties-build.xml&r1=125853&p2=lenya/branches/BRANCH_1_2_X/src/targets/properties-build.xml&r2=125854
==============================================================================
--- lenya/branches/BRANCH_1_2_X/src/targets/properties-build.xml	(original)
+++ lenya/branches/BRANCH_1_2_X/src/targets/properties-build.xml	Thu Jan 20 15:19:43 2005
@@ -35,7 +35,7 @@
   <property file="build.properties"/>
 
   <!-- Project version and name -->
-  <property name="version" value="1.2.1"/>
+  <property name="version" value="1.2.2"/>
   <property name="fullname" value="${ant.project.name}-${version}"/>
   <property name="distname" value="apache-${ant.project.name}-${version}"/>
 

Deleted: /lenya/branches/BRANCH_1_2_X/src/webapp/WEB-INF/lib/lucene-1.4.1.jar
Url: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/webapp/WEB-INF/lib/lucene-1.4.1.jar?view=auto&rev=125853
==============================================================================

Deleted: /lenya/branches/BRANCH_1_2_X/src/webapp/WEB-INF/lib/nekodtd-20020615.jar
Url: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/webapp/WEB-INF/lib/nekodtd-20020615.jar?view=auto&rev=125853
==============================================================================

Deleted: /lenya/branches/BRANCH_1_2_X/src/webapp/WEB-INF/lib/nekopull-0.2.4.jar
Url: http://svn.apache.org/viewcvs/lenya/branches/BRANCH_1_2_X/src/webapp/WEB-INF/lib/nekopull-0.2.4.jar?view=auto&rev=125853
==============================================================================

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org