Changeset 15191

Timestamp:

2008-04-14 16:20:45 (5 months ago)

Author:

dmn

Message:

updating branch from trunk

Files:

• greenstone3/branches/customizingGreenstone3/README-CVS.txt (deleted)
• greenstone3/branches/customizingGreenstone3/README-SVN.txt (copied) (copied from greenstone3/trunk/README-SVN.txt)
• greenstone3/branches/customizingGreenstone3/README.txt (modified) (4 diffs)
• greenstone3/branches/customizingGreenstone3/bin/script/convert_coll_from_gs2.pl (modified) (22 diffs)
• greenstone3/branches/customizingGreenstone3/bin/search4j (copied) (copied from greenstone3/trunk/bin/search4j)
• greenstone3/branches/customizingGreenstone3/build.properties (modified) (1 diff)
• greenstone3/branches/customizingGreenstone3/build.xml (copied) (copied from greenstone3/trunk/build.xml) (55 diffs)
• greenstone3/branches/customizingGreenstone3/dist-resources/convert-build-xml-source.xsl (modified) (1 diff)
• greenstone3/branches/customizingGreenstone3/dist-resources/convert-build-xml.xsl (modified) (1 diff)
• greenstone3/branches/customizingGreenstone3/docs/manual/manual.tex (modified) (1 diff)
• greenstone3/branches/customizingGreenstone3/gs3-server.bat (modified) (1 diff)
• greenstone3/branches/customizingGreenstone3/gs3-server.sh (modified) (3 diffs)
• greenstone3/branches/customizingGreenstone3/gs3-setup.bat (modified) (3 diffs)
• greenstone3/branches/customizingGreenstone3/gs3-setup.sh (modified) (1 diff)
• greenstone3/branches/customizingGreenstone3/lib/java/AntelopeTasks_3.4.2.jar (copied) (copied from greenstone3/trunk/lib/java/AntelopeTasks_3.4.2.jar)
• greenstone3/branches/customizingGreenstone3/resources/java/global.properties.in (modified) (1 diff)
• greenstone3/branches/customizingGreenstone3/resources/tomcat/setclasspath.bat (modified) (2 diffs)
• greenstone3/branches/customizingGreenstone3/resources/tomcat/setclasspath.sh (modified) (1 diff)
• greenstone3/branches/customizingGreenstone3/src/java/org/greenstone/gsdl3/action/QueryAction.java (modified) (3 diffs)
• greenstone3/branches/customizingGreenstone3/src/java/org/greenstone/gsdl3/core/MessageRouter.java (modified) (29 diffs)
• greenstone3/branches/customizingGreenstone3/src/java/org/greenstone/gsdl3/core/Receptionist.java (modified) (2 diffs)
• greenstone3/branches/customizingGreenstone3/src/java/org/greenstone/gsdl3/service/AbstractGS2FieldSearch.java (modified) (2 diffs)
• greenstone3/branches/customizingGreenstone3/src/java/org/greenstone/gsdl3/service/AbstractSearch.java (modified) (2 diffs)
• greenstone3/branches/customizingGreenstone3/src/java/org/greenstone/gsdl3/service/GS2MGPPSearch.java (modified) (2 diffs)
• greenstone3/branches/customizingGreenstone3/src/java/org/greenstone/gsdl3/service/GS2MGRetrieve.java (modified) (1 diff)
• greenstone3/branches/customizingGreenstone3/src/java/org/greenstone/gsdl3/service/GoogleNgramMGPPSearch.java (copied) (copied from greenstone3/trunk/src/java/org/greenstone/gsdl3/service/GoogleNgramMGPPSearch.java)
• greenstone3/branches/customizingGreenstone3/src/java/org/greenstone/gsdl3/sql (copied) (copied from greenstone3/trunk/src/java/org/greenstone/gsdl3/sql)
• greenstone3/branches/customizingGreenstone3/src/java/org/greenstone/gsdl3/sql/DatabaseFactory.java (copied) (copied from greenstone3/trunk/src/java/org/greenstone/gsdl3/sql/DatabaseFactory.java)
• greenstone3/branches/customizingGreenstone3/src/java/org/greenstone/gsdl3/sql/MetadataDBWrapper.java (copied) (copied from greenstone3/trunk/src/java/org/greenstone/gsdl3/sql/MetadataDBWrapper.java)
• greenstone3/branches/customizingGreenstone3/src/java/org/greenstone/gsdl3/sql/SQLServer.java (copied) (copied from greenstone3/trunk/src/java/org/greenstone/gsdl3/sql/SQLServer.java)
• greenstone3/branches/customizingGreenstone3/src/java/org/greenstone/gsdl3/sql/SQLStatements.java (copied) (copied from greenstone3/trunk/src/java/org/greenstone/gsdl3/sql/SQLStatements.java)
• greenstone3/branches/customizingGreenstone3/src/java/org/greenstone/gsdl3/sql/derby (copied) (copied from greenstone3/trunk/src/java/org/greenstone/gsdl3/sql/derby)
• greenstone3/branches/customizingGreenstone3/src/java/org/greenstone/gsdl3/sql/derby/DerbyDBWrapper.java (copied) (copied from greenstone3/trunk/src/java/org/greenstone/gsdl3/sql/derby/DerbyDBWrapper.java)
• greenstone3/branches/customizingGreenstone3/src/java/org/greenstone/gsdl3/sql/derby/DerbySQLServer.java (copied) (copied from greenstone3/trunk/src/java/org/greenstone/gsdl3/sql/derby/DerbySQLServer.java)
• greenstone3/branches/customizingGreenstone3/src/java/org/greenstone/gsdl3/util/GDBMWrapper.java (modified) (1 diff)
• greenstone3/branches/customizingGreenstone3/src/java/org/greenstone/gsdl3/util/GSFile.java (modified) (2 diffs)
• greenstone3/branches/customizingGreenstone3/src/java/org/greenstone/gsdl3/util/GSXML.java (modified) (1 diff)
• greenstone3/branches/customizingGreenstone3/web/WEB-INF/classes/AbstractGS2FieldSearch.properties (modified) (1 diff)
• greenstone3/branches/customizingGreenstone3/web/WEB-INF/classes/AbstractSearch.properties (modified) (1 diff)
• greenstone3/branches/customizingGreenstone3/web/WEB-INF/web.xml (modified) (5 diffs)
• greenstone3/branches/customizingGreenstone3/web/index.html (modified) (1 diff)
• greenstone3/branches/customizingGreenstone3/web/interfaces/classic/transform/pref.xsl (modified) (2 diffs)
• greenstone3/branches/customizingGreenstone3/web/interfaces/classic/transform/query-common.xsl (modified) (1 diff)
• greenstone3/branches/customizingGreenstone3/winutil/search4j.exe (copied) (copied from greenstone3/trunk/winutil/search4j.exe)

