[Mashup-dev] svn commit r18822 - in trunk/mashup/java: . modules/distribution modules/distribution/src/assemble

[channa at wso2.com]

Author: channa
Date: Thu Jul  3 03:53:59 2008
New Revision: 18822
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=18822

Log:
Added dependancies and configuration file copying for AntiSamy. Completed MASHUP-660. Can tweak config and apply to other locations as necessary.


Modified:
   trunk/mashup/java/modules/distribution/create-distro-build.xml
   trunk/mashup/java/modules/distribution/src/assemble/bin-release-assembly.xml
   trunk/mashup/java/pom.xml

Modified: trunk/mashup/java/modules/distribution/create-distro-build.xml
URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/distribution/create-distro-build.xml?rev=18822&r1=18821&r2=18822&view=diff
==============================================================================
--- trunk/mashup/java/modules/distribution/create-distro-build.xml	(original)
+++ trunk/mashup/java/modules/distribution/create-distro-build.xml	Thu Jul  3 03:53:59 2008
@@ -222,6 +222,7 @@
                 <include name="wrapper.conf"/>
                 <include name="log4j.properties"/>
                 <include name="registry.xml"/>
+                <include name="antisamy-mashup-1.0.xml"/>
             </fileset>
         </copy>
 

Modified: trunk/mashup/java/modules/distribution/src/assemble/bin-release-assembly.xml
URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/distribution/src/assemble/bin-release-assembly.xml?rev=18822&r1=18821&r2=18822&view=diff
==============================================================================
--- trunk/mashup/java/modules/distribution/src/assemble/bin-release-assembly.xml	(original)
+++ trunk/mashup/java/modules/distribution/src/assemble/bin-release-assembly.xml	Thu Jul  3 03:53:59 2008
@@ -89,6 +89,9 @@
                 <include>org.slf4j:slf4j-simple:jar</include>
                 <include>org.slf4j:slf4j-api:jar</include>
                 <include>antisamy:antisamy-bin:jar</include>
+                <include>batik:batik-css:jar</include>
+                <include>batik:batik-util:jar</include>
+                <include>nekohtml:nekohtml:jar</include>
            </includes>
         </dependencySet>
     </dependencySets>

Modified: trunk/mashup/java/pom.xml
URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/pom.xml?rev=18822&r1=18821&r2=18822&view=diff
==============================================================================
--- trunk/mashup/java/pom.xml	(original)
+++ trunk/mashup/java/pom.xml	Thu Jul  3 03:53:59 2008
@@ -1323,6 +1323,21 @@
                  <artifactId>antisamy-bin</artifactId>
                  <version>${antisamy.version}</version>
         </dependency>
+        <dependency>
+                 <groupId>batik</groupId>
+                 <artifactId>batik-css</artifactId>
+                 <version>${batik.version}</version>
+        </dependency>
+        <dependency>
+                 <groupId>batik</groupId>
+                 <artifactId>batik-util</artifactId>
+                 <version>${batik.version}</version>
+        </dependency>
+        <dependency>
+                 <groupId>nekohtml</groupId>
+                 <artifactId>nekohtml</artifactId>
+                 <version>${nekohtml.version}</version>
+        </dependency>
     </dependencies>
 
     <modules>
@@ -1443,5 +1458,7 @@
         <icu4j.version>3.4.4</icu4j.version>
         <wsdlvalidator.version>3.395</wsdlvalidator.version>
         <antisamy.version>1.2</antisamy.version>
+        <batik.version>1.7</batik.version>
+        <nekohtml.version>1.9.7</nekohtml.version>
     </properties>
 </project>