Remove duplicate postgres startup #11793 (rebased onto dev_4_4)

.classpath-template

@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="examples/Delete"/>
-	<classpathentry kind="src" path="components/tools/OmeroJava/src"/>
 	<classpathentry kind="src" path="components/tools/OmeroJava/test"/>
-	<classpathentry kind="src" path="components/tools/OmeroImporter/test"/>
-	<classpathentry kind="src" path="components/tools/OmeroImporter/src"/>
 	<classpathentry kind="src" path="components/dsl/test"/>
 	<classpathentry kind="src" path="components/dsl/resources"/>
 	<classpathentry kind="src" path="components/dsl/src"/>
@@ -20,14 +17,12 @@
 	<classpathentry kind="src" path="components/romio/resources"/>
 	<classpathentry kind="src" path="components/romio/src"/>
 	<classpathentry kind="src" path="components/romio/test"/>
-	<classpathentry kind="src" path="components/specification/test"/>
 	<classpathentry kind="src" output="target/eclipse-bioformats" path="components/bioformats/components/autogen/src"/>
 	<classpathentry kind="src" output="target/eclipse-bioformats" path="components/bioformats/components/bio-formats/src"/>
 	<classpathentry kind="src" output="target/eclipse-bioformats" path="components/bioformats/components/bio-formats/test"/>
-	<classpathentry kind="src" output="target/eclipse-bioformats" path="components/bioformats/components/common/src"/>
-	<classpathentry kind="src" output="target/eclipse-bioformats" path="components/bioformats/components/common/test"/>
 	<classpathentry kind="src" output="target/eclipse-bioformats" path="components/bioformats/components/forks/mdbtools/src"/>
 	<classpathentry kind="src" output="target/eclipse-bioformats" path="components/bioformats/components/forks/poi/src"/>
+	<classpathentry kind="src" output="target/eclipse-bioformats" path="components/bioformats/components/loci-legacy/src"/>
 	<classpathentry kind="src" output="target/eclipse-bioformats" path="components/bioformats/components/metakit/src"/>
 	<classpathentry kind="src" output="target/eclipse-bioformats" path="components/bioformats/components/metakit/test"/>
 	<classpathentry kind="src" output="target/eclipse-bioformats" path="components/bioformats/components/ome-io/src"/>
@@ -36,6 +31,8 @@
 	<classpathentry kind="src" output="target/eclipse-bioformats" path="components/bioformats/components/ome-xml/test"/>
 	<classpathentry kind="src" output="target/eclipse-bioformats" path="components/bioformats/components/scifio/src"/>
 	<classpathentry kind="src" output="target/eclipse-bioformats" path="components/bioformats/components/scifio/test"/>
+	<classpathentry kind="src" output="target/eclipse-bioformats" path="components/bioformats/components/scifio-devel/src"/>
+	<classpathentry kind="src" output="target/eclipse-bioformats" path="components/bioformats/components/scifio-devel/test"/>
 	<classpathentry kind="src" output="target/eclipse-bioformats" path="components/bioformats/components/stubs/lwf-stubs/src"/>
 	<classpathentry kind="src" output="target/eclipse-bioformats" path="components/bioformats/components/test-suite/src"/>
 	<!-- Broken.

.gitignore

@@ -43,13 +43,13 @@ scons.log
 *.so
 *~
 *generated*
+/components/validator/WebApp/uploads/
 test-output
 temp-testng-customsuite.xml
 .settings
 .springBeans
 /components/tools/OmeroCpp/compiler.log
 /components/tools/OmeroWeb/omeroweb/media/webtest
-/components/xsd-fu/xsd_fu.egg-info/
 # Scons output files
 .sconsign.dblite
 *.dylib

.gitmodules

@@ -1,9 +1,12 @@
 [submodule "components/bioformats"]
 	path = components/bioformats
 	url = git://github.com/openmicroscopy/bioformats.git
+	ignore = dirty
 [submodule "docs/sphinx"]
 	path = docs/sphinx
 	url = git://github.com/openmicroscopy/ome-documentation.git
+	ignore = dirty
 [submodule "components/tools/OmeroPy/scripts"]
 	path = components/tools/OmeroPy/scripts
 	url = git://github.com/ome/scripts.git
+	ignore = dirty

.travis.yml

