M5toM6.diff

diff -ur /Users/pedemonte/builds/maqetta-Preview5/users/javier@pedemonte.us/eclipse_yo/.settings/com.ibm.etools.webtools.dojo.core.prefs users/javier@pedemonte.us/eclipse_yo/.settings/com.ibm.etools.webtools.dojo.core.prefs
--- /Users/pedemonte/builds/maqetta-Preview5/users/javier@pedemonte.us/eclipse_yo/.settings/com.ibm.etools.webtools.dojo.core.prefs	2012-05-15 23:17:01.000000000 -0500
+++ users/javier@pedemonte.us/eclipse_yo/.settings/com.ibm.etools.webtools.dojo.core.prefs	2012-05-15 23:27:00.000000000 -0500
@@ -1,18 +1,10 @@
-#Tue May 15 23:17:01 CDT 2012
-dojo-args-attribute-name=data-dojo-args,args
-dojo-attach-event-attribute-name=data-dojo-attach-event,dojoAttachEvent
-dojo-attach-point-attribute-name=data-dojo-attach-point,dojoAttachPoint
+#Tue May 15 23:27:00 CDT 2012
+dojo-root=/eclipse_yo/WebContent/lib/dojo
 dojo-bootstrap-js=dojo/dojo.js
-dojo-config-attribute-name=data-dojo-config,djConfig
 dojo-css=dojo/resources/dojo.css
-dojo-deploy-location-option=ProjectSetupProperties.deploy.as.part.of.this.project
+eclipse.preferences.version=1
 dojo-dijit-css=dijit/themes/dijit.css
-dojo-event-attribute-name=data-dojo-event,event
-dojo-id-attribute-name=data-dojo-id,jsId
-dojo-props-attribute-name=data-dojo-props,DOJO-SETTINGS-NO-VALUE
-dojo-root=/eclipse_yo/WebContent/lib/dojo
+dojo-deploy-location-option=ProjectSetupProperties.deploy.as.part.of.this.project
 dojo-source-metadata-root=/eclipse_yo/WebContent/lib/dojo
 dojo-theme-css=dijit/themes/claro/claro.css
-dojo-type-attribute-name=data-dojo-type,dojoType
 dojo-version-attribute-name=1.7.1 (27407)
-eclipse.preferences.version=1
diff -ur /Users/pedemonte/builds/maqetta-Preview5/users/javier@pedemonte.us/eclipse_yo/.settings/org.eclipse.wst.validation.prefs users/javier@pedemonte.us/eclipse_yo/.settings/org.eclipse.wst.validation.prefs
--- /Users/pedemonte/builds/maqetta-Preview5/users/javier@pedemonte.us/eclipse_yo/.settings/org.eclipse.wst.validation.prefs	2012-05-15 23:17:01.000000000 -0500
+++ users/javier@pedemonte.us/eclipse_yo/.settings/org.eclipse.wst.validation.prefs	2012-05-15 23:27:00.000000000 -0500
@@ -1,15 +1,14 @@
-#Tue May 15 23:17:01 CDT 2012
-DELEGATES_PREFERENCE=delegateValidatorList
-USER_BUILD_PREFERENCE=enabledBuildValidatorListorg.eclipse.wst.wsi.ui.internal.WSIMessageValidator;com.ibm.jee.sdo.jdbc.ui.validators.JDBCMediatorConnectionFileValidator;
-USER_MANUAL_PREFERENCE=enabledManualValidatorListorg.eclipse.wst.wsi.ui.internal.WSIMessageValidator;com.ibm.jee.sdo.jdbc.ui.validators.JDBCMediatorConnectionFileValidator;
-USER_PREFERENCE=overrideGlobalPreferencesfalse
-eclipse.preferences.version=1
+#Tue May 15 23:27:00 CDT 2012
+vals/com.ibm.etools.webtools.dojo.core.dojoUniformAttributesSettingValidator/groups=0107include0105facet08rad.dojo0107include11007fileext04htmlF07fileext05xhtmlF07fileext03htmF07fileext04htplF07fileext03jspF07fileext03jsfF07fileext03jsvF07fileext04jtplF111contentType136org.eclipse.wst.html.core.htmlsourceT111contentType134org.eclipse.jst.jsp.core.jspsourceT0107exclude0504file121WebContent/lib/dojo/dojoxF0204file120WebContent/lib/dojo/dojoF0204file120WebContent/lib/dojo/utilF0204file124WebContent/lib/dojo/ibm_soapF0204file121WebContent/lib/dojo/dijitF02
 override=true
