litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merging r883 through r884 from http://svn.mannlib.cornell.edu/svn/vivo/branches/rel-1.1-maint

Browse source
This commit is contained in:
rjy7 2010-07-16 20:42:37 +00:00
parent daa60b1044
commit 0b00e4e914
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
doc/upgrade-1.1.txt
View file

@ -89,9 +89,9 @@ II. The Upgrade Process
6. Stop "Apache Tomcat" and run ant by typing: ant all 6. Stop "Apache Tomcat" and run ant by typing: ant all
7. If you have setup the Apache Tomcat Connector using mod_jk and modified your 7. If you have set up the Apache Tomcat Connector using mod_jk and modified
tomcat/conf/server.xml file, you will need to add a line to your context your tomcat/conf/server.xml file, you will need to add a line to your
section specifying a "Manager" tag; see examples below. context section specifying a "Manager" tag; see examples below.
Context section before: Context section before:
@ -302,21 +302,21 @@ B. If you created your own theme directory in VIVO 1.0, follow the steps below
to upgrade your theme to VIVO 1.1. to upgrade your theme to VIVO 1.1.
1. Copy the directory /vivo/themes/vivo-basic/templates into your theme 1. Copy the directory /vivo/themes/vivo-basic/templates into your theme
directory. directory /vivo/themes/<your-theme-name>.
2. Follow step a or b below, whichever is applicable to your theme: 2. Follow step a or b below, whichever is applicable to your theme:
a. If you did not apply any customizations to the JSPs in your VIVO 1.0 a. If you did not apply any customizations to the JSPs in your VIVO 1.0
theme then you do not need to apply any additional changes to the theme, then you do not need to apply any additional changes to the
VIVO 1.1 theme emplates during the upgrade process. VIVO 1.1 theme templates during the upgrade process.
b. If you did apply customizations to the JSPs in your VIVO 1.0 theme, b. If you did apply customizations to the JSPs in your VIVO 1.0 theme,
you will need to replicate those modifications in the new FTL theme you will need to hand-replicate those modifications in the new theme
templates. template files.
A VIVO 1.0 theme contained three JSP files: menu.jsp, identity.jsp, The theme template content that was previously contained in three
and footer.jsp. The VIVO 1.1 theme contains five FTL files, JSP files is now contained in five FTL files. The correspondence
corresponding to the earlier JSPs as follows: between the 1.0 JSPs and the 1.1 FTLs is as follows:
identity.jsp => identity.ftl identity.jsp => identity.ftl
menu.jsp => menu.ftl and search.ftl menu.jsp => menu.ftl and search.ftl
@ -337,7 +337,7 @@ to upgrade your theme to VIVO 1.1.
the syntax and available built-in constructs. Template authors need the syntax and available built-in constructs. Template authors need
not be concerned with the Programmer's Guide or Java API documentation. not be concerned with the Programmer's Guide or Java API documentation.
c. Remove the jsp directory from your themes directory.