Permalink
Browse files

getting ready for release

git-svn-id: https://flexapps.svn.sourceforge.net/svnroot/flexapps/census2@649 381d3abc-5231-0410-a0e4-b068e20cbb11
  • Loading branch information...
jlward4
jlward4 committed Jun 8, 2010
1 parent 66ec8d8 commit 6a1ac3b893f1db0e1354688ac1f7f99f2a93f79e
@@ -1,18 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<actionScriptProperties mainApplicationPath="census2.mxml" version="3">
- <compiler additionalCompilerArguments="-locale en_US -licenses.license flexbuilder3 137740017147979634978523" copyDependentFiles="true" enableModuleDebug="true" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="false" htmlPlayerVersion="9.0.28" htmlPlayerVersionCheck="false" outputFolderLocation="/home/jamesw/projects/census2/server/WebContent" outputFolderPath="bin-debug" rootURL="http://localhost:8080/census2/index.html?" sourceFolderPath="src" strict="true" useApolloConfig="false" verifyDigests="true" warn="true">
+<actionScriptProperties mainApplicationPath="census2.mxml" projectUUID="157f6f73-9419-4dc1-9a20-5c3fa1039a2f" version="6">
+ <compiler additionalCompilerArguments="-locale en_US -licenses.license flexbuilder3 137740017147979634978523" autoRSLOrdering="false" copyDependentFiles="true" flexSDK="Flex 3.5" fteInMXComponents="false" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="false" htmlPlayerVersionCheck="false" includeNetmonSwc="false" outputFolderLocation="/home/jamesw/projects/census2/server/WebContent" outputFolderPath="bin-debug" rootURL="http://localhost:8080/census2/index.html?" sourceFolderPath="src" strict="true" targetPlayerVersion="0.0.0" useApolloConfig="false" useDebugRSLSwfs="true" verifyDigests="true" warn="true">
<compilerSourcePath/>
<libraryPath defaultLinkType="3">
- <libraryPathEntry kind="3" linkType="1" path="${PROJECT_FRAMEWORKS}/libs/player/9/playerglobal.swc" useDefaultLinkType="false"/>
<libraryPathEntry kind="4" path="">
<modifiedEntries>
- <libraryPathEntry index="4" kind="3" linkType="4" path="${PROJECT_FRAMEWORKS}/libs/rpc.swc" useDefaultLinkType="true">
+ <libraryPathEntry kind="3" linkType="4" path="${PROJECT_FRAMEWORKS}/libs/rpc.swc" useDefaultLinkType="true">
<crossDomainRsls>
<crossDomainRslEntry autoExtract="true" policyFileUrl="" rslUrl="rpc_3.5.0.12683.swz"/>
<crossDomainRslEntry autoExtract="true" policyFileUrl="" rslUrl="rpc_3.5.0.12683.swf"/>
</crossDomainRsls>
</libraryPathEntry>
- <libraryPathEntry kind="3" linkType="4" path="${PROJECT_FRAMEWORKS}/libs/datavisualization.swc" useDefaultLinkType="true">
+ <libraryPathEntry kind="3" linkType="4" path="${PROJECT_FRAMEWORKS}/libs/datavisualization.swc" sourcepath="${PROJECT_FRAMEWORKS}/projects/datavisualization/src" useDefaultLinkType="true">
<crossDomainRsls>
<crossDomainRslEntry autoExtract="true" policyFileUrl="" rslUrl="datavisualization_3.5.0.12683.swz"/>
<crossDomainRslEntry autoExtract="true" policyFileUrl="" rslUrl="datavisualization_3.5.0.12683.swf"/>
@@ -25,7 +24,9 @@
</libraryPathEntry>
<libraryPathEntry kind="1" linkType="1" path="libs"/>
</libraryPath>
- <sourceAttachmentPath/>
+ <sourceAttachmentPath>
+ <sourceAttachmentPathEntry kind="3" linkType="4" path="${PROJECT_FRAMEWORKS}/libs/datavisualization.swc" sourcepath="${PROJECT_FRAMEWORKS}/projects/datavisualization/src" useDefaultLinkType="true"/>
+ </sourceAttachmentPath>
</compiler>
<applications>
<application path="census2.mxml"/>
View
@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<flexProperties flexServerType="0" toolCompile="true" useServerFlexSDK="false" version="1"/>
+<flexProperties enableServiceManager="false" flexServerFeatures="0" flexServerType="0" toolCompile="true" useServerFlexSDK="false" version="1"/>
@@ -1,4 +0,0 @@
-#Mon Mar 29 10:24:55 MDT 2010
-eclipse.preferences.version=1
-upgradeSDK/fb253292=
-upgradeSDK/fb4=
@@ -8,21 +8,23 @@
import mx.rpc.events.ResultEvent;
import mx.rpc.events.FaultEvent;
- </mx:Script>
-
- <census2:ChannelConfig id="channelConfig">
- <census2:setup>
+
+ private function refreshData():void
+ {
var token:AsyncToken = channelConfig.remoteObject.getAllResults();
token.addResponder(new AsyncResponder(function(resultEvent:ResultEvent, o:Object):void {
dg.dataProvider = resultEvent.result;
}, function(faultEvent:FaultEvent, o:Object):void {
Alert.show(faultEvent.fault.message, "Error");
}));
- </census2:setup>
- </census2:ChannelConfig>
+ }
+ </mx:Script>
+
+ <census2:ChannelConfig id="channelConfig" setup="refreshData()"/>
<mx:DataGrid id="dg" width="100%" height="100%">
<mx:columns>
+ <mx:DataGridColumn dataField="createDate"/>
<mx:DataGridColumn dataField="testId"/>
<mx:DataGridColumn dataField="ipAddress"/>
<mx:DataGridColumn dataField="gzip"/>
@@ -36,4 +38,15 @@
</mx:columns>
</mx:DataGrid>
+ <mx:Button label="delete selected" enabled="{dg.selectedItem != null}">
+ <mx:click>
+ var token:AsyncToken = channelConfig.remoteObject.deleteResult(dg.selectedItem.ipAddress, dg.selectedItem.testId, dg.selectedItem.gzip, dg.selectedItem.numRows);
+ token.addResponder(new AsyncResponder(function(resultEvent:ResultEvent, o:Object):void {
+ refreshData();
+ }, function(faultEvent:FaultEvent, o:Object):void {
+ Alert.show(faultEvent.fault.message, "Error");
+ }));
+ </mx:click>
+ </mx:Button>
+
</mx:Application>
View
@@ -125,6 +125,11 @@
private function startTest(test:Object):void
{
+ if (numRows.value > numRows.maximum)
+ {
+ numRows.value = numRows.maximum;
+ }
+
resetResults(test);
iframe.source = test.url + "?clientId="+channelConfig.subtopic +
@@ -339,7 +344,7 @@
<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="20000" 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))
@@ -366,7 +371,7 @@
<mx:Component>
<mx:HBox paddingTop="0" paddingBottom="0" verticalScrollPolicy="off" horizontalScrollPolicy="off"
useHandCursor="true" buttonMode="true" mouseChildren="false" backgroundAlpha="0.000001" backgroundColor="#ffffff">
- <mx:Label text="{data.name}" fontSize="10" width="90" styleName="listItem" fontWeight="bold"/>
+ <mx:Label text="{data.name}" fontSize="10" width="100" styleName="listItem" fontWeight="bold"/>
<mx:Label text="{data.description}" fontSize="10"/>
</mx:HBox>
</mx:Component>
@@ -30,7 +30,7 @@ public class TextFormatters
var nf:NumberFormatter = new NumberFormatter();
var n:Number = new Number(labelValue);
- if (n >= 1000000)
+ if (n >= 1048576)
{
if ((Math.floor(n / 100000) % 10) == 0)
{
@@ -40,9 +40,9 @@ public class TextFormatters
{
nf.precision = 1;
}
- return nf.format(n / 1000000) + " MB";
+ return nf.format(n / 1048576) + " MB";
}
- else if (n >= 1000)
+ else if (n >= 1024)
{
if ((n % 1000) == 0)
{
@@ -52,7 +52,7 @@ public class TextFormatters
{
nf.precision = 1;
}
- return nf.format(n / 1000) + " KB";
+ return nf.format(n / 1024) + " KB";
}
else if (n == -1)
{
@@ -110,7 +110,7 @@ public class TextFormatters
public static function getChartDetails(item:Object):String
{
- var s:String = "<font size='20'><b>" + item.name + "</b></font>" +
+ var s:String = "<font size='18'><b>" + item.name + "</b></font>" +
"<br/><font size='16'><b>Rows: " + getRpsFormatter().format(item.numRows) + "</b></font>" +
"<br/><font size='16'><b>Gzip: " + item.gzip + "</b></font>";
View
@@ -13,6 +13,11 @@
<attribute name="owner.project.facets" value="jst.web"/>
</attributes>
</classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/Census 2 JBoss 5.1 Runtime">
+ <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"/>
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<faceted-project>
- <runtime name="JBoss 5.1 Runtime Census2"/>
+ <runtime name="Census 2 JBoss 5.1 Runtime"/>
<fixed facet="jst.java"/>
<fixed facet="jst.web"/>
<installed facet="jst.java" version="6.0"/>
Binary file not shown.
@@ -49,4 +49,5 @@
<welcome-file-list>
<welcome-file>index.html</welcome-file>
</welcome-file-list>
+
</web-app>
Binary file not shown.
Binary file not shown.
View
Binary file not shown.
@@ -49,6 +49,12 @@
<url>http://localhost:8080/census2-tests/silverlight_xml.html</url>
<description>Silverlight via XML</description>
</test>
+ <test>
+ <id>smartgwt_rpc</id>
+ <name>Smart GWT RPC</name>
+ <url>http://localhost:8080/census2-tests/Census2_gwt.html</url>
+ <description>Smart GWT via RPC</description>
+ </test>
<test>
<id>dojo_json</id>
<name>Dojo JSON</name>
@@ -112,6 +112,7 @@
{
CensusResult cr = rai.next();
item.put(cr.getResultType(), cr.getResultData());
+ item.put("createDate", cr.getCreateDate());
}
allResults.add(item);
@@ -138,4 +139,18 @@
return allRawResults;
}
+ public void deleteResult(String ipAddress, String testId, Boolean gzip, Integer numRows)
+ {
+ ObjectContainer db4oServer = (ObjectContainer)FlexContext.getServletContext().getAttribute(Db4oServletContextListener.KEY_DB4O_SERVER);
+ CensusResult searchCensusResult = new CensusResult();
+ searchCensusResult.setTestId(testId);
+ searchCensusResult.setNumRows(numRows);
+ searchCensusResult.setGzip(gzip);
+ ObjectSet<CensusResult> results = db4oServer.queryByExample(searchCensusResult);
+ for (CensusResult r : results)
+ {
+ db4oServer.delete(r);
+ }
+ }
+
}

0 comments on commit 6a1ac3b

Please sign in to comment.