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 [20/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/per...
Propchange: beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/generator/MiltonJpfAccesser.vm
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/generator/MiltonJws.vm
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/generator/MiltonJws.vm?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/generator/MiltonJws.vm (original)
+++ beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/generator/MiltonJws.vm Fri Aug 12 08:12:28 2005
@@ -1,68 +1,68 @@
-##
-## The Velocity code generation template for the Milton JPF controllerfor
-## generated as a control client for testing beehive-controls.
-##
-## Copyright 2004 The Apache Software Foundation.
-##
-## Licensed under the Apache License, Version 2.0 (the "License");
-## you may not use this file except in compliance with the License.
-## You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing, software
-## distributed under the License is distributed on an "AS IS" BASIS,
-## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-## See the License for the specific language governing permissions and
-## limitations under the License.
-##
-## $Header:$
-##
-#macro (defineWebMethods)
- #foreach ($test in $suite.tests)
- @WebMethod
- public Report ${test.name}() throws Exception
- {
- #programaticControls($test)
- ${suite.packageName}.${suite.name} driver = new ${suite.packageName}.${suite.name}();
- return driver.${test.name}(${test.parameters});
- }
-
- #end
-#end
-##
-#macro (declarativeControls $test)
- #foreach ($control in $test.getDeclarativeControls())
- @Control
- #foreach ($annotation in $control.getAnnotations())
- $annotation
- #end
- $control.modifier ${control.type}${control.genericType} $control.name;
-
- #end
-#end
-##
-#macro (programaticControls $test)
- #foreach ($control in $test.getProgramaticControls())
- $control.type $control.name = ($control.type) java.beans.Beans.instantiate(Thread.currentThread().getContextClassLoader(), "$control.type");
- #end
-#end
-##
-package $client.jws_package;
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-
-import org.apache.beehive.test.tools.milton.common.Report;
-
-import org.apache.beehive.controls.api.bean.Control;
-
-@WebService
-public class ${suite.name}WebService
-{
- #foreach ($test in $suite.tests)
- #declarativeControls($test)
- #end
-
- #defineWebMethods()
-}
+##
+## The Velocity code generation template for the Milton JPF controllerfor
+## generated as a control client for testing beehive-controls.
+##
+## Copyright 2004 The Apache Software Foundation.
+##
+## Licensed under the Apache License, Version 2.0 (the "License");
+## you may not use this file except in compliance with the License.
+## You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##
+## $Header:$
+##
+#macro (defineWebMethods)
+ #foreach ($test in $suite.tests)
+ @WebMethod
+ public Report ${test.name}() throws Exception
+ {
+ #programaticControls($test)
+ ${suite.packageName}.${suite.name} driver = new ${suite.packageName}.${suite.name}();
+ return driver.${test.name}(${test.parameters});
+ }
+
+ #end
+#end
+##
+#macro (declarativeControls $test)
+ #foreach ($control in $test.getDeclarativeControls())
+ @Control
+ #foreach ($annotation in $control.getAnnotations())
+ $annotation
+ #end
+ $control.modifier ${control.type}${control.genericType} $control.name;
+
+ #end
+#end
+##
+#macro (programaticControls $test)
+ #foreach ($control in $test.getProgramaticControls())
+ $control.type $control.name = ($control.type) java.beans.Beans.instantiate(Thread.currentThread().getContextClassLoader(), "$control.type");
+ #end
+#end
+##
+package $client.jws_package;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+
+import org.apache.beehive.test.tools.milton.common.Report;
+
+import org.apache.beehive.controls.api.bean.Control;
+
+@WebService
+public class ${suite.name}WebService
+{
+ #foreach ($test in $suite.tests)
+ #declarativeControls($test)
+ #end
+
+ #defineWebMethods()
+}
Propchange: beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/generator/MiltonJws.vm
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/generator/MiltonJwsAccesser.vm
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/generator/MiltonJwsAccesser.vm?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/generator/MiltonJwsAccesser.vm (original)
+++ beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/generator/MiltonJwsAccesser.vm Fri Aug 12 08:12:28 2005
@@ -1,30 +1,30 @@
-#macro (defineJwsTestMethods)
- #set( $velocimacro.context.localscope = true )
- #foreach ($test in $suite.tests)
- #set( $attributes = ${test.attributes} )
-
- @Freq("$attributes.frequency")
- @Status("$attributes.status")
- @Misc("$attributes.misc")
- @Desc("$attributes.description")
- public void ${test.name}() throws Exception
- {
- assertReport("${client.jws_accesser_call_path}", "${test.name}");
- }
-
- #end
-#end
-###
-package $client.jws_accesser_package;
-
-import org.apache.beehive.test.tools.milton.junit.SOAPReportTestCase;
-
-import org.apache.beehive.test.tools.mantis.annotations.tch.*;
-
-@Webapps("$suite.webapps")
-public class $client.jws_accesser_name extends SOAPReportTestCase
-{
- public ${client.jws_accesser_name}(String s){super(s);}
-
- #defineJwsTestMethods()
-}
+#macro (defineJwsTestMethods)
+ #set( $velocimacro.context.localscope = true )
+ #foreach ($test in $suite.tests)
+ #set( $attributes = ${test.attributes} )
+
+ @Freq("$attributes.frequency")
+ @Status("$attributes.status")
+ @Misc("$attributes.misc")
+ @Desc("$attributes.description")
+ public void ${test.name}() throws Exception
+ {
+ assertReport("${client.jws_accesser_call_path}", "${test.name}");
+ }
+
+ #end
+#end
+###
+package $client.jws_accesser_package;
+
+import org.apache.beehive.test.tools.milton.junit.SOAPReportTestCase;
+
+import org.apache.beehive.test.tools.mantis.annotations.tch.*;
+
+@Webapps("$suite.webapps")
+public class $client.jws_accesser_name extends SOAPReportTestCase
+{
+ public ${client.jws_accesser_name}(String s){super(s);}
+
+ #defineJwsTestMethods()
+}
Propchange: beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/generator/MiltonJwsAccesser.vm
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/generator/MiltonTestClient.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/generator/MiltonTestClient.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/generator/MiltonTestClient.java (original)
+++ beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/generator/MiltonTestClient.java Fri Aug 12 08:12:28 2005
@@ -1,107 +1,107 @@
-package org.apache.beehive.test.tools.milton.mantis.generator;
-
-import java.io.IOException;
-import java.io.Writer;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Set;
-
-import org.apache.beehive.test.tools.milton.mantis.MiltonTestSuite;
-import org.apache.beehive.test.tools.milton.mantis.MiltonUtil;
-
-import com.sun.mirror.apt.AnnotationProcessorEnvironment;
-import com.sun.mirror.apt.Filer;
-
-/*
- * Abstract class describing a MiltonTestClient which is used by MiltonClientGenerator
- * to create the corresponding client files from a MiltonTestSuite.
- */
-public abstract class MiltonTestClient
-{
- protected final String DEFAULT_WEBAPP_DIR = "webapps/";
- protected final String DEFAULT_ACCESSER_SRC_DIR = "testsrcgen/";
-
- protected String _templateName = null;
- protected Writer _writer = null;
- protected Filer _filer = null;
- protected MiltonTestSuite _mts = null;
- protected HashMap<String, Object> _context = new HashMap<String, Object>();
- protected Map<String, String> _options;
- protected String _webappName = null;
- protected String _webappDir = null;
- protected String _accesserDir = null;
-
- /*
- * Construct a MiltonTestClient
- *
- * @param p_mts The MiltonTestSuite to represent
- * @param p_evn APT environment used for accessing the Filer
- *
- * @see MiltonTestSuite
- * @see MiltonClientGenerator
- */
- public MiltonTestClient(MiltonTestSuite p_mts, AnnotationProcessorEnvironment p_env)
- {
- this._mts = p_mts;
- this._filer = p_env.getFiler();
- this._options = p_env.getOptions();
-
- // Get settings from apt environment
- _webappName = MiltonUtil.getOption(this._options, "webapp.name");
-
- if (null == _webappName)
- throw new IllegalStateException("You must supply a -Awebapp.name to APT via Mantis");
-
- _webappDir = MiltonUtil.getOption(this._options, "webapp.gen.dir");
-
- if (null == _webappDir)
- _webappDir = DEFAULT_WEBAPP_DIR;
- else if (! _webappDir.endsWith("/"))
- _webappDir += "/";
-
- _accesserDir = MiltonUtil.getOption(this._options, "accesser.src.gendir");
-
- if (null == _accesserDir)
- _accesserDir = DEFAULT_ACCESSER_SRC_DIR;
- else if (! _accesserDir.endsWith("/"))
- _accesserDir += "/";
- }
-
- /*
- * Return a String which represents the path to the Template used for generation
- */
- public String getTemplateName()
- {
- return this._templateName;
- }
-
- /*
- * Return a Writer for the file to generate.
- */
- public Writer getWriter()
- throws IOException
- {
- return this._writer;
- }
-
- /*
- * Return the MiltonTestSuite this client will generate files for.
- */
- public MiltonTestSuite getSuite()
- {
- return this._mts;
- }
-
- /*
- * Return the context for this MiltonTestClient. A MiltonTestClient may
- * need to add additional information or provide slightly modified versions
- * of the data held by the MiltonTestSuite. This can be put in the Context
- * and then accessed by the generator.
- */
- public HashMap getContext()
- {
- return this._context;
- }
-
-
-}
+package org.apache.beehive.test.tools.milton.mantis.generator;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Set;
+
+import org.apache.beehive.test.tools.milton.mantis.MiltonTestSuite;
+import org.apache.beehive.test.tools.milton.mantis.MiltonUtil;
+
+import com.sun.mirror.apt.AnnotationProcessorEnvironment;
+import com.sun.mirror.apt.Filer;
+
+/*
+ * Abstract class describing a MiltonTestClient which is used by MiltonClientGenerator
+ * to create the corresponding client files from a MiltonTestSuite.
+ */
+public abstract class MiltonTestClient
+{
+ protected final String DEFAULT_WEBAPP_DIR = "webapps/";
+ protected final String DEFAULT_ACCESSER_SRC_DIR = "testsrcgen/";
+
+ protected String _templateName = null;
+ protected Writer _writer = null;
+ protected Filer _filer = null;
+ protected MiltonTestSuite _mts = null;
+ protected HashMap<String, Object> _context = new HashMap<String, Object>();
+ protected Map<String, String> _options;
+ protected String _webappName = null;
+ protected String _webappDir = null;
+ protected String _accesserDir = null;
+
+ /*
+ * Construct a MiltonTestClient
+ *
+ * @param p_mts The MiltonTestSuite to represent
+ * @param p_evn APT environment used for accessing the Filer
+ *
+ * @see MiltonTestSuite
+ * @see MiltonClientGenerator
+ */
+ public MiltonTestClient(MiltonTestSuite p_mts, AnnotationProcessorEnvironment p_env)
+ {
+ this._mts = p_mts;
+ this._filer = p_env.getFiler();
+ this._options = p_env.getOptions();
+
+ // Get settings from apt environment
+ _webappName = MiltonUtil.getOption(this._options, "webapp.name");
+
+ if (null == _webappName)
+ throw new IllegalStateException("You must supply a -Awebapp.name to APT via Mantis");
+
+ _webappDir = MiltonUtil.getOption(this._options, "webapp.gen.dir");
+
+ if (null == _webappDir)
+ _webappDir = DEFAULT_WEBAPP_DIR;
+ else if (! _webappDir.endsWith("/"))
+ _webappDir += "/";
+
+ _accesserDir = MiltonUtil.getOption(this._options, "accesser.src.gendir");
+
+ if (null == _accesserDir)
+ _accesserDir = DEFAULT_ACCESSER_SRC_DIR;
+ else if (! _accesserDir.endsWith("/"))
+ _accesserDir += "/";
+ }
+
+ /*
+ * Return a String which represents the path to the Template used for generation
+ */
+ public String getTemplateName()
+ {
+ return this._templateName;
+ }
+
+ /*
+ * Return a Writer for the file to generate.
+ */
+ public Writer getWriter()
+ throws IOException
+ {
+ return this._writer;
+ }
+
+ /*
+ * Return the MiltonTestSuite this client will generate files for.
+ */
+ public MiltonTestSuite getSuite()
+ {
+ return this._mts;
+ }
+
+ /*
+ * Return the context for this MiltonTestClient. A MiltonTestClient may
+ * need to add additional information or provide slightly modified versions
+ * of the data held by the MiltonTestSuite. This can be put in the Context
+ * and then accessed by the generator.
+ */
+ public HashMap getContext()
+ {
+ return this._context;
+ }
+
+
+}
Propchange: beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/generator/MiltonTestClient.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/generator/VelocityGenerator.java
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/generator/VelocityGenerator.java?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/generator/VelocityGenerator.java (original)
+++ beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/generator/VelocityGenerator.java Fri Aug 12 08:12:28 2005
@@ -1,76 +1,76 @@
-package org.apache.beehive.test.tools.milton.mantis.generator;
-
-import java.util.HashMap;
-import java.util.Properties;
-
-import org.apache.velocity.Template;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.VelocityEngine;
-import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
-
-/*
- * Implementation of the MiltonClientGenerator. This generator uses Apache
- * Velocity templates to generate client files for the MiltonTestClient
- * passed to it.
- *
- * @see MiltonClientGenerator
- * @see MiltonTestClient
- */
-public class VelocityGenerator implements MiltonClientGenerator
-{
- protected VelocityEngine _ve;
-
- private HashMap<String, Template> _templateMap = new HashMap<String, Template>();
-
- /*
- * Constructs a VelocityGenerator
- */
- public VelocityGenerator() throws Exception
- {
- this._ve = new VelocityEngine();
-
- Properties p = new Properties();
- p.setProperty(VelocityEngine.RESOURCE_LOADER, "class");
- p.setProperty("class." + VelocityEngine.RESOURCE_LOADER + ".class",
- ClasspathResourceLoader.class.getName());
-
- this._ve.init(p);
- }
-
- /*
- * Given a MiltonTestClient generate the corresponding files.
- */
- public void generate(MiltonTestClient p_mtc)
- {
- VelocityContext vc = new VelocityContext();
-
- vc.put("suite", p_mtc.getSuite());
- vc.put("client", p_mtc.getContext());
-
- try {
- Template t = getTemplate(p_mtc.getTemplateName());
- t.merge(vc, p_mtc.getWriter());
- }
- //TODO: throw meaningful exception
- catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
-
- /*
- * Returns the the Velocity Template given a path. If the Template
- * has already been requested it will cache the template information in
- * a map and return from the map on subsequent requests.
- */
- protected Template getTemplate(String p_templateName)
- throws Exception
- {
- if (_templateMap.containsKey(p_templateName))
- return _templateMap.get(p_templateName);
-
- Template t = _ve.getTemplate(p_templateName);
- _templateMap.put(p_templateName, t);
-
- return t;
- }
-}
+package org.apache.beehive.test.tools.milton.mantis.generator;
+
+import java.util.HashMap;
+import java.util.Properties;
+
+import org.apache.velocity.Template;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.VelocityEngine;
+import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
+
+/*
+ * Implementation of the MiltonClientGenerator. This generator uses Apache
+ * Velocity templates to generate client files for the MiltonTestClient
+ * passed to it.
+ *
+ * @see MiltonClientGenerator
+ * @see MiltonTestClient
+ */
+public class VelocityGenerator implements MiltonClientGenerator
+{
+ protected VelocityEngine _ve;
+
+ private HashMap<String, Template> _templateMap = new HashMap<String, Template>();
+
+ /*
+ * Constructs a VelocityGenerator
+ */
+ public VelocityGenerator() throws Exception
+ {
+ this._ve = new VelocityEngine();
+
+ Properties p = new Properties();
+ p.setProperty(VelocityEngine.RESOURCE_LOADER, "class");
+ p.setProperty("class." + VelocityEngine.RESOURCE_LOADER + ".class",
+ ClasspathResourceLoader.class.getName());
+
+ this._ve.init(p);
+ }
+
+ /*
+ * Given a MiltonTestClient generate the corresponding files.
+ */
+ public void generate(MiltonTestClient p_mtc)
+ {
+ VelocityContext vc = new VelocityContext();
+
+ vc.put("suite", p_mtc.getSuite());
+ vc.put("client", p_mtc.getContext());
+
+ try {
+ Template t = getTemplate(p_mtc.getTemplateName());
+ t.merge(vc, p_mtc.getWriter());
+ }
+ //TODO: throw meaningful exception
+ catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ /*
+ * Returns the the Velocity Template given a path. If the Template
+ * has already been requested it will cache the template information in
+ * a map and return from the map on subsequent requests.
+ */
+ protected Template getTemplate(String p_templateName)
+ throws Exception
+ {
+ if (_templateMap.containsKey(p_templateName))
+ return _templateMap.get(p_templateName);
+
+ Template t = _ve.getTemplate(p_templateName);
+ _templateMap.put(p_templateName, t);
+
+ return t;
+ }
+}
Propchange: beehive/trunk/controls/test/tools/milton/src/org/apache/beehive/test/tools/milton/mantis/generator/VelocityGenerator.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/controls/test/tools/tch/README
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/README?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/README (original)
+++ beehive/trunk/controls/test/tools/tch/README Fri Aug 12 08:12:28 2005
@@ -1,35 +1,35 @@
-NOTICE:
-
-To run the TCH tests:
- 1) $ . ./setenv.sh
- 2) $ cd deploy
- 2) $ . ./setenv.sh
- 3) $ ant run
-
-The tests for TCH live under deploy/test and they will pass if you run them with Ant 1.5. However, we are using Ant 1.6.2 now, and the tests will not pass on that version. The failures reported while running the tests are a result of how Ant 1.6.2 prints certain things to stdout differently.
-
-
-
-If you run the tests, you should see output similar to this:
-
-==========================================
-
-Diff is:
-
-7c7
-< Source path: file:${TCH_HOME}/test/core/task/short-suite.xml:7
----
-> Source path: ${TCH_HOME}\test\core\task\short-suite.xml:7
-19c19
-< Source path: file:${TCH_HOME}/test/core/task/short-suite.xml:7
----
-> Source path: ${TCH_HOME}\test\core\task\short-suite.xml:7
-...........etc............
-
-==========================================
-
-This is due to the stupid way we determine test pass/failure. We are planning on fixing this for ant 1.6.2, but we haven't gotten to that point yet.
-
-Despite the fact that the tests fail, TCH itself will work correctly with Ant 1.6.2.
-
-
+NOTICE:
+
+To run the TCH tests:
+ 1) $ . ./setenv.sh
+ 2) $ cd deploy
+ 2) $ . ./setenv.sh
+ 3) $ ant run
+
+The tests for TCH live under deploy/test and they will pass if you run them with Ant 1.5. However, we are using Ant 1.6.2 now, and the tests will not pass on that version. The failures reported while running the tests are a result of how Ant 1.6.2 prints certain things to stdout differently.
+
+
+
+If you run the tests, you should see output similar to this:
+
+==========================================
+
+Diff is:
+
+7c7
+< Source path: file:${TCH_HOME}/test/core/task/short-suite.xml:7
+---
+> Source path: ${TCH_HOME}\test\core\task\short-suite.xml:7
+19c19
+< Source path: file:${TCH_HOME}/test/core/task/short-suite.xml:7
+---
+> Source path: ${TCH_HOME}\test\core\task\short-suite.xml:7
+...........etc............
+
+==========================================
+
+This is due to the stupid way we determine test pass/failure. We are planning on fixing this for ant 1.6.2, but we haven't gotten to that point yet.
+
+Despite the fact that the tests fail, TCH itself will work correctly with Ant 1.6.2.
+
+
Propchange: beehive/trunk/controls/test/tools/tch/README
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/controls/test/tools/tch/ant
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/ant?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/ant (original)
+++ beehive/trunk/controls/test/tools/tch/ant Fri Aug 12 08:12:28 2005
@@ -1,4 +1,4 @@
-#!/bin/sh
-
-java org.apache.tools.ant.Main "$@"
-
+#!/bin/sh
+
+java org.apache.tools.ant.Main "$@"
+
Propchange: beehive/trunk/controls/test/tools/tch/ant
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: beehive/trunk/controls/test/tools/tch/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/controls/test/tools/tch/common.props
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/common.props?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/common.props (original)
+++ beehive/trunk/controls/test/tools/tch/common.props Fri Aug 12 08:12:28 2005
@@ -1,36 +1,36 @@
-TCH_HOME=${basedir}
-root=${TCH_HOME}
-branch-home=${TCH_HOME}
-src=${branch-home}/src
-extension=${branch-home}/extension
-deploydir=${TCH_HOME}/deploy
-testdir=${deploydir}/test
-3rdpartydir=${TCH_HOME}/3rdparty
-builddir=${TCH_HOME}/build
-
-root-template=${deploydir}/tch-root-template.xml
-root-file=${deploydir}/tch-root.xml
-
-core-jar-name=tchx.jar
-util-jar-name=tch-util.jar
-gtlf-tools-jar-name=gtlf-utils.jar
-
-core-jar-location=${deploydir}/${core-jar-name}
-
-dtd-location=${src}/dtd
-
-
-# external exectasks
-exectaskbuilddir=${TCH_HOME}/exectasktemp
-
-# package
-
-src-core-zip=tch-core-src.zip
-
-javadocs-zip=tch-javadocs.zip
-packagedir=${root}/package
-javadocdir=${root}/javadoc
-packagefilename=tch.zip
-
-#test suites
+TCH_HOME=${basedir}
+root=${TCH_HOME}
+branch-home=${TCH_HOME}
+src=${branch-home}/src
+extension=${branch-home}/extension
+deploydir=${TCH_HOME}/deploy
+testdir=${deploydir}/test
+3rdpartydir=${TCH_HOME}/3rdparty
+builddir=${TCH_HOME}/build
+
+root-template=${deploydir}/tch-root-template.xml
+root-file=${deploydir}/tch-root.xml
+
+core-jar-name=tchx.jar
+util-jar-name=tch-util.jar
+gtlf-tools-jar-name=gtlf-utils.jar
+
+core-jar-location=${deploydir}/${core-jar-name}
+
+dtd-location=${src}/dtd
+
+
+# external exectasks
+exectaskbuilddir=${TCH_HOME}/exectasktemp
+
+# package
+
+src-core-zip=tch-core-src.zip
+
+javadocs-zip=tch-javadocs.zip
+packagedir=${root}/package
+javadocdir=${root}/javadoc
+packagefilename=tch.zip
+
+#test suites
testdir=${deploydir}/test
Propchange: beehive/trunk/controls/test/tools/tch/common.props
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/controls/test/tools/tch/deploy/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/deploy/build.xml?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/deploy/build.xml (original)
+++ beehive/trunk/controls/test/tools/tch/deploy/build.xml Fri Aug 12 08:12:28 2005
@@ -1,42 +1,42 @@
-<project name="tch-project" default="usage">
- <taskdef name="tch" classname="org.apache.beehive.test.tools.tch.TchVMTask"/>
- <property name="tch.verbose" value="false"/>
- <property name="test-suite" value="test/regression.xml"/>
- <property file="../buildenv.properties"/>
-
- <property name="tch.home" value="${basedir}"/>
- <target name="usage" depends="version">
- <loadfile property="helpfile" srcfile="help/helpfile"/>
- <echo message="${helpfile}"/>
- </target>
-
- <target name="version">
- <java classname="org.apache.beehive.test.tools.tch.core.version"/>
- </target>
-
- <target name="run" depends="set-java-opts">
- <tch
- testfile="${test-suite}"
- tchHome="${tch.home}"
- failOnError="true"
- verbose="${tch.verbose}"
- >
- <arg value="-emacs"/>
- </tch>
- </target>
-
- <target name="set-java-opts">
- <condition property="javaopts" value="">
- <not>
- <isset property="javaopts"/>
- </not>
- </condition>
- <condition property="tch.javaopts" value="">
- <not>
- <isset property="tch.javaopts"/>
- </not>
- </condition>
- </target>
-
-</project>
-
+<project name="tch-project" default="usage">
+ <taskdef name="tch" classname="org.apache.beehive.test.tools.tch.TchVMTask"/>
+ <property name="tch.verbose" value="false"/>
+ <property name="test-suite" value="test/regression.xml"/>
+ <property file="../buildenv.properties"/>
+
+ <property name="tch.home" value="${basedir}"/>
+ <target name="usage" depends="version">
+ <loadfile property="helpfile" srcfile="help/helpfile"/>
+ <echo message="${helpfile}"/>
+ </target>
+
+ <target name="version">
+ <java classname="org.apache.beehive.test.tools.tch.core.version"/>
+ </target>
+
+ <target name="run" depends="set-java-opts">
+ <tch
+ testfile="${test-suite}"
+ tchHome="${tch.home}"
+ failOnError="true"
+ verbose="${tch.verbose}"
+ >
+ <arg value="-emacs"/>
+ </tch>
+ </target>
+
+ <target name="set-java-opts">
+ <condition property="javaopts" value="">
+ <not>
+ <isset property="javaopts"/>
+ </not>
+ </condition>
+ <condition property="tch.javaopts" value="">
+ <not>
+ <isset property="tch.javaopts"/>
+ </not>
+ </condition>
+ </target>
+
+</project>
+
Propchange: beehive/trunk/controls/test/tools/tch/deploy/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/controls/test/tools/tch/deploy/messages/end.txt
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/deploy/messages/end.txt?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/deploy/messages/end.txt (original)
+++ beehive/trunk/controls/test/tools/tch/deploy/messages/end.txt Fri Aug 12 08:12:28 2005
@@ -1,21 +1,21 @@
-
-
-
-
-*****************************************************************
-*****************************************************************
-** **
-** **
-** **
-** TCH TEST RUN HAS COMPLETED. **
-** **
-** (please see log files to view results in detail, **
-** e.g. tch.debug, tch.log) **
-** **
-** **
-** **
-*****************************************************************
-*****************************************************************
-
-
-
+
+
+
+
+*****************************************************************
+*****************************************************************
+** **
+** **
+** **
+** TCH TEST RUN HAS COMPLETED. **
+** **
+** (please see log files to view results in detail, **
+** e.g. tch.debug, tch.log) **
+** **
+** **
+** **
+*****************************************************************
+*****************************************************************
+
+
+
Propchange: beehive/trunk/controls/test/tools/tch/deploy/messages/end.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/controls/test/tools/tch/deploy/messages/start.txt
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/deploy/messages/start.txt?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/deploy/messages/start.txt (original)
+++ beehive/trunk/controls/test/tools/tch/deploy/messages/start.txt Fri Aug 12 08:12:28 2005
@@ -1,20 +1,20 @@
-
-
-
-
-*****************************************************************
-*****************************************************************
-** **
-** **
-** **
-** TCH TEST RUN HAS BEGUN. **
-** **
-** INITIALIZATION AND VALIDATION COMMENCING ... **
-** **
-** **
-** **
-*****************************************************************
-*****************************************************************
-
-
-
+
+
+
+
+*****************************************************************
+*****************************************************************
+** **
+** **
+** **
+** TCH TEST RUN HAS BEGUN. **
+** **
+** INITIALIZATION AND VALIDATION COMMENCING ... **
+** **
+** **
+** **
+*****************************************************************
+*****************************************************************
+
+
+
Propchange: beehive/trunk/controls/test/tools/tch/deploy/messages/start.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: beehive/trunk/controls/test/tools/tch/deploy/schema/config.xsd
URL: http://svn.apache.org/viewcvs/beehive/trunk/controls/test/tools/tch/deploy/schema/config.xsd?rev=232310&r1=232309&r2=232310&view=diff
==============================================================================
--- beehive/trunk/controls/test/tools/tch/deploy/schema/config.xsd (original)
+++ beehive/trunk/controls/test/tools/tch/deploy/schema/config.xsd Fri Aug 12 08:12:28 2005
@@ -1,336 +1,336 @@
-<xs:schema elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:element name="config-root">
- <xs:complexType>
- <xs:all>
- <xs:element
- maxOccurs="1"
- minOccurs="0"
- name="environment-config"
- type="environment-configType"
- />
- <xs:element
- maxOccurs="1"
- minOccurs="0"
- name="machine-config"
- type="machine-configType"
- />
- <xs:element
- maxOccurs="1"
- minOccurs="0"
- name="process-config"
- type="process-configType"
- />
- </xs:all>
- </xs:complexType>
- </xs:element>
-
- <!-- FIXME: the attribute values here should be checked as existant. Easier to do this programatically -->
- <xs:complexType name="configured-process-typeType">
- <xs:attribute
- name="name"
- type="xs:string"
- use="required"
- />
- <xs:attribute
- name="process-type"
- type="xs:string"
- use="required"
- />
- <xs:attribute
- name="env"
- type="xs:string"
- use="required"
- />
- <xs:attribute
- name="configuration"
- type="xs:string"
- use="required"
- />
- </xs:complexType>
- <xs:complexType name="envType">
- <xs:sequence>
- <xs:element
- maxOccurs="unbounded"
- minOccurs="0"
- name="var"
- type="varType"
- />
- </xs:sequence>
- <xs:attribute
- name="name"
- type="xs:string"
- use="required"
- />
- </xs:complexType>
- <xs:complexType name="environment-configType">
- <xs:sequence>
- <xs:element
- maxOccurs="unbounded"
- name="env"
- type="envType"
- />
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="exec-process-configType">
- <xs:sequence>
- <xs:element name="cmd" type="xs:string"/>
- </xs:sequence>
- <xs:attribute
- name="name"
- type="xs:string"
- use="required"
- />
- </xs:complexType>
- <xs:complexType name="tch-agent-process-configType">
- <xs:sequence>
- <xs:element
- maxOccurs="unbounded"
- minOccurs="0"
- name="property"
- type="propertyType"
- />
- </xs:sequence>
- <xs:attribute
- name="name"
- type="xs:string"
- use="required"
- />
- <xs:attribute
- name="port"
- type="xs:string"
- use="optional"
- />
- <xs:attribute
- name="bindname"
- type="xs:string"
- use="optional"
- />
- <xs:attribute
- name="javaopts"
- type="xs:string"
- use="optional"
- />
- <xs:attribute
- name="startup-timeout"
- type="xs:string"
- use="optional"
- />
- </xs:complexType>
- <xs:complexType name="machineType">
- <xs:attribute
- name="name"
- type="xs:string"
- use="required"
- />
- <xs:attribute
- name="host"
- type="xs:string"
- use="optional"
- />
- <xs:attribute
- name="externalhost"
- type="xs:string"
- use="optional"
- />
- <xs:attribute name="ip" use="optional"/>
- <xs:attribute
- name="login"
- type="xs:string"
- use="optional"
- />
- </xs:complexType>
- <xs:complexType name="machine-configType">
- <xs:sequence>
- <xs:element
- maxOccurs="unbounded"
- name="machine"
- type="machineType"
- />
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="processType">
- <xs:choice maxOccurs="unbounded">
- <xs:element
- maxOccurs="unbounded"
- minOccurs="0"
- name="nested-process"
- type="nested-processType"
- />
- </xs:choice>
- <xs:attribute
- name="name"
- type="xs:string"
- use="required"
- />
- <xs:attribute
- name="machine"
- type="xs:string"
- use="optional"
- />
- <xs:attribute
- name="requires-started"
- type="xs:string"
- use="optional"
- />
- <xs:attribute
- name="implicit"
- type="xs:boolean"
- use="optional"
- />
- <xs:attribute
- name="auto-start"
- type="xs:string"
- use="optional"
- />
- <xs:attribute
- name="sleep-seconds-after-started"
- type="xs:string"
- use="optional"
- />
- <xs:attribute
- name="window"
- type="xs:boolean"
- use="optional"
- />
- <xs:attribute
- name="home"
- type="xs:string"
- use="optional"
- />
- <xs:attribute
- name="java-home"
- type="xs:string"
- use="optional"
- />
- <xs:attribute
- name="configured-process-type"
- type="xs:string"
- use="optional"
- />
- <xs:attribute
- name="configuration"
- type="xs:string"
- use="optional"
- />
- <xs:attribute
- name="abstract"
- type="xs:string"
- use="optional"
- />
- <xs:attribute
- name="inherit"
- type="xs:string"
- use="optional"
- />
- <xs:attribute
- name="process-type"
- type="xs:string"
- use="optional"
- />
- </xs:complexType>
- <xs:complexType name="nested-processType">
- <xs:attribute
- name="name"
- type="xs:string"
- use="required"
- />
- </xs:complexType>
- <xs:complexType name="process-configType">
- <xs:choice maxOccurs="unbounded">
- <xs:element
- maxOccurs="unbounded"
- minOccurs="0"
- name="process-type"
- type="process-typeType"
- />
- <xs:element
- maxOccurs="unbounded"
- minOccurs="0"
- name="configured-process-type"
- type="configured-process-typeType"
- />
- <xs:element
- maxOccurs="unbounded"
- minOccurs="0"
- name="exec-process-config"
- type="exec-process-configType"
- />
- <xs:element
- maxOccurs="unbounded"
- minOccurs="0"
- name="listener-process-config"
- type="tch-agent-process-configType"
- />
- <xs:element
- maxOccurs="unbounded"
- minOccurs="0"
- name="tch-agent"
- type="tch-agent-process-configType"
- />
- <xs:element
- maxOccurs="unbounded"
- minOccurs="0"
- name="tch-agent-process-config"
- type="tch-agent-process-configType"
- />
- <xs:element
- maxOccurs="unbounded"
- minOccurs="0"
- name="process"
- type="processType"
- />
- </xs:choice>
- </xs:complexType>
- <xs:complexType name="process-typeType">
- <xs:attribute
- name="name"
- type="xs:string"
- use="required"
- />
- <xs:attribute
- name="default-process-manager"
- type="xs:string"
- use="required"
- />
- <xs:attribute name="process-handler" use="required"/>
- <xs:attribute
- name="configuration-manager"
- type="xs:string"
- use="required"
- />
- <xs:attribute
- name="xml-handler"
- type="xs:string"
- use="required"
- />
- <xs:attribute
- name="root-config-tagname"
- type="xs:string"
- use="required"
- />
- </xs:complexType>
- <xs:complexType name="varType">
- <xs:attribute
- name="name"
- type="xs:string"
- use="required"
- />
- <xs:attribute
- name="value"
- type="xs:string"
- use="required"
- />
- </xs:complexType>
- <xs:complexType name="propertyType">
- <xs:attribute
- name="name"
- type="xs:string"
- use="required"
- />
- <xs:attribute
- name="value"
- type="xs:string"
- use="required"
- />
- </xs:complexType>
-</xs:schema>
+<xs:schema elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+ <xs:element name="config-root">
+ <xs:complexType>
+ <xs:all>
+ <xs:element
+ maxOccurs="1"
+ minOccurs="0"
+ name="environment-config"
+ type="environment-configType"
+ />
+ <xs:element
+ maxOccurs="1"
+ minOccurs="0"
+ name="machine-config"
+ type="machine-configType"
+ />
+ <xs:element
+ maxOccurs="1"
+ minOccurs="0"
+ name="process-config"
+ type="process-configType"
+ />
+ </xs:all>
+ </xs:complexType>
+ </xs:element>
+
+ <!-- FIXME: the attribute values here should be checked as existant. Easier to do this programatically -->
+ <xs:complexType name="configured-process-typeType">
+ <xs:attribute
+ name="name"
+ type="xs:string"
+ use="required"
+ />
+ <xs:attribute
+ name="process-type"
+ type="xs:string"
+ use="required"
+ />
+ <xs:attribute
+ name="env"
+ type="xs:string"
+ use="required"
+ />
+ <xs:attribute
+ name="configuration"
+ type="xs:string"
+ use="required"
+ />
+ </xs:complexType>
+ <xs:complexType name="envType">
+ <xs:sequence>
+ <xs:element
+ maxOccurs="unbounded"
+ minOccurs="0"
+ name="var"
+ type="varType"
+ />
+ </xs:sequence>
+ <xs:attribute
+ name="name"
+ type="xs:string"
+ use="required"
+ />
+ </xs:complexType>
+ <xs:complexType name="environment-configType">
+ <xs:sequence>
+ <xs:element
+ maxOccurs="unbounded"
+ name="env"
+ type="envType"
+ />
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="exec-process-configType">
+ <xs:sequence>
+ <xs:element name="cmd" type="xs:string"/>
+ </xs:sequence>
+ <xs:attribute
+ name="name"
+ type="xs:string"
+ use="required"
+ />
+ </xs:complexType>
+ <xs:complexType name="tch-agent-process-configType">
+ <xs:sequence>
+ <xs:element
+ maxOccurs="unbounded"
+ minOccurs="0"
+ name="property"
+ type="propertyType"
+ />
+ </xs:sequence>
+ <xs:attribute
+ name="name"
+ type="xs:string"
+ use="required"
+ />
+ <xs:attribute
+ name="port"
+ type="xs:string"
+ use="optional"
+ />
+ <xs:attribute
+ name="bindname"
+ type="xs:string"
+ use="optional"
+ />
+ <xs:attribute
+ name="javaopts"
+ type="xs:string"
+ use="optional"
+ />
+ <xs:attribute
+ name="startup-timeout"
+ type="xs:string"
+ use="optional"
+ />
+ </xs:complexType>
+ <xs:complexType name="machineType">
+ <xs:attribute
+ name="name"
+ type="xs:string"
+ use="required"
+ />
+ <xs:attribute
+ name="host"
+ type="xs:string"
+ use="optional"
+ />
+ <xs:attribute
+ name="externalhost"
+ type="xs:string"
+ use="optional"
+ />
+ <xs:attribute name="ip" use="optional"/>
+ <xs:attribute
+ name="login"
+ type="xs:string"
+ use="optional"
+ />
+ </xs:complexType>
+ <xs:complexType name="machine-configType">
+ <xs:sequence>
+ <xs:element
+ maxOccurs="unbounded"
+ name="machine"
+ type="machineType"
+ />
+ </xs:sequence>
+ </xs:complexType>
+ <xs:complexType name="processType">
+ <xs:choice maxOccurs="unbounded">
+ <xs:element
+ maxOccurs="unbounded"
+ minOccurs="0"
+ name="nested-process"
+ type="nested-processType"
+ />
+ </xs:choice>
+ <xs:attribute
+ name="name"
+ type="xs:string"
+ use="required"
+ />
+ <xs:attribute
+ name="machine"
+ type="xs:string"
+ use="optional"
+ />
+ <xs:attribute
+ name="requires-started"
+ type="xs:string"
+ use="optional"
+ />
+ <xs:attribute
+ name="implicit"
+ type="xs:boolean"
+ use="optional"
+ />
+ <xs:attribute
+ name="auto-start"
+ type="xs:string"
+ use="optional"
+ />
+ <xs:attribute
+ name="sleep-seconds-after-started"
+ type="xs:string"
+ use="optional"
+ />
+ <xs:attribute
+ name="window"
+ type="xs:boolean"
+ use="optional"
+ />
+ <xs:attribute
+ name="home"
+ type="xs:string"
+ use="optional"
+ />
+ <xs:attribute
+ name="java-home"
+ type="xs:string"
+ use="optional"
+ />
+ <xs:attribute
+ name="configured-process-type"
+ type="xs:string"
+ use="optional"
+ />
+ <xs:attribute
+ name="configuration"
+ type="xs:string"
+ use="optional"
+ />
+ <xs:attribute
+ name="abstract"
+ type="xs:string"
+ use="optional"
+ />
+ <xs:attribute
+ name="inherit"
+ type="xs:string"
+ use="optional"
+ />
+ <xs:attribute
+ name="process-type"
+ type="xs:string"
+ use="optional"
+ />
+ </xs:complexType>
+ <xs:complexType name="nested-processType">
+ <xs:attribute
+ name="name"
+ type="xs:string"
+ use="required"
+ />
+ </xs:complexType>
+ <xs:complexType name="process-configType">
+ <xs:choice maxOccurs="unbounded">
+ <xs:element
+ maxOccurs="unbounded"
+ minOccurs="0"
+ name="process-type"
+ type="process-typeType"
+ />
+ <xs:element
+ maxOccurs="unbounded"
+ minOccurs="0"
+ name="configured-process-type"
+ type="configured-process-typeType"
+ />
+ <xs:element
+ maxOccurs="unbounded"
+ minOccurs="0"
+ name="exec-process-config"
+ type="exec-process-configType"
+ />
+ <xs:element
+ maxOccurs="unbounded"
+ minOccurs="0"
+ name="listener-process-config"
+ type="tch-agent-process-configType"
+ />
+ <xs:element
+ maxOccurs="unbounded"
+ minOccurs="0"
+ name="tch-agent"
+ type="tch-agent-process-configType"
+ />
+ <xs:element
+ maxOccurs="unbounded"
+ minOccurs="0"
+ name="tch-agent-process-config"
+ type="tch-agent-process-configType"
+ />
+ <xs:element
+ maxOccurs="unbounded"
+ minOccurs="0"
+ name="process"
+ type="processType"
+ />
+ </xs:choice>
+ </xs:complexType>
+ <xs:complexType name="process-typeType">
+ <xs:attribute
+ name="name"
+ type="xs:string"
+ use="required"
+ />
+ <xs:attribute
+ name="default-process-manager"
+ type="xs:string"
+ use="required"
+ />
+ <xs:attribute name="process-handler" use="required"/>
+ <xs:attribute
+ name="configuration-manager"
+ type="xs:string"
+ use="required"
+ />
+ <xs:attribute
+ name="xml-handler"
+ type="xs:string"
+ use="required"
+ />
+ <xs:attribute
+ name="root-config-tagname"
+ type="xs:string"
+ use="required"
+ />
+ </xs:complexType>
+ <xs:complexType name="varType">
+ <xs:attribute
+ name="name"
+ type="xs:string"
+ use="required"
+ />
+ <xs:attribute
+ name="value"
+ type="xs:string"
+ use="required"
+ />
+ </xs:complexType>
+ <xs:complexType name="propertyType">
+ <xs:attribute
+ name="name"
+ type="xs:string"
+ use="required"
+ />
+ <xs:attribute
+ name="value"
+ type="xs:string"
+ use="required"
+ />
+ </xs:complexType>
+</xs:schema>
Propchange: beehive/trunk/controls/test/tools/tch/deploy/schema/config.xsd
------------------------------------------------------------------------------
svn:eol-style = native