From 78da7fc1df9d1995512b2d08ff0bc11daf7cf220 Mon Sep 17 00:00:00 2001 From: "Rafael H. Schloming" Date: Wed, 3 Dec 2008 19:34:40 +0000 Subject: made ant build generate perftest scripts git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@723029 13f79535-47bb-0310-9956-ffa450edef68 --- java/common.xml | 20 +- java/common/build.xml | 20 +- java/common/jython-2.2-rc2.jar | Bin 1203486 -> 0 bytes java/common/jython-lib.jar | Bin 1570006 -> 0 bytes java/lib/jython-2.2-rc2.jar | Bin 0 -> 1203486 bytes java/lib/jython-lib.jar | Bin 0 -> 1570006 bytes java/perftests/build.xml | 12 ++ java/perftests/etc/perftests.log4j | 46 ++++ java/perftests/generate-scripts | 74 +++++++ java/perftests/scripts.xml | 307 +++++++++++++++++++++++++++ java/perftests/src/main/java/perftests.log4j | 45 ---- 11 files changed, 465 insertions(+), 59 deletions(-) delete mode 100644 java/common/jython-2.2-rc2.jar delete mode 100644 java/common/jython-lib.jar create mode 100644 java/lib/jython-2.2-rc2.jar create mode 100644 java/lib/jython-lib.jar create mode 100644 java/perftests/etc/perftests.log4j create mode 100644 java/perftests/generate-scripts create mode 100644 java/perftests/scripts.xml delete mode 100644 java/perftests/src/main/java/perftests.log4j (limited to 'java') diff --git a/java/common.xml b/java/common.xml index 4ba43503d4..9ca87b97ab 100644 --- a/java/common.xml +++ b/java/common.xml @@ -39,7 +39,7 @@ - + @@ -52,6 +52,7 @@ + @@ -61,7 +62,7 @@ - + @@ -89,6 +90,21 @@ + + + + + + + + + + + + + + + diff --git a/java/common/build.xml b/java/common/build.xml index 6172a680ec..dfe060cdef 100644 --- a/java/common/build.xml +++ b/java/common/build.xml @@ -28,7 +28,6 @@ - @@ -39,17 +38,14 @@ - - - - - - - - - - - + + + + + + + + diff --git a/java/common/jython-2.2-rc2.jar b/java/common/jython-2.2-rc2.jar deleted file mode 100644 index e25e2cb945..0000000000 Binary files a/java/common/jython-2.2-rc2.jar and /dev/null differ diff --git a/java/common/jython-lib.jar b/java/common/jython-lib.jar deleted file mode 100644 index bb3ba82db5..0000000000 Binary files a/java/common/jython-lib.jar and /dev/null differ diff --git a/java/lib/jython-2.2-rc2.jar b/java/lib/jython-2.2-rc2.jar new file mode 100644 index 0000000000..e25e2cb945 Binary files /dev/null and b/java/lib/jython-2.2-rc2.jar differ diff --git a/java/lib/jython-lib.jar b/java/lib/jython-lib.jar new file mode 100644 index 0000000000..bb3ba82db5 Binary files /dev/null and b/java/lib/jython-lib.jar differ diff --git a/java/perftests/build.xml b/java/perftests/build.xml index 0288ef691e..b38201f5da 100644 --- a/java/perftests/build.xml +++ b/java/perftests/build.xml @@ -30,11 +30,23 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/perftests/src/main/java/perftests.log4j b/java/perftests/src/main/java/perftests.log4j deleted file mode 100644 index 3bd8c201f8..0000000000 --- a/java/perftests/src/main/java/perftests.log4j +++ /dev/null @@ -1,45 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you 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. -# -log4j.rootLogger=${root.logging.level} - - -log4j.logger.org.apache.qpid=${amqj.logging.level}, console -log4j.additivity.org.apache.qpid=false - -log4j.logger.org.apache.qpid.requestreply=${amqj.test.logging.level} -log4j.logger.org.apache.qpid.pingpong=${amqj.test.logging.level} -log4j.logger.org.apache.qpid.ping=${amqj.test.logging.level} -log4j.logger.org.apache.qpid.topic=${amqj.test.logging.level} - - -log4j.logger.uk.co.thebadgerset.junit.extensions=${badger.level}, console -log4j.additivity.uk.co.thebadgerset.junit.extensions=false - -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.Threshold=all -log4j.appender.console.layout=org.apache.log4j.PatternLayout - -log4j.appender.console.layout.ConversionPattern=%t %d %p [%c{4}] %m%n -#log4j.appender.console.layout.ConversionPattern=%t %p [%c] %m%n - -log4j.appender.fileApp=org.apache.log4j.FileAppender -log4j.appender.fileApp.file=${log.dir}/perftests.volumetest.log -log4j.appender.fileApp.Threshold=info -log4j.appender.fileApp.append=false -log4j.appender.fileApp.layout=org.apache.log4j.PatternLayout -- cgit v1.2.1