Incremental roll in of code base to google repository. Please note, d…

…atabase changes apply, see http://code.google.com/p/ala-citizenscience/wiki/DatabaseMigration?ts=1310956163&updated=DatabaseMigration for more details.

git-svn-id: http://ala-citizenscience.googlecode.com/svn/trunk@26 a1be47e5-e1a4-4eca-8b5b-22a79e575783

adds.txt

@@ -0,0 +1,104 @@
+svn add        webdefault.xml
+svn add        overlay_war.sh
+svn add        findbugs-exclude.xml
+svn add        adds.txt
+svn add        src/test/java/au/com/gaiaresources/bdrs/test
+svn add        src/test/java/au/com/gaiaresources/bdrs/spatial
+svn add        src/test/java/au/com/gaiaresources/bdrs/model/method
+svn add        src/test/java/au/com/gaiaresources/bdrs/model/detect
+svn add        src/test/java/au/com/gaiaresources/bdrs/model/showcase
+svn add        src/test/java/au/com/gaiaresources/bdrs/model/map
+svn add        src/test/java/au/com/gaiaresources/bdrs/model/record
+svn add        src/test/java/au/com/gaiaresources/bdrs/model/preference
+svn add        src/test/java/au/com/gaiaresources/bdrs/model/survey/SurveyServiceImplTest.java
+svn add        src/test/java/au/com/gaiaresources/bdrs/service/detect
+svn add        src/test/java/au/com/gaiaresources/bdrs/service/web
+svn add        src/test/java/au/com/gaiaresources/bdrs/controller/review
+svn add        src/test/java/au/com/gaiaresources/bdrs/controller/showcase
+svn add        src/test/java/au/com/gaiaresources/bdrs/controller/map
+svn add        src/test/java/au/com/gaiaresources/bdrs/controller/webservice/ApplicationServiceUploadTest.java
+svn add        src/test/java/au/com/gaiaresources/bdrs/controller/theme/ThemeControllerAsAdminTest.java
+svn add        src/test/java/au/com/gaiaresources/bdrs/controller/attribute/CensusMethodControllerTest.java
+svn add        src/test/java/au/com/gaiaresources/bdrs/controller/mobile/MobileApplicationControllerTest.java
+svn add        src/test/java/au/com/gaiaresources/bdrs/controller/record/TrackerControllerCensusMethodTest.java
+svn add        src/test/java/au/com/gaiaresources/bdrs/controller/record/RecordDeletionControllerTest.java
+svn add        src/test/resources/au/com/gaiaresources/bdrs/controller
+svn add        src/test/resources/au/com/gaiaresources/bdrs/spatial
+svn add        src/test/resources/au/com/gaiaresources/bdrs/service/gis
+svn add        src/test/resources/au/com/gaiaresources/bdrs/service/detect
+svn add        src/test/resources/au/com/gaiaresources/bdrs/service/web
+svn add        src/test/resources/au/com/gaiaresources/bdrs/service/bulkdata/invalid_daterange.xls
+svn add        src/main/mobile
+svn add        src/main/java/au/com/gaiaresources/bdrs/spatial
+svn add        src/main/java/au/com/gaiaresources/bdrs/controller/showcase
+svn add        src/main/java/au/com/gaiaresources/bdrs/controller/review
+svn add        src/main/java/au/com/gaiaresources/bdrs/controller/webservice/ManagedFileWebService.java
+svn add        src/main/java/au/com/gaiaresources/bdrs/controller/theme/StaticPageController.java
+svn add        src/main/java/au/com/gaiaresources/bdrs/controller/attribute/CensusMethodController.java
+svn add        src/main/java/au/com/gaiaresources/bdrs/controller/attribute/formfield/TypedAttributeValueFormField.java
+svn add        src/main/java/au/com/gaiaresources/bdrs/controller/mobile/MobileApplicationController.java
+svn add        src/main/java/au/com/gaiaresources/bdrs/controller/map/GeoMapLayerController.java
+svn add        src/main/java/au/com/gaiaresources/bdrs/controller/map/GeoMapController.java
+svn add        src/main/java/au/com/gaiaresources/bdrs/controller/record/RecordDeletionController.java
+svn add        src/main/java/au/com/gaiaresources/bdrs/controller/record/AtlasController.java
+svn add        src/main/java/au/com/gaiaresources/bdrs/controller/record/validator/DynamicIntRangeValidator.java
+svn add        src/main/java/au/com/gaiaresources/bdrs/controller/record/validator/DynamicDateRangeValidator.java
+svn add        src/main/java/au/com/gaiaresources/bdrs/servlet/jsp/tag/Formatter.java
+svn add        src/main/java/au/com/gaiaresources/bdrs/model/detect
+svn add        src/main/java/au/com/gaiaresources/bdrs/model/showcase
+svn add        src/main/java/au/com/gaiaresources/bdrs/model/map
+svn add        src/main/java/au/com/gaiaresources/bdrs/model/method/Taxonomic.java
+svn add        src/main/java/au/com/gaiaresources/bdrs/model/method/impl
+svn add        src/main/java/au/com/gaiaresources/bdrs/model/method/CensusMethodDAO.java
+svn add        src/main/java/au/com/gaiaresources/bdrs/model/taxa/TypedAttributeValue.java
+svn add        src/main/java/au/com/gaiaresources/bdrs/service/image
+svn add        src/main/java/au/com/gaiaresources/bdrs/service/detect
+svn add        src/main/java/au/com/gaiaresources/bdrs/service/managedFile
+svn add        src/main/java/au/com/gaiaresources/bdrs/service/bulkdata/BulkDataReadWriteService.java
+svn add        src/main/java/au/com/gaiaresources/bdrs/service/bulkdata/BulkDataReadWriteServiceImpl.java
+svn add        src/main/java/au/com/gaiaresources/bdrs/service/bulkdata/DataReferenceException.java
+svn add        src/main/java/au/com/gaiaresources/bdrs/service/web/GoogleKeyService.java
+svn add        src/main/java/au/com/gaiaresources/bdrs/service/web/JsonService.java
+svn add        src/main/java/au/com/gaiaresources/bdrs/util/KMLUtils.java
+svn add        src/main/images/icons/tree_node.gif
+svn add        src/main/js-test/bdrs
+svn add        src/main/resources/au/com/gaiaresources/bdrs/model/portal/impl/admin_groupListing.vm
+svn add        src/main/resources/au/com/gaiaresources/bdrs/model/portal/impl/admin_censusMethodListing.vm
+svn add        src/main/resources/au/com/gaiaresources/bdrs/model/portal/impl/admin_groupEdit.vm
+svn add        src/main/resources/au/com/gaiaresources/bdrs/model/portal/impl/admin_censusMethodEdit.vm
+svn add        src/main/resources/au/com/gaiaresources/bdrs/service/detect
+svn add        src/main/resources/au/com/gaiaresources/bdrs/service/web
+svn add        src/main/resources/au/com/gaiaresources/bdrs/controller/mobile
+svn add        src/main/js/advancedReviewSightings.js
+svn add        src/main/js/jquery-tmpl
+svn add        src/main/js/bdrs
+svn add        src/main/js/jquery.cj-simple-slideshow.min.js
+svn add        src/main/js/jquery-blockui
+svn add        src/main/js/jquery-1.6.2.min.js
+svn add        src/main/webapp/WEB-INF/bdrs.map
+svn add        src/main/webapp/WEB-INF/jsp/vanilla/admin/home_default.jsp
+svn add        src/main/webapp/WEB-INF/jsp/vanilla/user/home_default.jsp
+svn add        src/main/webapp/WEB-INF/jsp/vanilla/public/index.jsp
+svn add        src/main/webapp/WEB-INF/jsp/vanilla/public/userSignUp_default.jsp
+svn add        src/main/webapp/WEB-INF/jsp/vanilla/public/home_default.jsp
+svn add        src/main/webapp/WEB-INF/jsp/bdrs/widget/userGrid.jsp
+svn add        src/main/webapp/WEB-INF/jsp/bdrs/widget/galleryGrid.jsp
+svn add        src/main/webapp/WEB-INF/jsp/bdrs/widget/censusMethodGrid.jsp
+svn add        src/main/webapp/WEB-INF/jsp/bdrs/widget/geoMapLayerGrid.jsp
+svn add        src/main/webapp/WEB-INF/jsp/bdrs/widget/geoMapGrid.jsp
+svn add        src/main/webapp/WEB-INF/jsp/bdrs/widget/groupGrid.jsp
+svn add        src/main/webapp/WEB-INF/jsp/bdrs/admin/gallery
+svn add        src/main/webapp/WEB-INF/jsp/bdrs/admin/censusMethod
+svn add        src/main/webapp/WEB-INF/jsp/bdrs/admin/mapLayer
+svn add        src/main/webapp/WEB-INF/jsp/bdrs/admin/map
+svn add        src/main/webapp/WEB-INF/jsp/bdrs/admin/survey/userLocationRow.jsp
+svn add        src/main/webapp/WEB-INF/jsp/bdrs/embedded/image_slideshow.jsp
+svn add        src/main/webapp/WEB-INF/jsp/bdrs/map/viewMap.jsp
+svn add        src/main/webapp/WEB-INF/jsp/bdrs/user/review
+svn add        src/main/webapp/WEB-INF/jsp/bdrs/user/record/render/atlas
+svn add        src/main/webapp/WEB-INF/jsp/bdrs/public/fieldguide/taxonView_default.jsp
+svn add        src/main/webapp/WEB-INF/jsp/bdrs/public/fieldguide/groupListing_default.jsp
+svn add        src/main/webapp/WEB-INF/jsp/template/postMessage.jsp
+svn add        src/main/webapp/WEB-INF/jsp/template/jsonDummyView.jsp
+svn add        src/main/webapp/WEB-INF/jsp/template/theme/static_public.jsp
+svn add        src/main/webapp/WEB-INF/jsp/template/vanilla/dashboard_default.jsp

