From 3f39accc97ae0f96aae6c2f237652cc07a975daa Mon Sep 17 00:00:00 2001
From: Musachy Barroso <musachy@apache.org>
Date: Mon, 22 Dec 2008 19:15:11 +0000
Subject: [PATCH] Add convention and javatemplates plugins to plugins modules,
 and assembly descriptor

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@728745 13f79535-47bb-0310-9956-ffa450edef68
---
 assembly/pom.xml                   | 12 ++++++++++++
 assembly/src/main/assembly/all.xml |  4 ++++
 plugins/javatemplates/pom.xml      |  6 +++---
 plugins/pom.xml                    |  1 +
 4 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/assembly/pom.xml b/assembly/pom.xml
index 6dd48e283..3234d036c 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -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>
diff --git a/assembly/src/main/assembly/all.xml b/assembly/src/main/assembly/all.xml
index d5402368e..7958f3532 100644
--- a/assembly/src/main/assembly/all.xml
+++ b/assembly/src/main/assembly/all.xml
@@ -127,6 +127,10 @@
         <directory>../plugins/codebehind/target/site</directory>
         <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>
diff --git a/plugins/javatemplates/pom.xml b/plugins/javatemplates/pom.xml
index 79745517e..d414cf659 100644
--- a/plugins/javatemplates/pom.xml
+++ b/plugins/javatemplates/pom.xml
@@ -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>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 36784f69a..f2a82278e 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -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>