[weld-commits] Weld SVN: r6329 - build/trunk/parent.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2010-05-27 14:37:47 -0400 (Thu, 27 May 2010)
New Revision: 6329

Modified:
   build/trunk/parent/pom.xml
Log:
more updates

Modified: build/trunk/parent/pom.xml
===================================================================
--- build/trunk/parent/pom.xml	2010-05-27 14:25:05 UTC (rev 6328)
+++ build/trunk/parent/pom.xml	2010-05-27 18:37:47 UTC (rev 6329)
@@ -46,6 +46,16 @@
          </snapshots>
       </pluginRepository>
       <pluginRepository>
+         <id>download.java.net/glassfish</id>
+         <url>http://download.java.net/maven/glassfish</url>
+         <releases>
+            <enabled>true</enabled>
+         </releases>
+         <snapshots>
+            <enabled>false</enabled>
+         </snapshots>
+      </pluginRepository>
+      <pluginRepository>
          <id>repository.jboss.org</id>
          <url>http://repository.jboss.org/maven2</url>
          <releases>
@@ -233,6 +243,7 @@
                   <descriptors>
                      <descriptor>src/main/assembly/assembly.xml</descriptor>
                   </descriptors>
+                  <finalName>${project.build.finalName}</finalName>
                </configuration>
             </plugin>
             <plugin>
@@ -298,9 +309,15 @@
                            <requireMavenVersion>
                               <version>[${minimum.maven.version},)</version>
                            </requireMavenVersion>
-                           <requirePluginVersions />
+                           <requirePluginVersions>
+                              <unCheckedPlugins>
+                                 <unCheckedPlugin>org.apache.maven.plugins:maven-eclipse-plugin</unCheckedPlugin>
+                                 <unCheckedPlugin>org.codehaus.mojo:versions-maven-plugin</unCheckedPlugin>
+                              </unCheckedPlugins>
+                           </requirePluginVersions>
+
                         </rules>
-                        <unCheckedPluginsList>org.apache.maven.plugins:maven-eclipse-plugin</unCheckedPluginsList>
+
                      </configuration>
                   </execution>
                </executions>
@@ -406,9 +423,9 @@
                <version>3.0</version>
                <configuration>
                   <goalPrefix>glassfish</goalPrefix>
-                  <app>${project.build.directory}/${build.finalName}.war</app>
+                  <app>${project.build.directory}/${project.build.finalName}.war</app>
                   <port>7070</port>
-                  <contextRoot>${build.finalName}</contextRoot>
+                  <contextRoot>${project.build.finalName}</contextRoot>
                </configuration>
                <executions>
                   <execution>
@@ -428,7 +445,7 @@
                   <connectors>
                      <connector
                         implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-                        <port>6060</port>
+                        <port>9090</port>
                      </connector>
                   </connectors>
                   <!-- force friendly name instead of artifact name + version -->
@@ -437,7 +454,7 @@
                      Where the BeanManager is constructed. This is where
                      you'll declare datasources.
                   -->
-                  <jettyEnvXml>${basedir}/src/test/resources/jetty-env.xml</jettyEnvXml>
+                  <jettyEnvXml>${basedir}/src/main/resources/jetty-env.xml</jettyEnvXml>
                   <!-- This parameter will auto-deploy modified classes. -->
                   <!--
                      You can save changes in a file or class and refresh
@@ -453,10 +470,11 @@
                <groupId>org.codehaus.mojo</groupId>
                <artifactId>tomcat-maven-plugin</artifactId>
                <version>1.0-beta-1</version>
+               <inherited>true</inherited>
                <configuration>
                   <path>/${project.build.finalName}</path>
                   <!-- Embedded port -->
-                  <port>9090</port>
+                  <port>6060</port>
                   <!--
                      The default authentication credentials for remote
                      deployment are username "admin" with no password To
@@ -471,6 +489,7 @@
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-war-plugin</artifactId>
                <version>2.1-beta-1</version>
+               <inherited>true</inherited>
                <configuration>
                   <failOnMissingWebXml>false</failOnMissingWebXml>
                   <warName>${project.build.finalName}</warName>
@@ -592,7 +611,7 @@
                   <artifactId>maven-javadoc-plugin</artifactId>
                   <executions>
                      <execution>
-                        <id>javadoc-api</id>
+                        <id>javadoc</id>
                         <phase>package</phase>
                         <goals>
                            <goal>javadoc</goal>