findbugs-exclude.xml

@@ -0,0 +1,7 @@
+<FindBugsFilter>
+     <Match>
+        <!-- Exclude unused loggers -->
+       <Field type="org.apache.log4j.Logger"/>
+       <Bug code="UrF"/>
+     </Match>
+</FindBugsFilter>

overlay_war.sh

@@ -0,0 +1,81 @@
+#!/bin/bash
+
+usage()
+{
+cat << EOF
+usage: $0 options
+
+This script takes a directory with the target data to overlay the war file.
+
+OPTIONS:
+   -t      target WAR file (optional, will use /target/bdrs-core.war by default) Absolute or relative path
+   -s      source directory. This should be the the base directory of the data to overlay the WAR file with. Absolute or relative path
+
+Example:
+$0 -s ~/workspace/GR205-DIDMS/deployment/external_stage/war_file/
+$0 -t target/bdrs-core.war -s ~/workspace/GR205-DIDMS/deployment/external_stage/war_file/
+EOF
+}
+
+TARGET="target/bdrs-core.war"
+SOURCE=
+
+while getopts “ht::s:” OPTION
+do
+    case $OPTION in
+        h)
+            usage
+            exit 1
+            ;;
+        t)
+            TARGET=$OPTARG
+            ;;
+        s)
+            SOURCE=$OPTARG
+        ;;
+    esac
+done
+
+if [[ -z $TARGET ]] || [[ -z $SOURCE ]]
+then
+    usage
+    exit 1
+fi
+
+if [[ ! $TARGET == \/* ]]
+then
+    # Convert to absolute path
+    TARGET=$PWD"/"$TARGET
+fi
+
+if [[ ! -f $TARGET ]]
+then
+    echo "Target WAR file" \"$TARGET\" "does not exist or is not a file"
+    exit 1
+fi
+
+if [[ ! -d $SOURCE ]]
+then
+    echo "Source directory" \"$SOURCE\" "does not exist"
+    exit 1
+fi
+
+if [[ ! -d $SOURCE"/WEB-INF" ]]
+then
+    echo "Expected to find the WEB-INF directory in the source dir. Are you sure this is the right directory?"
+    read -p "Do you want to continue (y/n)?: " CHOICE
+    if [ "$CHOICE" = "n" ]
+    then
+        echo "WAR file has not been overlayed"
+        exit 0
+    fi
+fi
+
+pushd $SOURCE
+
+zip -r $TARGET . -x \*/.* -x \*.svn*
+
+popd
+
+echo "WAR file" \"$TARGET\" "successfully overlayed with data from" \"$SOURCE\"
+

pom.xml

@@ -25,6 +25,10 @@
             <id>Selenium repo</id>
             <url>http://nexus.openqa.org/content/repositories/releases</url>
         </repository>
+        <repository>
+            <id>Tartarus</id>
+            <url>http://tartarus:8080/artifactory/repo/</url>
+        </repository>
         <repository>
             <id>ALA</id>
             <url>http://maven.ala.org.au/repository</url>
@@ -71,7 +75,7 @@
             <groupId>javax.servlet</groupId>
             <artifactId>jstl</artifactId>
             <version>1.2</version>
-            <scope>provided</scope>
+            <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
@@ -315,6 +319,12 @@
             <artifactId>gt-epsg-wkt</artifactId>
             <version>2.5.3</version>
             <scope>compile</scope>
+        </dependency>
+		<dependency>
+            <groupId>org.geotools</groupId>
+            <artifactId>gt-jai-tools</artifactId>
+            <version>2.5.5-jai-tools</version>
+            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.geotools</groupId>
@@ -535,6 +545,8 @@
                     <encoding>UTF-8</encoding>
                     <nonFilteredFileExtensions>
 			            <nonFilteredFileExtension>xls</nonFilteredFileExtension>
+						<nonFilteredFileExtension>zip</nonFilteredFileExtension>
+						<nonFilteredFileExtension>apk</nonFilteredFileExtension>
                     </nonFilteredFileExtensions>
                 </configuration>
             </plugin>
@@ -544,6 +556,11 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
+                	<encoding>UTF-8</encoding>
+                    <nonFilteredFileExtensions>
+                        <nonFilteredFileExtension>xls</nonFilteredFileExtension>
+                        <nonFilteredFileExtension>zip</nonFilteredFileExtension>
+                    </nonFilteredFileExtensions>
                     <excludes>
                         <!--exclude>**/*Client.java</exclude-->
                     </excludes>
@@ -845,6 +862,7 @@
                     <findbugsXmlOutput>true</findbugsXmlOutput>
                     <findbugsXmlWithMessages>true</findbugsXmlWithMessages>
                     <xmlOutput>true</xmlOutput>
+                    <excludeFilterFile>findbugs-exclude.xml</excludeFilterFile>
                 </configuration>
             </plugin>
         </plugins>
@@ -860,7 +878,7 @@
                 <!-- Mail properties -->
                 <bdrs.default.mail.server>localhost</bdrs.default.mail.server>
                 <bdrs.default.mail.port>25</bdrs.default.mail.port>
-                <bdrs.default.mail.from>Your Email Here</bdrs.default.mail.from>
+                <bdrs.default.mail.from>bdrs-core@gaiaresources.com.au</bdrs.default.mail.from>
                 <bdrs.error.mail.to></bdrs.error.mail.to>
                 <bdrs.mail.subject.prefix>[BDRS-Core - Dev]</bdrs.mail.subject.prefix>
                 <!-- Application address properties -->
@@ -878,8 +896,8 @@
                 <bdrs.tomcat.manager.username>tomcat</bdrs.tomcat.manager.username>
                 <bdrs.tomcat.manager.password>tomcat</bdrs.tomcat.manager.password>
                 <!-- reCAPTCHA properties -->
-                <bdrs.recaptcha.public.key>Your Key Here</bdrs.recaptcha.public.key>
-                <bdrs.recaptcha.private.key>Your Key Here</bdrs.recaptcha.private.key>
+                <bdrs.recaptcha.public.key>6LfbwwQAAAAAAEiDp_pgbdLzIOgVLpTpA3kqUfXF</bdrs.recaptcha.public.key>
+                <bdrs.recaptcha.private.key>6LfbwwQAAAAAAF5wVuk8nLcOanKCwvA_-rmtvNIL</bdrs.recaptcha.private.key>
                 <!-- File storage location -->
                 <bdrs.file.store.location>/tmp</bdrs.file.store.location>
             </properties>

src/main/css/bdrs/bdrs.css

@@ -39,14 +39,19 @@
     text-align: right;
 }
 
-#record_base_map {
+.tracker_map {
     height: 465px;
 }
 
-.tracker_map {
+.review_map {
     height: 465px;
 }
 
+.review_map_fullscreen {
+	height: 100%;
+	width: 100%;
+}
+
 .kmlDescriptionTable {
    /* margin: 0.5em 0.5em 0.5em 0.5em; */
 }
@@ -62,13 +67,27 @@
     padding-right: 1em;
 }
 
-/************************************/
-/* Sighting Filter Table            */
-/************************************/
-#sightingFilterTable th,
-#sightingFilterTable td {
-    padding: 0em 0.5em 0em 0.5em;
-    margin: 0em 0em 0em 0em;
-    text-align: left;
+/* Styling for the popups in viewMap.jsp */
+.olFramedCloudPopupContent h1 {
+	color: #333333;
+    font-size: 135%;
+    font-weight: bold;
+    padding: 10px 0;
+}
+
+.olFramedCloudPopupContent table {
+
 }
 
+.olFramedCloudPopupContent th,
+.olFramedCloudPopupContent td {
+    padding: 0;
+    margin: 0;
+}
+
+.olFramedCloudPopupContent tbody th {
+    text-align: right;
+    padding-right: 1em;
+}
+
+