[seam-commits] Seam SVN: r7836 - in branches/Seam_2_0: doc/Seam_Reference_Guide/en and 1 other directory.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Mon Apr 7 13:25:46 EDT 2008
Author: pete.muir at jboss.org
Date: 2008-04-07 13:25:45 -0400 (Mon, 07 Apr 2008)
New Revision: 7836
Added:
branches/Seam_2_0/build/maven/
Modified:
branches/Seam_2_0/build/common.build.xml
branches/Seam_2_0/build/parent.pom.xml
branches/Seam_2_0/build/root.pom.xml
branches/Seam_2_0/build/utilities.build.xml
branches/Seam_2_0/doc/Seam_Reference_Guide/en/Tutorial.xml
Log:
Upgrade to maven 2.0.8 and add dependencyReport target
Modified: branches/Seam_2_0/build/common.build.xml
===================================================================
--- branches/Seam_2_0/build/common.build.xml 2008-04-07 17:22:00 UTC (rev 7835)
+++ branches/Seam_2_0/build/common.build.xml 2008-04-07 17:25:45 UTC (rev 7836)
@@ -275,6 +275,60 @@
</sequential>
</macrodef>
+ <macrodef name="dependencyReport">
+ <attribute name="module" />
+ <attribute name="pom" default="${tmp.dir}/poms/@{module}.pom" />
+ <attribute name="output" default="${tmp.dir}/poms/@{module}-dependency-report.txt" />
+ <sequential>
+ <maven target="-f @{pom} dependency:tree" basedir="${seam.dir}">
+ <arg line="-DoutputFile=@{output}" />
+ <arg line="" />
+ </maven>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="outputDependencyReport">
+ <attribute name="module" />
+ <attribute name="output" default="${seam.dir}/dependency-report.txt"/>
+ <sequential>
+ <dependencyReport module="@{module}" />
+ <concat append="true" destfile="@{output}">
+ <header>
+
+
+-----------------------------------------
+Dependency Tree for @{module}
+*****************************************
+-----------------------------------------
+
+</header>
+ <fileset file="${tmp.dir}/poms/@{module}-dependency-report.txt"/>
+ </concat>
+ </sequential>
+ </macrodef>
+
+ <target name="dependencyReport" depends="initpoms" description="Build dependency report for all modules">
+ <delete file="${seam.dir}/dependency-report.txt" />
+ <concat append="true" destfile="${seam.dir}/dependency-report.txt">
+-----------------------------------------
+Dependencies for Seam ${complete.version}
+*****************************************
+-----------------------------------------
+
+ </concat>
+ <outputDependencyReport module="core" />
+ <outputDependencyReport module="debug" />
+ <outputDependencyReport module="ui" />
+ <outputDependencyReport module="remoting" />
+ <outputDependencyReport module="mail" />
+ <outputDependencyReport module="pdf" />
+ <outputDependencyReport module="ioc" />
+ <outputDependencyReport module="wicket" />
+ <outputDependencyReport module="jbas5" />
+ <outputDependencyReport module="jul" />
+ <echo>Dependency Report written to ${seam.dir}/dependency-report.txt</echo>
+ </target>
+
<target name="initdav">
<artifact:install-provider artifactId="wagon-webdav" version="1.0-beta-2"/>
</target>
Copied: branches/Seam_2_0/build/maven (from rev 7835, trunk/build/maven)
Modified: branches/Seam_2_0/build/parent.pom.xml
===================================================================
--- branches/Seam_2_0/build/parent.pom.xml 2008-04-07 17:22:00 UTC (rev 7835)
+++ branches/Seam_2_0/build/parent.pom.xml 2008-04-07 17:25:45 UTC (rev 7836)
@@ -14,27 +14,18 @@
<artifactId>root</artifactId>
<version>@seam.version@</version>
</parent>
- <!-- <pluginRepositories>
- <pluginRepository>
- <snapshots />
- <id>m2-snapshot</id>
- <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
- </pluginRepository>
- </pluginRepositories>-->
- <!-- Uncomment to enable newer version of dependency plugin which has the
- dependency:tree command useful for analyzing the dependency tree of a module
- You'll also need the m2-snapshot repository enabled -->
+
<build>
- <!-- <pluginManagement>
+ <pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.0-alpha-5-SNAPSHOT</version>
+ <version>2.0</version>
</plugin>
</plugins>
- </pluginManagement>-->
+ </pluginManagement>
</build>
<!--
Modified: branches/Seam_2_0/build/root.pom.xml
===================================================================
--- branches/Seam_2_0/build/root.pom.xml 2008-04-07 17:22:00 UTC (rev 7835)
+++ branches/Seam_2_0/build/root.pom.xml 2008-04-07 17:25:45 UTC (rev 7836)
@@ -882,12 +882,6 @@
<version>2.2.1</version>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.0</version>
- </plugin>
-
</plugins>
</pluginManagement>
</build>
Modified: branches/Seam_2_0/build/utilities.build.xml
===================================================================
--- branches/Seam_2_0/build/utilities.build.xml 2008-04-07 17:22:00 UTC (rev 7835)
+++ branches/Seam_2_0/build/utilities.build.xml 2008-04-07 17:25:45 UTC (rev 7836)
@@ -141,7 +141,7 @@
<sequential>
<java classname="org.codehaus.classworlds.Launcher" fork="true" dir="@{basedir}">
<classpath>
- <fileset dir="${maven.dir}/core/boot">
+ <fileset dir="${maven.dir}/boot">
<include name="*.jar" />
</fileset>
<fileset dir="${maven.dir}/bin">
Modified: branches/Seam_2_0/doc/Seam_Reference_Guide/en/Tutorial.xml
===================================================================
--- branches/Seam_2_0/doc/Seam_Reference_Guide/en/Tutorial.xml 2008-04-07 17:22:00 UTC (rev 7835)
+++ branches/Seam_2_0/doc/Seam_Reference_Guide/en/Tutorial.xml 2008-04-07 17:25:45 UTC (rev 7836)
@@ -145,7 +145,7 @@
<title></title>
<programlistingco>
<areaspec>
- <area id="registration-entity-annotation" coords="1"/>
+
<area id="registration-name-annotation" coords="2"/>
<area id="registration-scope-annotation" coords="3"/>
<area id="registration-table-annotation" coords="4"/>
@@ -154,7 +154,7 @@
<area id="registration-notnull" coords="22"/>
<area id="registration-id-annotation" coords="44"/>
</areaspec>
- <programlisting><![CDATA[@Entity
+ <programlisting role="JAVA"><![CDATA[@Entity <co id="registration-entity-annotation"/>
@Name("user")
@Scope(SESSION)
@Table(name="users")
More information about the seam-commits
mailing list