Author: saminda
Date: Tue Jan 22 04:54:24 2008
New Revision: 12679
Log:
fixing build and test case
Modified:
branches/wsas/java/2.2/wsas/java/modules/distribution/pom.xml
branches/wsas/java/2.2/wsas/java/modules/documentation/pom.xml
branches/wsas/java/2.2/wsas/java/modules/integration/pom.xml
branches/wsas/java/2.2/wsas/java/modules/integration/test/org/wso2/documentation/DocLinkT.java
branches/wsas/java/2.2/wsas/java/pom.xml
Modified: branches/wsas/java/2.2/wsas/java/modules/distribution/pom.xml
==============================================================================
--- branches/wsas/java/2.2/wsas/java/modules/distribution/pom.xml
(original)
+++ branches/wsas/java/2.2/wsas/java/modules/distribution/pom.xml Tue Jan
22 04:54:24 2008
@@ -496,13 +496,13 @@
<echo message="################## Copy docs in
the xdocs ####################"/>
<copy todir="${dist.temp.dir}/docs">
- <fileset
dir="../../target/site/wso2wsas-documentation">
+ <fileset
dir="../documentation/target/site">
<exclude name="**/**.html"/>
</fileset>
</copy>
<copy todir="${dist.temp.dir}/docs"
filtering="on">
- <fileset
dir="../../target/site/wso2wsas-documentation">
+ <fileset
dir="../documentation/target/site">
<include name="**/**.html"/>
<include name="**/**.css"/>
<include name="**/**.xsl"/>
Modified: branches/wsas/java/2.2/wsas/java/modules/documentation/pom.xml
==============================================================================
--- branches/wsas/java/2.2/wsas/java/modules/documentation/pom.xml
(original)
+++ branches/wsas/java/2.2/wsas/java/modules/documentation/pom.xml Tue Jan
22 04:54:24 2008
@@ -32,62 +32,5 @@
</plugin>
</plugins>
</build>
-
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-report-plugin</artifactId>
- <configuration>
-
<outputDirectory>../../target/site/${artifactId}</outputDirectory>
-
<reportsDirectory>target/surefire-reports</reportsDirectory>
- <outputName>${artifactId}-test-report</outputName>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
-
<outputDirectory>../../target/site/${artifactId}</outputDirectory>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>findbugs-maven-plugin</artifactId>
- <version>1.1.1</version>
- <configuration>
- <!--<xmlOutput>true|false</xmlOutput>
- <xmlOutputDirectory>
- directory location of xml findbugs report
- </xmlOutputDirectory>
- <threshold>Normal</threshold>
- <effort>Default</effort>
- <excludeFilterFile>findbugs-exclude.xml</excludeFilterFile>
- <includeFilterFile>findbugs-include.xml</includeFilterFile>
- <visitors>FindDeadLocalStores,UnreadFields</visitors>
-
<omitVisitors>FindDeadLocalStores,UnreadFields</omitVisitors>
- <onlyAnalyze>org.codehaus.mojo.findbugs.*</onlyAnalyze>
-
<pluginList>/libs/fb-contrib/fb-contrib-2.8.0.jar</pluginList>
- <debug>true|false</debug>
- <relaxed>true|false</relaxed>-->
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
- <!--<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-clover-plugin</artifactId>
- </plugin>-->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-pmd-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
+
</project>
\ No newline at end of file
Modified: branches/wsas/java/2.2/wsas/java/modules/integration/pom.xml
==============================================================================
--- branches/wsas/java/2.2/wsas/java/modules/integration/pom.xml
(original)
+++ branches/wsas/java/2.2/wsas/java/modules/integration/pom.xml Tue Jan
22 04:54:24 2008
@@ -62,9 +62,8 @@
</dependency>
<dependency>
- <groupId>org.wso2.wsas</groupId>
- <artifactId>wso2wsas-samples-Javascript-service</artifactId>
- <version>${pom.version}</version>
+ <groupId>httpunit</groupId>
+ <artifactId>httpunit</artifactId>
<scope>test</scope>
</dependency>
@@ -218,7 +217,7 @@
<mkdir
dir="target/tomcat_test/lib/tomcat/webapps/ROOT/test_docs"/>
<copy
todir="target/tomcat_test/lib/tomcat/webapps/ROOT/test_docs">
- <fileset
dir="../../target/site/wso2wsas-documentation"/>
+ <fileset
dir="../documentation/target/site"/>
</copy>
<copy
todir="target/tomcat_test/lib/tomcat/webapps/ROOT/test_docs">
<fileset dir="../samples">
Modified:
branches/wsas/java/2.2/wsas/java/modules/integration/test/org/wso2/documentation/DocLinkT.java
==============================================================================
---
branches/wsas/java/2.2/wsas/java/modules/integration/test/org/wso2/documentation/DocLinkT.java
(original)
+++
branches/wsas/java/2.2/wsas/java/modules/integration/test/org/wso2/documentation/DocLinkT.java
Tue Jan 22 04:54:24 2008
@@ -108,6 +108,13 @@
continue;
}
+
+ if (urlString.indexOf("wso2.org") > -1) {
+ linkInfo.setDescription("Found an external link for wso2.org
[Ignore]");
+ externelList.add(linkInfo);
+ continue;
+ }
+
if (urlString.indexOf("apidocs") > -1) {
linkInfo.setDescription("Found API docs");
externelList.add(linkInfo);
Modified: branches/wsas/java/2.2/wsas/java/pom.xml
==============================================================================
--- branches/wsas/java/2.2/wsas/java/pom.xml (original)
+++ branches/wsas/java/2.2/wsas/java/pom.xml Tue Jan 22 04:54:24 2008
@@ -780,17 +780,16 @@
</dependency>
<dependency>
- <groupId>httpunit</groupId>
- <artifactId>httpunit</artifactId>
- <version>1.6.2-PATCH</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.wso2.dataservice</groupId>
<artifactId>wso2data-service</artifactId>
<version>${wso2dataservice.version}</version>
</dependency>
+ <dependency>
+ <groupId>httpunit</groupId>
+ <artifactId>httpunit</artifactId>
+ <version>1.6.2-PATCHED</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
_______________________________________________
Wsas-java-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/wsas-java-dev
