You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ba...@apache.org on 2006/06/10 20:23:22 UTC

svn commit: r413345 - /myfaces/maven/trunk/myfaces-archetype/src/main/resources/archetype-resources/pom.xml

Author: baranda
Date: Sat Jun 10 11:23:22 2006
New Revision: 413345

URL: http://svn.apache.org/viewvc?rev=413345&view=rev
Log:
Isolated all the jetty related stuff for the jettyConfig profile only. The standard behaviour was doing things only needed if using jetty.

Modified:
    myfaces/maven/trunk/myfaces-archetype/src/main/resources/archetype-resources/pom.xml

Modified: myfaces/maven/trunk/myfaces-archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/maven/trunk/myfaces-archetype/src/main/resources/archetype-resources/pom.xml?rev=413345&r1=413344&r2=413345&view=diff
==============================================================================
--- myfaces/maven/trunk/myfaces-archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ myfaces/maven/trunk/myfaces-archetype/src/main/resources/archetype-resources/pom.xml Sat Jun 10 11:23:22 2006
@@ -11,23 +11,23 @@
     <name>A custom project using myfaces</name>
     <url>http://www.myorganization.org</url>
 
-    <build>
-        <finalName>${artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.mortbay.jetty</groupId>
-                <artifactId>maven-jetty6-plugin</artifactId>
-                <configuration>
-                    <scanIntervalSeconds>10</scanIntervalSeconds>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
     <!-- Profile to run jetty, so the tomcat jars are included in the bundle. They are not included by default -->
     <profiles>
         <profile>
             <id>jettyConfig</id>
+            <build>
+                <finalName>${artifactId}</finalName>
+                <plugins>
+                    <plugin>
+                        <groupId>org.mortbay.jetty</groupId>
+                        <artifactId>maven-jetty6-plugin</artifactId>
+                        <configuration>
+                            <scanIntervalSeconds>10</scanIntervalSeconds>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+
             <dependencies>
                 <dependency>
                     <groupId>javax.servlet</groupId>
@@ -54,10 +54,19 @@
                     <scope>compile</scope>
                 </dependency>
             </dependencies>
+
+            <pluginRepositories>
+                <!-- Repository to get the jetty plugin -->
+                <pluginRepository>
+                    <id>mortbay-repo</id>
+                    <name>mortbay-repo</name>
+                    <url>http://www.mortbay.org/maven2/snapshot</url>
+                </pluginRepository>
+            </pluginRepositories>
+
         </profile>
     </profiles>
 
-
     <repositories>
         <repository>
             <releases>
@@ -71,16 +80,6 @@
         </repository>
     </repositories>
 
-    <!-- Repositories for plugins -->
-    <pluginRepositories>
-        <!-- Repository to get the jetty plugin -->
-        <pluginRepository>
-            <id>mortbay-repo</id>
-            <name>mortbay-repo</name>
-            <url>http://www.mortbay.org/maven2/snapshot</url>
-        </pluginRepository>
-    </pluginRepositories>
-
     <!-- Project dependencies -->
     <dependencies>
         <dependency>
@@ -107,7 +106,7 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>3.8.1</version>
+            <version>4.0</version>
             <scope>test</scope>
         </dependency>
 



Re: svn commit: r413345 - /myfaces/maven/trunk/myfaces-archetype/src/main/resources/archetype-resources/pom.xml

Posted by Bruno Aranda <br...@gmail.com>.
Mmmh, yes, that's right. One minute :)

Bruno

On 6/10/06, Wendy Smoak <ws...@gmail.com> wrote:
> On 6/10/06, baranda@apache.org <ba...@apache.org> wrote:
> > Author: baranda
> > Date: Sat Jun 10 11:23:22 2006
> > New Revision: 413345
> >
> > URL: http://svn.apache.org/viewvc?rev=413345&view=rev
> > Log:
> > Isolated all the jetty related stuff for the jettyConfig profile only. The standard behaviour was doing things only needed if using jetty.
>
> Can you please put the <finalName> element back in a top-level <build>
> element)?
>
> Otherwise when you 'mvn install'  a webapp created from this profile,
> the .war file in the target directory will have the version number
> appended.
>
> Thanks,
> Wendy
>

Re: svn commit: r413345 - /myfaces/maven/trunk/myfaces-archetype/src/main/resources/archetype-resources/pom.xml

Posted by Wendy Smoak <ws...@gmail.com>.
On 6/10/06, baranda@apache.org <ba...@apache.org> wrote:
> Author: baranda
> Date: Sat Jun 10 11:23:22 2006
> New Revision: 413345
>
> URL: http://svn.apache.org/viewvc?rev=413345&view=rev
> Log:
> Isolated all the jetty related stuff for the jettyConfig profile only. The standard behaviour was doing things only needed if using jetty.

Can you please put the <finalName> element back in a top-level <build>
element)?

Otherwise when you 'mvn install'  a webapp created from this profile,
the .war file in the target directory will have the version number
appended.

Thanks,
Wendy