Working on fixing themes and upgrade to 5.16

Working on fixing themes and upgrade to 5.16

.classpath

@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="javasource"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="C:/Program Files/Mendix/5.15.0/runtime/bundles/biz.aQute.bnd.annotation.jar"/><classpathentry kind="lib" path="C:/Program Files/Mendix/5.15.0/runtime/bundles/org.scala-lang.scala-library.jar"/><classpathentry kind="lib" path="C:/Program Files/Mendix/5.15.0/runtime/bundles/datastorage-api.jar"/><classpathentry kind="lib" path="C:/Program Files/Mendix/5.15.0/runtime/bundles/json.jar"/><classpathentry kind="lib" path="C:/Program Files/Mendix/5.15.0/runtime/bundles/logging.jar"/><classpathentry kind="lib" path="C:/Program Files/Mendix/5.15.0/runtime/bundles/m2ee-api.jar"/><classpathentry kind="lib" path="C:/Program Files/Mendix/5.15.0/runtime/bundles/mxruntime.jar"/><classpathentry kind="lib" path="C:/Program Files/Mendix/5.15.0/runtime/bundles/integration.jar"/><classpathentry kind="lib" path="C:/Program Files/Mendix/5.15.0/runtime/bundles/osgi.cmpn.jar"/><classpathentry kind="lib" path="C:/Program Files/Mendix/5.15.0/runtime/bundles/webui.jar"/><classpathentry kind="lib" path="C:/Program Files/Mendix/5.15.0/runtime/bundles/javax.servlet.jar"/>
+	<classpathentry kind="lib" path="C:/Program Files/Mendix/5.16.1/runtime/bundles/biz.aQute.bnd.annotation.jar"/><classpathentry kind="lib" path="C:/Program Files/Mendix/5.16.1/runtime/bundles/org.scala-lang.scala-library.jar"/><classpathentry kind="lib" path="C:/Program Files/Mendix/5.16.1/runtime/bundles/datastorage-api.jar"/><classpathentry kind="lib" path="C:/Program Files/Mendix/5.16.1/runtime/bundles/json.jar"/><classpathentry kind="lib" path="C:/Program Files/Mendix/5.16.1/runtime/bundles/logging.jar"/><classpathentry kind="lib" path="C:/Program Files/Mendix/5.16.1/runtime/bundles/m2ee-api.jar"/><classpathentry kind="lib" path="C:/Program Files/Mendix/5.16.1/runtime/bundles/mxruntime.jar"/><classpathentry kind="lib" path="C:/Program Files/Mendix/5.16.1/runtime/bundles/integration.jar"/><classpathentry kind="lib" path="C:/Program Files/Mendix/5.16.1/runtime/bundles/osgi.cmpn.jar"/><classpathentry kind="lib" path="C:/Program Files/Mendix/5.16.1/runtime/bundles/webui.jar"/><classpathentry kind="lib" path="C:/Program Files/Mendix/5.16.1/runtime/bundles/javax.servlet.jar"/>
 	<classpathentry kind="lib" path="userlib/axiom-api-1.2.12.jar"/><classpathentry kind="lib" path="userlib/commons-lang-2.5.jar"/><classpathentry kind="lib" path="userlib/commons-logging-1.1.jar"/><classpathentry kind="lib" path="userlib/guice-2.0.jar"/><classpathentry kind="lib" path="userlib/openid4java-0.9.8.jar"/>
 	<classpathentry kind="output" path="deployment/run/bin"/>
 </classpath>

MxBootswatch.launch

@@ -10,23 +10,23 @@
 <mapEntry key="M2EE_ADMIN_PASS" value="1"/>
 <mapEntry key="M2EE_ADMIN_PORT" value="8090"/>
 <mapEntry key="M2EE_ADMIN_LISTEN_ADDRESSES" value="*"/>
