Author: musachy
Date: Mon Aug 10 19:00:38 2009
New Revision: 802900
URL: http://svn.apache.org/viewvc?rev=802900&view=rev
Log:
WW-3217 Bring JSON plugin into trunk
Modified:
struts/struts2/trunk/assembly/pom.xml
struts/struts2/trunk/assembly/src/main/assembly/all.xml
Modified: struts/struts2/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/assembly/pom.xml?rev=802900&r1=802899&r2=802900&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/pom.xml (original)
+++ struts/struts2/trunk/assembly/pom.xml Mon Aug 10 19:00:38 2009
@@ -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>
@@ -445,6 +452,12 @@
<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>
<version>${version}</version>
</dependency>
@@ -460,6 +473,7 @@
<artifactId>struts2-osgi-demo-bundle</artifactId>
<version>${version}</version>
</dependency>
+
</dependencies>
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=802900&r1=802899&r2=802900&view=diff
==============================================================================
--- struts/struts2/trunk/assembly/src/main/assembly/all.xml (original)
+++ struts/struts2/trunk/assembly/src/main/assembly/all.xml Mon Aug 10 19:00:38
2009
@@ -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>
