From 2f3f48e7d4cb6aa4c8743e3792421f3f16705728 Mon Sep 17 00:00:00 2001
From: Bosanac Dejan <dejanb@apache.org>
Date: Thu, 6 May 2010 10:55:26 +0000
Subject: [PATCH] https://issues.apache.org/activemq/browse/AMQ-1547 - this
 test should be in activemq-web-demo module

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@941656 13f79535-47bb-0310-9956-ffa450edef68
---
 .../org/apache/activemq/web/JettyServer.java  | 81 -------------------
 .../src/test/resources/log4j.properties       | 35 --------
 2 files changed, 116 deletions(-)
 delete mode 100644 activemq-web/src/test/java/org/apache/activemq/web/JettyServer.java
 delete mode 100755 activemq-web/src/test/resources/log4j.properties

diff --git a/activemq-web/src/test/java/org/apache/activemq/web/JettyServer.java b/activemq-web/src/test/java/org/apache/activemq/web/JettyServer.java
deleted file mode 100644
index 2479f08a5e..0000000000
--- a/activemq-web/src/test/java/org/apache/activemq/web/JettyServer.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.web;
-
-import org.apache.activemq.broker.BrokerService;
-import org.apache.activemq.demo.DefaultQueueSender;
-import org.eclipse.jetty.server.Connector;
-import org.eclipse.jetty.server.Handler;
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.server.nio.SelectChannelConnector;
-import org.eclipse.jetty.webapp.WebAppContext;
-
-/**
- * A simple bootstrap class for starting Jetty in your IDE using the local web
- * application.
- * 
- * @version $Revision$
- */
-public final class JettyServer {
-
-    public static final int PORT = 8080;
-
-    public static final String WEBAPP_DIR = "src/main/webapp";
-
-    public static final String WEBAPP_CTX = "/";
-
-    private JettyServer() {
-    }
-
-    public static void main(String[] args) throws Exception {
-        // lets create a broker
-        BrokerService broker = new BrokerService();
-        broker.setPersistent(false);
-        broker.setUseJmx(true);
-        broker.addConnector("tcp://localhost:61616");
-        broker.addConnector("stomp://localhost:61613");
-        broker.start();
-
-        // lets publish some messages so that there is some stuff to browse
-        DefaultQueueSender.main(new String[] {
-            "FOO.BAR"
-        });
-
-        // now lets start the web server
-        int port = PORT;
-        if (args.length > 0) {
-            String text = args[0];
-            port = Integer.parseInt(text);
-        }
-        System.out.println("Starting Web Server on port: " + port);
-        Server server = new Server();
-        SelectChannelConnector connector = new SelectChannelConnector();
-        connector.setPort(port);
-        connector.setServer(server);
-        WebAppContext context = new WebAppContext();
-
-        context.setResourceBase(WEBAPP_DIR);
-        context.setContextPath(WEBAPP_CTX);
-        context.setServer(server);
-        server.setHandler(context);
-        server.setConnectors(new Connector[] {
-            connector
-        });
-        server.start();
-    }
-}
diff --git a/activemq-web/src/test/resources/log4j.properties b/activemq-web/src/test/resources/log4j.properties
deleted file mode 100755
index 60bf691980..0000000000
--- a/activemq-web/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,35 +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.
-## ---------------------------------------------------------------------------
-
-#
-# The logging properties used during tests..
-#
-log4j.rootLogger=INFO, out
-
-log4j.logger.org.apache.activemq.spring=WARN
-
-# CONSOLE appender not used by default
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-
-# File appender
-log4j.appender.out=org.apache.log4j.FileAppender
-log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
-log4j.appender.out.file=target/test-reports/activemq-test.log
-log4j.appender.out.append=true