+USER_MANUAL_PREFERENCE=enabledManualValidatorListcom.ibm.jee.sdo.jdbc.ui.validators.JDBCMediatorConnectionFileValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;
+vals/org.eclipse.wst.html.ui.HTMLValidator/groups=0107include06111contentType136org.eclipse.wst.html.core.htmlsourceT07fileext04htmlF07fileext05xhtmlF07fileext03htmF07fileext04htplF07fileext03wmlF0107exclude0504file121WebContent/lib/dojo/dojoxF0204file120WebContent/lib/dojo/dojoF0204file120WebContent/lib/dojo/utilF0204file124WebContent/lib/dojo/ibm_soapF0204file121WebContent/lib/dojo/dijitF02
 suspend=false
-vals/com.ibm.etools.webtools.dojo.core.dojoUniformAttributesSettingValidator/groups=0107include0105facet08rad.dojo0107include11007fileext04htmlF07fileext05xhtmlF07fileext03htmF07fileext04htplF07fileext03jspF07fileext03jsfF07fileext03jsvF07fileext04jtplF111contentType136org.eclipse.wst.html.core.htmlsourceT111contentType134org.eclipse.jst.jsp.core.jspsourceT0107exclude0404file121WebContent/lib/dojo/dojoxF0204file120WebContent/lib/dojo/dojoF0204file120WebContent/lib/dojo/utilF0204file121WebContent/lib/dojo/dijitF02
-vals/com.ibm.etools.webtools.json.core.json/groups=0107include02111contentType136org.eclipse.wst.jsdt.core.jsonSourceT07fileext04jsonF0107exclude0404file121WebContent/lib/dojo/dojoxF0204file120WebContent/lib/dojo/dojoF0204file120WebContent/lib/dojo/utilF0204file121WebContent/lib/dojo/dijitF02
-vals/org.eclipse.wst.html.ui.HTMLValidator/groups=0107include06111contentType136org.eclipse.wst.html.core.htmlsourceT07fileext04htmlF07fileext05xhtmlF07fileext03htmF07fileext04htplF07fileext03wmlF0107exclude0404file121WebContent/lib/dojo/dojoxF0204file120WebContent/lib/dojo/dojoF0204file120WebContent/lib/dojo/utilF0204file121WebContent/lib/dojo/dijitF02
-vals/org.eclipse.wst.jsdt.web.core.JsBatchValidator/groups=0107include01113projectNature134org.eclipse.wst.jsdt.core.jsNature0107include11007fileext04htmlF07fileext05xhtmlF07fileext03htmF07fileext04htplF07fileext03jspF07fileext03jsfF07fileext03jsvF07fileext04jtplF111contentType136org.eclipse.wst.html.core.htmlsourceT111contentType134org.eclipse.jst.jsp.core.jspsourceT0107exclude0404file121WebContent/lib/dojo/dojoxF0204file120WebContent/lib/dojo/dojoF0204file120WebContent/lib/dojo/utilF0204file121WebContent/lib/dojo/dijitF02
-vals/org.eclipse.wst.xml.core.xml/groups=0107include05111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF0107exclude09113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature04file121WebContent/lib/dojo/dojoxF0204file120WebContent/lib/dojo/dojoF0204file120WebContent/lib/dojo/utilF0204file121WebContent/lib/dojo/dijitF0204file08.projectT01113projectNature130org.eclipse.jst.j2ee.EARNature04file110.settings/T0204file110.classpathT01
-vals/org.eclipse.wst.xsl.core.xsl/groups=0107include0207fileext03xslF111contentType134org.eclipse.wst.xml.core.xslsourceT0107exclude0404file121WebContent/lib/dojo/dojoxF0204file120WebContent/lib/dojo/dojoF0204file120WebContent/lib/dojo/utilF0204file121WebContent/lib/dojo/dijitF02
+vals/com.ibm.etools.webtools.json.core.json/groups=0107include02111contentType136org.eclipse.wst.jsdt.core.jsonSourceT07fileext04jsonF0107exclude0504file121WebContent/lib/dojo/dojoxF0204file120WebContent/lib/dojo/dojoF0204file120WebContent/lib/dojo/utilF0204file124WebContent/lib/dojo/ibm_soapF0204file121WebContent/lib/dojo/dijitF02
+eclipse.preferences.version=1
 vf.version=3
