You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ho...@apache.org on 2006/03/08 14:58:02 UTC
svn commit: r384216 - in /geronimo/daytrader/trunk/modules/web: pom.xml
src/main/webapp/WEB-INF/classes/build.properties
src/main/webapp/WEB-INF/web.xml
Author: hogstrom
Date: Wed Mar 8 05:57:56 2006
New Revision: 384216
URL: http://svn.apache.org/viewcvs?rev=384216&view=rev
Log:
Maven 2 changes to try and support verisoning in web.xml
Added:
geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/classes/build.properties
Modified:
geronimo/daytrader/trunk/modules/web/pom.xml
geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/web.xml
Modified: geronimo/daytrader/trunk/modules/web/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/web/pom.xml?rev=384216&r1=384215&r2=384216&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/pom.xml (original)
+++ geronimo/daytrader/trunk/modules/web/pom.xml Wed Mar 8 05:57:56 2006
@@ -33,6 +33,24 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <filters>
+ <filter>${basedir}/src/main/webapp/WEB-INF/classes/build.properties</filter>
+ </filters>
+ <resources>
+ <resource implementation="org.apache.maven.model.Resource">
+ <filtering>true</filtering>
+ <directory>${basedir}/src/main/webapp/WEB-INF</directory>
+ <includes>
+ <include>web.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty6-plugin</artifactId>
<configuration>
Added: geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/classes/build.properties
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/classes/build.properties?rev=384216&view=auto
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/classes/build.properties (added)
+++ geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/classes/build.properties Wed Mar 8 05:57:56 2006
@@ -0,0 +1 @@
+ejb_version=${pom.version}
Modified: geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/web.xml?rev=384216&r1=384215&r2=384216&view=diff
==============================================================================
--- geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/daytrader/trunk/modules/web/src/main/webapp/WEB-INF/web.xml Wed Mar 8 05:57:56 2006
@@ -419,13 +419,13 @@
<message-destination-ref-name>jms/TradeBrokerQueue</message-destination-ref-name>
<message-destination-type>javax.jms.Queue</message-destination-type>
<message-destination-usage>Produces</message-destination-usage>
- <message-destination-link>daytrader-ejb-${pom.currentVersion}.jar#TradeBrokerQueue</message-destination-link>
+ <message-destination-link>daytrader-ejb-1.1-SNAPSHOT.jar#TradeBrokerQueue</message-destination-link>
</message-destination-ref>
<message-destination-ref>
<message-destination-ref-name>jms/TradeStreamerTopic</message-destination-ref-name>
<message-destination-type>javax.jms.Topic</message-destination-type>
<message-destination-usage>Produces</message-destination-usage>
- <message-destination-link>daytrader-ejb-${pom.currentVersion}.jar#TradeStreamerTopic</message-destination-link>
+ <message-destination-link>daytrader-ejb-1.1-SNAPSHOT.jar#TradeStreamerTopic</message-destination-link>
</message-destination-ref>
<service-ref>
<description>WSDL Service Trade</description>
Re: svn commit: r384216 - in /geronimo/daytrader/trunk/modules/web:
pom.xml src/main/webapp/WEB-INF/classes/build.properties src/main/webapp/WEB-INF/web.xml
Posted by Matt Hogstrom <ma...@hogstrom.org>.
You're righ Jacek. I've tried a few approaches and have not been successful
with Maven 2. I will get this fixed though. My understanding was that it was
going to be supported natively but it looks like that hasn't been completed yet
so I had to regress.
Matt
Jacek Laskowski wrote:
> 2006/3/8, hogstrom@apache.org <ho...@apache.org>:
>
>>Author: hogstrom
>>Date: Wed Mar 8 05:57:56 2006
>>New Revision: 384216
>>
>>URL: http://svn.apache.org/viewcvs?rev=384216&view=rev
>
> ...
>
>>- <message-destination-link>daytrader-ejb-${pom.currentVersion}.jar#TradeBrokerQueue</message-destination-link>
>>+ <message-destination-link>daytrader-ejb-1.1-SNAPSHOT.jar#TradeBrokerQueue</message-destination-link>
>
> ...
>
>>- <message-destination-link>daytrader-ejb-${pom.currentVersion}.jar#TradeStreamerTopic</message-destination-link>
>>+ <message-destination-link>daytrader-ejb-1.1-SNAPSHOT.jar#TradeStreamerTopic</message-destination-link>
>
>
> What's wrong with the previous "decoupled" solution? Now, everytime
> you'll change the version, the file will require it, too. There must
> be something in-between and can't see it ;)
>
> Jacek
>
> --
> Jacek Laskowski
> http://www.laskowski.org.pl
>
>
>
Re: svn commit: r384216 - in /geronimo/daytrader/trunk/modules/web: pom.xml src/main/webapp/WEB-INF/classes/build.properties src/main/webapp/WEB-INF/web.xml
Posted by Jacek Laskowski <el...@gmail.com>.
2006/3/8, hogstrom@apache.org <ho...@apache.org>:
> Author: hogstrom
> Date: Wed Mar 8 05:57:56 2006
> New Revision: 384216
>
> URL: http://svn.apache.org/viewcvs?rev=384216&view=rev
...
> - <message-destination-link>daytrader-ejb-${pom.currentVersion}.jar#TradeBrokerQueue</message-destination-link>
> + <message-destination-link>daytrader-ejb-1.1-SNAPSHOT.jar#TradeBrokerQueue</message-destination-link>
...
> - <message-destination-link>daytrader-ejb-${pom.currentVersion}.jar#TradeStreamerTopic</message-destination-link>
> + <message-destination-link>daytrader-ejb-1.1-SNAPSHOT.jar#TradeStreamerTopic</message-destination-link>
What's wrong with the previous "decoupled" solution? Now, everytime
you'll change the version, the file will require it, too. There must
be something in-between and can't see it ;)
Jacek
--
Jacek Laskowski
http://www.laskowski.org.pl