You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by da...@apache.org on 2012/09/20 10:45:34 UTC
svn commit: r1387909 - in /activemq/trunk/activemq-web-console: README.txt
pom.xml src/main/webapp/WEB-INF/activemq.xml
Author: davsclaus
Date: Thu Sep 20 08:45:34 2012
New Revision: 1387909
URL: http://svn.apache.org/viewvc?rev=1387909&view=rev
Log:
Polished
Modified:
activemq/trunk/activemq-web-console/README.txt
activemq/trunk/activemq-web-console/pom.xml
activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/activemq.xml
Modified: activemq/trunk/activemq-web-console/README.txt
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/README.txt?rev=1387909&r1=1387908&r2=1387909&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/README.txt (original)
+++ activemq/trunk/activemq-web-console/README.txt Thu Sep 20 08:45:34 2012
@@ -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/
Modified: activemq/trunk/activemq-web-console/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/pom.xml?rev=1387909&r1=1387908&r2=1387909&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/pom.xml (original)
+++ activemq/trunk/activemq-web-console/pom.xml Thu Sep 20 08:45:34 2012
@@ -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>
Modified: activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/activemq.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/activemq.xml?rev=1387909&r1=1387908&r2=1387909&view=diff
==============================================================================
--- activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/activemq.xml (original)
+++ activemq/trunk/activemq-web-console/src/main/webapp/WEB-INF/activemq.xml Thu Sep 20 08:45:34 2012
@@ -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">