You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2005/08/12 17:23:08 UTC
svn commit: r232310 [7/92] - in /beehive/trunk/controls/test: common/
infra/gtlf/ infra/gtlf/xsl/ infra/mantis/ infra/tch/ infra/tch/messages/
infra/tch/runtime/ infra/tch/schema/ perf/ perf/bin/ perf/cases/
perf/ctlsrc/org/apache/beehive/controls/perf...
Modified: beehive/trunk/controls/test/infra/tch/tch-root.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/infra/tch/tch-root.xml?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/infra/tch/tch-root.xml (original)
+++ beehive/trunk/controls/test/infra/tch/tch-root.xml Fri Aug 12 08:12:28 2005
@@ -1,270 +1,270 @@
-<project name="tch" default="version">
-
- <!-- This is the root Tch buildfile. It performs process configuration, as well as
- calling out to the specified Tch buildfile supplied by the user.
- See the documentation and the functional description document for more details. -->
-
- <!-- Tch core tasks -->
-
- <taskdef name="process-setup" classname="org.apache.beehive.test.tools.tch.core.stl.ProcessSetupTask"/>
-
- <taskdef name="test-suite-call" classname="org.apache.beehive.test.tools.tch.core.TestSuiteCallTask"/>
- <taskdef name="test-suite" classname="org.apache.beehive.test.tools.tch.core.TestSuiteTask"/>
- <taskdef name="test-block" classname="org.apache.beehive.test.tools.tch.core.TestBlockTask"/>
- <taskdef name="test" classname="org.apache.beehive.test.tools.tch.core.TestTask"/>
-
- <taskdef name="process" classname="org.apache.beehive.test.tools.tch.core.ProcessTask"/>
- <taskdef name="independent-test-group" classname="org.apache.beehive.test.tools.tch.core.IndependentTestGroupTask"/>
- <taskdef name="configuration-dependency" classname="org.apache.beehive.test.tools.tch.core.ConfigurationDependencyTask"/>
- <taskdef name="jvmarg" classname="org.apache.beehive.test.tools.tch.core.JvmargTask"/>
- <taskdef name="test-parameter" classname="org.apache.beehive.test.tools.tch.core.ParamTask"/>
- <taskdef name="test-unit-modifier" classname="org.apache.beehive.test.tools.tch.core.TestUnitModifierTask"/>
- <taskdef name="test-unit-override" classname="org.apache.beehive.test.tools.tch.core.TestUnitOverrideTask"/>
- <taskdef name="append-to-test-unit" classname="org.apache.beehive.test.tools.tch.core.AppendModifierToTestUnitTask"/>
- <taskdef name="test-name-modifier" classname="org.apache.beehive.test.tools.tch.core.TestNameModifierTask"/>
- <taskdef name="append-to-test-name" classname="org.apache.beehive.test.tools.tch.core.AppendModifierToTestNameTask"/>
- <taskdef name="test-parallel" classname="org.apache.beehive.test.tools.tch.core.TestParallelTask"/>
- <taskdef name="test-sequential" classname="org.apache.beehive.test.tools.tch.core.TestSequentialTask"/>
- <taskdef name="test-vehicle" classname="org.apache.beehive.test.tools.tch.core.TestVehicleTask"/>
- <taskdef name="test-metadata" classname="org.apache.beehive.test.tools.tch.core.TestMetadataTask"/>
-
- <taskdef name="if" classname="org.apache.beehive.test.tools.tch.core.IfTask"/>
- <taskdef name="conditional" classname="org.apache.beehive.test.tools.tch.core.IfTask$ConditionTask"/>
-
- <taskdef name="requires-dependent" classname="org.apache.beehive.test.tools.tch.core.RequiresDependentTask"/>
- <taskdef name="requires" classname="org.apache.beehive.test.tools.tch.core.RequiresTask"/>
- <taskdef name="dependent" classname="org.apache.beehive.test.tools.tch.core.DependentTask"/>
-
- <!-- FIXME we can probably remove the 'utility' task -->
- <taskdef name="utility" classname="org.apache.beehive.test.tools.tch.core.UtilityTask"/>
- <taskdef
- name="javatest-utility"
- classname="org.apache.beehive.test.tools.tch.extension.exectask.javatest.JavatestUtilityTask"/>
- <taskdef name="parameter"
- classname="org.apache.beehive.test.tools.tch.extension.exectask.javatest.JavatestUtilityTask$ParameterContainer"/>
-
- <taskdef name="custom-task" classname="org.apache.beehive.test.tools.tch.core.AnythingTask"/>
- <taskdef name="init-hook" classname="org.apache.beehive.test.tools.tch.core.InitHookTask"/>
- <taskdef name="cleanup-hook" classname="org.apache.beehive.test.tools.tch.core.CleanupHookTask"/>
- <taskdef name="prop-val-substitution" classname="org.apache.beehive.test.tools.tch.core.PropValueSubstitutionSetupTask"/>
- <taskdef name="inform" classname="org.apache.beehive.test.tools.tch.core.ant.TchLogTask"/>
-
-
-
- <taskdef name="startup" classname="org.apache.beehive.test.tools.tch.core.StartupTask"/>
- <taskdef name="file-exists" classname="org.apache.beehive.test.tools.tch.util.ant.FileExistsTask"/>
- <taskdef name="message" classname="org.apache.beehive.test.tools.tch.core.MessageTask"/>
- <taskdef name="test-list-output" classname="org.apache.beehive.test.tools.tch.core.TestListOutputTask"/>
- <taskdef name="update" classname="org.apache.beehive.test.tools.tch.extension.update.UpdateManager"/>
-
- <taskdef name="init-pm"
- classname="org.apache.beehive.test.tools.tch.core.InitProcessManagementTask"/>
- <taskdef name="resolve-process-info-props"
- classname="org.apache.beehive.test.tools.tch.core.process.ResolveProcessPropertiesTask"/>
- <taskdef name="check-references"
- classname="org.apache.beehive.test.tools.tch.core.ReferenceCheckTask"/>
- <taskdef name="final-validation"
- classname="org.apache.beehive.test.tools.tch.core.configuration.FinalValidationCheckTask"/>
- <taskdef name="auto-start-processes"
- classname="org.apache.beehive.test.tools.tch.core.AutoStartProcessesTask"/>
- <taskdef name="init-logger"
- classname="org.apache.beehive.test.tools.tch.core.InitLoggerTask"/>
- <taskdef name="test-runner" classname="org.apache.beehive.test.tools.tch.core.TestRunner"/>
- <taskdef name="shutdown"
- classname="org.apache.beehive.test.tools.tch.core.PrepareForShutdown"/>
-
- <!-- For javatest execution task -->
- <taskdef name="javatest"
- classname="org.apache.beehive.test.tools.tch.extension.exectask.javatest.JavatestTask"/>
-
- <taskdef name="junit"
- classname="org.apache.beehive.test.tools.tch.extension.exectask.junit.JunitExecTask"/>
-
- <!-- For webservertest execution task -->
- <taskdef name="wstest"
- classname="org.apache.beehive.test.tools.tch.extension.exectask.wstest.WebServerExecTask"/>
-
- <!-- Tch test (tch testing tch) -->
- <taskdef name="tch-diff-test" classname="org.apache.beehive.test.tools.tch.extension.exectask.self.TchExecTask"/>
-
-
-
- <!-- cmdline exec task -->
- <taskdef name="cmdline"
- classname="org.apache.beehive.test.tools.tch.extension.exectask.cmdline.CommandLineTask"/>
-
- <!-- For stf execution task
- <taskdef name="stf"
- classname="org.apache.beehive.test.tools.tch.extension.exectask.stf.STFExecTask"/>
- -->
- <!-- For ant-exec-task execution task -->
- <taskdef name="ant-task"
- classname="org.apache.beehive.test.tools.tch.extension.exectask.ant.AntExecTask"/>
-
- <property name="test-suite" value="test.xml"/>
-
- <property name="base-param" value="set-at-base"/>
-
- <property
- name="tch.internal.start-processes-only-prop-name"
- value="tch.start-processes-only"
- />
-
- <property
- name="tch.internal.log-banners-prop-name"
- value="tch.log-banners"
- />
-
- <!-- do not change this prefix, we depend on it for dynamic process config -->
- <property environment="env"/>
-
-
- <target name="version">
- <echo message="runtime java.version: ${java.version}"/>
- <echo message="runtime java.home: ${java.home}"/>
- <java classname="tch.version"/>
- </target>
-
- <target name="dtd">
- <antstructure output="simple.dtd"/>
- </target>
-
- <target name="run" depends="version,
- preRun,
- InitRun,
- PostInitRun,
- PreExecRun,
- ExecRun,
- PostRun"/>
-
- <target name="preRun">
-
- <startup/> <!-- might want to move both of these to the very beginning, when we want to have control over all msgs -->
-
- <fail unless="tch.home" message="tch.home must be set."/>
- <file-exists dir="${tch.baseDir}" file="${test-suite}" message="Your supplied test-suite XML testfile was not found. This is set using "-Dtest-suite=filename" and defaults to "test.xml". The file not found is: "/>
-
- <antcall target="print-start-message"/>
-
- <process-setup/>
-
- <!--java classname="org.apache.beehive.test.tools.tch.core.configuration.ProcessSetup"
- failonerror="true"/-->
-
-
-
-
- </target>
-
- <target name="InitRun" depends="is-init-mode-enabled">
- <echo message="Running test suite: ${test-suite} ..."/>
- <test-suite-call
- testfile="${test-suite}"
- dir="${tch.baseDir}"
- topLevel="true"
- />
- <check-references/>
- <final-validation checkFatalOnly="true"/>
-
- <!-- this performs updates to test metadata
- forces init-mode-only
- experimental, does not do anything right now
- -->
- <update/>
-
- <!-- There are antcalls since they should only run if
- tch.internal.validation-failed is not set
- -->
- <antcall target="test-runner"/>
- <antcall target="init-pm"/>
-
- <!-- this task needs to set properties, on the current project,
- so it cannot run in its own target -->
- <resolve-process-info-props/>
-
- <final-validation/>
- <message mode="middle"/>
- <test-list-output/>
- </target>
-
- <target name="test-runner" unless="tch.internal.validation-failed">
- <test-runner/>
- </target>
-
- <target name="init-pm" unless="tch.internal.validation-failed">
- <init-pm/>
- </target>
-
- <target name="final-validation" unless="tch.internal.validation-failed">
- <final-validation/>
- </target>
-
- <target name="PostInitRun" unless="tch.internal.init-mode-only-enabled">
- <init-logger/>
- <auto-start-processes/>
- </target>
-
- <target name="ExitEarly" if="${tch.internal.start-processes-only-prop-name}">
- <fail message="Exiting after starting processes..."/>
- </target>
-
- <target name="PreExecRun" depends="ExitEarly" unless="tch.internal.init-mode-only-enabled">
-
- <prop-val-substitution>
- <arg name="${env.TCH_HOME}" value="TCH_HOME" env="true"/>
- </prop-val-substitution>
-
-
-
- <!-- Switching from init mode to run mode -->
- <java classname="org.apache.beehive.test.tools.tch.core.DirtyClass"
- failonerror="true"/>
- <test-runner/>
- </target>
-
- <target name="ExecRun" unless="tch.internal.init-mode-only-enabled">
- <test-suite-call testfile="${test-suite}" dir="${tch.baseDir}" topLevel="true"/>
- </target>
-
- <target name="PostRun" unless="tch.internal.init-mode-only-enabled">
- <java
- classname="org.apache.beehive.test.tools.tch.core.DirtyClass"
- failonerror="true"
- />
-
- <antcall target="print-end-message"/>
-
- <shutdown/>
- </target>
-
- <target name="print-start-message" unless="${tch.internal.log-banners-prop-name}">
- <loadfile
- srcfile="${tch.home}/messages/start.txt"
- property="tch.internal.start-message"
- />
- <echo message="${tch.internal.start-message}"/>
- </target>
-
- <target name="print-end-message" unless="${tch.internal.log-banners-prop-name}">
- <loadfile
- srcfile="${tch.home}/messages/end.txt"
- property="tch.internal.end-message"
- />
- <echo message="${tch.internal.end-message}"/>
- </target>
-
- <target name="is-init-mode-enabled">
- <condition
- property="tch.internal.init-mode-only-enabled"
- value="set"
- >
- <equals
- arg1="true"
- arg2="${tch.init-mode-only}"
- casesensitive="false"
- />
- </condition>
- </target>
-
-</project>
-
+<project name="tch" default="version">
+
+ <!-- This is the root Tch buildfile. It performs process configuration, as well as
+ calling out to the specified Tch buildfile supplied by the user.
+ See the documentation and the functional description document for more details. -->
+
+ <!-- Tch core tasks -->
+
+ <taskdef name="process-setup" classname="org.apache.beehive.test.tools.tch.core.stl.ProcessSetupTask"/>
+
+ <taskdef name="test-suite-call" classname="org.apache.beehive.test.tools.tch.core.TestSuiteCallTask"/>
+ <taskdef name="test-suite" classname="org.apache.beehive.test.tools.tch.core.TestSuiteTask"/>
+ <taskdef name="test-block" classname="org.apache.beehive.test.tools.tch.core.TestBlockTask"/>
+ <taskdef name="test" classname="org.apache.beehive.test.tools.tch.core.TestTask"/>
+
+ <taskdef name="process" classname="org.apache.beehive.test.tools.tch.core.ProcessTask"/>
+ <taskdef name="independent-test-group" classname="org.apache.beehive.test.tools.tch.core.IndependentTestGroupTask"/>
+ <taskdef name="configuration-dependency" classname="org.apache.beehive.test.tools.tch.core.ConfigurationDependencyTask"/>
+ <taskdef name="jvmarg" classname="org.apache.beehive.test.tools.tch.core.JvmargTask"/>
+ <taskdef name="test-parameter" classname="org.apache.beehive.test.tools.tch.core.ParamTask"/>
+ <taskdef name="test-unit-modifier" classname="org.apache.beehive.test.tools.tch.core.TestUnitModifierTask"/>
+ <taskdef name="test-unit-override" classname="org.apache.beehive.test.tools.tch.core.TestUnitOverrideTask"/>
+ <taskdef name="append-to-test-unit" classname="org.apache.beehive.test.tools.tch.core.AppendModifierToTestUnitTask"/>
+ <taskdef name="test-name-modifier" classname="org.apache.beehive.test.tools.tch.core.TestNameModifierTask"/>
+ <taskdef name="append-to-test-name" classname="org.apache.beehive.test.tools.tch.core.AppendModifierToTestNameTask"/>
+ <taskdef name="test-parallel" classname="org.apache.beehive.test.tools.tch.core.TestParallelTask"/>
+ <taskdef name="test-sequential" classname="org.apache.beehive.test.tools.tch.core.TestSequentialTask"/>
+ <taskdef name="test-vehicle" classname="org.apache.beehive.test.tools.tch.core.TestVehicleTask"/>
+ <taskdef name="test-metadata" classname="org.apache.beehive.test.tools.tch.core.TestMetadataTask"/>
+
+ <taskdef name="if" classname="org.apache.beehive.test.tools.tch.core.IfTask"/>
+ <taskdef name="conditional" classname="org.apache.beehive.test.tools.tch.core.IfTask$ConditionTask"/>
+
+ <taskdef name="requires-dependent" classname="org.apache.beehive.test.tools.tch.core.RequiresDependentTask"/>
+ <taskdef name="requires" classname="org.apache.beehive.test.tools.tch.core.RequiresTask"/>
+ <taskdef name="dependent" classname="org.apache.beehive.test.tools.tch.core.DependentTask"/>
+
+ <!-- FIXME we can probably remove the 'utility' task -->
+ <taskdef name="utility" classname="org.apache.beehive.test.tools.tch.core.UtilityTask"/>
+ <taskdef
+ name="javatest-utility"
+ classname="org.apache.beehive.test.tools.tch.extension.exectask.javatest.JavatestUtilityTask"/>
+ <taskdef name="parameter"
+ classname="org.apache.beehive.test.tools.tch.extension.exectask.javatest.JavatestUtilityTask$ParameterContainer"/>
+
+ <taskdef name="custom-task" classname="org.apache.beehive.test.tools.tch.core.AnythingTask"/>
+ <taskdef name="init-hook" classname="org.apache.beehive.test.tools.tch.core.InitHookTask"/>
+ <taskdef name="cleanup-hook" classname="org.apache.beehive.test.tools.tch.core.CleanupHookTask"/>
+ <taskdef name="prop-val-substitution" classname="org.apache.beehive.test.tools.tch.core.PropValueSubstitutionSetupTask"/>
+ <taskdef name="inform" classname="org.apache.beehive.test.tools.tch.core.ant.TchLogTask"/>
+
+
+
+ <taskdef name="startup" classname="org.apache.beehive.test.tools.tch.core.StartupTask"/>
+ <taskdef name="file-exists" classname="org.apache.beehive.test.tools.tch.util.ant.FileExistsTask"/>
+ <taskdef name="message" classname="org.apache.beehive.test.tools.tch.core.MessageTask"/>
+ <taskdef name="test-list-output" classname="org.apache.beehive.test.tools.tch.core.TestListOutputTask"/>
+ <taskdef name="update" classname="org.apache.beehive.test.tools.tch.extension.update.UpdateManager"/>
+
+ <taskdef name="init-pm"
+ classname="org.apache.beehive.test.tools.tch.core.InitProcessManagementTask"/>
+ <taskdef name="resolve-process-info-props"
+ classname="org.apache.beehive.test.tools.tch.core.process.ResolveProcessPropertiesTask"/>
+ <taskdef name="check-references"
+ classname="org.apache.beehive.test.tools.tch.core.ReferenceCheckTask"/>
+ <taskdef name="final-validation"
+ classname="org.apache.beehive.test.tools.tch.core.configuration.FinalValidationCheckTask"/>
+ <taskdef name="auto-start-processes"
+ classname="org.apache.beehive.test.tools.tch.core.AutoStartProcessesTask"/>
+ <taskdef name="init-logger"
+ classname="org.apache.beehive.test.tools.tch.core.InitLoggerTask"/>
+ <taskdef name="test-runner" classname="org.apache.beehive.test.tools.tch.core.TestRunner"/>
+ <taskdef name="shutdown"
+ classname="org.apache.beehive.test.tools.tch.core.PrepareForShutdown"/>
+
+ <!-- For javatest execution task -->
+ <taskdef name="javatest"
+ classname="org.apache.beehive.test.tools.tch.extension.exectask.javatest.JavatestTask"/>
+
+ <taskdef name="junit"
+ classname="org.apache.beehive.test.tools.tch.extension.exectask.junit.JunitExecTask"/>
+
+ <!-- For webservertest execution task -->
+ <taskdef name="wstest"
+ classname="org.apache.beehive.test.tools.tch.extension.exectask.wstest.WebServerExecTask"/>
+
+ <!-- Tch test (tch testing tch) -->
+ <taskdef name="tch-diff-test" classname="org.apache.beehive.test.tools.tch.extension.exectask.self.TchExecTask"/>
+
+
+
+ <!-- cmdline exec task -->
+ <taskdef name="cmdline"
+ classname="org.apache.beehive.test.tools.tch.extension.exectask.cmdline.CommandLineTask"/>
+
+ <!-- For stf execution task
+ <taskdef name="stf"
+ classname="org.apache.beehive.test.tools.tch.extension.exectask.stf.STFExecTask"/>
+ -->
+ <!-- For ant-exec-task execution task -->
+ <taskdef name="ant-task"
+ classname="org.apache.beehive.test.tools.tch.extension.exectask.ant.AntExecTask"/>
+
+ <property name="test-suite" value="test.xml"/>
+
+ <property name="base-param" value="set-at-base"/>
+
+ <property
+ name="tch.internal.start-processes-only-prop-name"
+ value="tch.start-processes-only"
+ />
+
+ <property
+ name="tch.internal.log-banners-prop-name"
+ value="tch.log-banners"
+ />
+
+ <!-- do not change this prefix, we depend on it for dynamic process config -->
+ <property environment="env"/>
+
+
+ <target name="version">
+ <echo message="runtime java.version: ${java.version}"/>
+ <echo message="runtime java.home: ${java.home}"/>
+ <java classname="tch.version"/>
+ </target>
+
+ <target name="dtd">
+ <antstructure output="simple.dtd"/>
+ </target>
+
+ <target name="run" depends="version,
+ preRun,
+ InitRun,
+ PostInitRun,
+ PreExecRun,
+ ExecRun,
+ PostRun"/>
+
+ <target name="preRun">
+
+ <startup/> <!-- might want to move both of these to the very beginning, when we want to have control over all msgs -->
+
+ <fail unless="tch.home" message="tch.home must be set."/>
+ <file-exists dir="${tch.baseDir}" file="${test-suite}" message="Your supplied test-suite XML testfile was not found. This is set using "-Dtest-suite=filename" and defaults to "test.xml". The file not found is: "/>
+
+ <antcall target="print-start-message"/>
+
+ <process-setup/>
+
+ <!--java classname="org.apache.beehive.test.tools.tch.core.configuration.ProcessSetup"
+ failonerror="true"/-->
+
+
+
+
+ </target>
+
+ <target name="InitRun" depends="is-init-mode-enabled">
+ <echo message="Running test suite: ${test-suite} ..."/>
+ <test-suite-call
+ testfile="${test-suite}"
+ dir="${tch.baseDir}"
+ topLevel="true"
+ />
+ <check-references/>
+ <final-validation checkFatalOnly="true"/>
+
+ <!-- this performs updates to test metadata
+ forces init-mode-only
+ experimental, does not do anything right now
+ -->
+ <update/>
+
+ <!-- There are antcalls since they should only run if
+ tch.internal.validation-failed is not set
+ -->
+ <antcall target="test-runner"/>
+ <antcall target="init-pm"/>
+
+ <!-- this task needs to set properties, on the current project,
+ so it cannot run in its own target -->
+ <resolve-process-info-props/>
+
+ <final-validation/>
+ <message mode="middle"/>
+ <test-list-output/>
+ </target>
+
+ <target name="test-runner" unless="tch.internal.validation-failed">
+ <test-runner/>
+ </target>
+
+ <target name="init-pm" unless="tch.internal.validation-failed">
+ <init-pm/>
+ </target>
+
+ <target name="final-validation" unless="tch.internal.validation-failed">
+ <final-validation/>
+ </target>
+
+ <target name="PostInitRun" unless="tch.internal.init-mode-only-enabled">
+ <init-logger/>
+ <auto-start-processes/>
+ </target>
+
+ <target name="ExitEarly" if="${tch.internal.start-processes-only-prop-name}">
+ <fail message="Exiting after starting processes..."/>
+ </target>
+
+ <target name="PreExecRun" depends="ExitEarly" unless="tch.internal.init-mode-only-enabled">
+
+ <prop-val-substitution>
+ <arg name="${env.TCH_HOME}" value="TCH_HOME" env="true"/>
+ </prop-val-substitution>
+
+
+
+ <!-- Switching from init mode to run mode -->
+ <java classname="org.apache.beehive.test.tools.tch.core.DirtyClass"
+ failonerror="true"/>
+ <test-runner/>
+ </target>
+
+ <target name="ExecRun" unless="tch.internal.init-mode-only-enabled">
+ <test-suite-call testfile="${test-suite}" dir="${tch.baseDir}" topLevel="true"/>
+ </target>
+
+ <target name="PostRun" unless="tch.internal.init-mode-only-enabled">
+ <java
+ classname="org.apache.beehive.test.tools.tch.core.DirtyClass"
+ failonerror="true"
+ />
+
+ <antcall target="print-end-message"/>
+
+ <shutdown/>
+ </target>
+
+ <target name="print-start-message" unless="${tch.internal.log-banners-prop-name}">
+ <loadfile
+ srcfile="${tch.home}/messages/start.txt"
+ property="tch.internal.start-message"
+ />
+ <echo message="${tch.internal.start-message}"/>
+ </target>
+
+ <target name="print-end-message" unless="${tch.internal.log-banners-prop-name}">
+ <loadfile
+ srcfile="${tch.home}/messages/end.txt"
+ property="tch.internal.end-message"
+ />
+ <echo message="${tch.internal.end-message}"/>
+ </target>
+
+ <target name="is-init-mode-enabled">
+ <condition
+ property="tch.internal.init-mode-only-enabled"
+ value="set"
+ >
+ <equals
+ arg1="true"
+ arg2="${tch.init-mode-only}"
+ casesensitive="false"
+ />
+ </condition>
+ </target>
+
+</project>
+
Propchange: beehive/trunk/controls/test/infra/tch/tch-root.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/controls/test/infra/tch/tch-update-conf.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/infra/tch/tch-update-conf.xml?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/infra/tch/tch-update-conf.xml (original)
+++ beehive/trunk/controls/test/infra/tch/tch-update-conf.xml Fri Aug 12 08:12:28 2005
@@ -1,39 +1,39 @@
-<root>
- <updatable-entity>
- <entity name="owner" property-name="update.owners"/>
- <entity name="freq" property-name="update.frequencies"/>
- <entity name="timeout" property-name="update.timeout"/>
- <entity name="conversation" property-name="update.conversations"/>
- <entity name="serverMode" property-name="update.server-modes"/>
- <entity name="domain" property-name="update.domains"/>
- <entity name="os" property-name="update.os"/>
- <entity name="db" property-name="update.dbs"/>
- <entity name="status" property-name="update.status"/>
- <entity name="misc" property-name="update.misc"/>
- </updatable-entity>
- <update-listener>
-
- <!-- Default listener -->
- <!-- (default because it does not specify an exec task -->
- <listener
- name="default"
- classname="org.apache.beehive.test.tools.tch.extension.update.DefaultUpdateListener"
- exectask=""
- />
-
- <!-- Junit update listener -->
- <listener
- name="junit-updater"
- classname="org.apache.beehive.test.tools.tch.extension.update.junit.JunitUpdateListener"
- exectask="junit"
- >
- <configuration>
- <!-- mapping used if tag name is different from xml metadata name -->
- <!--metadata-mapping tch-val="frequency" junit-val="freq"/-->
- </configuration>
- </listener>
-
- </update-listener>
-</root>
-
-
+<root>
+ <updatable-entity>
+ <entity name="owner" property-name="update.owners"/>
+ <entity name="freq" property-name="update.frequencies"/>
+ <entity name="timeout" property-name="update.timeout"/>
+ <entity name="conversation" property-name="update.conversations"/>
+ <entity name="serverMode" property-name="update.server-modes"/>
+ <entity name="domain" property-name="update.domains"/>
+ <entity name="os" property-name="update.os"/>
+ <entity name="db" property-name="update.dbs"/>
+ <entity name="status" property-name="update.status"/>
+ <entity name="misc" property-name="update.misc"/>
+ </updatable-entity>
+ <update-listener>
+
+ <!-- Default listener -->
+ <!-- (default because it does not specify an exec task -->
+ <listener
+ name="default"
+ classname="org.apache.beehive.test.tools.tch.extension.update.DefaultUpdateListener"
+ exectask=""
+ />
+
+ <!-- Junit update listener -->
+ <listener
+ name="junit-updater"
+ classname="org.apache.beehive.test.tools.tch.extension.update.junit.JunitUpdateListener"
+ exectask="junit"
+ >
+ <configuration>
+ <!-- mapping used if tag name is different from xml metadata name -->
+ <!--metadata-mapping tch-val="frequency" junit-val="freq"/-->
+ </configuration>
+ </listener>
+
+ </update-listener>
+</root>
+
+
Propchange: beehive/trunk/controls/test/infra/tch/tch-update-conf.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/controls/test/infra/tch/tch.cmd
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/infra/tch/tch.cmd?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/infra/tch/tch.cmd (original)
+++ beehive/trunk/controls/test/infra/tch/tch.cmd Fri Aug 12 08:12:28 2005
@@ -1,8 +1,8 @@
-@echo off
-
-if NOT %ERRORLEVEL% == 0 goto antsh
-%~d0%~p0/tchcmd.cmd %*
-
-rem it won't get here unless you use "call" on the .cmd
-:antsh
-sh %~d0%~p0/tch.sh %*
+@echo off
+
+if NOT %ERRORLEVEL% == 0 goto antsh
+%~d0%~p0/tchcmd.cmd %*
+
+rem it won't get here unless you use "call" on the .cmd
+:antsh
+sh %~d0%~p0/tch.sh %*
Propchange: beehive/trunk/controls/test/infra/tch/tch.cmd
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/controls/test/infra/tch/tch.sh
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/infra/tch/tch.sh?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/infra/tch/tch.sh (original)
+++ beehive/trunk/controls/test/infra/tch/tch.sh Fri Aug 12 08:12:28 2005
@@ -1,3 +1,3 @@
-#!/bin/sh
-
-java org.apache.tools.ant.Main -emacs -verbose -f ${TCH_HOME}/build.xml -Dtch.home=${TCH_HOME} "$@"
+#!/bin/sh
+
+java org.apache.tools.ant.Main -emacs -verbose -f ${TCH_HOME}/build.xml -Dtch.home=${TCH_HOME} "$@"
Propchange: beehive/trunk/controls/test/infra/tch/tch.sh
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/controls/test/infra/tch/tchcmd.cmd
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/infra/tch/tchcmd.cmd?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/infra/tch/tchcmd.cmd (original)
+++ beehive/trunk/controls/test/infra/tch/tchcmd.cmd Fri Aug 12 08:12:28 2005
@@ -1,5 +1,5 @@
-@echo off
-
-SETLOCAL
-java org.apache.tools.ant.Main -emacs -verbose -f %TCH_HOME%/build.xml -Dtch.home=%TCH_HOME% %*
-
+@echo off
+
+SETLOCAL
+java org.apache.tools.ant.Main -emacs -verbose -f %TCH_HOME%/build.xml -Dtch.home=%TCH_HOME% %*
+
Propchange: beehive/trunk/controls/test/infra/tch/tchcmd.cmd
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/bin/benchmark.bat
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/bin/benchmark.sh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/bin/perf.bat
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/bin/perf.sh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/bin/run.bat
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/bin/run.sh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/cases/controls-perf.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/ctlsrc/org/apache/beehive/controls/perf/controls/custom/PerfResultControl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/ctlsrc/org/apache/beehive/controls/perf/controls/custom/PerfResultControlImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/ctlsrc/org/apache/beehive/controls/perf/controls/custom/StrlenControl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/ctlsrc/org/apache/beehive/controls/perf/controls/custom/StrlenControlImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/ctlsrc/org/apache/beehive/controls/perf/controls/custom/StrlenControlST.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/ctlsrc/org/apache/beehive/controls/perf/controls/custom/StrlenControlSTImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/ctlsrc/org/apache/beehive/controls/perf/controls/custom/StrlenEventControl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/ctlsrc/org/apache/beehive/controls/perf/controls/custom/StrlenEventControlImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/controls/test/perf/ctlsrc/org/apache/beehive/controls/perf/controls/custom/StrlenEventControlListener.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/perf/ctlsrc/org/apache/beehive/controls/perf/controls/custom/StrlenEventControlListener.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/perf/ctlsrc/org/apache/beehive/controls/perf/controls/custom/StrlenEventControlListener.java (original)
+++ beehive/trunk/controls/test/perf/ctlsrc/org/apache/beehive/controls/perf/controls/custom/StrlenEventControlListener.java Fri Aug 12 08:12:28 2005
@@ -1,11 +1,11 @@
-package org.apache.beehive.controls.perf.controls.custom;
-
-public class StrlenEventControlListener implements StrlenEventControl.EventSet0
-{
- private transient int _length = -1;
- public void setLength(int p_val){
- //System.out.println("setting val to:"+p_val);
- _length = p_val;
- }
- public int getLength(){return _length;}
-}
+package org.apache.beehive.controls.perf.controls.custom;
+
+public class StrlenEventControlListener implements StrlenEventControl.EventSet0
+{
+ private transient int _length = -1;
+ public void setLength(int p_val){
+ //System.out.println("setting val to:"+p_val);
+ _length = p_val;
+ }
+ public int getLength(){return _length;}
+}
Propchange: beehive/trunk/controls/test/perf/ctlsrc/org/apache/beehive/controls/perf/controls/custom/StrlenEventControlListener.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/ctlsrc/org/apache/beehive/controls/perf/controls/custom/VarargsControl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/ctlsrc/org/apache/beehive/controls/perf/controls/custom/VarargsControlImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/ctlsrc/org/apache/beehive/controls/perf/controls/custom/VarretControl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/ctlsrc/org/apache/beehive/controls/perf/controls/custom/VarretControlImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/perfEnv.bat
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/perfEnv.sh
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/src/org/apache/beehive/controls/perf/benchmarks/CStrlen.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/src/org/apache/beehive/controls/perf/benchmarks/dproxy/IStrlen.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/src/org/apache/beehive/controls/perf/benchmarks/dproxy/StrlenDProxy.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/src/org/apache/beehive/controls/perf/benchmarks/dproxy/StrlenDProxyTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/src/org/apache/beehive/controls/perf/benchmarks/javabean/StrlenBean.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/src/org/apache/beehive/controls/perf/benchmarks/javabean/StrlenBeanTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/src/org/apache/beehive/controls/perf/benchmarks/javaclass/StrlenClassTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/src/org/apache/beehive/controls/perf/benchmarks/methodinv/StrlenMethodInvTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/src/org/apache/beehive/controls/perf/standalone/StrlenEventPgmTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/src/org/apache/beehive/controls/perf/standalone/StrlenPgmTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/src/org/apache/beehive/controls/perf/standalone/StrlenSTPgmTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/src/org/apache/beehive/controls/perf/standalone/VarargsPgmTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/src/org/apache/beehive/controls/perf/standalone/VarretPgmTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/src/org/apache/beehive/controls/perf/tch/PerfTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/src/org/apache/beehive/controls/perf/tch/StandAlonePerfRunner.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/src/org/apache/beehive/controls/perf/tch/WebPerfRunner.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/src/org/apache/beehive/controls/perf/utils/Constants.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/src/org/apache/beehive/controls/perf/utils/PerfUtil.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/src/org/apache/beehive/controls/perf/utils/StreamCapture.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/controls/test/perf/webapps/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/perf/webapps/build.xml?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/perf/webapps/build.xml (original)
+++ beehive/trunk/controls/test/perf/webapps/build.xml Fri Aug 12 08:12:28 2005
@@ -1,213 +1,213 @@
-<?xml version="1.0"?>
-<!--
-===========================================================================
-
- This project consists of targets to build/clean a web appplication with
- the latest Beehive NETUI artifacts, start/stop app server, and deploy
- the web application to a started app server.
-
- This project originates from trunk/netui/test/webapps/drt/build.xml for
- code reusing.
-
-============================================================================
--->
-<project name="Beehive/Controls/Perf-webapp" default="usage" basedir=".">
-
- <import file="../../../../beehive-imports.xml"/>
- <property file="${beehive.home}/controls/test/common/path.properties"/>
-
- <property name="controls.perf.root" value="${beehive.home}/controls/test/perf"/>
- <property name="buildWebapp.xml" value="${beehive.home}/test/ant/buildWebapp.xml"/>
- <property name="webapp.stage.dir" value="${controls.perf.root}/webapps/stage"/>
- <property name="webapp.name" value="controlsPerfWeb"/>
- <property name="webapp.dir" location="${controls.perf.root}/webapps/${webapp.name}"/>
- <property name="test.hostname" value="localhost"/>
- <property name="test.port" value="8080"/>
- <property name="webapp.waitfor.url" value="http://${test.hostname}:${test.port}/${webapp.name}"/>
- <property name="cewolf.root" value="${controls.perf.root}/external/cewolf_0_10_1"/>
- <property name="xmlbeans.root" value="${controls.perf.root}/external/xmlbeans-2.0.0-beta1"/>
-
- <target name="usage">
- <echo message="" />
- <echo message="" />
- <echo message="web app build scripts for controls testing" />
- <echo message="================================================================" />
- <echo message="| Usage |" />
- <echo message="================================================================" />
- <echo message="" />
- <echo message="-------------------------------------------------------------------" />
- <echo message="| Standard Targets |" />
- <echo message="-------------------------------------------------------------------" />
- <echo message="build - inject latest netui artifacts and build ${webapp.name}, " />
- <echo message=" includes compiling controls in the webapp "/>
- <echo message="clean - clean ${webapp.name}"/>
- <echo message="start - start app server"/>
- <echo message="stop - stop app server"/>
- <echo message="deploy - deploys built webapp to a started app" />
- <echo message="" />
- <echo message="" />
- </target>
-
-
- <!-- ================================================================ -->
- <!-- -->
- <!-- Targets for building a webapp -->
- <!-- -->
- <!-- ================================================================ -->
- <target name="build" description="build ${webapp.name}">
- <echo message="-----------------------------------------------------"/>
- <echo message="| ${webapp.name} build starting |"/>
- <echo message="-----------------------------------------------------"/>
-
- <antcall target="${webapp.name}.stage"/>
- <deploy-netui webappDir="${webapp.stage.dir}/${webapp.name}"/>
- <build-webapp webappDir="${webapp.stage.dir}/${webapp.name}"/>
- <antcall target="${webapp.name}.postprocess"/>
- <echo message="----------------------------------------------"/>
- <echo message="| ${webapp.name} build ending |"/>
- <echo message="----------------------------------------------"/>
- </target>
-
- <!-- staging targets -->
- <target name="controlsPerfWeb.stage">
- <copy todir="${webapp.stage.dir}/${webapp.name}">
- <fileset dir="${webapp.dir}"/>
- </copy>
-
- <!-- inject stuff -->
- <ant antfile="${controls.test.root}/webapps/build.xml" target="-inject.milton" inheritAll="false">
- <property name="webapp.dir" location="${webapp.stage.dir}/${webapp.name}"/>
- <property name="do.inject.milton" value="true"/>
- </ant>
- <copy file="${controls.perf.root}/ctlbuild/lib/customcontrols.jar" todir="${webapp.stage.dir}/${webapp.name}/WEB-INF/lib"/>
- <copy file="${controls.perf.root}/build/lib/controlperf.jar" todir="${webapp.stage.dir}/${webapp.name}/WEB-INF/lib"/>
- </target>
-
- <target name="controlsPerfWeb.postprocess"/>
-
- <target name="reportWeb.stage" if="reportweb.properties.exists" depends="check.reportweb.properties"
- description="stage the report web">
-
- <copy todir="${webapp.stage.dir}/${webapp.name}">
- <fileset dir="${webapp.dir}"/>
- </copy>
-
- <copy todir="${webapp.stage.dir}/${webapp.name}/docs">
- <fileset dir="${controls.perf.root}/build/docs"/>
- </copy>
-
- <!-- inject stuff -->
- <ant antfile="${controls.test.root}/webapps/build.xml" target="-inject.milton" inheritAll="false">
- <property name="webapp.dir" location="${webapp.stage.dir}/${webapp.name}"/>
- <property name="do.inject.milton" value="true"/>
- </ant>
- <ant antfile="${controls.test.root}/webapps/build.xml" target="-inject.milton" inheritAll="false">
- <property name="webapp.dir" location="${webapp.stage.dir}/${webapp.name}"/>
- <property name="do.inject.milton" value="true"/>
- </ant>
- <copy todir="${webapp.stage.dir}/${webapp.name}/WEB-INF/lib">
- <fileset dir="${cewolf.root}/lib">
- <exclude name="servlet.jar"/>
- <exclude name="crimson.jar"/>
- <exclude name="cewolf.jar"/>
- </fileset>
- </copy>
- <!-- HACK: cewolf_0_10_1 has a bug in the distro where the cewolf.jar in lib is old! -->
- <copy file="${cewolf.root}/build/cewolf.jar" todir="${webapp.stage.dir}/${webapp.name}/WEB-INF/lib"/>
- <copy file="${controls.perf.root}/external/perf-results.jar" todir="${webapp.stage.dir}/${webapp.name}/WEB-INF/lib"/>
- <copy file="${controls.perf.root}/ctlbuild/lib/customcontrols.jar" todir="${webapp.stage.dir}/${webapp.name}/WEB-INF/lib"/>
-
-
- <!-- these must be provided at build time for the machine's localations -->
- <copy file="${basedir}/reportweb.properties" todir="${webapp.stage.dir}/${webapp.name}/jpf/" overwrite="true"/>
- </target>
-
- <target name="check.reportweb.properties">
- <echo message="MAKE SURE TO SET xmlbeans.report.dir AND beehive.report.dir in reportweb.properties"/>
- <property file="${basedir}/reportweb.properties"/>
- <available property="reportweb.properties.exists"
- file="${basedir}/reportweb.properties" type="file"/>
- </target>
-
-
- <target name="reportWeb.postprocess">
- <!-- HACK: until i figure out why the perf-results.jar compiled by svn-built v2 has a version error against 2.0.0-beta1 -->
- <!-- may have to just compile perf-results.xsd as part of the reportWeb build using the beehive xbean jar -->
- <delete file="${webapp.stage.dir}/${webapp.name}/WEB-INF/lib/apache-xbean.jar"/>
- <copy file="${xmlbeans.root}/lib/xbean.jar" todir="${webapp.stage.dir}/${webapp.name}/WEB-INF/lib"/>
- </target>
-
- <target name="clean" description="Clean webapp">
- <echo message="----------------------------------------------"/>
- <echo message="| ${webapp.name} clean starting |"/>
- <echo message="----------------------------------------------"/>
-
- <delete failonerror="false" dir="${webapp.stage.dir}/${webapp.name}"/>
-
- <echo message="----------------------------------------------"/>
- <echo message="| ${webapp.name} clean ending |"/>
- <echo message="----------------------------------------------"/>
- </target>
-
- <!-- ================================================================ -->
- <!-- -->
- <!-- Targets for deploying the webapp on a server -->
- <!-- -->
- <!-- ================================================================ -->
- <target name="deploy" description="Deploy webapp">
- <deploy-webapp webappDir="${webapp.stage.dir}/${webapp.name}" contextPath="${webapp.name}"/>
- </target>
-
- <target name="undeploy" description="Undeploy webapp">
- <undeploy-webapp contextPath="${webapp.name}"/>
- </target>
-
- <target name="redeploy" description="Redeploy webapp">
- <redeploy-webapp contextPath="${webapp.name}"/>
- </target>
-
- <!-- ================================================================ -->
- <!-- -->
- <!-- Targets for starting / stopping a server -->
- <!-- -->
- <!-- ================================================================ -->
- <target name="start" description="Start server">
- <start-server shmem="false" javaOptions=""/>
- </target>
-
- <target name="stop" description="Stop server">
- <stop-server/>
- </target>
-
- <target name="ensure.deployed" description="Deploy webapp for the test recorder">
- <echo>Ensuring that the webapp ${webapp.name} is deployed on a running server at the url ${webapp.waitfor.url}</echo>
-
- <waitfor maxwait="5" maxwaitunit="second" timeoutproperty="unavailable">
- <http url="${webapp.waitfor.url}"/>
- </waitfor>
- <antcall target="do.deploy"/>
- <antcall target="do.redeploy"/>
- <fail if="still.unavailable" message="Couldn't find webapp with path ${webapp.waitfor.url}"/>
- </target>
-
- <target name="do.deploy" if="unavailable">
- <echo>Webapp is not deployed; deploying</echo>
-
- <antcall target="deploy"/>
- <echo>...deploy complete</echo>
-
- <waitfor maxwait="120" maxwaitunit="second" timeoutproperty="still.unavailable">
- <http url="${webapp.waitfor.url}"/>
- </waitfor>
- </target>
-
- <target name="do.redeploy" unless="unavailable">
- <echo>Webapp is deployed; undeploy and redeploy</echo>
- <re-webapp contextPath="${webapp.name}"/>
-
- <waitfor maxwait="120" maxwaitunit="second" timeoutproperty="still.unavailable">
- <http url="${webapp.waitfor.url}"/>
- </waitfor>
- </target>
-
-</project>
+<?xml version="1.0"?>
+<!--
+===========================================================================
+
+ This project consists of targets to build/clean a web appplication with
+ the latest Beehive NETUI artifacts, start/stop app server, and deploy
+ the web application to a started app server.
+
+ This project originates from trunk/netui/test/webapps/drt/build.xml for
+ code reusing.
+
+============================================================================
+-->
+<project name="Beehive/Controls/Perf-webapp" default="usage" basedir=".">
+
+ <import file="../../../../beehive-imports.xml"/>
+ <property file="${beehive.home}/controls/test/common/path.properties"/>
+
+ <property name="controls.perf.root" value="${beehive.home}/controls/test/perf"/>
+ <property name="buildWebapp.xml" value="${beehive.home}/test/ant/buildWebapp.xml"/>
+ <property name="webapp.stage.dir" value="${controls.perf.root}/webapps/stage"/>
+ <property name="webapp.name" value="controlsPerfWeb"/>
+ <property name="webapp.dir" location="${controls.perf.root}/webapps/${webapp.name}"/>
+ <property name="test.hostname" value="localhost"/>
+ <property name="test.port" value="8080"/>
+ <property name="webapp.waitfor.url" value="http://${test.hostname}:${test.port}/${webapp.name}"/>
+ <property name="cewolf.root" value="${controls.perf.root}/external/cewolf_0_10_1"/>
+ <property name="xmlbeans.root" value="${controls.perf.root}/external/xmlbeans-2.0.0-beta1"/>
+
+ <target name="usage">
+ <echo message="" />
+ <echo message="" />
+ <echo message="web app build scripts for controls testing" />
+ <echo message="================================================================" />
+ <echo message="| Usage |" />
+ <echo message="================================================================" />
+ <echo message="" />
+ <echo message="-------------------------------------------------------------------" />
+ <echo message="| Standard Targets |" />
+ <echo message="-------------------------------------------------------------------" />
+ <echo message="build - inject latest netui artifacts and build ${webapp.name}, " />
+ <echo message=" includes compiling controls in the webapp "/>
+ <echo message="clean - clean ${webapp.name}"/>
+ <echo message="start - start app server"/>
+ <echo message="stop - stop app server"/>
+ <echo message="deploy - deploys built webapp to a started app" />
+ <echo message="" />
+ <echo message="" />
+ </target>
+
+
+ <!-- ================================================================ -->
+ <!-- -->
+ <!-- Targets for building a webapp -->
+ <!-- -->
+ <!-- ================================================================ -->
+ <target name="build" description="build ${webapp.name}">
+ <echo message="-----------------------------------------------------"/>
+ <echo message="| ${webapp.name} build starting |"/>
+ <echo message="-----------------------------------------------------"/>
+
+ <antcall target="${webapp.name}.stage"/>
+ <deploy-netui webappDir="${webapp.stage.dir}/${webapp.name}"/>
+ <build-webapp webappDir="${webapp.stage.dir}/${webapp.name}"/>
+ <antcall target="${webapp.name}.postprocess"/>
+ <echo message="----------------------------------------------"/>
+ <echo message="| ${webapp.name} build ending |"/>
+ <echo message="----------------------------------------------"/>
+ </target>
+
+ <!-- staging targets -->
+ <target name="controlsPerfWeb.stage">
+ <copy todir="${webapp.stage.dir}/${webapp.name}">
+ <fileset dir="${webapp.dir}"/>
+ </copy>
+
+ <!-- inject stuff -->
+ <ant antfile="${controls.test.root}/webapps/build.xml" target="-inject.milton" inheritAll="false">
+ <property name="webapp.dir" location="${webapp.stage.dir}/${webapp.name}"/>
+ <property name="do.inject.milton" value="true"/>
+ </ant>
+ <copy file="${controls.perf.root}/ctlbuild/lib/customcontrols.jar" todir="${webapp.stage.dir}/${webapp.name}/WEB-INF/lib"/>
+ <copy file="${controls.perf.root}/build/lib/controlperf.jar" todir="${webapp.stage.dir}/${webapp.name}/WEB-INF/lib"/>
+ </target>
+
+ <target name="controlsPerfWeb.postprocess"/>
+
+ <target name="reportWeb.stage" if="reportweb.properties.exists" depends="check.reportweb.properties"
+ description="stage the report web">
+
+ <copy todir="${webapp.stage.dir}/${webapp.name}">
+ <fileset dir="${webapp.dir}"/>
+ </copy>
+
+ <copy todir="${webapp.stage.dir}/${webapp.name}/docs">
+ <fileset dir="${controls.perf.root}/build/docs"/>
+ </copy>
+
+ <!-- inject stuff -->
+ <ant antfile="${controls.test.root}/webapps/build.xml" target="-inject.milton" inheritAll="false">
+ <property name="webapp.dir" location="${webapp.stage.dir}/${webapp.name}"/>
+ <property name="do.inject.milton" value="true"/>
+ </ant>
+ <ant antfile="${controls.test.root}/webapps/build.xml" target="-inject.milton" inheritAll="false">
+ <property name="webapp.dir" location="${webapp.stage.dir}/${webapp.name}"/>
+ <property name="do.inject.milton" value="true"/>
+ </ant>
+ <copy todir="${webapp.stage.dir}/${webapp.name}/WEB-INF/lib">
+ <fileset dir="${cewolf.root}/lib">
+ <exclude name="servlet.jar"/>
+ <exclude name="crimson.jar"/>
+ <exclude name="cewolf.jar"/>
+ </fileset>
+ </copy>
+ <!-- HACK: cewolf_0_10_1 has a bug in the distro where the cewolf.jar in lib is old! -->
+ <copy file="${cewolf.root}/build/cewolf.jar" todir="${webapp.stage.dir}/${webapp.name}/WEB-INF/lib"/>
+ <copy file="${controls.perf.root}/external/perf-results.jar" todir="${webapp.stage.dir}/${webapp.name}/WEB-INF/lib"/>
+ <copy file="${controls.perf.root}/ctlbuild/lib/customcontrols.jar" todir="${webapp.stage.dir}/${webapp.name}/WEB-INF/lib"/>
+
+
+ <!-- these must be provided at build time for the machine's localations -->
+ <copy file="${basedir}/reportweb.properties" todir="${webapp.stage.dir}/${webapp.name}/jpf/" overwrite="true"/>
+ </target>
+
+ <target name="check.reportweb.properties">
+ <echo message="MAKE SURE TO SET xmlbeans.report.dir AND beehive.report.dir in reportweb.properties"/>
+ <property file="${basedir}/reportweb.properties"/>
+ <available property="reportweb.properties.exists"
+ file="${basedir}/reportweb.properties" type="file"/>
+ </target>
+
+
+ <target name="reportWeb.postprocess">
+ <!-- HACK: until i figure out why the perf-results.jar compiled by svn-built v2 has a version error against 2.0.0-beta1 -->
+ <!-- may have to just compile perf-results.xsd as part of the reportWeb build using the beehive xbean jar -->
+ <delete file="${webapp.stage.dir}/${webapp.name}/WEB-INF/lib/apache-xbean.jar"/>
+ <copy file="${xmlbeans.root}/lib/xbean.jar" todir="${webapp.stage.dir}/${webapp.name}/WEB-INF/lib"/>
+ </target>
+
+ <target name="clean" description="Clean webapp">
+ <echo message="----------------------------------------------"/>
+ <echo message="| ${webapp.name} clean starting |"/>
+ <echo message="----------------------------------------------"/>
+
+ <delete failonerror="false" dir="${webapp.stage.dir}/${webapp.name}"/>
+
+ <echo message="----------------------------------------------"/>
+ <echo message="| ${webapp.name} clean ending |"/>
+ <echo message="----------------------------------------------"/>
+ </target>
+
+ <!-- ================================================================ -->
+ <!-- -->
+ <!-- Targets for deploying the webapp on a server -->
+ <!-- -->
+ <!-- ================================================================ -->
+ <target name="deploy" description="Deploy webapp">
+ <deploy-webapp webappDir="${webapp.stage.dir}/${webapp.name}" contextPath="${webapp.name}"/>
+ </target>
+
+ <target name="undeploy" description="Undeploy webapp">
+ <undeploy-webapp contextPath="${webapp.name}"/>
+ </target>
+
+ <target name="redeploy" description="Redeploy webapp">
+ <redeploy-webapp contextPath="${webapp.name}"/>
+ </target>
+
+ <!-- ================================================================ -->
+ <!-- -->
+ <!-- Targets for starting / stopping a server -->
+ <!-- -->
+ <!-- ================================================================ -->
+ <target name="start" description="Start server">
+ <start-server shmem="false" javaOptions=""/>
+ </target>
+
+ <target name="stop" description="Stop server">
+ <stop-server/>
+ </target>
+
+ <target name="ensure.deployed" description="Deploy webapp for the test recorder">
+ <echo>Ensuring that the webapp ${webapp.name} is deployed on a running server at the url ${webapp.waitfor.url}</echo>
+
+ <waitfor maxwait="5" maxwaitunit="second" timeoutproperty="unavailable">
+ <http url="${webapp.waitfor.url}"/>
+ </waitfor>
+ <antcall target="do.deploy"/>
+ <antcall target="do.redeploy"/>
+ <fail if="still.unavailable" message="Couldn't find webapp with path ${webapp.waitfor.url}"/>
+ </target>
+
+ <target name="do.deploy" if="unavailable">
+ <echo>Webapp is not deployed; deploying</echo>
+
+ <antcall target="deploy"/>
+ <echo>...deploy complete</echo>
+
+ <waitfor maxwait="120" maxwaitunit="second" timeoutproperty="still.unavailable">
+ <http url="${webapp.waitfor.url}"/>
+ </waitfor>
+ </target>
+
+ <target name="do.redeploy" unless="unavailable">
+ <echo>Webapp is deployed; undeploy and redeploy</echo>
+ <re-webapp contextPath="${webapp.name}"/>
+
+ <waitfor maxwait="120" maxwaitunit="second" timeoutproperty="still.unavailable">
+ <http url="${webapp.waitfor.url}"/>
+ </waitfor>
+ </target>
+
+</project>
Propchange: beehive/trunk/controls/test/perf/webapps/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/controls/test/perf/webapps/controlsPerfWeb/WEB-INF/src/global/Global.app
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/perf/webapps/controlsPerfWeb/WEB-INF/src/global/Global.app?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/perf/webapps/controlsPerfWeb/WEB-INF/src/global/Global.app (original)
+++ beehive/trunk/controls/test/perf/webapps/controlsPerfWeb/WEB-INF/src/global/Global.app Fri Aug 12 08:12:28 2005
@@ -1,34 +1,34 @@
-package global;
-
-import org.apache.beehive.test.tools.milton.common.Report;
-import org.apache.beehive.netui.pageflow.*;
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
-
-/**
- * WARNING: This file is part of the test framework. It is copied
- * into this webapp at build time. Any changes you make to
- * this file will be lost the next time you rebuild.
- * DO NOT ADD THIS FILE TO YOUR WEBAPP! -->
- */
-@Jpf.Controller(
- catches={
- @Jpf.Catch(type=java.lang.Exception.class, method="handleException")
- }
-)
-public class Global extends GlobalApp
-{
- @Jpf.ExceptionHandler(
- forwards={
- @Jpf.Forward(name=Report.RESULTS, path=Report.RESULTSJSP)
- }
- )
- protected Forward handleException(Exception ex, String actionName, String message, Object form)
- {
- Report report = (Report)getRequest().getAttribute(Report.KEY);
-
- if (null == report)
- report = new Report(Report.ABORT, "An Unexpected Exception Was Found", ex);
-
- return new Forward(Report.RESULTS, Report.KEY, report);
- }
-}
+package global;
+
+import org.apache.beehive.test.tools.milton.common.Report;
+import org.apache.beehive.netui.pageflow.*;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+
+/**
+ * WARNING: This file is part of the test framework. It is copied
+ * into this webapp at build time. Any changes you make to
+ * this file will be lost the next time you rebuild.
+ * DO NOT ADD THIS FILE TO YOUR WEBAPP! -->
+ */
+@Jpf.Controller(
+ catches={
+ @Jpf.Catch(type=java.lang.Exception.class, method="handleException")
+ }
+)
+public class Global extends GlobalApp
+{
+ @Jpf.ExceptionHandler(
+ forwards={
+ @Jpf.Forward(name=Report.RESULTS, path=Report.RESULTSJSP)
+ }
+ )
+ protected Forward handleException(Exception ex, String actionName, String message, Object form)
+ {
+ Report report = (Report)getRequest().getAttribute(Report.KEY);
+
+ if (null == report)
+ report = new Report(Report.ABORT, "An Unexpected Exception Was Found", ex);
+
+ return new Forward(Report.RESULTS, Report.KEY, report);
+ }
+}
Propchange: beehive/trunk/controls/test/perf/webapps/controlsPerfWeb/WEB-INF/src/global/Global.app
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/controls/test/perf/webapps/controlsPerfWeb/WEB-INF/src/log4j.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/perf/webapps/controlsPerfWeb/WEB-INF/src/log4j.xml?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/perf/webapps/controlsPerfWeb/WEB-INF/src/log4j.xml (original)
+++ beehive/trunk/controls/test/perf/webapps/controlsPerfWeb/WEB-INF/src/log4j.xml Fri Aug 12 08:12:28 2005
@@ -1,38 +1,38 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
-
-<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-
- <appender name="LOGFILE" class="org.apache.log4j.RollingFileAppender">
- <param name="File" value="controlsPerfWeb.log"/>
- <param name="Append" value="false"/>
- <param name="MaxFileSize" value="500000KB"/>
- <layout class="org.apache.log4j.PatternLayout">
- <param name="ConversionPattern" value="%d{DATE} %-5p %-15c{1} [%x]: %m%n"/>
- </layout>
- </appender>
-
- <!-- base for all netui server components -->
- <category name="org.apache.beehive.netui">
- <priority value="warn"/>
- <appender-ref ref="LOGFILE"/>
- </category>
-
- <!-- base for all netui server components -->
- <category name="org.apache.struts">
- <priority value="warn"/>
- <appender-ref ref="LOGFILE"/>
- </category>
-
- <category name="org.apache.beehive.netui.script">
- <priority value="warn"/>
- <appender-ref ref="LOGFILE"/>
- </category>
-
- <category name="org.apache">
- <priority value="warn"/>
- <appender-ref ref="LOGFILE"/>
- </category>
-
- <!-- base for all netui server components -->
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
+
+ <appender name="LOGFILE" class="org.apache.log4j.RollingFileAppender">
+ <param name="File" value="controlsPerfWeb.log"/>
+ <param name="Append" value="false"/>
+ <param name="MaxFileSize" value="500000KB"/>
+ <layout class="org.apache.log4j.PatternLayout">
+ <param name="ConversionPattern" value="%d{DATE} %-5p %-15c{1} [%x]: %m%n"/>
+ </layout>
+ </appender>
+
+ <!-- base for all netui server components -->
+ <category name="org.apache.beehive.netui">
+ <priority value="warn"/>
+ <appender-ref ref="LOGFILE"/>
+ </category>
+
+ <!-- base for all netui server components -->
+ <category name="org.apache.struts">
+ <priority value="warn"/>
+ <appender-ref ref="LOGFILE"/>
+ </category>
+
+ <category name="org.apache.beehive.netui.script">
+ <priority value="warn"/>
+ <appender-ref ref="LOGFILE"/>
+ </category>
+
+ <category name="org.apache">
+ <priority value="warn"/>
+ <appender-ref ref="LOGFILE"/>
+ </category>
+
+ <!-- base for all netui server components -->
</log4j:configuration>
Propchange: beehive/trunk/controls/test/perf/webapps/controlsPerfWeb/WEB-INF/src/log4j.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/perf/webapps/controlsPerfWeb/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/controls/test/perf/webapps/controlsPerfWeb/error.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/perf/webapps/controlsPerfWeb/error.jsp?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/perf/webapps/controlsPerfWeb/error.jsp (original)
+++ beehive/trunk/controls/test/perf/webapps/controlsPerfWeb/error.jsp Fri Aug 12 08:12:28 2005
@@ -1,7 +1,7 @@
-<html>
-<head>
-</head>
-<body>
-Error page of controlsPerfWeb,
-</body>
-</html>
+<html>
+<head>
+</head>
+<body>
+Error page of controlsPerfWeb,
+</body>
+</html>
Propchange: beehive/trunk/controls/test/perf/webapps/controlsPerfWeb/error.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/controls/test/perf/webapps/controlsPerfWeb/index.jsp
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/perf/webapps/controlsPerfWeb/index.jsp?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/perf/webapps/controlsPerfWeb/index.jsp (original)
+++ beehive/trunk/controls/test/perf/webapps/controlsPerfWeb/index.jsp Fri Aug 12 08:12:28 2005
@@ -1,7 +1,7 @@
-<html>
-<head>
-</head>
-<body>
-Welcome to controlsPerfWeb, a web app to test beehive controls performance
-</body>
-</html>
+<html>
+<head>
+</head>
+<body>
+Welcome to controlsPerfWeb, a web app to test beehive controls performance
+</body>
+</html>
Propchange: beehive/trunk/controls/test/perf/webapps/controlsPerfWeb/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/controls/test/perf/webapps/controlsPerfWeb/jpf/test/controls/performance/benchmarks/strlen/dproxy/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/perf/webapps/controlsPerfWeb/jpf/test/controls/performance/benchmarks/strlen/dproxy/Controller.jpf?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/perf/webapps/controlsPerfWeb/jpf/test/controls/performance/benchmarks/strlen/dproxy/Controller.jpf (original)
+++ beehive/trunk/controls/test/perf/webapps/controlsPerfWeb/jpf/test/controls/performance/benchmarks/strlen/dproxy/Controller.jpf Fri Aug 12 08:12:28 2005
@@ -1,104 +1,104 @@
-/*
- *
- * N E T U I
- *
- * Copyright 2004 The Apache Software Foundation.
- *
- * All Rights Reserved. Unpublished rights reserved under the copyright laws
- * of the United States. The software contained on this media is proprietary
- * to and embodies the confidential technology of BEA Systems, Inc. The
- * possession or receipt of this information does not convey any right to
- * disclose its contents, reproduce it, or use, or license the use,
- * for manufacture or sale, the information or anything described
- * therein. Any use, disclosure, or reproduction without BEA System's
- * prior written permission is strictly prohibited.
- *
- * $Header:$
- */
-package jpf.test.controls.performance.benchmarks.strlen.dproxy;
-
-// for logging
-import org.apache.log4j.Logger;
-import org.apache.log4j.Level;
-import org.apache.log4j.BasicConfigurator;
-
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
-import org.apache.beehive.test.tools.milton.common.Report;
-// perf imports
-import java.lang.reflect.Proxy;
-import org.apache.beehive.controls.perf.benchmarks.dproxy.IStrlen;
-import org.apache.beehive.controls.perf.benchmarks.dproxy.StrlenDProxy;
-import org.apache.beehive.controls.perf.utils.Constants;
-import org.apache.beehive.controls.perf.utils.PerfUtil;
-
-@Jpf.Controller(
- forwards = {
- @Jpf.Forward(name=Report.RESULTS, path = Report.RESULTSJSP)
- })
-public class Controller extends PageFlowController
-{
- private Report _report = new Report();
- private transient Logger logger = Logger.getRootLogger();
-
- @Jpf.Action()
- protected Forward begin()
- {
- BasicConfigurator.configure();
- try
- {
- log(Constants.DELIM+"StrlenDproxyJpfTest");
- final int iterations = Constants.STRLEN_ITERATIONS;
- PerfUtil util = new PerfUtil();
- String input = util.createString(Constants.DEFAULT_STR_SIZE);
- long cputime;
- int hash = 0;
-
- // instantiate the proxy to be used in the test
- Class[] proxyInterfaces = new Class[]{IStrlen.class};
- IStrlen strlen = (IStrlen) Proxy.newProxyInstance(IStrlen.class.getClassLoader(),
- proxyInterfaces,
- new StrlenDProxy());
-
- // warm up the vm
- cputime = System.currentTimeMillis();
- for(int i=0; i<iterations; i++){
- hash += run(input, strlen);
- }
- cputime = System.currentTimeMillis() - cputime;
-
- // run it again for the real measurement
- cputime = System.currentTimeMillis();
- for(int i=0; i<iterations; i++){
- hash += run(input, strlen);
- }
- cputime = System.currentTimeMillis() - cputime;
-
- // log the results
- log("hash "+hash);
- log("time "+cputime);
- _report.setStatus(Report.PASS);
- }
- catch(Exception e)
- {
- _report.setStatus(Report.FAIL);
- _report.setExceptionStack(e);
- }
-
- logger = null;
- return new Forward(Report.RESULTS, Report.KEY, _report);
- }
-
-
- private int run(String p_input, IStrlen p_strlen)
- {
- return p_strlen.stringLength(p_input);
- }
-
- private void log(String message)
- {
- logger.info("PERF "+message);
- _report.addMessage(message);
- }
-}
+/*
+ *
+ * N E T U I
+ *
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * All Rights Reserved. Unpublished rights reserved under the copyright laws
+ * of the United States. The software contained on this media is proprietary
+ * to and embodies the confidential technology of BEA Systems, Inc. The
+ * possession or receipt of this information does not convey any right to
+ * disclose its contents, reproduce it, or use, or license the use,
+ * for manufacture or sale, the information or anything described
+ * therein. Any use, disclosure, or reproduction without BEA System's
+ * prior written permission is strictly prohibited.
+ *
+ * $Header:$
+ */
+package jpf.test.controls.performance.benchmarks.strlen.dproxy;
+
+// for logging
+import org.apache.log4j.Logger;
+import org.apache.log4j.Level;
+import org.apache.log4j.BasicConfigurator;
+
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+import org.apache.beehive.test.tools.milton.common.Report;
+// perf imports
+import java.lang.reflect.Proxy;
+import org.apache.beehive.controls.perf.benchmarks.dproxy.IStrlen;
+import org.apache.beehive.controls.perf.benchmarks.dproxy.StrlenDProxy;
+import org.apache.beehive.controls.perf.utils.Constants;
+import org.apache.beehive.controls.perf.utils.PerfUtil;
+
+@Jpf.Controller(
+ forwards = {
+ @Jpf.Forward(name=Report.RESULTS, path = Report.RESULTSJSP)
+ })
+public class Controller extends PageFlowController
+{
+ private Report _report = new Report();
+ private transient Logger logger = Logger.getRootLogger();
+
+ @Jpf.Action()
+ protected Forward begin()
+ {
+ BasicConfigurator.configure();
+ try
+ {
+ log(Constants.DELIM+"StrlenDproxyJpfTest");
+ final int iterations = Constants.STRLEN_ITERATIONS;
+ PerfUtil util = new PerfUtil();
+ String input = util.createString(Constants.DEFAULT_STR_SIZE);
+ long cputime;
+ int hash = 0;
+
+ // instantiate the proxy to be used in the test
+ Class[] proxyInterfaces = new Class[]{IStrlen.class};
+ IStrlen strlen = (IStrlen) Proxy.newProxyInstance(IStrlen.class.getClassLoader(),
+ proxyInterfaces,
+ new StrlenDProxy());
+
+ // warm up the vm
+ cputime = System.currentTimeMillis();
+ for(int i=0; i<iterations; i++){
+ hash += run(input, strlen);
+ }
+ cputime = System.currentTimeMillis() - cputime;
+
+ // run it again for the real measurement
+ cputime = System.currentTimeMillis();
+ for(int i=0; i<iterations; i++){
+ hash += run(input, strlen);
+ }
+ cputime = System.currentTimeMillis() - cputime;
+
+ // log the results
+ log("hash "+hash);
+ log("time "+cputime);
+ _report.setStatus(Report.PASS);
+ }
+ catch(Exception e)
+ {
+ _report.setStatus(Report.FAIL);
+ _report.setExceptionStack(e);
+ }
+
+ logger = null;
+ return new Forward(Report.RESULTS, Report.KEY, _report);
+ }
+
+
+ private int run(String p_input, IStrlen p_strlen)
+ {
+ return p_strlen.stringLength(p_input);
+ }
+
+ private void log(String message)
+ {
+ logger.info("PERF "+message);
+ _report.addMessage(message);
+ }
+}
Propchange: beehive/trunk/controls/test/perf/webapps/controlsPerfWeb/jpf/test/controls/performance/benchmarks/strlen/dproxy/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/controls/test/perf/webapps/controlsPerfWeb/jpf/test/controls/performance/benchmarks/strlen/javabean/Controller.jpf
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/perf/webapps/controlsPerfWeb/jpf/test/controls/performance/benchmarks/strlen/javabean/Controller.jpf?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/perf/webapps/controlsPerfWeb/jpf/test/controls/performance/benchmarks/strlen/javabean/Controller.jpf (original)
+++ beehive/trunk/controls/test/perf/webapps/controlsPerfWeb/jpf/test/controls/performance/benchmarks/strlen/javabean/Controller.jpf Fri Aug 12 08:12:28 2005
@@ -1,99 +1,99 @@
-/*
- *
- * N E T U I
- *
- * Copyright 2004 The Apache Software Foundation.
- *
- * All Rights Reserved. Unpublished rights reserved under the copyright laws
- * of the United States. The software contained on this media is proprietary
- * to and embodies the confidential technology of BEA Systems, Inc. The
- * possession or receipt of this information does not convey any right to
- * disclose its contents, reproduce it, or use, or license the use,
- * for manufacture or sale, the information or anything described
- * therein. Any use, disclosure, or reproduction without BEA System's
- * prior written permission is strictly prohibited.
- *
- * $Header:$
- */
-package jpf.test.controls.performance.benchmarks.strlen.javabean;
-
-// for logging
-import org.apache.log4j.Logger;
-import org.apache.log4j.Level;
-import org.apache.log4j.BasicConfigurator;
-// netui
-import org.apache.beehive.netui.pageflow.PageFlowController;
-import org.apache.beehive.netui.pageflow.Forward;
-import org.apache.beehive.netui.pageflow.annotations.Jpf;
-import org.apache.beehive.test.tools.milton.common.Report;
-// perf imports
-import org.apache.beehive.controls.perf.benchmarks.javabean.StrlenBean;
-import org.apache.beehive.controls.perf.utils.Constants;
-import org.apache.beehive.controls.perf.utils.PerfUtil;
-
-@Jpf.Controller(
- forwards = {
- @Jpf.Forward(name=Report.RESULTS, path = Report.RESULTSJSP)
- })
-public class Controller extends PageFlowController
-{
- private Report _report = new Report();
- private transient Logger logger = Logger.getRootLogger();
-
- @Jpf.Action()
- protected Forward begin()
- {
- BasicConfigurator.configure();
- try
- {
- log("TEST: StrlenJavabeanJpfTest");
- final int iterations = Constants.STRLEN_ITERATIONS;
- PerfUtil util = new PerfUtil();
- String input = util.createString(Constants.DEFAULT_STR_SIZE);
- long cputime;
- int hash = 0;
-
- // instantiate the bean for the test
- StrlenBean bean = new StrlenBean();
-
- // warm up the vm
- cputime = System.currentTimeMillis();
- for(int i=0; i<iterations; i++){
- hash += run(input, bean);
- }
- cputime = System.currentTimeMillis() - cputime;
-
- // run it again for the real measurement
- cputime = System.currentTimeMillis();
- for(int i=0; i<iterations; i++){
- hash += run(input, bean);
- }
- cputime = System.currentTimeMillis() - cputime;
-
- // log the results
- log("hash "+hash);
- log("time "+cputime);
- _report.setStatus(Report.PASS);
- }
- catch(Exception e)
- {
- _report.setStatus(Report.FAIL);
- _report.setExceptionStack(e);
- }
-
- logger = null;
- return new Forward(Report.RESULTS, Report.KEY, _report);
- }
-
-
- private int run(String p_input, StrlenBean p_bean)
- {
- return p_bean.stringLength(p_input);
- }
-
- private void log(String message)
- {
- logger.info("PERF "+message);
- _report.addMessage(message);
- }
-}
+/*
+ *
+ * N E T U I
+ *
+ * Copyright 2004 The Apache Software Foundation.
+ *
+ * All Rights Reserved. Unpublished rights reserved under the copyright laws
+ * of the United States. The software contained on this media is proprietary
+ * to and embodies the confidential technology of BEA Systems, Inc. The
+ * possession or receipt of this information does not convey any right to
+ * disclose its contents, reproduce it, or use, or license the use,
+ * for manufacture or sale, the information or anything described
+ * therein. Any use, disclosure, or reproduction without BEA System's
+ * prior written permission is strictly prohibited.
+ *
+ * $Header:$
+ */
+package jpf.test.controls.performance.benchmarks.strlen.javabean;
+
+// for logging
+import org.apache.log4j.Logger;
+import org.apache.log4j.Level;
+import org.apache.log4j.BasicConfigurator;
+// netui
+import org.apache.beehive.netui.pageflow.PageFlowController;
+import org.apache.beehive.netui.pageflow.Forward;
+import org.apache.beehive.netui.pageflow.annotations.Jpf;
+import org.apache.beehive.test.tools.milton.common.Report;
+// perf imports
+import org.apache.beehive.controls.perf.benchmarks.javabean.StrlenBean;
+import org.apache.beehive.controls.perf.utils.Constants;
+import org.apache.beehive.controls.perf.utils.PerfUtil;
+
+@Jpf.Controller(
+ forwards = {
+ @Jpf.Forward(name=Report.RESULTS, path = Report.RESULTSJSP)
+ })
+public class Controller extends PageFlowController
+{
+ private Report _report = new Report();
+ private transient Logger logger = Logger.getRootLogger();
+
+ @Jpf.Action()
+ protected Forward begin()
+ {
+ BasicConfigurator.configure();
+ try
+ {
+ log("TEST: StrlenJavabeanJpfTest");
+ final int iterations = Constants.STRLEN_ITERATIONS;
+ PerfUtil util = new PerfUtil();
+ String input = util.createString(Constants.DEFAULT_STR_SIZE);
+ long cputime;
+ int hash = 0;
+
+ // instantiate the bean for the test
+ StrlenBean bean = new StrlenBean();
+
+ // warm up the vm
+ cputime = System.currentTimeMillis();
+ for(int i=0; i<iterations; i++){
+ hash += run(input, bean);
+ }
+ cputime = System.currentTimeMillis() - cputime;
+
+ // run it again for the real measurement
+ cputime = System.currentTimeMillis();
+ for(int i=0; i<iterations; i++){
+ hash += run(input, bean);
+ }
+ cputime = System.currentTimeMillis() - cputime;
+
+ // log the results
+ log("hash "+hash);
+ log("time "+cputime);
+ _report.setStatus(Report.PASS);
+ }
+ catch(Exception e)
+ {
+ _report.setStatus(Report.FAIL);
+ _report.setExceptionStack(e);
+ }
+
+ logger = null;
+ return new Forward(Report.RESULTS, Report.KEY, _report);
+ }
+
+
+ private int run(String p_input, StrlenBean p_bean)
+ {
+ return p_bean.stringLength(p_input);
+ }
+
+ private void log(String message)
+ {
+ logger.info("PERF "+message);
+ _report.addMessage(message);
+ }
+}
Propchange: beehive/trunk/controls/test/perf/webapps/controlsPerfWeb/jpf/test/controls/performance/benchmarks/strlen/javabean/Controller.jpf
------------------------------------------------------------------------------
svn:eol-style = native