geronimo-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From David Jencks <david_jen...@yahoo.com>
Subject Re: svn commit: r749122 - in /geronimo/server/trunk/plugins/activemq: ./ activemq-portlets/ activemq-server/ activemq-webconsole-jetty/ activemq-webconsole-jetty/src/ activemq-webconsole-jetty/src/main/ activemq-webconsole-jetty/src/main/history/ act
Date Mon, 02 Mar 2009 08:09:37 GMT
I think I got the license headers, I'll work on pruning dependencies  
shortly.

thanks for picking this up!
david jencks

On Mar 1, 2009, at 10:17 PM, Jarek Gawor wrote:

> David,
>
> Looks like some pom.xml files are missing license headers and the
> commons-api* dependencies are unnecessary.
>
> Jarek
>
> On Sun, Mar 1, 2009 at 4:52 PM,  <djencks@apache.org> wrote:
>> Author: djencks
>> Date: Sun Mar  1 21:52:41 2009
>> New Revision: 749122
>>
>> URL: http://svn.apache.org/viewvc?rev=749122&view=rev
>> Log:
>> GERONIMO-4560 run the activemq web console on geronimo
>>
>> Added:
>>    geronimo/server/trunk/plugins/activemq/activemq-webconsole/
>>    geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/
>>    geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/ 
>> pom.xml   (with props)
>>    geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/ 
>> src/
>>    geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/ 
>> src/main/
>>    geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/ 
>> src/main/history/
>>    geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/ 
>> src/main/history/dependencies.xml   (with props)
>>    geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/ 
>> src/main/plan/
>>    geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/ 
>> src/main/plan/plan.xml   (with props)
>>    geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/
>>    geronimo/server/trunk/plugins/activemq/activemq-webconsole- 
>> tomcat/pom.xml
>>    geronimo/server/trunk/plugins/activemq/activemq-webconsole- 
>> tomcat/src/
>>    geronimo/server/trunk/plugins/activemq/activemq-webconsole- 
>> tomcat/src/main/
>>    geronimo/server/trunk/plugins/activemq/activemq-webconsole- 
>> tomcat/src/main/history/
>>    geronimo/server/trunk/plugins/activemq/activemq-webconsole- 
>> tomcat/src/main/history/dependencies.xml
>>    geronimo/server/trunk/plugins/activemq/activemq-webconsole- 
>> tomcat/src/main/plan/
>>    geronimo/server/trunk/plugins/activemq/activemq-webconsole- 
>> tomcat/src/main/plan/plan.xml
>>    geronimo/server/trunk/plugins/activemq/activemq-webconsole/ 
>> pom.xml   (with props)
>> Modified:
>>    geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml
>>    geronimo/server/trunk/plugins/activemq/activemq-server/pom.xml
>>    geronimo/server/trunk/plugins/activemq/pom.xml
>>
>> Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/ 
>> pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml?rev=749122&r1=749121&r2=749122&view=diff
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> =====================================================================
>> --- geronimo/server/trunk/plugins/activemq/activemq-portlets/ 
>> pom.xml (original)
>> +++ geronimo/server/trunk/plugins/activemq/activemq-portlets/ 
>> pom.xml Sun Mar  1 21:52:41 2009
>> @@ -1,22 +1,12 @@
>>  <?xml version="1.0" encoding="UTF-8"?>
>> -<!--
>> -    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.
>> --->
>> +    <!--
>> +        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.
>> +    -->
>>
>> -<!-- $Rev$ $Date$ -->
>> +    <!-- $Rev$ $Date$ -->
>>
>>  <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance 
>> " xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd 
>> ">
>>
>> @@ -126,6 +116,14 @@
>>             <plugin>
>>                 <groupId>org.apache.maven.plugins</groupId>
>>                 <artifactId>maven-war-plugin</artifactId>
>> +                <configuration>
>> +                    <webXml>${project.build.directory}/jspweb.xml</ 
>> webXml>
>> +                    <archiveClasses>true</archiveClasses>
>> +                    <archive>
>> +                        <!-- Do not include META-INF/maven to  
>> avoid long file problems on windows -->
>> +                        <addMavenDescriptor>false</ 
>> addMavenDescriptor>
>> +                    </archive>
>> +                </configuration>
>>             </plugin>
>>         </plugins>
>>     </build>
>>
>> Modified: geronimo/server/trunk/plugins/activemq/activemq-server/ 
>> pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-server/pom.xml?rev=749122&r1=749121&r2=749122&view=diff
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> =====================================================================
>> --- geronimo/server/trunk/plugins/activemq/activemq-server/pom.xml  
>> (original)
>> +++ geronimo/server/trunk/plugins/activemq/activemq-server/pom.xml  
>> Sun Mar  1 21:52:41 2009
>> @@ -56,6 +56,12 @@
>>             <version>${geronimoVersion}</version>
>>             <type>car</type>
>>         </dependency>
>> +        <dependency>
>> +            <groupId>org.apache.geronimo.plugins</groupId>
>> +            <artifactId>activemq-webconsole-jetty</artifactId>
>> +            <version>${geronimoVersion}</version>
>> +            <type>car</type>
>> +        </dependency>
>>     </dependencies>
>>
>>     <build>
>>
>> Added: geronimo/server/trunk/plugins/activemq/activemq-webconsole- 
>> jetty/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/pom.xml?rev=749122&view=auto
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> =====================================================================
>> --- geronimo/server/trunk/plugins/activemq/activemq-webconsole- 
>> jetty/pom.xml (added)
>> +++ geronimo/server/trunk/plugins/activemq/activemq-webconsole- 
>> jetty/pom.xml Sun Mar  1 21:52:41 2009
>> @@ -0,0 +1,129 @@
>> +<?xml version="1.0" encoding="UTF-8"?>
>> +<project>
>> +    <parent>
>> +        <artifactId>activemq</artifactId>
>> +        <groupId>org.apache.geronimo.plugins
>> +               </groupId>
>> +        <version>2.2-SNAPSHOT</version>
>> +    </parent>
>> +    <modelVersion>4.0.0</modelVersion>
>> +    <artifactId>activemq-webconsole-jetty</artifactId>
>> +    <name>ActiveMQ web console on Jetty</name>
>> +    <packaging>car</packaging>
>> +
>> +    <dependencies>
>> +        <dependency>
>> +            <groupId>org.apache.geronimo.framework</groupId>
>> +            <artifactId>geronimo-gbean-deployer
>> +                       </artifactId>
>> +            <version>${geronimoVersion}</version>
>> +            <type>car</type>
>> +            <scope>provided</scope>
>> +        </dependency>
>> +
>> +        <dependency>
>> +            <groupId>org.apache.geronimo.configs</groupId>
>> +            <artifactId>j2ee-deployer</artifactId>
>> +            <version>${geronimoVersion}</version>
>> +            <type>car</type>
>> +            <scope>provided</scope>
>> +        </dependency>
>> +
>> +        <dependency>
>> +            <groupId>org.apache.geronimo.configs</groupId>
>> +            <artifactId>${jetty}-deployer</artifactId>
>> +            <version>${geronimoVersion}</version>
>> +            <type>car</type>
>> +            <scope>provided</scope>
>> +        </dependency>
>> +        <dependency>
>> +            <groupId>org.apache.geronimo.configs</groupId>
>> +            <artifactId>jasper-deployer</artifactId>
>> +            <version>${geronimoVersion}</version>
>> +            <type>car</type>
>> +            <scope>provided</scope>
>> +        </dependency>
>> +
>> +        <!--
>> +                       should be added by deployers but isn't into  
>> geronimo-plugin.xml
>> +               -->
>> +        <dependency>
>> +            <groupId>org.apache.geronimo.configs</groupId>
>> +            <artifactId>${jetty}</artifactId>
>> +            <version>${geronimoVersion}</version>
>> +            <type>car</type>
>> +        </dependency>
>> +
>> +        <dependency>
>> +            <groupId>org.apache.geronimo.configs</groupId>
>> +            <artifactId>jasper</artifactId>
>> +            <version>${geronimoVersion}</version>
>> +            <type>car</type>
>> +        </dependency>
>> +
>> +        <dependency>
>> +            <groupId>org.apache.geronimo.configs</groupId>
>> +            <artifactId>activemq-broker</artifactId>
>> +            <version>${geronimoVersion}</version>
>> +            <type>car</type>
>> +        </dependency>
>> +
>> +        <dependency>
>> +            <groupId>org.apache.geronimo.plugins</groupId>
>> +            <artifactId>activemq-webconsole</artifactId>
>> +            <version>${geronimoVersion}</version>
>> +            <type>war</type>
>> +        </dependency>
>> +
>> +        <!--  dependencies from original web console -->
>> +        <dependency>
>> +            <groupId>org.apache.activemq</groupId>
>> +            <artifactId>activemq-web</artifactId>
>> +            <version>5.3-SNAPSHOT</version>
>> +        </dependency>
>> +
>> +        <!-- XMPP support -->
>> +        <dependency>
>> +            <groupId>org.apache.activemq</groupId>
>> +            <artifactId>activemq-xmpp</artifactId>
>> +            <version>5.3-SNAPSHOT</version>
>> +        </dependency>
>> +        <dependency>
>> +            <groupId>org.apache.activemq</groupId>
>> +            <artifactId>activemq-console</artifactId>
>> +            <version>5.3-SNAPSHOT</version>
>> +        </dependency>
>> +
>> +        <!-- SiteMesh for layout -->
>> +        <dependency>
>> +            <groupId>opensymphony</groupId>
>> +            <artifactId>sitemesh</artifactId>
>> +            <version>2.2.1</version>
>> +        </dependency>
>> +
>> +
>> +    </dependencies>
>> +    <build>
>> +        <plugins>
>> +            <plugin>
>> +                <groupId>org.apache.geronimo.buildsupport
>> +                               </groupId>
>> +                <artifactId>car-maven-plugin</artifactId>
>> +                <configuration>
>> +                    <deploymentConfigs>
>> +                        <deploymentConfig>${gbeanDeployer}</ 
>> deploymentConfig>
>> +                        <deploymentConfig>${j2eeDeployer}</ 
>> deploymentConfig>
>> +                        <deploymentConfig>${jettyDeployer}</ 
>> deploymentConfig>
>> +                        <deploymentConfig>${jasperDeployer}</ 
>> deploymentConfig>
>> +                    </deploymentConfigs>
>> +                    <module>
>> +                        <groupId>org.apache.geronimo.plugins</ 
>> groupId>
>> +                        <artifactId>activemq-webconsole</artifactId>
>> +                        <type>war</type>
>> +                    </module>
>> +                </configuration>
>> +            </plugin>
>> +        </plugins>
>> +    </build>
>> +
>> +</project>
>> \ No newline at end of file
>>
>> Propchange: geronimo/server/trunk/plugins/activemq/activemq- 
>> webconsole-jetty/pom.xml
>> ------------------------------------------------------------------------------
>>    svn:eol-style = native
>>
>> Propchange: geronimo/server/trunk/plugins/activemq/activemq- 
>> webconsole-jetty/pom.xml
>> ------------------------------------------------------------------------------
>>    svn:keywords = Date Revision
>>
>> Propchange: geronimo/server/trunk/plugins/activemq/activemq- 
>> webconsole-jetty/pom.xml
>> ------------------------------------------------------------------------------
>>    svn:mime-type = text/xml
>>
>> Added: geronimo/server/trunk/plugins/activemq/activemq-webconsole- 
>> jetty/src/main/history/dependencies.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/src/main/history/dependencies.xml?rev=749122&view=auto
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> =====================================================================
>> --- geronimo/server/trunk/plugins/activemq/activemq-webconsole- 
>> jetty/src/main/history/dependencies.xml (added)
>> +++ geronimo/server/trunk/plugins/activemq/activemq-webconsole- 
>> jetty/src/main/history/dependencies.xml Sun Mar  1 21:52:41 2009
>> @@ -0,0 +1,139 @@
>> +<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
>> +<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2 
>> " xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
>> +    <module-id>
>> +        <groupId>org.apache.geronimo.plugins</groupId>
>> +        <artifactId>activemq-webconsole-jetty</artifactId>
>> +        <version>2.2-SNAPSHOT</version>
>> +        <type>car</type>
>> +    </module-id>
>> +    <dependency>
>> +        <groupId>org.apache.geronimo.configs</groupId>
>> +        <artifactId>jetty6</artifactId>
>> +        <type>car</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>org.apache.geronimo.configs</groupId>
>> +        <artifactId>jasper</artifactId>
>> +        <type>car</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>org.apache.geronimo.configs</groupId>
>> +        <artifactId>activemq-broker</artifactId>
>> +        <type>car</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>org.apache.geronimo.plugins</groupId>
>> +        <artifactId>activemq-webconsole</artifactId>
>> +        <type>war</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>org.apache.activemq</groupId>
>> +        <artifactId>activemq-web</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>org.apache.activemq</groupId>
>> +        <artifactId>activemq-camel</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>commons-logging</groupId>
>> +        <artifactId>commons-logging-api</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>org.apache.camel</groupId>
>> +        <artifactId>camel-jms</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>org.apache.camel</groupId>
>> +        <artifactId>camel-spring</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>org.springframework</groupId>
>> +        <artifactId>spring-tx</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>commons-logging</groupId>
>> +        <artifactId>commons-logging</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>org.springframework</groupId>
>> +        <artifactId>spring-aop</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>aopalliance</groupId>
>> +        <artifactId>aopalliance</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>org.springframework</groupId>
>> +        <artifactId>spring-jms</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>commons-pool</groupId>
>> +        <artifactId>commons-pool</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>org.springframework</groupId>
>> +        <artifactId>spring-context-support</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>org.apache.activemq</groupId>
>> +        <artifactId>activemq-pool</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>org.apache.geronimo.specs</groupId>
>> +        <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>rome</groupId>
>> +        <artifactId>rome</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>jdom</groupId>
>> +        <artifactId>jdom</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>org.springframework</groupId>
>> +        <artifactId>spring-webmvc</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>xmlpull</groupId>
>> +        <artifactId>xmlpull</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>org.apache.activemq</groupId>
>> +        <artifactId>activemq-xmpp</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>jivesoftware</groupId>
>> +        <artifactId>smackx</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>org.apache.activemq</groupId>
>> +        <artifactId>activemq-console</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>opensymphony</groupId>
>> +        <artifactId>sitemesh</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +</plugin-artifact>
>>
>> Propchange: geronimo/server/trunk/plugins/activemq/activemq- 
>> webconsole-jetty/src/main/history/dependencies.xml
>> ------------------------------------------------------------------------------
>>    svn:eol-style = native
>>
>> Propchange: geronimo/server/trunk/plugins/activemq/activemq- 
>> webconsole-jetty/src/main/history/dependencies.xml
>> ------------------------------------------------------------------------------
>>    svn:keywords = Date Revision
>>
>> Propchange: geronimo/server/trunk/plugins/activemq/activemq- 
>> webconsole-jetty/src/main/history/dependencies.xml
>> ------------------------------------------------------------------------------
>>    svn:mime-type = text/xml
>>
>> Added: geronimo/server/trunk/plugins/activemq/activemq-webconsole- 
>> jetty/src/main/plan/plan.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-webconsole-jetty/src/main/plan/plan.xml?rev=749122&view=auto
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> =====================================================================
>> --- geronimo/server/trunk/plugins/activemq/activemq-webconsole- 
>> jetty/src/main/plan/plan.xml (added)
>> +++ geronimo/server/trunk/plugins/activemq/activemq-webconsole- 
>> jetty/src/main/plan/plan.xml Sun Mar  1 21:52:41 2009
>> @@ -0,0 +1,29 @@
>> +<?xml version="1.0" encoding="UTF-8"?>
>> +<!--
>> +    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.
>> +-->
>> +
>> +<!-- $Rev$ $Date$ -->
>> +
>> +<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
>> +    <context-root>/activemq-console</context-root>
>> +
>> +    <gbean name="amq-console-properties"  
>> class="org.apache.geronimo.system.properties.SystemProperties">
>> +        <attribute name="systemProperties">
>> +            webconsole.type=inVM
>> +        </attribute>
>> +    </gbean>
>> +</web-app>
>> \ No newline at end of file
>>
>> Propchange: geronimo/server/trunk/plugins/activemq/activemq- 
>> webconsole-jetty/src/main/plan/plan.xml
>> ------------------------------------------------------------------------------
>>    svn:eol-style = native
>>
>> Propchange: geronimo/server/trunk/plugins/activemq/activemq- 
>> webconsole-jetty/src/main/plan/plan.xml
>> ------------------------------------------------------------------------------
>>    svn:keywords = Date Revision
>>
>> Propchange: geronimo/server/trunk/plugins/activemq/activemq- 
>> webconsole-jetty/src/main/plan/plan.xml
>> ------------------------------------------------------------------------------
>>    svn:mime-type = text/xml
>>
>> Added: geronimo/server/trunk/plugins/activemq/activemq-webconsole- 
>> tomcat/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/pom.xml?rev=749122&view=auto
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> =====================================================================
>> --- geronimo/server/trunk/plugins/activemq/activemq-webconsole- 
>> tomcat/pom.xml (added)
>> +++ geronimo/server/trunk/plugins/activemq/activemq-webconsole- 
>> tomcat/pom.xml Sun Mar  1 21:52:41 2009
>> @@ -0,0 +1,129 @@
>> +<?xml version="1.0" encoding="UTF-8"?>
>> +<project>
>> +    <parent>
>> +        <artifactId>activemq</artifactId>
>> +        <groupId>org.apache.geronimo.plugins
>> +               </groupId>
>> +        <version>2.2-SNAPSHOT</version>
>> +    </parent>
>> +    <modelVersion>4.0.0</modelVersion>
>> +    <artifactId>activemq-webconsole-tomcat</artifactId>
>> +    <name>ActiveMQ web console on Tomcat</name>
>> +    <packaging>car</packaging>
>> +
>> +    <dependencies>
>> +        <dependency>
>> +            <groupId>org.apache.geronimo.framework</groupId>
>> +            <artifactId>geronimo-gbean-deployer
>> +                       </artifactId>
>> +            <version>${geronimoVersion}</version>
>> +            <type>car</type>
>> +            <scope>provided</scope>
>> +        </dependency>
>> +
>> +        <dependency>
>> +            <groupId>org.apache.geronimo.configs</groupId>
>> +            <artifactId>j2ee-deployer</artifactId>
>> +            <version>${geronimoVersion}</version>
>> +            <type>car</type>
>> +            <scope>provided</scope>
>> +        </dependency>
>> +
>> +        <dependency>
>> +            <groupId>org.apache.geronimo.configs</groupId>
>> +            <artifactId>tomcat6-deployer</artifactId>
>> +            <version>${geronimoVersion}</version>
>> +            <type>car</type>
>> +            <scope>provided</scope>
>> +        </dependency>
>> +        <dependency>
>> +            <groupId>org.apache.geronimo.configs</groupId>
>> +            <artifactId>jasper-deployer</artifactId>
>> +            <version>${geronimoVersion}</version>
>> +            <type>car</type>
>> +            <scope>provided</scope>
>> +        </dependency>
>> +
>> +        <!--
>> +                       should be added by deployers but isn't into  
>> geronimo-plugin.xml
>> +               -->
>> +        <dependency>
>> +            <groupId>org.apache.geronimo.configs</groupId>
>> +            <artifactId>tomcat6</artifactId>
>> +            <version>${geronimoVersion}</version>
>> +            <type>car</type>
>> +        </dependency>
>> +
>> +        <dependency>
>> +            <groupId>org.apache.geronimo.configs</groupId>
>> +            <artifactId>jasper</artifactId>
>> +            <version>${geronimoVersion}</version>
>> +            <type>car</type>
>> +        </dependency>
>> +
>> +        <dependency>
>> +            <groupId>org.apache.geronimo.configs</groupId>
>> +            <artifactId>activemq-broker</artifactId>
>> +            <version>${geronimoVersion}</version>
>> +            <type>car</type>
>> +        </dependency>
>> +
>> +        <dependency>
>> +            <groupId>org.apache.geronimo.plugins</groupId>
>> +            <artifactId>activemq-webconsole</artifactId>
>> +            <version>${geronimoVersion}</version>
>> +            <type>war</type>
>> +        </dependency>
>> +
>> +        <!--  dependencies from original web console -->
>> +        <dependency>
>> +            <groupId>org.apache.activemq</groupId>
>> +            <artifactId>activemq-web</artifactId>
>> +            <version>5.3-SNAPSHOT</version>
>> +        </dependency>
>> +
>> +        <!-- XMPP support -->
>> +        <dependency>
>> +            <groupId>org.apache.activemq</groupId>
>> +            <artifactId>activemq-xmpp</artifactId>
>> +            <version>5.3-SNAPSHOT</version>
>> +        </dependency>
>> +        <dependency>
>> +            <groupId>org.apache.activemq</groupId>
>> +            <artifactId>activemq-console</artifactId>
>> +            <version>5.3-SNAPSHOT</version>
>> +        </dependency>
>> +
>> +        <!-- SiteMesh for layout -->
>> +        <dependency>
>> +            <groupId>opensymphony</groupId>
>> +            <artifactId>sitemesh</artifactId>
>> +            <version>2.2.1</version>
>> +        </dependency>
>> +
>> +
>> +    </dependencies>
>> +    <build>
>> +        <plugins>
>> +            <plugin>
>> +                <groupId>org.apache.geronimo.buildsupport
>> +                               </groupId>
>> +                <artifactId>car-maven-plugin</artifactId>
>> +                <configuration>
>> +                    <deploymentConfigs>
>> +                        <deploymentConfig>${gbeanDeployer}</ 
>> deploymentConfig>
>> +                        <deploymentConfig>${j2eeDeployer}</ 
>> deploymentConfig>
>> +                        <deploymentConfig>${tomcatDeployer}</ 
>> deploymentConfig>
>> +                        <deploymentConfig>${jasperDeployer}</ 
>> deploymentConfig>
>> +                    </deploymentConfigs>
>> +                    <module>
>> +                        <groupId>org.apache.geronimo.plugins</ 
>> groupId>
>> +                        <artifactId>activemq-webconsole</artifactId>
>> +                        <type>war</type>
>> +                    </module>
>> +                </configuration>
>> +            </plugin>
>> +        </plugins>
>> +    </build>
>> +
>> +</project>
>>
>> Added: geronimo/server/trunk/plugins/activemq/activemq-webconsole- 
>> tomcat/src/main/history/dependencies.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/src/main/history/dependencies.xml?rev=749122&view=auto
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> =====================================================================
>> --- geronimo/server/trunk/plugins/activemq/activemq-webconsole- 
>> tomcat/src/main/history/dependencies.xml (added)
>> +++ geronimo/server/trunk/plugins/activemq/activemq-webconsole- 
>> tomcat/src/main/history/dependencies.xml Sun Mar  1 21:52:41 2009
>> @@ -0,0 +1,144 @@
>> +<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
>> +<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2 
>> " xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
>> +    <module-id>
>> +        <groupId>org.apache.geronimo.plugins</groupId>
>> +        <artifactId>activemq-webconsole-tomcat</artifactId>
>> +        <version>2.2-SNAPSHOT</version>
>> +        <type>car</type>
>> +    </module-id>
>> +    <dependency>
>> +        <groupId>org.apache.geronimo.configs</groupId>
>> +        <artifactId>tomcat6</artifactId>
>> +        <type>car</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>org.apache.geronimo.configs</groupId>
>> +        <artifactId>jasper</artifactId>
>> +        <type>car</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>org.apache.geronimo.configs</groupId>
>> +        <artifactId>activemq-broker</artifactId>
>> +        <type>car</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>org.apache.geronimo.plugins</groupId>
>> +        <artifactId>activemq-webconsole</artifactId>
>> +        <type>war</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>org.apache.activemq</groupId>
>> +        <artifactId>activemq-web</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>org.apache.activemq</groupId>
>> +        <artifactId>activemq-camel</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>commons-logging</groupId>
>> +        <artifactId>commons-logging-api</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>org.apache.camel</groupId>
>> +        <artifactId>camel-jms</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>org.apache.camel</groupId>
>> +        <artifactId>camel-spring</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>org.springframework</groupId>
>> +        <artifactId>spring-tx</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>commons-logging</groupId>
>> +        <artifactId>commons-logging</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>org.springframework</groupId>
>> +        <artifactId>spring-aop</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>aopalliance</groupId>
>> +        <artifactId>aopalliance</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>org.springframework</groupId>
>> +        <artifactId>spring-jms</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>commons-pool</groupId>
>> +        <artifactId>commons-pool</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>org.springframework</groupId>
>> +        <artifactId>spring-context-support</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>org.apache.activemq</groupId>
>> +        <artifactId>activemq-pool</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>org.apache.geronimo.specs</groupId>
>> +        <artifactId>geronimo-jta_1.0.1B_spec</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>org.mortbay.jetty</groupId>
>> +        <artifactId>jetty-util</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>rome</groupId>
>> +        <artifactId>rome</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>jdom</groupId>
>> +        <artifactId>jdom</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>org.springframework</groupId>
>> +        <artifactId>spring-webmvc</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>xmlpull</groupId>
>> +        <artifactId>xmlpull</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>org.apache.activemq</groupId>
>> +        <artifactId>activemq-xmpp</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>jivesoftware</groupId>
>> +        <artifactId>smackx</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>org.apache.activemq</groupId>
>> +        <artifactId>activemq-console</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +    <dependency>
>> +        <groupId>opensymphony</groupId>
>> +        <artifactId>sitemesh</artifactId>
>> +        <type>jar</type>
>> +    </dependency>
>> +</plugin-artifact>
>>
>> Added: geronimo/server/trunk/plugins/activemq/activemq-webconsole- 
>> tomcat/src/main/plan/plan.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-webconsole-tomcat/src/main/plan/plan.xml?rev=749122&view=auto
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> =====================================================================
>> --- geronimo/server/trunk/plugins/activemq/activemq-webconsole- 
>> tomcat/src/main/plan/plan.xml (added)
>> +++ geronimo/server/trunk/plugins/activemq/activemq-webconsole- 
>> tomcat/src/main/plan/plan.xml Sun Mar  1 21:52:41 2009
>> @@ -0,0 +1,29 @@
>> +<?xml version="1.0" encoding="UTF-8"?>
>> +<!--
>> +    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.
>> +-->
>> +
>> +<!-- $Rev: 630365 $ $Date: 2008-02-22 19:34:01 -0500 (Fri, 22 Feb  
>> 2008) $ -->
>> +
>> +<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
>> +    <context-root>/ /Users/david/geronimo/svn/geronimo/server/ 
>> trunk/plugins/activemq/activemq-webconsole-tomcat/src/main/history/ 
>> dependencies.xml-console</context-root>
>> +
>> +    <gbean name="amq-console-properties"  
>> class="org.apache.geronimo.system.properties.SystemProperties">
>> +        <attribute name="systemProperties">
>> +            webconsole.type=inVM
>> +        </attribute>
>> +    </gbean>
>> +</web-app>
>> \ No newline at end of file
>>
>> Added: geronimo/server/trunk/plugins/activemq/activemq-webconsole/ 
>> pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-webconsole/pom.xml?rev=749122&view=auto
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> =====================================================================
>> --- geronimo/server/trunk/plugins/activemq/activemq-webconsole/ 
>> pom.xml (added)
>> +++ geronimo/server/trunk/plugins/activemq/activemq-webconsole/ 
>> pom.xml Sun Mar  1 21:52:41 2009
>> @@ -0,0 +1,46 @@
>> +<?xml version="1.0" encoding="UTF-8"?>
>> +<project>
>> +    <parent>
>> +        <artifactId>activemq</artifactId>
>> +        <groupId>org.apache.geronimo.plugins</groupId>
>> +        <version>2.2-SNAPSHOT</version>
>> +    </parent>
>> +    <modelVersion>4.0.0</modelVersion>
>> +    <groupId>org.apache.geronimo.plugins</groupId>
>> +    <artifactId>activemq-webconsole</artifactId>
>> +    <packaging>war</packaging>
>> +    <name>Slimmed activemq-web-console</name>
>> +    <dependencies>
>> +        <dependency>
>> +            <groupId>org.apache.activemq</groupId>
>> +            <artifactId>activemq-web-console</artifactId>
>> +            <version>5.3-SNAPSHOT</version>
>> +            <type>war</type>
>> +            <scope>provided</scope>
>> +        </dependency>
>> +    </dependencies>
>> +    <build>
>> +        <plugins>
>> +            <plugin>
>> +                <groupId>org.apache.maven.plugins</groupId>
>> +                <artifactId>maven-war-plugin</artifactId>
>> +                <inherited>false</inherited>
>> +                <configuration>
>> +                    <failOnMissingWebXml>false</failOnMissingWebXml>
>> +                    <overlays>
>> +                        <overlay>
>> +                            <id>activemq-webconsole</id>
>> +                            <groupId>org.apache.activemq</groupId>
>> +                            <artifactId>activemq-web-console</ 
>> artifactId>
>> +                            <excludes>
>> +                                <!-- this probably isn't read....  
>> but just in case -->
>> +                                <exclude>WEB-INF/classes/ 
>> log4j.properties</exclude>
>> +                                <exclude>WEB-INF/lib/*</exclude>
>> +                            </excludes>
>> +                        </overlay>
>> +                    </overlays>
>> +                </configuration>
>> +            </plugin>
>> +        </plugins>
>> +    </build>
>> +</project>
>> \ No newline at end of file
>>
>> Propchange: geronimo/server/trunk/plugins/activemq/activemq- 
>> webconsole/pom.xml
>> ------------------------------------------------------------------------------
>>    svn:eol-style = native
>>
>> Propchange: geronimo/server/trunk/plugins/activemq/activemq- 
>> webconsole/pom.xml
>> ------------------------------------------------------------------------------
>>    svn:keywords = Date Revision
>>
>> Propchange: geronimo/server/trunk/plugins/activemq/activemq- 
>> webconsole/pom.xml
>> ------------------------------------------------------------------------------
>>    svn:mime-type = text/xml
>>
>> Modified: geronimo/server/trunk/plugins/activemq/pom.xml
>> URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/pom.xml?rev=749122&r1=749121&r2=749122&view=diff
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> =====================================================================
>> --- geronimo/server/trunk/plugins/activemq/pom.xml (original)
>> +++ geronimo/server/trunk/plugins/activemq/pom.xml Sun Mar  1  
>> 21:52:41 2009
>> @@ -14,11 +14,7 @@
>>     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.
>> --->
>> -
>> -<!-- $Rev$ $Date$ -->
>> -
>> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance 
>> " xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd 
>> ">
>> +--><!-- $Rev$ $Date$ --><project xmlns="http://maven.apache.org/POM/4.0.0 
>> " xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"  
>> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd 
>> ">
>>
>>     <modelVersion>4.0.0</modelVersion>
>>
>> @@ -45,7 +41,10 @@
>>         <module>activemq-portlets</module>
>>         <module>activemq-console-jetty</module>
>>         <module>activemq-console-tomcat</module>
>> -    </modules>
>> +    <module>activemq-webconsole-jetty</module>
>> +    <module>activemq-webconsole-tomcat</module>
>> +    <module>activemq-webconsole</module>
>> +  </modules>
>>
>>     <profiles>
>>         <profile>
>>
>>
>>


Mime
View raw message