-<mapEntry key="M2EE_CONSOLE_PATH" value="C:/Program Files/Mendix/5.15.0/modeler/MendixConsoleLog.exe"/>
+<mapEntry key="M2EE_CONSOLE_PATH" value="C:/Program Files/Mendix/5.16.1/modeler/MendixConsoleLog.exe"/>
 <mapEntry key="MXCONSOLE_BASE_PATH" value="C:/Users/sbl/Documents/GitHub/MxBootswatch/deployment"/>
-<mapEntry key="MXCONSOLE_RUNTIME_PATH" value="C:/Program Files/Mendix/5.15.0/runtime"/>
-<mapEntry key="MXCONSOLE_RUNTIME_PORT" value="8080"/>
+<mapEntry key="MXCONSOLE_RUNTIME_PATH" value="C:/Program Files/Mendix/5.16.1/runtime"/>
+<mapEntry key="MXCONSOLE_RUNTIME_PORT" value="8020"/>
 <mapEntry key="MXCONSOLE_RUNTIME_LISTEN_ADDRESSES" value="*"/>
 <mapEntry key="MXCONSOLE_SERVER_URL" value="http://127.0.0.1:8090/"/>
 </mapAttribute>
 <stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
 <stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;sourceLookupDirector&gt;&#13;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;MxBootswatch&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;default/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.debug.core.containerType.default&quot;/&gt;&#13;&#10;&lt;/sourceContainers&gt;&#13;&#10;&lt;/sourceLookupDirector&gt;&#13;&#10;"/>
 <listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry containerPath=&quot;org.eclipse.jdt.launching.JRE_CONTAINER&quot; javaProject=&quot;MxBootswatch&quot; path=&quot;1&quot; type=&quot;4&quot;/&gt;&#13;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;C:/Program Files/Mendix/5.15.0/runtime/felix/bin/felix.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;C:/Program Files/Mendix/5.15.0/runtime/lib/com.mendix.xml-apis-1.4.1.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;C:/Program Files/Mendix/5.16.1/runtime/felix/bin/felix.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;C:/Program Files/Mendix/5.16.1/runtime/lib/com.mendix.xml-apis-1.4.1.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 </listAttribute>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.felix.main.Main"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="MxBootswatch"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djava.net.preferIPv4Stack=true -Djava.library.path=&quot;C:/Program Files/Mendix/5.15.0/runtime/lib/x64;C:/Users/sbl/Documents/GitHub/MxBootswatch/deployment/model/lib/userlib&quot; -Dfile.encoding=UTF-8 -Djava.io.tmpdir=&quot;C:/Users/sbl/Documents/GitHub/MxBootswatch/deployment/data/tmp&quot; -Djava.security.policy==&quot;C:\Users\sbl\Documents\GitHub\MxBootswatch\deployment\data\.policy&quot; -Dorg.osgi.framework.security=&quot;osgi&quot; -Dcom.mendix.policy.file=&quot;C:\Users\sbl\Documents\GitHub\MxBootswatch\deployment\data\security.policy&quot; -Dfelix.config.properties=file:run/felixconfig.properties -Dorg.osgi.service.http.port=8080"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Djava.net.preferIPv4Stack=true -Djava.library.path=&quot;C:/Program Files/Mendix/5.16.1/runtime/lib/x64;C:/Users/sbl/Documents/GitHub/MxBootswatch/deployment/model/lib/userlib&quot; -Dfile.encoding=UTF-8 -Djava.io.tmpdir=&quot;C:/Users/sbl/Documents/GitHub/MxBootswatch/deployment/data/tmp&quot; -Djava.security.policy==&quot;C:\Users\sbl\Documents\GitHub\MxBootswatch\deployment\data\.policy&quot; -Dorg.osgi.framework.security=&quot;osgi&quot; -Dcom.mendix.policy.file=&quot;C:\Users\sbl\Documents\GitHub\MxBootswatch\deployment\data\security.policy&quot; -Dfelix.config.properties=file:run/felixconfig.properties -Dorg.osgi.service.http.port=8020"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="C:/Users/sbl/Documents/GitHub/MxBootswatch/deployment"/>
 </launchConfiguration>

javasource/com/mendix/core/Core.java

