Author: rfeng
Date: Fri Jan 18 11:28:49 2008
New Revision: 613235
URL: http://svn.apache.org/viewvc?rev=613235&view=rev
Log:
Merge one more fix for TUSCANY-1986 from trunk r613233
Added:
incubator/tuscany/branches/sca-java-1.1/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
- copied, changed from r613233,
incubator/tuscany/java/sca/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
Copied:
incubator/tuscany/branches/sca-java-1.1/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
(from r613233,
incubator/tuscany/java/sca/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml)
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml?p2=incubator/tuscany/branches/sca-java-1.1/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml&p1=incubator/tuscany/java/sca/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml&r1=613233&r2=613235&rev=613235&view=diff
==============================================================================
---
incubator/tuscany/java/sca/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
(original)
+++
incubator/tuscany/branches/sca-java-1.1/demos/alert-aggregator-webapp/src/main/webapp/WEB-INF/geronimo-web.xml
Fri Jan 18 11:28:49 2008
@@ -24,7 +24,7 @@
<d:moduleId>
<d:groupId>org.apache.tuscany.sca.tuscany-demos</d:groupId>
<d:artifactId>demo-alert-aggregator-webapp</d:artifactId>
- <d:version>1.2-incubating-SNAPSHOT</d:version>
+ <d:version>1.1-incubating-SNAPSHOT</d:version>
<d:type>war</d:type>
</d:moduleId>
<!-- TUSCANY-1986 -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