@@ -0,0 +1,32 @@
+language: java
+
+env:
+    - BUILD=py BUILD_TARGET="build-default" TEST_TARGET="-py test -Dtest.with.fail=true"
+    - BUILD=java BUILD_TARGET="build-default test-compile" TEST_TARGET="-p"
+
+matrix:
+      fast_finish: true
+
+jdk:
+  - openjdk7
+
+before_install:
+    - sudo apt-get -qq update
+    - sudo apt-get install -qq git
+    - sudo apt-get install -qq zeroc-ice34
+    - sudo apt-get install -qq python-imaging python-numpy python-tables python-genshi
+    - git config github.token 3bc7fc530b01081559eb911f59ccfec7f4fb2592
+    - git config --global user.email snoopycrimecop@gmail.com
+    - git config --global user.name 'Snoopy Crime Cop'
+    - sudo pip install scc --use-mirrors
+    - scc travis-merge
+    - if [[ $BUILD == 'py' ]]; then sudo pip install flake8 --use-mirrors; fi
+    - if [[ $BUILD == 'py' ]]; then flake8 -v components/tools/OmeroPy/src/omero/plugins;  fi
+    - if [[ $BUILD == 'py' ]]; then flake8 -v components/tools/OmeroPy/test/integration/clitest;  fi
+    - if [[ $BUILD == 'py' ]]; then flake8 -v components/tools/OmeroPy/test/unit/clitest;  fi
+
+install: python build.py $BUILD_TARGET
+
+# Running python tests as script, since there's no compile step.
+script:
+    - python build.py $TEST_TARGET

README.md

@@ -0,0 +1,7 @@
+[![Build Status](https://travis-ci.org/openmicroscopy/openmicroscopy.png)](http://travis-ci.org/openmicroscopy/openmicroscopy)
+
+For a quick start-up guide, see docs/QUICKSTART.txt
+
+Full developer documentation is available from http://www.openmicroscopy.org/site/support/omero5/developers/index.html
+
+If you are looking for something else, please refer to the main OME website http://www.openmicroscopy.org/site

build.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
 #
 # $Id$
 #
@@ -68,7 +69,7 @@ def find_java():
     return "java"
 
 def calculate_memory_args():
-    return "-Xmx600M -Djavac.maxmem.default=750M -Djavadoc.maxmem.default=750M -XX:MaxPermSize=256m".split(" ")
+    return "-Xmx600M -XX:MaxPermSize=256m".split(" ")
 
 def choose_omero_version():
     """
@@ -107,6 +108,49 @@ def choose_omero_version():
         sys.exit(1)
 
 
+def handle_tools(args):
+    _ = os.path.sep.join
+    additions = []
+    mappings = {
+        "-top": _(["build.xml"]),
+        "-cpp": _(["components","tools","OmeroCpp","build.xml"]),
+        "-fs": _(["components","tools","OmeroFS","build.xml"]),
+        "-java": _(["components","tools","OmeroJava","build.xml"]),
+        "-py": _(["components","tools","OmeroPy","build.xml"]),
+        "-web": _(["components","tools","OmeroWeb","build.xml"]),
+    }
+    while len(args) > 0 and args[0] in mappings.keys()+["-perf"]:
+        if args[0] == "-perf":
+            args.pop(0)
+            A = "-listener net.sf.antcontrib.perf.AntPerformanceListener".split()
+            additions.extend(A)
+        elif args[0] in mappings.keys():
+            F = mappings[args.pop(0)]
+            A = ["-f", F]
+            additions.extend(A)
+    return additions + args
+
+
+def handle_relative(args):
+    """
+    If no other specific file has been requested,
+    then use whatever relative path is needed to
+    specify build.xml in the local directory.
+
+    Regardless, os.chdir is called to the top.
+    """
+    additions = []
+    this = os.path.abspath(__file__)
+    this_dir = os.path.abspath(os.path.join(this, os.pardir))
+    cwd = os.path.abspath(os.getcwd())
+    os.chdir(this_dir)
+    if "-f" not in args:
+        build_xml = os.path.join(cwd, "build.xml")
+        if os.path.exists(build_xml):
+            additions.append("-f")
+            additions.append(build_xml)
+    return additions + args
+
 if __name__ == "__main__":
     #
     # use java_omero which will specially configure the build system.
@@ -119,12 +163,9 @@ def choose_omero_version():
         del os.environ['CLASSPATH']
 
     try:
-        if len(args) > 0 and args[0] == "-perf":
-            args.pop(0)
-            A = "-listener net.sf.antcontrib.perf.AntPerformanceListener".split() + args
-            java_omero(A)
-        else:
-            java_omero(args)
+        args = handle_tools(args)
+        args = handle_relative(args)
+        java_omero(args)
         notification(""" Finished: %s """ % " ".join(args), 0)
     except KeyboardInterrupt:
         sys.stderr.write("\nCancelled by user\n")