Author: musachy
Date: Mon Dec 22 11:15:11 2008
New Revision: 728745
URL: http://svn.apache.org/viewvc?rev=728745&view=rev
Log:
Add convention and javatemplates plugins to plugins modules, and assembly
descriptor
Modified:
struts/struts2/trunk/assembly/pom.xml
struts/struts2/trunk/assembly/src/main/assembly/all.xml
struts/struts2/trunk/plugins/javatemplates/pom.xml
struts/struts2/trunk/plugins/pom.xml
Modified: struts/struts2/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/pom.xml?rev=728745&r1=728744&r2=728745&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/pom.xml (original)
+++ struts/struts2/trunk/assembly/pom.xml Mon Dec 22 11:15:11 2008
@@ -166,6 +166,18 @@
<artifactId>struts2-codebehind-plugin</artifactId>
<version>${version}</version>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-convention-plugin</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-javatemplates-plugin</artifactId>
+ <version>${version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.struts</groupId>
Modified: struts/struts2/trunk/assembly/src/main/assembly/all.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/src/main/assembly/all.xml?rev=728745&r1=728744&r2=728745&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/src/main/assembly/all.xml (original)
+++ struts/struts2/trunk/assembly/src/main/assembly/all.xml Mon Dec 22 11:15:11
2008
@@ -128,6 +128,10 @@
<outputDirectory>docs/struts2-plugins/struts2-codebehind-plugin</outputDirectory>
</fileSet>
<fileSet>
+ <directory>../plugins/codebehind/target/site</directory>
+
<outputDirectory>docs/struts2-plugins/struts2-javatemplates-plugin</outputDirectory>
+ </fileSet>
+ <fileSet>
<directory>../plugins/convention/target/site</directory>
<outputDirectory>docs/struts2-plugins/struts2-convention-plugin</outputDirectory>
</fileSet>
Modified: struts/struts2/trunk/plugins/javatemplates/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/javatemplates/pom.xml?rev=728745&r1=728744&r2=728745&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/javatemplates/pom.xml (original)
+++ struts/struts2/trunk/plugins/javatemplates/pom.xml Mon Dec 22 11:15:11 2008
@@ -13,9 +13,9 @@
<name>Struts 2 Java Templates Plugin</name>
<scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/trunk/struts2-javatemplates-plugin/</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/trunk/struts2-javatemplates-plugin/</developerConnection>
-
<url>http://svn.apache.org/viewcvs.cgi/struts/sandbox/trunk/struts2-javatemplates-plugin/</url>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/javatemplates/</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/javatemplates/</developerConnection>
+
<url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/javatemplates/</url>
</scm>
<dependencies>
Modified: struts/struts2/trunk/plugins/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/pom.xml?rev=728745&r1=728744&r2=728745&view=diff
==============================================================================
--- struts/struts2/trunk/plugins/pom.xml (original)
+++ struts/struts2/trunk/plugins/pom.xml Mon Dec 22 11:15:11 2008
@@ -43,6 +43,7 @@
<module>codebehind</module>
<module>convention</module>
<module>config-browser</module>
+ <module>javatemplates</module>
<module>jasperreports</module>
<module>jfreechart</module>
<module>jsf</module>
