This is an automated email from the ASF dual-hosted git repository. jgallimore pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomee.git
The following commit(s) were added to refs/heads/master by this push: new c5e606b Pulling The Grinder as I'm not sure it fits with the ASL c5e606b is described below commit c5e606ba4ed4d3b98eed9a5b0356be22c00d89c6 Author: Jonathan Gallimore <j...@jrg.me.uk> AuthorDate: Fri Dec 6 17:20:02 2019 +0000 Pulling The Grinder as I'm not sure it fits with the ASL --- examples/xa-datasource/grinder.sh | 28 -- examples/xa-datasource/pom.xml | 286 --------------------- examples/xa-datasource/src/assembly/tests.xml | 50 ---- .../test/java/org/superbiz/perf/DBTestPerf.java | 56 ---- .../xa-datasource/src/test/resources/grinder.py | 18 -- 5 files changed, 438 deletions(-) diff --git a/examples/xa-datasource/grinder.sh b/examples/xa-datasource/grinder.sh deleted file mode 100755 index 4f18701..0000000 --- a/examples/xa-datasource/grinder.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -# -# Prior to running this script, start TomEE with: -# mvn clean install tomee:run -# -TESTS=$(ls $PWD/target/*-tests.jar) -PROPERTIES=$PWD/target/grinder.properties -echo " -grinder.script $PWD/target/test-classes/grinder.py -grinder.processes 1 -grinder.threads 2 -grinder.runs 0 -grinder.jvm.classpath $TESTS -grinder.logDirectory $PWD/target/logs -grinder.numberOfOldLogs 0 -" > $PROPERTIES - - -( -cd $(dirname "$0")/grinder/ -java -cp grinder.jar net.grinder.Console & -sleep 10 -) -( -cd $(dirname "$0")/grinder/ -java -cp grinder.jar net.grinder.Grinder $PROPERTIES -) \ No newline at end of file diff --git a/examples/xa-datasource/pom.xml b/examples/xa-datasource/pom.xml index 9105a9c..dcf66dd 100644 --- a/examples/xa-datasource/pom.xml +++ b/examples/xa-datasource/pom.xml @@ -55,292 +55,6 @@ </plugin> <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>make-assembly</id> - <!-- this is used for inheritance merges --> - <phase>package</phase> - <!-- bind to the packaging phase --> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - <configuration> - <descriptors> - <descriptor>src/assembly/tests.xml</descriptor> - </descriptors> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>2.10</version> - <executions> - <execution> - <id>copy-grinder-libs</id> - <phase>process-test-resources</phase> - <configuration> - <artifactItems> - <artifactItem> - <groupId>net.sf.grinder</groupId> - <artifactId>grinder</artifactId> - <version>3.11</version> - <destFileName>grinder.jar</destFileName> - </artifactItem> - <artifactItem> - <groupId>net.sf.grinder</groupId> - <artifactId>grinder-dcr-agent</artifactId> - <version>3.11</version> - </artifactItem> - <artifactItem> - <groupId>net.sf.grinder</groupId> - <artifactId>grinder-http</artifactId> - <version>3.11</version> - </artifactItem> - <artifactItem> - <groupId>net.sf.grinder</groupId> - <artifactId>grinder-core</artifactId> - <version>3.11</version> - </artifactItem> - <artifactItem> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>1.6.4</version> - </artifactItem> - <artifactItem> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jdk14</artifactId> - <version>1.6.4</version> - </artifactItem> - <artifactItem> - <groupId>asm</groupId> - <artifactId>asm</artifactId> - <version>3.2</version> - </artifactItem> - <artifactItem> - <groupId>org.picocontainer</groupId> - <artifactId>picocontainer</artifactId> - <version>2.13.6</version> - </artifactItem> - <artifactItem> - <groupId>org.python</groupId> - <artifactId>jython-standalone</artifactId> - <version>2.5.3</version> - </artifactItem> - <artifactItem> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - <version>1.0.0</version> - </artifactItem> - <artifactItem> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-core</artifactId> - <version>1.0.0</version> - </artifactItem> - <artifactItem> - <groupId>net.sf.grinder</groupId> - <artifactId>grinder-httpclient</artifactId> - <version>3.11</version> - </artifactItem> - <artifactItem> - <groupId>net.sf.grinder</groupId> - <artifactId>grinder-xmlbeans</artifactId> - <version>3.11</version> - </artifactItem> - <artifactItem> - <groupId>javax.xml</groupId> - <artifactId>jsr173</artifactId> - <version>1.0</version> - </artifactItem> - <artifactItem> - <groupId>org.apache.xmlbeans</groupId> - <artifactId>xmlbeans</artifactId> - <version>2.5.0</version> - </artifactItem> - <artifactItem> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - <version>1.0.1</version> - </artifactItem> - <artifactItem> - <groupId>net.sf.grinder</groupId> - <artifactId>grinder-console-service</artifactId> - <version>3.11</version> - </artifactItem> - <artifactItem> - <groupId>org.clojure</groupId> - <artifactId>clojure</artifactId> - <version>1.4.0</version> - </artifactItem> - <artifactItem> - <groupId>org.clojure</groupId> - <artifactId>tools.logging</artifactId> - <version>0.2.3</version> - </artifactItem> - <artifactItem> - <groupId>ring</groupId> - <artifactId>ring-core</artifactId> - <version>1.1.0</version> - </artifactItem> - <artifactItem> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>2.1</version> - </artifactItem> - <artifactItem> - <groupId>commons-codec</groupId> - <artifactId>commons-codec</artifactId> - <version>1.6</version> - </artifactItem> - <artifactItem> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - <version>1.2.1</version> - </artifactItem> - <artifactItem> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - </artifactItem> - <artifactItem> - <groupId>clj-time</groupId> - <artifactId>clj-time</artifactId> - <version>0.3.7</version> - </artifactItem> - <artifactItem> - <groupId>joda-time</groupId> - <artifactId>joda-time</artifactId> - <version>2.0</version> - </artifactItem> - <artifactItem> - <groupId>ring</groupId> - <artifactId>ring-jetty-adapter</artifactId> - <version>1.1.0</version> - </artifactItem> - <artifactItem> - <groupId>ring</groupId> - <artifactId>ring-servlet</artifactId> - <version>1.1.0</version> - </artifactItem> - <artifactItem> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-server</artifactId> - <version>7.6.1.v20120215</version> - </artifactItem> - <artifactItem> - <groupId>org.eclipse.jetty.orbit</groupId> - <artifactId>javax.servlet</artifactId> - <version>2.5.0.v201103041518</version> - </artifactItem> - <artifactItem> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-continuation</artifactId> - <version>7.6.1.v20120215</version> - </artifactItem> - <artifactItem> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-http</artifactId> - <version>7.6.1.v20120215</version> - </artifactItem> - <artifactItem> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-io</artifactId> - <version>7.6.1.v20120215</version> - </artifactItem> - <artifactItem> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-util</artifactId> - <version>7.6.1.v20120215</version> - </artifactItem> - <artifactItem> - <groupId>ring-middleware-format</groupId> - <artifactId>ring-middleware-format</artifactId> - <version>0.2.0</version> - </artifactItem> - <artifactItem> - <groupId>org.clojure</groupId> - <artifactId>core.memoize</artifactId> - <version>0.5.1</version> - </artifactItem> - <artifactItem> - <groupId>org.clojure</groupId> - <artifactId>core.cache</artifactId> - <version>0.5.0</version> - </artifactItem> - <artifactItem> - <groupId>cheshire</groupId> - <artifactId>cheshire</artifactId> - <version>4.0.0</version> - </artifactItem> - <artifactItem> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-core</artifactId> - <version>2.0.0</version> - </artifactItem> - <artifactItem> - <groupId>com.fasterxml.jackson.dataformat</groupId> - <artifactId>jackson-dataformat-smile</artifactId> - <version>2.0.0</version> - </artifactItem> - <artifactItem> - <groupId>clj-yaml</groupId> - <artifactId>clj-yaml</artifactId> - <version>0.3.1</version> - </artifactItem> - <artifactItem> - <groupId>org.yaml</groupId> - <artifactId>snakeyaml</artifactId> - <version>1.5</version> - </artifactItem> - <artifactItem> - <groupId>compojure</groupId> - <artifactId>compojure</artifactId> - <version>1.0.4</version> - </artifactItem> - <artifactItem> - <groupId>org.clojure</groupId> - <artifactId>core.incubator</artifactId> - <version>0.1.0</version> - </artifactItem> - <artifactItem> - <groupId>org.clojure</groupId> - <artifactId>tools.macro</artifactId> - <version>0.1.0</version> - </artifactItem> - <artifactItem> - <groupId>clout</groupId> - <artifactId>clout</artifactId> - <version>1.0.1</version> - </artifactItem> - <artifactItem> - <groupId>clj-stacktrace</groupId> - <artifactId>clj-stacktrace</artifactId> - <version>0.2.4</version> - </artifactItem> - <artifactItem> - <groupId>net.sf.grinder</groupId> - <artifactId>grinder-swing-console</artifactId> - <version>3.11</version> - </artifactItem> - <artifactItem> - <groupId>net.sf.jedit-syntax</groupId> - <artifactId>jedit-syntax</artifactId> - <version>2.2.2</version> - </artifactItem> - </artifactItems> - <outputDirectory> - ${project.basedir}/grinder - </outputDirectory> - </configuration> - <goals> - <goal>copy</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.apache.tomee.maven</groupId> <artifactId>tomee-maven-plugin</artifactId> <version>${tomee.version}</version> diff --git a/examples/xa-datasource/src/assembly/tests.xml b/examples/xa-datasource/src/assembly/tests.xml deleted file mode 100644 index df5a6a5..0000000 --- a/examples/xa-datasource/src/assembly/tests.xml +++ /dev/null @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - 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. ---> - -<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd"> - <!-- TODO: a jarjar format would be better --> - <id>tests</id> - <formats> - <format>jar</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - <dependencySets> - <dependencySet> - <outputDirectory>/</outputDirectory> - <useProjectArtifact>true</useProjectArtifact> - <unpack>true</unpack> - <scope>test</scope> - <excludes> - <exclude>org.apache.cxf*:*</exclude> - <exclude>org.apache.openejb*:*</exclude> - <exclude>org.apache.openjpa*:*</exclude> - <exclude>org.apache.openwebbeans*:*</exclude> - <exclude>org.apache.xbean*:*</exclude> - <exclude>org.apache.myfaces*:*</exclude> - <exclude>org.apache.tomcat*:*</exclude> - <exclude>org.hsqldb:*</exclude> - <exclude>org.jboss.*:*</exclude> - <exclude>org.eclipse*:*</exclude> - <exclude>org.codehaus*:*</exclude> - <exclude>com.sun*:*</exclude> - </excludes> - </dependencySet> - </dependencySets> -</assembly> diff --git a/examples/xa-datasource/src/test/java/org/superbiz/perf/DBTestPerf.java b/examples/xa-datasource/src/test/java/org/superbiz/perf/DBTestPerf.java deleted file mode 100644 index 83cc09c..0000000 --- a/examples/xa-datasource/src/test/java/org/superbiz/perf/DBTestPerf.java +++ /dev/null @@ -1,56 +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. - */ -package org.superbiz.perf; - -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.impl.client.CloseableHttpClient; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.impl.conn.PoolingHttpClientConnectionManager; -import org.junit.Assert; -import org.tomitribe.util.IO; - -import java.net.URI; - -public class DBTestPerf extends Assert { - - private final CloseableHttpClient httpClient; - private final URI webappUri; - - public DBTestPerf(String webappUrl) { - System.out.println("Hello"); - webappUri = URI.create(webappUrl); - PoolingHttpClientConnectionManager cm = new PoolingHttpClientConnectionManager(); - cm.setMaxTotal(200); - cm.setDefaultMaxPerRoute(200); - httpClient = HttpClients.custom() - .setConnectionManager(cm) - .build(); - } - - public void get() throws Exception { - { - final HttpGet get = new HttpGet(webappUri.resolve("dbtest/list")); - try (CloseableHttpResponse response = httpClient.execute(get)) { - IO.slurp(response.getEntity().getContent()); - assertEquals(200, response.getStatusLine().getStatusCode()); - } - - } - } - -} diff --git a/examples/xa-datasource/src/test/resources/grinder.py b/examples/xa-datasource/src/test/resources/grinder.py deleted file mode 100644 index 14850d7..0000000 --- a/examples/xa-datasource/src/test/resources/grinder.py +++ /dev/null @@ -1,18 +0,0 @@ -from net.grinder.script.Grinder import grinder -from net.grinder.script import Test -from org.superbiz.perf import DBTestPerf - -tests = { - "get" : Test(1, "get") - } - -loadBean = DBTestPerf("http://localhost:9080/") -get = tests["get"].wrap(loadBean) - -# A TestRunner instance is created for each thread. It can be used to -# store thread-specific data. -class TestRunner: - - # This method is called for every run. - def __call__(self): - get.get()