carrot2-cvscommits Mailing List for Carrot2 (Page 400)
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...> - 2004-02-06 18:19:43
|
Update of /cvsroot/carrot2/carrot2/components/filters/linguistic/pl-eng-stemming In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4867/components/filters/linguistic/pl-eng-stemming Modified Files: build.xml Added Files: pl-eng-stemming.dep.xml Log Message: [new], component: global Added a new ANT task to manage JAR interdependencies in the project. Now you can easily collect all JARs that a component requires, plus only these JARs are use d at compile-time. Try using these targets on build files of components: 'ant show.dependencies' (shows all required components and JAR files), 'ant collect.dependencies' (copies the required JARs to the distribution.dir folder). [refactoring], component: global Build files have changed, so ANT1.6 is now a requirement. --- NEW FILE: pl-eng-stemming.dep.xml --- <!-- A dependency descriptor. This has to be updated manually when new JARs are required. --> <component name="pl-eng-stemming"> <dependency name="carrot2-shared-lib" /> <dependency name="lametyzator" /> </component> Index: build.xml =================================================================== RCS file: /cvsroot/carrot2/carrot2/components/filters/linguistic/pl-eng-stemming/build.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** build.xml 23 Nov 2003 23:37:54 -0000 1.2 --- build.xml 6 Feb 2004 18:16:23 -0000 1.3 *************** *** 21,39 **** <property name="javac.debug" value="on" /> - <!-- ## classpath for compiling classes ## --> - - <path id="carrot.shared.libs"> - <!-- all jars runtime/shared/lib --> - <fileset dir="${carrot2.cvs.dir}/lib"> - <include name="**/*.jar"/> - </fileset> - </path> - - <!-- ## project classpath ### --> - <path id="compile.classpath"> - <path refid="carrot.shared.libs" /> - <fileset dir="lib" includes="**/*.jar" /> - </path> - <!-- ##################################### --> <!-- ### {{{ CLEAN ### --> --- 21,24 ---- *************** *** 51,55 **** <!-- ##################################### --> ! <target name="prepare"> <mkdir dir="${distribution.dir}" /> <mkdir dir="${build.dir}" /> --- 36,40 ---- <!-- ##################################### --> ! <target name="prepare" depends="generate.dependency.path"> <mkdir dir="${distribution.dir}" /> <mkdir dir="${build.dir}" /> *************** *** 60,63 **** --- 45,99 ---- <!-- }}} --> + <!-- ##################################### --> + <!-- ### {{{ DEPENDENCY analysis ### --> + <!-- ##################################### --> + <property name="component.descriptor" location="pl-eng-stemming.dep.xml" /> + + <target name="define.dependency.task"> + <taskdef resource="com/dawidweiss/carrot/ant/dependencies.antlib.xml"> + <classpath location="${carrot2.cvs.dir}/lib/carrot2-shared-lib.jar" /> + </taskdef> + </target> + + <target name="generate.dependency.path" depends="define.dependency.task"> + <dependencylist + property="component.dep" + fileListId="component.dep.flist" + componentDescriptor="${component.descriptor}" + verbose="false" + > + <dependencies dir="${carrot2.cvs.dir}/lib"> + <include name="*.dep.xml" /> + </dependencies> + </dependencylist> + <path id="classpath.dependencies"> + <filelist refid="component.dep.flist" /> + </path> + </target> + + <target name="show.dependencies" depends="define.dependency.task"> + <dependencylist componentDescriptor="${component.descriptor}" verbose="on"> + <dependencies dir="${carrot2.cvs.dir}/lib"> + <include name="*.dep.xml" /> + </dependencies> + </dependencylist> + </target> + + <target name="collect.dependencies" depends="prepare"> + <dependencylist componentDescriptor="${component.descriptor}" verbose="on" + fileListId="component.dep.flist"> + <dependencies dir="${carrot2.cvs.dir}/lib"> + <include name="*.dep.xml" /> + </dependencies> + </dependencylist> + + <copyfilelist todir="${distribution.dir}"> + <filelist refid="component.dep.flist" /> + </copyfilelist> + </target> + <!-- }}} --> + + + <!-- ##################################### --> *************** *** 72,77 **** includeantruntime = "false" includejavaruntime = "false" - classpathref = "compile.classpath" > <!-- add source code paths. --> <src path="${src.path}" /> --- 108,114 ---- includeantruntime = "false" includejavaruntime = "false" > + <classpath refid="classpath.dependencies" /> + <classpath location="${carrot2.cvs.dir}/lib/compile-time-only/servlet.jar" /> <!-- add source code paths. --> <src path="${src.path}" /> |
From: <daw...@us...> - 2004-02-06 18:19:42
|
Update of /cvsroot/carrot2/carrot2/components/inputs/adapter-nutch/src/com/dawidweiss/carrot/input/nutch In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4867/components/inputs/adapter-nutch/src/com/dawidweiss/carrot/input/nutch Modified Files: NutchToCarrot2Servlet.java Removed Files: XMLSerializerHelper.java Log Message: [new], component: global Added a new ANT task to manage JAR interdependencies in the project. Now you can easily collect all JARs that a component requires, plus only these JARs are use d at compile-time. Try using these targets on build files of components: 'ant show.dependencies' (shows all required components and JAR files), 'ant collect.dependencies' (copies the required JARs to the distribution.dir folder). [refactoring], component: global Build files have changed, so ANT1.6 is now a requirement. Index: NutchToCarrot2Servlet.java =================================================================== RCS file: /cvsroot/carrot2/carrot2/components/inputs/adapter-nutch/src/com/dawidweiss/carrot/input/nutch/NutchToCarrot2Servlet.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** NutchToCarrot2Servlet.java 4 Feb 2004 20:32:14 -0000 1.1 --- NutchToCarrot2Servlet.java 6 Feb 2004 18:16:26 -0000 1.2 *************** *** 41,44 **** --- 41,46 ---- import org.w3c.dom.NodeList; + import com.dawidweiss.carrot.util.XMLSerializerHelper; + /** * Nutch search engine adapter that accepts queries in *************** *** 75,84 **** private int defaultResultsNumber = DEFAULT_REQUESTED_RESULTS; - /** - * A private instance of the serializer (small performance - * gain over static method invocation). - */ - private final XMLSerializerHelper xmlSerializer = - new XMLSerializerHelper(); /** --- 77,80 ---- *************** *** 219,222 **** --- 215,222 ---- } + // the serializer is not thread-safe, but could also be pooled, just + // just as the objects above. + XMLSerializerHelper xmlSerializer = XMLSerializerHelper.getInstance(); + // Perform a Nutch search with the acquired query. NutchBean nutchBean = NutchBean.get( *************** *** 238,243 **** out.write(Integer.toString(requestedResults)); out.write("\">"); ! out.write( ! xmlSerializer.escapeElementEntities(queryBuffer.toString())); out.write("</query>\n\n"); --- 238,242 ---- out.write(Integer.toString(requestedResults)); out.write("\">"); ! xmlSerializer.writeValidXmlText(out, queryBuffer.toString(), false); out.write("</query>\n\n"); *************** *** 245,249 **** Summarizer summarizer = new Summarizer(); for (int i = 0; i < length; i++) { - Hit hit = show[i]; HitDetails detail = details[i]; String title = detail.getValue("title"); --- 244,247 ---- *************** *** 261,265 **** // emit the title. out.write("<title>"); ! out.write( xmlSerializer.escapeElementEntities(title)); out.write("</title>\n"); --- 259,263 ---- // emit the title. out.write("<title>"); ! xmlSerializer.writeValidXmlText(out, title, false); out.write("</title>\n"); *************** *** 271,278 **** // emit the summary (if exists) ! // extract summaries. We can't use the same method as ! // in Nutch's search.jsp -- getSummary(details, query); -- because ! // it returns encoded HTML entities and we want to emit them ! // as UTF-8 byte [] content = nutchBean.getContent(details[i]); Summary summary = summarizer.getSummary( --- 269,275 ---- // emit the summary (if exists) ! // ! // THIS IS CURRENTLY BROKEN (OUTPUTS RAW PAGE CONTENTS). No API ! // in Nutch to access the text of the page. byte [] content = nutchBean.getContent(details[i]); Summary summary = summarizer.getSummary( *************** *** 283,287 **** out.write("<snippet>"); for (int j=0;j<fragments.length;j++) { ! out.write( xmlSerializer.escapeElementEntities(fragments[j].getText())); } out.write("</snippet>\n"); --- 280,284 ---- out.write("<snippet>"); for (int j=0;j<fragments.length;j++) { ! xmlSerializer.writeValidXmlText(out, fragments[j].getText(), false); } out.write("</snippet>\n"); --- XMLSerializerHelper.java DELETED --- |
From: <daw...@us...> - 2004-02-06 18:19:42
|
Update of /cvsroot/carrot2/carrot2/components/inputs/snippet-reader In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4867/components/inputs/snippet-reader Modified Files: build.xml Added Files: snippet-reader.dep.xml Log Message: [new], component: global Added a new ANT task to manage JAR interdependencies in the project. Now you can easily collect all JARs that a component requires, plus only these JARs are use d at compile-time. Try using these targets on build files of components: 'ant show.dependencies' (shows all required components and JAR files), 'ant collect.dependencies' (copies the required JARs to the distribution.dir folder). [refactoring], component: global Build files have changed, so ANT1.6 is now a requirement. --- NEW FILE: snippet-reader.dep.xml --- <!-- A dependency descriptor. This has to be updated manually when new JARs are required. --> <component name="snippet-reader"> <dependency name="carrot2-shared-lib" /> <!-- this could be replaced with jdk's --> <dependency name="gnu-regexp" /> <!-- this could be removed? only aelfred is used out of this --> <dependency name="saxon" /> <file location="lib/xmlrpc-1.1.jar" /> </component> Index: build.xml =================================================================== RCS file: /cvsroot/carrot2/carrot2/components/inputs/snippet-reader/build.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** build.xml 23 Nov 2003 23:37:54 -0000 1.2 --- build.xml 6 Feb 2004 18:16:26 -0000 1.3 *************** *** 22,40 **** <property name="javac.debug" value="on" /> - <!-- ## classpath for compiling classes ## --> - - <path id="carrot.shared.libs"> - <!-- all jars runtime/shared/lib --> - <fileset dir="${carrot2.cvs.dir}/lib"> - <include name="**/*.jar"/> - </fileset> - </path> - - <!-- ## project classpath ### --> - <path id="compile.classpath"> - <path refid="carrot.shared.libs" /> - <fileset dir="lib" includes="**/*.jar" /> - </path> - <!-- ##################################### --> <!-- ### {{{ CLEAN ### --> --- 22,25 ---- *************** *** 52,56 **** <!-- ##################################### --> ! <target name="prepare"> <mkdir dir="${distribution.dir}" /> <mkdir dir="${build.dir}" /> --- 37,41 ---- <!-- ##################################### --> ! <target name="prepare" depends="generate.dependency.path"> <mkdir dir="${distribution.dir}" /> <mkdir dir="${build.dir}" /> *************** *** 61,64 **** --- 46,99 ---- <!-- }}} --> + <!-- ##################################### --> + <!-- ### {{{ DEPENDENCY analysis ### --> + <!-- ##################################### --> + <property name="component.descriptor" location="snippet-reader.dep.xml" /> + + <target name="define.dependency.task"> + <taskdef resource="com/dawidweiss/carrot/ant/dependencies.antlib.xml"> + <classpath location="${carrot2.cvs.dir}/lib/carrot2-shared-lib.jar" /> + </taskdef> + </target> + + <target name="generate.dependency.path" depends="define.dependency.task"> + <dependencylist + property="component.dep" + fileListId="component.dep.flist" + componentDescriptor="${component.descriptor}" + verbose="false" + > + <dependencies dir="${carrot2.cvs.dir}/lib"> + <include name="*.dep.xml" /> + </dependencies> + </dependencylist> + <path id="classpath.dependencies"> + <filelist refid="component.dep.flist" /> + </path> + </target> + + <target name="show.dependencies" depends="define.dependency.task"> + <dependencylist componentDescriptor="${component.descriptor}" verbose="on"> + <dependencies dir="${carrot2.cvs.dir}/lib"> + <include name="*.dep.xml" /> + </dependencies> + </dependencylist> + </target> + + <target name="collect.dependencies" depends="prepare"> + <dependencylist componentDescriptor="${component.descriptor}" verbose="on" + fileListId="component.dep.flist"> + <dependencies dir="${carrot2.cvs.dir}/lib"> + <include name="*.dep.xml" /> + </dependencies> + </dependencylist> + + <copyfilelist todir="${distribution.dir}"> + <filelist refid="component.dep.flist" /> + </copyfilelist> + </target> + <!-- }}} --> + + <!-- ##################################### --> *************** *** 73,78 **** includeantruntime = "false" includejavaruntime = "false" - classpathref = "compile.classpath" > <!-- add source code paths. --> <src path="${src.path}" /> --- 108,114 ---- includeantruntime = "false" includejavaruntime = "false" > + <classpath refid="classpath.dependencies" /> + <classpath location="${carrot2.cvs.dir}/lib/compile-time-only/servlet.jar" /> <!-- add source code paths. --> <src path="${src.path}" /> |
From: <daw...@us...> - 2004-02-06 18:19:42
|
Update of /cvsroot/carrot2/carrot2/components/filters/diagnostic/stream-interceptor In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4867/components/filters/diagnostic/stream-interceptor Modified Files: build.xml Added Files: stream-interceptor.dep.xml Log Message: [new], component: global Added a new ANT task to manage JAR interdependencies in the project. Now you can easily collect all JARs that a component requires, plus only these JARs are use d at compile-time. Try using these targets on build files of components: 'ant show.dependencies' (shows all required components and JAR files), 'ant collect.dependencies' (copies the required JARs to the distribution.dir folder). [refactoring], component: global Build files have changed, so ANT1.6 is now a requirement. --- NEW FILE: stream-interceptor.dep.xml --- <!-- A dependency descriptor. This has to be updated manually when new JARs are required. --> <component name="stream-interceptor"> <dependency name="carrot2-shared-lib" /> </component> Index: build.xml =================================================================== RCS file: /cvsroot/carrot2/carrot2/components/filters/diagnostic/stream-interceptor/build.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** build.xml 23 Nov 2003 23:37:54 -0000 1.2 --- build.xml 6 Feb 2004 18:16:23 -0000 1.3 *************** *** 22,39 **** <property name="javac.debug" value="on" /> - <!-- ## classpath for compiling classes ## --> - - <path id="carrot.shared.libs"> - <!-- all jars runtime/shared/lib --> - <fileset dir="${carrot2.cvs.dir}/lib"> - <include name="**/*.jar"/> - </fileset> - </path> - - <!-- ## project classpath ### --> - <path id="compile.classpath"> - <path refid="carrot.shared.libs" /> - </path> - <!-- ##################################### --> <!-- ### {{{ CLEAN ### --> --- 22,25 ---- *************** *** 51,55 **** <!-- ##################################### --> ! <target name="prepare"> <mkdir dir="${distribution.dir}" /> <mkdir dir="${build.dir}" /> --- 37,41 ---- <!-- ##################################### --> ! <target name="prepare" depends="generate.dependency.path"> <mkdir dir="${distribution.dir}" /> <mkdir dir="${build.dir}" /> *************** *** 60,63 **** --- 46,99 ---- <!-- }}} --> + <!-- ##################################### --> + <!-- ### {{{ DEPENDENCY analysis ### --> + <!-- ##################################### --> + <property name="component.descriptor" location="stream-interceptor.dep.xml" /> + + <target name="define.dependency.task"> + <taskdef resource="com/dawidweiss/carrot/ant/dependencies.antlib.xml"> + <classpath location="${carrot2.cvs.dir}/lib/carrot2-shared-lib.jar" /> + </taskdef> + </target> + + <target name="generate.dependency.path" depends="define.dependency.task"> + <dependencylist + property="component.dep" + fileListId="component.dep.flist" + componentDescriptor="${component.descriptor}" + verbose="false" + > + <dependencies dir="${carrot2.cvs.dir}/lib"> + <include name="*.dep.xml" /> + </dependencies> + </dependencylist> + <path id="classpath.dependencies"> + <filelist refid="component.dep.flist" /> + </path> + </target> + + <target name="show.dependencies" depends="define.dependency.task"> + <dependencylist componentDescriptor="${component.descriptor}" verbose="on"> + <dependencies dir="${carrot2.cvs.dir}/lib"> + <include name="*.dep.xml" /> + </dependencies> + </dependencylist> + </target> + + <target name="collect.dependencies" depends="prepare"> + <dependencylist componentDescriptor="${component.descriptor}" verbose="on" + fileListId="component.dep.flist"> + <dependencies dir="${carrot2.cvs.dir}/lib"> + <include name="*.dep.xml" /> + </dependencies> + </dependencylist> + + <copyfilelist todir="${distribution.dir}"> + <filelist refid="component.dep.flist" /> + </copyfilelist> + </target> + <!-- }}} --> + + <!-- ##################################### --> *************** *** 72,77 **** includeantruntime = "false" includejavaruntime = "false" - classpathref = "compile.classpath" > <!-- add source code paths. --> <src path="${src.path}" /> --- 108,114 ---- includeantruntime = "false" includejavaruntime = "false" > + <classpath refid="classpath.dependencies" /> + <classpath location="${carrot2.cvs.dir}/lib/compile-time-only/servlet.jar" /> <!-- add source code paths. --> <src path="${src.path}" /> |
From: <daw...@us...> - 2004-02-06 18:19:37
|
Update of /cvsroot/carrot2/carrot2/components/carrot2-shared-lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4867/components/carrot2-shared-lib Modified Files: .classpath build.xml Added Files: carrot2-shared-lib.dep.xml Log Message: [new], component: global Added a new ANT task to manage JAR interdependencies in the project. Now you can easily collect all JARs that a component requires, plus only these JARs are use d at compile-time. Try using these targets on build files of components: 'ant show.dependencies' (shows all required components and JAR files), 'ant collect.dependencies' (copies the required JARs to the distribution.dir folder). [refactoring], component: global Build files have changed, so ANT1.6 is now a requirement. --- NEW FILE: carrot2-shared-lib.dep.xml --- <!-- A dependency descriptor. This has to be updated manually when new JARs are required. --> <component name="carrot2-shared-lib"> <provides file="carrot2-shared-lib.jar" /> <dependency name="dweiss-utils" /> <dependency name="castor" /> <dependency name="jdom" /> <dependency name="put-utils" /> <dependency name="log4j" /> </component> Index: .classpath =================================================================== RCS file: /cvsroot/carrot2/carrot2/components/carrot2-shared-lib/.classpath,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** .classpath 19 Sep 2003 10:14:52 -0000 1.1.1.1 --- .classpath 6 Feb 2004 18:16:14 -0000 1.2 *************** *** 1,11 **** <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="src-test"/> <classpathentry kind="src" path="tmp/build/src-xml-binding-generated"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="var" path="CARROT2_CVS/lib/commons-beanutils.jar"/> <classpathentry kind="var" path="CARROT2_CVS/lib/commons-collections.jar"/> --- 1,8 ---- *************** *** 25,29 **** <classpathentry kind="var" path="CARROT2_CVS/lib/xml-apis.jar"/> <classpathentry kind="var" path="CARROT2_CVS/lib/junit.jar"/> ! <classpathentry kind="output" path="tmp/build/classes"/> </classpath> --- 22,26 ---- <classpathentry kind="var" path="CARROT2_CVS/lib/xml-apis.jar"/> <classpathentry kind="var" path="CARROT2_CVS/lib/junit.jar"/> ! <classpathentry kind="var" path="ECLIPSE_HOME/plugins/org.apache.ant_1.5.3/ant.jar"/> <classpathentry kind="output" path="tmp/build/classes"/> </classpath> Index: build.xml =================================================================== RCS file: /cvsroot/carrot2/carrot2/components/carrot2-shared-lib/build.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** build.xml 23 Nov 2003 23:37:53 -0000 1.3 --- build.xml 6 Feb 2004 18:16:14 -0000 1.4 *************** *** 15,32 **** <property name="lib.name" value="carrot2-shared-lib.jar" /> - <!-- ## classpath for compiling classes ## --> - <path id="carrot.shared.libs"> - <!-- all jars runtime/shared/lib --> - <fileset dir="${carrot2.cvs.dir}/lib"> - <include name="**/*.jar"/> - <exclude name="**/${lib.name}" /> - </fileset> - </path> - <!-- ##################################### --> <!-- ### {{{ PREPARE directories ### --> <!-- ##################################### --> ! <target name="prepare" description="Prepare build directories."> <mkdir dir="${build.dir}/classes" /> <mkdir dir="${build.dir}/src-xml-binding-generated" /> --- 15,24 ---- <property name="lib.name" value="carrot2-shared-lib.jar" /> <!-- ##################################### --> <!-- ### {{{ PREPARE directories ### --> <!-- ##################################### --> ! <target name="prepare" description="Prepare build directories." ! depends="compile.ant.tasks, generate.dependency.path"> <mkdir dir="${build.dir}/classes" /> <mkdir dir="${build.dir}/src-xml-binding-generated" /> *************** *** 55,59 **** <java classname="org.exolab.castor.builder.SourceGenerator" ! classpathref="carrot.shared.libs" failonerror="true" fork="true"> <arg value="-i" /><arg file="${carrot2.cvs.dir}/schema/component-descriptor.xsd"/> <arg value="-dest"/><arg file="${build.dir}/src-xml-binding-generated" /> --- 47,51 ---- <java classname="org.exolab.castor.builder.SourceGenerator" ! classpathref="classpath.dependencies" failonerror="true" fork="true"> <arg value="-i" /><arg file="${carrot2.cvs.dir}/schema/component-descriptor.xsd"/> <arg value="-dest"/><arg file="${build.dir}/src-xml-binding-generated" /> *************** *** 63,67 **** <java classname="org.exolab.castor.builder.SourceGenerator" ! classpathref="carrot.shared.libs" failonerror="true" fork="true"> <arg value="-i" /><arg file="${carrot2.cvs.dir}/schema/mime-types/x-carrot-clustering-input-query.xsd"/> <arg value="-dest"/><arg file="${build.dir}/src-xml-binding-generated" /> --- 55,59 ---- <java classname="org.exolab.castor.builder.SourceGenerator" ! classpathref="classpath.dependencies" failonerror="true" fork="true"> <arg value="-i" /><arg file="${carrot2.cvs.dir}/schema/mime-types/x-carrot-clustering-input-query.xsd"/> <arg value="-dest"/><arg file="${build.dir}/src-xml-binding-generated" /> *************** *** 71,75 **** <java classname="org.exolab.castor.builder.SourceGenerator" ! classpathref="carrot.shared.libs" failonerror="true" fork="true"> <arg value="-i" /><arg file="${carrot2.cvs.dir}/schema/process-descriptor.xsd"/> <arg value="-dest"/><arg file="${build.dir}/src-xml-binding-generated" /> --- 63,67 ---- <java classname="org.exolab.castor.builder.SourceGenerator" ! classpathref="classpath.dependencies" failonerror="true" fork="true"> <arg value="-i" /><arg file="${carrot2.cvs.dir}/schema/process-descriptor.xsd"/> <arg value="-dest"/><arg file="${build.dir}/src-xml-binding-generated" /> *************** *** 77,102 **** <arg value="-binding-file"/><arg file="xml-binding/process-descriptor-binding.xml" /> </java> - </target> <!-- }}} --> <!-- ##################################### --> <!-- ### {{{ COMPILE project ### --> <!-- ##################################### --> ! <target name="compile" depends="prepare, xmlbinding" description="Compiles all Java classes."> ! <javac destdir="${build.dir}/classes" failonerror="true" ! includeantruntime="false" includejavaruntime="false" - classpathref="carrot.shared.libs" debug="true" optimize="false" > ! <src path="src" /> ! <src path="${build.dir}/src-xml-binding-generated" /> </javac> ! <!-- copy any non-java files (resources) from the source path. --> <copy toDir="${build.dir}/classes"> --- 69,153 ---- <arg value="-binding-file"/><arg file="xml-binding/process-descriptor-binding.xml" /> </java> </target> <!-- }}} --> <!-- ##################################### --> + <!-- ### {{{ DEPENDENCY analysis ### --> + <!-- ##################################### --> + <property name="component.descriptor" location="carrot2-shared-lib.dep.xml" /> + + <target name="define.dependency.task"> + <taskdef resource="com/dawidweiss/carrot/ant/dependencies.antlib.xml"> + <classpath location="${build.dir}/classes" /> + </taskdef> + </target> + + <target name="generate.dependency.path" depends="define.dependency.task"> + <dependencylist + property="component.dep" + fileListId="component.dep.flist" + componentDescriptor="${component.descriptor}" + verbose="false" + > + <dependencies dir="${carrot2.cvs.dir}/lib"> + <include name="*.dep.xml" /> + </dependencies> + </dependencylist> + <path id="classpath.dependencies"> + <filelist refid="component.dep.flist" /> + </path> + </target> + + <target name="show.dependencies" depends="define.dependency.task"> + <dependencylist componentDescriptor="${component.descriptor}" verbose="on"> + <dependencies dir="${carrot2.cvs.dir}/lib"> + <include name="*.dep.xml" /> + </dependencies> + </dependencylist> + </target> + + <target name="collect.dependencies" depends="prepare"> + <dependencylist componentDescriptor="${component.descriptor}" verbose="on" + fileListId="component.dep.flist"> + <dependencies dir="${carrot2.cvs.dir}/lib"> + <include name="*.dep.xml" /> + </dependencies> + </dependencylist> + + <copyfilelist todir="${distribution.dir}"> + <filelist refid="component.dep.flist" /> + </copyfilelist> + </target> + <!-- }}} --> + + <!-- ##################################### --> <!-- ### {{{ COMPILE project ### --> <!-- ##################################### --> ! <target name="compile.ant.tasks"> ! <mkdir dir="${build.dir}/classes" /> ! <!-- copy any non-java files (resources) from the source path. --> ! <copy toDir="${build.dir}/classes"> ! <fileset dir="src"> ! <include name="com/dawidweiss/carrot/ant/**/*.*" /> ! <exclude name="**/*.java"/> ! </fileset> ! </copy> ! <!-- Compile ANT tasks first. --> ! <javac destdir="${build.dir}/classes" failonerror="true" ! includeantruntime="true" includejavaruntime="false" debug="true" optimize="false" + srcdir="src" + deprecation="true" > ! <include name="com/dawidweiss/carrot/ant/*.java" /> </javac> ! </target> ! ! <target name="compile" depends="prepare, xmlbinding" description="Compiles all Java classes."> <!-- copy any non-java files (resources) from the source path. --> <copy toDir="${build.dir}/classes"> *************** *** 104,112 **** <exclude name="**/*.java"/> </fileset> - <fileset dir="${build.dir}/classes"> - <include name="**/*.properties" /> - </fileset> </copy> </target> <!-- }}} --> --- 155,177 ---- <exclude name="**/*.java"/> </fileset> </copy> + <javac + destdir="${build.dir}/classes" + failonerror="true" + includeantruntime="false" + includejavaruntime="false" + debug="true" + optimize="false" + > + <classpath refid="classpath.dependencies" /> + <classpath> + <fileset dir="${carrot2.cvs.dir}/lib" includes="compile-time-only/servlet.jar" /> + </classpath> + <src path="src" /> + <src path="${build.dir}/src-xml-binding-generated" /> + <exclude name="com/dawidweiss/carrot/ant/*.java" /> + </javac> + </target> <!-- }}} --> *************** *** 154,158 **** <!-- ##################################### --> ! <target name="javadoc" depends="compile" description="Builds a JAR and copies it to the runtime environment."> <delete dir="${javadoc.dir}" failonerror="false" /> --- 219,223 ---- <!-- ##################################### --> ! <target name="javadoc" depends="prepare" description="Builds a JAR and copies it to the runtime environment."> <delete dir="${javadoc.dir}" failonerror="false" /> *************** *** 161,165 **** <javadoc packagenames = "com.dawidweiss.carrot.*" destdir = "${javadoc.dir}" - classpathref = "carrot.shared.libs" public = "true" version = "false" --- 226,229 ---- *************** *** 172,177 **** stylesheetfile = "${carrot2.cvs.dir}/misc/javadoc/stylesheet.css" > ! <sourcepath path="src"/> <sourcepath path="${build.dir}/src-xml-binding-generated" /> </javadoc> </target> --- 236,246 ---- stylesheetfile = "${carrot2.cvs.dir}/misc/javadoc/stylesheet.css" > ! <classpath refid="classpath.dependencies" /> ! <classpath> ! <fileset dir="${carrot2.cvs.dir}/lib" includes="compile-time-only/servlet.jar" /> ! </classpath> ! <sourcepath path="src" /> <sourcepath path="${build.dir}/src-xml-binding-generated" /> + <excludepackage name="com.dawidweiss.carrot.ant" /> </javadoc> </target> |
From: <daw...@us...> - 2004-02-06 18:19:37
|
Update of /cvsroot/carrot2/carrot2/components/filters/clustering/lingo-clustering In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4867/components/filters/clustering/lingo-clustering Modified Files: build.xml Added Files: lingo-clustering.dep.xml Log Message: [new], component: global Added a new ANT task to manage JAR interdependencies in the project. Now you can easily collect all JARs that a component requires, plus only these JARs are use d at compile-time. Try using these targets on build files of components: 'ant show.dependencies' (shows all required components and JAR files), 'ant collect.dependencies' (copies the required JARs to the distribution.dir folder). [refactoring], component: global Build files have changed, so ANT1.6 is now a requirement. --- NEW FILE: lingo-clustering.dep.xml --- <!-- A dependency descriptor. This has to be updated manually when new JARs are required. --> <component name="lingo-clustering"> <dependency name="carrot2-shared-lib" /> <dependency name="jama" /> <dependency name="lametyzator" /> <!-- This could probably be replaced with jdk's --> <dependency name="gnu-regexp" /> <!-- This could probably be removed --> <dependency name="colt" /> </component> Index: build.xml =================================================================== RCS file: /cvsroot/carrot2/carrot2/components/filters/clustering/lingo-clustering/build.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** build.xml 23 Nov 2003 23:37:54 -0000 1.2 --- build.xml 6 Feb 2004 18:16:21 -0000 1.3 *************** *** 21,39 **** <property name="javac.debug" value="on" /> - <!-- ## classpath for compiling classes ## --> - - <path id="carrot.shared.libs"> - <!-- all jars runtime/shared/lib --> - <fileset dir="${carrot2.cvs.dir}/lib"> - <include name="**/*.jar"/> - </fileset> - </path> - - <!-- ## project classpath ### --> - <path id="compile.classpath"> - <path refid="carrot.shared.libs" /> - <fileset dir="lib" includes="**/*.jar" /> - </path> - <!-- ##################################### --> <!-- ### {{{ CLEAN ### --> --- 21,24 ---- *************** *** 51,55 **** <!-- ##################################### --> ! <target name="prepare"> <mkdir dir="${distribution.dir}" /> <mkdir dir="${build.dir}" /> --- 36,40 ---- <!-- ##################################### --> ! <target name="prepare" depends="generate.dependency.path"> <mkdir dir="${distribution.dir}" /> <mkdir dir="${build.dir}" /> *************** *** 60,63 **** --- 45,96 ---- <!-- }}} --> + <!-- ##################################### --> + <!-- ### {{{ DEPENDENCY analysis ### --> + <!-- ##################################### --> + <property name="component.descriptor" location="lingo-clustering.dep.xml" /> + + <target name="define.dependency.task"> + <taskdef resource="com/dawidweiss/carrot/ant/dependencies.antlib.xml"> + <classpath location="${carrot2.cvs.dir}/lib/carrot2-shared-lib.jar" /> + </taskdef> + </target> + + <target name="generate.dependency.path" depends="define.dependency.task"> + <dependencylist + property="component.dep" + fileListId="component.dep.flist" + componentDescriptor="${component.descriptor}" + verbose="false" + > + <dependencies dir="${carrot2.cvs.dir}/lib"> + <include name="*.dep.xml" /> + </dependencies> + </dependencylist> + <path id="classpath.dependencies"> + <filelist refid="component.dep.flist" /> + </path> + </target> + + <target name="show.dependencies" depends="define.dependency.task"> + <dependencylist componentDescriptor="${component.descriptor}" verbose="on"> + <dependencies dir="${carrot2.cvs.dir}/lib"> + <include name="*.dep.xml" /> + </dependencies> + </dependencylist> + </target> + + <target name="collect.dependencies" depends="prepare"> + <dependencylist componentDescriptor="${component.descriptor}" verbose="on" + fileListId="component.dep.flist"> + <dependencies dir="${carrot2.cvs.dir}/lib"> + <include name="*.dep.xml" /> + </dependencies> + </dependencylist> + + <copyfilelist todir="${distribution.dir}"> + <filelist refid="component.dep.flist" /> + </copyfilelist> + </target> + <!-- }}} --> <!-- ##################################### --> *************** *** 72,77 **** includeantruntime = "false" includejavaruntime = "false" - classpathref = "compile.classpath" > <!-- add source code paths. --> <src path="${src.path}" /> --- 105,112 ---- includeantruntime = "false" includejavaruntime = "false" > + <classpath refid="classpath.dependencies" /> + <classpath location="${carrot2.cvs.dir}/lib/compile-time-only/servlet.jar" /> + <!-- add source code paths. --> <src path="${src.path}" /> |
From: <daw...@us...> - 2004-02-06 18:19:37
|
Update of /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4867/components/controllers/carrot2-web-controller Modified Files: build.xml Added Files: carrot2-web-controller.dep.xml Log Message: [new], component: global Added a new ANT task to manage JAR interdependencies in the project. Now you can easily collect all JARs that a component requires, plus only these JARs are use d at compile-time. Try using these targets on build files of components: 'ant show.dependencies' (shows all required components and JAR files), 'ant collect.dependencies' (copies the required JARs to the distribution.dir folder). [refactoring], component: global Build files have changed, so ANT1.6 is now a requirement. --- NEW FILE: carrot2-web-controller.dep.xml --- <!-- A dependency descriptor. This has to be updated manually when new JARs are required. --> <component name="carrot2-web-controller"> <dependency name="carrot2-shared-lib" /> <!-- replace this with jdk's? --> <dependency name="gnu-regexp" /> <file location="lib/bsf.jar" /> <file location="lib/bsh-1.2b7.jar" /> <dependency name="put-utils" /> <dependency name="struts" /> </component> Index: build.xml =================================================================== RCS file: /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/build.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** build.xml 19 Jan 2004 22:18:45 -0000 1.3 --- build.xml 6 Feb 2004 18:16:20 -0000 1.4 *************** *** 3,7 **** <project name="Carrot2 Web Controller Component" default="help" basedir="." > ! <!-- ## these are overrioden my master build file ### --> <property name="distribution.dir" location="tmp/dist" /> --- 3,7 ---- <project name="Carrot2 Web Controller Component" default="help" basedir="." > ! <!-- ## these are overrioden by the master build file ### --> <property name="distribution.dir" location="tmp/dist" /> *************** *** 27,53 **** <property name="javac.debug" value="on" /> - <!-- ## classpath for compiling classes ## --> - - <path id="carrot.shared.libs"> - <!-- all jars runtime/shared/lib --> - <fileset dir="${carrot2.cvs.dir}/lib"> - <include name="**/*.jar"/> - </fileset> - </path> - <!-- ## project classpath ### --> - <path id="compile.classpath"> - <fileset dir="lib"> - <include name="**/*.jar" /> - </fileset> - <path refid="carrot.shared.libs" /> - </path> - <filterset begintoken="@" endtoken="@" id="deployment.info"> <filter token="DEPLOY_HOST" value="${deployment.host}"/> <filter token="DEPLOY_PORT" value="${deployment.port}"/> </filterset> <!-- ##################################### --> <!-- ### {{{ CLEAN ### --> --- 27,86 ---- <property name="javac.debug" value="on" /> <!-- ## project classpath ### --> <filterset begintoken="@" endtoken="@" id="deployment.info"> <filter token="DEPLOY_HOST" value="${deployment.host}"/> <filter token="DEPLOY_PORT" value="${deployment.port}"/> </filterset> + + <!-- ##################################### --> + <!-- ### {{{ DEPENDENCY analysis ### --> + <!-- ##################################### --> + <property name="component.descriptor" location="carrot2-web-controller.dep.xml" /> + <target name="define.dependency.task"> + <taskdef resource="com/dawidweiss/carrot/ant/dependencies.antlib.xml"> + <classpath location="${carrot2.cvs.dir}/lib/carrot2-shared-lib.jar" /> + </taskdef> + </target> + + <target name="generate.dependency.path" depends="define.dependency.task"> + <dependencylist + property="component.dep" + fileListId="component.dep.flist" + componentDescriptor="${component.descriptor}" + verbose="false" + > + <dependencies dir="${carrot2.cvs.dir}/lib"> + <include name="*.dep.xml" /> + </dependencies> + </dependencylist> + <path id="classpath.dependencies"> + <filelist refid="component.dep.flist" /> + </path> + </target> + + <target name="show.dependencies" depends="define.dependency.task"> + <dependencylist componentDescriptor="${component.descriptor}" verbose="on"> + <dependencies dir="${carrot2.cvs.dir}/lib"> + <include name="*.dep.xml" /> + </dependencies> + </dependencylist> + </target> + + <target name="collect.dependencies" depends="prepare"> + <dependencylist componentDescriptor="${component.descriptor}" verbose="on" + fileListId="component.dep.flist"> + <dependencies dir="${carrot2.cvs.dir}/lib"> + <include name="*.dep.xml" /> + </dependencies> + </dependencylist> + + <copyfilelist todir="${distribution.dir}"> + <filelist refid="component.dep.flist" /> + </copyfilelist> + </target> + <!-- }}} --> + <!-- ##################################### --> <!-- ### {{{ CLEAN ### --> *************** *** 65,69 **** <!-- ### {{{ PREPARE ### --> <!-- ##################################### --> ! <target name="prepare"> <mkdir dir="${build.dir}/WEB-INF/classes" /> <mkdir dir="${build.dir}/WEB-INF/lib" /> --- 98,102 ---- <!-- ### {{{ PREPARE ### --> <!-- ##################################### --> ! <target name="prepare" depends="generate.dependency.path"> <mkdir dir="${build.dir}/WEB-INF/classes" /> <mkdir dir="${build.dir}/WEB-INF/lib" /> *************** *** 98,101 **** --- 131,159 ---- </copy> + <!-- copy struts and dependencies because it is needed to be declared locally for some reason... --> + <dependencylist componentDescriptor="${carrot2.cvs.dir}/lib/struts.dep.xml" + fileListId="struts.dep.flist"> + <dependencies dir="${carrot2.cvs.dir}/lib"> + <include name="*.dep.xml" /> + </dependencies> + </dependencylist> + + <mkdir dir="${build.dir}/WEB-INF/lib" /> + <copyfilelist todir="${build.dir}/WEB-INF/lib"> + <filelist refid="struts.dep.flist" /> + </copyfilelist> + + <dependencylist componentDescriptor="${carrot2.cvs.dir}/lib/put-utils.dep.xml" + fileListId="struts.dep.flist"> + <dependencies dir="${carrot2.cvs.dir}/lib"> + <include name="*.dep.xml" /> + </dependencies> + </dependencylist> + + <mkdir dir="${build.dir}/WEB-INF/lib" /> + <copyfilelist todir="${build.dir}/WEB-INF/lib"> + <filelist refid="struts.dep.flist" /> + </copyfilelist> + </target> <!-- }}} --> *************** *** 113,119 **** includeantruntime = "false" includejavaruntime = "false" - classpathref = "compile.classpath" > ! <!-- add source code paths. --> <src path="${src.path}" /> </javac> --- 171,177 ---- includeantruntime = "false" includejavaruntime = "false" > ! <classpath refid="classpath.dependencies" /> ! <classpath location="${carrot2.cvs.dir}/lib/compile-time-only/servlet.jar" /> <src path="${src.path}" /> </javac> *************** *** 153,157 **** </fileset> ! <lib dir="lib"> </lib> --- 211,216 ---- </fileset> ! <lib dir="${build.dir}/WEB-INF/lib"> ! <include name="*.jar" /> </lib> |
From: <daw...@us...> - 2004-02-06 18:19:37
|
Update of /cvsroot/carrot2/carrot2/components/filters/clustering/ahc-clustering In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4867/components/filters/clustering/ahc-clustering Modified Files: build.xml Added Files: ahc-clustering.dep.xml Log Message: [new], component: global Added a new ANT task to manage JAR interdependencies in the project. Now you can easily collect all JARs that a component requires, plus only these JARs are use d at compile-time. Try using these targets on build files of components: 'ant show.dependencies' (shows all required components and JAR files), 'ant collect.dependencies' (copies the required JARs to the distribution.dir folder). [refactoring], component: global Build files have changed, so ANT1.6 is now a requirement. --- NEW FILE: ahc-clustering.dep.xml --- <!-- A dependency descriptor. This has to be updated manually when new JARs are required. --> <component name="ahc-clustering"> <dependency name="carrot2-shared-lib" /> </component> Index: build.xml =================================================================== RCS file: /cvsroot/carrot2/carrot2/components/filters/clustering/ahc-clustering/build.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** build.xml 23 Nov 2003 23:37:54 -0000 1.2 --- build.xml 6 Feb 2004 18:16:21 -0000 1.3 *************** *** 21,38 **** <property name="javac.debug" value="on" /> - <!-- ## classpath for compiling classes ## --> - - <path id="carrot.shared.libs"> - <!-- all jars runtime/shared/lib --> - <fileset dir="${carrot2.cvs.dir}/lib"> - <include name="**/*.jar"/> - </fileset> - </path> - - <!-- ## project classpath ### --> - <path id="compile.classpath"> - <path refid="carrot.shared.libs" /> - </path> - <!-- ##################################### --> <!-- ### {{{ CLEAN ### --> --- 21,24 ---- *************** *** 50,54 **** <!-- ##################################### --> ! <target name="prepare"> <mkdir dir="${distribution.dir}" /> <mkdir dir="${build.dir}" /> --- 36,40 ---- <!-- ##################################### --> ! <target name="prepare" depends="generate.dependency.path"> <mkdir dir="${distribution.dir}" /> <mkdir dir="${build.dir}" /> *************** *** 58,61 **** --- 44,95 ---- <!-- }}} --> + <!-- ##################################### --> + <!-- ### {{{ DEPENDENCY analysis ### --> + <!-- ##################################### --> + <property name="component.descriptor" location="ahc-clustering.dep.xml" /> + + <target name="define.dependency.task"> + <taskdef resource="com/dawidweiss/carrot/ant/dependencies.antlib.xml"> + <classpath location="${carrot2.cvs.dir}/lib/carrot2-shared-lib.jar" /> + </taskdef> + </target> + + <target name="generate.dependency.path" depends="define.dependency.task"> + <dependencylist + property="component.dep" + fileListId="component.dep.flist" + componentDescriptor="${component.descriptor}" + verbose="false" + > + <dependencies dir="${carrot2.cvs.dir}/lib"> + <include name="*.dep.xml" /> + </dependencies> + </dependencylist> + <path id="classpath.dependencies"> + <filelist refid="component.dep.flist" /> + </path> + </target> + + <target name="show.dependencies" depends="define.dependency.task"> + <dependencylist componentDescriptor="${component.descriptor}" verbose="on"> + <dependencies dir="${carrot2.cvs.dir}/lib"> + <include name="*.dep.xml" /> + </dependencies> + </dependencylist> + </target> + + <target name="collect.dependencies" depends="prepare"> + <dependencylist componentDescriptor="${component.descriptor}" verbose="on" + fileListId="component.dep.flist"> + <dependencies dir="${carrot2.cvs.dir}/lib"> + <include name="*.dep.xml" /> + </dependencies> + </dependencylist> + + <copyfilelist todir="${distribution.dir}"> + <filelist refid="component.dep.flist" /> + </copyfilelist> + </target> + <!-- }}} --> <!-- ##################################### --> *************** *** 70,75 **** includeantruntime = "false" includejavaruntime = "false" - classpathref = "compile.classpath" > <!-- add source code paths. --> <src path="${src.path}" /> --- 104,110 ---- includeantruntime = "false" includejavaruntime = "false" > + <classpath refid="classpath.dependencies" /> + <classpath location="${carrot2.cvs.dir}/lib/compile-time-only/servlet.jar" /> <!-- add source code paths. --> <src path="${src.path}" /> |
From: <daw...@us...> - 2004-02-06 18:19:31
|
Update of /cvsroot/carrot2/carrot2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4867 Modified Files: build.xml history.xml issues.txt readme.txt Removed Files: libraries.LICENCE todo.txt Log Message: [new], component: global Added a new ANT task to manage JAR interdependencies in the project. Now you can easily collect all JARs that a component requires, plus only these JARs are use d at compile-time. Try using these targets on build files of components: 'ant show.dependencies' (shows all required components and JAR files), 'ant collect.dependencies' (copies the required JARs to the distribution.dir folder). [refactoring], component: global Build files have changed, so ANT1.6 is now a requirement. Index: build.xml =================================================================== RCS file: /cvsroot/carrot2/carrot2/build.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** build.xml 23 Nov 2003 23:39:02 -0000 1.3 --- build.xml 6 Feb 2004 18:16:14 -0000 1.4 *************** *** 44,63 **** <echo level="info" message="#### Cleaning up components..." /> - <!-- Common lib (local clean) --> - <ant antfile="build.xml" dir="components/carrot2-shared-lib" inheritall="false" target="clean" /> - <!-- Controllers --> - <ant antfile="build.xml" dir="components/controllers/carrot2-web-controller" inheritall="false" target="clean" /> <!-- filters --> ! <ant antfile="build.xml" dir="components/filters/clustering/ahc-clustering" inheritall="false" target="clean" /> ! <ant antfile="build.xml" dir="components/filters/clustering/lingo-clustering" inheritall="false" target="clean" /> ! <ant antfile="build.xml" dir="components/filters/clustering/stc-clustering" inheritall="false" target="clean" /> ! <ant antfile="build.xml" dir="components/filters/diagnostic/stream-interceptor" inheritall="false" target="clean" /> ! <ant antfile="build.xml" dir="components/filters/linguistic/pl-eng-stemming" inheritall="false" target="clean" /> ! <ant antfile="build.xml" dir="components/filters/pruning/text-only" inheritall="false" target="clean" /> ! <ant antfile="build.xml" dir="components/inputs/snippet-generator" inheritall="false" target="clean" /> ! <ant antfile="build.xml" dir="components/inputs/snippet-reader" inheritall="false" target="clean" /> ! <ant antfile="build.xml" dir="components/inputs/treeSnippetMiner" inheritall="false" target="clean" /> ! <ant antfile="build.xml" dir="components/inputs/verbatim-input" inheritall="false" target="clean" /> ! <ant antfile="build.xml" dir="components/outputs/xslt-renderer" inheritall="false" target="clean" /> <echo level="info" message="#### Cleaning up local build directory" /> --- 44,53 ---- <echo level="info" message="#### Cleaning up components..." /> <!-- filters --> ! <subant target="clean" inheritall="false"> ! <fileset dir="components"> ! <include name="**/build.xml" /> ! </fileset> ! </subant> <echo level="info" message="#### Cleaning up local build directory" /> *************** *** 75,81 **** --- 65,75 ---- <!-- build shared library to shared libraries directory --> + <ant antfile="build.xml" dir="components/carrot2-shared-lib" inheritall="false" target="clean" /> <ant antfile="build.xml" dir="components/carrot2-shared-lib" inheritall="false" target="build"> <property name="distribution.dir" location="lib" /> </ant> + <!-- copy the dependency specification --> + <copy file="components/carrot2-shared-lib/carrot2-shared-lib.dep.xml" + tofile="lib/carrot2-shared-lib.dep.xml" overwrite="true" /> </target> <!-- }}} --> *************** *** 160,175 **** </target> <!-- }}} --> - <target name="build.text-only" depends="init"> <!-- {{{ --> - <echo> - - #### Building: text-only pruning filter #### - - </echo> - <ant antfile="build.xml" target="build" dir="components/filters/pruning/text-only" inheritall="false"> - <property name="distribution.dir" location="${distribution.dir}" /> - <property name="javadoc.dir" location="${javadoc.dir}" /> - </ant> - </target> <!-- }}} --> - <target name="build.snippet-generator" depends="init"> <!-- {{{ --> <echo> --- 154,157 ---- *************** *** 242,246 **** build.stream-interceptors, build.pl-eng-stemming, - build.text-only, build.snippet-generator, build.snippet-reader, --- 224,227 ---- Index: history.xml =================================================================== RCS file: /cvsroot/carrot2/carrot2/history.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** history.xml 4 Feb 2004 20:32:13 -0000 1.10 --- history.xml 6 Feb 2004 18:16:14 -0000 1.11 *************** *** 9,12 **** --- 9,45 ---- <history> <changelist> + <date>2004-02-06</date> + <committer>dawid</committer> + + <change component="carrot2.filter.text-only" type="refactoring"> + The text-only component has been removed. If you ever need it, + get it from the CVS history. + </change> + + <change component="global" type="refactoring"> + Build files have changed, so ANT1.6 is now a requirement. + </change> + + <change component="global" type="new"> + Added a new ANT task to manage JAR interdependencies in the project. + Now you can easily collect all JARs that a component requires, plus + only these JARs are used at compile-time. Try using these targets + on build files of components: 'ant show.dependencies' (shows + all required components and JAR files), + 'ant collect.dependencies' (copies the required JARs to the distribution.dir folder). + </change> + </changelist> + + <changelist> + <date>2004-02-05</date> + <committer>dawid</committer> + <change component="carrot2-shared-lib" type="new"> + Added a new XML Serializer that takes into + account invalid XML characters and ignores them. + The performance of it can still be improved, but it can wait. + </change> + </changelist> + + <changelist> <date>2004-02-04</date> <committer>dawid</committer> Index: issues.txt =================================================================== RCS file: /cvsroot/carrot2/carrot2/issues.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** issues.txt 23 Nov 2003 23:39:02 -0000 1.1 --- issues.txt 6 Feb 2004 18:16:14 -0000 1.2 *************** *** 1,4 **** ! -- Massimo Miccoli reports: --- 1,5 ---- ! KNOWN ISSUES ! ------------ Massimo Miccoli reports: Index: readme.txt =================================================================== RCS file: /cvsroot/carrot2/carrot2/readme.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** readme.txt 23 Nov 2003 23:39:02 -0000 1.3 --- readme.txt 6 Feb 2004 18:16:14 -0000 1.4 *************** *** 1,37 **** Carrot2 Project ! Copyright (C) 2002-2003, Dawid Weiss ! Portions (C) Contributors listen in carrot2.CONTRIBUTORS file. - --- ! In order to build Carrot2's components, you must have ANT in your ! path. Issue the following command: ! ant build ! Components will be compiled into a set of WAR files placed in - tmp/dist ! --- ! 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: ant -Ddeployment.port=80 -Ddeployment.host=myhost.com build.webcontroller - --- ! Tests suite and documentation is available as a separate CVS checkout, ! or on-line. ! --- ! Subscribe to project mailing lists to keep up to date with changes: car...@li... car...@li... --- 1,75 ---- Carrot2 Project ! See the license file for legal information. ! INFORMATION ! =========== ! Carrot2 is a component-based data processing framework, created ! especially for the reason of clustering search results from ! search engines (but not only). ! See more at: ! http://carrot.cs.put.poznan.pl ! ACQUIRING BINARY RELEASE ! ======================== ! It is advised that you grap a binary release of the Carrot2 components from the ! nightly build drop-off zone at: ! ! http://carrot.cs.put.poznan.pl/static/download/nightly/ ! ! ! BUILDING FROM SOURCES ! ===================== ! ! In order to build Carrot2's components, you must have ANT in your path. We use ! ANT 1.6, lower versions are not supported but may work. ! ! This command should build all the components for you and place them in tmp/dist. ! ! ant build ! ! ! THE WEB CONTROLLER COMPONENT ! ============================ ! ! The web controller component for Carrot2 uses the rest of the components to ! process user queries. The controller looks for services offered by components ! using 'descriptors'. Sample component descriptors (and process descriptors that ! bind them together) can be found in 'descriptors' folder. You should adjust the ! host and port in these descriptors to match your configuration (localhost for ! local deployment). You can also override these properties at build-time using ! the following variables: ant -Ddeployment.port=80 -Ddeployment.host=myhost.com build.webcontroller ! TEST SUITE AND DOCUMENTATION ! ============================ ! Tests suite and documentation are available as a separate CVS checkout, or on- ! line at: ! http://carrot.cs.put.poznan.pl ! ! ! CONTACT ! ======= ! ! If you have questions or problems, subscribe to: car...@li... car...@li... + This e-mailing list will keep you up to date with changes: + + car...@li... + + Other inquiries can be directed to project coordinator: + + Dawid Weiss <daw...@cs...> + --- libraries.LICENCE DELETED --- --- todo.txt DELETED --- |
Update of /cvsroot/carrot2/carrot2/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4867/lib Modified Files: carrot2-adapters.jar carrot2-shared-lib.jar struts.jar Added Files: FSA.jar Jama-1.0.1.jar carrot2-shared-lib-only.dep.xml carrot2-shared-lib.dep.xml castor.LICENCE castor.dep.xml colt.dep.xml commons-beanutils.LICENCE commons-beanutils.dep.xml commons-collections.LICENCE dweiss-utils.dep.xml gnu-regexp.LICENCE gnu-regexp.dep.xml jama.dep.xml jdom.LICENCE jdom.dep.xml lametyzator.dep.xml lametyzator.jar log4j.LICENCE log4j.dep.xml put-utils.dep.xml saxon.dep.xml struts.LICENCE struts.dep.xml xerces.LICENCE xerces.dep.xml Removed Files: jaxp.jar junit.jar Log Message: [new], component: global Added a new ANT task to manage JAR interdependencies in the project. Now you can easily collect all JARs that a component requires, plus only these JARs are use d at compile-time. Try using these targets on build files of components: 'ant show.dependencies' (shows all required components and JAR files), 'ant collect.dependencies' (copies the required JARs to the distribution.dir folder). [refactoring], component: global Build files have changed, so ANT1.6 is now a requirement. --- NEW FILE: FSA.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: Jama-1.0.1.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: carrot2-shared-lib-only.dep.xml --- <!-- This is mostly for adapters. They only use utility functions. --> <component name="carrot2-shared-lib-only"> <provides file="carrot2-shared-lib.jar" /> </component> --- NEW FILE: carrot2-shared-lib.dep.xml --- <!-- A dependency descriptor. This has to be updated manually when new JARs are required. --> <component name="carrot2-shared-lib"> <provides file="carrot2-shared-lib.jar" /> <dependency name="dweiss-utils" /> <dependency name="castor" /> <dependency name="jdom" /> <dependency name="put-utils" /> <dependency name="log4j" /> </component> --- NEW FILE: castor.LICENCE --- Copyright 1999-2003 (C) Intalio Inc. All Rights Reserved. Redistribution and use of this software and associated documentation ("Software"), with or without modification, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain copyright statements and notices. Redistributions must also contain a copy of this document. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. 3. The name "ExoLab" must not be used to endorse or promote products derived from this Software without prior written permission of Intalio Inc. For written permission, please contact in...@ex.... 4. Products derived from this Software may not be called "Castor" nor may "Castor" appear in their names without prior written permission of Intalio Inc. Exolab, Castor and Intalio are trademarks of Intalio Inc. 5. Due credit should be given to the ExoLab Project (http://www.exolab.org/). THIS SOFTWARE IS PROVIDED BY INTALIO AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTALIO OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. --- NEW FILE: castor.dep.xml --- <component name="castor"> <!-- Files that this component is composed of --> <file location="castor-0.9.4.2-xml.jar" /> <dependency name="xerces" /> </component> --- NEW FILE: colt.dep.xml --- <component name="colt"> <!-- Files that this component is composed of --> <file location="colt.jar" /> <dependency name="xerces" /> </component> --- NEW FILE: commons-beanutils.LICENCE --- /* * Header: /home/cvspublic/jakarta-commons/beanutils/LICENSE.txt,v 1.3 2003/01/15 21:59:38 rdonkin Exp * Revision: 1.3 * Date: 2003/01/15 21:59:38 * * ==================================================================== * * The Apache Software License, Version 1.1 * * Copyright (c) 1999-2003 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. * * 3. The end-user documentation included with the redistribution, if * any, must include the following acknowlegement: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowlegement may appear in the software itself, * if and wherever such third-party acknowlegements normally appear. * * 4. The names "The Jakarta Project", "Commons", and "Apache Software * Foundation" must not be used to endorse or promote products derived * from this software without prior written permission. For written * permission, please contact ap...@ap.... * * 5. Products derived from this software may not be called "Apache" * nor may "Apache" appear in their names without prior written * permission of the Apache Group. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * ==================================================================== * * This software consists of voluntary contributions made by many * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * <http://www.apache.org/>. * */ --- NEW FILE: commons-beanutils.dep.xml --- <component name="commons-beanutils"> <!-- Files that this component is composed of --> <file location="commons-beanutils.jar" /> <file location="commons-logging.jar" /> <file location="commons-collections.jar" /> </component> --- NEW FILE: commons-collections.LICENCE --- /* * Header: /home/cvs/jakarta-commons/collections/LICENSE.txt,v 1.1 2002/07/25 02:36:45 jvanzyl Exp * Revision: 1.1 * Date: 2002/07/25 02:36:45 * * ==================================================================== * * The Apache Software License, Version 1.1 * * Copyright (c) 1999-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. * * 3. The end-user documentation included with the redistribution, if * any, must include the following acknowlegement: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowlegement may appear in the software itself, * if and wherever such third-party acknowlegements normally appear. * * 4. The names "The Jakarta Project", "Commons", and "Apache Software * Foundation" must not be used to endorse or promote products derived * from this software without prior written permission. For written * permission, please contact ap...@ap.... * * 5. Products derived from this software may not be called "Apache" * nor may "Apache" appear in their names without prior written * permission of the Apache Group. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * ==================================================================== * * This software consists of voluntary contributions made by many * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * <http://www.apache.org/>. * */ --- NEW FILE: dweiss-utils.dep.xml --- <component name="dweiss-utils"> <!-- Files that this component is composed of --> <file location="dweiss-utils.jar" /> </component> --- NEW FILE: gnu-regexp.LICENCE --- GNU LESSER GENERAL PUBLIC LICENSE Version 2.1, February 1999 Copyright (C) 1991, 1999 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. [This is the first released version of the Lesser GPL. It also counts as the successor of the GNU Library Public License, version 2, hence the version number 2.1.] Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below. When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things. To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it. For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights. We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library. To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others. Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license. Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs. When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library. We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances. For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License. In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system. Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library. The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run. GNU LESSER GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you". A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables. The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".) "Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library. Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does. 1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. 2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: a) The modified work must itself be a software library. b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change. c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License. d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful. (For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.) These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library. In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. 3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. This option is useful when you wish to copy part of the code of the Library into a program that is not a library. 4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange. If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code. 5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License. However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables. When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law. If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.) Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. 6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications. You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things: a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.) b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with. c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution. d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place. e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy. For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. 7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things: a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above. b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work. 8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. 9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it. 10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License. 11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library. If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances. It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. 12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. 13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. 14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. NO WARRANTY 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS How to Apply These Terms to Your New Libraries If you develop a new library, and you want it to be of the greatest possible use to the public, we recommend making it free software that everyone can redistribute and change. You can do so by permitting redistribution under these terms (or, alternatively, under the terms of the ordinary General Public License). To apply these terms, attach the following notices to the library. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the library's name and a brief idea of what it does.> Copyright (C) <year> <name of author> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Also add information on how to contact you by electronic and paper mail. You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the library, if necessary. Here is a sample; alter the names: Yoyodyne, Inc., hereby disclaims all copyright interest in the library `Frob' (a library for tweaking knobs) written by James Random Hacker. <signature of Ty Coon>, 1 April 1990 Ty Coon, President of Vice That's all there is to it! --- NEW FILE: gnu-regexp.dep.xml --- <component name="gnu-regexp"> <!-- Files that this component is composed of --> <file location="gnu-regexp-1.1.4.jar" /> </component> --- NEW FILE: jama.dep.xml --- <component name="jama"> <!-- Files that this component is composed of --> <file location="Jama-1.0.1.jar" /> </component> --- NEW FILE: jdom.LICENCE --- /*-- Id: LICENSE.txt,v 1.10 2003/04/10 08:36:05 jhunter Exp Copyright (C) 2000-2003 Jason Hunter & Brett McLaughlin. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 1. Redistributions of source code must retain the above copyright notice, this list of conditions, and the following disclaimer. 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions, and the disclaimer that follows these conditions in the documentation and/or other materials provided with the distribution. 3. The name "JDOM" must not be used to endorse or promote products derived from this software without prior written permission. For written permission, please contact <license AT jdom DOT org>. 4. Products derived from this software may not be called "JDOM", nor may "JDOM" appear in their name, without prior written permission from the JDOM Project Management <pm AT jdom DOT org>. In addition, we request (but do not require) that you include in the end-user documentation provided with the redistribution and/or in the software itself an acknowledgement equivalent to the following: "This product includes software developed by the JDOM Project (http://www.jdom.org/)." Alternatively, the acknowledgment may be graphical using the logos available at http://www.jdom.org/images/logos. THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. This software consists of voluntary contributions made by many individuals on behalf of the JDOM Project and was originally created by Jason Hunter <jhunter AT jdom DOT org> and Brett McLaughlin <brett AT jdom DOT org>. For more information on the JDOM Project, please see <http://www.jdom.org/>. */ --- NEW FILE: jdom.dep.xml --- <component name="jdom"> <!-- Files that this component is composed of --> <file location="jdom.jar" /> </component> --- NEW FILE: lametyzator.dep.xml --- <!-- A dependency descriptor. This has to be updated manually when new JARs are required. --> <component name="lametyzator"> <file location="FSA.jar" /> <file location="lametyzator.jar" /> </component> --- NEW FILE: lametyzator.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: log4j.LICENCE --- /* * ============================================================================ * The Apache Software License, Version 1.1 * ============================================================================ * * Copyright (C) 1999 The Apache Software Foundation. All rights reserved. * * Redistribution and use in source and binary forms, with or without modifica- * tion, are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright notice, * this list of conditions and the following disclaimer in the documentation * and/or other materials provided with the distribution. * * 3. The end-user documentation included with the redistribution, if any, must * include the following acknowledgment: "This product includes software * developed by the Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, if * and wherever such third-party acknowledgments normally appear. * * 4. The names "log4j" and "Apache Software Foundation" must not be used to * endorse or promote products derived from this software without prior * written permission. For written permission, please contact * ap...@ap.... * * 5. Products derived from this software may not be called "Apache", nor may * "Apache" appear in their name, without prior written permission of the * Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU- * DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * This software consists of voluntary contributions made by many individuals * on behalf of the Apache Software Foundation. For more information on the * Apache Software Foundation, please see <http://www.apache.org/>. * */ --- NEW FILE: log4j.dep.xml --- <component name="log4j"> <!-- Files that this component is composed of --> <file location="log4j-1.2.7.jar" /> </component> --- NEW FILE: put-utils.dep.xml --- <component name="put-utils"> <!-- Files that this component is composed of --> <file location="put-utils.jar" /> <dependency name="commons-beanutils" /> </component> --- NEW FILE: saxon.dep.xml --- <component name="saxon"> <file location="saxon.jar" /> </component> --- NEW FILE: struts.LICENCE --- /* * Header: /home/cvs/jakarta-struts/LICENSE,v 1.2 2001/02/02 00:38:31 craigmcc Exp * Revision: 1.2 * Date: 2001/02/02 00:38:31 * * ==================================================================== * * The Apache Software License, Version 1.1 * * Copyright (c) 1999-2001 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. * * 3. The end-user documentation included with the redistribution, if * any, must include the following acknowlegement: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowlegement may appear in the software itself, * if and wherever such third-party acknowlegements normally appear. * * 4. The names "The Jakarta Project", "Struts", and "Apache Software * Foundation" must not be used to endorse or promote products derived * from this software without prior written permission. For written * permission, please contact ap...@ap.... * * 5. Products derived from this software may not be called "Apache" * nor may "Apache" appear in their names without prior written * permission of the Apache Group. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * ==================================================================== * * This software consists of voluntary contributions made by many * individuals on behalf of the Apache Software Foundation. For more * information on the Apache Software Foundation, please see * <http://www.apache.org/>. * */ --- NEW FILE: struts.dep.xml --- <!-- A dependency descriptor. This has to be updated manually when new JARs are required. --> <component name="struts"> <file location="struts.jar" /> <dependency name="commons-beanutils" /> </component> --- NEW FILE: xerces.LICENCE --- /* * The Apache Software License, Version 1.1 * * * Copyright (c) 1999-2002 The Apache Software Foundation. All rights * reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the * distribution. * * 3. The end-user documentation included with the redistribution, * if any, must include the following acknowledgment: * "This product includes software developed by the * Apache Software Foundation (http://www.apache.org/)." * Alternately, this acknowledgment may appear in the software itself, * if and wherever such third-party acknowledgments normally appear. * * 4. The names "Xerces" and "Apache Software Foundation" must * not be used to endorse or promote products derived from this * software without prior written permission. For written * permission, please contact ap...@ap.... * * 5. Products derived from this software may not be called "Apache", * nor may "Apache" appear in their name, without prior written * permission of the Apache Software Foundation. * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * ==================================================================== * * This software consists of voluntary contributions made by many * individuals on behalf of the Apache Software Foundation and was * originally based on software copyright (c) 1999, International * Business Machines, Inc., http://www.ibm.com. For more * information on the Apache Software Foundation, please see * <http://www.apache.org/>. */ --- NEW FILE: xerces.dep.xml --- <component name="xerces"> <!-- Files that this component is composed of --> <file location="xercesImpl.jar" /> <file location="xml-apis.jar" /> </component> Index: carrot2-adapters.jar =================================================================== RCS file: /cvsroot/carrot2/carrot2/lib/carrot2-adapters.jar,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 Binary files /tmp/cvsmHM16r and /tmp/cvs7NomJR differ Index: carrot2-shared-lib.jar =================================================================== RCS file: /cvsroot/carrot2/carrot2/lib/carrot2-shared-lib.jar,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 Binary files /tmp/cvshxT7yu and /tmp/cvsdNgYdU differ Index: struts.jar =================================================================== RCS file: /cvsroot/carrot2/carrot2/lib/struts.jar,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 Binary files /tmp/cvsEKAYXy and /tmp/cvsxJ4LGY differ --- jaxp.jar DELETED --- --- junit.jar DELETED --- |
From: <daw...@us...> - 2004-02-06 18:19:19
|
Update of /cvsroot/carrot2/carrot2/lib/compile-time-only In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4867/lib/compile-time-only Added Files: junit.jar Log Message: [new], component: global Added a new ANT task to manage JAR interdependencies in the project. Now you can easily collect all JARs that a component requires, plus only these JARs are use d at compile-time. Try using these targets on build files of components: 'ant show.dependencies' (shows all required components and JAR files), 'ant collect.dependencies' (copies the required JARs to the distribution.dir folder). [refactoring], component: global Build files have changed, so ANT1.6 is now a requirement. --- NEW FILE: junit.jar --- (This appears to be a binary file; contents omitted.) |
From: <daw...@us...> - 2004-02-06 18:19:19
|
Update of /cvsroot/carrot2/carrot2/components/filters/linguistic/pl-eng-stemming/src/com/dawidweiss/carrot/filter/stemming/porter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4867/components/filters/linguistic/pl-eng-stemming/src/com/dawidweiss/carrot/filter/stemming/porter Removed Files: PorterStemmer.java Log Message: [new], component: global Added a new ANT task to manage JAR interdependencies in the project. Now you can easily collect all JARs that a component requires, plus only these JARs are use d at compile-time. Try using these targets on build files of components: 'ant show.dependencies' (shows all required components and JAR files), 'ant collect.dependencies' (copies the required JARs to the distribution.dir folder). [refactoring], component: global Build files have changed, so ANT1.6 is now a requirement. --- PorterStemmer.java DELETED --- |
From: <daw...@us...> - 2004-02-06 18:19:10
|
Update of /cvsroot/carrot2/carrot2/components/filters/linguistic/pl-eng-stemming/src/com/dawidweiss/carrot/filter/stemming/lametyzator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4867/components/filters/linguistic/pl-eng-stemming/src/com/dawidweiss/carrot/filter/stemming/lametyzator Removed Files: Lametyzator.java polski.fsa Log Message: [new], component: global Added a new ANT task to manage JAR interdependencies in the project. Now you can easily collect all JARs that a component requires, plus only these JARs are use d at compile-time. Try using these targets on build files of components: 'ant show.dependencies' (shows all required components and JAR files), 'ant collect.dependencies' (copies the required JARs to the distribution.dir folder). [refactoring], component: global Build files have changed, so ANT1.6 is now a requirement. --- Lametyzator.java DELETED --- --- polski.fsa DELETED --- |
From: <daw...@us...> - 2004-02-06 18:19:08
|
Update of /cvsroot/carrot2/carrot2/components/filters/linguistic/pl-eng-stemming/src/com/dawidweiss/carrot/filter/stemming In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4867/components/filters/linguistic/pl-eng-stemming/src/com/dawidweiss/carrot/filter/stemming Removed Files: DirectStemmer.java Log Message: [new], component: global Added a new ANT task to manage JAR interdependencies in the project. Now you can easily collect all JARs that a component requires, plus only these JARs are use d at compile-time. Try using these targets on build files of components: 'ant show.dependencies' (shows all required components and JAR files), 'ant collect.dependencies' (copies the required JARs to the distribution.dir folder). [refactoring], component: global Build files have changed, so ANT1.6 is now a requirement. --- DirectStemmer.java DELETED --- |
From: <daw...@us...> - 2004-02-06 18:19:08
|
Update of /cvsroot/carrot2/carrot2/components/filters/linguistic/pl-eng-stemming/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4867/components/filters/linguistic/pl-eng-stemming/lib Removed Files: FSA.jar Log Message: [new], component: global Added a new ANT task to manage JAR interdependencies in the project. Now you can easily collect all JARs that a component requires, plus only these JARs are use d at compile-time. Try using these targets on build files of components: 'ant show.dependencies' (shows all required components and JAR files), 'ant collect.dependencies' (copies the required JARs to the distribution.dir folder). [refactoring], component: global Build files have changed, so ANT1.6 is now a requirement. --- FSA.jar DELETED --- |
From: <daw...@us...> - 2004-02-06 18:19:08
|
Update of /cvsroot/carrot2/carrot2/components/filters/clustering/lingo-clustering/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4867/components/filters/clustering/lingo-clustering/lib Removed Files: FSA.jar Jama-1.0.1.jar junit.jar stemming.jar Log Message: [new], component: global Added a new ANT task to manage JAR interdependencies in the project. Now you can easily collect all JARs that a component requires, plus only these JARs are use d at compile-time. Try using these targets on build files of components: 'ant show.dependencies' (shows all required components and JAR files), 'ant collect.dependencies' (copies the required JARs to the distribution.dir folder). [refactoring], component: global Build files have changed, so ANT1.6 is now a requirement. --- FSA.jar DELETED --- --- Jama-1.0.1.jar DELETED --- --- junit.jar DELETED --- --- stemming.jar DELETED --- |
From: <daw...@us...> - 2004-02-06 18:19:06
|
Update of /cvsroot/carrot2/carrot2/components/controllers/carrot2-web-controller/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4867/components/controllers/carrot2-web-controller/lib Removed Files: struts.jar Log Message: [new], component: global Added a new ANT task to manage JAR interdependencies in the project. Now you can easily collect all JARs that a component requires, plus only these JARs are use d at compile-time. Try using these targets on build files of components: 'ant show.dependencies' (shows all required components and JAR files), 'ant collect.dependencies' (copies the required JARs to the distribution.dir folder). [refactoring], component: global Build files have changed, so ANT1.6 is now a requirement. --- struts.jar DELETED --- |
From: <daw...@us...> - 2004-02-06 18:19:06
|
Update of /cvsroot/carrot2/carrot2/components/carrot2-shared-lib/src-test/com/dawidweiss/carrot/ant In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4867/components/carrot2-shared-lib/src-test/com/dawidweiss/carrot/ant Added Files: GetDependenciesTaskTest.java dependency.xml Log Message: [new], component: global Added a new ANT task to manage JAR interdependencies in the project. Now you can easily collect all JARs that a component requires, plus only these JARs are use d at compile-time. Try using these targets on build files of components: 'ant show.dependencies' (shows all required components and JAR files), 'ant collect.dependencies' (copies the required JARs to the distribution.dir folder). [refactoring], component: global Build files have changed, so ANT1.6 is now a requirement. --- NEW FILE: GetDependenciesTaskTest.java --- /* * Carrot2 Project * Copyright (C) 2002-2003, Dawid Weiss * All rights reserved. * * Refer to full text of the licence "carrot2.LICENCE" in the root folder * of CVS checkout or at: * http://www.cs.put.poznan.pl/dweiss/carrot2.LICENCE */ package com.dawidweiss.carrot.ant; import junit.framework.TestCase; import org.apache.tools.ant.*; import org.apache.tools.ant.BuildListener; import org.apache.tools.ant.Project; import org.apache.tools.ant.types.FileSet; import org.xml.sax.SAXException; import java.io.File; import java.io.IOException; import javax.xml.parsers.ParserConfigurationException; /** * A test case for ANT dependency checker. */ public class GetDependenciesTaskTest extends TestCase { public GetDependenciesTaskTest() { super(); } public GetDependenciesTaskTest(String arg0) { super(arg0); } public void testDependencyChecker() throws ParserConfigurationException, SAXException, IOException { Project project = new Project(); project.setBaseDir(new File(".")); project.init(); project.addBuildListener( new BuildListener() { public void buildStarted(BuildEvent arg0) { } public void buildFinished(BuildEvent arg0) { } public void targetStarted(BuildEvent arg0) { } public void targetFinished(BuildEvent arg0) { } public void taskStarted(BuildEvent arg0) { } public void taskFinished(BuildEvent arg0) { } public void messageLogged(BuildEvent arg0) { System.out.println(arg0.getMessage()); } } ); GetDependenciesTask task = new GetDependenciesTask(); task.setProject(project); task.setProperty("testproperty"); task.setComponentDescriptor( new File("com/dawidweiss/carrot/ant/dependency.xml".replace('/', File.separatorChar)) ); FileSet fs = task.createDependencies(); fs.setDir(new File(".")); fs.setIncludes("**/*.dep.xml"); task.execute(); assertEquals( new File( "com/dawidweiss/carrot/ant/subdir/component-b.dep.xml".replace( '/', File.separatorChar ) ).getCanonicalPath(), new File(project.getProperty("testproperty")).getCanonicalPath() ); } public void testPropertyNameWithPropertiesInside() throws ParserConfigurationException, SAXException, IOException { Project project = new Project(); project.setBaseDir(new File(".")); project.init(); project.setProperty("propertyname", "value"); GetDependenciesTask task = new GetDependenciesTask(); task.setProject(project); task.setProperty("${propertyname}.dep"); task.setComponentDescriptor( new File("com/dawidweiss/carrot/ant/dependency.xml".replace('/', File.separatorChar)) ); FileSet fs = task.createDependencies(); fs.setDir(new File(".")); fs.setIncludes("**/*.dep.xml"); task.execute(); assertNotNull(project.getProperty("value.dep")); assertEquals( new File( "com/dawidweiss/carrot/ant/subdir/component-b.dep.xml".replace( '/', File.separatorChar ) ).getCanonicalPath(), new File(project.getProperty("value.dep")).getCanonicalPath() ); } } --- NEW FILE: dependency.xml --- <component name="mycomponent"> <dependency name="a" /> <dependency name="b" /> </component> |
Update of /cvsroot/carrot2/carrot2/components/carrot2-shared-lib/src-test/com/dawidweiss/carrot/ant/subdir In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4867/components/carrot2-shared-lib/src-test/com/dawidweiss/carrot/ant/subdir Added Files: component-a.dep.xml component-b.dep.xml component-c.dep.xml Log Message: [new], component: global Added a new ANT task to manage JAR interdependencies in the project. Now you can easily collect all JARs that a component requires, plus only these JARs are use d at compile-time. Try using these targets on build files of components: 'ant show.dependencies' (shows all required components and JAR files), 'ant collect.dependencies' (copies the required JARs to the distribution.dir folder). [refactoring], component: global Build files have changed, so ANT1.6 is now a requirement. --- NEW FILE: component-a.dep.xml --- <component name="a"> </component> --- NEW FILE: component-b.dep.xml --- <component name="b"> <dependency name="c" /> </component> --- NEW FILE: component-c.dep.xml --- <component name="c"> <file location="component-b.dep.xml" /> </component> |
From: <daw...@us...> - 2004-02-06 18:19:06
|
Update of /cvsroot/carrot2/carrot2/components/carrot2-shared-lib/src/com/dawidweiss/carrot/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4867/components/carrot2-shared-lib/src/com/dawidweiss/carrot/util Added Files: XMLSerializerHelper.java Log Message: [new], component: global Added a new ANT task to manage JAR interdependencies in the project. Now you can easily collect all JARs that a component requires, plus only these JARs are use d at compile-time. Try using these targets on build files of components: 'ant show.dependencies' (shows all required components and JAR files), 'ant collect.dependencies' (copies the required JARs to the distribution.dir folder). [refactoring], component: global Build files have changed, so ANT1.6 is now a requirement. --- NEW FILE: XMLSerializerHelper.java --- /* * Carrot2 Project * Copyright (C) 2002-2003, Dawid Weiss * All rights reserved. * * Refer to full text of the licence "carrot2.LICENCE" in the root folder * of CVS checkout or at: * http://www.cs.put.poznan.pl/dweiss/carrot2.LICENCE */ package com.dawidweiss.carrot.util; import java.io.IOException; import java.io.Writer; /** * A utility class for encoding Java String into XML text chunks. Please note that some characters * cannot be serialized into an XML text. Refer to <a * href="http://www.w3.org/TR/2000/REC-xml-20001006#charsets"> XML specification</a> for more * information. * * Instances of this class are not guaranteed to be thread-safe. */ public class XMLSerializerHelper { /** * A public instance for faster one-time access, <b>this instance is synchronized * </b> because it uses a shared memory buffer to copy/ encode. */ public static final XMLSerializerHelper instance = new XMLSerializerHelper() { public synchronized void writeValidXmlText(Writer writer, String str, boolean exceptionOnUnescapable) throws IOException { super.writeValidXmlText(writer, str, exceptionOnUnescapable); } public synchronized String toValidXmlText(String str, boolean exceptionOnUnescapable) { return super.toValidXmlText(str, exceptionOnUnescapable); } }; /** * Returns an instance of the serializer. The instance is not thread-safe, * but can be reused many times (and should be). */ public static XMLSerializerHelper getInstance() { return new XMLSerializerHelper(); } /** * Use static <code>instance</code> field. */ private XMLSerializerHelper() { } /** * Escapes a string so that it can be safely put into an XML text node and writes it to the * <code>writer</code>. Please note that some characters cannot be serialized into an XML * text. Refer to <a href="http://www.w3.org/TR/2000/REC-xml-20001006#charsets"> XML * specification</a> for more information. * * @param writer The writer to output the string to. * @param str The string to be escaped. * @param exceptionOnUnescapable If true, <code>IllegalArgumentException</code> is thrown when * an unescapable sequence of characters is encountered. Otherwise, the offending * characters will be omitted in the output. */ public void writeValidXmlText(Writer writer, String str, boolean exceptionOnUnescapable) throws IOException { writer.write(toValidXmlText(str, exceptionOnUnescapable)); } /** * Escapes a string so that it can be safely put into an XML text node. Please note that some * characters cannot be serialized into an XML text. Refer to <a * href="http://www.w3.org/TR/2000/REC-xml-20001006#charsets"> XML specification</a> for more * information. * * @param str The string to be escaped. * @param exceptionOnUnescapable If true, <code>IllegalArgumentException</code> is thrown when * an unescapable sequence of characters is encountered. Otherwise, the offending * characters will be omitted in the output. */ public String toValidXmlText(String str, boolean exceptionOnUnescapable) { StringBuffer buffer = null; for (int i = 0; i < str.length(); i++) { char ch = str.charAt(i); String entity; switch (ch) { case '<': // '<' entity = "<"; break; case '>': // '>' entity = ">"; break; case '&': // '&' entity = "&"; break; case '\'': entity = "'"; break; case '"': entity = """; break; case 0x09: // valid xml characters case 0x0a: case 0x0d: entity = null; break; default: // check if valid XML characters if ( ((ch >= 0x20) && (ch <= 0xD7FF)) || ((ch >= 0xe000) && (ch <= 0xfffd)) || ((ch >= 0x10000) && (ch <= 0x10ffff)) ) { entity = null; break; } else { if (exceptionOnUnescapable) { throw new IllegalArgumentException( "Character is not within valid XML characters (code: 0x" + Integer.toHexString(ch) + ", position: " + i + ")." ); } else { // replace the character with an empty string. entity = ""; break; } } } if (buffer == null) { if (entity != null) { buffer = new StringBuffer(str.length() + 20); buffer.append(str.substring(0, i)); buffer.append(entity); } } else { if (entity == null) { buffer.append(ch); } else { buffer.append(entity); } } } return (buffer != null) ? buffer.toString() : str; } } |
From: <daw...@us...> - 2004-02-06 18:19:05
|
Update of /cvsroot/carrot2/carrot2/components/carrot2-shared-lib/src-test/com/dawidweiss/carrot/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4867/components/carrot2-shared-lib/src-test/com/dawidweiss/carrot/util Added Files: XMLSerializerHelperTest.java Log Message: [new], component: global Added a new ANT task to manage JAR interdependencies in the project. Now you can easily collect all JARs that a component requires, plus only these JARs are use d at compile-time. Try using these targets on build files of components: 'ant show.dependencies' (shows all required components and JAR files), 'ant collect.dependencies' (copies the required JARs to the distribution.dir folder). [refactoring], component: global Build files have changed, so ANT1.6 is now a requirement. --- NEW FILE: XMLSerializerHelperTest.java --- /* * Carrot2 Project * Copyright (C) 2002-2003, Dawid Weiss * Portions (C) Contributors listen in carrot2.CONTRIBUTORS file. * All rights reserved. * * Refer to full text of the licence "carrot2.LICENCE" in the root folder * of CVS checkout or at: * http://www.cs.put.poznan.pl/dweiss/carrot2.LICENCE */ package com.dawidweiss.carrot.util; import junit.framework.TestCase; /** * The <code>XMLSerializerHelper</code> test cases. */ public class XMLSerializerHelperTest extends TestCase { public XMLSerializerHelperTest(String s) { super(s); } /** * Test regular string (no change should be made). */ public void testNoEscapedString() { String str = "abcdef \n\r\t xy."; assertEquals( str, XMLSerializerHelper.instance.toValidXmlText(str, false)); } /** * Test default entities. */ public void testDefaultEntities() { String str = ":&\"'<>:"; String expected = ":&"'<>:"; assertEquals( expected, XMLSerializerHelper.instance.toValidXmlText(str, false)); } /** * Test silent omission of invalid XML characters. */ public void testSilentTreatmentOfInvalidCharacters() { String str = ":" + (char) 0x1b + ":"; String expected = "::"; try { assertEquals( expected, XMLSerializerHelper.instance.toValidXmlText(str, false)); } catch (IllegalArgumentException e) { fail("silent treatment of an invalid char sequence caused an exception."); } } /** * Test exception on treatment of invalid XML characters. */ public void testExceptionOnTreatmentOfInvalidCharacters() { String str = ":" + (char) 0x1b + ":"; String expected = "::"; try { assertEquals( expected, XMLSerializerHelper.instance.toValidXmlText(str, true)); fail("Exception was expected."); } catch (IllegalArgumentException e) { // this is all right. we expected it. } } /** * Tests whether the newInstance factory method is usable. */ public void testNewInstanceAccessor() { XMLSerializerHelper.getInstance().toValidXmlText("",false); } } |
Update of /cvsroot/carrot2/carrot2/components/carrot2-shared-lib/src/com/dawidweiss/carrot/ant In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4867/components/carrot2-shared-lib/src/com/dawidweiss/carrot/ant Added Files: AbsolutePathFileList.java CopyFileList.java GetDependenciesTask.java dependencies.antlib.xml Log Message: [new], component: global Added a new ANT task to manage JAR interdependencies in the project. Now you can easily collect all JARs that a component requires, plus only these JARs are use d at compile-time. Try using these targets on build files of components: 'ant show.dependencies' (shows all required components and JAR files), 'ant collect.dependencies' (copies the required JARs to the distribution.dir folder). [refactoring], component: global Build files have changed, so ANT1.6 is now a requirement. --- NEW FILE: AbsolutePathFileList.java --- /* * Carrot2 Project * Copyright (C) 2002-2003, Dawid Weiss * All rights reserved. * * Refer to full text of the licence "carrot2.LICENCE" in the root folder * of CVS checkout or at: * http://www.cs.put.poznan.pl/dweiss/carrot2.LICENCE */ package com.dawidweiss.carrot.ant; import org.apache.tools.ant.*; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.types.FileList; import org.apache.tools.ant.util.FileUtils; import java.io.File; import java.io.IOException; import java.util.ArrayList; /** * A subclass of <code>FileList</code> that contains only absolute file references. */ public class AbsolutePathFileList extends FileList { private String error; private ArrayList files = new ArrayList(); public AbsolutePathFileList() { super(); } /** * Adds a single file to this fileset. */ public void addFile(File file) { if (file.isAbsolute() == false) { throw new RuntimeException( "Only absolute references are accepted" + " in this file list." ); } files.add(file.getAbsolutePath()); } /** * Return the root of the filesystem. */ public File getDir(Project s) { File root = ((files.size() == 0) ? s.getBaseDir() : new File((String) files.get(0))); while (root.getParentFile() != null) { root = root.getParentFile(); } return root; } /** * Forbid attribute. */ public void setDir(File arg0) throws BuildException { throw new RuntimeException("This type does not accept dir attribute."); } /** * @see org.apache.tools.ant.types.FileList#getFiles(org.apache.tools.ant.Project) */ public String [] getFiles(Project arg0) { String [] filesAsStrings = new String[files.size()]; files.toArray(filesAsStrings); try { File absRoot = getDir(getProject()).getCanonicalFile(); FileUtils futils = FileUtils.newFileUtils(); for (int i = 0; i < filesAsStrings.length; i++) { File path = new File( futils.removeLeadingPath(absRoot, new File(filesAsStrings[i])) ); if (path.isAbsolute()) { throw new RuntimeException( "Dependency list spans across many volumes. File lists in ANT do not allow this situation." ); } filesAsStrings[i] = path.getPath(); } } catch (IOException e) { } return filesAsStrings; } } --- NEW FILE: CopyFileList.java --- package com.dawidweiss.carrot.ant; import java.io.File; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.Copy; import org.apache.tools.ant.types.FileList; import org.apache.tools.ant.util.FileUtils; /** * An ANT task that copies a file list to certain directory. */ public class CopyFileList extends org.apache.tools.ant.Task { private File toDir; private FileList fileList; /** Public empty constructor */ public CopyFileList() { } public void setToDir(File todir) { this.toDir = todir; } /** * Creates a new file list element. */ public FileList createFileList() { if (fileList != null) throw new RuntimeException("Only one file list accepted."); fileList = new FileList(); return fileList; } /** * @see org.apache.tools.ant.Task#execute() */ public void execute() throws BuildException { if (getProject() == null) throw new BuildException("Project reference is required."); if (toDir.isDirectory()==false) { throw new BuildException("Not a directory: " + toDir); } if (this.fileList == null) { throw new BuildException("File list expected."); } Project prj = getProject(); FileUtils futils = FileUtils.newFileUtils(); String [] files = fileList.getFiles(prj); for (int i=0;i<files.length;i++) { File file = futils.resolveFile(fileList.getDir(prj), files[i]); Copy copyTask = new Copy(); copyTask.setProject(prj); copyTask.setFile(file); copyTask.setTodir(toDir); copyTask.execute(); } } } --- NEW FILE: GetDependenciesTask.java --- /* * Carrot2 Project * Copyright (C) 2002-2003, Dawid Weiss * All rights reserved. * * Refer to full text of the licence "carrot2.LICENCE" in the root folder * of CVS checkout or at: * http://www.cs.put.poznan.pl/dweiss/carrot2.LICENCE */ package com.dawidweiss.carrot.ant; import org.apache.tools.ant.*; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.types.FileSet; import org.apache.tools.ant.util.FileUtils; import org.w3c.dom.*; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.xml.sax.SAXException; import java.io.File; import java.io.IOException; import java.util.*; import java.util.ArrayList; import java.util.LinkedList; import javax.xml.parsers.*; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; /** * An ANT task that parses a dependency file and extracts information about all depending objects * into a string. */ public class GetDependenciesTask extends org.apache.tools.ant.Task { /** The component info file of the component for which dependencies are to be retrieved. */ private File componentDescriptor; /** * A list of pointers to dependency files for scanning against named dependencies (FileSet * objects) */ private LinkedList dependencies = new LinkedList(); /** The name of the property to save the dependent list of objects to. */ private String propertyName; /** The reference id of a file list to create (can be null). */ private String fileListId; /** Dumps a verbose info about dependencies. */ private boolean verbose; /** * Public empty constructor */ public GetDependenciesTask() { } /** * Sets a path to the dependency of the component for which dependencies are to be retrieved. */ public void setComponentDescriptor(File dependencyFile) throws ParserConfigurationException, SAXException, IOException { this.componentDescriptor = dependencyFile; } /** * Crates a new fileset with a set of dependency files to scan. */ public FileSet createDependencies() { FileSet newFileset = new FileSet(); dependencies.add(newFileset); return newFileset; } /** * Setter for property attribute. */ public void setProperty(String property) { this.propertyName = property; } /** * Sets the reference id of a file list to create. */ public void setFileListId(String id) { this.fileListId = id; } /** * If true, verbose info is printed during dependency tracking. */ public void setVerbose( boolean b) { this.verbose = b; } /** * @see org.apache.tools.ant.Task#execute() */ public void execute() throws BuildException { if (getProject() == null) { throw new BuildException("Project reference is required."); } if (this.componentDescriptor == null) { throw new BuildException("dependency-file attribute is required."); } FileUtils futils = FileUtils.newFileUtils(); try { ComponentDependency component = new ComponentDependency(this.componentDescriptor); // load all dependencies pointed to by embedded filesets. HashMap components = new HashMap(); for (Iterator i = dependencies.iterator(); i.hasNext();) { FileSet fs = (FileSet) i.next(); DirectoryScanner ds = fs.getDirectoryScanner(getProject()); File fromDir = fs.getDir(getProject()); String [] srcFiles = ds.getIncludedFiles(); for (int j = 0; j < srcFiles.length; j++) { ComponentDependency dep = new ComponentDependency( futils.resolveFile(fromDir, srcFiles[j]).getCanonicalFile() ); if (components.containsKey(dep.getName())) { throw new BuildException( "Component name duplicated: " + dep.getFile() + " and " + ((ComponentDependency) components.get(dep.getName())).getFile() ); } components.put(dep.getName(), dep); } } // gather dependencies required by the component. HashSet required = new HashSet(); HashSet requiredObjects = new HashSet(); ArrayList dependencyStack = new ArrayList(); dependencyStack.addAll(component.getDependentComponentNames()); int indent = 0; while (dependencyStack.isEmpty() == false) { Object object = dependencyStack.remove( dependencyStack.size() - 1 ); if (object instanceof Integer) { indent--; continue; } String requiredComponent = (String) object; if (required.contains(requiredComponent)) { if (verbose) { verboseLog(indent, "[component, repeated above] " + requiredComponent); } continue; } if (!components.containsKey(requiredComponent)) { if (verbose) { verboseLog(indent, "[component] ERROR NOT RESOLVED: " + requiredComponent); } throw new BuildException( "Component required by '" + component.getName() + "' was not found: " + requiredComponent ); } else { required.add(requiredComponent); if (verbose) { verboseLog(indent, "[component] " + requiredComponent); } ComponentDependency requiredComponentDependency = (ComponentDependency) components .get(requiredComponent); indent ++; dependencyStack.add(new Integer(indent) ); dependencyStack.addAll( requiredComponentDependency.getDependentComponentNames() ); requiredObjects.addAll(requiredComponentDependency.getRequiredObjects()); requiredObjects.addAll(requiredComponentDependency.getProvidedObjects()); if (verbose) { Collection c = requiredComponentDependency.getRequiredObjects(); for (Iterator k = c.iterator(); k.hasNext(); ) { verboseLog(indent+1, "[req file] " + k.next()); } c = requiredComponentDependency.getProvidedObjects(); for (Iterator k = c.iterator(); k.hasNext(); ) { verboseLog(indent+1, "[own file] " + k.next()); } } } } // add your own objects. requiredObjects.addAll(component.getRequiredObjects()); if (verbose) { Collection c = component.getRequiredObjects(); for (Iterator k = c.iterator(); k.hasNext(); ) { verboseLog(0, "[file] " + k.next()); } } StringBuffer componentsBuffer = new StringBuffer(); for (Iterator i = required.iterator(); i.hasNext();) { componentsBuffer.append(i.next()); if (i.hasNext()) { componentsBuffer.append(", "); } } Project project = getProject(); if (!project.getDataTypeDefinitions().containsKey("AbsolutePathFileList")) { project.addDataTypeDefinition("AbsolutePathFileList", AbsolutePathFileList.class); } AbsolutePathFileList list = (AbsolutePathFileList) project.createDataType( "AbsolutePathFileList" ); if (fileListId != null) { project.addReference(fileListId, list); } StringBuffer objectsBuffer = new StringBuffer(); for (Iterator i = requiredObjects.iterator(); i.hasNext();) { File requiredObject = (File) i.next(); objectsBuffer.append(requiredObject); list.addFile(requiredObject); if (i.hasNext()) { objectsBuffer.append(", "); } } log( "Component: \"" + component.getName() + "\" has the following required components: " + componentsBuffer, Project.MSG_VERBOSE ); log( "Component: \"" + component.getName() + "\" has the following required objects: " + objectsBuffer, Project.MSG_VERBOSE ); if (propertyName != null) { project.setProperty(project.replaceProperties(propertyName), objectsBuffer.toString()); } } catch (Exception e) { throw new BuildException(e); } } /** * Logs a message with indentation. */ private final void verboseLog(int indent, String msg) { StringBuffer buf = new StringBuffer(); for (int i = 0; i<indent; i++) buf.append(" "); buf.append(msg); log(buf.toString(), Project.MSG_INFO); } /** * A class that represents a component */ private class ComponentDependency { /** Name of this component. */ private String name; /** A list of objects this component is composed of (File objects) */ private ArrayList objects = new ArrayList(); /** A dependency list (by name, Strings) of this component. */ private ArrayList dependencies = new ArrayList(); /** A list of objects this component provides (File objects) */ private ArrayList provides = new ArrayList(); /** A file pointer to this component's xml */ private File file; public ComponentDependency(File file) throws ParserConfigurationException, SAXException, IOException { if (file.exists() == false) { throw new IOException("Dependency file cannot be read: " + file.getAbsolutePath()); } if (file.canRead() == false) { throw new IOException("Dependency file cannot be read: " + file.getAbsolutePath()); } this.file = file; log("Parsing dependency file: " + file, Project.MSG_VERBOSE); // parse the dependency file. DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); DocumentBuilder builder; builder = factory.newDocumentBuilder(); Document dependency = null; dependency = builder.parse(file); Element root = dependency.getDocumentElement(); if (!"component".equals(root.getNodeName())) { throw new SAXException("Root element name should be: 'component'"); } this.name = root.getAttribute("name"); FileUtils futils = FileUtils.newFileUtils(); // gather all files this component consists of NodeList files = root.getElementsByTagName("file"); for (int i = 0; i < files.getLength(); i++) { Element fileNode = (Element) files.item(i); String path = fileNode.getAttribute("location"); if ((path == null) || "".equals(path.trim())) { throw new SAXException("Expected 'location' attribute on file node."); } File object = futils.resolveFile(file.getParentFile(), path) .getCanonicalFile(); objects.add(object); log("Added component object: " + object, Project.MSG_DEBUG); } // gather all dependencies by name files = root.getElementsByTagName("dependency"); for (int i = 0; i < files.getLength(); i++) { Element fileNode = (Element) files.item(i); String depName = fileNode.getAttribute("name"); if ((depName == null) || "".equals(depName.trim())) { throw new SAXException("Expected 'name' attribute on dependency node."); } dependencies.add(depName); log("Added dependency to component: " + depName, Project.MSG_DEBUG); } // gather all provided objects by name files = root.getElementsByTagName("provides"); for (int i = 0; i < files.getLength(); i++) { Element fileNode = (Element) files.item(i); String depName = fileNode.getAttribute("file"); if ((depName == null) || "".equals(depName.trim())) { throw new SAXException("Expected 'file' attribute on provides node."); } File object = futils.resolveFile(file.getParentFile(), depName) .getCanonicalFile(); provides.add(object); log("Added provided object to component: " + depName, Project.MSG_DEBUG); } } /** * @return Returns a list with names of dependent components. */ public Collection getDependentComponentNames() { return dependencies; } /** * @return Returns a list of required files for this component (without dependencies). */ public Collection getRequiredObjects() { return objects; } public Collection getProvidedObjects() { return provides; } /** * Returns the name of the component. */ public String getName() { return name; } /** * Returns the File pointer */ public File getFile() { return file; } } } --- NEW FILE: dependencies.antlib.xml --- <?xml version="1.0"?> <antlib> <!-- Creates a dependency list --> <typedef name="dependencylist" classname="com.dawidweiss.carrot.ant.GetDependenciesTask" /> <!-- copies a filelist to some directory --> <typedef name="copyfilelist" classname="com.dawidweiss.carrot.ant.CopyFileList" /> </antlib> |
From: <daw...@us...> - 2004-02-06 18:14:27
|
Update of /cvsroot/carrot2/carrot2/descriptors/components-experimental In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4019 Removed Files: carrot2.filter.text-only.xml Log Message: Not used and removed for this reason. --- carrot2.filter.text-only.xml DELETED --- |
From: <daw...@us...> - 2004-02-06 18:13:28
|
Update of /cvsroot/carrot2/carrot2/components/filters/pruning/text-only/web/WEB-INF In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3766/web/WEB-INF Removed Files: .cvsignore web.xml Log Message: Not used and removed for this reason. --- .cvsignore DELETED --- --- web.xml DELETED --- |
From: <daw...@us...> - 2004-02-06 18:13:19
|
Update of /cvsroot/carrot2/carrot2/components/filters/pruning/text-only/src/com/dawidweiss/carrot/filter/textonly In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3766/src/com/dawidweiss/carrot/filter/textonly Removed Files: SAXHandler.java TextOnlyFilter.java Log Message: Not used and removed for this reason. --- SAXHandler.java DELETED --- --- TextOnlyFilter.java DELETED --- |