From 11e6f88ded46e709e94012b81a10861bdd76fc26 Mon Sep 17 00:00:00 2001
From: Claus Ibsen <davsclaus@apache.org>
Date: Thu, 20 Sep 2012 08:45:34 +0000
Subject: [PATCH] Polished

git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@1387909 13f79535-47bb-0310-9956-ffa450edef68
---
 activemq-web-console/README.txt               |  4 +--
 activemq-web-console/pom.xml                  | 29 ++++---------------
 .../src/main/webapp/WEB-INF/activemq.xml      |  8 ++---
 3 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/activemq-web-console/README.txt b/activemq-web-console/README.txt
index 44dfc71bda..7b69ed678c 100755
--- a/activemq-web-console/README.txt
+++ b/activemq-web-console/README.txt
@@ -1,8 +1,8 @@
 
 Welcome to the ActiveMQ Web Console
 
-To run the console you must install a recent distro of Maven
-such as version 2.0.4 or later
+To run the console you must install a recent distro of Apache Maven
+such as version 3.0.4 or later
 	
 		http://maven.apache.org/
 
diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml
index 13f171251c..0db618e45d 100755
--- a/activemq-web-console/pom.xml
+++ b/activemq-web-console/pom.xml
@@ -30,7 +30,11 @@
   <name>ActiveMQ :: Web Console</name>
   <description>Web Console for ActiveMQ</description>
 
-  <build>
+	<properties>
+		<jetty.port>8080</jetty.port>
+	</properties>
+
+	<build>
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -239,20 +243,6 @@
       <version>3.1.1</version>
     </dependency>
 
-    <!-- enable commons-logging when inside jetty6:run -->
-    <!--
-    <dependency>
-        <groupId>org.slf4j</groupId>
-        <artifactId>jcl104-over-slf4j</artifactId>
-        <version>1.5.0</version>
-    </dependency>
-    -->
-    <!--
-        <dependency>
-          <groupId>org.slf4j</groupId>
-          <artifactId>slf4j-jcl</artifactId>
-        </dependency>
-    -->
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
@@ -310,13 +300,4 @@
     </dependency>
   </dependencies>
 
-  <properties>
-    <jetty.port>8080</jetty.port>
-<!--      <activemq.osgi.dynamic.import>
-        javax.naming,
-        org.xml.*,
-        javax.xml.*,
-        org.w3c.*,
-    </activemq.osgi.dynamic.import> -->
-  </properties>
 </project>
diff --git a/activemq-web-console/src/main/webapp/WEB-INF/activemq.xml b/activemq-web-console/src/main/webapp/WEB-INF/activemq.xml
index b883a83337..4baf3b5206 100755
--- a/activemq-web-console/src/main/webapp/WEB-INF/activemq.xml
+++ b/activemq-web-console/src/main/webapp/WEB-INF/activemq.xml
@@ -20,10 +20,10 @@
   xmlns:amq="http://activemq.apache.org/schema/core"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xmlns:osgi="http://www.springframework.org/schema/osgi"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd
-  http://activemq.apache.org/camel/schema/spring http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
-  http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
+  xsi:schemaLocation="
+    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+    http://activemq.apache.org/schema/core http://activemq.apache.org/schema/core/activemq-core.xsd
+    http://www.springframework.org/schema/osgi http://www.springframework.org/schema/osgi/spring-osgi.xsd">
 
 
   <broker brokerName="web-console" useJmx="true" xmlns="http://activemq.apache.org/schema/core">