You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/07/17 22:23:48 UTC
svn commit: r422836 - in /geronimo/sandbox/svkmerge/m2migration:
applications/console/console-ear/pom.xml configs/pom.xml
m2-assemblies/geronimo-jetty-j2ee/pom.xml
m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml pom.xml
Author: jdillon
Date: Mon Jul 17 13:23:48 2006
New Revision: 422836
URL: http://svn.apache.org/viewvc?rev=422836&view=rev
Log:
Applied console-configs.patch from (GERONIMO-2067)
Enabled console webapp for Jetty assembly
Modified:
geronimo/sandbox/svkmerge/m2migration/applications/console/console-ear/pom.xml
geronimo/sandbox/svkmerge/m2migration/configs/pom.xml
geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml
geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml
geronimo/sandbox/svkmerge/m2migration/pom.xml
Modified: geronimo/sandbox/svkmerge/m2migration/applications/console/console-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/applications/console/console-ear/pom.xml?rev=422836&r1=422835&r2=422836&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/applications/console/console-ear/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/applications/console/console-ear/pom.xml Mon Jul 17 13:23:48 2006
@@ -76,11 +76,13 @@
<groupId>org.apache.geronimo.applications.console</groupId>
<artifactId>geronimo-console-framework</artifactId>
<contextRoot>/console</contextRoot>
+ <bundleFileName>framework.war</bundleFileName>
</webModule>
<webModule>
<groupId>org.apache.geronimo.applications.console</groupId>
<artifactId>geronimo-console-standard</artifactId>
<contextRoot>/console-standard</contextRoot>
+ <bundleFileName>standard.war</bundleFileName>
</webModule>
</modules>
</configuration>
Modified: geronimo/sandbox/svkmerge/m2migration/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/configs/pom.xml?rev=422836&r1=422835&r2=422836&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/configs/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/configs/pom.xml Mon Jul 17 13:23:48 2006
@@ -111,8 +111,8 @@
<module>client-deployer</module>
<module>client-security</module>
<module>client-system</module>
- <!-- <module>console-jetty</module> -->
- <!-- <module>console-tomcat</module> -->
+ <module>console-jetty</module>
+ <module>console-tomcat</module>
<!-- <module>daytrader-jetty</module> -->
<!-- <module>daytrader-tomcat</module> -->
<module>directory</module>
Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml?rev=422836&r1=422835&r2=422836&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/pom.xml Mon Jul 17 13:23:48 2006
@@ -253,14 +253,12 @@
</dependency>
-->
- <!--
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>webconsole-jetty</artifactId>
<version>${pom.version}</version>
<type>car</type>
</dependency>
- -->
<!--
<dependency>
Modified: geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml?rev=422836&r1=422835&r2=422836&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-assemblies/geronimo-jetty-j2ee/src/main/var/config/config.xml Mon Jul 17 13:23:48 2006
@@ -135,7 +135,7 @@
<module name="org.apache.geronimo.configs/welcome-jetty/${pom.version}/car"/>
- <!--<module name="org.apache.geronimo.configs/webconsole-jetty/${pom.version}/car"/>-->
+ <module name="org.apache.geronimo.configs/webconsole-jetty/${pom.version}/car"/>
<!--<module name="org.apache.geronimo.configs/uddi-jetty/${pom.version}/car" load="false"/>-->
Modified: geronimo/sandbox/svkmerge/m2migration/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/pom.xml?rev=422836&r1=422835&r2=422836&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/pom.xml Mon Jul 17 13:23:48 2006
@@ -443,6 +443,18 @@
</dependency>
<dependency>
+ <groupId>activemq</groupId>
+ <artifactId>activemq-gbean-g1_1</artifactId>
+ <version>${activeMqVersion}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>activemq</groupId>
+ <artifactId>activemq-gbean-management-g1_1</artifactId>
+ <version>${activeMqVersion}</version>
+ </dependency>
+
+ <dependency>
<groupId>jdbm</groupId>
<artifactId>jdbm</artifactId>
<version>0.20-dev</version>
@@ -671,6 +683,9 @@
<warSourceDirectory>${pom.basedir}/src/webapp</warSourceDirectory>
<webXml>${pom.basedir}/target/jspweb.xml</webXml>
<archiveClasses>true</archiveClasses>
+ <archive>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
</configuration>
</plugin>