You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by pm...@apache.org on 2007/09/05 23:44:26 UTC
svn commit: r573078 - in /geronimo/plugins/activemq/trunk: activemq-tomcat/
activemq-tomcat/pom.xml activemq-tomcat/src/main/plan/plan.xml pom.xml
Author: pmcmahan
Date: Wed Sep 5 14:44:26 2007
New Revision: 573078
URL: http://svn.apache.org/viewvc?rev=573078&view=rev
Log:
GERONIMO-3413 activemq console extension for tomcat
Added:
geronimo/plugins/activemq/trunk/activemq-tomcat/
- copied from r573077, geronimo/plugins/activemq/trunk/activemq-jetty/
Modified:
geronimo/plugins/activemq/trunk/activemq-tomcat/pom.xml
geronimo/plugins/activemq/trunk/activemq-tomcat/src/main/plan/plan.xml
geronimo/plugins/activemq/trunk/pom.xml
Modified: geronimo/plugins/activemq/trunk/activemq-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/activemq/trunk/activemq-tomcat/pom.xml?rev=573078&r1=573077&r2=573078&view=diff
==============================================================================
--- geronimo/plugins/activemq/trunk/activemq-tomcat/pom.xml (original)
+++ geronimo/plugins/activemq/trunk/activemq-tomcat/pom.xml Wed Sep 5 14:44:26 2007
@@ -30,8 +30,8 @@
</parent>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>activemq-jetty</artifactId>
- <name>ActiveMQ :: Configuration for Jetty</name>
+ <artifactId>activemq-tomcat</artifactId>
+ <name>ActiveMQ :: Configuration for Tomcat</name>
<packaging>car</packaging>
<dependencies>
@@ -113,7 +113,7 @@
<deploymentConfigs>
<deploymentConfig>${gbeanDeployer}</deploymentConfig>
<deploymentConfig>${j2eeDeployer}</deploymentConfig>
- <deploymentConfig>${jetty6Deployer}</deploymentConfig>
+ <deploymentConfig>${tomcatDeployer}</deploymentConfig>
<deploymentConfig>${jasperDeployer}</deploymentConfig>
</deploymentConfigs>
<module>
@@ -121,10 +121,10 @@
<artifactId>activemq-portlets</artifactId>
<type>war</type>
</module>
- <name>ActiveMQ -- Jetty</name>
+ <name>ActiveMQ -- Tomcat</name>
<category>Application</category>
<description>
- ActiveMQ for Jetty
+ ActiveMQ for Tomcat
</description>
<url>http://geronimo.apache.org/</url>
<author>The Apache Geronimo development community</author>
@@ -136,7 +136,7 @@
<obsoletes>
<moduleId>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>activemq-jetty</artifactId>
+ <artifactId>activemq-tomcat</artifactId>
</moduleId>
</obsoletes>
<dependencies>
@@ -215,13 +215,13 @@
<prerequisite>
<id>
<groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jetty6</artifactId>
+ <artifactId>tomcat6</artifactId>
</id>
<resource-type>Web Container</resource-type>
<description>
- This version of the plugin works with the Geronimo/Jetty distribution.
- It is not intended to run in the Geronimo/Tomcat distribution.
- There is a separate version of this plugin that works with Tomcat.
+ This version of the plugin works with the Geronimo/Tomcat distribution.
+ It is not intended to run in the Geronimo/Jetty distribution.
+ There is a separate version of this plugin that works with Jetty.
Please install the version appropriate to your Geronimo distribution.
</description>
</prerequisite>
Modified: geronimo/plugins/activemq/trunk/activemq-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/activemq/trunk/activemq-tomcat/src/main/plan/plan.xml?rev=573078&r1=573077&r2=573078&view=diff
==============================================================================
--- geronimo/plugins/activemq/trunk/activemq-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/plugins/activemq/trunk/activemq-tomcat/src/main/plan/plan.xml Wed Sep 5 14:44:26 2007
@@ -16,7 +16,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2">
<!-- This is where the files are accessed from. (aka - portletContext) -->
<context-root>/activemq</context-root>
@@ -29,6 +29,7 @@
</role>
</role-mappings>
</security>
+ <cross-context/>
<gbean name="JMSServerManager" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
<attribute name="pageTitle">Server/JMS Server</attribute>
Modified: geronimo/plugins/activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/activemq/trunk/pom.xml?rev=573078&r1=573077&r2=573078&view=diff
==============================================================================
--- geronimo/plugins/activemq/trunk/pom.xml (original)
+++ geronimo/plugins/activemq/trunk/pom.xml Wed Sep 5 14:44:26 2007
@@ -30,7 +30,7 @@
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>activemq</artifactId>
- <name>ActiveMQ management plugin</name>
+ <name>ActiveMQ</name>
<packaging>pom</packaging>
<version>1.0-SNAPSHOT</version>
@@ -337,9 +337,7 @@
<modules>
<module>activemq-portlets</module>
-<!--
<module>activemq-tomcat</module>
--->
<module>activemq-jetty</module>
</modules>
</profile>