+vals/org.eclipse.wst.xml.core.xml/groups=0107include05111contentType128org.eclipse.core.runtime.xmlT111contentType134org.eclipse.wst.xml.core.xmlsourceT111contentType134org.eclipse.wst.xml.core.xslsourceT111contentType134org.eclipse.jst.jsp.core.tldsourceT07fileext03xmlF0107exclude111113projectNature134org.eclipse.jst.j2ee.ejb.EJBNature04file121WebContent/dojo/dojoxF0204file120WebContent/dojo/dojoF0204file120WebContent/dojo/utilF0207pattern124.*/META-INF/ibmconfig/.*F04file124WebContent/dojo/ibm_soapF0204file121WebContent/dojo/dijitF0204file08.projectT01113projectNature130org.eclipse.jst.j2ee.EARNature04file110.settings/T0204file110.classpathT01
+DELEGATES_PREFERENCE=delegateValidatorList
+vals/org.eclipse.wst.jsdt.web.core.JsBatchValidator/groups=0107include01113projectNature134org.eclipse.wst.jsdt.core.jsNature0107include11007fileext04htmlF07fileext05xhtmlF07fileext03htmF07fileext04htplF07fileext03jspF07fileext03jsfF07fileext03jsvF07fileext04jtplF111contentType136org.eclipse.wst.html.core.htmlsourceT111contentType134org.eclipse.jst.jsp.core.jspsourceT0107exclude0504file121WebContent/lib/dojo/dojoxF0204file120WebContent/lib/dojo/dojoF0204file120WebContent/lib/dojo/utilF0204file124WebContent/lib/dojo/ibm_soapF0204file121WebContent/lib/dojo/dijitF02
+USER_PREFERENCE=overrideGlobalPreferencesfalse
+USER_BUILD_PREFERENCE=enabledBuildValidatorListcom.ibm.jee.sdo.jdbc.ui.validators.JDBCMediatorConnectionFileValidator;org.eclipse.wst.wsi.ui.internal.WSIMessageValidator;
diff -ur /Users/pedemonte/builds/maqetta-Preview5/users/javier@pedemonte.us/project1/.settings/libs.settings users/javier@pedemonte.us/project1/.settings/libs.settings
--- /Users/pedemonte/builds/maqetta-Preview5/users/javier@pedemonte.us/project1/.settings/libs.settings	2012-05-15 23:13:23.000000000 -0500
+++ users/javier@pedemonte.us/project1/.settings/libs.settings	2012-05-15 23:24:38.000000000 -0500
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <libraries>
-<library id="maqetta" name="maqetta" version="0.3" virtualRoot=""/>
+<library id="maqetta" name="maqetta" version="0.3" virtualRoot="lib/maqetta"/>
 <library id="dojo" name="dojo" version="1.7" virtualRoot="lib/dojo"/>
 <library id="DojoThemes" name="DojoThemes" version="1.7" virtualRoot="themes"/>
+<library id="gridx" name="gridx" version="1.0" virtualRoot="lib/dojo/gridx"/>
 <library id="html" name="html" version="0.8"/>
 <library id="clipart" name="clipart" version="1.0" virtualRoot="lib/clipart"/>
 <library id="shapes" name="shapes" version="1.0" virtualRoot="lib/shapes"/>
diff -ur /Users/pedemonte/builds/maqetta-Preview5/users/javier@pedemonte.us/project1/Sample1.html users/javier@pedemonte.us/project1/Sample1.html
--- /Users/pedemonte/builds/maqetta-Preview5/users/javier@pedemonte.us/project1/Sample1.html	2012-05-15 23:13:23.000000000 -0500
+++ users/javier@pedemonte.us/project1/Sample1.html	2012-05-15 23:24:38.000000000 -0500
@@ -7,16 +7,18 @@
 @import "app.css";
 @import "lib/dojo/dojo/resources/dojo.css";
 </style>
-<script type="text/javascript" src="maqetta/maqetta.js"></script>
-<script type="text/javascript" data-dojo-config="'async':true,'parseOnLoad':true,'packages':[{'name':'clipart','location':'../../clipart'},{'name':'shapes','location':'../../shapes'}]" src="lib/dojo/dojo/dojo.js"></script>
-<script type="text/javascript" src="maqetta/States.js"></script>
+<script type="text/javascript" data-dojo-config="'async':true,'parseOnLoad':true,'packages':[{'name':'clipart','location':'../../clipart'},{'name':'shapes','location':'../../shapes'},{'name':'maqetta','location':'../../maqetta'}]" src="lib/dojo/dojo/dojo.js"></script>
 <script type="text/javascript">
