jsptest-svn-commits Mailing List for JspTest (Page 2)
Status: Alpha
Brought to you by:
lkoskela
Menu
▾
▴
jsptest-svn-commits — Mailing list for JspTest SVN commit emails
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(15) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(3) |
Feb
|
Mar
(2) |
Apr
(38) |
May
(1) |
Jun
(5) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(17) |
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(10) |
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(3) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
(5) |
May
(5) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <lko...@us...> - 2008-11-19 13:04:05
|
Revision: 251
http://jsptest.svn.sourceforge.net/jsptest/?rev=251&view=rev
Author: lkoskela
Date: 2008-11-19 13:04:03 +0000 (Wed, 19 Nov 2008)
Log Message:
-----------
[maven-release-plugin] prepare release jsptest-0.18
Modified Paths:
--------------
trunk/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml
trunk/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml
trunk/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml
trunk/jsptest-acceptance/pom.xml
trunk/jsptest-generic/jsptest-common/pom.xml
trunk/jsptest-generic/jsptest-compiler-api/pom.xml
trunk/jsptest-generic/jsptest-framework/pom.xml
trunk/jsptest-generic/pom.xml
trunk/jsptest-jsp12/pom.xml
trunk/jsptest-jsp20/pom.xml
trunk/jsptest-jsp21/pom.xml
trunk/pom.xml
Modified: trunk/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml
===================================================================
--- trunk/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml 2008-11-19 12:59:11 UTC (rev 250)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml 2008-11-19 13:04:03 UTC (rev 251)
@@ -1,11 +1,8 @@
-<?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">
+<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>
+ <version>0.18</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-acceptance-jsp12</artifactId>
@@ -21,4 +18,4 @@
<artifactId>jsptest-jsp12</artifactId>
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
Modified: trunk/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml
===================================================================
--- trunk/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml 2008-11-19 12:59:11 UTC (rev 250)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml 2008-11-19 13:04:03 UTC (rev 251)
@@ -1,11 +1,8 @@
-<?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">
+<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>
+ <version>0.18</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-acceptance-jsp20</artifactId>
@@ -21,4 +18,4 @@
<artifactId>jsptest-jsp20</artifactId>
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
Modified: trunk/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml
===================================================================
--- trunk/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml 2008-11-19 12:59:11 UTC (rev 250)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml 2008-11-19 13:04:03 UTC (rev 251)
@@ -1,15 +1,12 @@
-<?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">
+<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>
+ <version>0.18</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-acceptance-jsp21</artifactId>
- <version>0.18-SNAPSHOT</version>
+ <version>0.18</version>
<packaging>jar</packaging>
<name>
Acceptance tests for the JspTest variant for the JSP 2.1
@@ -22,4 +19,4 @@
<artifactId>jsptest-jsp21</artifactId>
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
Modified: trunk/jsptest-acceptance/pom.xml
===================================================================
--- trunk/jsptest-acceptance/pom.xml 2008-11-19 12:59:11 UTC (rev 250)
+++ trunk/jsptest-acceptance/pom.xml 2008-11-19 13:04:03 UTC (rev 251)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.18-SNAPSHOT</version>
+ <version>0.18</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-acceptance</artifactId>
Modified: trunk/jsptest-generic/jsptest-common/pom.xml
===================================================================
--- trunk/jsptest-generic/jsptest-common/pom.xml 2008-11-19 12:59:11 UTC (rev 250)
+++ trunk/jsptest-generic/jsptest-common/pom.xml 2008-11-19 13:04:03 UTC (rev 251)
@@ -1,15 +1,12 @@
-<?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">
+<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>
+ <version>0.18</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-common</artifactId>
- <version>0.18-SNAPSHOT</version>
+ <version>0.18</version>
<packaging>jar</packaging>
<name>Common utilities</name>
<description>
@@ -38,4 +35,4 @@
</dependencies>
</profile>
</profiles>
-</project>
+</project>
\ No newline at end of file
Modified: trunk/jsptest-generic/jsptest-compiler-api/pom.xml
===================================================================
--- trunk/jsptest-generic/jsptest-compiler-api/pom.xml 2008-11-19 12:59:11 UTC (rev 250)
+++ trunk/jsptest-generic/jsptest-compiler-api/pom.xml 2008-11-19 13:04:03 UTC (rev 251)
@@ -1,19 +1,16 @@
-<?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">
+<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>
+ <version>0.18</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-compiler-api</artifactId>
- <version>0.18-SNAPSHOT</version>
+ <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>
+</project>
\ No newline at end of file
Modified: trunk/jsptest-generic/jsptest-framework/pom.xml
===================================================================
--- trunk/jsptest-generic/jsptest-framework/pom.xml 2008-11-19 12:59:11 UTC (rev 250)
+++ trunk/jsptest-generic/jsptest-framework/pom.xml 2008-11-19 13:04:03 UTC (rev 251)
@@ -1,15 +1,12 @@
-<?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">
+<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>
+ <version>0.18</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-framework</artifactId>
- <version>0.18-SNAPSHOT</version>
+ <version>0.18</version>
<packaging>jar</packaging>
<name>Core framework</name>
<description>
@@ -19,12 +16,12 @@
<dependency>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-compiler-api</artifactId>
- <version>0.18-SNAPSHOT</version>
+ <version>0.18</version>
</dependency>
<dependency>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-common</artifactId>
- <version>0.18-SNAPSHOT</version>
+ <version>0.18</version>
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
Modified: trunk/jsptest-generic/pom.xml
===================================================================
--- trunk/jsptest-generic/pom.xml 2008-11-19 12:59:11 UTC (rev 250)
+++ trunk/jsptest-generic/pom.xml 2008-11-19 13:04:03 UTC (rev 251)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.18-SNAPSHOT</version>
+ <version>0.18</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-generic</artifactId>
- <version>0.18-SNAPSHOT</version>
+ <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>
Modified: trunk/jsptest-jsp12/pom.xml
===================================================================
--- trunk/jsptest-jsp12/pom.xml 2008-11-19 12:59:11 UTC (rev 250)
+++ trunk/jsptest-jsp12/pom.xml 2008-11-19 13:04:03 UTC (rev 251)
@@ -1,11 +1,8 @@
-<?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">
+<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>
+ <version>0.18</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-jsp12</artifactId>
@@ -50,4 +47,4 @@
</resource>
</resources>
</build>
-</project>
+</project>
\ No newline at end of file
Modified: trunk/jsptest-jsp20/pom.xml
===================================================================
--- trunk/jsptest-jsp20/pom.xml 2008-11-19 12:59:11 UTC (rev 250)
+++ trunk/jsptest-jsp20/pom.xml 2008-11-19 13:04:03 UTC (rev 251)
@@ -1,11 +1,8 @@
-<?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">
+<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>
+ <version>0.18</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-jsp20</artifactId>
@@ -50,4 +47,4 @@
</resource>
</resources>
</build>
-</project>
+</project>
\ No newline at end of file
Modified: trunk/jsptest-jsp21/pom.xml
===================================================================
--- trunk/jsptest-jsp21/pom.xml 2008-11-19 12:59:11 UTC (rev 250)
+++ trunk/jsptest-jsp21/pom.xml 2008-11-19 13:04:03 UTC (rev 251)
@@ -1,11 +1,8 @@
-<?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">
+<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>
+ <version>0.18</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-jsp21</artifactId>
@@ -45,4 +42,4 @@
</resource>
</resources>
</build>
-</project>
+</project>
\ No newline at end of file
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2008-11-19 12:59:11 UTC (rev 250)
+++ trunk/pom.xml 2008-11-19 13:04:03 UTC (rev 251)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.18-SNAPSHOT</version>
+ <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>
@@ -32,9 +32,9 @@
</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>
+ <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>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lko...@us...> - 2008-11-19 12:59:17
|
Revision: 250
http://jsptest.svn.sourceforge.net/jsptest/?rev=250&view=rev
Author: lkoskela
Date: 2008-11-19 12:59:11 +0000 (Wed, 19 Nov 2008)
Log Message:
-----------
Added the <autoVersionSubmodules/> configuration for maven-release-plugin
Modified Paths:
--------------
trunk/pom.xml
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2008-11-09 12:08:04 UTC (rev 249)
+++ trunk/pom.xml 2008-11-19 12:59:11 UTC (rev 250)
@@ -164,6 +164,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<configuration>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
<preparationGoals>clean install</preparationGoals>
</configuration>
</plugin>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lko...@us...> - 2008-11-09 12:08:10
|
Revision: 249
http://jsptest.svn.sourceforge.net/jsptest/?rev=249&view=rev
Author: lkoskela
Date: 2008-11-09 12:08:04 +0000 (Sun, 09 Nov 2008)
Log Message:
-----------
Formatted POM files with Eclipse
Modified Paths:
--------------
trunk/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml
trunk/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml
trunk/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml
trunk/jsptest-generic/jsptest-common/pom.xml
trunk/jsptest-generic/jsptest-compiler-api/pom.xml
trunk/jsptest-generic/jsptest-framework/pom.xml
trunk/jsptest-jsp12/pom.xml
trunk/jsptest-jsp20/pom.xml
trunk/jsptest-jsp21/pom.xml
Modified: trunk/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml
===================================================================
--- trunk/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml 2008-11-09 11:48:28 UTC (rev 248)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml 2008-11-09 12:08:04 UTC (rev 249)
@@ -1,19 +1,24 @@
<?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 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>
Modified: trunk/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml
===================================================================
--- trunk/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml 2008-11-09 11:48:28 UTC (rev 248)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml 2008-11-09 12:08:04 UTC (rev 249)
@@ -1,19 +1,24 @@
<?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 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>
Modified: trunk/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml
===================================================================
--- trunk/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml 2008-11-09 11:48:28 UTC (rev 248)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml 2008-11-09 12:08:04 UTC (rev 249)
@@ -1,20 +1,25 @@
<?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 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>
Modified: trunk/jsptest-generic/jsptest-common/pom.xml
===================================================================
--- trunk/jsptest-generic/jsptest-common/pom.xml 2008-11-09 11:48:28 UTC (rev 248)
+++ trunk/jsptest-generic/jsptest-common/pom.xml 2008-11-09 12:08:04 UTC (rev 249)
@@ -1,34 +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-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 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>
Modified: trunk/jsptest-generic/jsptest-compiler-api/pom.xml
===================================================================
--- trunk/jsptest-generic/jsptest-compiler-api/pom.xml 2008-11-09 11:48:28 UTC (rev 248)
+++ trunk/jsptest-generic/jsptest-compiler-api/pom.xml 2008-11-09 12:08:04 UTC (rev 249)
@@ -1,14 +1,19 @@
<?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 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>
Modified: trunk/jsptest-generic/jsptest-framework/pom.xml
===================================================================
--- trunk/jsptest-generic/jsptest-framework/pom.xml 2008-11-09 11:48:28 UTC (rev 248)
+++ trunk/jsptest-generic/jsptest-framework/pom.xml 2008-11-09 12:08:04 UTC (rev 249)
@@ -1,26 +1,30 @@
<?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 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>
Modified: trunk/jsptest-jsp12/pom.xml
===================================================================
--- trunk/jsptest-jsp12/pom.xml 2008-11-09 11:48:28 UTC (rev 248)
+++ trunk/jsptest-jsp12/pom.xml 2008-11-09 12:08:04 UTC (rev 249)
@@ -1,48 +1,53 @@
<?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 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>
Modified: trunk/jsptest-jsp20/pom.xml
===================================================================
--- trunk/jsptest-jsp20/pom.xml 2008-11-09 11:48:28 UTC (rev 248)
+++ trunk/jsptest-jsp20/pom.xml 2008-11-09 12:08:04 UTC (rev 249)
@@ -1,48 +1,53 @@
<?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 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>
Modified: trunk/jsptest-jsp21/pom.xml
===================================================================
--- trunk/jsptest-jsp21/pom.xml 2008-11-09 11:48:28 UTC (rev 248)
+++ trunk/jsptest-jsp21/pom.xml 2008-11-09 12:08:04 UTC (rev 249)
@@ -1,43 +1,48 @@
<?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 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>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lko...@us...> - 2008-11-09 11:48:30
|
Revision: 248
http://jsptest.svn.sourceforge.net/jsptest/?rev=248&view=rev
Author: lkoskela
Date: 2008-11-09 11:48:28 +0000 (Sun, 09 Nov 2008)
Log Message:
-----------
Removed the obsolete shell script for building modules in certain order. This workaround is not necessary anymore (with the recent Maven versions).
Removed Paths:
-------------
trunk/build.sh
Deleted: trunk/build.sh
===================================================================
--- trunk/build.sh 2008-11-08 12:00:27 UTC (rev 247)
+++ trunk/build.sh 2008-11-09 11:48:28 UTC (rev 248)
@@ -1,8 +0,0 @@
-#!/bin/sh
-eval 'cd jsptest-generic/jsptest-common;eval "mvn install";cd ../..'
-eval 'cd jsptest-generic/jsptest-compiler-api;eval "mvn install";cd ../..'
-eval 'cd jsptest-generic;eval "mvn install";cd ..'
-eval 'cd jsptest-jsp12;eval "mvn install";cd ..'
-eval 'cd jsptest-jsp20;eval "mvn install";cd ..'
-eval 'cd jsptest-jsp21;eval "mvn install";cd ..'
-eval 'mvn install'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lko...@us...> - 2008-11-08 12:00:39
|
Revision: 247
http://jsptest.svn.sourceforge.net/jsptest/?rev=247&view=rev
Author: lkoskela
Date: 2008-11-08 12:00:27 +0000 (Sat, 08 Nov 2008)
Log Message:
-----------
Added missing @author tags
Modified Paths:
--------------
trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/RequestAndSessionAttributeTest.java
trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/SunJavaC.java
trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/Path.java
trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/CustomClassLoaderTest.java
trunk/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/PathTest.java
trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/StreamConsumerTest.java
trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/StringsTest.java
trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/XMLTest.java
trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/TagKey.java
trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/AbstractFakeJspCompilerTestCase.java
trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/assertion/TestExpectedAssertionFailure.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JspExecutionImpl.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JspImpl.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/JspTestServletOutputStream.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockHttpServletRequest.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockHttpServletResponse.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockPageContext.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockServletContext.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockServletInputStream.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/ClasspathTldLocator.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/ExplodedTldLocator.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/TldLocator.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/TldUriMappings.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/WebInfLibTldLocator.java
trunk/jsptest-jsp20/src/test/java/net/sf/jsptest/compiler/jsp20/TestJspImpl.java
trunk/jsptest-jsp20/src/test/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/TestClasspathTldLocator.java
Modified: trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/RequestAndSessionAttributeTest.java
===================================================================
--- trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/RequestAndSessionAttributeTest.java 2008-11-08 07:11:53 UTC (rev 246)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/RequestAndSessionAttributeTest.java 2008-11-08 12:00:27 UTC (rev 247)
@@ -18,7 +18,7 @@
import net.sf.jsptest.JspTestCase;
/**
- * Unit testing JavaServer Pages has never been this easy!
+ * @author Lasse Koskela
*/
public class RequestAndSessionAttributeTest extends JspTestCase {
Modified: trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/SunJavaC.java
===================================================================
--- trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/SunJavaC.java 2008-11-08 07:11:53 UTC (rev 246)
+++ trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/SunJavaC.java 2008-11-08 12:00:27 UTC (rev 247)
@@ -18,10 +18,10 @@
import java.lang.reflect.Method;
/**
- * This implementation uses the java compiler from sun which ships with since the jdk since java
- * 1.3. The code is inspired by the javac ant task implementation.
+ * This implementation uses the Java compiler from Sun which ships with the JDK since Java
+ * 1.3. The code is inspired by the <tt>javac</tt> Ant task implementation.
*
- * @author mathias.broekelmann
+ * @author Mathias Broekelmann
*/
public class SunJavaC implements JavaCompiler {
Modified: trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/Path.java
===================================================================
--- trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/Path.java 2008-11-08 07:11:53 UTC (rev 246)
+++ trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/Path.java 2008-11-08 12:00:27 UTC (rev 247)
@@ -22,7 +22,7 @@
import java.util.Enumeration;
/**
- * @author lkoskela
+ * @author Lasse Koskela
*/
public class Path extends ArrayList {
Modified: trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/CustomClassLoaderTest.java
===================================================================
--- trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/CustomClassLoaderTest.java 2008-11-08 07:11:53 UTC (rev 246)
+++ trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/CustomClassLoaderTest.java 2008-11-08 12:00:27 UTC (rev 247)
@@ -3,6 +3,9 @@
import java.io.File;
import junit.framework.TestCase;
+/**
+ * @author Lasse Koskela
+ */
public class CustomClassLoaderTest extends TestCase {
private File baseDir;
Modified: trunk/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-08 07:11:53 UTC (rev 246)
+++ trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/IOTest.java 2008-11-08 12:00:27 UTC (rev 247)
@@ -3,6 +3,9 @@
import java.io.File;
import junit.framework.TestCase;
+/**
+ * @author Lasse Koskela
+ */
public class IOTest extends TestCase {
private File file;
Modified: trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/PathTest.java
===================================================================
--- trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/PathTest.java 2008-11-08 07:11:53 UTC (rev 246)
+++ trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/PathTest.java 2008-11-08 12:00:27 UTC (rev 247)
@@ -6,6 +6,9 @@
import java.util.List;
import junit.framework.TestCase;
+/**
+ * @author Lasse Koskela
+ */
public class PathTest extends TestCase {
private Path path;
Modified: trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/StreamConsumerTest.java
===================================================================
--- trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/StreamConsumerTest.java 2008-11-08 07:11:53 UTC (rev 246)
+++ trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/StreamConsumerTest.java 2008-11-08 12:00:27 UTC (rev 247)
@@ -6,6 +6,9 @@
import java.io.StringWriter;
import junit.framework.TestCase;
+/**
+ * @author Lasse Koskela
+ */
public class StreamConsumerTest extends TestCase {
private StringWriter log;
Modified: trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/StringsTest.java
===================================================================
--- trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/StringsTest.java 2008-11-08 07:11:53 UTC (rev 246)
+++ trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/StringsTest.java 2008-11-08 12:00:27 UTC (rev 247)
@@ -2,6 +2,9 @@
import junit.framework.TestCase;
+/**
+ * @author Lasse Koskela
+ */
public class StringsTest extends TestCase {
public void testReplacingNonexistentNeedle() throws Exception {
Modified: trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/XMLTest.java
===================================================================
--- trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/XMLTest.java 2008-11-08 07:11:53 UTC (rev 246)
+++ trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/XMLTest.java 2008-11-08 12:00:27 UTC (rev 247)
@@ -8,6 +8,9 @@
import org.w3c.dom.Element;
import org.xml.sax.InputSource;
+/**
+ * @author Lasse Koskela
+ */
public class XMLTest extends TestCase {
public void testCollectingTextContentForEmptyElement() throws Exception {
Modified: trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/TagKey.java
===================================================================
--- trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/TagKey.java 2008-11-08 07:11:53 UTC (rev 246)
+++ trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/TagKey.java 2008-11-08 12:00:27 UTC (rev 247)
@@ -2,6 +2,7 @@
/**
* @author Meinert Schwartau (scwar32)
+ * @author Lasse Koskela
*/
public class TagKey {
Modified: trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/AbstractFakeJspCompilerTestCase.java
===================================================================
--- trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/AbstractFakeJspCompilerTestCase.java 2008-11-08 07:11:53 UTC (rev 246)
+++ trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/AbstractFakeJspCompilerTestCase.java 2008-11-08 12:00:27 UTC (rev 247)
@@ -3,6 +3,9 @@
import net.sf.jsptest.compiler.dummy.FakeJspCompiler;
import junit.framework.TestCase;
+/**
+ * @author Lasse Koskela
+ */
public abstract class AbstractFakeJspCompilerTestCase extends TestCase {
protected void setUp() throws Exception {
Modified: trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/assertion/TestExpectedAssertionFailure.java
===================================================================
--- trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/assertion/TestExpectedAssertionFailure.java 2008-11-08 07:11:53 UTC (rev 246)
+++ trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/assertion/TestExpectedAssertionFailure.java 2008-11-08 12:00:27 UTC (rev 247)
@@ -4,6 +4,9 @@
import junit.framework.TestCase;
import net.sf.jsptest.HtmlTestCase;
+/**
+ * @author Lasse Koskela
+ */
public class TestExpectedAssertionFailure extends TestCase {
private HtmlTestCase testcase;
Modified: trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JspExecutionImpl.java
===================================================================
--- trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JspExecutionImpl.java 2008-11-08 07:11:53 UTC (rev 246)
+++ trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JspExecutionImpl.java 2008-11-08 12:00:27 UTC (rev 247)
@@ -2,6 +2,9 @@
import net.sf.jsptest.compiler.api.JspExecution;
+/**
+ * @author Lasse Koskela
+ */
public class JspExecutionImpl implements JspExecution {
private final String renderedOutput;
Modified: trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JspImpl.java
===================================================================
--- trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JspImpl.java 2008-11-08 07:11:53 UTC (rev 246)
+++ trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JspImpl.java 2008-11-08 12:00:27 UTC (rev 247)
@@ -21,6 +21,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+/**
+ * @author Lasse Koskela
+ */
public class JspImpl implements Jsp {
private static final Log log = LogFactory.getLog(JspImpl.class);
Modified: trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/JspTestServletOutputStream.java
===================================================================
--- trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/JspTestServletOutputStream.java 2008-11-08 07:11:53 UTC (rev 246)
+++ trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/JspTestServletOutputStream.java 2008-11-08 12:00:27 UTC (rev 247)
@@ -4,6 +4,9 @@
import java.io.OutputStream;
import javax.servlet.ServletOutputStream;
+/**
+ * @author Lasse Koskela
+ */
public class JspTestServletOutputStream extends ServletOutputStream {
private final OutputStream stream;
Modified: trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockHttpServletRequest.java
===================================================================
--- trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockHttpServletRequest.java 2008-11-08 07:11:53 UTC (rev 246)
+++ trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockHttpServletRequest.java 2008-11-08 12:00:27 UTC (rev 247)
@@ -36,6 +36,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
+/**
+ * @author Lasse Koskela
+ */
public class MockHttpServletRequest implements HttpServletRequest {
private Map headers = new HashMap();
Modified: trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockHttpServletResponse.java
===================================================================
--- trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockHttpServletResponse.java 2008-11-08 07:11:53 UTC (rev 246)
+++ trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockHttpServletResponse.java 2008-11-08 12:00:27 UTC (rev 247)
@@ -28,6 +28,9 @@
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;
+/**
+ * @author Lasse Koskela
+ */
public class MockHttpServletResponse implements HttpServletResponse {
private ServletOutputStream servletOutputStream;
Modified: trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockPageContext.java
===================================================================
--- trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockPageContext.java 2008-11-08 07:11:53 UTC (rev 246)
+++ trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockPageContext.java 2008-11-08 12:00:27 UTC (rev 247)
@@ -20,6 +20,9 @@
import org.apache.commons.el.ExpressionEvaluatorImpl;
import org.apache.commons.el.VariableResolverImpl;
+/**
+ * @author Lasse Koskela
+ */
public class MockPageContext extends PageContext {
private static final String VALID_SCOPES_DESCRIPTION = "Valid scopes are PageContext.PAGE_SCOPE, "
Modified: trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockServletContext.java
===================================================================
--- trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockServletContext.java 2008-11-08 07:11:53 UTC (rev 246)
+++ trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockServletContext.java 2008-11-08 12:00:27 UTC (rev 247)
@@ -10,6 +10,9 @@
import javax.servlet.ServletContext;
import javax.servlet.ServletException;
+/**
+ * @author Lasse Koskela
+ */
public class MockServletContext implements ServletContext {
public Set getResourcePaths(String reference) {
Modified: trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockServletInputStream.java
===================================================================
--- trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockServletInputStream.java 2008-11-08 07:11:53 UTC (rev 246)
+++ trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockServletInputStream.java 2008-11-08 12:00:27 UTC (rev 247)
@@ -6,6 +6,8 @@
/**
* Mock implementation of <code>ServletInputStream</code>.
+ *
+ * @author Lasse Koskela
*/
public class MockServletInputStream extends ServletInputStream {
Modified: trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/ClasspathTldLocator.java
===================================================================
--- trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/ClasspathTldLocator.java 2008-11-08 07:11:53 UTC (rev 246)
+++ trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/ClasspathTldLocator.java 2008-11-08 12:00:27 UTC (rev 247)
@@ -17,6 +17,9 @@
import java.net.URL;
+/**
+ * @author Lasse Koskela
+ */
public class ClasspathTldLocator implements TldLocator {
public TldLocation find(String filename) {
Modified: trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/ExplodedTldLocator.java
===================================================================
--- trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/ExplodedTldLocator.java 2008-11-08 07:11:53 UTC (rev 246)
+++ trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/ExplodedTldLocator.java 2008-11-08 12:00:27 UTC (rev 247)
@@ -17,6 +17,9 @@
import java.io.File;
+/**
+ * @author Lasse Koskela
+ */
public class ExplodedTldLocator implements TldLocator {
private final String webRoot;
Modified: trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/TldLocator.java
===================================================================
--- trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/TldLocator.java 2008-11-08 07:11:53 UTC (rev 246)
+++ trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/TldLocator.java 2008-11-08 12:00:27 UTC (rev 247)
@@ -15,6 +15,9 @@
*/
package net.sf.jsptest.compiler.jsp20.mock.taglibs;
+/**
+ * @author Lasse Koskela
+ */
public interface TldLocator {
/**
Modified: trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/TldUriMappings.java
===================================================================
--- trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/TldUriMappings.java 2008-11-08 07:11:53 UTC (rev 246)
+++ trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/TldUriMappings.java 2008-11-08 12:00:27 UTC (rev 247)
@@ -5,6 +5,9 @@
import java.util.List;
import java.util.Map;
+/**
+ * @author Lasse Koskela
+ */
public class TldUriMappings {
private static final Map standardTlds = new HashMap();
Modified: trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/WebInfLibTldLocator.java
===================================================================
--- trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/WebInfLibTldLocator.java 2008-11-08 07:11:53 UTC (rev 246)
+++ trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/WebInfLibTldLocator.java 2008-11-08 12:00:27 UTC (rev 247)
@@ -21,6 +21,9 @@
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
+/**
+ * @author Lasse Koskela
+ */
public class WebInfLibTldLocator implements TldLocator {
private final String webRoot;
Modified: trunk/jsptest-jsp20/src/test/java/net/sf/jsptest/compiler/jsp20/TestJspImpl.java
===================================================================
--- trunk/jsptest-jsp20/src/test/java/net/sf/jsptest/compiler/jsp20/TestJspImpl.java 2008-11-08 07:11:53 UTC (rev 246)
+++ trunk/jsptest-jsp20/src/test/java/net/sf/jsptest/compiler/jsp20/TestJspImpl.java 2008-11-08 12:00:27 UTC (rev 247)
@@ -16,6 +16,9 @@
import net.sf.jsptest.compiler.api.JspExecution;
import net.sf.jsptest.compiler.jsp20.mock.MockJspWriter;
+/**
+ * @author Lasse Koskela
+ */
public class TestJspImpl extends TestCase {
public static class FakeServlet extends javax.servlet.http.HttpServlet {
Modified: trunk/jsptest-jsp20/src/test/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/TestClasspathTldLocator.java
===================================================================
--- trunk/jsptest-jsp20/src/test/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/TestClasspathTldLocator.java 2008-11-08 07:11:53 UTC (rev 246)
+++ trunk/jsptest-jsp20/src/test/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/TestClasspathTldLocator.java 2008-11-08 12:00:27 UTC (rev 247)
@@ -3,6 +3,9 @@
import java.io.File;
import junit.framework.TestCase;
+/**
+ * @author Lasse Koskela
+ */
public class TestClasspathTldLocator extends TestCase {
private TldLocator locator;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lko...@us...> - 2008-11-08 07:11:57
|
Revision: 246
http://jsptest.svn.sourceforge.net/jsptest/?rev=246&view=rev
Author: lkoskela
Date: 2008-11-08 07:11:53 +0000 (Sat, 08 Nov 2008)
Log Message:
-----------
Refactored mocking of taglibs to use a single HashMap of TagKey->Class instead of two.
Modified Paths:
--------------
trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/JspCompilationInfo.java
trunk/jsptest-generic/jsptest-compiler-api/src/main/java/net/sf/jsptest/compiler/api/JspCompiler.java
trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/JspTestCase.java
trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/compiler/dummy/FakeJspCompiler.java
trunk/jsptest-jsp12/src/main/java/net/sf/jsptest/compiler/jsp12/JspCompilerImpl.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperCompiler.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperExecution.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JspCompilerImpl.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockOptions.java
trunk/jsptest-jsp20/src/main/java/org/apache/jasper/compiler/MockTagPluginManager.java
trunk/jsptest-jsp21/src/main/java/net/sf/jsptest/compiler/jsp21/JspCompilerImpl.java
Modified: trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/JspCompilationInfo.java
===================================================================
--- trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/JspCompilationInfo.java 2008-11-08 06:42:59 UTC (rev 245)
+++ trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/JspCompilationInfo.java 2008-11-08 07:11:53 UTC (rev 246)
@@ -37,12 +37,10 @@
private String classOutputDir;
private String webRoot;
private Map taglibs;
- private Map tags;
private static Map compilationHistory = new HashMap();
public JspCompilationInfo() {
this.taglibs = new HashMap();
- this.tags = new HashMap();
}
private String absolute(String path) {
@@ -127,16 +125,8 @@
this.taglibs = new HashMap(taglibs);
}
- public Map getTags() {
- return tags;
- }
-
- public void setTags(Map tags) {
- this.tags = new HashMap(tags);
- }
-
public synchronized void compilationWasSuccessful() {
- compilationHistory.put(jspSourceLocation, new LastCompile(taglibs, tags));
+ compilationHistory.put(jspSourceLocation, new LastCompile(taglibs));
}
public synchronized boolean jspCompilationRequired() {
@@ -146,7 +136,7 @@
File java = new File(javaSourceLocation);
File clazz = new File(classFileLocation);
return (doesNotExistOrIsTooOld(clazz) || doesNotExistOrIsTooOld(java)
- || jsp.lastModified() > java.lastModified() || taglibsHaveChangedSinceLastCompile() || tagsHaveChangedSinceLastCompile());
+ || jsp.lastModified() > java.lastModified() || taglibsHaveChangedSinceLastCompile());
}
private boolean taglibsHaveChangedSinceLastCompile() {
@@ -157,14 +147,6 @@
return !lastCompile.getTaglibs().equals(getTaglibs());
}
- private boolean tagsHaveChangedSinceLastCompile() {
- LastCompile lastCompile = (LastCompile) compilationHistory.get(getJspSource());
- if (lastCompile == null) {
- return true;
- }
- return !lastCompile.getTags().equals(getTags());
- }
-
private boolean doesNotExistOrIsTooOld(File file) {
long expirationAge = 5 * 60 * 1000L;
long expirationThreshold = System.currentTimeMillis() - expirationAge;
@@ -179,17 +161,11 @@
private static final class LastCompile {
private final Map taglibs;
- private final Map tags;
- public LastCompile(Map taglibs, Map tags) {
+ public LastCompile(Map taglibs) {
this.taglibs = taglibs;
- this.tags = tags;
}
- public Map getTags() {
- return tags;
- }
-
public Map getTaglibs() {
return taglibs;
}
Modified: trunk/jsptest-generic/jsptest-compiler-api/src/main/java/net/sf/jsptest/compiler/api/JspCompiler.java
===================================================================
--- trunk/jsptest-generic/jsptest-compiler-api/src/main/java/net/sf/jsptest/compiler/api/JspCompiler.java 2008-11-08 06:42:59 UTC (rev 245)
+++ trunk/jsptest-generic/jsptest-compiler-api/src/main/java/net/sf/jsptest/compiler/api/JspCompiler.java 2008-11-08 07:11:53 UTC (rev 246)
@@ -8,7 +8,7 @@
*/
public interface JspCompiler {
- Jsp compile(String path, Map taglibs, Map tags);
+ Jsp compile(String path, Map taglibs);
void setWebRoot(String directory);
Modified: trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/JspTestCase.java
===================================================================
--- trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/JspTestCase.java 2008-11-08 06:42:59 UTC (rev 245)
+++ trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/JspTestCase.java 2008-11-08 07:11:53 UTC (rev 246)
@@ -40,7 +40,6 @@
private Map requestAttributes;
private Map sessionAttributes;
private Map substituteTaglibs;
- private Map substituteTags;
private JspExecution execution;
public JspTestCase() {
@@ -55,7 +54,6 @@
requestAttributes = new HashMap();
sessionAttributes = new HashMap();
substituteTaglibs = new HashMap();
- substituteTags = new HashMap();
}
/**
@@ -127,7 +125,7 @@
+ new File(getWebRoot()).getAbsolutePath());
compiler.setWebRoot(getWebRoot());
compiler.setOutputDirectory(getOutputDirectory());
- Jsp jsp = compiler.compile(path, substituteTaglibs, substituteTags);
+ Jsp jsp = compiler.compile(path, substituteTaglibs);
log.debug("Simulating a request to " + path);
execution = jsp.request(httpMethod, requestAttributes, sessionAttributes);
}
@@ -177,6 +175,6 @@
* The new (substitute) implementation to use.
*/
protected void substituteTag(String prefix, String name, Class newImplementation) {
- substituteTags.put(new TagKey(prefix, name), newImplementation);
+ substituteTaglibs.put(new TagKey(prefix, name), newImplementation);
}
}
Modified: trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/compiler/dummy/FakeJspCompiler.java
===================================================================
--- trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/compiler/dummy/FakeJspCompiler.java 2008-11-08 06:42:59 UTC (rev 245)
+++ trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/compiler/dummy/FakeJspCompiler.java 2008-11-08 07:11:53 UTC (rev 246)
@@ -32,7 +32,7 @@
fakedOutput.append(content);
}
- public Jsp compile(String path, Map taglibs, Map tags) {
+ public Jsp compile(String path, Map taglibs) {
lastCompiledWebRoot = getWebRoot();
lastCompiledPath = path;
return new Jsp() {
Modified: trunk/jsptest-jsp12/src/main/java/net/sf/jsptest/compiler/jsp12/JspCompilerImpl.java
===================================================================
--- trunk/jsptest-jsp12/src/main/java/net/sf/jsptest/compiler/jsp12/JspCompilerImpl.java 2008-11-08 06:42:59 UTC (rev 245)
+++ trunk/jsptest-jsp12/src/main/java/net/sf/jsptest/compiler/jsp12/JspCompilerImpl.java 2008-11-08 07:11:53 UTC (rev 246)
@@ -10,7 +10,7 @@
*/
public class JspCompilerImpl implements JspCompiler {
- public Jsp compile(String path, Map taglibs, Map tags) {
+ public Jsp compile(String path, Map taglibs) {
throw new RuntimeException("Not implemented");
}
Modified: trunk/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-08 06:42:59 UTC (rev 245)
+++ trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperCompiler.java 2008-11-08 07:11:53 UTC (rev 246)
@@ -107,11 +107,9 @@
* 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
- * @param mockTags
- * Mapping of <tt>TagKey</tt>s to tag handler classes
*/
- public JspCompilationInfo compile(String path, Map mockTaglibs, Map mockTags) throws Exception {
- JspCompilationInfo info = createJspCompilationInfo(path, mockTaglibs, mockTags);
+ public JspCompilationInfo compile(String path, Map mockTaglibs) throws Exception {
+ JspCompilationInfo info = createJspCompilationInfo(path, mockTaglibs);
if (info.jspCompilationRequired()) {
compileJsp(info);
compileJavaToBytecode(info);
@@ -139,14 +137,13 @@
}
}
- private JspCompilationInfo createJspCompilationInfo(String jsp, Map mockTaglibs, Map mockTags) {
+ 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);
- info.setTags(mockTags);
resolveJavaSourceFile(info);
resolveClassFileLocation(info);
resolveClassName(info);
Modified: trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperExecution.java
===================================================================
--- trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperExecution.java 2008-11-08 06:42:59 UTC (rev 245)
+++ trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperExecution.java 2008-11-08 07:11:53 UTC (rev 246)
@@ -185,15 +185,10 @@
}
private Class compileToClass(String path) throws Exception, ClassNotFoundException {
- // TODO: why are the mocks for taglibs and tags handled differently here?
- JspCompilationInfo compilation = getCompiler().compile(path, mockTaglibs, getMockTags());
+ JspCompilationInfo compilation = getCompiler().compile(path, mockTaglibs);
return loadJspClass(compilation.getClassName());
}
- protected Map getMockTags() {
- return new HashMap();
- }
-
private JasperCompiler getCompiler() {
compiler.setWebRoot(getWebRoot());
compiler.setClassOutputBaseDir(getClassOutputBaseDir());
Modified: trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JspCompilerImpl.java
===================================================================
--- trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JspCompilerImpl.java 2008-11-08 06:42:59 UTC (rev 245)
+++ trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JspCompilerImpl.java 2008-11-08 07:11:53 UTC (rev 246)
@@ -33,12 +33,12 @@
return webRoot;
}
- public Jsp compile(final String jspPath, Map taglibs, Map tags) {
+ public Jsp compile(final String jspPath, Map taglibs) {
try {
JasperCompiler compiler = new JasperCompiler();
compiler.setWebRoot(getWebRoot());
compiler.setClassOutputBaseDir(getOutputDirectory());
- JspCompilationInfo info = compiler.compile(jspPath, taglibs, tags);
+ JspCompilationInfo info = compiler.compile(jspPath, taglibs);
final Class servletClass = compileToClass(info);
return new JspImpl(servletClass);
} catch (Exception e) {
Modified: trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockOptions.java
===================================================================
--- trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockOptions.java 2008-11-08 06:42:59 UTC (rev 245)
+++ trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockOptions.java 2008-11-08 07:11:53 UTC (rev 246)
@@ -133,7 +133,7 @@
public TagPluginManager getTagPluginManager() {
return new MockTagPluginManager(servletContext, options.getTagPluginManager(),
- compilationInfo.getTaglibs(), compilationInfo.getTags());
+ compilationInfo.getTaglibs());
}
public boolean genStringAsCharArray() {
Modified: trunk/jsptest-jsp20/src/main/java/org/apache/jasper/compiler/MockTagPluginManager.java
===================================================================
--- trunk/jsptest-jsp20/src/main/java/org/apache/jasper/compiler/MockTagPluginManager.java 2008-11-08 06:42:59 UTC (rev 245)
+++ trunk/jsptest-jsp20/src/main/java/org/apache/jasper/compiler/MockTagPluginManager.java 2008-11-08 07:11:53 UTC (rev 246)
@@ -17,49 +17,35 @@
public class MockTagPluginManager extends TagPluginManager {
protected Map mockTaglibs;
- protected Map mockTags;
- public MockTagPluginManager(ServletContext ctx, TagPluginManager manager, Map taglibs, Map tags) {
+ public MockTagPluginManager(ServletContext ctx, TagPluginManager manager, Map taglibs) {
super(ctx);
mockTaglibs = new HashMap(taglibs);
- mockTags = new HashMap(tags);
}
public void apply(Nodes nodes, ErrorDispatcher errorDispatcher, PageInfo pageInfo)
throws JasperException {
invokePrivateInitWith(errorDispatcher);
assignToPrivateField("pageInfo", pageInfo);
- visitPageNodes(nodes);
+ substituteMocksFor(nodes);
}
- private void visitPageNodes(Nodes nodes) throws JasperException {
- replaceTaglibs(nodes);
- replaceTags(nodes);
+ private void substituteMocksFor(Nodes nodes) throws JasperException {
+ nodes.visit(new TagSubstitutor(mockTaglibs));
}
- private void replaceTaglibs(Nodes nodes) throws JasperException {
- nodes.visit(new TagSubstitutor() {
+ /**
+ * Walks through the node tree representing the JSP and replaces the <i>handler</i> of certain
+ * tags with a mock implementation if one has been configured.
+ */
+ private static class TagSubstitutor extends Node.Visitor {
- protected Class substitute(TagInfo tagInfo) {
- String tagName = tagInfo.getTagLibrary().getPrefixString();
- return (Class) mockTaglibs.get(new TagKey(tagName));
- }
- });
- }
+ private final Map mocks;
- private void replaceTags(Nodes nodes) throws JasperException {
- nodes.visit(new TagSubstitutor() {
+ public TagSubstitutor(Map mockTaglibs) {
+ this.mocks = mockTaglibs;
+ }
- protected Class substitute(TagInfo tagInfo) {
- String prefix = tagInfo.getTagLibrary().getPrefixString();
- String name = tagInfo.getTagName();
- return (Class) mockTags.get(new TagKey(prefix, name));
- }
- });
- }
-
- private static abstract class TagSubstitutor extends Node.Visitor {
-
public void visit(Node.CustomTag n) throws JasperException {
Class mockClass = substitute(n.getTagInfo());
if (mockClass != null) {
@@ -68,7 +54,21 @@
super.visit(n);
}
- protected abstract Class substitute(TagInfo tagInfo);
+ private Class substitute(TagInfo tagInfo) {
+ String prefix = tagInfo.getTagLibrary().getPrefixString();
+ String name = tagInfo.getTagName();
+ TagKey[] matchingOrder = new TagKey[] { new TagKey(prefix, name), new TagKey(prefix) };
+ return firstMatch(mocks, matchingOrder);
+ }
+
+ private Class firstMatch(Map map, TagKey[] keys) {
+ for (int i = 0; i < keys.length; i++) {
+ if (map.containsKey(keys[i])) {
+ return (Class) mocks.get(keys[i]);
+ }
+ }
+ return null;
+ }
}
private void assignToPrivateField(String fieldName, Object value) {
Modified: trunk/jsptest-jsp21/src/main/java/net/sf/jsptest/compiler/jsp21/JspCompilerImpl.java
===================================================================
--- trunk/jsptest-jsp21/src/main/java/net/sf/jsptest/compiler/jsp21/JspCompilerImpl.java 2008-11-08 06:42:59 UTC (rev 245)
+++ trunk/jsptest-jsp21/src/main/java/net/sf/jsptest/compiler/jsp21/JspCompilerImpl.java 2008-11-08 07:11:53 UTC (rev 246)
@@ -10,7 +10,7 @@
*/
public class JspCompilerImpl implements JspCompiler {
- public Jsp compile(String path, Map taglibs, Map tags) {
+ public Jsp compile(String path, Map taglibs) {
throw new RuntimeException("Not implemented");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lko...@us...> - 2008-11-08 06:43:03
|
Revision: 245
http://jsptest.svn.sourceforge.net/jsptest/?rev=245&view=rev
Author: lkoskela
Date: 2008-11-08 06:42:59 +0000 (Sat, 08 Nov 2008)
Log Message:
-----------
Fixed the consistency issue between how 'target/test-classes' and 'target/classes' were added to the classpath
Modified Paths:
--------------
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperCompiler.java
Modified: trunk/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-08 06:33:30 UTC (rev 244)
+++ trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperCompiler.java 2008-11-08 06:42:59 UTC (rev 245)
@@ -333,8 +333,7 @@
cp.addContainer(org.apache.jasper.JspC.class);
cp.addContainer(org.apache.jasper.compiler.Compiler.class);
cp.addContainer(org.apache.jasper.runtime.HttpJspBase.class);
- // TODO: why are these directories added differently?
- cp.add(new File("target", "test-classes"));
+ cp.add(new File("target", "test-classes").getAbsolutePath());
cp.add(new File("target", "classes").getAbsolutePath());
return cp.toStringArray();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lko...@us...> - 2008-11-08 06:33:32
|
Revision: 244
http://jsptest.svn.sourceforge.net/jsptest/?rev=244&view=rev
Author: lkoskela
Date: 2008-11-08 06:33:30 +0000 (Sat, 08 Nov 2008)
Log Message:
-----------
Refactored both types of 'mocked taglibs' to use TagKey as the hash key. This gives us consistency but also allows us to refactor the two HashMaps into one.
Modified Paths:
--------------
trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/JspTestCase.java
trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/TagKey.java
trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/TagKeyTest.java
trunk/jsptest-jsp20/src/main/java/org/apache/jasper/compiler/MockTagPluginManager.java
Modified: trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/JspTestCase.java
===================================================================
--- trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/JspTestCase.java 2008-11-07 23:00:53 UTC (rev 243)
+++ trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/JspTestCase.java 2008-11-08 06:33:30 UTC (rev 244)
@@ -165,7 +165,7 @@
* The new (substitute) implementation to use.
*/
protected void substituteTaglib(String name, Class newImplementation) {
- substituteTaglibs.put(name, newImplementation);
+ substituteTaglibs.put(new TagKey(name), newImplementation);
}
/**
Modified: trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/TagKey.java
===================================================================
--- trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/TagKey.java 2008-11-07 23:00:53 UTC (rev 243)
+++ trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/TagKey.java 2008-11-08 06:33:30 UTC (rev 244)
@@ -8,6 +8,10 @@
private final String prefix;
private final String name;
+ public TagKey(String prefix) {
+ this(prefix, "*");
+ }
+
public TagKey(String prefix, String name) {
this.prefix = prefix;
this.name = name;
Modified: trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/TagKeyTest.java
===================================================================
--- trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/TagKeyTest.java 2008-11-07 23:00:53 UTC (rev 243)
+++ trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/TagKeyTest.java 2008-11-08 06:33:30 UTC (rev 244)
@@ -26,4 +26,8 @@
public void testToStringPrettyPrints() throws Exception {
assertEquals("prefix:name", new TagKey("prefix", "name").toString());
}
+
+ public void testTagNameDefaultsToAsteriskIfNotSet() throws Exception {
+ assertEquals(new TagKey("prefix", "*"), new TagKey("prefix"));
+ }
}
Modified: trunk/jsptest-jsp20/src/main/java/org/apache/jasper/compiler/MockTagPluginManager.java
===================================================================
--- trunk/jsptest-jsp20/src/main/java/org/apache/jasper/compiler/MockTagPluginManager.java 2008-11-07 23:00:53 UTC (rev 243)
+++ trunk/jsptest-jsp20/src/main/java/org/apache/jasper/compiler/MockTagPluginManager.java 2008-11-08 06:33:30 UTC (rev 244)
@@ -42,7 +42,7 @@
protected Class substitute(TagInfo tagInfo) {
String tagName = tagInfo.getTagLibrary().getPrefixString();
- return (Class) mockTaglibs.get(tagName);
+ return (Class) mockTaglibs.get(new TagKey(tagName));
}
});
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lko...@us...> - 2008-11-07 23:01:04
|
Revision: 243
http://jsptest.svn.sourceforge.net/jsptest/?rev=243&view=rev
Author: lkoskela
Date: 2008-11-07 23:00:53 +0000 (Fri, 07 Nov 2008)
Log Message:
-----------
Removed a bit of duplication.
Modified Paths:
--------------
trunk/jsptest-jsp20/src/main/java/org/apache/jasper/compiler/MockTagPluginManager.java
Modified: trunk/jsptest-jsp20/src/main/java/org/apache/jasper/compiler/MockTagPluginManager.java
===================================================================
--- trunk/jsptest-jsp20/src/main/java/org/apache/jasper/compiler/MockTagPluginManager.java 2008-11-07 22:21:33 UTC (rev 242)
+++ trunk/jsptest-jsp20/src/main/java/org/apache/jasper/compiler/MockTagPluginManager.java 2008-11-07 23:00:53 UTC (rev 243)
@@ -5,6 +5,7 @@
import java.util.HashMap;
import java.util.Map;
import javax.servlet.ServletContext;
+import javax.servlet.jsp.tagext.TagInfo;
import net.sf.jsptest.TagKey;
import org.apache.jasper.JasperException;
import org.apache.jasper.compiler.Node.Nodes;
@@ -37,34 +38,39 @@
}
private void replaceTaglibs(Nodes nodes) throws JasperException {
- nodes.visit(new Node.Visitor() {
+ nodes.visit(new TagSubstitutor() {
- public void visit(Node.CustomTag n) throws JasperException {
- String tagName = n.getTagInfo().getTagLibrary().getPrefixString();
- Class mockClass = (Class) mockTaglibs.get(tagName);
- if (mockClass != null) {
- n.setTagHandlerClass(mockClass);
- }
- super.visit(n);
+ protected Class substitute(TagInfo tagInfo) {
+ String tagName = tagInfo.getTagLibrary().getPrefixString();
+ return (Class) mockTaglibs.get(tagName);
}
});
}
private void replaceTags(Nodes nodes) throws JasperException {
- nodes.visit(new Node.Visitor() {
+ nodes.visit(new TagSubstitutor() {
- public void visit(Node.CustomTag n) throws JasperException {
- String prefix = n.getTagInfo().getTagLibrary().getPrefixString();
- String name = n.getTagInfo().getTagName();
- Class mockClass = (Class) mockTags.get(new TagKey(prefix, name));
- if (mockClass != null) {
- n.setTagHandlerClass(mockClass);
- }
- super.visit(n);
+ protected Class substitute(TagInfo tagInfo) {
+ String prefix = tagInfo.getTagLibrary().getPrefixString();
+ String name = tagInfo.getTagName();
+ return (Class) mockTags.get(new TagKey(prefix, name));
}
});
}
+ private static abstract class TagSubstitutor extends Node.Visitor {
+
+ public void visit(Node.CustomTag n) throws JasperException {
+ Class mockClass = substitute(n.getTagInfo());
+ if (mockClass != null) {
+ n.setTagHandlerClass(mockClass);
+ }
+ super.visit(n);
+ }
+
+ protected abstract Class substitute(TagInfo tagInfo);
+ }
+
private void assignToPrivateField(String fieldName, Object value) {
try {
Field field = getClass().getSuperclass().getDeclaredField(fieldName);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lko...@us...> - 2008-11-07 22:21:37
|
Revision: 242
http://jsptest.svn.sourceforge.net/jsptest/?rev=242&view=rev
Author: lkoskela
Date: 2008-11-07 22:21:33 +0000 (Fri, 07 Nov 2008)
Log Message:
-----------
Implemented a patch from Meinert Schwartau with minor modifications. JspTest now has the ability to stub/mock/fake individual tags, not just whole tag libraries.
Modified Paths:
--------------
trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/TestMockingTaglibs.java
trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/JspCompilationInfo.java
trunk/jsptest-generic/jsptest-compiler-api/src/main/java/net/sf/jsptest/compiler/api/JspCompiler.java
trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/JspTestCase.java
trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/compiler/dummy/FakeJspCompiler.java
trunk/jsptest-jsp12/src/main/java/net/sf/jsptest/compiler/jsp12/JspCompilerImpl.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperCompiler.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperExecution.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JspCompilerImpl.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockOptions.java
trunk/jsptest-jsp20/src/main/java/org/apache/jasper/compiler/MockTagPluginManager.java
trunk/jsptest-jsp21/src/main/java/net/sf/jsptest/compiler/jsp21/JspCompilerImpl.java
Added Paths:
-----------
trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/TagKey.java
trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/TagKeyTest.java
Modified: trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/TestMockingTaglibs.java
===================================================================
--- trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/TestMockingTaglibs.java 2008-11-07 22:05:06 UTC (rev 241)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/TestMockingTaglibs.java 2008-11-07 22:21:33 UTC (rev 242)
@@ -22,6 +22,7 @@
/**
* @author Lasse Koskela
+ * @author Meinert Schwartau (scwar32)
*/
public class TestMockingTaglibs extends JspTestCase {
@@ -34,7 +35,7 @@
}
/**
- * This taglib class gets to replace the real thing.
+ * This taglib class gets to replace the real thing (<c:_/>).
*/
public static class MockCustomTag extends CustomTag {
@@ -52,9 +53,39 @@
}
}
- public void testRenderingJspUsingCustomTaglibs() throws Exception {
+ /**
+ * This taglib class gets to replace the real thing (<c:out/>).
+ */
+ public static class MockCustomOutTag extends CustomTag {
+
+ public void setValue(String value) {
+ }
+
+ public int doStartTag() throws JspException {
+ try {
+ JspWriter out = pageContext.getOut();
+ out.print("replaced");
+ } catch (Exception e) {
+ throw new JspException(e);
+ }
+ return TagSupport.SKIP_BODY;
+ }
+
+ public int doEndTag() throws JspException {
+ return TagSupport.EVAL_PAGE;
+ }
+ }
+
+ public void testSubstitutingCustomTaglibs() throws Exception {
substituteTaglib("custom", MockCustomTag.class);
get("/taglibs/custom-taglib.jsp");
output().shouldContain("This content is coming from the mock CustomTag");
}
+
+ public void testSubstitutingSpecificTagWithinTagLibrary() throws Exception {
+ substituteTag("c", "out", MockCustomOutTag.class);
+ get("/taglibs/standard-taglibs.jsp");
+ output().shouldNotContain("loop-1");
+ output().shouldContain("replaced-replaced");
+ }
}
Modified: trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/JspCompilationInfo.java
===================================================================
--- trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/JspCompilationInfo.java 2008-11-07 22:05:06 UTC (rev 241)
+++ trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/JspCompilationInfo.java 2008-11-07 22:21:33 UTC (rev 242)
@@ -25,6 +25,7 @@
* find input) and add newly created information (where the output went).
*
* @author Lasse Koskela
+ * @author Meinert Schwartau (scwar32)
*/
public class JspCompilationInfo {
@@ -36,10 +37,12 @@
private String classOutputDir;
private String webRoot;
private Map taglibs;
+ private Map tags;
private static Map compilationHistory = new HashMap();
public JspCompilationInfo() {
this.taglibs = new HashMap();
+ this.tags = new HashMap();
}
private String absolute(String path) {
@@ -116,6 +119,26 @@
this.webRoot = webRoot;
}
+ public Map getTaglibs() {
+ return taglibs;
+ }
+
+ public void setTaglibs(Map taglibs) {
+ this.taglibs = new HashMap(taglibs);
+ }
+
+ public Map getTags() {
+ return tags;
+ }
+
+ public void setTags(Map tags) {
+ this.tags = new HashMap(tags);
+ }
+
+ public synchronized void compilationWasSuccessful() {
+ compilationHistory.put(jspSourceLocation, new LastCompile(taglibs, tags));
+ }
+
public synchronized boolean jspCompilationRequired() {
// TODO: only avoid compilation if there is a matching MD5 for the .jsp
// file in a cache or if the file is missing altogether.
@@ -123,21 +146,23 @@
File java = new File(javaSourceLocation);
File clazz = new File(classFileLocation);
return (doesNotExistOrIsTooOld(clazz) || doesNotExistOrIsTooOld(java)
- || jsp.lastModified() > java.lastModified() || taglibsHaveChangedSinceLastCompile());
+ || jsp.lastModified() > java.lastModified() || taglibsHaveChangedSinceLastCompile() || tagsHaveChangedSinceLastCompile());
}
private boolean taglibsHaveChangedSinceLastCompile() {
- Map taglibs = (Map) compilationHistory.get(getJspSource());
- if (taglibs == null) {
- // first compilation -> must compile
+ LastCompile lastCompile = (LastCompile) compilationHistory.get(getJspSource());
+ if (lastCompile == null) {
return true;
}
- if (!taglibs.equals(getTaglibs())) {
- // not the first compilation but taglibs were configured differently
- // for the previous compilation so we need a new one
+ return !lastCompile.getTaglibs().equals(getTaglibs());
+ }
+
+ private boolean tagsHaveChangedSinceLastCompile() {
+ LastCompile lastCompile = (LastCompile) compilationHistory.get(getJspSource());
+ if (lastCompile == null) {
return true;
}
- return false;
+ return !lastCompile.getTags().equals(getTags());
}
private boolean doesNotExistOrIsTooOld(File file) {
@@ -146,15 +171,27 @@
return file.exists() == false || file.lastModified() < expirationThreshold;
}
- public void setTaglibs(Map taglibs) {
- this.taglibs = new HashMap(taglibs);
- }
+ /**
+ * Represents the tag configuration of a prior compilation.
+ *
+ * @author Meinert Schwartau (scwar32)
+ */
+ private static final class LastCompile {
- public Map getTaglibs() {
- return taglibs;
- }
+ private final Map taglibs;
+ private final Map tags;
- public synchronized void compilationWasSuccessful() {
- compilationHistory.put(jspSourceLocation, taglibs);
+ public LastCompile(Map taglibs, Map tags) {
+ this.taglibs = taglibs;
+ this.tags = tags;
+ }
+
+ public Map getTags() {
+ return tags;
+ }
+
+ public Map getTaglibs() {
+ return taglibs;
+ }
}
}
Modified: trunk/jsptest-generic/jsptest-compiler-api/src/main/java/net/sf/jsptest/compiler/api/JspCompiler.java
===================================================================
--- trunk/jsptest-generic/jsptest-compiler-api/src/main/java/net/sf/jsptest/compiler/api/JspCompiler.java 2008-11-07 22:05:06 UTC (rev 241)
+++ trunk/jsptest-generic/jsptest-compiler-api/src/main/java/net/sf/jsptest/compiler/api/JspCompiler.java 2008-11-07 22:21:33 UTC (rev 242)
@@ -2,9 +2,13 @@
import java.util.Map;
+/**
+ * @author Lasse Koskela
+ * @author Meinert Schwartau (scwar32)
+ */
public interface JspCompiler {
- Jsp compile(String path, Map taglibs);
+ Jsp compile(String path, Map taglibs, Map tags);
void setWebRoot(String directory);
Modified: trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/JspTestCase.java
===================================================================
--- trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/JspTestCase.java 2008-11-07 22:05:06 UTC (rev 241)
+++ trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/JspTestCase.java 2008-11-07 22:21:33 UTC (rev 242)
@@ -32,6 +32,7 @@
* renders the expected kind of output.
*
* @author Lasse Koskela
+ * @author Meinert Schwartau (scwar32)
*/
public abstract class JspTestCase extends TestCase {
@@ -39,6 +40,7 @@
private Map requestAttributes;
private Map sessionAttributes;
private Map substituteTaglibs;
+ private Map substituteTags;
private JspExecution execution;
public JspTestCase() {
@@ -53,6 +55,7 @@
requestAttributes = new HashMap();
sessionAttributes = new HashMap();
substituteTaglibs = new HashMap();
+ substituteTags = new HashMap();
}
/**
@@ -124,7 +127,7 @@
+ new File(getWebRoot()).getAbsolutePath());
compiler.setWebRoot(getWebRoot());
compiler.setOutputDirectory(getOutputDirectory());
- Jsp jsp = compiler.compile(path, substituteTaglibs);
+ Jsp jsp = compiler.compile(path, substituteTaglibs, substituteTags);
log.debug("Simulating a request to " + path);
execution = jsp.request(httpMethod, requestAttributes, sessionAttributes);
}
@@ -164,4 +167,16 @@
protected void substituteTaglib(String name, Class newImplementation) {
substituteTaglibs.put(name, newImplementation);
}
+
+ /**
+ * Invoke this method to substitute the specified taglib with the given implementation.
+ *
+ * @param name
+ * The name of the taglib to replace.
+ * @param newImplementation
+ * The new (substitute) implementation to use.
+ */
+ protected void substituteTag(String prefix, String name, Class newImplementation) {
+ substituteTags.put(new TagKey(prefix, name), newImplementation);
+ }
}
Added: trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/TagKey.java
===================================================================
--- trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/TagKey.java (rev 0)
+++ trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/TagKey.java 2008-11-07 22:21:33 UTC (rev 242)
@@ -0,0 +1,55 @@
+package net.sf.jsptest;
+
+/**
+ * @author Meinert Schwartau (scwar32)
+ */
+public class TagKey {
+
+ private final String prefix;
+ private final String name;
+
+ public TagKey(String prefix, String name) {
+ this.prefix = prefix;
+ this.name = name;
+ }
+
+ public String toString() {
+ return prefix + ":" + name;
+ }
+
+ public int hashCode() {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((name == null) ? 0 : name.hashCode());
+ result = prime * result + ((prefix == null) ? 0 : prefix.hashCode());
+ return result;
+ }
+
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ final TagKey other = (TagKey) obj;
+ if (name == null) {
+ if (other.name != null) {
+ return false;
+ }
+ } else if (!name.equals(other.name)) {
+ return false;
+ }
+ if (prefix == null) {
+ if (other.prefix != null) {
+ return false;
+ }
+ } else if (!prefix.equals(other.prefix)) {
+ return false;
+ }
+ return true;
+ }
+}
Added: trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/TagKeyTest.java
===================================================================
--- trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/TagKeyTest.java (rev 0)
+++ trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/TagKeyTest.java 2008-11-07 22:21:33 UTC (rev 242)
@@ -0,0 +1,29 @@
+package net.sf.jsptest;
+
+import junit.framework.TestCase;
+
+/**
+ * @author Lasse Koskela
+ */
+public class TagKeyTest extends TestCase {
+
+ public void testEqualsAndHashcode() throws Exception {
+ // TODO: add EqualsTester to the class path and use that
+ TagKey subject = new TagKey("prefix", "name");
+ TagKey samePrefixSameName = new TagKey("prefix", "name");
+ TagKey samePrefixDifferentName = new TagKey("prefix", "different");
+ TagKey differentPrefixDifferentName = new TagKey("different", "different");
+ TagKey differentPrefixSameName = new TagKey("different", "different");
+ assertTrue(subject.equals(subject));
+ assertEquals(subject.hashCode(), subject.hashCode());
+ assertTrue(subject.equals(samePrefixSameName));
+ assertEquals(subject.hashCode(), samePrefixSameName.hashCode());
+ assertFalse(subject.equals(samePrefixDifferentName));
+ assertFalse(subject.equals(differentPrefixSameName));
+ assertFalse(subject.equals(differentPrefixDifferentName));
+ }
+
+ public void testToStringPrettyPrints() throws Exception {
+ assertEquals("prefix:name", new TagKey("prefix", "name").toString());
+ }
+}
Modified: trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/compiler/dummy/FakeJspCompiler.java
===================================================================
--- trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/compiler/dummy/FakeJspCompiler.java 2008-11-07 22:05:06 UTC (rev 241)
+++ trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/compiler/dummy/FakeJspCompiler.java 2008-11-07 22:21:33 UTC (rev 242)
@@ -5,6 +5,10 @@
import net.sf.jsptest.compiler.api.JspCompiler;
import net.sf.jsptest.compiler.api.JspExecution;
+/**
+ * @author Lasse Koskela
+ * @author Meinert Schwartau (scwar32)
+ */
public class FakeJspCompiler implements JspCompiler {
private static StringBuffer fakedOutput = new StringBuffer(2000);
@@ -28,7 +32,7 @@
fakedOutput.append(content);
}
- public Jsp compile(String path, Map taglibs) {
+ public Jsp compile(String path, Map taglibs, Map tags) {
lastCompiledWebRoot = getWebRoot();
lastCompiledPath = path;
return new Jsp() {
Modified: trunk/jsptest-jsp12/src/main/java/net/sf/jsptest/compiler/jsp12/JspCompilerImpl.java
===================================================================
--- trunk/jsptest-jsp12/src/main/java/net/sf/jsptest/compiler/jsp12/JspCompilerImpl.java 2008-11-07 22:05:06 UTC (rev 241)
+++ trunk/jsptest-jsp12/src/main/java/net/sf/jsptest/compiler/jsp12/JspCompilerImpl.java 2008-11-07 22:21:33 UTC (rev 242)
@@ -4,9 +4,13 @@
import net.sf.jsptest.compiler.api.Jsp;
import net.sf.jsptest.compiler.api.JspCompiler;
+/**
+ * @author Lasse Koskela
+ * @author Meinert Schwartau (scwar32)
+ */
public class JspCompilerImpl implements JspCompiler {
- public Jsp compile(String path, Map taglibs) {
+ public Jsp compile(String path, Map taglibs, Map tags) {
throw new RuntimeException("Not implemented");
}
Modified: trunk/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-07 22:05:06 UTC (rev 241)
+++ trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperCompiler.java 2008-11-07 22:21:33 UTC (rev 242)
@@ -70,6 +70,7 @@
* "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 {
@@ -105,10 +106,12 @@
* @param path
* The path to the JSP source file to compile, given relative to the web root.
* @param mockTaglibs
- * Mapping of tagnames to tag handler classes
+ * Mapping of tag names to tag handler classes
+ * @param mockTags
+ * Mapping of <tt>TagKey</tt>s to tag handler classes
*/
- public JspCompilationInfo compile(String path, Map mockTaglibs) throws Exception {
- JspCompilationInfo info = createJspCompilationInfo(path, mockTaglibs);
+ public JspCompilationInfo compile(String path, Map mockTaglibs, Map mockTags) throws Exception {
+ JspCompilationInfo info = createJspCompilationInfo(path, mockTaglibs, mockTags);
if (info.jspCompilationRequired()) {
compileJsp(info);
compileJavaToBytecode(info);
@@ -136,13 +139,14 @@
}
}
- private JspCompilationInfo createJspCompilationInfo(String jsp, Map mockTaglibs) {
+ private JspCompilationInfo createJspCompilationInfo(String jsp, Map mockTaglibs, Map mockTags) {
JspCompilationInfo info = new JspCompilationInfo();
info.setJspPath(jsp);
info.setClassOutputDir(classOutputBaseDir);
info.setJspSource(resolveJspSourceFile(jsp));
info.setWebRoot(getWebRoot());
info.setTaglibs(mockTaglibs);
+ info.setTags(mockTags);
resolveJavaSourceFile(info);
resolveClassFileLocation(info);
resolveClassName(info);
@@ -232,7 +236,7 @@
private Options createOptions(ServletContext ctx, ServletConfig cfg, JspCompilationInfo info) {
Options options = new EmbeddedServletOptions(cfg, ctx);
- return new MockOptions(options, ctx, info.getTaglibs());
+ return new MockOptions(options, ctx, info);
}
private void resolveJavaSourceFile(JspCompilationInfo info) {
Modified: trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperExecution.java
===================================================================
--- trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperExecution.java 2008-11-07 22:05:06 UTC (rev 241)
+++ trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperExecution.java 2008-11-07 22:21:33 UTC (rev 242)
@@ -50,6 +50,7 @@
* system.
*
* @author Lasse Koskela
+ * @author Meinert Schwartau (scwar32)
*/
public abstract class JasperExecution extends TestCase {
@@ -184,10 +185,15 @@
}
private Class compileToClass(String path) throws Exception, ClassNotFoundException {
- JspCompilationInfo compilation = getCompiler().compile(path, mockTaglibs);
+ // TODO: why are the mocks for taglibs and tags handled differently here?
+ JspCompilationInfo compilation = getCompiler().compile(path, mockTaglibs, getMockTags());
return loadJspClass(compilation.getClassName());
}
+ protected Map getMockTags() {
+ return new HashMap();
+ }
+
private JasperCompiler getCompiler() {
compiler.setWebRoot(getWebRoot());
compiler.setClassOutputBaseDir(getClassOutputBaseDir());
Modified: trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JspCompilerImpl.java
===================================================================
--- trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JspCompilerImpl.java 2008-11-07 22:05:06 UTC (rev 241)
+++ trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JspCompilerImpl.java 2008-11-07 22:21:33 UTC (rev 242)
@@ -7,6 +7,10 @@
import net.sf.jsptest.compiler.api.JspCompiler;
import net.sf.jsptest.utils.CustomClassLoader;
+/**
+ * @author Lasse Koskela
+ * @author Meinert Schwartau (scwar32)
+ */
public class JspCompilerImpl implements JspCompiler {
private String outputDirectory = new File(System.getProperty("java.io.tmpdir"),
@@ -29,12 +33,12 @@
return webRoot;
}
- public Jsp compile(final String jspPath, Map taglibs) {
+ public Jsp compile(final String jspPath, Map taglibs, Map tags) {
try {
JasperCompiler compiler = new JasperCompiler();
compiler.setWebRoot(getWebRoot());
compiler.setClassOutputBaseDir(getOutputDirectory());
- JspCompilationInfo info = compiler.compile(jspPath, taglibs);
+ JspCompilationInfo info = compiler.compile(jspPath, taglibs, tags);
final Class servletClass = compileToClass(info);
return new JspImpl(servletClass);
} catch (Exception e) {
Modified: trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockOptions.java
===================================================================
--- trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockOptions.java 2008-11-07 22:05:06 UTC (rev 241)
+++ trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockOptions.java 2008-11-07 22:21:33 UTC (rev 242)
@@ -18,6 +18,7 @@
import java.io.File;
import java.util.Map;
import javax.servlet.ServletContext;
+import net.sf.jsptest.compiler.JspCompilationInfo;
import net.sf.jsptest.compiler.jsp20.mock.taglibs.MockTldLocationsCache;
import org.apache.jasper.Options;
import org.apache.jasper.compiler.JspConfig;
@@ -27,17 +28,18 @@
/**
* @author Lasse Koskela
+ * @author Meinert Schwartau (scwar32)
*/
public class MockOptions implements Options {
private Options options;
private ServletContext servletContext;
- private Map taglibs;
+ private JspCompilationInfo compilationInfo;
- public MockOptions(Options options, ServletContext context, Map taglibs) {
+ public MockOptions(Options options, ServletContext context, JspCompilationInfo compilationInfo) {
this.options = options;
this.servletContext = context;
- this.taglibs = taglibs;
+ this.compilationInfo = compilationInfo;
}
public boolean getErrorOnUseBeanInvalidClassAttribute() {
@@ -130,7 +132,8 @@
}
public TagPluginManager getTagPluginManager() {
- return new MockTagPluginManager(servletContext, options.getTagPluginManager(), taglibs);
+ return new MockTagPluginManager(servletContext, options.getTagPluginManager(),
+ compilationInfo.getTaglibs(), compilationInfo.getTags());
}
public boolean genStringAsCharArray() {
Modified: trunk/jsptest-jsp20/src/main/java/org/apache/jasper/compiler/MockTagPluginManager.java
===================================================================
--- trunk/jsptest-jsp20/src/main/java/org/apache/jasper/compiler/MockTagPluginManager.java 2008-11-07 22:05:06 UTC (rev 241)
+++ trunk/jsptest-jsp20/src/main/java/org/apache/jasper/compiler/MockTagPluginManager.java 2008-11-07 22:21:33 UTC (rev 242)
@@ -5,16 +5,23 @@
import java.util.HashMap;
import java.util.Map;
import javax.servlet.ServletContext;
+import net.sf.jsptest.TagKey;
import org.apache.jasper.JasperException;
import org.apache.jasper.compiler.Node.Nodes;
+/**
+ * @author Lasse Koskela
+ * @author Meinert Schwartau (scwar32)
+ */
public class MockTagPluginManager extends TagPluginManager {
protected Map mockTaglibs;
+ protected Map mockTags;
- public MockTagPluginManager(ServletContext ctx, TagPluginManager tagPluginManager, Map taglibs) {
+ public MockTagPluginManager(ServletContext ctx, TagPluginManager manager, Map taglibs, Map tags) {
super(ctx);
mockTaglibs = new HashMap(taglibs);
+ mockTags = new HashMap(tags);
}
public void apply(Nodes nodes, ErrorDispatcher errorDispatcher, PageInfo pageInfo)
@@ -25,6 +32,11 @@
}
private void visitPageNodes(Nodes nodes) throws JasperException {
+ replaceTaglibs(nodes);
+ replaceTags(nodes);
+ }
+
+ private void replaceTaglibs(Nodes nodes) throws JasperException {
nodes.visit(new Node.Visitor() {
public void visit(Node.CustomTag n) throws JasperException {
@@ -38,6 +50,21 @@
});
}
+ private void replaceTags(Nodes nodes) throws JasperException {
+ nodes.visit(new Node.Visitor() {
+
+ public void visit(Node.CustomTag n) throws JasperException {
+ String prefix = n.getTagInfo().getTagLibrary().getPrefixString();
+ String name = n.getTagInfo().getTagName();
+ Class mockClass = (Class) mockTags.get(new TagKey(prefix, name));
+ if (mockClass != null) {
+ n.setTagHandlerClass(mockClass);
+ }
+ super.visit(n);
+ }
+ });
+ }
+
private void assignToPrivateField(String fieldName, Object value) {
try {
Field field = getClass().getSuperclass().getDeclaredField(fieldName);
Modified: trunk/jsptest-jsp21/src/main/java/net/sf/jsptest/compiler/jsp21/JspCompilerImpl.java
===================================================================
--- trunk/jsptest-jsp21/src/main/java/net/sf/jsptest/compiler/jsp21/JspCompilerImpl.java 2008-11-07 22:05:06 UTC (rev 241)
+++ trunk/jsptest-jsp21/src/main/java/net/sf/jsptest/compiler/jsp21/JspCompilerImpl.java 2008-11-07 22:21:33 UTC (rev 242)
@@ -4,9 +4,13 @@
import net.sf.jsptest.compiler.api.Jsp;
import net.sf.jsptest.compiler.api.JspCompiler;
+/**
+ * @author Lasse Koskela
+ * @author Meinert Schwartau (scwar32)
+ */
public class JspCompilerImpl implements JspCompiler {
- public Jsp compile(String path, Map taglibs) {
+ public Jsp compile(String path, Map taglibs, Map tags) {
throw new RuntimeException("Not implemented");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lko...@us...> - 2008-11-07 22:05:07
|
Revision: 241
http://jsptest.svn.sourceforge.net/jsptest/?rev=241&view=rev
Author: lkoskela
Date: 2008-11-07 22:05:06 +0000 (Fri, 07 Nov 2008)
Log Message:
-----------
Added missing @author tags
Modified Paths:
--------------
trunk/jsptest-generic/jsptest-compiler-api/src/main/java/net/sf/jsptest/compiler/api/Jsp.java
trunk/jsptest-generic/jsptest-compiler-api/src/main/java/net/sf/jsptest/compiler/api/JspCompilerFactory.java
trunk/jsptest-generic/jsptest-compiler-api/src/main/java/net/sf/jsptest/compiler/api/JspExecution.java
Modified: trunk/jsptest-generic/jsptest-compiler-api/src/main/java/net/sf/jsptest/compiler/api/Jsp.java
===================================================================
--- trunk/jsptest-generic/jsptest-compiler-api/src/main/java/net/sf/jsptest/compiler/api/Jsp.java 2008-11-07 21:46:34 UTC (rev 240)
+++ trunk/jsptest-generic/jsptest-compiler-api/src/main/java/net/sf/jsptest/compiler/api/Jsp.java 2008-11-07 22:05:06 UTC (rev 241)
@@ -2,6 +2,9 @@
import java.util.Map;
+/**
+ * @author Lasse Koskela
+ */
public interface Jsp {
JspExecution request(String httpMethod, Map requestAttributes, Map sessionAttributes);
Modified: trunk/jsptest-generic/jsptest-compiler-api/src/main/java/net/sf/jsptest/compiler/api/JspCompilerFactory.java
===================================================================
--- trunk/jsptest-generic/jsptest-compiler-api/src/main/java/net/sf/jsptest/compiler/api/JspCompilerFactory.java 2008-11-07 21:46:34 UTC (rev 240)
+++ trunk/jsptest-generic/jsptest-compiler-api/src/main/java/net/sf/jsptest/compiler/api/JspCompilerFactory.java 2008-11-07 22:05:06 UTC (rev 241)
@@ -8,6 +8,9 @@
import java.util.Properties;
import org.apache.log4j.Logger;
+/**
+ * @author Lasse Koskela
+ */
public class JspCompilerFactory {
private static final Logger log = Logger.getLogger(JspCompilerFactory.class);
Modified: trunk/jsptest-generic/jsptest-compiler-api/src/main/java/net/sf/jsptest/compiler/api/JspExecution.java
===================================================================
--- trunk/jsptest-generic/jsptest-compiler-api/src/main/java/net/sf/jsptest/compiler/api/JspExecution.java 2008-11-07 21:46:34 UTC (rev 240)
+++ trunk/jsptest-generic/jsptest-compiler-api/src/main/java/net/sf/jsptest/compiler/api/JspExecution.java 2008-11-07 22:05:06 UTC (rev 241)
@@ -1,5 +1,8 @@
package net.sf.jsptest.compiler.api;
+/**
+ * @author Lasse Koskela
+ */
public interface JspExecution {
String getRenderedResponse();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lko...@us...> - 2008-11-07 21:46:37
|
Revision: 240
http://jsptest.svn.sourceforge.net/jsptest/?rev=240&view=rev
Author: lkoskela
Date: 2008-11-07 21:46:34 +0000 (Fri, 07 Nov 2008)
Log Message:
-----------
Custom Eclipse code formatting configuration
Added Paths:
-----------
trunk/eclipse-formatting.xml
Added: trunk/eclipse-formatting.xml
===================================================================
--- trunk/eclipse-formatting.xml (rev 0)
+++ trunk/eclipse-formatting.xml 2008-11-07 21:46:34 UTC (rev 240)
@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<profiles version="11">
+<profile kind="CodeFormatterProfile" name="jsptest" version="11">
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="100"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.compiler.source" value="1.5"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="100"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.5"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.5"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="space"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
+</profile>
+</profiles>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lko...@us...> - 2008-11-07 20:14:26
|
Revision: 239
http://jsptest.svn.sourceforge.net/jsptest/?rev=239&view=rev
Author: lkoskela
Date: 2008-11-07 20:14:01 +0000 (Fri, 07 Nov 2008)
Log Message:
-----------
Applied formatting throughout the codebase with a custom Eclipse formatting config
Modified Paths:
--------------
trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/html/FormAssertionTest.java
trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/html/PageAssertionTest.java
trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/BasicJspTest.java
trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/CustomTag.java
trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/CustomTagTest.java
trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/RequestAndSessionAttributeTest.java
trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/TaglibTest.java
trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/TaglibsDefinedInJarFileTest.java
trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/TestMockingTaglibs.java
trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/JspCompilationInfo.java
trunk/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/JavaCompiler.java
trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/SunJavaC.java
trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/CustomClassLoader.java
trunk/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/Path.java
trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/StreamConsumer.java
trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/Strings.java
trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/XML.java
trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/CustomClassLoaderTest.java
trunk/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/PathTest.java
trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/StreamConsumerTest.java
trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/StringsTest.java
trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/XMLTest.java
trunk/jsptest-generic/jsptest-compiler-api/src/main/java/net/sf/jsptest/compiler/api/Jsp.java
trunk/jsptest-generic/jsptest-compiler-api/src/main/java/net/sf/jsptest/compiler/api/JspCompilerFactory.java
trunk/jsptest-generic/jsptest-compiler-api/src/main/java/net/sf/jsptest/compiler/api/JspExecution.java
trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/HtmlTestCase.java
trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/JspTestCase.java
trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/assertion/AbstractAssertion.java
trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/assertion/DOMAssertion.java
trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/assertion/ElementAssertion.java
trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/assertion/ElementChooser.java
trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/assertion/ExpectedAssertionFailure.java
trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/assertion/FormAssertion.java
trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/assertion/FormFieldAssertion.java
trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/assertion/LinkAssertion.java
trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/assertion/NameChooser.java
trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/assertion/OutputAssertion.java
trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/assertion/PageAssertion.java
trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/html/Form.java
trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/html/FormField.java
trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/AbstractFakeJspCompilerTestCase.java
trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/AbstractHtmlTestCaseTestCase.java
trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/TestHtmlTestCase.java
trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/TestHtmlTestCaseElementAssertions.java
trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/TestHtmlTestCaseFormAssertions.java
trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/TestHtmlTestCaseLinkAssertions.java
trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/TestHtmlTestCasePageAssertions.java
trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/TestJspTestCase.java
trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/assertion/TestExpectedAssertionFailure.java
trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/compiler/dummy/FakeJspCompiler.java
trunk/jsptest-jsp12/src/main/java/net/sf/jsptest/compiler/jsp12/JspCompilerImpl.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperCompiler.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperExecution.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JspCompilerImpl.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JspExecutionImpl.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JspImpl.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/JspTestServletOutputStream.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockHttpServletRequest.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockHttpServletResponse.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockHttpSession.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockJspFactory.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockJspWriter.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockOptions.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockPageContext.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockServletConfig.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockServletContext.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockServletInputStream.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockTagInfo.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/ClasspathTldLocator.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/ExplodedTldLocator.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/MockTagInfo.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/MockTldLocationsCache.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/TldLocation.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/TldLocator.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/TldUriMappings.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/WebInfLibTldLocator.java
trunk/jsptest-jsp20/src/main/java/org/apache/jasper/compiler/MockTagPluginManager.java
trunk/jsptest-jsp20/src/test/java/net/sf/jsptest/compiler/jsp20/TestJspImpl.java
trunk/jsptest-jsp20/src/test/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/TestClasspathTldLocator.java
trunk/jsptest-jsp21/src/main/java/net/sf/jsptest/compiler/jsp21/JspCompilerImpl.java
Modified: trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/html/FormAssertionTest.java
===================================================================
--- trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/html/FormAssertionTest.java 2008-11-07 19:06:40 UTC (rev 238)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/html/FormAssertionTest.java 2008-11-07 20:14:01 UTC (rev 239)
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package net.sf.jsptest.acceptance.html;
import junit.framework.AssertionFailedError;
@@ -42,15 +41,11 @@
public void testAssertingAgainstFormFieldValue() throws Exception {
setRequestAttribute("j_username", "bob");
get("/html/forms/simpleform.jsp");
- form("form_name").field("text_field_1")
- .shouldHaveValue("one");
- form("form_name").field("text_field_2")
- .shouldHaveValue("two");
+ form("form_name").field("text_field_1").shouldHaveValue("one");
+ form("form_name").field("text_field_2").shouldHaveValue("two");
try {
- form("form_name").field("text_field_1").shouldHaveValue(
- "three");
- throw new RuntimeException(
- "The field value shouldn't match!");
+ form("form_name").field("text_field_1").shouldHaveValue("three");
+ throw new RuntimeException("The field value shouldn't match!");
} catch (AssertionFailedError expected) {
}
}
Modified: trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/html/PageAssertionTest.java
===================================================================
--- trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/html/PageAssertionTest.java 2008-11-07 19:06:40 UTC (rev 238)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/html/PageAssertionTest.java 2008-11-07 20:14:01 UTC (rev 239)
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package net.sf.jsptest.acceptance.html;
import junit.framework.AssertionFailedError;
Modified: trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/BasicJspTest.java
===================================================================
--- trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/BasicJspTest.java 2008-11-07 19:06:40 UTC (rev 238)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/BasicJspTest.java 2008-11-07 20:14:01 UTC (rev 239)
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package net.sf.jsptest.acceptance.jsp;
import junit.framework.AssertionFailedError;
@@ -50,8 +49,7 @@
}
}
- public void testJspFileWithSpecialCharactersInName()
- throws Exception {
+ public void testJspFileWithSpecialCharactersInName() throws Exception {
get("/name$_test-file2.jsp");
output().shouldContain("Hello from Jasper");
}
@@ -61,8 +59,7 @@
output().shouldContain("Hello from Jasper");
}
- public void testJspFileInSubDirectoryWithSpecialCharsInPath()
- throws Exception {
+ public void testJspFileInSubDirectoryWithSpecialCharsInPath() throws Exception {
get("/su-b.dir/page_in_sub.dir.jsp");
output().shouldContain("Hello from Jasper");
}
Modified: trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/CustomTag.java
===================================================================
--- trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/CustomTag.java 2008-11-07 19:06:40 UTC (rev 238)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/CustomTag.java 2008-11-07 20:14:01 UTC (rev 239)
@@ -13,12 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package net.sf.jsptest.acceptance.jsp;
import java.io.IOException;
import java.util.Enumeration;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import javax.servlet.jsp.JspException;
@@ -48,9 +46,7 @@
try {
JspWriter out = pageContext.getOut();
out.println("<pre>");
- out
- .println("This content is coming from CustomTag for timezone "
- + timezone);
+ out.println("This content is coming from CustomTag for timezone " + timezone);
printRequestMethod(out);
printRequestAttributes(out);
printSessionAttributes(out);
@@ -63,31 +59,25 @@
}
private void printRequestMethod(JspWriter out) throws IOException {
- out.println("HTTP request method: "
- + getRequest().getMethod());
+ out.println("HTTP request method: " + getRequest().getMethod());
}
- private void printRequestAttributes(JspWriter out)
- throws IOException {
+ private void printRequestAttributes(JspWriter out) throws IOException {
Enumeration attrNames = getRequest().getAttributeNames();
while (attrNames.hasMoreElements()) {
String name = (String) attrNames.nextElement();
- String value = String.valueOf(getRequest().getAttribute(
- name));
- out.println("HTTP request attribute: " + name + "="
- + value);
+ String value = String.valueOf(getRequest().getAttribute(name));
+ out.println("HTTP request attribute: " + name + "=" + value);
}
}
- private void printSessionAttributes(JspWriter out)
- throws IOException {
+ private void printSessionAttributes(JspWriter out) throws IOException {
HttpSession session = getRequest().getSession(true);
Enumeration attrNames = session.getAttributeNames();
while (attrNames.hasMoreElements()) {
String name = (String) attrNames.nextElement();
String value = String.valueOf(session.getAttribute(name));
- out.println("HTTP session attribute: " + name + "="
- + value);
+ out.println("HTTP session attribute: " + name + "=" + value);
}
}
Modified: trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/CustomTagTest.java
===================================================================
--- trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/CustomTagTest.java 2008-11-07 19:06:40 UTC (rev 238)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/CustomTagTest.java 2008-11-07 20:14:01 UTC (rev 239)
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package net.sf.jsptest.acceptance.jsp;
import net.sf.jsptest.JspTestCase;
@@ -29,8 +28,7 @@
public void testRenderingJspUsingCustomTaglibs() throws Exception {
get("/taglibs/custom-taglib.jsp");
- output().shouldContain(
- "This content is coming from CustomTag");
+ output().shouldContain("This content is coming from CustomTag");
}
public void testTaglibAttributes() throws Exception {
@@ -59,7 +57,6 @@
output().shouldContain("request attribute: Rn2=Rv2");
output().shouldContain("session attribute: Sn1=Sv1");
output().shouldContain("session attribute: Sn2=Sv2");
-
// POST
setRequestAttribute("Rn1", "Rv1");
setRequestAttribute("Rn2", "Rv2");
@@ -71,5 +68,4 @@
output().shouldContain("session attribute: Sn1=Sv1");
output().shouldContain("session attribute: Sn2=Sv2");
}
-
}
Modified: trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/RequestAndSessionAttributeTest.java
===================================================================
--- trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/RequestAndSessionAttributeTest.java 2008-11-07 19:06:40 UTC (rev 238)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/RequestAndSessionAttributeTest.java 2008-11-07 20:14:01 UTC (rev 239)
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package net.sf.jsptest.acceptance.jsp;
import net.sf.jsptest.JspTestCase;
@@ -43,8 +42,7 @@
output().shouldContain("session attribute: 'Sn2'='Sv2'");
}
- public void testRequestAndSessionAttributesCanBeObjects()
- throws Exception {
+ public void testRequestAndSessionAttributesCanBeObjects() throws Exception {
setRequestAttribute("request", (Object) "1");
setSessionAttribute("session", (Object) new Integer(2));
get("/echo_attributes.jsp");
@@ -52,8 +50,7 @@
output().shouldContain("session attribute: 'session'='2'");
}
- public void testSessionAndRequestAttributesDontOverrideEachOther()
- throws Exception {
+ public void testSessionAndRequestAttributesDontOverrideEachOther() throws Exception {
setRequestAttribute("name", "request");
setSessionAttribute("name", "session");
get("/echo_attributes.jsp");
Modified: trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/TaglibTest.java
===================================================================
--- trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/TaglibTest.java 2008-11-07 19:06:40 UTC (rev 238)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/TaglibTest.java 2008-11-07 20:14:01 UTC (rev 239)
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package net.sf.jsptest.acceptance.jsp;
import net.sf.jsptest.JspTestCase;
Modified: trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/TaglibsDefinedInJarFileTest.java
===================================================================
--- trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/TaglibsDefinedInJarFileTest.java 2008-11-07 19:06:40 UTC (rev 238)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/TaglibsDefinedInJarFileTest.java 2008-11-07 20:14:01 UTC (rev 239)
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package net.sf.jsptest.acceptance.jsp;
import net.sf.jsptest.JspTestCase;
Modified: trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/TestMockingTaglibs.java
===================================================================
--- trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/TestMockingTaglibs.java 2008-11-07 19:06:40 UTC (rev 238)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/TestMockingTaglibs.java 2008-11-07 20:14:01 UTC (rev 239)
@@ -13,13 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package net.sf.jsptest.acceptance.jsp;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspWriter;
import javax.servlet.jsp.tagext.TagSupport;
-
import net.sf.jsptest.JspTestCase;
/**
@@ -27,36 +25,36 @@
*/
public class TestMockingTaglibs extends JspTestCase {
- protected String getJspPackageName() {
- return "cust.om.tags";
- }
+ protected String getJspPackageName() {
+ return "cust.om.tags";
+ }
- protected String getWebRoot() {
- return "src/test/resources/websrc";
- }
+ protected String getWebRoot() {
+ return "src/test/resources/websrc";
+ }
- /**
- * This taglib class gets to replace the real thing.
- */
- public static class MockCustomTag extends CustomTag {
- public int doAfterBody() throws JspException {
- try {
- JspWriter out = pageContext.getOut();
- out.println("<pre>");
- out.println("This content is coming from the mock CustomTag"
- + " for timezone " + timezone);
- out.println("</pre>");
- } catch (Exception e) {
- throw new JspException(e);
- }
- return TagSupport.EVAL_PAGE;
- }
- }
+ /**
+ * This taglib class gets to replace the real thing.
+ */
+ public static class MockCustomTag extends CustomTag {
- public void testRenderingJspUsingCustomTaglibs() throws Exception {
- substituteTaglib("custom", MockCustomTag.class);
- get("/taglibs/custom-taglib.jsp");
- output()
- .shouldContain("This content is coming from the mock CustomTag");
- }
+ public int doAfterBody() throws JspException {
+ try {
+ JspWriter out = pageContext.getOut();
+ out.println("<pre>");
+ out.println("This content is coming from the mock CustomTag" + " for timezone "
+ + timezone);
+ out.println("</pre>");
+ } catch (Exception e) {
+ throw new JspException(e);
+ }
+ return TagSupport.EVAL_PAGE;
+ }
+ }
+
+ public void testRenderingJspUsingCustomTaglibs() throws Exception {
+ substituteTaglib("custom", MockCustomTag.class);
+ get("/taglibs/custom-taglib.jsp");
+ output().shouldContain("This content is coming from the mock CustomTag");
+ }
}
Modified: trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/JspCompilationInfo.java
===================================================================
--- trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/JspCompilationInfo.java 2008-11-07 19:06:40 UTC (rev 238)
+++ trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/JspCompilationInfo.java 2008-11-07 20:14:01 UTC (rev 239)
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package net.sf.jsptest.compiler;
import java.io.File;
@@ -21,31 +20,22 @@
import java.util.Map;
/**
- * The <tt>JspCompilationInfo</tt> class acts as a simple data struct, being
- * passed around as a blackboard of sorts where different compilation methods
- * obtain prerequisite information (where to find input) and add newly created
- * information (where the output went).
+ * The <tt>JspCompilationInfo</tt> class acts as a simple data struct, being passed around as a
+ * blackboard of sorts where different compilation methods obtain prerequisite information (where to
+ * find input) and add newly created information (where the output went).
*
* @author Lasse Koskela
*/
public class JspCompilationInfo {
private String classFileLocation;
-
private String jspSourceLocation;
-
private String jspClassName;
-
private String javaSourceLocation;
-
private String jspPath;
-
private String classOutputDir;
-
private String webRoot;
-
private Map taglibs;
-
private static Map compilationHistory = new HashMap();
public JspCompilationInfo() {
@@ -132,8 +122,7 @@
File jsp = new File(jspSourceLocation);
File java = new File(javaSourceLocation);
File clazz = new File(classFileLocation);
- return (doesNotExistOrIsTooOld(clazz)
- || doesNotExistOrIsTooOld(java)
+ return (doesNotExistOrIsTooOld(clazz) || doesNotExistOrIsTooOld(java)
|| jsp.lastModified() > java.lastModified() || taglibsHaveChangedSinceLastCompile());
}
@@ -153,10 +142,8 @@
private boolean doesNotExistOrIsTooOld(File file) {
long expirationAge = 5 * 60 * 1000L;
- long expirationThreshold = System.currentTimeMillis()
- - expirationAge;
- return file.exists() == false
- || file.lastModified() < expirationThreshold;
+ long expirationThreshold = System.currentTimeMillis() - expirationAge;
+ return file.exists() == false || file.lastModified() < expirationThreshold;
}
public void setTaglibs(Map taglibs) {
Modified: trunk/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-07 19:06:40 UTC (rev 238)
+++ trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/CommandLineJavac.java 2008-11-07 20:14:01 UTC (rev 239)
@@ -13,14 +13,12 @@
* 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;
/**
@@ -28,73 +26,68 @@
*/
public class CommandLineJavac implements JavaCompiler {
- private static final String SEPARATOR = System
- .getProperty("path.separator");
+ 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);
- }
+ 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[] 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 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 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();
- }
- }
+ 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;
- }
- }
+ 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;
+ }
+ }
}
Modified: trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/JavaCompiler.java
===================================================================
--- trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/JavaCompiler.java 2008-11-07 19:06:40 UTC (rev 238)
+++ trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/JavaCompiler.java 2008-11-07 20:14:01 UTC (rev 239)
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package net.sf.jsptest.compiler.java;
/**
@@ -23,25 +22,22 @@
*/
public interface JavaCompiler {
- /**
- * Compiles the given .java source file into the given .class file using an
- * explicitly set class path.
- *
- * @param pathToJavaSource
- * Path to the source file to compile.
- * @param outputDirectory
- * Path to the output directory under which to generate the
- * .class file
- * @param classpath
- * The class path to use for compilation.
- */
- boolean compile(String pathToJavaSource, String outputDirectory,
- String[] classpath) throws Exception;
+ /**
+ * Compiles the given .java source file into the given .class file using an explicitly set class
+ * path.
+ *
+ * @param pathToJavaSource
+ * Path to the source file to compile.
+ * @param outputDirectory
+ * Path to the output directory under which to generate the .class file
+ * @param classpath
+ * The class path to use for compilation.
+ */
+ boolean compile(String pathToJavaSource, String outputDirectory, String[] classpath)
+ throws Exception;
- /**
- * Indicates whether this Java compiler implementation is available on the
- * current system.
- */
- boolean isAvailable();
-
-}
\ No newline at end of file
+ /**
+ * Indicates whether this Java compiler implementation is available on the current system.
+ */
+ boolean isAvailable();
+}
Modified: trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/SunJavaC.java
===================================================================
--- trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/SunJavaC.java 2008-11-07 19:06:40 UTC (rev 238)
+++ trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/SunJavaC.java 2008-11-07 20:14:01 UTC (rev 239)
@@ -13,81 +13,73 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package net.sf.jsptest.compiler.java;
import java.lang.reflect.Method;
/**
- * This implementation uses the java compiler from sun which ships with since
- * the jdk since java 1.3. The code is inspired by the javac ant task
- * implementation.
+ * This implementation uses the java compiler from sun which ships with since the jdk since java
+ * 1.3. The code is inspired by the javac ant task implementation.
*
* @author mathias.broekelmann
- *
*/
public class SunJavaC implements JavaCompiler {
- private static final String SEPARATOR = System
- .getProperty("path.separator");
+ private static final String SEPARATOR = System.getProperty("path.separator");
- public boolean compile(String pathToJavaSource, String outputDirectory,
- String[] classpath) throws Exception {
- String classpathString = join(classpath);
- String[] args = buildArgs(pathToJavaSource, outputDirectory,
- classpathString);
- return compile(args);
- }
+ public boolean compile(String pathToJavaSource, String outputDirectory, String[] classpath)
+ throws Exception {
+ String classpathString = join(classpath);
+ String[] args = buildArgs(pathToJavaSource, outputDirectory, classpathString);
+ return compile(args);
+ }
- private boolean compile(String[] args) {
- try {
- Class compilerClass = getCompileClass();
- Method compilerMethod = resolveCompilerMethod(compilerClass);
- Object compilerInstance = compilerClass.newInstance();
- Object[] compilerArguments = new Object[] { args };
- int returnCode = ((Integer) compilerMethod.invoke(compilerInstance,
- compilerArguments)).intValue();
- return returnCode == 0;
- } catch (Throwable e) {
- System.err.println(e.getMessage());
- return false;
- }
- }
+ private boolean compile(String[] args) {
+ try {
+ Class compilerClass = getCompileClass();
+ Method compilerMethod = resolveCompilerMethod(compilerClass);
+ Object compilerInstance = compilerClass.newInstance();
+ Object[] compilerArguments = new Object[] { args };
+ int returnCode = ((Integer) compilerMethod.invoke(compilerInstance, compilerArguments))
+ .intValue();
+ return returnCode == 0;
+ } catch (Throwable e) {
+ System.err.println(e.getMessage());
+ return false;
+ }
+ }
- private String[] buildArgs(String pathToJavaSource, String outputDirectory,
- String classpathString) {
- return new String[] { "-classpath", classpathString, "-d",
- outputDirectory, pathToJavaSource };
- }
+ private String[] buildArgs(String pathToJavaSource, String outputDirectory,
+ String classpathString) {
+ return new String[] { "-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 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();
+ }
- public boolean isAvailable() {
- try {
- resolveCompilerMethod(getCompileClass());
- return true;
- } catch (Throwable ex) {
- return false;
- }
- }
+ public boolean isAvailable() {
+ try {
+ resolveCompilerMethod(getCompileClass());
+ return true;
+ } catch (Throwable ex) {
+ return false;
+ }
+ }
- private Method resolveCompilerMethod(Class compilerClass)
- throws NoSuchMethodException {
- return compilerClass.getMethod("compile", new Class[] { (new String[0])
- .getClass() });
- }
+ private Method resolveCompilerMethod(Class compilerClass) throws NoSuchMethodException {
+ return compilerClass.getMethod("compile", new Class[] { (new String[0]).getClass() });
+ }
- private Class getCompileClass() throws ClassNotFoundException {
- return Class.forName("com.sun.tools.javac.Main");
- }
-
+ private Class getCompileClass() throws ClassNotFoundException {
+ return Class.forName("com.sun.tools.javac.Main");
+ }
}
Modified: trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/CustomClassLoader.java
===================================================================
--- trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/CustomClassLoader.java 2008-11-07 19:06:40 UTC (rev 238)
+++ trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/CustomClassLoader.java 2008-11-07 20:14:01 UTC (rev 239)
@@ -13,45 +13,42 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package net.sf.jsptest.utils;
import java.io.File;
/**
- * A class loader implementation that first checks if the class asked for can be
- * found under the given base directory and only then delegates to the parent
- * class' implementation.
+ * A class loader implementation that first checks if the class asked for can be found under the
+ * given base directory and only then delegates to the parent class' implementation.
*
* @author Lasse Koskela
*/
public class CustomClassLoader extends ClassLoader {
- private File baseDir;
+ private File baseDir;
- public CustomClassLoader(String baseDir) {
- this(new File(baseDir));
- }
+ public CustomClassLoader(String baseDir) {
+ this(new File(baseDir));
+ }
- public CustomClassLoader(File baseDir) {
- this.baseDir = baseDir;
- }
+ public CustomClassLoader(File baseDir) {
+ this.baseDir = baseDir;
+ }
- public Class loadClass(String name) throws ClassNotFoundException {
- File classFile = new File(baseDir, name.replace('.', '/') + ".class");
- if (!classFile.exists()) {
- return super.loadClass(name);
- }
- try {
- byte[] data = IO.readToByteArray(classFile);
- return defineClass(name, data);
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
+ public Class loadClass(String name) throws ClassNotFoundException {
+ File classFile = new File(baseDir, name.replace('.', '/') + ".class");
+ if (!classFile.exists()) {
+ return super.loadClass(name);
+ }
+ try {
+ byte[] data = IO.readToByteArray(classFile);
+ return defineClass(name, data);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
- protected Class defineClass(String name, byte[] data)
- throws ClassFormatError {
- return super.defineClass(name, data, 0, data.length);
- }
-}
\ No newline at end of file
+ protected Class defineClass(String name, byte[] data) throws ClassFormatError {
+ return super.defineClass(name, data, 0, data.length);
+ }
+}
Modified: trunk/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-07 19:06:40 UTC (rev 238)
+++ trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/IO.java 2008-11-07 20:14:01 UTC (rev 239)
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package net.sf.jsptest.utils;
import java.io.ByteArrayOutputStream;
@@ -24,20 +23,18 @@
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.
+ * 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 {
+ public static byte[] readToByteArray(File file) throws IOException {
return readToByteArray(new FileInputStream(file));
}
- public static byte[] readToByteArray(InputStream in)
- throws IOException {
+ public static byte[] readToByteArray(InputStream in) throws IOException {
ByteArrayOutputStream out = new ByteArrayOutputStream();
byte[] buffer = new byte[8096];
int r = -1;
@@ -58,9 +55,7 @@
return new String(readToByteArray(file));
}
- public static String readToString(InputStream stream)
- throws IOException {
+ public static String readToString(InputStream stream) throws IOException {
return new String(readToByteArray(stream));
}
-
}
Modified: trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/Path.java
===================================================================
--- trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/Path.java 2008-11-07 19:06:40 UTC (rev 238)
+++ trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/Path.java 2008-11-07 20:14:01 UTC (rev 239)
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package net.sf.jsptest.utils;
import java.io.File;
@@ -27,75 +26,74 @@
*/
public class Path extends ArrayList {
- private static final String SEPARATOR = System
- .getProperty("path.separator");
+ private static final String SEPARATOR = System.getProperty("path.separator");
- public void addSystemProperty(String name) {
- String property = System.getProperty(name);
- if (property != null) {
- String[] systemClasspath = property.split(SEPARATOR);
- for (int i = 0; i < systemClasspath.length; i++) {
- String entry = systemClasspath[i];
- File file = new File(entry);
- if (file.exists()) {
- add(file.getAbsolutePath());
- } else {
- add(entry);
- }
- }
- }
- }
+ public void addSystemProperty(String name) {
+ String property = System.getProperty(name);
+ if (property != null) {
+ String[] systemClasspath = property.split(SEPARATOR);
+ for (int i = 0; i < systemClasspath.length; i++) {
+ String entry = systemClasspath[i];
+ File file = new File(entry);
+ if (file.exists()) {
+ add(file.getAbsolutePath());
+ } else {
+ add(entry);
+ }
+ }
+ }
+ }
- public boolean add(Object pathElement) {
- if (contains(pathElement)) {
- return false;
- }
- return super.add(pathElement);
- }
+ public boolean add(Object pathElement) {
+ if (contains(pathElement)) {
+ return false;
+ }
+ return super.add(pathElement);
+ }
- public boolean add(File file) {
- return add(file.getAbsolutePath());
- }
+ public boolean add(File file) {
+ return add(file.getAbsolutePath());
+ }
- public String[] toStringArray() {
- return (String[]) toArray(new String[size()]);
- }
+ public String[] toStringArray() {
+ return (String[]) toArray(new String[size()]);
+ }
- public void addContainer(Class klass) {
- String resource = resourcePathFor(klass);
- addJarFile(klass.getResource(resource));
- try {
- ClassLoader context = klass.getClassLoader();
- if (context != null) {
- Enumeration en = context.getResources(resource);
- while (en.hasMoreElements()) {
- addJarFile((URL) en.nextElement());
- }
- }
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
+ public void addContainer(Class klass) {
+ String resource = resourcePathFor(klass);
+ addJarFile(klass.getResource(resource));
+ try {
+ ClassLoader context = klass.getClassLoader();
+ if (context != null) {
+ Enumeration en = context.getResources(resource);
+ while (en.hasMoreElements()) {
+ addJarFile((URL) en.nextElement());
+ }
+ }
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
- private String resourcePathFor(Class klass) {
- String resource = klass.getName().replaceAll("\\.", "/");
- return "/" + resource + ".class";
- }
+ private String resourcePathFor(Class klass) {
+ String resource = klass.getName().replaceAll("\\.", "/");
+ return "/" + resource + ".class";
+ }
- private void addJarFile(URL url) {
- if (url != null) {
- addJarFile(url.toExternalForm());
- }
- }
+ private void addJarFile(URL url) {
+ if (url != null) {
+ addJarFile(url.toExternalForm());
+ }
+ }
- private void addJarFile(String url) {
- String prefix = "jar:file:";
- if (url.startsWith(prefix)) {
- String file = url.substring(prefix.length());
- if (file.indexOf("!") > -1) {
- file = file.substring(0, file.indexOf('!'));
- }
- add(new File(file));
- }
- }
+ private void addJarFile(String url) {
+ String prefix = "jar:file:";
+ if (url.startsWith(prefix)) {
+ String file = url.substring(prefix.length());
+ if (file.indexOf("!") > -1) {
+ file = file.substring(0, file.indexOf('!'));
+ }
+ add(new File(file));
+ }
+ }
}
Modified: trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/StreamConsumer.java
===================================================================
--- trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/StreamConsumer.java 2008-11-07 19:06:40 UTC (rev 238)
+++ trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/StreamConsumer.java 2008-11-07 20:14:01 UTC (rev 239)
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package net.sf.jsptest.utils;
import java.io.ByteArrayOutputStream;
@@ -27,13 +26,10 @@
public class StreamConsumer implements Runnable {
private final String outputPrefix;
-
private final InputStream stream;
-
private final PrintWriter log;
- public StreamConsumer(String streamName, InputStream stream,
- PrintWriter log) {
+ public StreamConsumer(String streamName, InputStream stream, PrintWriter log) {
this.outputPrefix = streamName + ":";
this.stream = stream;
this.log = log;
Modified: trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/Strings.java
===================================================================
--- trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/Strings.java 2008-11-07 19:06:40 UTC (rev 238)
+++ trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/Strings.java 2008-11-07 20:14:01 UTC (rev 239)
@@ -13,41 +13,37 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package net.sf.jsptest.utils;
/**
- * The <tt>Strings</tt> class provides utility methods for string
- * manipulation.
+ * The <tt>Strings</tt> class provides utility methods for string manipulation.
*
* @author Lasse Koskela
*/
public class Strings {
- /**
- * Replace instances of "what" from "fromWhere" with "withWhat". This is
- * essentially a replacement for not being able to use
- * {@link String#replace(String, String, String)} with JDK 1.4.
- *
- * @param fromWhere
- * The string to replace stuff from.
- * @param what
- * The string to replace.
- * @param withWhat
- * The string to replace with.
- * @return A new string with the replaced content.
- */
- public static String replace(String fromWhere, String what, String withWhat) {
- if (what.length() > 0) {
- int indexOfWhat = fromWhere.indexOf(what);
- if (indexOfWhat != -1) {
- String beforeMatch = fromWhere.substring(0, indexOfWhat);
- String afterMatch = fromWhere.substring(indexOfWhat
- + what.length());
- fromWhere = beforeMatch + withWhat
- + replace(afterMatch, what, withWhat);
- }
- }
- return fromWhere;
- }
+ /**
+ * Replace instances of "what" from "fromWhere" with "withWhat". This is essentially a
+ * replacement for not being able to use {@link String#replace(String, String, String)} with JDK
+ * 1.4.
+ *
+ * @param fromWhere
+ * The string to replace stuff from.
+ * @param what
+ * The string to replace.
+ * @param withWhat
+ * The string to replace with.
+ * @return A new string with the replaced content.
+ */
+ public static String replace(String fromWhere, String what, String withWhat) {
+ if (what.length() > 0) {
+ int indexOfWhat = fromWhere.indexOf(what);
+ if (indexOfWhat != -1) {
+ String beforeMatch = fromWhere.substring(0, indexOfWhat);
+ String afterMatch = fromWhere.substring(indexOfWhat + what.length());
+ fromWhere = beforeMatch + withWhat + replace(afterMatch, what, withWhat);
+ }
+ }
+ return fromWhere;
+ }
}
Modified: trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/XML.java
===================================================================
--- trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/XML.java 2008-11-07 19:06:40 UTC (rev 238)
+++ trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/XML.java 2008-11-07 20:14:01 UTC (rev 239)
@@ -13,61 +13,57 @@
* 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.OutputStream;
-
import javax.xml.transform.OutputKeys;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
/**
- * The <tt>XML</tt> class provides utility methods for handling XML related
- * tasks.
+ * The <tt>XML</tt> class provides utility methods for handling XML related tasks.
*
* @author Lasse Koskela
*/
public class XML {
- private static final String APACHE_INDENTATION = "{http://xml.apache.org/xslt}indent-amount";
+ private static final String APACHE_INDENTATION = "{http://xml.apache.org/xslt}indent-amount";
- public static String toString(Node xml) {
- try {
- TransformerFactory f = TransformerFactory.newInstance();
- Transformer t = f.newTransformer();
- t.setOutputProperty(OutputKeys.INDENT, "yes");
- t.setOutputProperty(APACHE_INDENTATION, "2");
- OutputStream out = new ByteArrayOutputStream();
- t.transform(new DOMSource(xml), new StreamResult(out));
- return out.toString();
- } catch (TransformerException e) {
- throw new RuntimeException(e);
- }
- }
+ public static String toString(Node xml) {
+ try {
+ TransformerFactory f = TransformerFactory.newInstance();
+ Transformer t = f.newTransformer();
+ t.setOutputProperty(OutputKeys.INDENT, "yes");
+ t.setOutputProperty(APACHE_INDENTATION, "2");
+ OutputStream out = new ByteArrayOutputStream();
+ t.transform(new DOMSource(xml), new StreamResult(out));
+ return out.toString();
+ } catch (TransformerException e) {
+ throw new RuntimeException(e);
+ }
+ }
- public static String textContentOf(Element element) {
- StringBuffer textContent = new StringBuffer(100);
- NodeList children = element.getChildNodes();
- for (int i = 0; i < children.getLength(); i++) {
- appendTextContentOf(children.item(i), textContent);
- }
- return textContent.toString();
- }
+ public static String textContentOf(Element element) {
+ StringBuffer textContent = new StringBuffer(100);
+ NodeList children = element.getChildNodes();
+ for (int i = 0; i < children.getLength(); i++) {
+ appendTextContentOf(children.item(i), textContent);
+ }
+ return textContent.toString();
+ }
- private static void appendTextContentOf(Node from, StringBuffer to) {
- if (from.getNodeType() == Node.ELEMENT_NODE) {
- to.append(textContentOf((Element) from));
- } else if (from.getNodeType() != Node.COMMENT_NODE) {
- to.append(from.getNodeValue().trim());
- }
- }
+ private static void appendTextContentOf(Node from, StringBuffer to) {
+ if (from.getNodeType() == Node.ELEMENT_NODE) {
+ to.append(textContentOf((Element) from));
+ } else if (from.getNodeType() != Node.COMMENT_NODE) {
+ to.append(from.getNodeValue().trim());
+ }
+ }
}
Modified: trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/CustomClassLoaderTest.java
===================================================================
--- trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/CustomClassLoaderTest.java 2008-11-07 19:06:40 UTC (rev 238)
+++ trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/CustomClassLoaderTest.java 2008-11-07 20:14:01 UTC (rev 239)
@@ -1,60 +1,54 @@
package net.sf.jsptest.utils;
import java.io.File;
-
import junit.framework.TestCase;
public class CustomClassLoaderTest extends TestCase {
- private File baseDir;
- protected String definedName;
- protected byte[] definedData;
- private String fullyQualifiedClassName;
+ private File baseDir;
+ protected String definedName;
+ protected byte[] definedData;
+ private String fullyQualifiedClassName;
- protected void setUp() throws Exception {
- super.setUp();
- fullyQualifiedClassName = "pkg.Fake";
- baseDir = new File(System.getProperty("java.io.tmpdir"), "basedir");
- File packageDir = new File(baseDir, "pkg");
- packageDir.mkdirs();
- File classFile = new File(packageDir, "Fake.class");
- IO.write("Fake", classFile);
- }
+ protected void setUp() throws Exception {
+ super.setUp();
+ fullyQualifiedClassName = "pkg.Fake";
+ baseDir = new File(System.getProperty("java.io.tmpdir"), "basedir");
+ File packageDir = new File(baseDir, "pkg");
+ packageDir.mkdirs();
+ File classFile = new File(packageDir, "Fake.class");
+ IO.write("Fake", classFile);
+ }
- public void testClassesAreLoadedFromTheGivenBaseDirectory()
- throws Exception {
- CustomClassLoader cl = new CustomClassLoader(baseDir) {
- // override to avoid actual class loading
- protected Class defineClass(String name, byte[] data)
- throws ClassFormatError {
- definedName = name;
- definedData = data;
- return CustomClassLoaderTest.class;
- }
- };
+ public void testClassesAreLoadedFromTheGivenBaseDirectory() throws Exception {
+ CustomClassLoader cl = new CustomClassLoader(baseDir) {
- verifyClassLoading(cl);
- }
+ // override to avoid actual class loading
+ protected Class defineClass(String name, byte[] data) throws ClassFormatError {
+ definedName = name;
+ definedData = data;
+ return CustomClassLoaderTest.class;
+ }
+ };
+ verifyClassLoading(cl);
+ }
- public void testBaseDirectoryCanBeGivenAsAbsolutePathName()
- throws Exception {
- CustomClassLoader cl = new CustomClassLoader(baseDir.getAbsolutePath()) {
- // override to avoid actual class loading
- protected Class defineClass(String name, byte[] data)
- throws ClassFormatError {
- definedName = name;
- definedData = data;
- return CustomClassLoaderTest.class;
- }
- };
+ public void testBaseDirectoryCanBeGivenAsAbsolutePathName() throws Exception {
+ CustomClassLoader cl = new CustomClassLoader(baseDir.getAbsolutePath()) {
- verifyClassLoading(cl);
- }
+ // override to avoid actual class loading
+ protected Class defineClass(String name, byte[] data) throws ClassFormatError {
+ definedName = name;
+ definedData = data;
+ return CustomClassLoaderTest.class;
+ }
+ };
+ verifyClassLoading(cl);
+ }
- private void verifyClassLoading(CustomClassLoader classLoader)
- throws ClassNotFoundException {
- classLoader.loadClass(fullyQualifiedClassName);
- assertEquals(fullyQualifiedClassName, definedName);
- assertEquals("Fake", new String(definedData));
- }
+ private void verifyClassLoading(CustomClassLoader classLoader) throws ClassNotFoundException {
+ classLoader.loadClass(fullyQualifiedClassName);
+ assertEquals(fullyQualifiedClassName, definedName);
+ assertEquals("Fake", new String(definedData));
+ }
}
Modified: trunk/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-07 19:06:40 UTC (rev 238)
+++ trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/IOTest.java 2008-11-07 20:14:01 UTC (rev 239)
@@ -1,7 +1,6 @@
package net.sf.jsptest.utils;
import java.io.File;
-
import junit.framework.TestCase;
public class IOTest extends TestCase {
Modified: trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/PathTest.java
===================================================================
--- trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/PathTest.java 2008-11-07 19:06:40 UTC (rev 238)
+++ trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/PathTest.java 2008-11-07 20:14:01 UTC (rev 239)
@@ -4,77 +4,75 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-
import junit.framework.TestCase;
public class PathTest extends TestCase {
- private Path path;
- private File file1;
- private File file2;
+ private Path path;
+ private File file1;
+ private File file2;
- protected void setUp() throws Exception {
- super.setUp();
- path = new Path();
- file1 = File.createTempFile("test", ".tmp");
- file2 = File.createTempFile("test", ".tmp");
- }
+ protected void setUp() throws Exception {
+ super.setUp();
+ path = new Path();
+ file1 = File.createTempFile("test", ".tmp");
+ file2 = File.createTempFile("test", ".tmp");
+ }
- protected void tearDown() throws Exception ...
[truncated message content] |
|
From: <lko...@us...> - 2008-11-07 19:06:45
|
Revision: 238
http://jsptest.svn.sourceforge.net/jsptest/?rev=238&view=rev
Author: lkoskela
Date: 2008-11-07 19:06:40 +0000 (Fri, 07 Nov 2008)
Log Message:
-----------
Formatting
Modified Paths:
--------------
trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/resources/websrc/WEB-INF/web.xml
trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/resources/websrc2/WEB-INF/web.xml
Modified: trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/resources/websrc/WEB-INF/web.xml
===================================================================
--- trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/resources/websrc/WEB-INF/web.xml 2008-11-05 22:36:42 UTC (rev 237)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/resources/websrc/WEB-INF/web.xml 2008-11-07 19:06:40 UTC (rev 238)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
@@ -82,12 +82,12 @@
<servlet-name>Faces Servlet</servlet-name>
<url-pattern>*.faces</url-pattern>
</servlet-mapping>
--->
-
- <!-- Welcome files -->
- <welcome-file-list>
- <welcome-file>index.jsp</welcome-file>
- </welcome-file-list>
+-->
+
+ <!-- Welcome files -->
+ <welcome-file-list>
+ <welcome-file>index.jsp</welcome-file>
+ </welcome-file-list>
<!-- standard taglibs -->
<taglib>
Modified: trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/resources/websrc2/WEB-INF/web.xml
===================================================================
--- trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/resources/websrc2/WEB-INF/web.xml 2008-11-05 22:36:42 UTC (rev 237)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/resources/websrc2/WEB-INF/web.xml 2008-11-07 19:06:40 UTC (rev 238)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
@@ -82,12 +82,12 @@
<servlet-name>Faces Servlet</servlet-name>
<url-pattern>*.faces</url-pattern>
</servlet-mapping>
--->
-
- <!-- Welcome files -->
- <welcome-file-list>
- <welcome-file>index.jsp</welcome-file>
- </welcome-file-list>
+-->
+
+ <!-- Welcome files -->
+ <welcome-file-list>
+ <welcome-file>index.jsp</welcome-file>
+ </welcome-file-list>
<!-- standard taglibs -->
<taglib>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lko...@us...> - 2008-11-05 22:36:47
|
Revision: 237
http://jsptest.svn.sourceforge.net/jsptest/?rev=237&view=rev
Author: lkoskela
Date: 2008-11-05 22:36:42 +0000 (Wed, 05 Nov 2008)
Log Message:
-----------
Added an explicit '<resource/>' reference to 'src/main/resources'. Apparently that is nowadays required by Maven because the acceptance tests started blowing up due to not finding 'jsptest.properties' in the classpath.
Modified Paths:
--------------
trunk/jsptest-jsp12/pom.xml
trunk/jsptest-jsp20/pom.xml
trunk/jsptest-jsp21/pom.xml
Modified: trunk/jsptest-jsp12/pom.xml
===================================================================
--- trunk/jsptest-jsp12/pom.xml 2008-06-27 11:47:44 UTC (rev 236)
+++ trunk/jsptest-jsp12/pom.xml 2008-11-05 22:36:42 UTC (rev 237)
@@ -38,4 +38,11 @@
<version>4.1.30</version>
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ </build>
</project>
Modified: trunk/jsptest-jsp20/pom.xml
===================================================================
--- trunk/jsptest-jsp20/pom.xml 2008-06-27 11:47:44 UTC (rev 236)
+++ trunk/jsptest-jsp20/pom.xml 2008-11-05 22:36:42 UTC (rev 237)
@@ -39,15 +39,10 @@
</dependency>
</dependencies>
<build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
</build>
</project>
Modified: trunk/jsptest-jsp21/pom.xml
===================================================================
--- trunk/jsptest-jsp21/pom.xml 2008-06-27 11:47:44 UTC (rev 236)
+++ trunk/jsptest-jsp21/pom.xml 2008-11-05 22:36:42 UTC (rev 237)
@@ -33,4 +33,11 @@
<version>6.0.13</version>
</dependency>
</dependencies>
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ </build>
</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lko...@us...> - 2008-06-27 11:47:45
|
Revision: 236
http://jsptest.svn.sourceforge.net/jsptest/?rev=236&view=rev
Author: lkoskela
Date: 2008-06-27 04:47:44 -0700 (Fri, 27 Jun 2008)
Log Message:
-----------
'page().shouldContain(String)' and 'page().shouldNotContain(String)' no longer consider the 'head' section of an HTML document
Modified Paths:
--------------
trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/assertion/PageAssertion.java
Modified: trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/assertion/PageAssertion.java
===================================================================
--- trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/assertion/PageAssertion.java 2008-06-27 11:46:09 UTC (rev 235)
+++ trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/assertion/PageAssertion.java 2008-06-27 11:47:44 UTC (rev 236)
@@ -5,6 +5,7 @@
import org.jaxen.JaxenException;
import org.jaxen.dom.DOMXPath;
import org.w3c.dom.Document;
+import org.w3c.dom.Element;
/**
* Provides assertion methods related to an HTML page.
@@ -13,34 +14,43 @@
*/
public class PageAssertion extends DOMAssertion {
- /**
- * @param content
- * The DOM tree to interpret as an HTML page.
- */
- public PageAssertion(Document content) {
- this.context = content.getDocumentElement();
- }
+ private Element headContext;
- /**
- * Assert that the page should have the specified title.
- *
- * @param expectedTitle
- * The expected title.
- */
- public void shouldHaveTitle(String expectedTitle) {
- try {
- String title = new DOMXPath("/HTML/HEAD/TITLE/text()")
- .stringValueOf(context);
- Assert.assertEquals(expectedTitle, title);
- } catch (JaxenException e) {
- throw new RuntimeException(e);
- }
- }
+ /**
+ * @param content
+ * The DOM tree to interpret as an HTML page.
+ */
+ public PageAssertion(Document content) {
+ try {
+ context = (Element) new DOMXPath("/HTML/BODY")
+ .selectSingleNode(content);
+ headContext = (Element) new DOMXPath("/HTML/HEAD")
+ .selectSingleNode(content);
+ } catch (JaxenException e) {
+ throw new RuntimeException(e);
+ }
+ }
- /**
- * Returns a handle for making assertions related to link elements.
- */
- public LinkAssertion shouldHaveLink() {
- return new LinkAssertion(context);
- }
+ /**
+ * Assert that the page should have the specified title.
+ *
+ * @param expectedTitle
+ * The expected title.
+ */
+ public void shouldHaveTitle(String expectedTitle) {
+ try {
+ String title = new DOMXPath("TITLE/text()")
+ .stringValueOf(headContext);
+ Assert.assertEquals(expectedTitle, title);
+ } catch (JaxenException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ /**
+ * Returns a handle for making assertions related to link elements.
+ */
+ public LinkAssertion shouldHaveLink() {
+ return new LinkAssertion(context);
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lko...@us...> - 2008-06-27 11:46:12
|
Revision: 235
http://jsptest.svn.sourceforge.net/jsptest/?rev=235&view=rev
Author: lkoskela
Date: 2008-06-27 04:46:09 -0700 (Fri, 27 Jun 2008)
Log Message:
-----------
Added a test for 'shouldContain' and 'shouldNotContain' not considering the 'head' section of an HTML document
Modified Paths:
--------------
trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/TestHtmlTestCasePageAssertions.java
Modified: trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/TestHtmlTestCasePageAssertions.java
===================================================================
--- trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/TestHtmlTestCasePageAssertions.java 2008-06-27 11:34:28 UTC (rev 234)
+++ trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/TestHtmlTestCasePageAssertions.java 2008-06-27 11:46:09 UTC (rev 235)
@@ -75,4 +75,13 @@
}
};
}
+
+ public void testPageShouldNotContainItsTitle() throws Exception {
+ testcase.page().shouldNotContain("PageTitle");
+ new ExpectedAssertionFailure(testcase) {
+ protected void run() throws Exception {
+ page().shouldContain("PageTitle");
+ }
+ };
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lko...@us...> - 2008-06-27 11:34:33
|
Revision: 234
http://jsptest.svn.sourceforge.net/jsptest/?rev=234&view=rev
Author: lkoskela
Date: 2008-06-27 04:34:28 -0700 (Fri, 27 Jun 2008)
Log Message:
-----------
Added 'cobertura.ser' to svn:ignore
Property Changed:
----------------
trunk/jsptest-generic/jsptest-common/
trunk/jsptest-generic/jsptest-compiler-api/
trunk/jsptest-generic/jsptest-framework/
Property changes on: trunk/jsptest-generic/jsptest-common
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
.settings
target
+ .classpath
.project
.settings
target
cobertura.ser
Property changes on: trunk/jsptest-generic/jsptest-compiler-api
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
.settings
target
+ .classpath
.project
.settings
target
cobertura.ser
Property changes on: trunk/jsptest-generic/jsptest-framework
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
.settings
target
agitar
+ .classpath
.project
.settings
target
cobertura.ser
agitar
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lko...@us...> - 2008-06-27 11:32:50
|
Revision: 233
http://jsptest.svn.sourceforge.net/jsptest/?rev=233&view=rev
Author: lkoskela
Date: 2008-06-27 04:32:47 -0700 (Fri, 27 Jun 2008)
Log Message:
-----------
Now ignoring comments when collecting 'text content'
Modified Paths:
--------------
trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/XML.java
Modified: trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/XML.java
===================================================================
--- trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/XML.java 2008-06-27 11:32:15 UTC (rev 232)
+++ trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/XML.java 2008-06-27 11:32:47 UTC (rev 233)
@@ -58,13 +58,16 @@
StringBuffer textContent = new StringBuffer(100);
NodeList children = element.getChildNodes();
for (int i = 0; i < children.getLength(); i++) {
- Node child = children.item(i);
- if (child.getNodeType() == Node.ELEMENT_NODE) {
- textContent.append(textContentOf((Element) child));
- } else {
- textContent.append(child.getNodeValue().trim());
- }
+ appendTextContentOf(children.item(i), textContent);
}
return textContent.toString();
}
+
+ private static void appendTextContentOf(Node from, StringBuffer to) {
+ if (from.getNodeType() == Node.ELEMENT_NODE) {
+ to.append(textContentOf((Element) from));
+ } else if (from.getNodeType() != Node.COMMENT_NODE) {
+ to.append(from.getNodeValue().trim());
+ }
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lko...@us...> - 2008-06-27 11:32:18
|
Revision: 232
http://jsptest.svn.sourceforge.net/jsptest/?rev=232&view=rev
Author: lkoskela
Date: 2008-06-27 04:32:15 -0700 (Fri, 27 Jun 2008)
Log Message:
-----------
Added a test for ignoring comments when collecting 'text content'
Modified Paths:
--------------
trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/XMLTest.java
Modified: trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/XMLTest.java
===================================================================
--- trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/XMLTest.java 2008-05-03 20:49:55 UTC (rev 231)
+++ trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/XMLTest.java 2008-06-27 11:32:15 UTC (rev 232)
@@ -33,6 +33,12 @@
assertEquals("parentchild", XML.textContentOf(element));
}
+ public void testCommentsAreIgnoredWhenCollectingTextContent()
+ throws Exception {
+ Element element = parse("<p>before comment<!-- ignore -->After comment</p>");
+ assertEquals("before commentAfter comment", XML.textContentOf(element));
+ }
+
private Element parse(String xmlSnippet) throws Exception {
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
DocumentBuilder parser = dbf.newDocumentBuilder();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lko...@us...> - 2008-05-03 20:50:00
|
Revision: 231
http://jsptest.svn.sourceforge.net/jsptest/?rev=231&view=rev
Author: lkoskela
Date: 2008-05-03 13:49:55 -0700 (Sat, 03 May 2008)
Log Message:
-----------
Added a couple of direct tests for CustomClassLoader
Modified Paths:
--------------
trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/CustomClassLoader.java
Added Paths:
-----------
trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/CustomClassLoaderTest.java
Modified: trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/CustomClassLoader.java
===================================================================
--- trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/CustomClassLoader.java 2008-04-25 08:45:19 UTC (rev 230)
+++ trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/CustomClassLoader.java 2008-05-03 20:49:55 UTC (rev 231)
@@ -27,27 +27,31 @@
*/
public class CustomClassLoader extends ClassLoader {
- private File baseDir;
+ private File baseDir;
- public CustomClassLoader(String baseDir) {
- this(new File(baseDir));
- }
+ public CustomClassLoader(String baseDir) {
+ this(new File(baseDir));
+ }
- public CustomClassLoader(File baseDir) {
- this.baseDir = baseDir;
- }
+ public CustomClassLoader(File baseDir) {
+ this.baseDir = baseDir;
+ }
- public Class loadClass(String name) throws ClassNotFoundException {
- File classFile = new File(baseDir, name.replace('.', '/')
- + ".class");
- if (!classFile.exists()) {
- return super.loadClass(name);
- }
- try {
- byte[] data = IO.readToByteArray(classFile);
- return super.defineClass(name, data, 0, data.length);
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
+ public Class loadClass(String name) throws ClassNotFoundException {
+ File classFile = new File(baseDir, name.replace('.', '/') + ".class");
+ if (!classFile.exists()) {
+ return super.loadClass(name);
+ }
+ try {
+ byte[] data = IO.readToByteArray(classFile);
+ return defineClass(name, data);
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ protected Class defineClass(String name, byte[] data)
+ throws ClassFormatError {
+ return super.defineClass(name, data, 0, data.length);
+ }
}
\ No newline at end of file
Added: trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/CustomClassLoaderTest.java
===================================================================
--- trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/CustomClassLoaderTest.java (rev 0)
+++ trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/CustomClassLoaderTest.java 2008-05-03 20:49:55 UTC (rev 231)
@@ -0,0 +1,60 @@
+package net.sf.jsptest.utils;
+
+import java.io.File;
+
+import junit.framework.TestCase;
+
+public class CustomClassLoaderTest extends TestCase {
+
+ private File baseDir;
+ protected String definedName;
+ protected byte[] definedData;
+ private String fullyQualifiedClassName;
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ fullyQualifiedClassName = "pkg.Fake";
+ baseDir = new File(System.getProperty("java.io.tmpdir"), "basedir");
+ File packageDir = new File(baseDir, "pkg");
+ packageDir.mkdirs();
+ File classFile = new File(packageDir, "Fake.class");
+ IO.write("Fake", classFile);
+ }
+
+ public void testClassesAreLoadedFromTheGivenBaseDirectory()
+ throws Exception {
+ CustomClassLoader cl = new CustomClassLoader(baseDir) {
+ // override to avoid actual class loading
+ protected Class defineClass(String name, byte[] data)
+ throws ClassFormatError {
+ definedName = name;
+ definedData = data;
+ return CustomClassLoaderTest.class;
+ }
+ };
+
+ verifyClassLoading(cl);
+ }
+
+ public void testBaseDirectoryCanBeGivenAsAbsolutePathName()
+ throws Exception {
+ CustomClassLoader cl = new CustomClassLoader(baseDir.getAbsolutePath()) {
+ // override to avoid actual class loading
+ protected Class defineClass(String name, byte[] data)
+ throws ClassFormatError {
+ definedName = name;
+ definedData = data;
+ return CustomClassLoaderTest.class;
+ }
+ };
+
+ verifyClassLoading(cl);
+ }
+
+ private void verifyClassLoading(CustomClassLoader classLoader)
+ throws ClassNotFoundException {
+ classLoader.loadClass(fullyQualifiedClassName);
+ assertEquals(fullyQualifiedClassName, definedName);
+ assertEquals("Fake", new String(definedData));
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lko...@us...> - 2008-04-25 08:45:24
|
Revision: 230
http://jsptest.svn.sourceforge.net/jsptest/?rev=230&view=rev
Author: lkoskela
Date: 2008-04-25 01:45:19 -0700 (Fri, 25 Apr 2008)
Log Message:
-----------
Added direct unit tests for StreamConsumer
Added Paths:
-----------
trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/StreamConsumerTest.java
Added: trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/StreamConsumerTest.java
===================================================================
--- trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/StreamConsumerTest.java (rev 0)
+++ trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/StreamConsumerTest.java 2008-04-25 08:45:19 UTC (rev 230)
@@ -0,0 +1,36 @@
+package net.sf.jsptest.utils;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+import junit.framework.TestCase;
+
+public class StreamConsumerTest extends TestCase {
+
+ private StringWriter log;
+ private String name;
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ log = new StringWriter();
+ name = "name";
+ }
+
+ public void testConsumesAllAvailableInput() throws Exception {
+ InputStream source = new ByteArrayInputStream("abc".getBytes());
+ assertEquals(3, source.available());
+ runStreamConsumerOn(source);
+ assertEquals(0, source.available());
+ }
+
+ public void testWritesNameAndFullContentAfterReadingEverything() throws Exception {
+ runStreamConsumerOn(new ByteArrayInputStream("abc".getBytes()));
+ assertEquals(name + ":\nabc\n", log.toString());
+ }
+
+ private void runStreamConsumerOn(InputStream source) {
+ new StreamConsumer(name, source, new PrintWriter(log)).run();
+ }
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lko...@us...> - 2008-04-24 19:24:47
|
Revision: 229
http://jsptest.svn.sourceforge.net/jsptest/?rev=229&view=rev
Author: lkoskela
Date: 2008-04-24 12:24:38 -0700 (Thu, 24 Apr 2008)
Log Message:
-----------
Deleted empty package directory.
Removed Paths:
-------------
trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/mock/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lko...@us...> - 2008-04-24 19:23:51
|
Revision: 228
http://jsptest.svn.sourceforge.net/jsptest/?rev=228&view=rev
Author: lkoskela
Date: 2008-04-24 12:23:48 -0700 (Thu, 24 Apr 2008)
Log Message:
-----------
Added missing javadoc comments.
Modified Paths:
--------------
trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/JspCompilationInfo.java
trunk/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/JavaCompiler.java
trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/SunJavaC.java
trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/CustomClassLoader.java
trunk/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/Path.java
trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/StreamConsumer.java
trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/Strings.java
trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/XML.java
Modified: trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/JspCompilationInfo.java
===================================================================
--- trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/JspCompilationInfo.java 2008-04-24 17:15:55 UTC (rev 227)
+++ trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/JspCompilationInfo.java 2008-04-24 19:23:48 UTC (rev 228)
@@ -1,5 +1,5 @@
/*
- * Copyright 2007 Lasse Koskela.
+ * 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.
Modified: trunk/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-04-24 17:15:55 UTC (rev 227)
+++ trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/CommandLineJavac.java 2008-04-24 19:23:48 UTC (rev 228)
@@ -1,5 +1,5 @@
/*
- * Copyright 2007 Lasse Koskela.
+ * 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.
Modified: trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/JavaCompiler.java
===================================================================
--- trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/JavaCompiler.java 2008-04-24 17:15:55 UTC (rev 227)
+++ trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/JavaCompiler.java 2008-04-24 19:23:48 UTC (rev 228)
@@ -1,5 +1,5 @@
/*
- * Copyright 2007 Lasse Koskela.
+ * 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.
Modified: trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/SunJavaC.java
===================================================================
--- trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/SunJavaC.java 2008-04-24 17:15:55 UTC (rev 227)
+++ trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/SunJavaC.java 2008-04-24 19:23:48 UTC (rev 228)
@@ -1,6 +1,19 @@
-/**
- *
+/*
+ * 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.lang.reflect.Method;
Modified: trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/CustomClassLoader.java
===================================================================
--- trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/CustomClassLoader.java 2008-04-24 17:15:55 UTC (rev 227)
+++ trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/CustomClassLoader.java 2008-04-24 19:23:48 UTC (rev 228)
@@ -1,5 +1,5 @@
/*
- * Copyright 2007 Lasse Koskela.
+ * 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.
Modified: trunk/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-04-24 17:15:55 UTC (rev 227)
+++ trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/IO.java 2008-04-24 19:23:48 UTC (rev 228)
@@ -1,5 +1,5 @@
/*
- * Copyright 2007 Lasse Koskela.
+ * 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.
Modified: trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/Path.java
===================================================================
--- trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/Path.java 2008-04-24 17:15:55 UTC (rev 227)
+++ trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/Path.java 2008-04-24 19:23:48 UTC (rev 228)
@@ -1,3 +1,19 @@
+/*
+ * 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.File;
@@ -6,6 +22,9 @@
import java.util.ArrayList;
import java.util.Enumeration;
+/**
+ * @author lkoskela
+ */
public class Path extends ArrayList {
private static final String SEPARATOR = System
Modified: trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/StreamConsumer.java
===================================================================
--- trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/StreamConsumer.java 2008-04-24 17:15:55 UTC (rev 227)
+++ trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/StreamConsumer.java 2008-04-24 19:23:48 UTC (rev 228)
@@ -1,5 +1,5 @@
/*
- * Copyright 2007 Lasse Koskela.
+ * 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.
Modified: trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/Strings.java
===================================================================
--- trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/Strings.java 2008-04-24 17:15:55 UTC (rev 227)
+++ trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/Strings.java 2008-04-24 19:23:48 UTC (rev 228)
@@ -1,7 +1,42 @@
+/*
+ * 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;
+/**
+ * The <tt>Strings</tt> class provides utility methods for string
+ * manipulation.
+ *
+ * @author Lasse Koskela
+ */
public class Strings {
+ /**
+ * Replace instances of "what" from "fromWhere" with "withWhat". This is
+ * essentially a replacement for not being able to use
+ * {@link String#replace(String, String, String)} with JDK 1.4.
+ *
+ * @param fromWhere
+ * The string to replace stuff from.
+ * @param what
+ * The string to replace.
+ * @param withWhat
+ * The string to replace with.
+ * @return A new string with the replaced content.
+ */
public static String replace(String fromWhere, String what, String withWhat) {
if (what.length() > 0) {
int indexOfWhat = fromWhere.indexOf(what);
Modified: trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/XML.java
===================================================================
--- trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/XML.java 2008-04-24 17:15:55 UTC (rev 227)
+++ trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/XML.java 2008-04-24 19:23:48 UTC (rev 228)
@@ -1,3 +1,19 @@
+/*
+ * 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;
@@ -14,6 +30,12 @@
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
+/**
+ * The <tt>XML</tt> class provides utility methods for handling XML related
+ * tasks.
+ *
+ * @author Lasse Koskela
+ */
public class XML {
private static final String APACHE_INDENTATION = "{http://xml.apache.org/xslt}indent-amount";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lko...@us...> - 2008-04-24 17:16:03
|
Revision: 227
http://jsptest.svn.sourceforge.net/jsptest/?rev=227&view=rev
Author: lkoskela
Date: 2008-04-24 10:15:55 -0700 (Thu, 24 Apr 2008)
Log Message:
-----------
[maven-release-plugin] prepare for next development iteration
Modified Paths:
--------------
trunk/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml
trunk/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml
trunk/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml
trunk/jsptest-acceptance/pom.xml
trunk/jsptest-generic/jsptest-common/pom.xml
trunk/jsptest-generic/jsptest-compiler-api/pom.xml
trunk/jsptest-generic/jsptest-framework/pom.xml
trunk/jsptest-generic/pom.xml
trunk/jsptest-jsp12/pom.xml
trunk/jsptest-jsp20/pom.xml
trunk/jsptest-jsp21/pom.xml
trunk/pom.xml
Modified: trunk/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml
===================================================================
--- trunk/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml 2008-04-24 17:15:35 UTC (rev 226)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml 2008-04-24 17:15:55 UTC (rev 227)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-acceptance</artifactId>
- <version>0.17</version>
+ <version>0.18-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-acceptance-jsp12</artifactId>
Modified: trunk/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml
===================================================================
--- trunk/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml 2008-04-24 17:15:35 UTC (rev 226)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml 2008-04-24 17:15:55 UTC (rev 227)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-acceptance</artifactId>
- <version>0.17</version>
+ <version>0.18-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-acceptance-jsp20</artifactId>
Modified: trunk/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml
===================================================================
--- trunk/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml 2008-04-24 17:15:35 UTC (rev 226)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml 2008-04-24 17:15:55 UTC (rev 227)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-acceptance</artifactId>
- <version>0.17</version>
+ <version>0.18-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-acceptance-jsp21</artifactId>
- <version>0.17</version>
+ <version>0.18-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Acceptance tests for the JspTest variant for the JSP 2.1 specification.</name>
<description />
Modified: trunk/jsptest-acceptance/pom.xml
===================================================================
--- trunk/jsptest-acceptance/pom.xml 2008-04-24 17:15:35 UTC (rev 226)
+++ trunk/jsptest-acceptance/pom.xml 2008-04-24 17:15:55 UTC (rev 227)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.17</version>
+ <version>0.18-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-acceptance</artifactId>
Modified: trunk/jsptest-generic/jsptest-common/pom.xml
===================================================================
--- trunk/jsptest-generic/jsptest-common/pom.xml 2008-04-24 17:15:35 UTC (rev 226)
+++ trunk/jsptest-generic/jsptest-common/pom.xml 2008-04-24 17:15:55 UTC (rev 227)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-generic</artifactId>
- <version>0.17</version>
+ <version>0.18-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-common</artifactId>
- <version>0.17</version>
+ <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>
Modified: trunk/jsptest-generic/jsptest-compiler-api/pom.xml
===================================================================
--- trunk/jsptest-generic/jsptest-compiler-api/pom.xml 2008-04-24 17:15:35 UTC (rev 226)
+++ trunk/jsptest-generic/jsptest-compiler-api/pom.xml 2008-04-24 17:15:55 UTC (rev 227)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-generic</artifactId>
- <version>0.17</version>
+ <version>0.18-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-compiler-api</artifactId>
- <version>0.17</version>
+ <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>
Modified: trunk/jsptest-generic/jsptest-framework/pom.xml
===================================================================
--- trunk/jsptest-generic/jsptest-framework/pom.xml 2008-04-24 17:15:35 UTC (rev 226)
+++ trunk/jsptest-generic/jsptest-framework/pom.xml 2008-04-24 17:15:55 UTC (rev 227)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-generic</artifactId>
- <version>0.17</version>
+ <version>0.18-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-framework</artifactId>
- <version>0.17</version>
+ <version>0.18-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Core framework</name>
<description>The core framework functionality for JspTest.</description>
@@ -15,12 +15,12 @@
<dependency>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-compiler-api</artifactId>
- <version>0.17</version>
+ <version>0.18-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-common</artifactId>
- <version>0.17</version>
+ <version>0.18-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Modified: trunk/jsptest-generic/pom.xml
===================================================================
--- trunk/jsptest-generic/pom.xml 2008-04-24 17:15:35 UTC (rev 226)
+++ trunk/jsptest-generic/pom.xml 2008-04-24 17:15:55 UTC (rev 227)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.17</version>
+ <version>0.18-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-generic</artifactId>
- <version>0.17</version>
+ <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>
Modified: trunk/jsptest-jsp12/pom.xml
===================================================================
--- trunk/jsptest-jsp12/pom.xml 2008-04-24 17:15:35 UTC (rev 226)
+++ trunk/jsptest-jsp12/pom.xml 2008-04-24 17:15:55 UTC (rev 227)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.17</version>
+ <version>0.18-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-jsp12</artifactId>
Modified: trunk/jsptest-jsp20/pom.xml
===================================================================
--- trunk/jsptest-jsp20/pom.xml 2008-04-24 17:15:35 UTC (rev 226)
+++ trunk/jsptest-jsp20/pom.xml 2008-04-24 17:15:55 UTC (rev 227)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.17</version>
+ <version>0.18-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-jsp20</artifactId>
Modified: trunk/jsptest-jsp21/pom.xml
===================================================================
--- trunk/jsptest-jsp21/pom.xml 2008-04-24 17:15:35 UTC (rev 226)
+++ trunk/jsptest-jsp21/pom.xml 2008-04-24 17:15:55 UTC (rev 227)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.17</version>
+ <version>0.18-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-jsp21</artifactId>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2008-04-24 17:15:35 UTC (rev 226)
+++ trunk/pom.xml 2008-04-24 17:15:55 UTC (rev 227)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.17</version>
+ <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>
@@ -32,9 +32,9 @@
</repository>
</distributionManagement>
<scm>
- <connection>scm:svn:https://jsptest.svn.sourceforge.net/svnroot/jsptest/tags/jsptest-0.17</connection>
- <developerConnection>scm:svn:https://jsptest.svn.sourceforge.net/svnroot/jsptest/tags/jsptest-0.17</developerConnection>
- <url>http://jsptest.svn.sourceforge.net/viewvc/jsptest/tags/jsptest-0.17</url>
+ <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>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
