carrot2-cvscommits Mailing List for Carrot2 (Page 403)
Brought to you by:
dawidweiss,
stachoo
This list is closed, nobody may subscribe to it.
2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(26) |
Nov
(58) |
Dec
(1) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2004 |
Jan
(16) |
Feb
(176) |
Mar
(2) |
Apr
(23) |
May
(854) |
Jun
(650) |
Jul
(248) |
Aug
(104) |
Sep
(58) |
Oct
(24) |
Nov
|
Dec
(27) |
2005 |
Jan
|
Feb
(186) |
Mar
(127) |
Apr
(54) |
May
(8) |
Jun
(103) |
Jul
(38) |
Aug
(75) |
Sep
(92) |
Oct
(110) |
Nov
(42) |
Dec
(146) |
2006 |
Jan
(733) |
Feb
(80) |
Mar
(23) |
Apr
(41) |
May
(31) |
Jun
(89) |
Jul
(137) |
Aug
(93) |
Sep
(96) |
Oct
(31) |
Nov
(36) |
Dec
(25) |
2007 |
Jan
(58) |
Feb
(25) |
Mar
(29) |
Apr
(68) |
May
(55) |
Jun
(43) |
Jul
(54) |
Aug
(104) |
Sep
(10) |
Oct
(24) |
Nov
(41) |
Dec
(32) |
2008 |
Jan
(80) |
Feb
(81) |
Mar
(141) |
Apr
(141) |
May
(94) |
Jun
(63) |
Jul
(141) |
Aug
(87) |
Sep
(66) |
Oct
(84) |
Nov
(110) |
Dec
(58) |
2009 |
Jan
(21) |
Feb
(56) |
Mar
(53) |
Apr
(67) |
May
(95) |
Jun
(10) |
Jul
(93) |
Aug
(41) |
Sep
(62) |
Oct
(54) |
Nov
(39) |
Dec
(40) |
2010 |
Jan
(81) |
Feb
(154) |
Mar
(123) |
Apr
(56) |
May
(38) |
Jun
(28) |
Jul
(53) |
Aug
(78) |
Sep
(64) |
Oct
(90) |
Nov
(12) |
Dec
(23) |
2011 |
Jan
(88) |
Feb
(24) |
Mar
(111) |
Apr
(59) |
May
(15) |
Jun
(8) |
Jul
(63) |
Aug
(37) |
Sep
(90) |
Oct
(7) |
Nov
(48) |
Dec
(39) |
2012 |
Jan
(7) |
Feb
(2) |
Mar
(16) |
Apr
(7) |
May
(35) |
Jun
(58) |
Jul
(17) |
Aug
(61) |
Sep
(18) |
Oct
(4) |
Nov
(25) |
Dec
(8) |
2013 |
Jan
(8) |
Feb
|
Mar
(13) |
Apr
(43) |
May
(26) |
Jun
(11) |
Jul
(16) |
Aug
(5) |
Sep
|
Oct
(43) |
Nov
(6) |
Dec
(10) |
2014 |
Jan
(22) |
Feb
(35) |
Mar
(5) |
Apr
(16) |
May
(8) |
Jun
(5) |
Jul
(12) |
Aug
(2) |
Sep
(4) |
Oct
|
Nov
(24) |
Dec
|
2015 |
Jan
(2) |
Feb
(31) |
Mar
(15) |
Apr
(3) |
May
(32) |
Jun
|
Jul
(11) |
Aug
(15) |
Sep
(5) |
Oct
(27) |
Nov
(3) |
Dec
|
2016 |
Jan
|
Feb
(16) |
Mar
(3) |
Apr
|
May
(7) |
Jun
|
Jul
(7) |
Aug
(29) |
Sep
(10) |
Oct
(8) |
Nov
(12) |
Dec
|
2017 |
Jan
|
Feb
(4) |
Mar
(6) |
Apr
(3) |
May
(1) |
Jun
|
Jul
(10) |
Aug
(1) |
Sep
(4) |
Oct
|
Nov
(3) |
Dec
|
2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(32) |
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2019 |
Jan
(13) |
Feb
(43) |
Mar
(31) |
Apr
(32) |
May
(30) |
Jun
(13) |
Jul
(6) |
Aug
(30) |
Sep
(43) |
Oct
(43) |
Nov
(28) |
Dec
(26) |
2020 |
Jan
(19) |
Feb
(16) |
Mar
(4) |
Apr
(5) |
May
(15) |
Jun
(14) |
Jul
(22) |
Aug
(1) |
Sep
(12) |
Oct
(16) |
Nov
(50) |
Dec
(79) |
2021 |
Jan
(52) |
Feb
(5) |
Mar
(50) |
Apr
(8) |
May
(4) |
Jun
(20) |
Jul
(15) |
Aug
(25) |
Sep
(3) |
Oct
|
Nov
(15) |
Dec
(19) |
2022 |
Jan
(8) |
Feb
(1) |
Mar
|
Apr
|
May
(10) |
Jun
(2) |
Jul
(9) |
Aug
(15) |
Sep
(1) |
Oct
(6) |
Nov
(12) |
Dec
(2) |
2023 |
Jan
(4) |
Feb
(2) |
Mar
(2) |
Apr
|
May
(22) |
Jun
(1) |
Jul
(2) |
Aug
|
Sep
|
Oct
(12) |
Nov
(24) |
Dec
|
From: <daw...@us...> - 2003-11-26 22:24:40
|
Update of /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/web/admin In directory sc8-pr-cvs1:/tmp/cvs-serv14986/components/controllers/carrot2-web-controller/web/admin Modified Files: index.jsp Added Files: recent.jsp Log Message: [new], component: carrot2.controller.carrot2-web Recent queries list added (queries history). [new], component: carrot2.controller.carrot2-web Short help added to the welcome page. --- NEW FILE: recent.jsp --- <%@page contentType="text/html; charset=UTF-8" errorPage="/error.jsp" import="com.dawidweiss.carrot.controller.carrot2.*, com.dawidweiss.carrot.controller.carrot2.xmlbinding.query.Query, com.dawidweiss.carrot.controller.carrot2.process.*, com.dawidweiss.carrot.controller.carrot2.struts.StrutsHelpers" %><%@include file="../jsp-tmpl/prolog-infopage.txt" %> <h1><bean:message key="blocks.recent-queries.head"/></h1> <div style="margin-left: 2em;"> <%@include file="../jsp-tmpl/recent-queries.txt" %> </div> <%@include file="../jsp-tmpl/epilog-infopage.txt" %> Index: index.jsp =================================================================== RCS file: /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/web/admin/index.jsp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** index.jsp 19 Sep 2003 10:16:02 -0000 1.1.1.1 --- index.jsp 26 Nov 2003 22:24:37 -0000 1.2 *************** *** 14,17 **** --- 14,24 ---- </nobr> </p> + + <p style="margin-top: 20px;"> + Temporary admin options: + </p> + <p> + <a href="recent.jsp">A list of recent queries</a> + </p> </div> </td></tr> |
From: <daw...@us...> - 2003-11-26 22:24:40
|
Update of /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/web In directory sc8-pr-cvs1:/tmp/cvs-serv14986/components/controllers/carrot2-web-controller/web Added Files: welcome.jsp whatis.jsp Log Message: [new], component: carrot2.controller.carrot2-web Recent queries list added (queries history). [new], component: carrot2.controller.carrot2-web Short help added to the welcome page. --- NEW FILE: welcome.jsp --- <%@page contentType="text/html; charset=UTF-8" errorPage="/error.jsp" import="com.dawidweiss.carrot.controller.carrot2.*, com.dawidweiss.carrot.controller.carrot2.xmlbinding.query.Query, com.dawidweiss.carrot.controller.carrot2.process.*, com.dawidweiss.carrot.controller.carrot2.struts.StrutsHelpers" %> <%@taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@include file="jsp-tmpl/prolog.txt" %> <table width="100%" border="0" style="margin-top: 3em;"> <tr> <td align="center" valign="top" width="50%"> <div style="text-align: left; margin-left: 10%; margin-right: 10%;"> <b> <bean:message key="blocks.welcome.head"/> </b><br/><br/> <bean:message key="blocks.welcome.info"/> </div> </td> <td align="center" valign="top" width="50%"> <div style="text-align: left; margin-left: 10%; margin-right: 10%;"> <b> <bean:message key="blocks.recent-queries.head"/> </b><br/><br/> <!-- Recent queries block --> <%@include file="jsp-tmpl/recent-queries.txt" %> </div> </td> </tr> </table> </center> <%@include file="jsp-tmpl/epilog.txt" %> --- NEW FILE: whatis.jsp --- <%@page contentType="text/html; charset=UTF-8" errorPage="/error.jsp" import="com.dawidweiss.carrot.controller.carrot2.struts.StrutsHelpers,com.dawidweiss.carrot.controller.carrot2.Carrot2InitServlet,com.dawidweiss.carrot.controller.carrot2.process.*" %><%@include file="jsp-tmpl/prolog-infopage.txt" %> <h1><bean:message key="blocks.whatis.whatis" /></h1> <p> Welcome!<br/> Carrot<sup>2</sup> is a system for clustering textual data. This demo clusters results acquired from various search engines, similarly to the commercial <a href="http://www.vivisimo.com">Vivisimo</a> meta search engine. </p> <p> First, select the <em>clustering process</em>. A clustering process consists of an input data source (usually a search engine), some clustering algorithm (Lingo rocks!) and finally the output visualization component (<em>dynamic tree</em> in most cases). Then, type a query, just as you would type it into the search engine of your clustering process and (patiently, we have a slow server :) wait for the result. </p> <p style="text-align: center;"> <img style="border: 1px solid black;" src="gfx/scr-process.gif" /> </p> <p> The result depends on the last component in the processing chain, for example in case of the dynamic tree component, you may expect the raw <em>ranking list</em> of results returned from the search engine and an additional set of <em>clusters</em> - thematically organized groups found in the search result. </p> <p style="text-align: center;"> <img style="border: 1px solid black;" src="gfx/scr-groups.gif" /> </p> <p> As the process of discovering clusters if fully automated, there is no guarantee that the clusters will make sense. Please report successes as well as failures of the algorithm to help improve it in the future! </p> <p> Thank you for your interest in Carrot</sup>2</sup>!<br/> </p> <%@include file="jsp-tmpl/epilog.txt" %> |
From: <daw...@us...> - 2003-11-26 22:24:40
|
Update of /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/web/WEB-INF In directory sc8-pr-cvs1:/tmp/cvs-serv14986/components/controllers/carrot2-web-controller/web/WEB-INF Modified Files: carrot-config.xml Log Message: [new], component: carrot2.controller.carrot2-web Recent queries list added (queries history). [new], component: carrot2.controller.carrot2-web Short help added to the welcome page. Index: carrot-config.xml =================================================================== RCS file: /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/web/WEB-INF/carrot-config.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** carrot-config.xml 26 Nov 2003 18:49:44 -0000 1.4 --- carrot-config.xml 26 Nov 2003 22:24:37 -0000 1.5 *************** *** 31,40 **** ## Specify other properties that the controller should know about. ## ! ## request-history (true|false|<missing>) ## Enables request history to be recorded and displayed in the ! ## controller. This is a privacy issue :) --> <properties> ! <property name="request-history" value="true" /> </properties> --- 31,41 ---- ## Specify other properties that the controller should know about. ## ! ## request-history (int|<missing>) ## Enables request history to be recorded and displayed in the ! ## controller. The value specifies number of history entries to ! ## be remembered. --> <properties> ! <property name="request-history" value="15" /> </properties> |
Update of /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/src/com/dawidweiss/carrot/controller/carrot2 In directory sc8-pr-cvs1:/tmp/cvs-serv14986/components/controllers/carrot2-web-controller/src/com/dawidweiss/carrot/controller/carrot2 Modified Files: Carrot2InitServlet.java Added Files: RequestHistory.java Log Message: [new], component: carrot2.controller.carrot2-web Recent queries list added (queries history). [new], component: carrot2.controller.carrot2-web Short help added to the welcome page. --- NEW FILE: RequestHistory.java --- package com.dawidweiss.carrot.controller.carrot2; import com.dawidweiss.carrot.controller.carrot2.process.ProcessDefinition; import com.dawidweiss.carrot.controller.carrot2.xmlbinding.query.Query; /** * A request history that can be attached to QueryProcessor. */ public final class RequestHistory { private final Query [] queries; private final ProcessDefinition [] processes; private final int max; private int position; private int last; /** * Creates a new request history with some predefined length. */ public RequestHistory(int length) { position = 0; last = 0; queries = new Query [ length + 1 ]; processes = new ProcessDefinition [ length + 1 ]; max = length + 1; } public void push(Query query, ProcessDefinition process) { synchronized (this) { queries[position] = query; processes[position] = process; position = (position + 1) % max; if (position == last) { last = (last + 1) % max; } } } public int getHistory(int max, Query [] query, ProcessDefinition [] process) { final int localmax = this.max; synchronized (this) { int from = last; int k = 0; while (from != position && max > 0) { query[k] = this.queries[from]; process[k] = this.processes[from]; max--; k++; from = (from + 1) % localmax; } return k; } } } Index: Carrot2InitServlet.java =================================================================== RCS file: /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/src/com/dawidweiss/carrot/controller/carrot2/Carrot2InitServlet.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Carrot2InitServlet.java 24 Nov 2003 22:45:19 -0000 1.3 --- Carrot2InitServlet.java 26 Nov 2003 22:24:37 -0000 1.4 *************** *** 62,65 **** --- 62,69 ---- private boolean allowReloading = false; + /** Extra configuration properties */ + private HashMap properties = new HashMap(3); + + /** * Initialize Carrot2 environment. *************** *** 221,225 **** } } ! // --- 225,260 ---- } } ! ! // Set properties ! List propertiesElementsList = root.getChildren("properties"); ! if (propertiesElementsList.size() > 1) ! { ! throw new RuntimeException("errors.initialization.too-many-properties"); ! } ! else ! { ! if (propertiesElementsList.size() != 0) ! { ! propertiesElementsList = ((Element) propertiesElementsList.get(0)).getChildren(); ! ! for (Iterator i = propertiesElementsList.iterator();i.hasNext();) ! { ! Element propertyElement = (Element) i.next(); ! if (!"property".equals(propertyElement.getName())) ! { ! throw new RuntimeException("errors.initialization.config-structure-error"); ! } ! ! String propName = propertyElement.getAttributeValue("name"); ! String value = propertyElement.getAttributeValue("value"); ! if (propName == null || value == null) ! { ! throw new RuntimeException("errors.initialization.config-structure-error"); ! } ! ! this.properties.put(propName, value); ! } ! } ! } // *************** *** 361,364 **** --- 396,412 ---- .booleanValue() ); + + // + // Check properties. + // + + if (this.properties.containsKey("request-history")) + { + int v = Integer.valueOf((String) properties.get("request-history")).intValue(); + if (v <= 0) + throw new IllegalArgumentException("Request history must be greater than zero."); + processor.setRequestHistory(new RequestHistory(v)); + } + // |
From: <daw...@us...> - 2003-11-26 22:24:40
|
Update of /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/src/i18n In directory sc8-pr-cvs1:/tmp/cvs-serv14986/components/controllers/carrot2-web-controller/src/i18n Modified Files: carrot2-strings.xml Log Message: [new], component: carrot2.controller.carrot2-web Recent queries list added (queries history). [new], component: carrot2.controller.carrot2-web Short help added to the welcome page. Index: carrot2-strings.xml =================================================================== RCS file: /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/src/i18n/carrot2-strings.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** carrot2-strings.xml 26 Nov 2003 18:49:44 -0000 1.4 --- carrot2-strings.xml 26 Nov 2003 22:24:37 -0000 1.5 *************** *** 67,70 **** --- 67,72 ---- <too-many-default-processes>Too many default processes specified. Only one element allowed.</too-many-default-processes> <missing-default-context>The default context cannot be found.</missing-default-context> + <too-many-properties>Only one 'property' element is allowed.</too-many-properties> + <config-structure-error>Configuration file structure error.</config-structure-error> </initialization> <forms> *************** *** 134,148 **** <blocks> <welcome> <lang:en> <info><![CDATA[ ! Welcome! If you don't know what to do now<br/> <a target="_top" href="whatis.jsp">click here for help</a>. ]]></info> </lang:en> <lang:pl> <info><![CDATA[ ! Witamy! JeÅli nie wiesz co teraz zrobiÄ<br/> <a target="_top" href="whatis.jsp">tutaj znajduje siÄ maÅa pomoc</a>. ]]></info> </lang:pl> --- 136,176 ---- <blocks> + <recent-queries> + <lang:en> + <head>Recent queries</head> + </lang:en> + <lang:pl> + <head>Ostatnio wydane zapytania</head> + </lang:pl> + </recent-queries> <welcome> <lang:en> + <head>Welcome</head> <info><![CDATA[ ! <p> ! Carrot<sup>2</sup> is a system for clustering textual data. This demo ! clusters results acquired from various search engines, similarly to ! the commercial <a href="http://www.vivisimo.com">Vivisimo</a> meta ! search engine. ! </p> ! <p> ! If you don't know what to do now, <a target="_top" href="whatis.jsp">click here for help</a>. + </p> ]]></info> </lang:en> <lang:pl> + <head>Witamy</head> <info><![CDATA[ ! <p> ! Carrot<sup>2</sup> jest systemem grupujÄ cym dane tekstowe. ! Niniejsza wersja demonstracyjna grupuje wyniki z wyszukiwarek ! internetowych, podobnie jak czyni to serwis ! <a href="http://www.vivisimo.com">Vivisimo</a>. ! </p> ! <p> ! JeÅli nie wiesz co teraz zrobiÄ, <a target="_top" href="whatis.jsp">tutaj znajduje siÄ maÅa pomoc</a>. + </p> ]]></info> </lang:pl> |
From: <daw...@us...> - 2003-11-26 22:24:40
|
Update of /cvsroot/carrot2/carrot2 In directory sc8-pr-cvs1:/tmp/cvs-serv14986 Modified Files: history.xml Log Message: [new], component: carrot2.controller.carrot2-web Recent queries list added (queries history). [new], component: carrot2.controller.carrot2-web Short help added to the welcome page. Index: history.xml =================================================================== RCS file: /cvsroot/carrot2/carrot2/history.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** history.xml 24 Nov 2003 22:45:19 -0000 1.6 --- history.xml 26 Nov 2003 22:24:37 -0000 1.7 *************** *** 9,12 **** --- 9,23 ---- <history> <changelist> + <date>2003-11-26</date> + <committer>dawid</committer> + <change component="carrot2.controller.carrot2-web" type="new"> + Recent queries list added (queries history). + </change> + <change component="carrot2.controller.carrot2-web" type="new"> + Short help added to the welcome page. + </change> + </changelist> + + <changelist> <date>2003-11-24</date> <committer>dawid</committer> |
From: <daw...@us...> - 2003-11-26 18:49:49
|
Update of /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/web In directory sc8-pr-cvs1:/tmp/cvs-serv1536/components/controllers/carrot2-web-controller/web Modified Files: largeInputSearch.jsp search.jsp Log Message: typo corrected. Index: largeInputSearch.jsp =================================================================== RCS file: /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/web/largeInputSearch.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** largeInputSearch.jsp 8 Oct 2003 12:33:14 -0000 1.2 --- largeInputSearch.jsp 26 Nov 2003 18:49:44 -0000 1.3 *************** *** 38,41 **** --- 38,44 ---- <html:link target="_parent" page="/demo.jsp"><bean:message key="links.demo"/></html:link> + + + <html:link target="_top" forward="whatis"><bean:message key="links.whatis"/></html:link> </nobr> </td> Index: search.jsp =================================================================== RCS file: /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/web/search.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** search.jsp 8 Oct 2003 12:33:14 -0000 1.2 --- search.jsp 26 Nov 2003 18:49:44 -0000 1.3 *************** *** 28,35 **** --- 28,43 ---- <nobr> <html:link target="_parent" page="/components.jsp"><bean:message key="links.components" /></html:link> + <html:link target="_parent" page="/admin/index.jsp"><bean:message key="links.admin"/></html:link> + <html:link target="_parent" page="/largeInputSearch.jsp"><bean:message key="links.largeinputsearch"/></html:link> + + + <html:link target="_parent" page="/demo.jsp"><bean:message key="links.demo"/></html:link> + + + <html:link target="_top" forward="whatis"><bean:message key="links.whatis"/></html:link> </nobr> </td> |
From: <daw...@us...> - 2003-11-26 18:49:48
|
Update of /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/web/WEB-INF In directory sc8-pr-cvs1:/tmp/cvs-serv1536/components/controllers/carrot2-web-controller/web/WEB-INF Modified Files: carrot-config.xml struts-config.xml web.xml Log Message: typo corrected. Index: carrot-config.xml =================================================================== RCS file: /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/web/WEB-INF/carrot-config.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** carrot-config.xml 24 Nov 2003 22:45:19 -0000 1.3 --- carrot-config.xml 26 Nov 2003 18:49:44 -0000 1.4 *************** *** 28,31 **** --- 28,42 ---- <default-process id="carrot2.process.lingo-google-en" /> + <!-- + ## Specify other properties that the controller should know about. + ## + ## request-history (true|false|<missing>) + ## Enables request history to be recorded and displayed in the + ## controller. This is a privacy issue :) + --> + <properties> + <property name="request-history" value="true" /> + </properties> + <!-- ## Specify the context-relative cache configuration file Index: struts-config.xml =================================================================== RCS file: /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/web/WEB-INF/struts-config.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** struts-config.xml 30 Sep 2003 11:35:45 -0000 1.2 --- struts-config.xml 26 Nov 2003 18:49:44 -0000 1.3 *************** *** 22,25 **** --- 22,26 ---- <forward name="search" path="/search.jsp" /> <forward name="runtimeError" path="/error.jsp" /> + <forward name="whatis" path="/whatis.jsp" /> </global-forwards> *************** *** 44,47 **** --- 45,49 ---- <forward name="visualize" path="/output.jsp" /> <forward name="processingError" path="/processingError.jsp" /> + <forward name="welcome" path="/welcome.jsp" /> </action> Index: web.xml =================================================================== RCS file: /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/web/WEB-INF/web.xml,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** web.xml 19 Sep 2003 10:16:03 -0000 1.1.1.1 --- web.xml 26 Nov 2003 18:49:44 -0000 1.2 *************** *** 43,46 **** --- 43,51 ---- </servlet> <servlet> + <servlet-name>jsp_preload_6</servlet-name> + <jsp-file>/welcome.jsp</jsp-file> + <load-on-startup>10</load-on-startup> + </servlet> + <servlet> <servlet-name>struts-action</servlet-name> <servlet-class>com.dawidweiss.util.struts.ForcedRequestEncodingActionServlet</servlet-class> |
From: <daw...@us...> - 2003-11-26 18:49:48
|
Update of /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/web/jsp-tmpl In directory sc8-pr-cvs1:/tmp/cvs-serv1536/components/controllers/carrot2-web-controller/web/jsp-tmpl Modified Files: prolog-infopage.txt Log Message: typo corrected. Index: prolog-infopage.txt =================================================================== RCS file: /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/web/jsp-tmpl/prolog-infopage.txt,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** prolog-infopage.txt 19 Sep 2003 10:16:03 -0000 1.1.1.1 --- prolog-infopage.txt 26 Nov 2003 18:49:45 -0000 1.2 *************** *** 11,14 **** --- 11,16 ---- [<html:link forward="main" target="_top"><bean:message key="links.enter"/></html:link>] <br/> + [<html:link forward="whatis" target="_top"><bean:message key="links.whatis"/></html:link>] + <br/> <br/> [<html:link page="/components.jsp" target="_top"><bean:message key="links.components"/></html:link>] |
From: <daw...@us...> - 2003-11-26 18:49:48
|
Update of /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/web/css In directory sc8-pr-cvs1:/tmp/cvs-serv1536/components/controllers/carrot2-web-controller/web/css Modified Files: carrot2.css Log Message: typo corrected. Index: carrot2.css =================================================================== RCS file: /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/web/css/carrot2.css,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** carrot2.css 30 Sep 2003 11:35:45 -0000 1.2 --- carrot2.css 26 Nov 2003 18:49:44 -0000 1.3 *************** *** 34,48 **** A { color: #646AB4; ! text-decoration: underline; font-weight: normal; } A:visited { ! text-decoration: underline; color: #B46464; } A:hover { ! text-decoration: none; color: red; } --- 34,48 ---- A { color: #646AB4; ! text-decoration: none; font-weight: normal; } A:visited { ! text-decoration: none; color: #B46464; } A:hover { ! text-decoration: underline; color: red; } |
From: <daw...@us...> - 2003-11-26 18:49:47
|
Update of /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/src/com/dawidweiss/carrot/controller/carrot2/struts/actions In directory sc8-pr-cvs1:/tmp/cvs-serv1536/components/controllers/carrot2-web-controller/src/com/dawidweiss/carrot/controller/carrot2/struts/actions Modified Files: SearchAction.java Log Message: typo corrected. Index: SearchAction.java =================================================================== RCS file: /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/src/com/dawidweiss/carrot/controller/carrot2/struts/actions/SearchAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** SearchAction.java 30 Sep 2003 11:35:45 -0000 1.2 --- SearchAction.java 26 Nov 2003 18:49:44 -0000 1.3 *************** *** 117,120 **** --- 117,125 ---- } } + else + { + // no query -- show 'void' page. + return mapping.findForward("welcome"); + } } catch (Throwable t) |
From: <daw...@us...> - 2003-11-26 18:49:47
|
Update of /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/src/i18n In directory sc8-pr-cvs1:/tmp/cvs-serv1536/components/controllers/carrot2-web-controller/src/i18n Modified Files: carrot2-strings.xml Log Message: typo corrected. Index: carrot2-strings.xml =================================================================== RCS file: /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/src/i18n/carrot2-strings.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** carrot2-strings.xml 24 Nov 2003 22:45:19 -0000 1.3 --- carrot2-strings.xml 26 Nov 2003 18:49:44 -0000 1.4 *************** *** 8,11 **** --- 8,12 ---- <admin>admin</admin> <demo>demonstration</demo> + <whatis>what is carrot?</whatis> <english>english</english> *************** *** 21,24 **** --- 22,26 ---- <admin>administracja</admin> <demo>demonstracja</demo> + <whatis>czym jest Carrot?</whatis> <english>angielski</english> *************** *** 132,135 **** --- 134,159 ---- <blocks> + <welcome> + <lang:en> + <info><![CDATA[ + Welcome! If you don't know what to do now<br/> + <a target="_top" href="whatis.jsp">click here for help</a>. + ]]></info> + </lang:en> + <lang:pl> + <info><![CDATA[ + Witamy! JeÅli nie wiesz co teraz zrobiÄ<br/> + <a target="_top" href="whatis.jsp">tutaj znajduje siÄ maÅa pomoc</a>. + ]]></info> + </lang:pl> + </welcome> + <whatis> + <lang:en> + <whatis><![CDATA[What is Carrot<sup>2</sup>?]]></whatis> + </lang:en> + <lang:pl> + <whatis><![CDATA[Czym jest Carrot<sup>2</sup>?]]></whatis> + </lang:pl> + </whatis> <wait> <lang:en> |
From: <daw...@us...> - 2003-11-26 18:49:47
|
Update of /cvsroot/carrot2/carrot2 In directory sc8-pr-cvs1:/tmp/cvs-serv1536 Modified Files: carrot2.LICENCE Log Message: typo corrected. Index: carrot2.LICENCE =================================================================== RCS file: /cvsroot/carrot2/carrot2/carrot2.LICENCE,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** carrot2.LICENCE 19 Sep 2003 10:14:51 -0000 1.1.1.1 --- carrot2.LICENCE 26 Nov 2003 18:49:43 -0000 1.2 *************** *** 2,6 **** Carrot2 Project Copyright (C) 2002-2003, Dawid Weiss ! Portions (C) Contributors listen in carrot2.CONTRIBUTORS file. Redistribution and use in source and binary forms, with or without modification, --- 2,6 ---- Carrot2 Project Copyright (C) 2002-2003, Dawid Weiss ! Portions (C) Contributors listed in carrot2.CONTRIBUTORS file. Redistribution and use in source and binary forms, with or without modification, |
From: <daw...@us...> - 2003-11-26 18:49:47
|
Update of /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/src/com/dawidweiss/carrot/controller/carrot2 In directory sc8-pr-cvs1:/tmp/cvs-serv1536/components/controllers/carrot2-web-controller/src/com/dawidweiss/carrot/controller/carrot2 Modified Files: QueryProcessor.java Log Message: typo corrected. Index: QueryProcessor.java =================================================================== RCS file: /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/src/com/dawidweiss/carrot/controller/carrot2/QueryProcessor.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** QueryProcessor.java 30 Sep 2003 11:35:44 -0000 1.2 --- QueryProcessor.java 26 Nov 2003 18:49:43 -0000 1.3 *************** *** 22,25 **** --- 22,26 ---- import com.dawidweiss.carrot.controller.carrot2.xmlbinding.componentDescriptor.*; import com.dawidweiss.carrot.controller.carrot2.xmlbinding.query.*; + import org.apache.log4j.Logger; import org.put.util.net.http.*; *************** *** 42,51 **** private QueryGuard queryGuard; private boolean fullDebugInfo; /** * Create a new QueryProcessor with a given cache and query guard. - * - * @param cache - * @param guard */ public QueryProcessor(Cache cache, QueryGuard guard) --- 43,51 ---- private QueryGuard queryGuard; private boolean fullDebugInfo; + private RequestHistory requestHistory; + /** * Create a new QueryProcessor with a given cache and query guard. */ public QueryProcessor(Cache cache, QueryGuard guard) *************** *** 54,57 **** --- 54,77 ---- this.queryGuard = guard; } + + + /** + * Sets request history memory. + */ + public void setRequestHistory(RequestHistory history) + { + if (this.requestHistory != null) + throw new IllegalStateException("Request history can be set only once."); + this.requestHistory = history; + } + + + /** + * Returns request history object or null. + */ + public RequestHistory getRequestHistory() { + return requestHistory; + } + /** *************** *** 110,113 **** --- 130,137 ---- // be implemented as a direct stream copy. output.write(new String(os.toByteArray(), "UTF-8")); + + // handle request history. + if (requestHistory != null) + requestHistory.push(query, process); } else |
From: <daw...@us...> - 2003-11-24 22:45:22
|
Update of /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/src/com/dawidweiss/carrot/controller/carrot2/struts/forms In directory sc8-pr-cvs1:/tmp/cvs-serv6974/components/controllers/carrot2-web-controller/src/com/dawidweiss/carrot/controller/carrot2/struts/forms Modified Files: QueryForm.java Log Message: [new] Default process definition can be now specified in the configuration. Index: QueryForm.java =================================================================== RCS file: /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/src/com/dawidweiss/carrot/controller/carrot2/struts/forms/QueryForm.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** QueryForm.java 19 Sep 2003 10:16:02 -0000 1.1.1.1 --- QueryForm.java 24 Nov 2003 22:45:19 -0000 1.2 *************** *** 17,20 **** --- 17,25 ---- import org.apache.struts.action.*; + + import com.dawidweiss.carrot.controller.carrot2.Carrot2InitServlet; + import com.dawidweiss.carrot.controller.carrot2.process.ProcessDefinition; + import com.dawidweiss.carrot.controller.carrot2.process.ProcessingChainLoader; + import javax.servlet.ServletContext; import javax.servlet.http.*; *************** *** 101,104 **** --- 106,119 ---- { resultsRequested = 100; + } + + if (processingChain == null) + { + ProcessingChainLoader processingChainLoader = + (ProcessingChainLoader) application + .getAttribute(Carrot2InitServlet.CARROT_PROCESSINGCHAINS_LOADER); + ProcessDefinition process = processingChainLoader.getDefaultProcess(); + if (process != null) + processingChain = process.getId(); } } |
From: <daw...@us...> - 2003-11-24 22:45:22
|
Update of /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/src/com/dawidweiss/carrot/controller/carrot2/process In directory sc8-pr-cvs1:/tmp/cvs-serv6974/components/controllers/carrot2-web-controller/src/com/dawidweiss/carrot/controller/carrot2/process Modified Files: ProcessingChainLoader.java Log Message: [new] Default process definition can be now specified in the configuration. Index: ProcessingChainLoader.java =================================================================== RCS file: /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/src/com/dawidweiss/carrot/controller/carrot2/process/ProcessingChainLoader.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ProcessingChainLoader.java 30 Sep 2003 11:35:45 -0000 1.2 --- ProcessingChainLoader.java 24 Nov 2003 22:45:19 -0000 1.3 *************** *** 40,43 **** --- 40,47 ---- /** If true, supports reloading (and anchors) */ private final boolean reloading = true; + + /** This is the default process, or null if there is no default process. */ + private ProcessDefinition defaultProcess = null; + /** *************** *** 334,336 **** --- 338,362 ---- return (ProcessDefinition) processesByNameKey.get(nameKey); } + + + /** + * Sets the default process to use. + */ + public void setDefaultProcess(ProcessDefinition process) + { + if (process == null) + throw new IllegalArgumentException("Default process must not be null."); + if (this.findProcessDefinition(process.getId()) != process) + throw new IllegalArgumentException("The default process must be loaded by this loader."); + this.defaultProcess = process; + } + + + /** + * @return Returns the default process or <code>null</code> if the default + * process cannot be found. + */ + public ProcessDefinition getDefaultProcess() { + return defaultProcess; + } } |
From: <daw...@us...> - 2003-11-24 22:45:22
|
Update of /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/src/i18n In directory sc8-pr-cvs1:/tmp/cvs-serv6974/components/controllers/carrot2-web-controller/src/i18n Modified Files: carrot2-strings.xml Log Message: [new] Default process definition can be now specified in the configuration. Index: carrot2-strings.xml =================================================================== RCS file: /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/src/i18n/carrot2-strings.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** carrot2-strings.xml 7 Oct 2003 06:38:38 -0000 1.2 --- carrot2-strings.xml 24 Nov 2003 22:45:19 -0000 1.3 *************** *** 63,66 **** --- 63,68 ---- <cache-config-missing>Cache configuration file missing.</cache-config-missing> <guards-dir-unavailable>Guards directory does not exist or cannot be read</guards-dir-unavailable> + <too-many-default-processes>Too many default processes specified. Only one element allowed.</too-many-default-processes> + <missing-default-context>The default context cannot be found.</missing-default-context> </initialization> <forms> |
From: <daw...@us...> - 2003-11-24 22:45:22
|
Update of /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/web/WEB-INF In directory sc8-pr-cvs1:/tmp/cvs-serv6974/components/controllers/carrot2-web-controller/web/WEB-INF Modified Files: carrot-config.xml Log Message: [new] Default process definition can be now specified in the configuration. Index: carrot-config.xml =================================================================== RCS file: /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/web/WEB-INF/carrot-config.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** carrot-config.xml 30 Sep 2003 11:35:45 -0000 1.2 --- carrot-config.xml 24 Nov 2003 22:45:19 -0000 1.3 *************** *** 22,25 **** --- 22,32 ---- <!-- + ## Specify the name of a default process. Lack of this + ## element will cause a random (the first?) process + ## to become the default. + --> + <default-process id="carrot2.process.lingo-google-en" /> + + <!-- ## Specify the context-relative cache configuration file --> |
From: <daw...@us...> - 2003-11-24 22:45:22
|
Update of /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/src/com/dawidweiss/carrot/controller/carrot2 In directory sc8-pr-cvs1:/tmp/cvs-serv6974/components/controllers/carrot2-web-controller/src/com/dawidweiss/carrot/controller/carrot2 Modified Files: Carrot2InitServlet.java Log Message: [new] Default process definition can be now specified in the configuration. Index: Carrot2InitServlet.java =================================================================== RCS file: /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/src/com/dawidweiss/carrot/controller/carrot2/Carrot2InitServlet.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Carrot2InitServlet.java 30 Sep 2003 11:35:44 -0000 1.2 --- Carrot2InitServlet.java 24 Nov 2003 22:45:19 -0000 1.3 *************** *** 200,203 **** --- 200,225 ---- ); } + + // Set the default process to use. + List defaultProcess = root.getChildren("default-process"); + if (defaultProcess.size() > 1) + { + throw new RuntimeException("errors.initialization.too-many-default-processes"); + } + else + { + if (defaultProcess.size() != 0) + { + String processId = ((Element) defaultProcess.get(0)).getAttributeValue("id"); + log.debug("Setting default process to: " + processId); + ProcessDefinition process = processLoader.findProcessDefinition(processId); + if (process == null) + { + throw new RuntimeException("errors.initialization.missing-default-context"); + } + processLoader.setDefaultProcess(process); + } + } + // |
From: <daw...@us...> - 2003-11-24 22:45:22
|
Update of /cvsroot/carrot2/carrot2 In directory sc8-pr-cvs1:/tmp/cvs-serv6974 Modified Files: history.xml Log Message: [new] Default process definition can be now specified in the configuration. Index: history.xml =================================================================== RCS file: /cvsroot/carrot2/carrot2/history.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** history.xml 23 Nov 2003 23:39:02 -0000 1.5 --- history.xml 24 Nov 2003 22:45:19 -0000 1.6 *************** *** 8,11 **** --- 8,18 ---- <history> + <changelist> + <date>2003-11-24</date> + <committer>dawid</committer> + <change component="carrot2.controller.carrot2-web" type="new"> + Default process can be now specified in WebApp configuration. + </change> + </changelist> <changelist> |
From: <daw...@us...> - 2003-11-24 22:05:59
|
Update of /cvsroot/carrot2/deploy/cron In directory sc8-pr-cvs1:/tmp/cvs-serv29162/cron Modified Files: update-demo.sh update-docs.sh update-website.sh Log Message: jsdk location changed. Index: update-demo.sh =================================================================== RCS file: /cvsroot/carrot2/deploy/cron/update-demo.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** update-demo.sh 6 Oct 2003 16:41:06 -0000 1.4 --- update-demo.sh 24 Nov 2003 22:05:56 -0000 1.5 *************** *** 9,13 **** cd /home/dweiss/carrot2/deploy ! JAVA_HOME=/usr/java/j2sdk1.4.1_02 JAVACMD=${JAVA_HOME}/bin/java ANT_HOME=/usr/java/ant --- 9,13 ---- cd /home/dweiss/carrot2/deploy ! JAVA_HOME=/usr/java/j2sdk JAVACMD=${JAVA_HOME}/bin/java ANT_HOME=/usr/java/ant Index: update-docs.sh =================================================================== RCS file: /cvsroot/carrot2/deploy/cron/update-docs.sh,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** update-docs.sh 6 Oct 2003 16:41:06 -0000 1.2 --- update-docs.sh 24 Nov 2003 22:05:56 -0000 1.3 *************** *** 9,13 **** cd /home/dweiss/carrot2/deploy ! JAVA_HOME=/usr/java/j2sdk1.4.1_02 JAVACMD=${JAVA_HOME}/bin/java ANT_HOME=/usr/java/ant --- 9,13 ---- cd /home/dweiss/carrot2/deploy ! JAVA_HOME=/usr/java/j2sdk JAVACMD=${JAVA_HOME}/bin/java ANT_HOME=/usr/java/ant Index: update-website.sh =================================================================== RCS file: /cvsroot/carrot2/deploy/cron/update-website.sh,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** update-website.sh 3 Nov 2003 09:33:57 -0000 1.6 --- update-website.sh 24 Nov 2003 22:05:56 -0000 1.7 *************** *** 8,12 **** cd /home/dweiss/carrot2/deploy ! JAVA_HOME=/usr/java/j2sdk1.4.1_02 JAVACMD=${JAVA_HOME}/bin/java ANT_HOME=/usr/java/ant --- 8,12 ---- cd /home/dweiss/carrot2/deploy ! JAVA_HOME=/usr/java/j2sdk JAVACMD=${JAVA_HOME}/bin/java ANT_HOME=/usr/java/ant |
From: <daw...@us...> - 2003-11-23 23:39:05
|
Update of /cvsroot/carrot2/carrot2 In directory sc8-pr-cvs1:/tmp/cvs-serv22086 Modified Files: build.xml history.xml readme.txt Added Files: issues.txt Log Message: misc updates. --- NEW FILE: issues.txt --- -- Massimo Miccoli reports: Users of Debian Woody distribution and Tomcat4 must give write permission to tomcat4 users on /var/lib/tomcat4/webapps so Carrot2 can work. Is not a true solution for security reason, but it work. Index: build.xml =================================================================== RCS file: /cvsroot/carrot2/carrot2/build.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** build.xml 25 Sep 2003 22:14:29 -0000 1.2 --- build.xml 23 Nov 2003 23:39:02 -0000 1.3 *************** *** 312,316 **** should only be used if the library changes. ! cleanall - cleans all temporary files build - build all components --- 312,316 ---- should only be used if the library changes. ! clean - cleans all temporary files build - build all components Index: history.xml =================================================================== RCS file: /cvsroot/carrot2/carrot2/history.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** history.xml 8 Oct 2003 12:33:34 -0000 1.4 --- history.xml 23 Nov 2003 23:39:02 -0000 1.5 *************** *** 10,13 **** --- 10,28 ---- <changelist> + <date>2003-11-23</date> + <committer>dawid</committer> + <change component="carrot2-shared-lib" type="bugfix"> + The query format has been changed to what it actually was: + the 'search' root element was not used anywhere. + </change> + <change component="global" type="refactoring"> + All build files now replace WARs instead of updating them. + </change> + <change component="carrot2.controller.carrot2-web" type="bugfix"> + WAR file contained duplicated libraries. + </change> + </changelist> + + <changelist> <date>2003-10-08</date> <committer>dawid</committer> Index: readme.txt =================================================================== RCS file: /cvsroot/carrot2/carrot2/readme.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** readme.txt 6 Oct 2003 08:25:19 -0000 1.2 --- readme.txt 23 Nov 2003 23:39:02 -0000 1.3 *************** *** 18,22 **** Web controller component for Carrot2 uses a set of component and process ! descriptors found in 'descrioptors' folder. You should adjust the host and port in these descriptors by either manually changing them inside descriptor files, or overriding build variables like this: --- 18,22 ---- Web controller component for Carrot2 uses a set of component and process ! descriptors found in 'descriptors' folder. You should adjust the host and port in these descriptors by either manually changing them inside descriptor files, or overriding build variables like this: |
From: <daw...@us...> - 2003-11-23 23:38:41
|
Update of /cvsroot/carrot2/carrot2/lib In directory sc8-pr-cvs1:/tmp/cvs-serv22045 Modified Files: carrot2-adapters.jar carrot2-shared-lib.jar Log Message: new query format binding. Index: carrot2-adapters.jar =================================================================== RCS file: /cvsroot/carrot2/carrot2/lib/carrot2-adapters.jar,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 Binary files /tmp/cvsGBDmr9 and /tmp/cvsioIHB8 differ Index: carrot2-shared-lib.jar =================================================================== RCS file: /cvsroot/carrot2/carrot2/lib/carrot2-shared-lib.jar,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 Binary files /tmp/cvsF2Xpxa and /tmp/cvsE04tcc differ |
From: <daw...@us...> - 2003-11-23 23:37:58
|
Update of /cvsroot/carrot2/carrot2/components/outputs/xslt-renderer In directory sc8-pr-cvs1:/tmp/cvs-serv21773/outputs/xslt-renderer Modified Files: build.xml Log Message: wars are now replaced and not updated. Index: build.xml =================================================================== RCS file: /cvsroot/carrot2/carrot2/components/outputs/xslt-renderer/build.xml,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** build.xml 19 Sep 2003 10:20:42 -0000 1.1.1.1 --- build.xml 23 Nov 2003 23:37:55 -0000 1.2 *************** *** 100,104 **** <target name="build" depends="compile" > ! <war warfile="${distribution.dir}/${dist.name}.war" webxml="${build.dir}/WEB-INF/web.xml"> <fileset dir="${build.dir}"> <exclude name="WEB-INF/web.xml" /> --- 100,104 ---- <target name="build" depends="compile" > ! <war update="false" warfile="${distribution.dir}/${dist.name}.war" webxml="${build.dir}/WEB-INF/web.xml"> <fileset dir="${build.dir}"> <exclude name="WEB-INF/web.xml" /> |
From: <daw...@us...> - 2003-11-23 23:37:58
|
Update of /cvsroot/carrot2/carrot2/components/inputs/treeSnippetMiner In directory sc8-pr-cvs1:/tmp/cvs-serv21773/inputs/treeSnippetMiner Modified Files: build.xml Log Message: wars are now replaced and not updated. Index: build.xml =================================================================== RCS file: /cvsroot/carrot2/carrot2/components/inputs/treeSnippetMiner/build.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** build.xml 27 Sep 2003 07:38:18 -0000 1.2 --- build.xml 23 Nov 2003 23:37:54 -0000 1.3 *************** *** 99,103 **** <target name="build" depends="compile" > ! <war warfile="${distribution.dir}/${dist.name}.war" webxml="${build.dir}/WEB-INF/web.xml"> <fileset dir="${build.dir}"> <exclude name="WEB-INF/web.xml" /> --- 99,103 ---- <target name="build" depends="compile" > ! <war update="false" warfile="${distribution.dir}/${dist.name}.war" webxml="${build.dir}/WEB-INF/web.xml"> <fileset dir="${build.dir}"> <exclude name="WEB-INF/web.xml" /> |