Changeset 4178

Timestamp:

Mar 14, 2008, 11:17:57 AM (15 years ago)

Author:

Nicklas Nordborg

Message:

Merged log:trunk#4160:4177 into extensions branch

Location:

branches/extensions

Files:

• build.xml (modified) (1 diff)
• doc/3rd-party-components.txt (modified) (1 diff)
• doc/src/docbook/admindoc/installation_upgrade.xml (modified) (7 diffs)
• doc/src/docbook/appendix/incompatible.xml (modified) (1 diff)
• lib/servlet/jsp-api.jar (modified) (previous)
• lib/servlet/servlet-api.jar (modified) (previous)
• src/core/net/sf/basedb/util/XMLUtil.java (modified) (1 diff)
• src/test/TestXMLUtil.java (modified) (1 diff)

branches/extensions/build.xml

@@ -1332 +1332 @@
       <link href="http://www.hibernate.org/hib_docs/v3/api"/>
       <link href="http://www.jdom.org/docs/apidocs/" />
-      <link href="http://java.sun.com/products/servlet/2.2/javadoc/" />
+      <link href="http://java.sun.com/products/servlet/2.5/docs/servlet-2_5-mr2/" />
+      <link href="http://java.sun.com/products/jsp/2.1/docs/jsp-2_1-pfd2/" />
       <link href="http://www.singularsys.com/jep/doc/javadoc/" />
       <link href="http://www.jfree.org/jfreechart/api/gjdoc/" />

branches/extensions/doc/3rd-party-components.txt

@@ -94 +94 @@
 
 More info : http://java.sun.com/products/servlet/index.jsp
-Version   : 2.4
+Version   : 2.5
 License   : N/A
 Jar files : jsp-api.jar, servlet-api.jar

branches/extensions/doc/src/docbook/admindoc/installation_upgrade.xml

@@ -66 +66 @@
   <sect1 id="installation_upgrade.upgrade">
     <title>Upgrade instructions</title>
+
+    <important id="tomcat6">
+      <title>BASE 2.7 requires Tomcat 6 or higher</title>
+      <para>
+        If you are upgrading from older BASE versions to BASE 2.7 or higher
+        you must also make sure that you are running Tomcat 6 or higher.
+        Earlier BASE versions only required Tomcat 5.5. If you are not
+        already running Tomcat 6 you need to upgrade.     
+      </para>
+    </important>
 
     <important id="dropindexes">
@@ -122 +132 @@
             If the BASE application is not shut down already, it is
             time to do it now. Do something like <command>sudo
-            /etc/init.d/tomcat5.5 stop</command>
+            /etc/init.d/tomcat6.0 stop</command>
           </para>
         </listitem>
@@ -247 +257 @@
             As tomcat user, remove cached files and directories. Do
             something like
-<programlisting>cd /usr/share/apache-tomcat-5.5.15/
+<programlisting>cd /usr/share/apache-tomcat-6.0.14/
 rm -rf work/Catalina</programlisting>
           </para>
@@ -258 +268 @@
           <para>
             Start the tomcat server: <command>sudo
-              /etc/init.d/tomcat5.5 start</command>
+              /etc/init.d/tomcat6.0 start</command>
           </para>
         </listitem>
@@ -646 +656 @@
         <listitem>
           <para>
-            Download and install tomcat 5.5.16 or later, available
+            Download and install tomcat 6.0.14 or later, available
             from <ulink
-            url="http://jakarta.apache.org/tomcat/" />
+            url="http://tomcat.apache.org" />
             <important>
               You MUST make sure that Tomcat uses the SERVER mode of
@@ -668 +678 @@
           <para>
             For more information about Tomcat options see
-            <ulink url="http://www.chemaxon.com/jchem/doc/admin/tomcat.html" />.
+            <ulink url="http://tomcat.apache.org/tomcat-6.0-doc/index.html" />.
           </para>
         </listitem>
@@ -1029 +1039 @@
 <programlisting># The following lines makes apache aware of the location of
 # the /base2 context
-Alias /base2 "/srv/www/tomcat5/base/webapps/base2"
-&lt;Directory "/srv/www/tomcat5/base/webapps/base2"&gt;
+Alias /base2 "/srv/www/tomcat6/base/webapps/base2"
+&lt;Directory "/srv/www/tomcat6/base/webapps/base2"&gt;
 Options Indexes FollowSymLinks
 allow from all

branches/extensions/doc/src/docbook/appendix/incompatible.xml

@@ -45 +45 @@
     </para>
   </note>
+  
+  <sect1 id="appendix.incompatible.2.7">
+    <title>BASE 2.7 release</title>
+    
+    <bridgehead>Tomcat 6 or higher is required</bridgehead>
+    <para>
+      If you have been running BASE with Tomcat 5.5 you need
+      to upgrade your Tomcat installation before installing
+      BASE 2.7.
+    </para>
+  </sect1>
   
   <sect1 id="appendix.incompatible.2.6">

branches/extensions/src/core/net/sf/basedb/util/XMLUtil.java

@@ -191 +191 @@
     @since 2.7
   */
-  public static Document getSchemaValidatedXml(URL xmlFile, String... schemaFiles)  
+  public static Document getSchemaValidatedXML(URL xmlFile, String... schemaFiles)  
     throws JDOMException, IOException
   {   

branches/extensions/src/test/TestXMLUtil.java

@@ -71 +71 @@
     try
     {
-      org.jdom.Document dom = XMLUtil.getSchemaValidatedXml(xmlFile, schemaFiles);
+      org.jdom.Document dom = XMLUtil.getSchemaValidatedXML(xmlFile, schemaFiles);
       if (!TestUtil.getSilent()) write(dom.toString());
       write("--Create schema validated DOM OK");