[weld-commits] Weld SVN: r5165 - archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources.

[weld-commits at lists.jboss.org]

Author: dan.j.allen
Date: 2009-11-28 11:14:32 -0500 (Sat, 28 Nov 2009)
New Revision: 5165

Modified:
   archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/pom.xml
Log:
codehaus tomcat plugin


Modified: archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/pom.xml
===================================================================
--- archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/pom.xml	2009-11-28 15:54:16 UTC (rev 5164)
+++ archetypes/trunk/jsf/servlet-minimal/src/main/resources/archetype-resources/pom.xml	2009-11-28 16:14:32 UTC (rev 5165)
@@ -150,39 +150,32 @@
                   </connector>
                </connectors>
                <!-- force friendly name instead of artifact name + version -->
-               <contextPath>${build.finalName}</contextPath>
-               <!-- Where the BeanManager is constructed. This is where you'll declare datasources.
--->
+               <contextPath>${project.build.finalName}</contextPath>
+               <!-- Where the BeanManager is constructed. This is where you'll declare datasources. -->
                <jettyEnvXml>\${basedir}/src/test/resources/jetty-env.xml</jettyEnvXml>
-               
                <!-- This parameter will auto-deploy modified classes. -->
-               <!-- You can save changes in a file or class and refresh your browser to view the changes.
--->
+               <!-- You can save changes in a file or class and refresh your browser to view the changes. -->
                <scanIntervalSeconds>3</scanIntervalSeconds>
             </configuration>
          </plugin>
-         <!-- Cargo - deploys to Tomcat using command 'mvn clean package cargo:redeploy'. -->
-<plugin>
-	<groupId>org.codehaus.cargo</groupId>
-	<artifactId>cargo-maven2-plugin</artifactId>
-	<configuration>
-		<container>
-			<containerId>tomcat6x</containerId>
-			<type>remote</type>
-		</container>
-		<configuration>
-			<type>runtime</type>
-			<properties>
-				<!-- Declare a tomcat.user and tomcat.password in your settings file -->
-				<cargo.remote.username>${tomcat.username}</cargo.remote.username>
-				<cargo.remote.password>${tomcat.password}</cargo.remote.password>
-				<!--defaults to localhost:8080-->
-				<!--<cargo.hostname>localhost</cargo.hostname>-->
-				<!--<cargo.servlet.port>8080</cargo.servlet.port>-->
-			</properties>
-		</configuration>
-	</configuration>
-</plugin>
+
+         <!-- Embedded Tomcat (package tomcat:run) -->
+         <!-- Standalone Tomcat (package tomcat:deploy) -->
+         <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>tomcat-maven-plugin</artifactId>
+            <configuration>
+               <path>/${project.build.finalName}</path>
+               <!-- Embedded port -->
+               <port>9090</port>
+               <!--
+                  The default authentication credentials for remote deployment are username "admin" with no password
+                  To override credentials, define a server in settings.xml and activate it using the <server> element
+               -->
+               <url>http://localhost:8080/manager</url>
+            </configuration>
+         </plugin>
+
       </plugins>
       
    </build>