@@ -1424,10 +1424,25 @@ public static ISession initializeGuestSession() throws CoreException
 	 * @param xmlStream the xml stream to map and store.
 	 * @param xmlToDomainMappingName name of the mapping from xml to domain objects (as defined in the Mendix Business Modeler, e.g. "Orders.MyMapping").
 	 * @param mappingParameter parameter object used during the mapping (optional)
+	 * @deprecated Don't use this, it will be removed in the future. Use the version that allows you to pass a shouldValidate boolean.
 	 */
+	@Deprecated
 	public static void importXmlStream(IContext context, InputStream xmlStream, String xmlToDomainMappingName, IMendixObject mappingParameter)
 	{
-		integration.importXmlStream(context, xmlStream, xmlToDomainMappingName, mappingParameter);
+		integration.importXmlStream(context, xmlStream, xmlToDomainMappingName, mappingParameter, false);
+	}
+
+	/**
+	 * Import an xml stream, map this stream to domain objects and store those object in the Mendix database.
+	 * @param context the context.
+	 * @param xmlStream the xml stream to map and store.
+	 * @param xmlToDomainMappingName name of the mapping from xml to domain objects (as defined in the Mendix Business Modeler, e.g. "Orders.MyMapping").
+	 * @param mappingParameter parameter object used during the mapping (optional)
+	 * @param shouldValidate whether the xml should be validated.
+	 */
+	public static void importXmlStream(IContext context, InputStream xmlStream, String xmlToDomainMappingName, IMendixObject mappingParameter, boolean shouldValidate)
+	{
+		integration.importXmlStream(context, xmlStream, xmlToDomainMappingName, mappingParameter, shouldValidate);
 	}
 
 	/**
@@ -1438,11 +1453,29 @@ public static void importXmlStream(IContext context, InputStream xmlStream, Stri
 	 * @param mappingParameter parameter object used during the mapping (optional)
 	 * @param storeResultInVariable whether to store the result of the xml mapping in variable which will be returned by this method.
 	 * @param hasListReturnValue indicates whether the return value of the xml mapping is of type List.
+	 * @deprecated Don't use this, it will be removed in the future. Use the version that allows you to pass a shouldValidate boolean.
 	 */
+	@Deprecated
 	public static Object importXmlStream(IContext context, InputStream xmlStream, String xmlToDomainMappingName, IMendixObject mappingParameter,
 			boolean storeResultInVariable, boolean hasListReturnValue)
 	{
-		return integration.importXmlStream(context, xmlStream, xmlToDomainMappingName, mappingParameter, storeResultInVariable, -1, hasListReturnValue);
+		return integration.importXmlStream(context, xmlStream, xmlToDomainMappingName, mappingParameter, storeResultInVariable, -1, hasListReturnValue, false);
+	}
+
+	/**
+	 * Import an xml stream, map this stream to domain objects and store those object in the Mendix database.
+	 * @param context the context.
+	 * @param xmlStream the xml stream to map and store.
+	 * @param xmlToDomainMappingName name of the mapping from xml to domain objects (as defined in the Mendix Business Modeler, e.g. "Orders.MyMapping").
+	 * @param mappingParameter parameter object used during the mapping (optional)
+	 * @param storeResultInVariable whether to store the result of the xml mapping in variable which will be returned by this method.
+	 * @param hasListReturnValue indicates whether the return value of the xml mapping is of type List.
+	 * @param shouldValidate whether the xml should be validated.
+	 */
+	public static Object importXmlStream(IContext context, InputStream xmlStream, String xmlToDomainMappingName, IMendixObject mappingParameter,
+			boolean storeResultInVariable, boolean hasListReturnValue, boolean shouldValidate)
+	{
+		return integration.importXmlStream(context, xmlStream, xmlToDomainMappingName, mappingParameter, storeResultInVariable, -1, hasListReturnValue, shouldValidate);
 	}
 
 	/**
@@ -1496,7 +1529,10 @@ public static Object importXmlStream(IContext context, InputStream xmlStream, St
 	 *</pre>
 	 * @throws WebserviceException
 	 * @throws IOException
+	 * @deprecated Don't use this, it will be removed in the future. If you want to build your own custom web
+	 * service calls, you can fully implement this yourself.
 	 */
