Note java version info on imports.

components/blitz/src/ome/formats/importer/ImportConfig.java

@@ -35,6 +35,7 @@
 import omero.model.Annotation;
 import omero.model.FilesetVersionInfo;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.log4j.Level;
@@ -257,11 +258,17 @@ public String getOmeroVersion() {
     public void fillVersionInfo(FilesetVersionInfo versionInfo) {
         versionInfo.setBioformatsVersion(rstring(getBioFormatsVersion()));
         versionInfo.setOmeroVersion(rstring(getOmeroVersion()));
+        versionInfo.setLocale(rstring(Locale.getDefault().toString()));
         versionInfo.setOsArchitecture(rstring(System.getProperty("os.arch")));
         versionInfo.setOsName(rstring(System.getProperty("os.name")));
         versionInfo.setOsVersion(rstring(System.getProperty("os.version")));
-        versionInfo.setLocale(rstring(Locale.getDefault().toString()));
-        // TODO: add java version info
+        versionInfo.setClientLanguage(rstring("Java"));
+        versionInfo.setClVendor(rstring(System.getProperty("java.vendor")));
+        versionInfo.setClVersion(rstring(System.getProperty("java.version")));
+        final String clientLanguageCompiler = System.getProperty("java.compiler");
+        if (!StringUtils.isEmpty(clientLanguageCompiler)) {
+            versionInfo.setClCompiler(rstring(clientLanguageCompiler));
+        }
     }
 
     /**

components/model/resources/mappings/fs.ome.xml

@@ -33,6 +33,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
             <required name="osArchitecture" type="string"/>
             <required name="osName" type="string"/>
             <required name="osVersion" type="string"/>
+            <required name="clientLanguage" type="string"/>
+            <required name="clVendor" type="string"/>
+            <required name="clVersion" type="string"/>
+            <optional name="clCompiler" type="string"/>
             <required name="locale" type="string"/>
         </properties>
     </type>

etc/omero.properties

@@ -16,7 +16,7 @@ omero.data.cron=* * 0 * * ?
 
 omero.db.authority=export.openmicroscopy.org
 omero.db.version=OMERO5.0DEV
-omero.db.patch=1
+omero.db.patch=2
 omero.db.host=localhost
 omero.db.name=omero
 omero.db.user=omero

sql/psql/OMERO5.0DEV__1/psql-footer.sql → sql/psql/OMERO5.0DEV__2/psql-footer.sql

@@ -1256,7 +1256,7 @@ alter table dbpatch alter message set default 'Updating';
 -- running so that if anything goes wrong, we'll have some record.
 --
 insert into dbpatch (currentVersion, currentPatch, previousVersion, previousPatch, message)
-             values ('OMERO5.0DEV',  1,    'OMERO5.0DEV',   0,             'Initializing');
+             values ('OMERO5.0DEV',  2,    'OMERO5.0DEV',   0,             'Initializing');
 
 --
 -- Here we will create the root account and the necessary groups
@@ -2139,7 +2139,7 @@ after delete on originalfile
 -- Here we have finished initializing this database.
 update dbpatch set message = 'Database ready.', finished = clock_timestamp()
   where currentVersion = 'OMERO5.0DEV' and
-        currentPatch = 1 and
+        currentPatch = 2 and
         previousVersion = 'OMERO5.0DEV' and
         previousPatch = 0;
 

sql/psql/OMERO5.0DEV__1/schema.sql → sql/psql/OMERO5.0DEV__2/schema.sql

@@ -839,6 +839,10 @@
         id int8 not null,
         bioformatsReader varchar(255) not null,
         bioformatsVersion varchar(255) not null,
+        clCompiler varchar(255),
+        clVendor varchar(255) not null,
+        clVersion varchar(255) not null,
+        clientLanguage varchar(255) not null,
         permissions int8 not null,
         locale varchar(255) not null,
         omeroVersion varchar(255) not null,