git-svn-id: https://flexapps.svn.sourceforge.net/svnroot/flexapps/cen…

…sus2@644 381d3abc-5231-0410-a0e4-b068e20cbb11
jamesward · May 27, 2010 · 1963661 · 1963661
1 parent bab2e9f
commit 1963661
Show file tree

Hide file tree

Showing 16 changed files with 87 additions and 18 deletions.
diff --git a/README.txt b/README.txt
@@ -21,10 +21,26 @@ Deployment instructions
   httpcore-4.0.1.jar
   httpmime-4.0.jar
 
-- deploy census2-tests.war
+- If updating make a backup copy of the census2.war/WEB-INF/db folder
 
-- deploy census2.war
+- export release build for flex projects
+
+- copy bin-release contents to WebContent folders
+
+- export war files
+
+- extract war files
+
+- update census2.war/WEB-INF/db
+
+- update permissions on census2.war/WEB-INF/db/census.db4o
+
+- update permissions on census2-tests.war/WEB-INF/db/census
 
 - update the deploy/census2.war/tests.xml file
 
 - update the deploy/census2.war/blazeds_config.xml file
+
+- deploy census2-tests.war
+
+- deploy census2.war
diff --git a/client/src/census2.mxml b/client/src/census2.mxml
@@ -339,7 +339,17 @@
       <mx:Spacer height="10"/>
       <mx:HBox width="90%" verticalAlign="middle" horizontalAlign="center" horizontalGap="3">
         <mx:Label text="Rows" paddingTop="2"/>
-        <controls:MyNumericStepper id="numRows" minimum="1000" maximum="100000" stepSize="1000" value="5000" useHandCursor="true" buttonMode="true" height="26" width="70" textIndent="0" textAlign="right" change="fetchAverageResults()"/>
+        <controls:MyNumericStepper id="numRows" minimum="1000" maximum="100000" stepSize="1000" value="5000" useHandCursor="true" buttonMode="true" height="26" width="70" textIndent="0" textAlign="right" change="fetchAverageResults()">
+          <controls:keyDown>
+            <![CDATA[
+            if (((event as KeyboardEvent).keyCode == Keyboard.ENTER) && (testList.selectedItem != null))
+            {
+              resetResults(testList.selectedItem);
+              startTest(testList.selectedItem);
+            }
+            ]]>
+          </controls:keyDown>
+        </controls:MyNumericStepper>
         <mx:CheckBox id="enableGZip" label="GZip" labelPlacement="left" width="55" height="100%" selected="true" useHandCursor="true" buttonMode="true" mouseChildren="false" change="fetchAverageResults()"/>
         <mx:Button id="runButton" height="26" label="Execute" icon="@Embed(source='assets/rightIcon.png')"
                    enabled="{testList.selectedItem != null}" useHandCursor="{testList.selectedItem != null}" buttonMode="true"
@@ -397,7 +407,7 @@
       </mx:VBox>
       <mx:Spacer height="10"/>
       <mx:Box width="100%" height="35%" styleName="leftInnerContainer">
-        <local:IFrame id="iframe" width="100%" height="100%" visible="true"/>
+        <local:IFrame id="iframe" width="100%" height="100%" visible="true" creationComplete="iframe.visible = true"/>
       </mx:Box>
     </mx:VBox>
   </mx:HBox>

diff --git a/server/.classpath b/server/.classpath
@@ -8,6 +8,15 @@
 			<attribute name="owner.project.facets" value="jst.web"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/JBoss 5.1 Runtime Census2">
+		<attributes>
+			<attribute name="owner.project.facets" value="jst.web"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java-6-sun-1.6.0.20">
+		<attributes>
+			<attribute name="owner.project.facets" value="jst.java"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
diff --git a/server/.settings/org.eclipse.wst.common.project.facet.core.xml b/server/.settings/org.eclipse.wst.common.project.facet.core.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <faceted-project>
-  <runtime name="JBoss 5.1 Runtime"/>
+  <runtime name="JBoss 5.1 Runtime Census2"/>
   <fixed facet="jst.java"/>
   <fixed facet="jst.web"/>
   <installed facet="jst.java" version="6.0"/>

