Merge branch 'development'

Conflicts:
	Core/module-build.xml - Overwriting with development version
	build.xml - Overwriting with development version

Core/.classpath

@@ -1,44 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="lib" path="target/classes"/>
-	<classpathentry kind="lib" path="target/overrides/properties"/>
-	<classpathentry kind="lib" path="lib/ma-priv-1.1.7.jar"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="src-test"/>
+	<classpathentry kind="src" path="overrides/properties"/>
+	<classpathentry kind="src" path="overrides/classes"/>
+	<classpathentry kind="src" output="maven-target/classes" path="src">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" path="classes"/>
+	<classpathentry including="**/*.java" kind="src" output="maven-target/test-classes" path="src-test">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="src" path="src-patch"/>
 	<classpathentry kind="src" path="src-unit"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/org.springframework.context.support-3.0.5.RELEASE.jar"/>
-	<classpathentry kind="lib" path="lib/commons-dbcp-jdbc4.jar"/>
-	<classpathentry kind="lib" path="lib/derby.jar"/>
-	<classpathentry kind="lib" path="lib/derbytools.jar"/>
-	<classpathentry kind="lib" path="lib/commons-codec-1.6.jar"/>
-	<classpathentry kind="lib" path="lib/commons-collections-3.2.1.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-server-7.4.5.v20110725.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-util-7.4.5.v20110725.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-http-7.4.5.v20110725.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-webapp-7.4.5.v20110725.jar" sourcepath="C:/ExternalSource/jetty/jetty-webapp-src.zip"/>
-	<classpathentry kind="lib" path="lib/jetty-servlet-7.4.5.v20110725.jar" sourcepath="C:/ExternalSource/jetty/jetty-servlet-src.zip"/>
-	<classpathentry kind="lib" path="lib/jetty-continuation-7.4.5.v20110725.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-io-7.4.5.v20110725.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-security-7.4.5.v20110725.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-xml-7.4.5.v20110725.jar"/>
-	<classpathentry kind="lib" path="lib/org.springframework.aop-3.0.5.RELEASE.jar"/>
-	<classpathentry kind="lib" path="lib/org.springframework.asm-3.0.5.RELEASE.jar"/>
-	<classpathentry kind="lib" path="lib/org.springframework.expression-3.0.5.RELEASE.jar"/>
-	<classpathentry kind="lib" path="lib/org.springframework.orm-3.0.5.RELEASE.jar"/>
-	<classpathentry kind="lib" path="lib/jsp-2.1-glassfish-9.1.1.B60.25.p2.jar" sourcepath="C:/ExternalSource/glassfish/jsp-2.1-glassfish-9.1.1.B60.25.p1-sources.jar"/>
-	<classpathentry kind="lib" path="lib/taglibs-log.jar"/>
-	<classpathentry kind="lib" path="lib-opt/tools.jar"/>
-	<classpathentry kind="lib" path="lib/mysql-connector-java-5.1.7-bin.jar"/>
-	<classpathentry kind="lib" path="lib/commons-pool.jar"/>
-	<classpathentry kind="lib" path="lib/httpclient-cache-4.2.1.jar"/>
-	<classpathentry kind="lib" path="lib/httpmime-4.2.1.jar"/>
-	<classpathentry kind="lib" path="lib-opt/ant-contrib-1.0b3.jar"/>
-	<classpathentry kind="lib" path="lib/ant-1.6.5.jar"/>
-	<classpathentry kind="lib" path="lib/postgresql-9.2-1002.jdbc4.jar"/>
-	<classpathentry kind="lib" path="lib/h2-1.3.171.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/M2M2 Core"/>
-	<classpathentry kind="con" path="DERBY_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry kind="output" path="maven-target/classes"/>
 </classpath>

Core/.externalToolBuilders/Core - Eclipse JSP Compile [Builder].launch

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AFTER_CLEAN_TARGETS" value="jsp-compile-eclipse,"/>
+<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS" value="jsp-compile-eclipse,"/>
+<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/Core/build.xml"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
+<booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="Core"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="jsp-compile-eclipse,"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_BUILDER_ENABLED" value="true"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/Core/build.xml}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+<stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>
+</launchConfiguration>

Core/.gitignore

@@ -14,3 +14,7 @@
 /release
 /save
 /mango.build.number
+/maven-target
+/databases
+/backup
+/dist/

Core/.project

@@ -1,18 +1,47 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>Core</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.apache.derby.ui.derbyEngine</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Core</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.common.project.facet.core.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+				<dictionary>
+					<key>LaunchConfigHandle</key>
+					<value>&lt;project&gt;/.externalToolBuilders/Core - Eclipse JSP Compile [Builder].launch</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.apache.derby.ui.derbyEngine</nature>
+		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+	</natures>
+</projectDescription>

Core/.settings/.jsdtscope

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="WebContent"/>
+	<classpathentry kind="output" path=""/>
+</classpath>

Core/.settings/org.eclipse.core.resources.prefs

@@ -1,2 +1,3 @@
 eclipse.preferences.version=1
+encoding/LICENSE=UTF-8
 encoding/RELEASE-NOTES=UTF-8

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

@@ -1,11 +1,5 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.7
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.7

Core/.settings/org.eclipse.m2e.core.prefs

@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

Core/.settings/org.eclipse.wst.common.component

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
+    <wb-module deploy-name="Core">
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/classes"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/overrides/properties"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src-test"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src-patch"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src-unit"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/overrides/classes"/>
+        <property name="context-root" value="Core"/>
+        <property name="java-output-path" value="/Core/maven-target/classes"/>
+    </wb-module>
+</project-modules>

Core/.settings/org.eclipse.wst.common.project.facet.core.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+  <installed facet="java" version="1.7"/>
+</faceted-project>

Core/.settings/org.eclipse.wst.jsdt.ui.superType.container

@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary

Core/.settings/org.eclipse.wst.jsdt.ui.superType.name

@@ -0,0 +1 @@
+Window

Core/Getting Started.txt

@@ -0,0 +1,22 @@
+Congratulations for downloading Mango.  Here are some tips to get you up and running as fast as possible.
+
+For help installing see our Installation form: http://forum.infiniteautomation.com/forum/forums/show/20.page
+
+*****Installation*****
+
+Mango requires Java JDK 1.7 (also known as JDK 7) to be already installed on your system. Infinite Automation recommends using the Oracle JDK 7..  You may need to set a JAVA_HOME environmental variable pointing to your JDK install folder.
+
+1.) Unzip the Mango zip file into any directory you like.  
+2.) To start Mango Automation, run one of the scripts provided in the /bin folder, either ma-start.bat for Windows platforms or ma.sh for *nix or Mac. (Also note: for *nix you may have to run "chmod +x ma-start.sh" to make the script executable.) 
+In addition, for *nix users ensure that the Mango home directory and all subdirectories are writable by the user under which Mango will run. 
+
+To use the /bin/ma.sh script on your command line, change to the bin directory and then type ./ma.sh start or ./ma.sh stop
+
+If you are having trouble starting Mango Automation:
+
+1. Make sure you have Java JDK 1.7 installed.
+2. JAVA_HOME is set to the Java JDK 1.7 install directory.  On windows usually: C:\Program Files\Java\jdk1.7.0_XX
+3. Nothing else is using port 8080 or change Mango to run on a different port.  See the /classes/env.properties file to set the new port number, read the instructions on how to use the overrides directory.
+
+If you still have trouble and you notice that script window briefly pops up and then the window closes: Open a command prompt and run mango from there so the window doesn't close.  Make a post in this forum with the results of the script and we will help you diagnose the issue.
+