Changeset 4178


Ignore:
Timestamp:
Mar 14, 2008, 11:17:57 AM (14 years ago)
Author:
Nicklas Nordborg
Message:

Merged log:trunk#4160:4177 into extensions branch

Location:
branches/extensions
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • branches/extensions/build.xml

    r4163 r4178  
    13321332      <link href="http://www.hibernate.org/hib_docs/v3/api"/>
    13331333      <link href="http://www.jdom.org/docs/apidocs/" />
    1334       <link href="http://java.sun.com/products/servlet/2.2/javadoc/" />
     1334      <link href="http://java.sun.com/products/servlet/2.5/docs/servlet-2_5-mr2/" />
     1335      <link href="http://java.sun.com/products/jsp/2.1/docs/jsp-2_1-pfd2/" />
    13351336      <link href="http://www.singularsys.com/jep/doc/javadoc/" />
    13361337      <link href="http://www.jfree.org/jfreechart/api/gjdoc/" />
  • branches/extensions/doc/3rd-party-components.txt

    r4151 r4178  
    9494
    9595More info : http://java.sun.com/products/servlet/index.jsp
    96 Version   : 2.4
     96Version   : 2.5
    9797License   : N/A
    9898Jar files : jsp-api.jar, servlet-api.jar
  • branches/extensions/doc/src/docbook/admindoc/installation_upgrade.xml

    r4148 r4178  
    6666  <sect1 id="installation_upgrade.upgrade">
    6767    <title>Upgrade instructions</title>
     68
     69    <important id="tomcat6">
     70      <title>BASE 2.7 requires Tomcat 6 or higher</title>
     71      <para>
     72        If you are upgrading from older BASE versions to BASE 2.7 or higher
     73        you must also make sure that you are running Tomcat 6 or higher.
     74        Earlier BASE versions only required Tomcat 5.5. If you are not
     75        already running Tomcat 6 you need to upgrade.     
     76      </para>
     77    </important>
    6878
    6979    <important id="dropindexes">
     
    122132            If the BASE application is not shut down already, it is
    123133            time to do it now. Do something like <command>sudo
    124             /etc/init.d/tomcat5.5 stop</command>
     134            /etc/init.d/tomcat6.0 stop</command>
    125135          </para>
    126136        </listitem>
     
    247257            As tomcat user, remove cached files and directories. Do
    248258            something like
    249 <programlisting>cd /usr/share/apache-tomcat-5.5.15/
     259<programlisting>cd /usr/share/apache-tomcat-6.0.14/
    250260rm -rf work/Catalina</programlisting>
    251261          </para>
     
    258268          <para>
    259269            Start the tomcat server: <command>sudo
    260               /etc/init.d/tomcat5.5 start</command>
     270              /etc/init.d/tomcat6.0 start</command>
    261271          </para>
    262272        </listitem>
     
    646656        <listitem>
    647657          <para>
    648             Download and install tomcat 5.5.16 or later, available
     658            Download and install tomcat 6.0.14 or later, available
    649659            from <ulink
    650             url="http://jakarta.apache.org/tomcat/" />
     660            url="http://tomcat.apache.org" />
    651661            <important>
    652662              You MUST make sure that Tomcat uses the SERVER mode of
     
    668678          <para>
    669679            For more information about Tomcat options see
    670             <ulink url="http://www.chemaxon.com/jchem/doc/admin/tomcat.html" />.
     680            <ulink url="http://tomcat.apache.org/tomcat-6.0-doc/index.html" />.
    671681          </para>
    672682        </listitem>
     
    10291039<programlisting># The following lines makes apache aware of the location of
    10301040# the /base2 context
    1031 Alias /base2 "/srv/www/tomcat5/base/webapps/base2"
    1032 &lt;Directory "/srv/www/tomcat5/base/webapps/base2"&gt;
     1041Alias /base2 "/srv/www/tomcat6/base/webapps/base2"
     1042&lt;Directory "/srv/www/tomcat6/base/webapps/base2"&gt;
    10331043Options Indexes FollowSymLinks
    10341044allow from all
  • branches/extensions/doc/src/docbook/appendix/incompatible.xml

    r4135 r4178  
    4545    </para>
    4646  </note>
     47 
     48  <sect1 id="appendix.incompatible.2.7">
     49    <title>BASE 2.7 release</title>
     50   
     51    <bridgehead>Tomcat 6 or higher is required</bridgehead>
     52    <para>
     53      If you have been running BASE with Tomcat 5.5 you need
     54      to upgrade your Tomcat installation before installing
     55      BASE 2.7.
     56    </para>
     57  </sect1>
    4758 
    4859  <sect1 id="appendix.incompatible.2.6">
  • branches/extensions/src/core/net/sf/basedb/util/XMLUtil.java

    r4161 r4178  
    191191    @since 2.7
    192192  */
    193   public static Document getSchemaValidatedXml(URL xmlFile, String... schemaFiles) 
     193  public static Document getSchemaValidatedXML(URL xmlFile, String... schemaFiles) 
    194194    throws JDOMException, IOException
    195195  {   
  • branches/extensions/src/test/TestXMLUtil.java

    r4161 r4178  
    7171    try
    7272    {
    73       org.jdom.Document dom = XMLUtil.getSchemaValidatedXml(xmlFile, schemaFiles);
     73      org.jdom.Document dom = XMLUtil.getSchemaValidatedXML(xmlFile, schemaFiles);
    7474      if (!TestUtil.getSilent()) write(dom.toString());
    7575      write("--Create schema validated DOM OK");
Note: See TracChangeset for help on using the changeset viewer.