Thread: [Jsptest-svn-commits] SF.net SVN: jsptest:[252] tags
Status: Alpha
Brought to you by:
lkoskela
From: <lko...@us...> - 2008-11-19 13:05:23
|
Revision: 252 http://jsptest.svn.sourceforge.net/jsptest/?rev=252&view=rev Author: lkoskela Date: 2008-11-19 13:05:17 +0000 (Wed, 19 Nov 2008) Log Message: ----------- [maven-release-plugin] copy for tag jsptest-0.18 Added Paths: ----------- tags/jsptest-0.18/ tags/jsptest-0.18/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml tags/jsptest-0.18/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml tags/jsptest-0.18/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml tags/jsptest-0.18/jsptest-acceptance/pom.xml tags/jsptest-0.18/jsptest-generic/jsptest-common/pom.xml tags/jsptest-0.18/jsptest-generic/jsptest-compiler-api/pom.xml tags/jsptest-0.18/jsptest-generic/jsptest-framework/pom.xml tags/jsptest-0.18/jsptest-generic/pom.xml tags/jsptest-0.18/jsptest-jsp12/pom.xml tags/jsptest-0.18/jsptest-jsp20/pom.xml tags/jsptest-0.18/jsptest-jsp21/pom.xml tags/jsptest-0.18/pom.xml Removed Paths: ------------- tags/jsptest-0.18/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml tags/jsptest-0.18/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml tags/jsptest-0.18/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml tags/jsptest-0.18/jsptest-acceptance/pom.xml tags/jsptest-0.18/jsptest-generic/jsptest-common/pom.xml tags/jsptest-0.18/jsptest-generic/jsptest-compiler-api/pom.xml tags/jsptest-0.18/jsptest-generic/jsptest-framework/pom.xml tags/jsptest-0.18/jsptest-generic/pom.xml tags/jsptest-0.18/jsptest-jsp12/pom.xml tags/jsptest-0.18/jsptest-jsp20/pom.xml tags/jsptest-0.18/jsptest-jsp21/pom.xml tags/jsptest-0.18/pom.xml Deleted: tags/jsptest-0.18/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml =================================================================== --- trunk/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml 2008-11-09 12:08:04 UTC (rev 249) +++ tags/jsptest-0.18/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml 2008-11-19 13:05:17 UTC (rev 252) @@ -1,24 +0,0 @@ -<?xml version="1.0"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest-acceptance</artifactId> - <version>0.18-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>jsptest-acceptance-jsp12</artifactId> - <packaging>jar</packaging> - <name> - Acceptance tests for the JspTest variant for the JSP 1.2 - specification. - </name> - <description /> - <dependencies> - <dependency> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest-jsp12</artifactId> - </dependency> - </dependencies> -</project> Copied: tags/jsptest-0.18/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml (from rev 251, trunk/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml) =================================================================== --- tags/jsptest-0.18/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml (rev 0) +++ tags/jsptest-0.18/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml 2008-11-19 13:05:17 UTC (rev 252) @@ -0,0 +1,21 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest-acceptance</artifactId> + <version>0.18</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>jsptest-acceptance-jsp12</artifactId> + <packaging>jar</packaging> + <name> + Acceptance tests for the JspTest variant for the JSP 1.2 + specification. + </name> + <description /> + <dependencies> + <dependency> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest-jsp12</artifactId> + </dependency> + </dependencies> +</project> \ No newline at end of file Deleted: tags/jsptest-0.18/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml =================================================================== --- trunk/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml 2008-11-09 12:08:04 UTC (rev 249) +++ tags/jsptest-0.18/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml 2008-11-19 13:05:17 UTC (rev 252) @@ -1,24 +0,0 @@ -<?xml version="1.0"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest-acceptance</artifactId> - <version>0.18-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>jsptest-acceptance-jsp20</artifactId> - <packaging>jar</packaging> - <name> - Acceptance tests for the JspTest variant for the JSP 2.0 - specification. - </name> - <description /> - <dependencies> - <dependency> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest-jsp20</artifactId> - </dependency> - </dependencies> -</project> Copied: tags/jsptest-0.18/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml (from rev 251, trunk/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml) =================================================================== --- tags/jsptest-0.18/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml (rev 0) +++ tags/jsptest-0.18/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml 2008-11-19 13:05:17 UTC (rev 252) @@ -0,0 +1,21 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest-acceptance</artifactId> + <version>0.18</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>jsptest-acceptance-jsp20</artifactId> + <packaging>jar</packaging> + <name> + Acceptance tests for the JspTest variant for the JSP 2.0 + specification. + </name> + <description /> + <dependencies> + <dependency> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest-jsp20</artifactId> + </dependency> + </dependencies> +</project> \ No newline at end of file Deleted: tags/jsptest-0.18/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml =================================================================== --- trunk/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml 2008-11-09 12:08:04 UTC (rev 249) +++ tags/jsptest-0.18/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml 2008-11-19 13:05:17 UTC (rev 252) @@ -1,25 +0,0 @@ -<?xml version="1.0"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest-acceptance</artifactId> - <version>0.18-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>jsptest-acceptance-jsp21</artifactId> - <version>0.18-SNAPSHOT</version> - <packaging>jar</packaging> - <name> - Acceptance tests for the JspTest variant for the JSP 2.1 - specification. - </name> - <description /> - <dependencies> - <dependency> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest-jsp21</artifactId> - </dependency> - </dependencies> -</project> Copied: tags/jsptest-0.18/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml (from rev 251, trunk/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml) =================================================================== --- tags/jsptest-0.18/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml (rev 0) +++ tags/jsptest-0.18/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml 2008-11-19 13:05:17 UTC (rev 252) @@ -0,0 +1,22 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest-acceptance</artifactId> + <version>0.18</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>jsptest-acceptance-jsp21</artifactId> + <version>0.18</version> + <packaging>jar</packaging> + <name> + Acceptance tests for the JspTest variant for the JSP 2.1 + specification. + </name> + <description /> + <dependencies> + <dependency> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest-jsp21</artifactId> + </dependency> + </dependencies> +</project> \ No newline at end of file Deleted: tags/jsptest-0.18/jsptest-acceptance/pom.xml =================================================================== --- trunk/jsptest-acceptance/pom.xml 2008-11-09 12:08:04 UTC (rev 249) +++ tags/jsptest-0.18/jsptest-acceptance/pom.xml 2008-11-19 13:05:17 UTC (rev 252) @@ -1,18 +0,0 @@ -<?xml version="1.0"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest</artifactId> - <version>0.18-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>jsptest-acceptance</artifactId> - <name>JspTest root project for acceptance test modules</name> - <description>This POM acts as a virtual root for the acceptance test projects for different JSP specification variants of JspTest.</description> - <packaging>pom</packaging> - <modules> - <module>jsptest-acceptance-jsp12</module> - <module>jsptest-acceptance-jsp20</module> - <module>jsptest-acceptance-jsp21</module> - </modules> -</project> Copied: tags/jsptest-0.18/jsptest-acceptance/pom.xml (from rev 251, trunk/jsptest-acceptance/pom.xml) =================================================================== --- tags/jsptest-0.18/jsptest-acceptance/pom.xml (rev 0) +++ tags/jsptest-0.18/jsptest-acceptance/pom.xml 2008-11-19 13:05:17 UTC (rev 252) @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest</artifactId> + <version>0.18</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>jsptest-acceptance</artifactId> + <name>JspTest root project for acceptance test modules</name> + <description>This POM acts as a virtual root for the acceptance test projects for different JSP specification variants of JspTest.</description> + <packaging>pom</packaging> + <modules> + <module>jsptest-acceptance-jsp12</module> + <module>jsptest-acceptance-jsp20</module> + <module>jsptest-acceptance-jsp21</module> + </modules> +</project> Deleted: tags/jsptest-0.18/jsptest-generic/jsptest-common/pom.xml =================================================================== --- trunk/jsptest-generic/jsptest-common/pom.xml 2008-11-09 12:08:04 UTC (rev 249) +++ tags/jsptest-0.18/jsptest-generic/jsptest-common/pom.xml 2008-11-19 13:05:17 UTC (rev 252) @@ -1,41 +0,0 @@ -<?xml version="1.0"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest-generic</artifactId> - <version>0.18-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>jsptest-common</artifactId> - <version>0.18-SNAPSHOT</version> - <packaging>jar</packaging> - <name>Common utilities</name> - <description> - Common utilities for the components of JspTest, including the - JSP version-specific compiler implementations. - </description> - <profiles> - <profile> - <id>default-tools.jar</id> - <activation> - <property> - <name>java.vendor</name> - <value>Sun Microsystems Inc.</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>com.sun</groupId> - <artifactId>tools</artifactId> - <version>1.4.2</version> - <scope>system</scope> - <systemPath> - ${java.home}/../lib/tools.jar - </systemPath> - </dependency> - </dependencies> - </profile> - </profiles> -</project> Copied: tags/jsptest-0.18/jsptest-generic/jsptest-common/pom.xml (from rev 251, trunk/jsptest-generic/jsptest-common/pom.xml) =================================================================== --- tags/jsptest-0.18/jsptest-generic/jsptest-common/pom.xml (rev 0) +++ tags/jsptest-0.18/jsptest-generic/jsptest-common/pom.xml 2008-11-19 13:05:17 UTC (rev 252) @@ -0,0 +1,38 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest-generic</artifactId> + <version>0.18</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>jsptest-common</artifactId> + <version>0.18</version> + <packaging>jar</packaging> + <name>Common utilities</name> + <description> + Common utilities for the components of JspTest, including the + JSP version-specific compiler implementations. + </description> + <profiles> + <profile> + <id>default-tools.jar</id> + <activation> + <property> + <name>java.vendor</name> + <value>Sun Microsystems Inc.</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>com.sun</groupId> + <artifactId>tools</artifactId> + <version>1.4.2</version> + <scope>system</scope> + <systemPath> + ${java.home}/../lib/tools.jar + </systemPath> + </dependency> + </dependencies> + </profile> + </profiles> +</project> \ No newline at end of file Deleted: tags/jsptest-0.18/jsptest-generic/jsptest-compiler-api/pom.xml =================================================================== --- trunk/jsptest-generic/jsptest-compiler-api/pom.xml 2008-11-09 12:08:04 UTC (rev 249) +++ tags/jsptest-0.18/jsptest-generic/jsptest-compiler-api/pom.xml 2008-11-19 13:05:17 UTC (rev 252) @@ -1,19 +0,0 @@ -<?xml version="1.0"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest-generic</artifactId> - <version>0.18-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>jsptest-compiler-api</artifactId> - <version>0.18-SNAPSHOT</version> - <packaging>jar</packaging> - <name>Internal compiler API</name> - <description> - A common internal API for the different versions of JSP - version-specific compilers. - </description> -</project> Copied: tags/jsptest-0.18/jsptest-generic/jsptest-compiler-api/pom.xml (from rev 251, trunk/jsptest-generic/jsptest-compiler-api/pom.xml) =================================================================== --- tags/jsptest-0.18/jsptest-generic/jsptest-compiler-api/pom.xml (rev 0) +++ tags/jsptest-0.18/jsptest-generic/jsptest-compiler-api/pom.xml 2008-11-19 13:05:17 UTC (rev 252) @@ -0,0 +1,16 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest-generic</artifactId> + <version>0.18</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>jsptest-compiler-api</artifactId> + <version>0.18</version> + <packaging>jar</packaging> + <name>Internal compiler API</name> + <description> + A common internal API for the different versions of JSP + version-specific compilers. + </description> +</project> \ No newline at end of file Deleted: tags/jsptest-0.18/jsptest-generic/jsptest-framework/pom.xml =================================================================== --- trunk/jsptest-generic/jsptest-framework/pom.xml 2008-11-09 12:08:04 UTC (rev 249) +++ tags/jsptest-0.18/jsptest-generic/jsptest-framework/pom.xml 2008-11-19 13:05:17 UTC (rev 252) @@ -1,30 +0,0 @@ -<?xml version="1.0"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest-generic</artifactId> - <version>0.18-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>jsptest-framework</artifactId> - <version>0.18-SNAPSHOT</version> - <packaging>jar</packaging> - <name>Core framework</name> - <description> - The core framework functionality for JspTest. - </description> - <dependencies> - <dependency> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest-compiler-api</artifactId> - <version>0.18-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest-common</artifactId> - <version>0.18-SNAPSHOT</version> - </dependency> - </dependencies> -</project> Copied: tags/jsptest-0.18/jsptest-generic/jsptest-framework/pom.xml (from rev 251, trunk/jsptest-generic/jsptest-framework/pom.xml) =================================================================== --- tags/jsptest-0.18/jsptest-generic/jsptest-framework/pom.xml (rev 0) +++ tags/jsptest-0.18/jsptest-generic/jsptest-framework/pom.xml 2008-11-19 13:05:17 UTC (rev 252) @@ -0,0 +1,27 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest-generic</artifactId> + <version>0.18</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>jsptest-framework</artifactId> + <version>0.18</version> + <packaging>jar</packaging> + <name>Core framework</name> + <description> + The core framework functionality for JspTest. + </description> + <dependencies> + <dependency> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest-compiler-api</artifactId> + <version>0.18</version> + </dependency> + <dependency> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest-common</artifactId> + <version>0.18</version> + </dependency> + </dependencies> +</project> \ No newline at end of file Deleted: tags/jsptest-0.18/jsptest-generic/pom.xml =================================================================== --- trunk/jsptest-generic/pom.xml 2008-11-09 12:08:04 UTC (rev 249) +++ tags/jsptest-0.18/jsptest-generic/pom.xml 2008-11-19 13:05:17 UTC (rev 252) @@ -1,41 +0,0 @@ -<?xml version="1.0"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest</artifactId> - <version>0.18-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>jsptest-generic</artifactId> - <version>0.18-SNAPSHOT</version> - <name>JspTest root project for the generic components</name> - <description>This POM acts as a virtual root for the set of generic components that make up JspTest.</description> - <packaging>pom</packaging> - <modules> - <module>jsptest-common</module> - <module>jsptest-compiler-api</module> - <module>jsptest-framework</module> - </modules> - <dependencies> - <dependency> - <groupId>jtidy</groupId> - <artifactId>jtidy</artifactId> - <version>4aug2000r7-dev</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.2</version> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.13</version> - </dependency> - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - <version>1.1.1</version> - </dependency> - </dependencies> -</project> Copied: tags/jsptest-0.18/jsptest-generic/pom.xml (from rev 251, trunk/jsptest-generic/pom.xml) =================================================================== --- tags/jsptest-0.18/jsptest-generic/pom.xml (rev 0) +++ tags/jsptest-0.18/jsptest-generic/pom.xml 2008-11-19 13:05:17 UTC (rev 252) @@ -0,0 +1,41 @@ +<?xml version="1.0"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest</artifactId> + <version>0.18</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>jsptest-generic</artifactId> + <version>0.18</version> + <name>JspTest root project for the generic components</name> + <description>This POM acts as a virtual root for the set of generic components that make up JspTest.</description> + <packaging>pom</packaging> + <modules> + <module>jsptest-common</module> + <module>jsptest-compiler-api</module> + <module>jsptest-framework</module> + </modules> + <dependencies> + <dependency> + <groupId>jtidy</groupId> + <artifactId>jtidy</artifactId> + <version>4aug2000r7-dev</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.2</version> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.13</version> + </dependency> + <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <version>1.1.1</version> + </dependency> + </dependencies> +</project> Deleted: tags/jsptest-0.18/jsptest-jsp12/pom.xml =================================================================== --- trunk/jsptest-jsp12/pom.xml 2008-11-09 12:08:04 UTC (rev 249) +++ tags/jsptest-0.18/jsptest-jsp12/pom.xml 2008-11-19 13:05:17 UTC (rev 252) @@ -1,53 +0,0 @@ -<?xml version="1.0"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest</artifactId> - <version>0.18-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>jsptest-jsp12</artifactId> - <packaging>jar</packaging> - <name>JspTest for JSP 1.2</name> - <description> - JspTest variant suitable for testing JavaServer Pages that - follow the JSP 1.2 specification. - </description> - <dependencies> - <dependency> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest-framework</artifactId> - </dependency> - <!-- needed for JSTL/TLD configuration --> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <version>1.0.2</version> - </dependency> - <dependency> - <groupId>taglibs</groupId> - <artifactId>standard</artifactId> - <version>1.0.2</version> - </dependency> - <!-- Provides the Jasper JSP compiler --> - <dependency> - <groupId>tomcat</groupId> - <artifactId>jasper-compiler</artifactId> - <version>4.1.30</version> - </dependency> - <dependency> - <groupId>tomcat</groupId> - <artifactId>jasper-runtime</artifactId> - <version>4.1.30</version> - </dependency> - </dependencies> - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - </resource> - </resources> - </build> -</project> Copied: tags/jsptest-0.18/jsptest-jsp12/pom.xml (from rev 251, trunk/jsptest-jsp12/pom.xml) =================================================================== --- tags/jsptest-0.18/jsptest-jsp12/pom.xml (rev 0) +++ tags/jsptest-0.18/jsptest-jsp12/pom.xml 2008-11-19 13:05:17 UTC (rev 252) @@ -0,0 +1,50 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest</artifactId> + <version>0.18</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>jsptest-jsp12</artifactId> + <packaging>jar</packaging> + <name>JspTest for JSP 1.2</name> + <description> + JspTest variant suitable for testing JavaServer Pages that + follow the JSP 1.2 specification. + </description> + <dependencies> + <dependency> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest-framework</artifactId> + </dependency> + <!-- needed for JSTL/TLD configuration --> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <version>1.0.2</version> + </dependency> + <dependency> + <groupId>taglibs</groupId> + <artifactId>standard</artifactId> + <version>1.0.2</version> + </dependency> + <!-- Provides the Jasper JSP compiler --> + <dependency> + <groupId>tomcat</groupId> + <artifactId>jasper-compiler</artifactId> + <version>4.1.30</version> + </dependency> + <dependency> + <groupId>tomcat</groupId> + <artifactId>jasper-runtime</artifactId> + <version>4.1.30</version> + </dependency> + </dependencies> + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + </resources> + </build> +</project> \ No newline at end of file Deleted: tags/jsptest-0.18/jsptest-jsp20/pom.xml =================================================================== --- trunk/jsptest-jsp20/pom.xml 2008-11-09 12:08:04 UTC (rev 249) +++ tags/jsptest-0.18/jsptest-jsp20/pom.xml 2008-11-19 13:05:17 UTC (rev 252) @@ -1,53 +0,0 @@ -<?xml version="1.0"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest</artifactId> - <version>0.18-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>jsptest-jsp20</artifactId> - <packaging>jar</packaging> - <name>JspTest for JSP 2.0</name> - <description> - JspTest variant suitable for testing JavaServer Pages that - follow the JSP 2.0 specification. - </description> - <dependencies> - <dependency> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest-framework</artifactId> - </dependency> - <!-- needed for JSTL/TLD configuration --> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <version>1.1.2</version> - </dependency> - <dependency> - <groupId>taglibs</groupId> - <artifactId>standard</artifactId> - <version>1.1.2</version> - </dependency> - <!-- Provides the Jasper JSP compiler --> - <dependency> - <groupId>tomcat</groupId> - <artifactId>jasper-compiler</artifactId> - <version>5.5.15</version> - </dependency> - <dependency> - <groupId>tomcat</groupId> - <artifactId>jasper-runtime</artifactId> - <version>5.5.15</version> - </dependency> - </dependencies> - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - </resource> - </resources> - </build> -</project> Copied: tags/jsptest-0.18/jsptest-jsp20/pom.xml (from rev 251, trunk/jsptest-jsp20/pom.xml) =================================================================== --- tags/jsptest-0.18/jsptest-jsp20/pom.xml (rev 0) +++ tags/jsptest-0.18/jsptest-jsp20/pom.xml 2008-11-19 13:05:17 UTC (rev 252) @@ -0,0 +1,50 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest</artifactId> + <version>0.18</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>jsptest-jsp20</artifactId> + <packaging>jar</packaging> + <name>JspTest for JSP 2.0</name> + <description> + JspTest variant suitable for testing JavaServer Pages that + follow the JSP 2.0 specification. + </description> + <dependencies> + <dependency> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest-framework</artifactId> + </dependency> + <!-- needed for JSTL/TLD configuration --> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <version>1.1.2</version> + </dependency> + <dependency> + <groupId>taglibs</groupId> + <artifactId>standard</artifactId> + <version>1.1.2</version> + </dependency> + <!-- Provides the Jasper JSP compiler --> + <dependency> + <groupId>tomcat</groupId> + <artifactId>jasper-compiler</artifactId> + <version>5.5.15</version> + </dependency> + <dependency> + <groupId>tomcat</groupId> + <artifactId>jasper-runtime</artifactId> + <version>5.5.15</version> + </dependency> + </dependencies> + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + </resources> + </build> +</project> \ No newline at end of file Deleted: tags/jsptest-0.18/jsptest-jsp21/pom.xml =================================================================== --- trunk/jsptest-jsp21/pom.xml 2008-11-09 12:08:04 UTC (rev 249) +++ tags/jsptest-0.18/jsptest-jsp21/pom.xml 2008-11-19 13:05:17 UTC (rev 252) @@ -1,48 +0,0 @@ -<?xml version="1.0"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest</artifactId> - <version>0.18-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>jsptest-jsp21</artifactId> - <packaging>jar</packaging> - <name>JspTest for JSP 2.1</name> - <description> - JspTest variant suitable for testing JavaServer Pages that - follow the JSP 2.1 specification. - </description> - <dependencies> - <dependency> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest-framework</artifactId> - </dependency> - <!-- needed for JSTL/TLD configuration --> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <version>1.1.2</version> - </dependency> - <dependency> - <groupId>taglibs</groupId> - <artifactId>standard</artifactId> - <version>1.1.2</version> - </dependency> - <!-- Provides the Jasper JSP compiler --> - <dependency> - <groupId>org.apache.tomcat</groupId> - <artifactId>jasper</artifactId> - <version>6.0.13</version> - </dependency> - </dependencies> - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - </resource> - </resources> - </build> -</project> Copied: tags/jsptest-0.18/jsptest-jsp21/pom.xml (from rev 251, trunk/jsptest-jsp21/pom.xml) =================================================================== --- tags/jsptest-0.18/jsptest-jsp21/pom.xml (rev 0) +++ tags/jsptest-0.18/jsptest-jsp21/pom.xml 2008-11-19 13:05:17 UTC (rev 252) @@ -0,0 +1,45 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest</artifactId> + <version>0.18</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>jsptest-jsp21</artifactId> + <packaging>jar</packaging> + <name>JspTest for JSP 2.1</name> + <description> + JspTest variant suitable for testing JavaServer Pages that + follow the JSP 2.1 specification. + </description> + <dependencies> + <dependency> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest-framework</artifactId> + </dependency> + <!-- needed for JSTL/TLD configuration --> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <version>1.1.2</version> + </dependency> + <dependency> + <groupId>taglibs</groupId> + <artifactId>standard</artifactId> + <version>1.1.2</version> + </dependency> + <!-- Provides the Jasper JSP compiler --> + <dependency> + <groupId>org.apache.tomcat</groupId> + <artifactId>jasper</artifactId> + <version>6.0.13</version> + </dependency> + </dependencies> + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + </resources> + </build> +</project> \ No newline at end of file Deleted: tags/jsptest-0.18/pom.xml =================================================================== --- trunk/pom.xml 2008-11-09 12:08:04 UTC (rev 249) +++ tags/jsptest-0.18/pom.xml 2008-11-19 13:05:17 UTC (rev 252) @@ -1,239 +0,0 @@ -<?xml version="1.0"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest</artifactId> - <version>0.18-SNAPSHOT</version> - <name>JspTest root project</name> - <description>This POM acts as a virtual root for the set of JSP version-specific combinations of the contained subprojects.</description> - <packaging>pom</packaging> - <url>http://jsptest.sourceforge.net</url> - <inceptionYear>2006</inceptionYear> - <organization> - <name>JspTest developers</name> - <url>http://jsptest.sourceforge.net</url> - </organization> - <licenses> - <license> - <name>The Apache Software License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> - <distribution>repo</distribution> - </license> - </licenses> - <issueManagement> - <system>sourceforge</system> - <url>https://sourceforge.net/tracker/?group_id=164388</url> - </issueManagement> - <distributionManagement> - <repository> - <id>jsptest.sourceforge.net</id> - <name>JspTest Maven2 repository at SourceForge</name> - <url>scp://shell.sourceforge.net:/home/groups/j/js/jsptest/htdocs/maven2</url> - </repository> - </distributionManagement> - <scm> - <connection>scm:svn:https://jsptest.svn.sourceforge.net/svnroot/jsptest/tags/jsptest-0.11</connection> - <developerConnection>scm:svn:https://jsptest.svn.sourceforge.net/svnroot/jsptest/tags/jsptest-0.11</developerConnection> - <url>http://jsptest.svn.sourceforge.net/viewvc/jsptest/tags/jsptest-0.11</url> - </scm> - <mailingLists /> - <developers> - <developer> - <name>Lasse Koskela</name> - <id>lkoskela</id> - <email>lko...@us...</email> - </developer> - </developers> - <modules> - <module>jsptest-generic</module> - <module>jsptest-jsp12</module> - <module>jsptest-jsp20</module> - <module>jsptest-jsp21</module> - <module>jsptest-acceptance</module> - </modules> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>sun.jdk</groupId> - <artifactId>tools</artifactId> - <version>1.4</version> - <scope>system</scope> - <systemPath>${java.home}/../lib/tools.jar</systemPath> - </dependency> - <dependency> - <groupId>jtidy</groupId> - <artifactId>jtidy</artifactId> - <version>4aug2000r7-dev</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.2</version> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.13</version> - </dependency> - <dependency> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest-jsp12</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest-jsp20</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest-jsp21</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest-common</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest-compiler-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest-framework</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - </dependencyManagement> - <build> - <resources> - <resource> - <targetPath>/</targetPath> - <filtering>false</filtering> - <directory>${basedir}/src/main/resources</directory> - </resource> - </resources> -<!-- define build plugins to be used (TODO: should this be moved to the jar POMs?) --> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <fork>true</fork> - <source>1.4</source> - <target>1.4</target> - </configuration> - </plugin> - <plugin> - <inherited>true</inherited> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <minmemory>128m</minmemory> - <maxmemory>256m</maxmemory> - </configuration> - <executions> - <execution> - <id>attach-sources</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <inherited>true</inherited> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-sources</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <configuration> - <preparationGoals>clean install</preparationGoals> - </configuration> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>src/main/assembly/jsp12.xml</descriptor> - <descriptor>src/main/assembly/jsp20.xml</descriptor> - <descriptor>src/main/assembly/jsp21.xml</descriptor> - </descriptors> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.3</version> - <configuration> - <includes> - <include>**/*Test.java</include> - <include>**/Test*.java</include> - </includes> - <testFailureIgnore>true</testFailureIgnore> - <forkMode>once</forkMode> - <useSystemClassLoader>true</useSystemClassLoader> - <skip>false</skip> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>surefire-report-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - <version>2.0</version> - </plugin> - </plugins> - </build> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-project-info-reports-plugin</artifactId> - <reportSets> - <reportSet> - <reports> - <report>dependencies</report> - <report>project-team</report> - <report>mailing-list</report> - <report>issue-tracking</report> - <report>license</report> - <report>scm</report> - </reports> - </reportSet> - </reportSets> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>surefire-report-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>cobertura-maven-plugin</artifactId> - <version>2.0</version> - </plugin> - </plugins> - </reporting> -</project> Copied: tags/jsptest-0.18/pom.xml (from rev 251, trunk/pom.xml) =================================================================== --- tags/jsptest-0.18/pom.xml (rev 0) +++ tags/jsptest-0.18/pom.xml 2008-11-19 13:05:17 UTC (rev 252) @@ -0,0 +1,240 @@ +<?xml version="1.0"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest</artifactId> + <version>0.18</version> + <name>JspTest root project</name> + <description>This POM acts as a virtual root for the set of JSP version-specific combinations of the contained subprojects.</description> + <packaging>pom</packaging> + <url>http://jsptest.sourceforge.net</url> + <inceptionYear>2006</inceptionYear> + <organization> + <name>JspTest developers</name> + <url>http://jsptest.sourceforge.net</url> + </organization> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + <issueManagement> + <system>sourceforge</system> + <url>https://sourceforge.net/tracker/?group_id=164388</url> + </issueManagement> + <distributionManagement> + <repository> + <id>jsptest.sourceforge.net</id> + <name>JspTest Maven2 repository at SourceForge</name> + <url>scp://shell.sourceforge.net:/home/groups/j/js/jsptest/htdocs/maven2</url> + </repository> + </distributionManagement> + <scm> + <connection>scm:svn:https://jsptest.svn.sourceforge.net/svnroot/jsptest/tags/jsptest-0.18</connection> + <developerConnection>scm:svn:https://jsptest.svn.sourceforge.net/svnroot/jsptest/tags/jsptest-0.18</developerConnection> + <url>http://jsptest.svn.sourceforge.net/viewvc/jsptest/tags/jsptest-0.18</url> + </scm> + <mailingLists /> + <developers> + <developer> + <name>Lasse Koskela</name> + <id>lkoskela</id> + <email>lko...@us...</email> + </developer> + </developers> + <modules> + <module>jsptest-generic</module> + <module>jsptest-jsp12</module> + <module>jsptest-jsp20</module> + <module>jsptest-jsp21</module> + <module>jsptest-acceptance</module> + </modules> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>sun.jdk</groupId> + <artifactId>tools</artifactId> + <version>1.4</version> + <scope>system</scope> + <systemPath>${java.home}/../lib/tools.jar</systemPath> + </dependency> + <dependency> + <groupId>jtidy</groupId> + <artifactId>jtidy</artifactId> + <version>4aug2000r7-dev</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.2</version> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.13</version> + </dependency> + <dependency> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest-jsp12</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest-jsp20</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest-jsp21</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest-common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest-compiler-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest-framework</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </dependencyManagement> + <build> + <resources> + <resource> + <targetPath>/</targetPath> + <filtering>false</filtering> + <directory>${basedir}/src/main/resources</directory> + </resource> + </resources> +<!-- define build plugins to be used (TODO: should this be moved to the jar POMs?) --> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <fork>true</fork> + <source>1.4</source> + <target>1.4</target> + </configuration> + </plugin> + <plugin> + <inherited>true</inherited> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <minmemory>128m</minmemory> + <maxmemory>256m</maxmemory> + </configuration> + <executions> + <execution> + <id>attach-sources</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <inherited>true</inherited> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-sources</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-release-plugin</artifactId> + <configuration> + <autoVersionSubmodules>true</autoVersionSubmodules> + <preparationGoals>clean install</preparationGoals> + </configuration> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>src/main/assembly/jsp12.xml</descriptor> + <descriptor>src/main/assembly/jsp20.xml</descriptor> + <descriptor>src/main/assembly/jsp21.xml</descriptor> + </descriptors> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.3</version> + <configuration> + <includes> + <include>**/*Test.java</include> + <include>**/Test*.java</include> + </includes> + <testFailureIgnore>true</testFailureIgnore> + <forkMode>once</forkMode> + <useSystemClassLoader>true</useSystemClassLoader> + <skip>false</skip> + </configuration> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>surefire-report-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>cobertura-maven-plugin</artifactId> + <version>2.0</version> + </plugin> + </plugins> + </build> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-project-info-reports-plugin</artifactId> + <reportSets> + <reportSet> + <reports> + <report>dependencies</report> + <report>project-team</report> + <report>mailing-list</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + </reports> + </reportSet> + </reportSets> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>surefire-report-maven-plugin</artifactId> + </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>cobertura-maven-plugin</artifactId> + <version>2.0</version> + </plugin> + </plugins> + </reporting> +</project> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <lko...@us...> - 2009-11-13 09:04:05
|
Revision: 260 http://jsptest.svn.sourceforge.net/jsptest/?rev=260&view=rev Author: lkoskela Date: 2009-11-13 09:03:51 +0000 (Fri, 13 Nov 2009) Log Message: ----------- [maven-release-plugin] copy for tag jsptest-0.19 Added Paths: ----------- tags/jsptest-0.19/ tags/jsptest-0.19/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml tags/jsptest-0.19/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml tags/jsptest-0.19/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml tags/jsptest-0.19/jsptest-acceptance/pom.xml tags/jsptest-0.19/jsptest-generic/jsptest-common/pom.xml tags/jsptest-0.19/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/CommandLineJavac.java tags/jsptest-0.19/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/Java6Compiler.java tags/jsptest-0.19/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/IO.java tags/jsptest-0.19/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/compiler/ tags/jsptest-0.19/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/IOTest.java tags/jsptest-0.19/jsptest-generic/jsptest-compiler-api/pom.xml tags/jsptest-0.19/jsptest-generic/jsptest-framework/pom.xml tags/jsptest-0.19/jsptest-generic/pom.xml tags/jsptest-0.19/jsptest-jsp12/pom.xml tags/jsptest-0.19/jsptest-jsp20/pom.xml tags/jsptest-0.19/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperCompiler.java tags/jsptest-0.19/jsptest-jsp21/pom.xml tags/jsptest-0.19/pom.xml Removed Paths: ------------- tags/jsptest-0.19/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml tags/jsptest-0.19/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml tags/jsptest-0.19/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml tags/jsptest-0.19/jsptest-acceptance/pom.xml tags/jsptest-0.19/jsptest-generic/jsptest-common/pom.xml tags/jsptest-0.19/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/CommandLineJavac.java tags/jsptest-0.19/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/IO.java tags/jsptest-0.19/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/IOTest.java tags/jsptest-0.19/jsptest-generic/jsptest-compiler-api/pom.xml tags/jsptest-0.19/jsptest-generic/jsptest-framework/pom.xml tags/jsptest-0.19/jsptest-generic/pom.xml tags/jsptest-0.19/jsptest-jsp12/pom.xml tags/jsptest-0.19/jsptest-jsp20/pom.xml tags/jsptest-0.19/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperCompiler.java tags/jsptest-0.19/jsptest-jsp21/pom.xml tags/jsptest-0.19/pom.xml Deleted: tags/jsptest-0.19/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml =================================================================== --- trunk/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml 2008-11-19 13:06:40 UTC (rev 253) +++ tags/jsptest-0.19/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml 2009-11-13 09:03:51 UTC (rev 260) @@ -1,21 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest-acceptance</artifactId> - <version>0.19-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>jsptest-acceptance-jsp12</artifactId> - <packaging>jar</packaging> - <name> - Acceptance tests for the JspTest variant for the JSP 1.2 - specification. - </name> - <description /> - <dependencies> - <dependency> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest-jsp12</artifactId> - </dependency> - </dependencies> -</project> \ No newline at end of file Copied: tags/jsptest-0.19/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml (from rev 259, trunk/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml) =================================================================== --- tags/jsptest-0.19/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml (rev 0) +++ tags/jsptest-0.19/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml 2009-11-13 09:03:51 UTC (rev 260) @@ -0,0 +1,21 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest-acceptance</artifactId> + <version>0.19</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>jsptest-acceptance-jsp12</artifactId> + <packaging>jar</packaging> + <name> + Acceptance tests for the JspTest variant for the JSP 1.2 + specification. + </name> + <description /> + <dependencies> + <dependency> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest-jsp12</artifactId> + </dependency> + </dependencies> +</project> \ No newline at end of file Deleted: tags/jsptest-0.19/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml =================================================================== --- trunk/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml 2008-11-19 13:06:40 UTC (rev 253) +++ tags/jsptest-0.19/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml 2009-11-13 09:03:51 UTC (rev 260) @@ -1,21 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest-acceptance</artifactId> - <version>0.19-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>jsptest-acceptance-jsp20</artifactId> - <packaging>jar</packaging> - <name> - Acceptance tests for the JspTest variant for the JSP 2.0 - specification. - </name> - <description /> - <dependencies> - <dependency> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest-jsp20</artifactId> - </dependency> - </dependencies> -</project> \ No newline at end of file Copied: tags/jsptest-0.19/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml (from rev 259, trunk/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml) =================================================================== --- tags/jsptest-0.19/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml (rev 0) +++ tags/jsptest-0.19/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml 2009-11-13 09:03:51 UTC (rev 260) @@ -0,0 +1,21 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest-acceptance</artifactId> + <version>0.19</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>jsptest-acceptance-jsp20</artifactId> + <packaging>jar</packaging> + <name> + Acceptance tests for the JspTest variant for the JSP 2.0 + specification. + </name> + <description /> + <dependencies> + <dependency> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest-jsp20</artifactId> + </dependency> + </dependencies> +</project> \ No newline at end of file Deleted: tags/jsptest-0.19/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml =================================================================== --- trunk/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml 2008-11-19 13:06:40 UTC (rev 253) +++ tags/jsptest-0.19/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml 2009-11-13 09:03:51 UTC (rev 260) @@ -1,22 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest-acceptance</artifactId> - <version>0.19-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>jsptest-acceptance-jsp21</artifactId> - <version>0.19-SNAPSHOT</version> - <packaging>jar</packaging> - <name> - Acceptance tests for the JspTest variant for the JSP 2.1 - specification. - </name> - <description /> - <dependencies> - <dependency> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest-jsp21</artifactId> - </dependency> - </dependencies> -</project> \ No newline at end of file Copied: tags/jsptest-0.19/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml (from rev 259, trunk/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml) =================================================================== --- tags/jsptest-0.19/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml (rev 0) +++ tags/jsptest-0.19/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml 2009-11-13 09:03:51 UTC (rev 260) @@ -0,0 +1,22 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest-acceptance</artifactId> + <version>0.19</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>jsptest-acceptance-jsp21</artifactId> + <version>0.19</version> + <packaging>jar</packaging> + <name> + Acceptance tests for the JspTest variant for the JSP 2.1 + specification. + </name> + <description /> + <dependencies> + <dependency> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest-jsp21</artifactId> + </dependency> + </dependencies> +</project> \ No newline at end of file Deleted: tags/jsptest-0.19/jsptest-acceptance/pom.xml =================================================================== --- trunk/jsptest-acceptance/pom.xml 2008-11-19 13:06:40 UTC (rev 253) +++ tags/jsptest-0.19/jsptest-acceptance/pom.xml 2009-11-13 09:03:51 UTC (rev 260) @@ -1,18 +0,0 @@ -<?xml version="1.0"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest</artifactId> - <version>0.19-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>jsptest-acceptance</artifactId> - <name>JspTest root project for acceptance test modules</name> - <description>This POM acts as a virtual root for the acceptance test projects for different JSP specification variants of JspTest.</description> - <packaging>pom</packaging> - <modules> - <module>jsptest-acceptance-jsp12</module> - <module>jsptest-acceptance-jsp20</module> - <module>jsptest-acceptance-jsp21</module> - </modules> -</project> Copied: tags/jsptest-0.19/jsptest-acceptance/pom.xml (from rev 259, trunk/jsptest-acceptance/pom.xml) =================================================================== --- tags/jsptest-0.19/jsptest-acceptance/pom.xml (rev 0) +++ tags/jsptest-0.19/jsptest-acceptance/pom.xml 2009-11-13 09:03:51 UTC (rev 260) @@ -0,0 +1,18 @@ +<?xml version="1.0"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest</artifactId> + <version>0.19</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>jsptest-acceptance</artifactId> + <name>JspTest root project for acceptance test modules</name> + <description>This POM acts as a virtual root for the acceptance test projects for different JSP specification variants of JspTest.</description> + <packaging>pom</packaging> + <modules> + <module>jsptest-acceptance-jsp12</module> + <module>jsptest-acceptance-jsp20</module> + <module>jsptest-acceptance-jsp21</module> + </modules> +</project> Deleted: tags/jsptest-0.19/jsptest-generic/jsptest-common/pom.xml =================================================================== --- trunk/jsptest-generic/jsptest-common/pom.xml 2008-11-19 13:06:40 UTC (rev 253) +++ tags/jsptest-0.19/jsptest-generic/jsptest-common/pom.xml 2009-11-13 09:03:51 UTC (rev 260) @@ -1,38 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest-generic</artifactId> - <version>0.19-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>jsptest-common</artifactId> - <version>0.19-SNAPSHOT</version> - <packaging>jar</packaging> - <name>Common utilities</name> - <description> - Common utilities for the components of JspTest, including the - JSP version-specific compiler implementations. - </description> - <profiles> - <profile> - <id>default-tools.jar</id> - <activation> - <property> - <name>java.vendor</name> - <value>Sun Microsystems Inc.</value> - </property> - </activation> - <dependencies> - <dependency> - <groupId>com.sun</groupId> - <artifactId>tools</artifactId> - <version>1.4.2</version> - <scope>system</scope> - <systemPath> - ${java.home}/../lib/tools.jar - </systemPath> - </dependency> - </dependencies> - </profile> - </profiles> -</project> \ No newline at end of file Copied: tags/jsptest-0.19/jsptest-generic/jsptest-common/pom.xml (from rev 259, trunk/jsptest-generic/jsptest-common/pom.xml) =================================================================== --- tags/jsptest-0.19/jsptest-generic/jsptest-common/pom.xml (rev 0) +++ tags/jsptest-0.19/jsptest-generic/jsptest-common/pom.xml 2009-11-13 09:03:51 UTC (rev 260) @@ -0,0 +1,38 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest-generic</artifactId> + <version>0.19</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>jsptest-common</artifactId> + <version>0.19</version> + <packaging>jar</packaging> + <name>Common utilities</name> + <description> + Common utilities for the components of JspTest, including the + JSP version-specific compiler implementations. + </description> + <profiles> + <profile> + <id>default-tools.jar</id> + <activation> + <property> + <name>java.vendor</name> + <value>Sun Microsystems Inc.</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>com.sun</groupId> + <artifactId>tools</artifactId> + <version>1.4.2</version> + <scope>system</scope> + <systemPath> + ${java.home}/../lib/tools.jar + </systemPath> + </dependency> + </dependencies> + </profile> + </profiles> +</project> \ No newline at end of file Deleted: tags/jsptest-0.19/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/CommandLineJavac.java =================================================================== --- trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/CommandLineJavac.java 2008-11-19 13:06:40 UTC (rev 253) +++ tags/jsptest-0.19/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/CommandLineJavac.java 2009-11-13 09:03:51 UTC (rev 260) @@ -1,93 +0,0 @@ -/* - * Copyright 2008 Lasse Koskela. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package net.sf.jsptest.compiler.java; - -import java.io.File; -import java.io.IOException; -import java.io.PrintWriter; -import java.io.StringWriter; -import net.sf.jsptest.utils.StreamConsumer; - -/** - * @author Lasse Koskela - */ -public class CommandLineJavac implements JavaCompiler { - - private static final String SEPARATOR = System.getProperty("path.separator"); - - public boolean compile(String srcFile, String destDir, String[] classpath) throws Exception { - srcFile = new File(srcFile).getCanonicalPath(); - String cp = join(classpath); - String[] command = buildCommandLine(srcFile, destDir, cp); - return execute(command); - } - - private String[] buildCommandLine(String pathToJavaSource, String outputDirectory, - String classpathString) { - return new String[] { "javac", "-classpath", classpathString, "-d", outputDirectory, - pathToJavaSource }; - } - - private String join(String[] classpath) { - StringBuffer s = new StringBuffer(5000); - for (int i = 0; i < classpath.length; i++) { - if (s.length() > 0) { - s.append(SEPARATOR); - } - s.append(classpath[i]); - } - return s.toString(); - } - - private boolean execute(String[] commandLine) throws IOException, InterruptedException { - Process p = Runtime.getRuntime().exec(commandLine); - String processOutput = readOutput(p); - boolean success = (p.waitFor() == 0); - if (!success) { - System.err.println(processOutput); - } - return success; - } - - private String readOutput(final Process p) throws IOException { - try { - StringWriter output = new StringWriter(); - final PrintWriter ps = new PrintWriter(output); - Thread stderrThread = new Thread(new StreamConsumer("STDERR", p.getErrorStream(), ps)); - Thread stdoutThread = new Thread(new StreamConsumer("STDOUT", p.getInputStream(), ps)); - p.getOutputStream().close(); - stderrThread.start(); - stdoutThread.start(); - stderrThread.join(); - stdoutThread.join(); - return output.toString(); - } catch (Exception e) { - StringWriter sw = new StringWriter(); - e.printStackTrace(new PrintWriter(sw)); - return sw.toString(); - } - } - - public boolean isAvailable() { - try { - Process p = Runtime.getRuntime().exec("javac"); - String s = readOutput(p); - return s.indexOf("Usage: javac") != -1; - } catch (Exception e) { - return false; - } - } -} Copied: tags/jsptest-0.19/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/CommandLineJavac.java (from rev 255, trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/CommandLineJavac.java) =================================================================== --- tags/jsptest-0.19/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/CommandLineJavac.java (rev 0) +++ tags/jsptest-0.19/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/CommandLineJavac.java 2009-11-13 09:03:51 UTC (rev 260) @@ -0,0 +1,93 @@ +/* + * Copyright 2008 Lasse Koskela. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package net.sf.jsptest.compiler.java; + +import java.io.File; +import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringWriter; +import net.sf.jsptest.utils.StreamConsumer; + +/** + * @author Lasse Koskela + */ +public class CommandLineJavac implements JavaCompiler { + + private static final String SEPARATOR = System.getProperty("path.separator"); + + public boolean compile(String srcFile, String destDir, String[] classpath) throws Exception { + srcFile = new File(srcFile).getCanonicalPath(); + String cp = join(classpath); + String[] command = buildCommandLine(srcFile, destDir, cp); + return execute(command); + } + + protected String[] buildCommandLine(String pathToJavaSource, String outputDirectory, + String classpathString) { + return new String[] { "javac", "-classpath", classpathString, "-d", outputDirectory, + pathToJavaSource }; + } + + private String join(String[] classpath) { + StringBuffer s = new StringBuffer(5000); + for (int i = 0; i < classpath.length; i++) { + if (s.length() > 0) { + s.append(SEPARATOR); + } + s.append(classpath[i]); + } + return s.toString(); + } + + protected boolean execute(String[] commandLine) throws IOException, InterruptedException { + Process p = Runtime.getRuntime().exec(commandLine); + String processOutput = readOutput(p); + boolean success = (p.waitFor() == 0); + if (!success) { + System.err.println(processOutput); + } + return success; + } + + private String readOutput(final Process p) throws IOException { + try { + StringWriter output = new StringWriter(); + final PrintWriter ps = new PrintWriter(output); + Thread stderrThread = new Thread(new StreamConsumer("STDERR", p.getErrorStream(), ps)); + Thread stdoutThread = new Thread(new StreamConsumer("STDOUT", p.getInputStream(), ps)); + p.getOutputStream().close(); + stderrThread.start(); + stdoutThread.start(); + stderrThread.join(); + stdoutThread.join(); + return output.toString(); + } catch (Exception e) { + StringWriter sw = new StringWriter(); + e.printStackTrace(new PrintWriter(sw)); + return sw.toString(); + } + } + + public boolean isAvailable() { + try { + Process p = Runtime.getRuntime().exec("javac"); + String s = readOutput(p); + return s.indexOf("Usage: javac") != -1; + } catch (Exception e) { + return false; + } + } +} Copied: tags/jsptest-0.19/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/Java6Compiler.java (from rev 255, trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/Java6Compiler.java) =================================================================== --- tags/jsptest-0.19/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/Java6Compiler.java (rev 0) +++ tags/jsptest-0.19/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/Java6Compiler.java 2009-11-13 09:03:51 UTC (rev 260) @@ -0,0 +1,65 @@ +package net.sf.jsptest.compiler.java; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.IOException; +import java.lang.reflect.Method; + +import net.sf.jsptest.utils.IO; + +public class Java6Compiler extends CommandLineJavac { + private static final String TMPDIR = System.getProperty("java.io.tmpdir"); + + protected boolean execute(String[] arguments) throws IOException, + InterruptedException { + ByteArrayOutputStream output = new ByteArrayOutputStream(); + try { + return executeWithReflection(arguments, output) == 0; + } finally { + File logFile = new File(TMPDIR, getClass().getName() + ".log"); + IO.append(output.toString(), logFile); + } + } + + private int executeWithReflection(String[] arguments, + ByteArrayOutputStream output) { + try { + Object systemJavaCompiler = acquireCompilerImplementation(); + Method[] methods = systemJavaCompiler.getClass().getMethods(); + for (int i = 0; i < methods.length; i++) { + if (methods[i].getName().equals("run")) { + Object returnValue = methods[i].invoke(systemJavaCompiler, + new Object[] { + new ByteArrayInputStream(new byte[0]), + output, output, arguments }); + return Integer.parseInt(String.valueOf(returnValue)); + } + } + return -1; + } catch (Exception e) { + throw new RuntimeException(e); + } + } + + protected String[] buildCommandLine(String pathToJavaSource, + String outputDirectory, String classpathString) { + return new String[] { "-verbose", "-classpath", classpathString, "-d", + outputDirectory, pathToJavaSource }; + } + + public boolean isAvailable() { + return acquireCompilerImplementation() != null; + } + + private Object acquireCompilerImplementation() { + try { + Class toolProvider = Class.forName("javax.tools.ToolProvider"); + Method method = toolProvider.getMethod("getSystemJavaCompiler", + null); + return method.invoke(null, null); + } catch (Exception e) { + return null; + } + } +} Deleted: tags/jsptest-0.19/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/IO.java =================================================================== --- trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/IO.java 2008-11-19 13:06:40 UTC (rev 253) +++ tags/jsptest-0.19/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/IO.java 2009-11-13 09:03:51 UTC (rev 260) @@ -1,61 +0,0 @@ -/* - * Copyright 2008 Lasse Koskela. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package net.sf.jsptest.utils; - -import java.io.ByteArrayOutputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileWriter; -import java.io.IOException; -import java.io.InputStream; - -/** - * The <tt>IO</tt> class provides utility methods for handling I/O related tasks such as reading - * from and writing to files, streams, and writers. - * - * @author Lasse Koskela - */ -public class IO { - - public static byte[] readToByteArray(File file) throws IOException { - return readToByteArray(new FileInputStream(file)); - } - - public static byte[] readToByteArray(InputStream in) throws IOException { - ByteArrayOutputStream out = new ByteArrayOutputStream(); - byte[] buffer = new byte[8096]; - int r = -1; - while ((r = in.read(buffer)) != -1) { - out.write(buffer, 0, r); - } - in.close(); - return out.toByteArray(); - } - - public static void write(String what, File to) throws IOException { - FileWriter fw = new FileWriter(to, false); - fw.write(what); - fw.close(); - } - - public static String readToString(File file) throws IOException { - return new String(readToByteArray(file)); - } - - public static String readToString(InputStream stream) throws IOException { - return new String(readToByteArray(stream)); - } -} Copied: tags/jsptest-0.19/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/IO.java (from rev 254, trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/IO.java) =================================================================== --- tags/jsptest-0.19/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/IO.java (rev 0) +++ tags/jsptest-0.19/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/IO.java 2009-11-13 09:03:51 UTC (rev 260) @@ -0,0 +1,68 @@ +/* + * Copyright 2008 Lasse Koskela. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package net.sf.jsptest.utils; + +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileWriter; +import java.io.IOException; +import java.io.InputStream; + +/** + * The <tt>IO</tt> class provides utility methods for handling I/O related tasks + * such as reading from and writing to files, streams, and writers. + * + * @author Lasse Koskela + */ +public class IO { + + public static byte[] readToByteArray(File file) throws IOException { + return readToByteArray(new FileInputStream(file)); + } + + public static byte[] readToByteArray(InputStream in) throws IOException { + ByteArrayOutputStream out = new ByteArrayOutputStream(); + byte[] buffer = new byte[8096]; + int r = -1; + while ((r = in.read(buffer)) != -1) { + out.write(buffer, 0, r); + } + in.close(); + return out.toByteArray(); + } + + public static void write(String what, File to) throws IOException { + write(what, new FileWriter(to, false)); + } + + public static void append(String what, File to) throws IOException { + write(what, new FileWriter(to, true)); + } + + private static void write(String what, FileWriter to) throws IOException { + to.write(what); + to.close(); + } + + public static String readToString(File file) throws IOException { + return new String(readToByteArray(file)); + } + + public static String readToString(InputStream stream) throws IOException { + return new String(readToByteArray(stream)); + } +} Deleted: tags/jsptest-0.19/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/IOTest.java =================================================================== --- trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/IOTest.java 2008-11-19 13:06:40 UTC (rev 253) +++ tags/jsptest-0.19/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/IOTest.java 2009-11-13 09:03:51 UTC (rev 260) @@ -1,26 +0,0 @@ -package net.sf.jsptest.utils; - -import java.io.File; -import junit.framework.TestCase; - -/** - * @author Lasse Koskela - */ -public class IOTest extends TestCase { - - private File file; - - protected void setUp() throws Exception { - file = File.createTempFile(getName(), ".txt"); - } - - protected void tearDown() throws Exception { - file.delete(); - } - - public void testReadAndWriteToFile() throws Exception { - String content = "content"; - IO.write(content, file); - assertEquals(content, new String(IO.readToByteArray(file))); - } -} Copied: tags/jsptest-0.19/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/IOTest.java (from rev 254, trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/IOTest.java) =================================================================== --- tags/jsptest-0.19/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/IOTest.java (rev 0) +++ tags/jsptest-0.19/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/IOTest.java 2009-11-13 09:03:51 UTC (rev 260) @@ -0,0 +1,32 @@ +package net.sf.jsptest.utils; + +import java.io.File; +import junit.framework.TestCase; + +/** + * @author Lasse Koskela + */ +public class IOTest extends TestCase { + + private File file; + + protected void setUp() throws Exception { + file = File.createTempFile(getName(), ".txt"); + } + + protected void tearDown() throws Exception { + file.delete(); + } + + public void testReadAndWriteToFile() throws Exception { + String content = "content"; + IO.write(content, file); + assertEquals(content, new String(IO.readToByteArray(file))); + } + + public void testAppendingToFile() throws Exception { + IO.append("one", file); + IO.append("two", file); + assertEquals("onetwo", new String(IO.readToByteArray(file))); + } +} Deleted: tags/jsptest-0.19/jsptest-generic/jsptest-compiler-api/pom.xml =================================================================== --- trunk/jsptest-generic/jsptest-compiler-api/pom.xml 2008-11-19 13:06:40 UTC (rev 253) +++ tags/jsptest-0.19/jsptest-generic/jsptest-compiler-api/pom.xml 2009-11-13 09:03:51 UTC (rev 260) @@ -1,16 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest-generic</artifactId> - <version>0.19-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>jsptest-compiler-api</artifactId> - <version>0.19-SNAPSHOT</version> - <packaging>jar</packaging> - <name>Internal compiler API</name> - <description> - A common internal API for the different versions of JSP - version-specific compilers. - </description> -</project> \ No newline at end of file Copied: tags/jsptest-0.19/jsptest-generic/jsptest-compiler-api/pom.xml (from rev 259, trunk/jsptest-generic/jsptest-compiler-api/pom.xml) =================================================================== --- tags/jsptest-0.19/jsptest-generic/jsptest-compiler-api/pom.xml (rev 0) +++ tags/jsptest-0.19/jsptest-generic/jsptest-compiler-api/pom.xml 2009-11-13 09:03:51 UTC (rev 260) @@ -0,0 +1,16 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest-generic</artifactId> + <version>0.19</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>jsptest-compiler-api</artifactId> + <version>0.19</version> + <packaging>jar</packaging> + <name>Internal compiler API</name> + <description> + A common internal API for the different versions of JSP + version-specific compilers. + </description> +</project> \ No newline at end of file Deleted: tags/jsptest-0.19/jsptest-generic/jsptest-framework/pom.xml =================================================================== --- trunk/jsptest-generic/jsptest-framework/pom.xml 2008-11-19 13:06:40 UTC (rev 253) +++ tags/jsptest-0.19/jsptest-generic/jsptest-framework/pom.xml 2009-11-13 09:03:51 UTC (rev 260) @@ -1,27 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest-generic</artifactId> - <version>0.19-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>jsptest-framework</artifactId> - <version>0.19-SNAPSHOT</version> - <packaging>jar</packaging> - <name>Core framework</name> - <description> - The core framework functionality for JspTest. - </description> - <dependencies> - <dependency> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest-compiler-api</artifactId> - <version>0.19-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest-common</artifactId> - <version>0.19-SNAPSHOT</version> - </dependency> - </dependencies> -</project> \ No newline at end of file Copied: tags/jsptest-0.19/jsptest-generic/jsptest-framework/pom.xml (from rev 259, trunk/jsptest-generic/jsptest-framework/pom.xml) =================================================================== --- tags/jsptest-0.19/jsptest-generic/jsptest-framework/pom.xml (rev 0) +++ tags/jsptest-0.19/jsptest-generic/jsptest-framework/pom.xml 2009-11-13 09:03:51 UTC (rev 260) @@ -0,0 +1,27 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest-generic</artifactId> + <version>0.19</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>jsptest-framework</artifactId> + <version>0.19</version> + <packaging>jar</packaging> + <name>Core framework</name> + <description> + The core framework functionality for JspTest. + </description> + <dependencies> + <dependency> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest-compiler-api</artifactId> + <version>0.19</version> + </dependency> + <dependency> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest-common</artifactId> + <version>0.19</version> + </dependency> + </dependencies> +</project> \ No newline at end of file Deleted: tags/jsptest-0.19/jsptest-generic/pom.xml =================================================================== --- trunk/jsptest-generic/pom.xml 2008-11-19 13:06:40 UTC (rev 253) +++ tags/jsptest-0.19/jsptest-generic/pom.xml 2009-11-13 09:03:51 UTC (rev 260) @@ -1,41 +0,0 @@ -<?xml version="1.0"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest</artifactId> - <version>0.19-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>jsptest-generic</artifactId> - <version>0.19-SNAPSHOT</version> - <name>JspTest root project for the generic components</name> - <description>This POM acts as a virtual root for the set of generic components that make up JspTest.</description> - <packaging>pom</packaging> - <modules> - <module>jsptest-common</module> - <module>jsptest-compiler-api</module> - <module>jsptest-framework</module> - </modules> - <dependencies> - <dependency> - <groupId>jtidy</groupId> - <artifactId>jtidy</artifactId> - <version>4aug2000r7-dev</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.2</version> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.13</version> - </dependency> - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - <version>1.1.1</version> - </dependency> - </dependencies> -</project> Copied: tags/jsptest-0.19/jsptest-generic/pom.xml (from rev 259, trunk/jsptest-generic/pom.xml) =================================================================== --- tags/jsptest-0.19/jsptest-generic/pom.xml (rev 0) +++ tags/jsptest-0.19/jsptest-generic/pom.xml 2009-11-13 09:03:51 UTC (rev 260) @@ -0,0 +1,41 @@ +<?xml version="1.0"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest</artifactId> + <version>0.19</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>jsptest-generic</artifactId> + <version>0.19</version> + <name>JspTest root project for the generic components</name> + <description>This POM acts as a virtual root for the set of generic components that make up JspTest.</description> + <packaging>pom</packaging> + <modules> + <module>jsptest-common</module> + <module>jsptest-compiler-api</module> + <module>jsptest-framework</module> + </modules> + <dependencies> + <dependency> + <groupId>jtidy</groupId> + <artifactId>jtidy</artifactId> + <version>4aug2000r7-dev</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.2</version> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.13</version> + </dependency> + <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <version>1.1.1</version> + </dependency> + </dependencies> +</project> Deleted: tags/jsptest-0.19/jsptest-jsp12/pom.xml =================================================================== --- trunk/jsptest-jsp12/pom.xml 2008-11-19 13:06:40 UTC (rev 253) +++ tags/jsptest-0.19/jsptest-jsp12/pom.xml 2009-11-13 09:03:51 UTC (rev 260) @@ -1,50 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest</artifactId> - <version>0.19-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>jsptest-jsp12</artifactId> - <packaging>jar</packaging> - <name>JspTest for JSP 1.2</name> - <description> - JspTest variant suitable for testing JavaServer Pages that - follow the JSP 1.2 specification. - </description> - <dependencies> - <dependency> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest-framework</artifactId> - </dependency> - <!-- needed for JSTL/TLD configuration --> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <version>1.0.2</version> - </dependency> - <dependency> - <groupId>taglibs</groupId> - <artifactId>standard</artifactId> - <version>1.0.2</version> - </dependency> - <!-- Provides the Jasper JSP compiler --> - <dependency> - <groupId>tomcat</groupId> - <artifactId>jasper-compiler</artifactId> - <version>4.1.30</version> - </dependency> - <dependency> - <groupId>tomcat</groupId> - <artifactId>jasper-runtime</artifactId> - <version>4.1.30</version> - </dependency> - </dependencies> - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - </resource> - </resources> - </build> -</project> \ No newline at end of file Copied: tags/jsptest-0.19/jsptest-jsp12/pom.xml (from rev 259, trunk/jsptest-jsp12/pom.xml) =================================================================== --- tags/jsptest-0.19/jsptest-jsp12/pom.xml (rev 0) +++ tags/jsptest-0.19/jsptest-jsp12/pom.xml 2009-11-13 09:03:51 UTC (rev 260) @@ -0,0 +1,50 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest</artifactId> + <version>0.19</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>jsptest-jsp12</artifactId> + <packaging>jar</packaging> + <name>JspTest for JSP 1.2</name> + <description> + JspTest variant suitable for testing JavaServer Pages that + follow the JSP 1.2 specification. + </description> + <dependencies> + <dependency> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest-framework</artifactId> + </dependency> + <!-- needed for JSTL/TLD configuration --> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <version>1.0.2</version> + </dependency> + <dependency> + <groupId>taglibs</groupId> + <artifactId>standard</artifactId> + <version>1.0.2</version> + </dependency> + <!-- Provides the Jasper JSP compiler --> + <dependency> + <groupId>tomcat</groupId> + <artifactId>jasper-compiler</artifactId> + <version>4.1.30</version> + </dependency> + <dependency> + <groupId>tomcat</groupId> + <artifactId>jasper-runtime</artifactId> + <version>4.1.30</version> + </dependency> + </dependencies> + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + </resources> + </build> +</project> \ No newline at end of file Deleted: tags/jsptest-0.19/jsptest-jsp20/pom.xml =================================================================== --- trunk/jsptest-jsp20/pom.xml 2008-11-19 13:06:40 UTC (rev 253) +++ tags/jsptest-0.19/jsptest-jsp20/pom.xml 2009-11-13 09:03:51 UTC (rev 260) @@ -1,50 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest</artifactId> - <version>0.19-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>jsptest-jsp20</artifactId> - <packaging>jar</packaging> - <name>JspTest for JSP 2.0</name> - <description> - JspTest variant suitable for testing JavaServer Pages that - follow the JSP 2.0 specification. - </description> - <dependencies> - <dependency> - <groupId>net.sf.jsptest</groupId> - <artifactId>jsptest-framework</artifactId> - </dependency> - <!-- needed for JSTL/TLD configuration --> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <version>1.1.2</version> - </dependency> - <dependency> - <groupId>taglibs</groupId> - <artifactId>standard</artifactId> - <version>1.1.2</version> - </dependency> - <!-- Provides the Jasper JSP compiler --> - <dependency> - <groupId>tomcat</groupId> - <artifactId>jasper-compiler</artifactId> - <version>5.5.15</version> - </dependency> - <dependency> - <groupId>tomcat</groupId> - <artifactId>jasper-runtime</artifactId> - <version>5.5.15</version> - </dependency> - </dependencies> - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - </resource> - </resources> - </build> -</project> \ No newline at end of file Copied: tags/jsptest-0.19/jsptest-jsp20/pom.xml (from rev 259, trunk/jsptest-jsp20/pom.xml) =================================================================== --- tags/jsptest-0.19/jsptest-jsp20/pom.xml (rev 0) +++ tags/jsptest-0.19/jsptest-jsp20/pom.xml 2009-11-13 09:03:51 UTC (rev 260) @@ -0,0 +1,50 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest</artifactId> + <version>0.19</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>jsptest-jsp20</artifactId> + <packaging>jar</packaging> + <name>JspTest for JSP 2.0</name> + <description> + JspTest variant suitable for testing JavaServer Pages that + follow the JSP 2.0 specification. + </description> + <dependencies> + <dependency> + <groupId>net.sf.jsptest</groupId> + <artifactId>jsptest-framework</artifactId> + </dependency> + <!-- needed for JSTL/TLD configuration --> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <version>1.1.2</version> + </dependency> + <dependency> + <groupId>taglibs</groupId> + <artifactId>standard</artifactId> + <version>1.1.2</version> + </dependency> + <!-- Provides the Jasper JSP compiler --> + <dependency> + <groupId>tomcat</groupId> + <artifactId>jasper-compiler</artifactId> + <version>5.5.15</version> + </dependency> + <dependency> + <groupId>tomcat</groupId> + <artifactId>jasper-runtime</artifactId> + <version>5.5.15</version> + </dependency> + </dependencies> + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + </resources> + </build> +</project> \ No newline at end of file Deleted: tags/jsptest-0.19/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperCompiler.java =================================================================== --- trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperCompiler.java 2008-11-19 13:06:40 UTC (rev 253) +++ tags/jsptest-0.19/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperCompiler.java 2009-11-13 09:03:51 UTC (rev 260) @@ -1,373 +0,0 @@ -/* - * Copyright 2007 Lasse Koskela. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package net.sf.jsptest.compiler.jsp20; - -import java.io.File; -import java.io.FileNotFoundException; -import java.io.PrintWriter; -import java.io.StringWriter; -import java.net.MalformedURLException; -import java.net.URL; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.jsp.tagext.TagInfo; -import net.sf.jsptest.compiler.JspCompilationInfo; -import net.sf.jsptest.compiler.java.CommandLineJavac; -import net.sf.jsptest.compiler.java.JavaCompiler; -import net.sf.jsptest.compiler.java.SunJavaC; -import net.sf.jsptest.compiler.jsp20.mock.MockOptions; -import net.sf.jsptest.compiler.jsp20.mock.MockServletConfig; -import net.sf.jsptest.compiler.jsp20.mock.MockTagInfo; -import net.sf.jsptest.utils.Path; -import net.sf.jsptest.utils.Strings; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.jasper.EmbeddedServletOptions; -import org.apache.jasper.JasperException; -import org.apache.jasper.JspCompilationContext; -import org.apache.jasper.Options; -import org.apache.jasper.compiler.AntCompiler; -import org.apache.jasper.compiler.Compiler; -import org.apache.jasper.compiler.JspRuntimeContext; -import org.apache.jasper.compiler.ServletWriter; -import org.apache.jasper.servlet.JspCServletContext; -import org.apache.jasper.servlet.JspServletWrapper; - -/** - * The <tt>JasperTestCase</tt> provides a facility for compiling JavaServer Pages outside a real - * Servlet/JSP container. - * <p> - * It makes use of Jakarta Tomcat's Jasper JSP compiler to compile a JSP file into Java source code, - * and then Sun's javac implementation to compile the Java source code into Java bytecode. - * <p> - * The resulting .class file is written under a "WEB-INF/classes" directory under the "web root" - * defined by concrete subclasses through the implementation of <tt>getWebRoot()</tt>. If you - * want the .class files to be generated somewhere else than under the web root, you can also - * override <tt>getClassOutputBaseDir()</tt>, which specifies the root directory for the compiled - * .class files. - * <p> - * The resulting Servlet class gets its package based on the <tt>getJspPackageName()</tt> method - * which can be overridden if necessary. The default is "jsp" which means that, for example, a JSP - * named "front_page.jsp" would eventually be translated into a class file - * "[webroot]/WEB-INF/classes/jsp/front_page_jsp.class" where "jsp/" is the JSP package name and - * "front_page_jsp.class" the normalized class name derived from the source JSP file's name. - * - * @author Lasse Koskela - * @author Meinert Schwartau (scwar32) - */ -public class JasperCompiler { - - private static final Log log = LogFactory.getLog(JasperCompiler.class); - private static JavaCompiler COMPILER = determineJavaCompiler(); - private String webRoot; - private String classOutputBaseDir; - private String jspPackageName; - - public JasperCompiler() { - webRoot = "."; - classOutputBaseDir = "."; - } - - /** - * Sets the "web root", i.e. the root directory of your exploded J2EE web application. In other - * words, this is the directory under which you should have a subdirectory named "WEB-INF". - */ - public void setWebRoot(String webRoot) { - this.webRoot = webRoot; - } - - /** - * Sets the directory where generated .class file(s) should be written.. - */ - public void setClassOutputBaseDir(String directory) { - this.classOutputBaseDir = directory; - } - - /** - * Compile the specified JSP source file into bytecode. - * - * @param path - * The path to the JSP source file to compile, given relative to the web root. - * @param mockTaglibs - * Mapping of tag names to tag handler classes - */ - public JspCompilationInfo compile(String path, Map mockTaglibs) throws Exception { - JspCompilationInfo info = createJspCompilationInfo(path, mockTaglibs); - if (info.jspCompilationRequired()) { - compileJsp(info); - compileJavaToBytecode(info); - } else { - log.debug(" No compilation needed for " + info.getJspSource()); - } - return info; - } - - /** - * Sets the package name for the generated Java classes. The default package name is "jsp". - */ - public void setJspPackageName(String packageName) { - this.jspPackageName = packageName; - } - - /** - * Returns the package name for the generated Java class. - */ - private String getJspPackageName() { - if (jspPackageName != null) { - return jspPackageName; - } else { - return "jsp"; - } - } - - private JspCompilationInfo createJspCompilationInfo(String jsp, Map mockTaglibs) { - JspCompilationInfo info = new JspCompilationInfo(); - info.setJspPath(jsp); - info.setClassOutputDir(classOutputBaseDir); - info.setJspSource(resolveJspSourceFile(jsp)); - info.setWebRoot(getWebRoot()); - info.setTaglibs(mockTaglibs); - resolveJavaSourceFile(info); - resolveClassFileLocation(info); - resolveClassName(info); - return info; - } - - private String getWebRoot() { - File root = new File(webRoot); - if (root.exists() && root.isDirectory()) { - return root.getAbsolutePath(); - } else { - return resolveWebRootFromClassPath(); - } - } - - private String resolveWebRootFromClassPath() { - String path = webRoot; - if (path.startsWith("./")) { - path = path.substring(2); - } - URL url = getClass().getClassLoader().getResource(path); - if (url == null) { - return webRoot; - } - if (!url.toExternalForm().startsWith("file:")) { - log.info("Web root referenced a non-filesystem resource: " + url); - return webRoot; - } - return new File(url.toExternalForm().substring("file:".length())).getAbsolutePath(); - } - - private void compileJsp(JspCompilationInfo info) throws Exception { - assertTrue("Source file " + new File(info.getJspSource()).getAbsolutePath() - + " does not exist", new File(info.getJspSource()).exists()); - PrintWriter logWriter = new PrintWriter(new StringWriter()); - URL baseUrl = new File(info.getWebRoot()).toURL(); - ServletContext sContext = new JspCServletContext(logWriter, baseUrl); - ServletConfig sConfig = new MockServletConfig(sContext); - Options options = createOptions(sContext, sConfig, info); - JspRuntimeContext rtContext = new JspRuntimeContext(sContext, options); - JspServletWrapper sWrapper = makeWrapper(sContext, options, rtContext); - JspCompilationContext cContext = createJspCompilationContext(info, sContext, options, - rtContext, sWrapper, new StringWriter()); - logCompilation(info.getJspSource(), info.getClassOutputDir()); - compileJspToJava(sWrapper, cContext); - File javaFile = new File(info.getJavaSource()); - assertTrue("Failed to generate .java source code to " + javaFile.getAbsolutePath(), - javaFile.exists()); - info.compilationWasSuccessful(); - } - - private void compileJspToJava(JspServletWrapper jspServletWrapper, - JspCompilationContext jspCompilationContext) throws FileNotFoundException, - JasperException, Exception { - Compiler compiler = new AntCompiler(); - compiler.init(jspCompilationContext, jspServletWrapper); - compiler.compile(); - } - - private JspCompilationContext createJspCompilationContext(JspCompilationInfo info, - ServletContext servletContext, Options options, JspRuntimeContext jspRuntimeContext, - JspServletWrapper jspServletWrapper, StringWriter stringWriter) { - boolean isErrorPage = false; - JspCompilationContext cContext = new JspCompilationContext(info.getJspPath(), isErrorPage, - options, servletContext, jspServletWrapper, jspRuntimeContext); - cContext.getOutputDir(); // forces creation of the directory tree - cContext.setServletJavaFileName(info.getJavaSource()); - cContext.setServletPackageName(getJspPackageName()); - cContext.setWriter(new ServletWriter(new PrintWriter(stringWriter))); - createPathToGeneratedJavaSource(info); - return cContext; - } - - private void createPathToGeneratedJavaSource(JspCompilationInfo info) { - new File(info.getJavaSource()).getParentFile().mkdirs(); - } - - private JspServletWrapper makeWrapper(ServletContext servletContext, Options options, - JspRuntimeContext jspRuntimeContext) throws MalformedURLException, JasperException { - TagInfo tagInfo = new MockTagInfo(); - String tagFilePath = "/"; - URL tagFileJarUrl = new File(".").toURL(); - JspServletWrapper wrapper = new JspServletWrapper(servletContext, options, tagFilePath, - tagInfo, jspRuntimeContext, tagFileJarUrl); - return wrapper; - } - - private Options createOptions(ServletContext ctx, ServletConfig cfg, JspCompilationInfo info) { - Options options = new EmbeddedServletOptions(cfg, ctx); - return new MockOptions(options, ctx, info); - } - - private void resolveJavaSourceFile(JspCompilationInfo info) { - File dir = new File(info.getClassOutputDir()); - if (getJspPackageName().length() > 0) { - dir = new File(dir, getJspPackageName().replace('.', '/')); - } - dir.mkdirs(); - String name = resolveJavaSourceFileName(info.getJspPath()); - info.setJavaSource(new File(dir, name).getPath()); - } - - private String resolveJavaSourceFileName(String jspPath) { - String name = encodeSpecialCharacters(jspPath); - if (name.startsWith("/")) { - name = name.substring(1); - } - return name + ".java"; - } - - private String encodeSpecialCharacters(String name) { - StringBuffer result = new StringBuffer(); - char[] chars = name.toCharArray(); - for (int i = 0; i < chars.length; i++) { - if (chars[i] == '-') { - result.append("_002d"); - } else if (chars[i] ==... [truncated message content] |