You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2010/06/15 03:13:52 UTC
svn commit: r954686 - in /geronimo/server/trunk/plugins/activemq:
activemq-jetty-server/pom.xml activemq-server/ pom.xml
Author: djencks
Date: Tue Jun 15 01:13:52 2010
New Revision: 954686
URL: http://svn.apache.org/viewvc?rev=954686&view=rev
Log:
don't duplicate profile ids. Remove obsolete activemq-server to try to reduce confusion
Removed:
geronimo/server/trunk/plugins/activemq/activemq-server/
Modified:
geronimo/server/trunk/plugins/activemq/activemq-jetty-server/pom.xml
geronimo/server/trunk/plugins/activemq/pom.xml
Modified: geronimo/server/trunk/plugins/activemq/activemq-jetty-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-jetty-server/pom.xml?rev=954686&r1=954685&r2=954686&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-jetty-server/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-jetty-server/pom.xml Tue Jun 15 01:13:52 2010
@@ -79,6 +79,101 @@
<skip>true</skip>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.geronimo.buildsupport</groupId>
+ <artifactId>geronimo-maven-plugin</artifactId>
+ <version>${project.version}</version>
+
+ <configuration>
+ <!--<assemblies>-->
+ <!--<assembly>-->
+ <!--<id>activemq</id>-->
+ <!--<groupId>org.apache.geronimo.plugins</groupId>-->
+ <!--<artifactId>activemq-server</artifactId>-->
+ <!--<version>${geronimoVersion}</version>-->
+ <!--<classifier>bin</classifier>-->
+ <!--<type>zip</type>-->
+ <!--</assembly>-->
+ <!--</assemblies>-->
+
+ <!--<defaultAssemblyId>activemq</defaultAssemblyId>-->
+ <assemblyArchive>${project.build.directory}/${pom.artifactId}-${pom.version}-bin.zip</assemblyArchive>
+ <optionSets>
+ <optionSet>
+ <id>morememory</id>
+ <options>
+ <option>-Xmx512m</option>
+ <option>-XX:MaxPermSize=128m</option>
+ </options>
+ </optionSet>
+
+ <optionSet>
+ <id>debug</id>
+ <options>
+ <option>-Xdebug</option>
+ <option>-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n</option>
+ </options>
+ </optionSet>
+ </optionSets>
+ </configuration>
+ <executions>
+ <execution>
+ <id>start</id>
+ <phase>pre-integration-test</phase>
+ <goals>
+ <goal>start-server</goal>
+ </goals>
+ <configuration>
+ <assemblyId>${it-server}</assemblyId>
+ <logOutput>true</logOutput>
+ <background>true</background>
+ <verifyTimeout>300</verifyTimeout>
+ <refresh>true</refresh>
+ <optionSets>
+ <optionSet>
+ <id>default</id>
+ <options>
+ <option>-XX:MaxPermSize=128m</option>
+ </options>
+ </optionSet>
+
+ <optionSet>
+ <id>morememory</id>
+ <options>
+ <option>-Xmx512m</option>
+ <option>-XX:MaxPermSize=128m</option>
+ </options>
+ </optionSet>
+
+ <optionSet>
+ <id>debug</id>
+ <options>
+ <option>-Xdebug</option>
+ <option>-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n</option>
+ </options>
+ </optionSet>
+ </optionSets>
+ </configuration>
+ </execution>
+ <!--<execution>-->
+ <!--<id>install-plugin</id>-->
+ <!--<phase>install</phase>-->
+ <!--<goals>-->
+ <!--<goal>install-plugin</goal>-->
+ <!--</goals>-->
+ <!--<configuration>-->
+ <!--<defaultGeronimoRepository>http://geronimo.apache.org/plugins/geronimo-${geronimoVersion}/</defaultGeronimoRepository>-->
+ <!--</configuration>-->
+ <!--</execution>-->
+ <execution>
+ <id>stop</id>
+ <phase>install</phase>
+ <goals>
+ <goal>stop-server</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
<dependencies>
Modified: geronimo/server/trunk/plugins/activemq/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/pom.xml?rev=954686&r1=954685&r2=954686&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/pom.xml Tue Jun 15 01:13:52 2010
@@ -51,11 +51,6 @@
<profile>
<id>all-subprojects</id>
<modules>
- <module>activemq-broker-blueprint</module>
- <module>geronimo-activemq-ra</module>
- <module>activemq-ra</module>
- <module>geronimo-activemq-blueprint</module>
- <module>geronimo-activemq-management</module>
<module>activemq-jetty-server</module>
</modules>
</profile>
@@ -65,12 +60,6 @@
<module>activemq-jetty-server</module>
</modules>
</profile>
- <profile>
- <id>all-subprojects</id>
- <modules>
- <module>activemq-server</module>
- </modules>
- </profile>
</profiles>
<properties>