From baac9e7e9a03f9142a788bf98b96012e54dfdf32 Mon Sep 17 00:00:00 2001 From: "Timothy A. Bish" Date: Fri, 14 Oct 2011 13:40:49 +0000 Subject: [PATCH] fix for: https://issues.apache.org/jira/browse/AMQ-1132 Remove the dependency on the ActiveIO test.jar. git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1183359 13f79535-47bb-0310-9956-ffa450edef68 --- activemq-core/pom.xml | 6 -- .../kaha/impl/async/JournalPerfTool.java | 81 ------------------- .../kaha/impl/async/JournalRWPerfTool.java | 81 ------------------- 3 files changed, 168 deletions(-) delete mode 100644 activemq-core/src/test/java/org/apache/activemq/kaha/impl/async/JournalPerfTool.java delete mode 100644 activemq-core/src/test/java/org/apache/activemq/kaha/impl/async/JournalRWPerfTool.java diff --git a/activemq-core/pom.xml b/activemq-core/pom.xml index 27f98cf793..7ee99563cd 100755 --- a/activemq-core/pom.xml +++ b/activemq-core/pom.xml @@ -194,12 +194,6 @@ log4j test - - ${project.groupId} - activeio-core - false - test-jar - org.springframework spring-jms diff --git a/activemq-core/src/test/java/org/apache/activemq/kaha/impl/async/JournalPerfTool.java b/activemq-core/src/test/java/org/apache/activemq/kaha/impl/async/JournalPerfTool.java deleted file mode 100644 index 590fcdeae7..0000000000 --- a/activemq-core/src/test/java/org/apache/activemq/kaha/impl/async/JournalPerfTool.java +++ /dev/null @@ -1,81 +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.apache.activemq.kaha.impl.async; - -import java.io.File; -import java.io.IOException; - -import org.apache.activeio.journal.Journal; -import org.apache.activeio.journal.JournalPerfToolSupport; - -/** - * A Performance statistics gathering tool for the AsyncDataManager based - * Journal. - * - * - */ -public class JournalPerfTool extends JournalPerfToolSupport { - - private int logFileSize = 1024 * 1024 * 50; - - public static void main(String[] args) throws Exception { - JournalPerfTool tool = new JournalPerfTool(); - - tool.initialWorkers = 10; - tool.syncFrequency = 15; - tool.workerIncrement = 0; - tool.workerThinkTime = 0; - tool.verbose = false; - tool.incrementDelay = 5 * 1000; - - if (args.length > 0) { - tool.journalDirectory = new File(args[0]); - } - if (args.length > 1) { - tool.workerIncrement = Integer.parseInt(args[1]); - } - if (args.length > 2) { - tool.incrementDelay = Long.parseLong(args[2]); - } - if (args.length > 3) { - tool.verbose = Boolean.getBoolean(args[3]); - } - if (args.length > 4) { - tool.recordSize = Integer.parseInt(args[4]); - } - if (args.length > 5) { - tool.syncFrequency = Integer.parseInt(args[5]); - } - if (args.length > 6) { - tool.workerThinkTime = Integer.parseInt(args[6]); - } - tool.exec(); - } - - /** - * @throws IOException - * @see org.apache.activeio.journal.JournalPerfToolSupport#createJournal() - */ - public Journal createJournal() throws IOException { - AsyncDataManager dm = new AsyncDataManager(); - dm.setMaxFileLength(logFileSize); - dm.setDirectory(this.journalDirectory); - dm.start(); - return new JournalFacade(dm); - } - -} diff --git a/activemq-core/src/test/java/org/apache/activemq/kaha/impl/async/JournalRWPerfTool.java b/activemq-core/src/test/java/org/apache/activemq/kaha/impl/async/JournalRWPerfTool.java deleted file mode 100644 index 16e859b9c2..0000000000 --- a/activemq-core/src/test/java/org/apache/activemq/kaha/impl/async/JournalRWPerfTool.java +++ /dev/null @@ -1,81 +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.apache.activemq.kaha.impl.async; - -import java.io.File; -import java.io.IOException; - -import org.apache.activeio.journal.Journal; -import org.apache.activeio.journal.JournalRWPerfToolSupport; - -/** - * A Performance statistics gathering tool for the AsyncDataManager based - * Journal. - * - * - */ -public class JournalRWPerfTool extends JournalRWPerfToolSupport { - - private int logFileSize = 1024 * 1024 * 50; - - public static void main(String[] args) throws Exception { - JournalRWPerfTool tool = new JournalRWPerfTool(); - - tool.initialWriteWorkers = 10; - tool.syncFrequency = 15; - tool.writeWorkerIncrement = 0; - tool.writeWorkerThinkTime = 0; - tool.verbose = false; - tool.incrementDelay = 5 * 1000; - - if (args.length > 0) { - tool.journalDirectory = new File(args[0]); - } - if (args.length > 1) { - tool.writeWorkerIncrement = Integer.parseInt(args[1]); - } - if (args.length > 2) { - tool.incrementDelay = Long.parseLong(args[2]); - } - if (args.length > 3) { - tool.verbose = Boolean.getBoolean(args[3]); - } - if (args.length > 4) { - tool.recordSize = Integer.parseInt(args[4]); - } - if (args.length > 5) { - tool.syncFrequency = Integer.parseInt(args[5]); - } - if (args.length > 6) { - tool.writeWorkerThinkTime = Integer.parseInt(args[6]); - } - tool.exec(); - } - - /** - * @throws IOException - * @see org.apache.activeio.journal.JournalPerfToolSupport#createJournal() - */ - public Journal createJournal() throws IOException { - AsyncDataManager dm = new AsyncDataManager(); - dm.setMaxFileLength(logFileSize); - dm.setDirectory(this.journalDirectory); - dm.start(); - return new JournalFacade(dm); - } - -}