-require(['dijit/layout/TabContainer']);
-require(['dijit/layout/ContentPane']);
-require(['dijit/form/Button']);
-require(['dijit/form/ComboBox']);
-require(['dijit/form/MultiSelect']);
-require(['dijit/form/TextBox']);
+require([
+  "dijit/layout/TabContainer",
+  "dijit/layout/ContentPane",
+  "dijit/form/Button",
+  "dijit/form/ComboBox",
+  "dijit/form/MultiSelect",
+  "dijit/form/TextBox",
+  "maqetta/space",
+  "maqetta/AppStates"
+]);
 </script>
 </head>
 <body class="claro" data-davinci-ws="collapse" id="myapp" dvFlowLayout="true" dvStates="{'Add Task':{'origin':true},'Task Added':{'origin':true}}">
diff -ur /Users/pedemonte/builds/maqetta-Preview5/users/javier@pedemonte.us/project1/file1.html users/javier@pedemonte.us/project1/file1.html
--- /Users/pedemonte/builds/maqetta-Preview5/users/javier@pedemonte.us/project1/file1.html	2012-05-15 23:14:34.000000000 -0500
+++ users/javier@pedemonte.us/project1/file1.html	2012-05-15 23:25:06.000000000 -0500
@@ -3,15 +3,18 @@
 <head>
 <meta charset="utf-8"/>
 <title>Untitled</title>
+<script type="text/javascript" src="lib/dojo/dojo/dojo.js" data-dojo-config="'async':true,'parseOnLoad':true,'packages':[{'name':'maqetta','location':'../../maqetta'},{'name':'gridx','location':'../gridx'},{'name':'clipart','location':'../../clipart'},{'name':'shapes','location':'../../shapes'},{'name':'jquery-ui','location':'../../jquery-ui'},{'name':'yui','location':'../../yui'}]"></script>
+<script type="text/javascript">
+require([
+  "dijit/dijit",
+  "dojo/parser",
+  "maqetta/space",
+  "maqetta/AppStates",
+  "dijit/Calendar"
+]);
+</script>
 <style>@import "themes/claro/claro.css";@import "lib/dojo/dojo/resources/dojo.css";@import "app.css";
 </style>
-<script type="text/javascript" src="maqetta/maqetta.js"></script>
-<script type="text/javascript" src="lib/dojo/dojo/dojo.js" data-dojo-config="'async':true,'parseOnLoad':true,'packages':[{'name':'clipart','location':'../../clipart'},{'name':'shapes','location':'../../shapes'},{'name':'jquery-ui','location':'../../jquery-ui'},{'name':'yui','location':'../../yui'}]"></script>
-<script type="text/javascript" src="maqetta/States.js"></script>
-<script type="text/javascript">
-require(["dijit/dijit"]);
-require(["dojo/parser"]);
-require(["dijit/Calendar"]);</script>
 </head>
 <body class="claro" dvFlowLayout="true" data-davinci-ws="collapse" id="myapp">
  <input data-dojo-type="dijit.Calendar"></input>
diff -ur /Users/pedemonte/builds/maqetta-Preview5/users/javier@pedemonte.us/project1/themes/myclaro/myclaro.theme users/javier@pedemonte.us/project1/themes/myclaro/myclaro.theme
--- /Users/pedemonte/builds/maqetta-Preview5/users/javier@pedemonte.us/project1/themes/myclaro/myclaro.theme	2012-05-15 23:15:43.000000000 -0500
+++ users/javier@pedemonte.us/project1/themes/myclaro/myclaro.theme	2012-05-15 23:26:03.000000000 -0500
@@ -1 +1 @@
-{"className":"myclaro","name":"myclaro","version":"1.7","specVersion":"0.7","files":["myclaro.css"],"meta":["claro.json"],"themeEditorHtmls":["dojo-theme-editor.html"]}
\ No newline at end of file
+{"className":"claro","name":"myclaro","version":"1.7","specVersion":"0.7","files":["myclaro.css"],"meta":["../claro/claro.json"],"themeEditorHtmls":["../claro/dojo-theme-editor.html"]}
\ No newline at end of file