Merge remote-tracking branch 'origin/master' into pkovac

Conflicts:
	WeaveAdmin/src/weave/services/beans/AttributeColumnInfo.as
	WeaveAdmin/src/weave/ui/TreeWithSearch.mxml
	WeaveAdmin/src/weave/ui/admin/managers/DataTableManager.mxml
	WeaveAdmin/src/weave/ui/admin/wizards/CSVImportWizard.mxml
	WeaveServices/src/weave/config/DatabaseConfig.java
	WeaveServices/src/weave/config/ISQLConfig.java
	WeaveServices/src/weave/config/SQLConfigXML.java
	WeaveServices/src/weave/servlets/AdminService.java
	WeaveServices/src/weave/servlets/DataService.java
	WeaveServices/src/weave/tests/test.java
	WeaveServices/src/weave/utils/SQLResult.java
	WeaveServices/src/weave/utils/SQLUtils.java

.gitignore

@@ -1 +1 @@
-tags
+tags

GeometryStreamConverter/.gitignore

@@ -1 +1 @@
-/build
+/build

INSTALL-LINUX.md

@@ -1,57 +1,57 @@
-# End-user requirements
-
-* Adobe Flash Player 10.0+
-
-# Server requirements
-
-* Java Servlet Container (Tomcat or Glassfish)
-* MySQL or PostgreSQL
-
-# Installation
-
-1. Install the following packages (Ubuntu/Debian):
- * sun-java6-jdk
- * ant
- * tomcat6
- * git
- * junit4
- * libservlet2.4-java
-2. Download the [Adobe Flex 3.6 SDK](http://opensource.adobe.com/wiki/display/flexsdk/Download+Flex+3) and extract it to a directory in your home dir, something like 
-
- ``~/bin/flex``.
-
-3. Add the following line to your ``.bashrc`` or equivalent, modified as appropriate to the path chosen in step 2:
-
- ``export FLEX_HOME=~/bin/flex``
-
- Additionally, run this line in your working terminal, or open a fresh terminal to ensure the environment variable is set. 
-4. Clone the Weave git repository either read-only:
-
- ``git clone git://github.com/IVPR/Weave.git``
-
- Or, if you are a contributor:
-
- ``git clone git@github.com:IVPR/Weave.git``
-5. Enter the resulting Weave directory, and the subdirectory it contains named ``WeaveClient.``
-6. Edit the ``buildall.xml`` file. Be sure to set ``WEAVE_DOCROOT`` to some path writable by your user, and to set SDK_VERSION as appropriate for the SDK version. More information can be found in the comments of the file.
-7. Run 
-
- ``ANT_OPTS=-XX:MaxPermSize=1024m ant -f buildall.xml install``
-
-8. Open a new file at /etc/tomcat6/Catalina/localhost/weave.xml, ie
-
- ``sudo vim /etc/tomcat6/Catalina/localhost/weave.xml``
-
- And add the following line:
-
- ``<Context path="/weave" docBase="/home/user/pub/app">``
-
- Modifying ``docBase`` as appropriate. 
-8. Copy ``WeaveServices.war`` from the source directory into ``/var/lib/tomcat6/webapps``.
-9. Restart the tomcat service as appropriate for your distribution. For example, on Ubuntu/Debian:
- ``/etc/init.d/tomcat6 restart``
-10. Open your browser and enter 
-
- ``"http://localhost:8080/weave"`` 
-
- to test.
+# End-user requirements
+
+* Adobe Flash Player 10.0+
+
+# Server requirements
+
+* Java Servlet Container (Tomcat or Glassfish)
+* MySQL or PostgreSQL
+
+# Installation
+
+1. Install the following packages (Ubuntu/Debian):
+ * sun-java6-jdk
+ * ant
+ * tomcat6
+ * git
+ * junit4
+ * libservlet2.4-java
+2. Download the [Adobe Flex 3.6 SDK](http://opensource.adobe.com/wiki/display/flexsdk/Download+Flex+3) and extract it to a directory in your home dir, something like 
+
+ ``~/bin/flex``.
+
+3. Add the following line to your ``.bashrc`` or equivalent, modified as appropriate to the path chosen in step 2:
+
+ ``export FLEX_HOME=~/bin/flex``
+
+ Additionally, run this line in your working terminal, or open a fresh terminal to ensure the environment variable is set. 
+4. Clone the Weave git repository either read-only:
+
+ ``git clone git://github.com/IVPR/Weave.git``
+
+ Or, if you are a contributor:
+
+ ``git clone git@github.com:IVPR/Weave.git``
+5. Enter the resulting Weave directory, and the subdirectory it contains named ``WeaveClient.``
+6. Edit the ``buildall.xml`` file. Be sure to set ``WEAVE_DOCROOT`` to some path writable by your user, and to set SDK_VERSION as appropriate for the SDK version. More information can be found in the comments of the file.
+7. Run 
+
+ ``ANT_OPTS=-XX:MaxPermSize=1024m ant -f buildall.xml install``
+
+8. Open a new file at /etc/tomcat6/Catalina/localhost/weave.xml, ie
+
+ ``sudo vim /etc/tomcat6/Catalina/localhost/weave.xml``
+
+ And add the following line:
+
+ ``<Context path="/weave" docBase="/home/user/pub/app">``
+
+ Modifying ``docBase`` as appropriate. 
+8. Copy ``WeaveServices.war`` from the source directory into ``/var/lib/tomcat6/webapps``.
+9. Restart the tomcat service as appropriate for your distribution. For example, on Ubuntu/Debian:
+ ``/etc/init.d/tomcat6 restart``
+10. Open your browser and enter 
+
+ ``"http://localhost:8080/weave"`` 
+
+ to test.

JTDS_SqlServerDriver/.classpath

@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/main"/>
-	<classpathentry kind="src" path="src/test"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/junit.jar"/>
-	<classpathentry kind="lib" path="lib/jcifs-1.3.12.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main"/>
+	<classpathentry kind="src" path="src/test"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="lib" path="lib/junit.jar"/>
+	<classpathentry kind="lib" path="lib/jcifs-1.3.12.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

JTDS_SqlServerDriver/.settings/org.eclipse.jdt.core.prefs

@@ -1,64 +1,64 @@
-#Sun Jul 08 10:42:43 MDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.doc.comment.support=enabled
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=ignore
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
-org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=warning
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+#Sun Jul 08 10:42:43 MDT 2007
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.deprecation=ignore
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=warning
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nullReference=ignore
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=ignore
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning