Author: antelder
Date: Sat Jul 4 07:41:47 2009
New Revision: 791075
URL: http://svn.apache.org/viewvc?rev=791075&view=rev
Log:
Merge archetype jetty property fix from trunk to m3 branch
Modified:
tuscany/branches/sca-java-2.0-M3/archetypes/ (props changed)
tuscany/branches/sca-java-2.0-M3/archetypes/contribution-jar/ (props
changed)
tuscany/branches/sca-java-2.0-M3/archetypes/contribution-zip-discriptor/
(props changed)
tuscany/branches/sca-java-2.0-M3/archetypes/quickstart/ (props changed)
tuscany/branches/sca-java-2.0-M3/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml
tuscany/branches/sca-java-2.0-M3/archetypes/quickstart-jsf/ (props
changed)
tuscany/branches/sca-java-2.0-M3/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml
tuscany/branches/sca-java-2.0-M3/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml
tuscany/branches/sca-java-2.0-M3/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
Propchange: tuscany/branches/sca-java-2.0-M3/archetypes/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Jul 4 07:41:47 2009
@@ -0,0 +1,2 @@
+/tuscany/branches/sca-java-1.3/archetypes:671193
+/tuscany/java/sca/archetypes:791073
Propchange: tuscany/branches/sca-java-2.0-M3/archetypes/contribution-jar/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 4 07:41:47 2009
@@ -1,2 +1,2 @@
/tuscany/branches/sca-java-1.3/archetypes/contribution-jar:671193
-/tuscany/java/sca/archetypes/contribution-jar:788283
+/tuscany/java/sca/archetypes/contribution-jar:788283,791073
Propchange:
tuscany/branches/sca-java-2.0-M3/archetypes/contribution-zip-discriptor/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 4 07:41:47 2009
@@ -1,2 +1,2 @@
/tuscany/branches/sca-java-1.3/archetypes/contribution-zip-discriptor:671193
-/tuscany/java/sca/archetypes/contribution-zip-discriptor:788611
+/tuscany/java/sca/archetypes/contribution-zip-discriptor:788611,791073
Propchange: tuscany/branches/sca-java-2.0-M3/archetypes/quickstart/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 4 07:41:47 2009
@@ -1,2 +1,2 @@
/tuscany/branches/sca-java-1.3/archetypes/quickstart:671193
-/tuscany/java/sca/archetypes/quickstart:785216
+/tuscany/java/sca/archetypes/quickstart:785216,791073
Modified:
tuscany/branches/sca-java-2.0-M3/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-2.0-M3/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml?rev=791075&r1=791074&r2=791075&view=diff
==============================================================================
---
tuscany/branches/sca-java-2.0-M3/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml
(original)
+++
tuscany/branches/sca-java-2.0-M3/archetypes/quickstart-bpel/src/main/resources/archetype-resources/pom.xml
Sat Jul 4 07:41:47 2009
@@ -151,7 +151,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>${jetty.version}</version>
+ <version>${jetty.version}</version>
<configuration>
<systemProperties>
<systemProperty>
Propchange: tuscany/branches/sca-java-2.0-M3/archetypes/quickstart-jsf/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jul 4 07:41:47 2009
@@ -1,2 +1,2 @@
/tuscany/branches/sca-java-1.3/archetypes/quickstart-jsf:671193
-/tuscany/java/sca/archetypes/quickstart-jsf:787259
+/tuscany/java/sca/archetypes/quickstart-jsf:787259,791073
Modified:
tuscany/branches/sca-java-2.0-M3/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-2.0-M3/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml?rev=791075&r1=791074&r2=791075&view=diff
==============================================================================
---
tuscany/branches/sca-java-2.0-M3/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml
(original)
+++
tuscany/branches/sca-java-2.0-M3/archetypes/quickstart-jsf/src/main/resources/archetype-resources/pom.xml
Sat Jul 4 07:41:47 2009
@@ -133,7 +133,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>${jetty.version}</version>
+ <version>${jetty.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -147,7 +147,8 @@
<properties>
<tuscany.version>2.0-M3-SNAPSHOT</tuscany.version>
<myfaces.version>1.5</myfaces.version>
- </properties>
+ <jetty.version>6.1.4</jetty.version>
+ </properties>
#end
</project>
Modified:
tuscany/branches/sca-java-2.0-M3/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-2.0-M3/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml?rev=791075&r1=791074&r2=791075&view=diff
==============================================================================
---
tuscany/branches/sca-java-2.0-M3/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml
(original)
+++
tuscany/branches/sca-java-2.0-M3/archetypes/quickstart-stripes/src/main/resources/archetype-resources/pom.xml
Sat Jul 4 07:41:47 2009
@@ -103,7 +103,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>${jetty.version}</version>
+ <version>${jetty.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -117,6 +117,7 @@
<properties>
<tuscany.version>2.0-M3-SNAPSHOT</tuscany.version>
<stripes.version>1.5</stripes.version>
+ <jetty.version>6.1.4</jetty.version>
</properties>
#end
Modified:
tuscany/branches/sca-java-2.0-M3/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-2.0-M3/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml?rev=791075&r1=791074&r2=791075&view=diff
==============================================================================
---
tuscany/branches/sca-java-2.0-M3/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
(original)
+++
tuscany/branches/sca-java-2.0-M3/archetypes/quickstart/src/main/resources/archetype-resources/pom.xml
Sat Jul 4 07:41:47 2009
@@ -118,7 +118,7 @@
<plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
- <version>${jetty.version}</version>
+ <version>${jetty.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
