myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lu4...@apache.org
Subject svn commit: r639141 - in /myfaces/myfaces-build-tools/trunk/maven2-archetypes: ./ myfaces-archetype-helloworld-facelets/ myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/ myfaces-archetype-helloworld/ myfaces-archetype-hello...
Date Thu, 20 Mar 2008 03:39:07 GMT
Author: lu4242
Date: Wed Mar 19 20:39:04 2008
New Revision: 639141

URL: http://svn.apache.org/viewvc?rev=639141&view=rev
Log:
Corrected mvn jetty:run for all archetypes

Modified:
    myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/   (props
changed)
    myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-facelets/
  (props changed)
    myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/pom.xml
    myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/pom.xml
    myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/pom.xml
    myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/ 
 (props changed)
    myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/pom.xml
    myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/   (props
changed)
    myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/pom.xml
    myfaces/myfaces-build-tools/trunk/maven2-archetypes/pom.xml

Propchange: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Mar 19 20:39:04 2008
@@ -0,0 +1,8 @@
+target
+.classpath
+.project
+.wtpmodules
+*.ipr
+*.iml
+*.iws
+.settings

Propchange: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-facelets/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Mar 19 20:39:04 2008
@@ -0,0 +1,8 @@
+target
+.classpath
+.project
+.wtpmodules
+*.ipr
+*.iml
+*.iws
+.settings

Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/pom.xml?rev=639141&r1=639140&r2=639141&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/pom.xml
(original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld-facelets/src/main/resources/archetype-resources/pom.xml
Wed Mar 19 20:39:04 2008
@@ -13,62 +13,18 @@
 
     <build>
         <finalName>${artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <!--This plugin allows to run the example using mvn jetty:run -->
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>maven-jetty-plugin</artifactId>
+                <version>6.1.8</version>
+                <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>
-                <plugins>
-                    <plugin>
-                        <groupId>org.mortbay.jetty</groupId>
-                        <artifactId>maven-jetty-plugin</artifactId>
-                        <configuration>
-                            <scanIntervalSeconds>10</scanIntervalSeconds>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-
-            <dependencies>
-                <dependency>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>jsp-api</artifactId>
-                    <version>2.0</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>tomcat</groupId>
-                    <artifactId>jasper-compiler</artifactId>
-                    <version>5.5.9</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>tomcat</groupId>
-                    <artifactId>jasper-runtime</artifactId>
-                    <version>5.5.9</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>tomcat</groupId>
-                    <artifactId>jasper-compiler-jdt</artifactId>
-                    <version>5.5.9</version>
-                    <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>

Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/pom.xml?rev=639141&r1=639140&r2=639141&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/pom.xml
(original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/pom.xml
Wed Mar 19 20:39:04 2008
@@ -1,10 +1,10 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
-  <parent>
-    <groupId>org.apache.myfaces.buildtools</groupId>
-    <artifactId>myfaces-archetype-parent</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
-  </parent>
+    <parent>
+        <groupId>org.apache.myfaces.buildtools</groupId>
+        <artifactId>myfaces-archetype-parent</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+    </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.myfaces.buildtools</groupId>

Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/pom.xml?rev=639141&r1=639140&r2=639141&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/pom.xml
(original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-helloworld/src/main/resources/archetype-resources/pom.xml
Wed Mar 19 20:39:04 2008
@@ -13,63 +13,19 @@
 
     <build>
         <finalName>${artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <!--This plugin allows to run the example using mvn jetty:run -->
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>maven-jetty-plugin</artifactId>
+                <version>6.1.8</version>
+                <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>
-                <plugins>
-                    <plugin>
-                        <groupId>org.mortbay.jetty</groupId>
-                        <artifactId>maven-jetty-plugin</artifactId>
-                        <configuration>
-                            <scanIntervalSeconds>10</scanIntervalSeconds>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-
-            <dependencies>
-                <dependency>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>jsp-api</artifactId>
-                    <version>2.0</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>tomcat</groupId>
-                    <artifactId>jasper-compiler</artifactId>
-                    <version>5.5.9</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>tomcat</groupId>
-                    <artifactId>jasper-runtime</artifactId>
-                    <version>5.5.9</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>tomcat</groupId>
-                    <artifactId>jasper-compiler-jdt</artifactId>
-                    <version>5.5.9</version>
-                    <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>
@@ -117,7 +73,6 @@
             </exclusions>    
         </dependency>
         
-        
         <dependency>
             <groupId>jstl</groupId>
             <artifactId>jstl</artifactId>
@@ -133,6 +88,5 @@
         </dependency>
 
     </dependencies>
-
 
 </project>

Propchange: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Mar 19 20:39:04 2008
@@ -0,0 +1,8 @@
+target
+.classpath
+.project
+.wtpmodules
+*.ipr
+*.iml
+*.iws
+.settings

Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/pom.xml?rev=639141&r1=639140&r2=639141&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/pom.xml
(original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-jsfcomponents/src/main/resources/archetype-resources/examples/pom.xml
Wed Mar 19 20:39:04 2008
@@ -123,64 +123,21 @@
             </properties>
         </profile>
 
-        <!-- Profile to run jetty, so the tomcat jars are included in the bundle. They
are not included by default -->
-        <profile>
-            <id>jettyConfig</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.mortbay.jetty</groupId>
-                        <artifactId>maven-jetty-plugin</artifactId>
-                        <configuration>
-                            <scanIntervalSeconds>10</scanIntervalSeconds>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-
-            <dependencies>
-                <dependency>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>jsp-api</artifactId>
-                    <version>2.0</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>tomcat</groupId>
-                    <artifactId>jasper-compiler</artifactId>
-                    <version>5.5.9</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>tomcat</groupId>
-                    <artifactId>jasper-runtime</artifactId>
-                    <version>5.5.9</version>
-                    <scope>compile</scope>
-                </dependency>
-                <dependency>
-                    <groupId>tomcat</groupId>
-                    <artifactId>jasper-compiler-jdt</artifactId>
-                    <version>5.5.9</version>
-                    <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>
 
     <build>
         <finalName>${artifactId}</finalName>
-
+        <plugins>
+            <plugin>
+                <!--This plugin allows to run the example using mvn jetty:run -->
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>maven-jetty-plugin</artifactId>
+                <version>6.1.8</version>
+                <configuration>
+                    <scanIntervalSeconds>10</scanIntervalSeconds>
+                </configuration>
+            </plugin>
+        </plugins>
         <resources>
             <resource>
                 <directory>src/main/resources</directory>

Propchange: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Mar 19 20:39:04 2008
@@ -0,0 +1,8 @@
+target
+.classpath
+.project
+.wtpmodules
+*.ipr
+*.iml
+*.iws
+.settings

Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/pom.xml?rev=639141&r1=639140&r2=639141&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/pom.xml
(original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/myfaces-archetype-trinidad/src/main/resources/archetype-resources/pom.xml
Wed Mar 19 20:39:04 2008
@@ -30,67 +30,19 @@
   <url>http://www.myorganization.org</url>
 
   <build>
-    <finalName>${artifactId}</finalName>
-  </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-jetty-plugin</artifactId>
-            <version>6.1.0</version>
-            <configuration>
-              <scanIntervalSeconds>10</scanIntervalSeconds>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-
-      <dependencies>
-        <dependency>
-          <groupId>javax.servlet</groupId>
-          <artifactId>jsp-api</artifactId>
-          <version>2.0</version>
-          <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-          <groupId>tomcat</groupId>
-          <artifactId>jasper-compiler</artifactId>
-          <version>5.5.9</version>
-          <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-          <groupId>tomcat</groupId>
-          <artifactId>jasper-runtime</artifactId>
-          <version>5.5.9</version>
-          <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-          <groupId>tomcat</groupId>
-          <artifactId>jasper-compiler-jdt</artifactId>
-          <version>5.5.9</version>
-          <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>
+            <plugin>
+                <!--This plugin allows to run the example using mvn jetty:run -->
+                <groupId>org.mortbay.jetty</groupId>
+                <artifactId>maven-jetty-plugin</artifactId>
+                <version>6.1.8</version>
+                <configuration>
+                    <scanIntervalSeconds>10</scanIntervalSeconds>
+                </configuration>
+            </plugin>
+        </plugins>    
+  </build>
 
   <repositories>
     <repository>

Modified: myfaces/myfaces-build-tools/trunk/maven2-archetypes/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/myfaces-build-tools/trunk/maven2-archetypes/pom.xml?rev=639141&r1=639140&r2=639141&view=diff
==============================================================================
--- myfaces/myfaces-build-tools/trunk/maven2-archetypes/pom.xml (original)
+++ myfaces/myfaces-build-tools/trunk/maven2-archetypes/pom.xml Wed Mar 19 20:39:04 2008
@@ -67,6 +67,12 @@
 
     <pluginManagement>
       <plugins>
+	<plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-plugin-plugin</artifactId>
+          <!-- 2.4 throws error, so temporally put on 2.3 -->
+          <version>2.3</version>
+        </plugin>
         <plugin>
           <artifactId>maven-jar-plugin</artifactId>
           <version>2.2</version>
@@ -116,6 +122,7 @@
     <module>myfaces-archetype-trinidad</module>
     <module>myfaces-archetype-helloworld</module>
     <module>myfaces-archetype-helloworld-facelets</module>
+    <module>myfaces-archetype-helloworld-portlets</module>
   </modules>
 
   <distributionManagement>



Mime
View raw message