From 353c2f203325c906d149799a11f36a82191c9e58 Mon Sep 17 00:00:00 2001
From: Musachy Barroso <musachy@apache.org>
Date: Mon, 10 Aug 2009 19:00:38 +0000
Subject: [PATCH] WW-3217 Bring JSON plugin into trunk

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@802900 13f79535-47bb-0310-9956-ffa450edef68
---
 assembly/pom.xml                   | 14 ++++++++++++++
 assembly/src/main/assembly/all.xml |  4 ++++
 2 files changed, 18 insertions(+)

diff --git a/assembly/pom.xml b/assembly/pom.xml
index 8747e90ac..e60d9d9ef 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -175,6 +175,13 @@
                         <version>${version}</version>
                         <classifier>jdk14</classifier>
                     </dependency>
+                    
+                    <dependency>
+                        <groupId>org.apache.struts</groupId>
+                        <artifactId>struts2-json-plugin</artifactId>
+                        <version>${version}</version>
+                        <classifier>jdk14</classifier>
+                    </dependency>
             </dependencies>
         </profile>
     </profiles>
@@ -443,6 +450,12 @@
             <version>${version}</version>
         </dependency>
         
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-json-plugin</artifactId>
+            <version>${version}</version>
+        </dependency>
+        
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-osgi-plugin</artifactId>
@@ -460,6 +473,7 @@
             <artifactId>struts2-osgi-demo-bundle</artifactId>
             <version>${version}</version>
         </dependency>
+        
 
     </dependencies>
 
diff --git a/assembly/src/main/assembly/all.xml b/assembly/src/main/assembly/all.xml
index fc3f38c13..2c8804f2e 100644
--- a/assembly/src/main/assembly/all.xml
+++ b/assembly/src/main/assembly/all.xml
@@ -219,6 +219,10 @@
         <directory>../plugins/osgi/target/site</directory>
         <outputDirectory>docs/struts2-plugins/struts2-osgi-plugin</outputDirectory>
       </fileSet>
+      <fileSet>
+        <directory>../plugins/osgi/target/site</directory>
+        <outputDirectory>docs/struts2-plugins/struts2-json-plugin</outputDirectory>
+      </fileSet>
       
     <!-- bundles -->
     <fileSet>