greenstone3/branches/customizingGreenstone3/README.txt

@@ -21 +21 @@
-See 'Installing from a Source Distribution' section below for extra notes about installing from Source.
-
-CVS.txt file for extra notes about installing from CVS
+SVN.txt file for extra notes about installing directly from SVN
-
-Running Greenstone:
----------------------------------------------------------
-
- 2
+3
-
-Alternatively, you can start Tomcat directly through using Ant. 'ant start', 'ant restart' and 'ant stop' starts, restarts and shuts down Tomcat, respectively. This will only start/stop a local server (one installed by Greenstone). You will need to manually start/stop an external Tomcat (see below for notes about using a version of Tomcat external to Greenstone).
@@ -39 +39 @@
-You need to have Perl installed and on your PATH. Perl is included as part of 
-the Windows binary distribution.
-
-
-
+
+
-
-Note that GLI doesn't start up the Greenstone Tomcat server so you should 
@@ -141 +140 @@
-Download the greenstone-3.xx-src.tar.gz package from sourceforge.net/projects/greenstone3, and unpack it.
-In the greenstone3 directory, edit the build.properties file and run 
-prepare 
+
-
-Tomcat will be installed as part of the prepare process. To stop this set the tomcat.installed.path to be the root of an existing Tomcat installation. 
@@ -181 +180 @@
-To recompile your Greenstone3 installation, in the top level greenstone3 directory, run:
-
+ant clean (use distclean instead if you want to regenerate the C++ Makefiles)
-ant configure
-ant configure-c++
-ant clean
-ant compile
-