+	@Deprecated   
 	public static IWebserviceResponse callWebservice(String location, String soapAction, String soapRequestMessage) 
 	{
 		return integration.callWebservice(location, soapAction, soapRequestMessage);
@@ -1553,7 +1589,10 @@ public static IWebserviceResponse callWebservice(String location, String soapAct
 	 *</pre>
 	 * @throws WebserviceException
 	 * @throws IOException
+	 * @deprecated Don't use this, it will be removed in the future. If you want to build your own custom web
+	 * service calls, you can fully implement this yourself.
 	 */
+	@Deprecated
 	public static IWebserviceResponse callWebservice(String location, String soapAction, InputStream soapRequestMessage) 
 	{
 		return integration.callWebservice(location, soapAction, soapRequestMessage);

theme-builder/amelia/ui/theme-amelia/css/bootstrap.css

@@ -2,7 +2,7 @@
 /*!
  * Bootswatch v3.2.0
  * Homepage: http://bootswatch.com
- * Copyright 2012-2014 Thomas Park
+ * Copyright 2012-2015 Thomas Park
  * Licensed under MIT
  * Based on Bootstrap
 */
@@ -6596,7 +6596,6 @@ input[type="checkbox"] {
 ========================================================================== */
 .dijitCalendarContainer {
   background-color: #ad1d28;
-  z-index: 98 !important;
 }
 .dijitCalendarContainer tr th,
 .dijitCalendarContainer tr td {
@@ -6722,8 +6721,43 @@ input[type="checkbox"] {
   background: #0f7f88;
 }
 .amelia .mx-datagrid .mx-datagrid-body-table .selected td {
-  background: #0f7f88;
+  background: #0a545a;
 }
 .amelia .mx-list > li:last-child {
   border-radius: 0px;
 }
+.navbar {
+  min-height: 0px;
+  color: #ffffff;
+}
+.navbar .mx-layoutcontainer-wrapper {
+  padding: 0px;
+}
+.navbar .navbar {
+  margin: 0px;
+  border: none;
+  border-radius: 0px;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+}
+.app-sidebar {
+  background: #ad1d28;
+}
+.app-sidebar .mx-layoutcontainer-wrapper {
+  padding: 0px;
+}
+.app-sidebar .navbar {
+  width: 100%;
+  border: none;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+}
+.app-sidebar .navbar .nav {
+  margin: 0px;
+}
+.navbar-nav {
+  margin: 0px;
+}
+.mx-layoutcontainer-middle .mx-layoutcontainer-wrapper.mx-layoutcontainer-nested {
+  overflow: hidden;
+}

theme-builder/bower_components/mendix/mendix-global.less

@@ -295,7 +295,7 @@ input[type="radio"], input[type="checkbox"] {
 ========================================================================== */
 .dijitCalendarContainer {
     background-color: @dijitCalendar-bg-color;
-    z-index: 98 !important;
+
     tr th,tr td {
         padding: 6px;
         text-align: center;
@@ -437,11 +437,49 @@ input[type="radio"], input[type="checkbox"] {
     background: @mx-list-striped-bg;
 }
 .mx-datagrid .mx-datagrid-body-table .selected td{
-    background:@mx-templategrid-itemselected-bg;
+    background:darken(@mx-templategrid-itemselected-bg,10%);
 }
 .mx-list > li:last-child{
     border-radius:0px;
 
 }
 
+}
+.navbar{
+    min-height: 0px;
+    .mx-layoutcontainer-wrapper{
+        padding: 0px;
+    }
+    .navbar{
+        margin: 0px;
+        border:none;
+        border-radius: 0px;
+        -webkit-box-shadow: none;
+        box-shadow: none;
+    }
+    color: @navbar-default-link-color;
+
+}
+.app-sidebar{
+    background: @navbar-default-bg;
+    .mx-layoutcontainer-wrapper{
+        padding:0px;
+    }
+    .navbar{
+        width:100%;
+        border: none;
+          -webkit-box-shadow: none;
+  box-shadow: none;
+        .nav{
+              margin: 0px;
+        }
+    }
+}
+.navbar-nav{
+    margin:0px;
+}
+.mx-layoutcontainer-middle{
+    .mx-layoutcontainer-wrapper.mx-layoutcontainer-nested{
+        overflow: hidden;
+    }
 }

theme-builder/cerulean/ui/theme-cerulean/css/bootstrap.css

@@ -1,7 +1,7 @@
 /*!
  * Bootswatch v3.2.0
  * Homepage: http://bootswatch.com
- * Copyright 2012-2014 Thomas Park
+ * Copyright 2012-2015 Thomas Park
  * Licensed under MIT
  * Based on Bootstrap
 */
@@ -6603,7 +6603,6 @@ input[type="checkbox"] {
 ========================================================================== */
 .dijitCalendarContainer {
   background-color: #2fa4e7;
-  z-index: 98 !important;
 }
 .dijitCalendarContainer tr th,
 .dijitCalendarContainer tr td {
@@ -6729,8 +6728,43 @@ input[type="checkbox"] {
   background: #f9f9f9;
 }
 .cerulean .mx-datagrid .mx-datagrid-body-table .selected td {
-  background: #f9f9f9;
+  background: #e0e0e0;
 }
 .cerulean .mx-list > li:last-child {
   border-radius: 0px;
 }
+.navbar {
+  min-height: 0px;
+  color: #ffffff;
+}
+.navbar .mx-layoutcontainer-wrapper {
+  padding: 0px;
+}
+.navbar .navbar {
+  margin: 0px;
+  border: none;
+  border-radius: 0px;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+}
+.app-sidebar {
+  background: #2fa4e7;
+}
+.app-sidebar .mx-layoutcontainer-wrapper {
+  padding: 0px;
+}
+.app-sidebar .navbar {
+  width: 100%;
+  border: none;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+}
+.app-sidebar .navbar .nav {
+  margin: 0px;
+}
+.navbar-nav {
+  margin: 0px;
+}
+.mx-layoutcontainer-middle .mx-layoutcontainer-wrapper.mx-layoutcontainer-nested {
+  overflow: hidden;
+}

theme-builder/cosmo/ui/theme-cosmo/css/bootstrap.css

@@ -2,7 +2,7 @@
 /*!
  * Bootswatch v3.2.0
  * Homepage: http://bootswatch.com
- * Copyright 2012-2014 Thomas Park
+ * Copyright 2012-2015 Thomas Park
  * Licensed under MIT
  * Based on Bootstrap
 */
@@ -6603,7 +6603,6 @@ input[type="checkbox"] {
 ========================================================================== */
 .dijitCalendarContainer {
   background-color: #007fff;
-  z-index: 98 !important;
 }
 .dijitCalendarContainer tr th,
 .dijitCalendarContainer tr td {
@@ -6729,8 +6728,43 @@ input[type="checkbox"] {
   background: #f9f9f9;
 }
 .cosmo .mx-datagrid .mx-datagrid-body-table .selected td {
-  background: #f9f9f9;
+  background: #e0e0e0;
 }
 .cosmo .mx-list > li:last-child {
   border-radius: 0px;
 }
+.navbar {
+  min-height: 0px;
+  color: #ffffff;
+}
+.navbar .mx-layoutcontainer-wrapper {
+  padding: 0px;
+}
+.navbar .navbar {
+  margin: 0px;
+  border: none;
+  border-radius: 0px;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+}
+.app-sidebar {
+  background: #222222;
+}
+.app-sidebar .mx-layoutcontainer-wrapper {
+  padding: 0px;
+}
+.app-sidebar .navbar {
+  width: 100%;
+  border: none;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+}
+.app-sidebar .navbar .nav {
+  margin: 0px;
+}
+.navbar-nav {
+  margin: 0px;
+}
+.mx-layoutcontainer-middle .mx-layoutcontainer-wrapper.mx-layoutcontainer-nested {
+  overflow: hidden;
+}