diff --git a/server/WebContent/CensusDashboard.swf b/server/WebContent/CensusDashboard.swf
diff --git a/server/WebContent/WEB-INF/lib/commons-lang-2.4.jar b/server/WebContent/WEB-INF/lib/commons-lang-2.4.jar
diff --git a/server/WebContent/WEB-INF/lib/flex-messaging-common.jar b/server/WebContent/WEB-INF/lib/flex-messaging-common.jar
diff --git a/server/WebContent/WEB-INF/lib/flex-messaging-core.jar b/server/WebContent/WEB-INF/lib/flex-messaging-core.jar
diff --git a/server/WebContent/WEB-INF/lib/flex-messaging-opt.jar b/server/WebContent/WEB-INF/lib/flex-messaging-opt.jar
diff --git a/server/WebContent/WEB-INF/lib/flex-messaging-proxy.jar b/server/WebContent/WEB-INF/lib/flex-messaging-proxy.jar
diff --git a/server/WebContent/WEB-INF/lib/flex-messaging-remoting.jar b/server/WebContent/WEB-INF/lib/flex-messaging-remoting.jar
diff --git a/server/WebContent/census2.swf b/server/WebContent/census2.swf
diff --git a/server/WebContent/index_results.html b/server/WebContent/index_results.html
@@ -19,6 +19,17 @@
 <html>
 	<head>
 		<script type="text/javascript" src="querystring.js"></script>
+	  <script type="text/javascript">
+	  var qs = new Querystring();
+
+	  var headID = document.getElementsByTagName("head")[0];         
+	  var cssNode = document.createElement('link');
+	  cssNode.type = 'text/css';
+	  cssNode.rel = 'stylesheet';
+	  cssNode.href = qs.get("theme") + ".css";
+	  cssNode.media = 'screen';
+	  headID.appendChild(cssNode);
+	  </script>
 	  <style>
 		html, body
 		{
@@ -29,17 +40,6 @@
 		}
 	  </style>
 	</head>
-  <script type="text/javascript">
-  var qs = new Querystring();
-
-  var headID = document.getElementsByTagName("head")[0];         
-  var cssNode = document.createElement('link');
-  cssNode.type = 'text/css';
-  cssNode.rel = 'stylesheet';
-  cssNode.href = qs.get("theme") + ".css";
-  cssNode.media = 'screen';
-  headID.appendChild(cssNode);
-  </script>
   <body class="leftInnerContainer">
 	  <center>
 	  	<table height="100%">

diff --git a/server/WebContent/readable.swf b/server/WebContent/readable.swf
diff --git a/server/WebContent/sexy.swf b/server/WebContent/sexy.swf
diff --git a/server/WebContent/tests.xml b/server/WebContent/tests.xml
@@ -11,6 +11,12 @@
   	<url>http://localhost:8080/census2-tests/flex_xml_as.html</url>
   	<description>Flex XML to AS Objects</description>
   </test>
+  <test>
+  	<id>flex_xml_e4x</id>
+  	<name>Flex XML E4X</name>
+  	<url>http://localhost:8080/census2-tests/flex_xml_e4x.html</url>
+  	<description>Flex XML to E4X</description>
+  </test>
   <test>
   	<id>flex_soap_as</id>
   	<name>Flex SOAP AS</name>
@@ -23,10 +29,38 @@
   	<url>http://localhost:8080/census2-tests/flex_soap_e4x.html</url>
   	<description>Flex SOAP to E4X</description>
   </test>
+  <!--
   <test>
   	<id>ajax_html</id>
   	<name>Ajax HTML</name>
   	<url>http://localhost:8080/census2-tests/ajax_html.html</url>
-  	<description>HTML Table via Ajax</description>
+  	<description>HTML Table via Plain Ajax</description>
+  </test>
+  <test>
+  	<id>ajax_json</id>
+  	<name>Ajax JSON</name>
+  	<url>http://localhost:8080/census2-tests/ajax_json.html</url>
+  	<description>HTML Table via Ajax JSON</description>
+  </test>
+  -->
+  <test>
+  	<id>silverlight_xml</id>
+  	<name>Silverlight XML</name>
+  	<url>http://localhost:8080/census2-tests/silverlight_xml.html</url>
+  	<description>Silverlight via XML</description>
+  </test>
+  <test>
+  	<id>dojo_json</id>
+  	<name>Dojo JSON</name>
+  	<url>http://localhost:8080/census2-tests/dojo_json.html</url>
+  	<description>Dojo Grid via JSON</description>
+  </test>
+  <!--
+  <test>
+    <id>flex_amf3_paged</id>
+    <name>Flex AMF3 Paged</name>
+    <url>http://localhost:8080/census2-tests/flex_amf3.html</url>
+    <description>Flex AMF3 w/ Paging</description>
   </test>
+  -->
 </tests>