greenstone3/branches/customizingGreenstone3/bin/script/convert_coll_from_gs2.pl

@@ -128 +128 @@
-    my $collwriter = new XML::Writer(OUTPUT => $colloutput, NEWLINES => 1);
-    
-c
+C
-    
-    #output the collection metadata to the collectionConfig file
@@ -134 +134 @@
-    
-    my $creator = $collectcfg->{'creator'};
-
+'default',
-    my $public =$collectcfg->{'public'};
-
+
+
-    $collwriter->endTag('metadataList');
-
@@ -169 +170 @@
-    my $numdocs = $buildcfg->{'numdocs'};
-    $buildwriter->startTag('metadataList');
-
-
+'',
+'',
-    $buildwriter->endTag('metadataList');
-    
@@ -191 +192 @@
-            $indexmap->{$k} = $v;
-            push @indexlist, $k;
-
-v
+ == 1
+k
-                $first = 0;
-            }   
@@ -202 +203 @@
-    if (defined $collectcfg->{'defaultindex'}) {
-        $defaultindex = $collectcfg->{'defaultindex'};
-
+#
-    }
-    
@@ -209 +210 @@
-    my @levellist = ();
-    my $default_search_level = "";
+    my $default_search_level_shortname = "";
-    my $default_retrieve_level = "Sec";
-    $first = 1;
@@ -219 +221 @@
-                push @levellist, $k;
-                if ($first) {
-
+
+
-                    $first = 0;
-                }
@@ -227 +230 @@
-        if (defined $collectcfg->{'defaultlevel'}) {
-            $default_search_level = $collectcfg->{'defaultlevel'};
-
+
+
-        }
-        if (defined $buildcfg->{'textlevel'}) {
@@ -237 +241 @@
-
-    #output the search stuff to coll cfg
-
+,'type'=>$buildtype
-    foreach my $i (keys %$indexmap) {
-        $collwriter->startTag('index', 'name'=>$i);
@@ -244 +248 @@
-        foreach my $lang (keys %{$collectionmeta->{$indexdisplay}}) {
-            my $value = $collectionmeta->{$indexdisplay}->{$lang};
-value
+i
-        }
-        $collwriter->endTag('index');
+    }
+
+    #output the defaultIndex to coll cfg
+    $collwriter->emptyTag('defaultIndex','name'=>$defaultindex);
+
+    #indexSubcollection
+    my $indexsubcollections = $collectcfg->{'indexsubcollections'};
+   
+    if (defined $indexsubcollections) {
+        my $indexsubcollections_t= $collectcfg->{'indexsubcollections'};
+        foreach my $i ( @$indexsubcollections_t) {
+            $collwriter->startTag('indexSubcollection', 'name'=>$i);
+            &output_display($collwriter, 'name', $defaultlang, $i);
+            $collwriter->endTag('indexSubcollection');
+        }
+    } 
+
+    #subcollection
+    my $subcollection = $collectcfg->{'subcollection'};
+    if (defined $subcollection){
+        foreach my $entry (keys %$subcollection){
+            my $value = $subcollection->{$entry};
+            $collwriter->emptyTag('subcollection','filter'=>$value,'name'=>$entry);
+        }
+    }
+
+    #indexlanguage
+    my $languages = $collectcfg->{'languages'};
+    if (defined $languages){
+        my $languages_t = $collectcfg->{'languages'};
+        foreach my $i (@$languages_t){
+            $collwriter->startTag('indexLanguage','name'=>$i);
+             &output_display($collwriter, 'name', $defaultlang, $i);
+            $collwriter->endTag('indexLanguage');
+        }
-    }
-
@@ -261 +300 @@
-            $collwriter->endTag('level');
-        }
-
+
+
+
+
+
+
+
+
+
+
-    # add in the format stuff
-    if (defined $format->{'SearchVList'}) {
@@ -276 +324 @@
-    
-    $collwriter->endTag('search');
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    $buildwriter->startTag('serviceRackList');
-    
@@ -288 +369 @@
-    }
-
+ #indexSubcollectionList
+
+    my $subcollectionmap = $buildcfg->{'subcollectionmap'};
+    my $firstsubcollection = 1;
+    my $defaultsubcollection = "";
+    my @subcollist;
+    my $subcolmap = {};
+
+    if (defined $buildcfg->{'subcollectionmap'}) {
+        my $subcolmap_t = $buildcfg->{'subcollectionmap'};
+
+        foreach my $l (@$subcolmap_t) {
+            my @pair = split(/->/, $l);
+            $subcolmap->{$pair[0]} = $pair[1];
+            push @subcollist, $pair[0];
+            if ($firstsubcollection==1) {
+                $defaultsubcollection = $pair[1];
+                $firstsubcollection = 0;
+            }   
+        }
+
+    }
+
+
-    #do the retrieve service
-    $buildwriter->startTag('serviceRack', 'name'=>"GS2".$service_type."Retrieve");
@@ -294 +399 @@
-    } elsif ($buildtype eq "mg") {
-        $buildwriter->emptyTag('defaultIndex', 'shortname'=>$defaultindex);
-
-
+
+
+
+
+
+
-    if (defined $indexstem) {
-        $buildwriter->emptyTag('indexStem', 'name'=>$indexstem);
@@ -362 +471 @@
-            if ($horizontalAtTop) {
-                $buildwriter->emptyTag('classifier', 'name'=>$name, 'content'=>$content, 'horizontalAtTop'=>'true');
+
-            } else {
-                $buildwriter->emptyTag('classifier', 'name'=>$name, 'content'=>$content);
@@ -367 +477 @@
-            
-            
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            my $vlist = $name."VList";
-            my $hlist = $name."HList";
@@ -411 +539 @@
-    # do the search service
-    $buildwriter->startTag('serviceRack', 'name'=>'GS2'.$service_type.'Search');
-
+#
-    $buildwriter->startTag('indexList');
-    #for each index
@@ -444 +572 @@
-                
-        # level info
-
+_shortname
-        $buildwriter->emptyTag('defaultGDBMLevel', 'shortname'=>$default_retrieve_level);
-        $buildwriter->startTag('levelList');
@@ -474 +602 @@
-    } 
-    
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    $buildwriter->endTag('serviceRack');
-    
@@ -484 +647 @@
-    # collection
-    $collwriter->emptyTag('replaceListRef', 'id'=>'gs2-standard');
-c
+C
-    $collwriter->end();
-    $buildwriter->end();
@@ -494 +657 @@
-
-sub output_metadata {
-
-
+
+
+
+
+
+
+
-    $writer->characters($metavalue);
-    $writer->endTag('metadata');
@@ -506 +674 @@
-        ($lang) = $lang =~ /\[l=(.*)\]/;
-    }
+
-    $writer->startTag('displayItem', 'name'=>$name, 'lang'=>$lang);
-    $writer->characters($value);

greenstone3/branches/customizingGreenstone3/build.properties

@@ -50 +50 @@
-## Mac OS X specific stuff
-# set the path to your GDBM here
-
+
+
+
+
+
+

greenstone3/branches/customizingGreenstone3/build.xml

@@ -1 +1 @@
-<?xml version="1.0"?>
-
-<!-- ====================================================================== 
-     March 2005                                                    
-
-     Greenstone3 build and install script
- 
+
-     kjdon                                                                
-     ====================================================================== -->
-<project name="greenstone3" default="usage" basedir=".">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-  Each of the following properties are used in the build script.
@@ -35 +35 @@
-
-  * Definitions from a "build.properties" file in the top level
-  
+
-
-  * Definitions from a "build.properties" file in the user's
-  
+
-
-  * Default definitions in this build.xml file.
@@ -48 +48 @@
-  "build.properties" files as well as in the "build.xml" script.
-
-
-
+
+
+
+
+
+
-  <property file="build.properties"/>
-  <property file="${user.home}/build.properties"/>
@@ -55 +59 @@
-  <!-- get properties from the environment -->
-  <property environment="env"/>
+
+    
+  <!-- version properties for external packages -->
+  <property name="tomcat.version" value="apache-tomcat-5.5.25"/>
+  <property name="axis.zip.version" value="axis-bin-1_2_1.zip"/>
+  <property name="axis.dir.version" value="axis-1_2_1"/>
+  <property name="gdbm.version" value="gdbm-1.8.3"/>
+
-  <property name="build.home" value="${basedir}/build"/>
-  <property name="src.home" value="${basedir}/src/java"/>
-  <property name="src.packages.home" value="${basedir}/src/packages"/>
-  <property name="packages.home" value="${basedir}/packages"/>
-  <!-- this may be set in build.properties, eg if you move the web dir to 
@@ -68 +79 @@
-  <!-- other files needed by the servlet go here -->
-  <property name="web.classes" value="${web.home}/WEB-INF/classes"/>
+  <!--- flax: the WordNet home -->
+  <property name="wn.home" value="${web.home}/WEB-INF/classes/flax/WordNet"/>
+
-  <!-- jni libraries and java wrappers go here -->
-  <property name="lib.jni" value="${basedir}/lib/jni"/>
-  
+
-  <property name="javadocs" value="${basedir}/docs/javadoc"/>
-
@@ -77 +91 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-  <property name="flax.svn.root" value="http://svn.greenstone.org/flax"/>
-
-  <property name="svn.root" value="http://svn.greenstone.org"/>
-
+
+
-  <!-- catalina home is set to tomcat basedir is already installed, otherwise
-  use greenstone's tomcat -->
@@ -159 +163 @@
-    <isset property="disable.collection.building"/>
-  </condition>
-
+
+
+
+
+
+
+
+
-  <!-- ============= Base dirs for each package and component ============ -->
-  <property name="src.applet.home" value="${src.home}/org/greenstone/applet"/>
@@ -167 +178 @@
-  <property name="gli.home" value="${basedir}/gli"/>
-  <property name="javagdbm.home" value="${src.packages.home}/javagdbm"/>
-
-
+
-  <!--<property name="indexers.home" value="${basedir}/src/packages/indexers">-->
-  <condition property="indexers.home" value="${basedir}/src/packages/indexers">
@@ -184 +194 @@
-
-
-
-
-
+  
+
+  
-
-  These properties control option settings on the Javac compiler when it
@@ -197 +207 @@
-  compile.optimize     Should compilation include the optimize option?
-
-
+  
-
-  <property name="compile.debug"       value="true"/>
@@ -203 +213 @@
-  <property name="compile.optimize"    value="true"/>
-
-
+  
-
-  Rather than relying on the CLASSPATH environment variable, Ant includes
@@ -212 +222 @@
-  that you explicitly added.
-
-
+  
-
-  <path id="compile.classpath">
@@ -228 +238 @@
-    <!-- Include the axis jar files -->
-    <!--<fileset dir="${basedir}/comms/soap/axis/lib">
-  
-  
+
+
-    
-    <!-- include the jar files from the source packages -->
@@ -265 +275 @@
-    <pathelement path="${env.PATH}"/>
-    <pathelement path="${env.Path}"/>
+    <pathelement path="${wn.home}/bin"/>
-  </path>
-
@@ -275 +286 @@
-    <echo>os.unix: ${os.unix}</echo>
-  </target>
-
+  
-
-  <!-- add comments about using xxx-core, xxx-packages if only want certain parts?? -->
-
-
+, prepare-flax
-    description="Use this when you first checkout the code: 'ant prepare install'. This will do some additional subversion checkouts and downloads, so you need to be online to run this.">
-
+    
-    description="Use this when you first checkout the code: 'ant prepare install'. This will do some additional cvs checkouts and downloads, so you need to be online to run this.">-->
-
@@ -293 +304 @@
-    description="Install Greenstone 3. Use this when you first checkout the code: 'ant prepare install'."/>
-  
-
-  
+  
+
-  <target name="svnupdate" depends="init,svnupdate-packages,svnupdate-core,svnupdate-gs2building,svnupdate-web"
-    description="Do a `svn update` for all sources. Doesn't recompile the code. You need to be online to run this."/>
@@ -305 +316 @@
-    description="Configure the installation. Includes setting up config files. Should be re-run if you change the build.properties file."/>
-
-gdbm,clean-packages,clean-core,clean-gs2building
+packages,clean-core,clean-gs2building,clean-gdbm
-    description="Remove all old compiled code. Includes core, packages and gs2building if necessary"/>
+  
+  <target name="distclean" depends="init,distclean-packages,clean-core,distclean-gs2building,distclean-gdbm"
+    description="Remove all compiled code and also any Makefiles etc generated during configure-c++. Includes core, packages, gs2building as necessary"/>
-  
-  <target name="compile" depends="init,compile-web,compile-packages,compile-core,compile-gs2building"
-    description="Compile all the source code, includes core, packages and gs2building if necessary. Copy jar files and executables to their correct places."/>
-  
+
-  <target name="update" depends="init,svnupdate,clean,configure,configure-c++,compile" 
-
+ To do this without any SVN updates, run it like 'ant -Dnosvn.mode=yes update'
-
-  <target name="start" depends="init,start-tomcat"
-    description="Startup the Tomcat server." >
-       
-     
-     
-    
-    
+    
+  
+  
+
+
-  </target>
-
@@ -329 +343 @@
-
-
-
+  
-  
-  <property name="install-command" value="ant [options] prepare install"/>
@@ -337 +351 @@
-    <echo message="  Execute 'ant -help' for Ant help."/>
-    <echo>To install Greenstone3, run '${install-command}'. 
-
-
-
+      
+      
+      
-    </echo>
-  </target>
@@ -349 +363 @@
-  </target>
-
-
+  
-
-  <target name="accept-properties" unless="properties.accepted">
-    <input addproperty="properties.ok" validargs="y,n">The following properties (among others) are being used from a build.properties file found in this directory:
-
-
-
-
-
-
+      
+      
+      
+      
+      
+      
-    </input>
-    <condition property="do.abort"> 
@@ -366 +380 @@
-  </target>
-
-<!--  <target name="check-cvsroot">
-    <condition property="svnroot.notset">
-      <or>
-                        <not>
-                          <isset property="env.CVSROOT"/>
-                        </not>
-                        <equals arg1="" arg2="${env.CVSROOT}"/>
-      </or>
-    </condition>
-    <fail if="cvsroot.notset" message="You need to set the CVSROOT variable"/>
-  </target> -->
-
-  <!-- this sets up some initial properties -->
@@ -403 +406 @@
-    </condition>
-    
-  
-  
-  
-  
- 
+
+
+
+
+
-
-    <condition property="proxy.present">
@@ -438 +441 @@
-    <mysetproxy proxyhost="${proxy.host}" proxyport="${proxy.port}" proxyuser="${proxy.username}" proxypassword="${proxy.password}"/>
-  </target>
-   
-
+
+ 
-  
-  <target name="prepare-web" depends="init,configure-java-version">
@@ -446 +449 @@
-  </target>
-  
-
++
-  <target name="configure-java-version" depends="init"
-
+
+
+
-    <condition property="need.xalan.jar">
-
+
+
+
+
-    </condition>
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    <copy file="${web.lib}/xalan.jar.tmp" tofile="${web.lib}/xalan.jar"/>
-
-
-
-
-
-
-
-
+
+