Changeset 153 for branches/omero

Timestamp:

07/15/05 08:30:23 (3 years ago)

Author:

jmoore

Message:

* Add short mention of Java 5 in docs
* Moved HACKING.txt to BUILDING.txt
* Some other small cosmetics

Location:

branches/omero

Files:

• components/server/web/WEB-INF/services.xml (modified) (3 diffs)
• docs/BUILDING.txt (moved) (moved from branches/omero/docs/HACKING.txt) (2 diffs)
• docs/INSTALL.txt (modified) (1 diff)
• log4j.properties (modified) (1 diff)

branches/omero/components/server/web/WEB-INF/services.xml

@@ -53 +53 @@
                 <property name="interceptorNames">
                 <list>
+                        <value>exceptionHandling</value>
                         <value>logging</value>  
                         <value>daoCleanUp</value>
@@ -61 +62 @@
                 </property>
         </bean>
-        
+
+        <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+        <!-- INTERCEPTORS -->   
         <bean 
                        id="serviceTracing" 
@@ -74 +77 @@
         />
 
-                
+        <bean
+                           id="exceptionHandling"
+                        class="org.openmicroscopy.omero.logic.ExceptionHandler"
+                lazy-init="true"
+        />
+        <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+                        
         <bean id="hierarchyBrowsingService" class="org.openmicroscopy.omero.logic.HierarchyBrowsingImpl">
                 <property name="annotationDao" ref="annotationDao"/>

branches/omero/docs/BUILDING.txt

@@ -10 +10 @@
 
     * Install Java and a Servlet Container (Tomcat, Jetty, Resin, or JBoss et al.)
+      Warning: The Omero server side code requires Java 5 and Tomcat 5.5.x. 
     
     * Set JAVA_HOME to your JDK installation
@@ -38 +39 @@
       (Alternatively, follow the container-specific instructions under docs/ .)
 
+
+TODO: Some of these instructions should go in INSTALL.txt. 

branches/omero/docs/INSTALL.txt

@@ -17 +17 @@
 For more specific instructions, please see the 
 INSTALL_*.txt files in the docs directory.
+
+Note: These instructions are for releases only.
+If you are working from subversion, please see
+BUILDING.txt to get things running.

branches/omero/log4j.properties

@@ -7 +7 @@
 
 log4j.category.org.openmicroscopy=info
+log4j.category.org.openmicroscopy.omero.shoolaadapter=error
 
 #########################################