Changeset 19997

Timestamp:

2009-07-16T15:06:34+12:00 (14 years ago)

Author:

oranfry

Message:

 

Location:

greenstone3/trunk

Files:

• build.xml (modified) (2 diffs)
• web/WEB-INF/classes/interface_default.properties (modified) (1 diff)
• web/WEB-INF/urlrewrite.xml (added)
• web/WEB-INF/web.xml (modified) (5 diffs)
• web/sites/localsite/collect/gs2mgppdemo/metadata.xml (modified) (1 diff)
• web/sites/localsite/siteConfig.xml (modified) (1 diff)

greenstone3/trunk/build.xml

@@ -1154 +1154 @@
 
     <!-- windows -->
-    <if><bool><istrue value="${os.iswindows}"/></bool>
+    <if><bool><istrue value="${current.os.iswindows}"/></bool>
       <exec executable="nmake" dir="${src.packages.home}/search4j" failonerror="true">
         <arg value="/f"/>
@@ -1168 +1168 @@
 
     <!-- unix -->
-    <else><if><bool><istrue value="${os.isunix}"/></bool>
+    <else><if><bool><istrue value="${current.os.isunix}"/></bool>
       <exec executable="${src.packages.home}/search4j/configure" dir="${src.packages.home}/search4j" failonerror="true">
         <arg value="--bindir=${basedir}/bin"/>

greenstone3/trunk/web/WEB-INF/classes/interface_default.properties

@@ -11 +11 @@
 pref_tip=Change your interface preferences
 # page titles
-help_t=help
-pref_t=preferences
+help_t=Help
+pref_t=Preferences
+home_t=Home
 aboutpage=About page
 textframebrowser=You must have a frame enabled browser to view this.

greenstone3/trunk/web/WEB-INF/web.xml

@@ -79 +79 @@
   
    <servlet>
-    <servlet-name>dev</servlet-name>
+    <servlet-name>dev</servlet-name>
     <description>A new skin engine still in development based on the standard gsdl3 library program</description>
     <servlet-class>org.greenstone.gsdl3.LibraryServlet</servlet-class>
@@ -92 +92 @@
     <init-param>
       <param-name>interface_name</param-name>
-      <param-value>default</param-value>
+      <param-value>oran</param-value>
     </init-param>
     <init-param>
@@ -222 +222 @@
          </init-param>
 </servlet>
-<!--
--->  
+
+<filter>
+  <filter-name>UrlRewriteFilter</filter-name>
+  <filter-class>org.tuckey.web.filters.urlrewrite.UrlRewriteFilter</filter-class>
+</filter>
+
+<filter-mapping>
+  <filter-name>UrlRewriteFilter</filter-name>
+  <url-pattern>/*</url-pattern>
+</filter-mapping>
+
+ 
     <!-- Define mappings that are used by the servlet container to
          translate a particular request URI (context-relative) to a
@@ -237 +247 @@
          will be mapped to the "controller" servlet.
 
-     Note: context path is determined by the servlet container - 
-     in Tomcat, specified in server.xml -kjdon
+ Note: context path is determined by the servlet container - 
+ in Tomcat, specified in server.xml -kjdon
          You may define any number of servlet mappings, including zero.
          It is also legal to define more than one mapping for the same
@@ -286 +296 @@
     <url-pattern>/gs3library</url-pattern>
   </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>gs3-library2</servlet-name>
+    <url-pattern>/gs3library2</url-pattern>
+  </servlet-mapping>
   
   <!-- axis mappings -->

greenstone3/trunk/web/sites/localsite/collect/gs2mgppdemo/metadata.xml

@@ -1 +1 @@
 <metadataList>
 
-  <metadataItem name="collectionName" lang="en">Greenstone2 MGPP demo</metadataItem>
+  <metadataItem name="collectionName" lang="en">MGPP demo</metadataItem>
   <metadataItem name="collectionName" lang="fr">Démo de Greenstone2 avec MGPP</metadataItem> 
 

greenstone3/trunk/web/sites/localsite/siteConfig.xml

@@ -49 +49 @@
     <replace macro="_httpextlink_" scope="all" text="_libraryname_?el=&amp;a=d&amp;c=_clustername_&amp;d=" resolve="true"/>
   </replaceList>
+
+    <metadataList xmlns:gsf="http://www.greenstone.org/greenstone3/schema/MetadataFormat" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+        <metadata name="siteName" lang="en">My Greenstone Library</metadata>
+        <metadata name="siteName" lang="fr">Mon site de dévelopment</metadata> 
+        <metadata name="siteDescription" lang="en">This is just a random site for testing stuff...</metadata>
+        <metadata name="siteDescription" lang="fr">C'est juste un site pour tester des trucs...</metadata>
+        <metadata name="siteAdmin">admin@example.com</metadata>
+    </metadataList>
+
 </siteConfig>