jsptest-svn-commits Mailing List for JspTest (Page 3)
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-04-24 17:15:37
|
Revision: 226
http://jsptest.svn.sourceforge.net/jsptest/?rev=226&view=rev
Author: lkoskela
Date: 2008-04-24 10:15:35 -0700 (Thu, 24 Apr 2008)
Log Message:
-----------
[maven-release-plugin] copy for tag jsptest-0.17
Added Paths:
-----------
tags/jsptest-0.17/
tags/jsptest-0.17/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml
tags/jsptest-0.17/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml
tags/jsptest-0.17/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/TestMockingTaglibs.java
tags/jsptest-0.17/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml
tags/jsptest-0.17/jsptest-acceptance/pom.xml
tags/jsptest-0.17/jsptest-generic/jsptest-common/pom.xml
tags/jsptest-0.17/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/CommandLineJavac.java
tags/jsptest-0.17/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/JavaCompiler.java
tags/jsptest-0.17/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/SunJavaC.java
tags/jsptest-0.17/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/Path.java
tags/jsptest-0.17/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/Strings.java
tags/jsptest-0.17/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/XML.java
tags/jsptest-0.17/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/StringsTest.java
tags/jsptest-0.17/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/XMLTest.java
tags/jsptest-0.17/jsptest-generic/jsptest-compiler-api/pom.xml
tags/jsptest-0.17/jsptest-generic/jsptest-compiler-api/src/main/java/net/sf/jsptest/compiler/api/JspExecution.java
tags/jsptest-0.17/jsptest-generic/jsptest-framework/pom.xml
tags/jsptest-0.17/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/HtmlTestCase.java
tags/jsptest-0.17/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/JspTestCase.java
tags/jsptest-0.17/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/assertion/DOMAssertion.java
tags/jsptest-0.17/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/TestHtmlTestCaseElementAssertions.java
tags/jsptest-0.17/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/compiler/dummy/FakeJspCompiler.java
tags/jsptest-0.17/jsptest-generic/pom.xml
tags/jsptest-0.17/jsptest-jsp12/pom.xml
tags/jsptest-0.17/jsptest-jsp20/pom.xml
tags/jsptest-0.17/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperCompiler.java
tags/jsptest-0.17/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JspExecutionImpl.java
tags/jsptest-0.17/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JspImpl.java
tags/jsptest-0.17/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockHttpServletRequest.java
tags/jsptest-0.17/jsptest-jsp20/src/test/java/net/sf/jsptest/compiler/jsp20/TestJspImpl.java
tags/jsptest-0.17/jsptest-jsp21/pom.xml
tags/jsptest-0.17/pom.xml
Removed Paths:
-------------
tags/jsptest-0.17/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml
tags/jsptest-0.17/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml
tags/jsptest-0.17/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/TestMockingTaglibs.java
tags/jsptest-0.17/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml
tags/jsptest-0.17/jsptest-acceptance/pom.xml
tags/jsptest-0.17/jsptest-generic/jsptest-common/pom.xml
tags/jsptest-0.17/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/CommandLineJavac.java
tags/jsptest-0.17/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/JavaCompiler.java
tags/jsptest-0.17/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/SunJavaC.java
tags/jsptest-0.17/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/Path.java
tags/jsptest-0.17/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/XML.java
tags/jsptest-0.17/jsptest-generic/jsptest-compiler-api/pom.xml
tags/jsptest-0.17/jsptest-generic/jsptest-compiler-api/src/main/java/net/sf/jsptest/compiler/api/JspExecution.java
tags/jsptest-0.17/jsptest-generic/jsptest-framework/pom.xml
tags/jsptest-0.17/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/HtmlTestCase.java
tags/jsptest-0.17/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/JspTestCase.java
tags/jsptest-0.17/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/assertion/DOMAssertion.java
tags/jsptest-0.17/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/TestHtmlTestCaseElementAssertions.java
tags/jsptest-0.17/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/compiler/dummy/FakeJspCompiler.java
tags/jsptest-0.17/jsptest-generic/pom.xml
tags/jsptest-0.17/jsptest-jsp12/pom.xml
tags/jsptest-0.17/jsptest-jsp20/pom.xml
tags/jsptest-0.17/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperCompiler.java
tags/jsptest-0.17/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JspExecutionImpl.java
tags/jsptest-0.17/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JspImpl.java
tags/jsptest-0.17/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockHttpServletRequest.java
tags/jsptest-0.17/jsptest-jsp20/src/test/java/net/sf/jsptest/compiler/jsp20/TestJspImpl.java
tags/jsptest-0.17/jsptest-jsp21/pom.xml
tags/jsptest-0.17/pom.xml
Copied: tags/jsptest-0.17 (from rev 217, trunk)
Deleted: tags/jsptest-0.17/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml
===================================================================
--- trunk/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml 2008-04-14 12:41:31 UTC (rev 217)
+++ tags/jsptest-0.17/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml 2008-04-24 17:15:35 UTC (rev 226)
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-acceptance</artifactId>
- <version>0.16-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jsptest-acceptance-jsp12</artifactId>
- <packaging>jar</packaging>
- <name>Acceptance tests for the JspTest variant for the JSP 1.2 specification.</name>
- <description />
- <dependencies>
- <dependency>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-jsp12</artifactId>
- </dependency>
- </dependencies>
-</project>
Copied: tags/jsptest-0.17/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml (from rev 225, trunk/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml)
===================================================================
--- tags/jsptest-0.17/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml (rev 0)
+++ tags/jsptest-0.17/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml 2008-04-24 17:15:35 UTC (rev 226)
@@ -0,0 +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-acceptance</artifactId>
+ <version>0.17</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>
Deleted: tags/jsptest-0.17/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml
===================================================================
--- trunk/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml 2008-04-14 12:41:31 UTC (rev 217)
+++ tags/jsptest-0.17/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml 2008-04-24 17:15:35 UTC (rev 226)
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-acceptance</artifactId>
- <version>0.16-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jsptest-acceptance-jsp20</artifactId>
- <packaging>jar</packaging>
- <name>Acceptance tests for the JspTest variant for the JSP 2.0 specification.</name>
- <description />
- <dependencies>
- <dependency>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-jsp20</artifactId>
- </dependency>
- </dependencies>
-</project>
Copied: tags/jsptest-0.17/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml (from rev 225, trunk/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml)
===================================================================
--- tags/jsptest-0.17/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml (rev 0)
+++ tags/jsptest-0.17/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml 2008-04-24 17:15:35 UTC (rev 226)
@@ -0,0 +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-acceptance</artifactId>
+ <version>0.17</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>
Deleted: tags/jsptest-0.17/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-04-14 12:41:31 UTC (rev 217)
+++ tags/jsptest-0.17/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/TestMockingTaglibs.java 2008-04-24 17:15:35 UTC (rev 226)
@@ -1,63 +0,0 @@
-/*
- * Copyright 2007 Lasse Koskela.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.sf.jsptest.acceptance.jsp;
-
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.tagext.TagSupport;
-
-import net.sf.jsptest.JspTestCase;
-
-/**
- * @author Lasse Koskela
- */
-public class TestMockingTaglibs extends JspTestCase {
-
- protected String getJspPackageName() {
- return "cust.om.tags";
- }
-
- 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;
- }
- }
-
- public void testRenderingJspUsingCustomTaglibs() throws Exception {
- substituteTaglib("custom", MockCustomTag.class);
- get("/taglibs/custom-taglib.jsp");
- output().shouldContain(
- "This content is coming from the mock CustomTag");
- }
-}
Copied: tags/jsptest-0.17/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/TestMockingTaglibs.java (from rev 221, trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/TestMockingTaglibs.java)
===================================================================
--- tags/jsptest-0.17/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/TestMockingTaglibs.java (rev 0)
+++ tags/jsptest-0.17/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/TestMockingTaglibs.java 2008-04-24 17:15:35 UTC (rev 226)
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2007 Lasse Koskela.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.sf.jsptest.acceptance.jsp;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.JspWriter;
+import javax.servlet.jsp.tagext.TagSupport;
+
+import net.sf.jsptest.JspTestCase;
+
+/**
+ * @author Lasse Koskela
+ */
+public class TestMockingTaglibs extends JspTestCase {
+
+ protected String getJspPackageName() {
+ return "cust.om.tags";
+ }
+
+ 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;
+ }
+ }
+
+ public void testRenderingJspUsingCustomTaglibs() throws Exception {
+ substituteTaglib("custom", MockCustomTag.class);
+ get("/taglibs/custom-taglib.jsp");
+ output()
+ .shouldContain("This content is coming from the mock CustomTag");
+ }
+}
Deleted: tags/jsptest-0.17/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml
===================================================================
--- trunk/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml 2008-04-14 12:41:31 UTC (rev 217)
+++ tags/jsptest-0.17/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml 2008-04-24 17:15:35 UTC (rev 226)
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-acceptance</artifactId>
- <version>0.16-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jsptest-acceptance-jsp21</artifactId>
- <version>0.16-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>Acceptance tests for the JspTest variant for the JSP 2.1 specification.</name>
- <description />
- <dependencies>
- <dependency>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-jsp21</artifactId>
- </dependency>
- </dependencies>
-</project>
Copied: tags/jsptest-0.17/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml (from rev 225, trunk/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml)
===================================================================
--- tags/jsptest-0.17/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml (rev 0)
+++ tags/jsptest-0.17/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml 2008-04-24 17:15:35 UTC (rev 226)
@@ -0,0 +1,20 @@
+<?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.17</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jsptest-acceptance-jsp21</artifactId>
+ <version>0.17</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>
Deleted: tags/jsptest-0.17/jsptest-acceptance/pom.xml
===================================================================
--- trunk/jsptest-acceptance/pom.xml 2008-04-14 12:41:31 UTC (rev 217)
+++ tags/jsptest-0.17/jsptest-acceptance/pom.xml 2008-04-24 17:15:35 UTC (rev 226)
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest</artifactId>
- <version>0.16-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jsptest-acceptance</artifactId>
- <name>JspTest root project for acceptance test modules</name>
- <description>This POM acts as a virtual root for the acceptance test projects for different JSP specification variants of JspTest.</description>
- <packaging>pom</packaging>
- <modules>
- <module>jsptest-acceptance-jsp12</module>
- <module>jsptest-acceptance-jsp20</module>
- <module>jsptest-acceptance-jsp21</module>
- </modules>
-</project>
Copied: tags/jsptest-0.17/jsptest-acceptance/pom.xml (from rev 225, trunk/jsptest-acceptance/pom.xml)
===================================================================
--- tags/jsptest-0.17/jsptest-acceptance/pom.xml (rev 0)
+++ tags/jsptest-0.17/jsptest-acceptance/pom.xml 2008-04-24 17:15:35 UTC (rev 226)
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>net.sf.jsptest</groupId>
+ <artifactId>jsptest</artifactId>
+ <version>0.17</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jsptest-acceptance</artifactId>
+ <name>JspTest root project for acceptance test modules</name>
+ <description>This POM acts as a virtual root for the acceptance test projects for different JSP specification variants of JspTest.</description>
+ <packaging>pom</packaging>
+ <modules>
+ <module>jsptest-acceptance-jsp12</module>
+ <module>jsptest-acceptance-jsp20</module>
+ <module>jsptest-acceptance-jsp21</module>
+ </modules>
+</project>
Deleted: tags/jsptest-0.17/jsptest-generic/jsptest-common/pom.xml
===================================================================
--- trunk/jsptest-generic/jsptest-common/pom.xml 2008-04-14 12:41:31 UTC (rev 217)
+++ tags/jsptest-0.17/jsptest-generic/jsptest-common/pom.xml 2008-04-24 17:15:35 UTC (rev 226)
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-generic</artifactId>
- <version>0.16-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jsptest-common</artifactId>
- <version>0.16-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>Common utilities</name>
- <description>Common utilities for the components of JspTest, including the JSP version-specific compiler implementations.</description>
- <profiles>
- <profile>
- <id>default-tools.jar</id>
- <activation>
- <property>
- <name>java.vendor</name>
- <value>Sun Microsystems Inc.</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.sun</groupId>
- <artifactId>tools</artifactId>
- <version>1.4.2</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-</project>
Copied: tags/jsptest-0.17/jsptest-generic/jsptest-common/pom.xml (from rev 225, trunk/jsptest-generic/jsptest-common/pom.xml)
===================================================================
--- tags/jsptest-0.17/jsptest-generic/jsptest-common/pom.xml (rev 0)
+++ tags/jsptest-0.17/jsptest-generic/jsptest-common/pom.xml 2008-04-24 17:15:35 UTC (rev 226)
@@ -0,0 +1,34 @@
+<?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.17</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jsptest-common</artifactId>
+ <version>0.17</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>
Deleted: tags/jsptest-0.17/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-14 12:41:31 UTC (rev 217)
+++ tags/jsptest-0.17/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/CommandLineJavac.java 2008-04-24 17:15:35 UTC (rev 226)
@@ -1,100 +0,0 @@
-/*
- * Copyright 2007 Lasse Koskela.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.sf.jsptest.compiler.java;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-
-import net.sf.jsptest.utils.StreamConsumer;
-
-/**
- * @author Lasse Koskela
- */
-public class CommandLineJavac implements JavaCompiler {
-
- private static final String SEPARATOR = System
- .getProperty("path.separator");
-
- public boolean compile(String srcFile, String destDir,
- String[] classpath) throws Exception {
- srcFile = new File(srcFile).getCanonicalPath();
- String cp = join(classpath);
- String[] command = buildCommandLine(srcFile, destDir, cp);
- return execute(command);
- }
-
- private String[] buildCommandLine(String pathToJavaSource,
- String outputDirectory, String classpathString) {
- return new String[] { "javac", "-classpath", classpathString,
- "-d", outputDirectory, pathToJavaSource };
- }
-
- private String join(String[] classpath) {
- StringBuffer s = new StringBuffer();
- for (int i = 0; i < classpath.length; i++) {
- if (s.length() > 0) {
- s.append(SEPARATOR);
- }
- s.append(classpath[i]);
- }
- return s.toString();
- }
-
- private boolean execute(String[] commandLine) throws IOException,
- InterruptedException {
- Process p = Runtime.getRuntime().exec(commandLine);
- String processOutput = readOutput(p);
- boolean success = (p.waitFor() == 0);
- if (!success) {
- System.err.println(processOutput);
- }
- return success;
- }
-
- private String readOutput(final Process p) throws IOException {
- try {
- StringWriter output = new StringWriter();
- final PrintWriter ps = new PrintWriter(output);
- Thread stderrThread = new Thread(new StreamConsumer(
- "STDERR", p.getErrorStream(), ps));
- Thread stdoutThread = new Thread(new StreamConsumer(
- "STDOUT", p.getInputStream(), ps));
- p.getOutputStream().close();
- stderrThread.start();
- stdoutThread.start();
- stderrThread.join();
- stdoutThread.join();
- return output.toString();
- } catch (Exception e) {
- StringWriter sw = new StringWriter();
- e.printStackTrace(new PrintWriter(sw));
- return sw.toString();
- }
- }
-
- public boolean isAvailable() {
- try {
- Process p = Runtime.getRuntime().exec("javac");
- String s = readOutput(p);
- return s.indexOf("Usage: javac") != -1;
- } catch (Exception e) {
- return false;
- }
- }
-}
Copied: tags/jsptest-0.17/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/CommandLineJavac.java (from rev 223, trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/CommandLineJavac.java)
===================================================================
--- tags/jsptest-0.17/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/CommandLineJavac.java (rev 0)
+++ tags/jsptest-0.17/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/CommandLineJavac.java 2008-04-24 17:15:35 UTC (rev 226)
@@ -0,0 +1,100 @@
+/*
+ * Copyright 2007 Lasse Koskela.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.sf.jsptest.compiler.java;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+
+import net.sf.jsptest.utils.StreamConsumer;
+
+/**
+ * @author Lasse Koskela
+ */
+public class CommandLineJavac implements JavaCompiler {
+
+ private static final String SEPARATOR = System
+ .getProperty("path.separator");
+
+ public boolean compile(String srcFile, String destDir, String[] classpath)
+ throws Exception {
+ srcFile = new File(srcFile).getCanonicalPath();
+ String cp = join(classpath);
+ String[] command = buildCommandLine(srcFile, destDir, cp);
+ return execute(command);
+ }
+
+ private String[] buildCommandLine(String pathToJavaSource,
+ String outputDirectory, String classpathString) {
+ return new String[] { "javac", "-classpath", classpathString, "-d",
+ outputDirectory, pathToJavaSource };
+ }
+
+ private String join(String[] classpath) {
+ StringBuffer s = new StringBuffer(5000);
+ for (int i = 0; i < classpath.length; i++) {
+ if (s.length() > 0) {
+ s.append(SEPARATOR);
+ }
+ s.append(classpath[i]);
+ }
+ return s.toString();
+ }
+
+ private boolean execute(String[] commandLine) throws IOException,
+ InterruptedException {
+ Process p = Runtime.getRuntime().exec(commandLine);
+ String processOutput = readOutput(p);
+ boolean success = (p.waitFor() == 0);
+ if (!success) {
+ System.err.println(processOutput);
+ }
+ return success;
+ }
+
+ private String readOutput(final Process p) throws IOException {
+ try {
+ StringWriter output = new StringWriter();
+ final PrintWriter ps = new PrintWriter(output);
+ Thread stderrThread = new Thread(new StreamConsumer("STDERR", p
+ .getErrorStream(), ps));
+ Thread stdoutThread = new Thread(new StreamConsumer("STDOUT", p
+ .getInputStream(), ps));
+ p.getOutputStream().close();
+ stderrThread.start();
+ stdoutThread.start();
+ stderrThread.join();
+ stdoutThread.join();
+ return output.toString();
+ } catch (Exception e) {
+ StringWriter sw = new StringWriter();
+ e.printStackTrace(new PrintWriter(sw));
+ return sw.toString();
+ }
+ }
+
+ public boolean isAvailable() {
+ try {
+ Process p = Runtime.getRuntime().exec("javac");
+ String s = readOutput(p);
+ return s.indexOf("Usage: javac") != -1;
+ } catch (Exception e) {
+ return false;
+ }
+ }
+}
Deleted: tags/jsptest-0.17/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-14 12:41:31 UTC (rev 217)
+++ tags/jsptest-0.17/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/JavaCompiler.java 2008-04-24 17:15:35 UTC (rev 226)
@@ -1,48 +0,0 @@
-/*
- * Copyright 2007 Lasse Koskela.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.sf.jsptest.compiler.java;
-
-/**
- * The interface for Java compiler implementations.
- *
- * @author Lasse Koskela
- */
-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.
- */
- public abstract boolean compile(String pathToJavaSource,
- String outputDirectory, String[] classpath)
- throws Exception;
-
- /**
- * Indicates whether this Java compiler implementation is available on the
- * current system.
- */
- public abstract boolean isAvailable();
-
-}
\ No newline at end of file
Copied: tags/jsptest-0.17/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/JavaCompiler.java (from rev 223, trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/JavaCompiler.java)
===================================================================
--- tags/jsptest-0.17/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/JavaCompiler.java (rev 0)
+++ tags/jsptest-0.17/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/JavaCompiler.java 2008-04-24 17:15:35 UTC (rev 226)
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2007 Lasse Koskela.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.sf.jsptest.compiler.java;
+
+/**
+ * The interface for Java compiler implementations.
+ *
+ * @author Lasse Koskela
+ */
+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;
+
+ /**
+ * Indicates whether this Java compiler implementation is available on the
+ * current system.
+ */
+ boolean isAvailable();
+
+}
\ No newline at end of file
Deleted: tags/jsptest-0.17/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-14 12:41:31 UTC (rev 217)
+++ tags/jsptest-0.17/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/SunJavaC.java 2008-04-24 17:15:35 UTC (rev 226)
@@ -1,70 +0,0 @@
-/**
- *
- */
-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.
- *
- * @author mathias.broekelmann
- *
- */
-public class SunJavaC implements JavaCompiler {
-
- 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);
- }
-
- private boolean compile(String[] args) {
- try {
- Class compilerClass = getCompileClass();
- Method compilerMethod = resolveCompilerMethod(compilerClass);
- return ((Integer)compilerMethod.invoke(compilerClass.newInstance(), new Object[] { args })).intValue() == 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 join(String[] classpath) {
- StringBuffer s = new StringBuffer();
- 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 {
- Class c = getCompileClass();
- resolveCompilerMethod(c);
- return true;
- } catch (Throwable ex) {
- return false;
- }
- }
-
- private Method resolveCompilerMethod(Class compilerClass) throws NoSuchMethodException {
- return compilerClass.getMethod("compile", new Class[] { (new String[] {}).getClass() });
- }
-
- private Class getCompileClass() throws ClassNotFoundException {
- Class c = Class.forName("com.sun.tools.javac.Main");
- return c;
- }
-
-}
Copied: tags/jsptest-0.17/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/SunJavaC.java (from rev 223, trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/SunJavaC.java)
===================================================================
--- tags/jsptest-0.17/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/SunJavaC.java (rev 0)
+++ tags/jsptest-0.17/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/SunJavaC.java 2008-04-24 17:15:35 UTC (rev 226)
@@ -0,0 +1,80 @@
+/**
+ *
+ */
+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.
+ *
+ * @author mathias.broekelmann
+ *
+ */
+public class SunJavaC implements JavaCompiler {
+
+ 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);
+ }
+
+ 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 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;
+ }
+ }
+
+ 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");
+ }
+
+}
Deleted: tags/jsptest-0.17/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-14 12:41:31 UTC (rev 217)
+++ tags/jsptest-0.17/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/Path.java 2008-04-24 17:15:35 UTC (rev 226)
@@ -1,82 +0,0 @@
-package net.sf.jsptest.utils;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Enumeration;
-
-public class Path extends ArrayList {
-
- 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 boolean add(Object pathElement) {
- if (contains(pathElement)) {
- return false;
- }
- return super.add(pathElement);
- }
-
- public boolean add(File file) {
- return add(file.getAbsolutePath());
- }
-
- 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();
- }
- }
-
- 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(String url) {
- String prefix = "jar:file:";
- if (url.startsWith(prefix)) {
- String file = url.substring(prefix.length());
- if (file.contains("!")) {
- file = file.substring(0, file.indexOf('!'));
- }
- add(new File(file));
- }
- }
-}
Copied: tags/jsptest-0.17/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/Path.java (from rev 224, trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/Path.java)
===================================================================
--- tags/jsptest-0.17/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/Path.java (rev 0)
+++ tags/jsptest-0.17/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/Path.java 2008-04-24 17:15:35 UTC (rev 226)
@@ -0,0 +1,82 @@
+package net.sf.jsptest.utils;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Enumeration;
+
+public class Path extends ArrayList {
+
+ 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 boolean add(Object pathElement) {
+ if (contains(pathElement)) {
+ return false;
+ }
+ return super.add(pathElement);
+ }
+
+ public boolean add(File file) {
+ return add(file.getAbsolutePath());
+ }
+
+ 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();
+ }
+ }
+
+ 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(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));
+ }
+ }
+}
Copied: tags/jsptest-0.17/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/Strings.java (from rev 224, trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/Strings.java)
===================================================================
--- tags/jsptest-0.17/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/Strings.java (rev 0)
+++ tags/jsptest-0.17/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/Strings.java 2008-04-24 17:15:35 UTC (rev 226)
@@ -0,0 +1,18 @@
+package net.sf.jsptest.utils;
+
+public class Strings {
+
+ 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;
+ }
+}
Deleted: tags/jsptest-0.17/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-14 12:41:31 UTC (rev 217)
+++ tags/jsptest-0.17/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/XML.java 2008-04-24 17:15:35 UTC (rev 226)
@@ -1,32 +0,0 @@
-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.Node;
-
-public class XML {
-
- 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);
- }
- }
-}
Copied: tags/jsptest-0.17/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/XML.java (from rev 224, trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/XML.java)
===================================================================
--- tags/jsptest-0.17/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/XML.java (rev 0)
+++ tags/jsptest-0.17/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/XML.java 2008-04-24 17:15:35 UTC (rev 226)
@@ -0,0 +1,48 @@
+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;
+
+public class XML {
+
+ 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 textContentOf(Element element) {
+ 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());
+ }
+ }
+ return textContent.toString();
+ }
+}
Copied: tags/jsptest-0.17/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/StringsTest.java (from rev 224, trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/StringsTest.java)
===================================================================
--- tags/jsptest-0.17/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/StringsTest.java (rev 0)
+++ tags/jsptest-0.17/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/StringsTest.java 2008-04-24 17:15:35 UTC (rev 226)
@@ -0,0 +1,35 @@
+package net.sf.jsptest.utils;
+
+import junit.framework.TestCase;
+
+public class StringsTest extends TestCase {
+
+ public void testReplacingNonexistentNeedle() throws Exception {
+ assertEquals("no such thing here", Strings.replace(
+ "no such thing here", "needle", "foo"));
+ }
+
+ public void testReplacingOneInstance() throws Exception {
+ assertEquals("Macs are cool", Strings.replace("what are cool", "what",
+ "Macs"));
+ }
+
+ public void testReplacingMultipleInstances() throws Exception {
+ assertEquals("Macs and Macs are cool", Strings.replace(
+ "what and what are cool", "what", "Macs"));
+ }
+
+ public void testReplacingWithTheSameValue() throws Exception {
+ assertEquals("abcabcabc", Strings.replace("abcabcabc", "bc", "bc"));
+ }
+
+ public void testReplacingWithSomethingThatContainsTheSameValue()
+ throws Exception {
+ assertEquals("a_bc_a_bc_a_bc_", Strings.replace("abcabcabc", "bc",
+ "_bc_"));
+ }
+
+ public void testReplacingEmptyStrings() throws Exception {
+ assertEquals("", Strings.replace("", "", ""));
+ }
+}
Copied: tags/jsptest-0.17/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/XMLTest.java (from rev 224, trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/XMLTest.java)
===================================================================
--- tags/jsptest-0.17/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/XMLTest.java (rev 0)
+++ tags/jsptest-0.17/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/XMLTest.java 2008-04-24 17:15:35 UTC (rev 226)
@@ -0,0 +1,43 @@
+package net.sf.jsptest.utils;
+
+import java.io.StringReader;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import junit.framework.TestCase;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.xml.sax.InputSource;
+
+public class XMLTest extends TestCase {
+
+ public void testCollectingTextContentForEmptyElement() throws Exception {
+ Element element = parse("<root></root>");
+ assertEquals("", XML.textContentOf(element));
+ }
+
+ public void testCollectingTextContentForNonEmptyElement() throws Exception {
+ Element element = parse("<parent>text</parent>");
+ assertEquals("text", XML.textContentOf(element));
+ }
+
+ public void testCollectingTextContentElementWithChildren() throws Exception {
+ Element element = parse("<parent>parent<child>child</child></parent>");
+ assertEquals("parentchild", XML.textContentOf(element));
+ }
+
+ public void testWhitespaceBetweenTextNodesIsRemoved() throws Exception {
+ Element element = parse("<parent>\n parent\n <child>\n child\n </child>\n</parent>");
+ assertEquals("parentchild", XML.textContentOf(element));
+ }
+
+ private Element parse(String xmlSnippet) throws Exception {
+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ DocumentBuilder parser = dbf.newDocumentBuilder();
+ String xml = "<?xml version='1.0'?>\n" + xmlSnippet;
+ Document doc = parser.parse(new InputSource(new StringReader(xml)));
+ return doc.getDocumentElement();
+ }
+}
Deleted: tags/jsptest-0.17/jsptest-generic/jsptest-compiler-api/pom.xml
===================================================================
--- trunk/jsptest-generic/jsptest-compiler-api/pom.xml 2008-04-14 12:41:31 UTC (rev 217)
+++ tags/jsptest-0.17/jsptest-generic/jsptest-compiler-api/pom.xml 2008-04-24 17:15:35 UTC (rev 226)
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-generic</artifactId>
- <version>0.16-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jsptest-compiler-api</artifactId>
- <version>0.16-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>Internal compiler API</name>
- <description>A common internal API for the different versions of JSP version-specific compilers.</description>
-</project>
Copied: tags/jsptest-0.17/jsptest-generic/jsptest-compiler-api/pom.xml (from rev 225, trunk/jsptest-generic/jsptest-compiler-api/pom.xml)
===================================================================
--- tags/jsptest-0.17/jsptest-generic/jsptest-compiler-api/pom.xml (rev 0)
+++ tags/jsptest-0.17/jsptest-generic/jsptest-compiler-api/pom.xml 2008-04-24 17:15:35 UTC (rev 226)
@@ -0,0 +1,14 @@
+<?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.17</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jsptest-compiler-api</artifactId>
+ <version>0.17</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>
Deleted: tags/jsptest-0.17/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-04-14 12:41:31 UTC (rev 217)
+++ tags/jsptest-0.17/jsptest-generic/jsptest-compiler-api/src/main/java/net/sf/jsptest/compiler/api/JspExecution.java 2008-04-24 17:15:35 UTC (rev 226)
@@ -1,8 +0,0 @@
-package net.sf.jsptest.compiler.api;
-
-import java.io.File;
-
-public interface JspExecution {
-
- File getRenderedResponse();
-}
Copied: tags/jsptest-0.17/jsptest-generic/jsptest-compiler-api/src/main/java/net/sf/jsptest/compiler/api/JspExecution.java (from rev 222, trunk/jsptest-generic/jsptest-compiler-api/src/main/java/net/sf/jsptest/compiler/api/JspExecution.java)
===================================================================
--- tags/jsptest-0.17/jsptest-generic/jsptest-compiler-api/src/main/java/net/sf/jsptest/compiler/api/JspExecution.java (rev 0)
+++ tags/jsptest-0.17/jsptest-generic/jsptest-compiler-api/src/main/java/net/sf/jsptest/compiler/api/JspExecution.java 2008-04-24 17:15:35 UTC (rev 226)
@@ -0,0 +1,6 @@
+package net.sf.jsptest.compiler.api;
+
+public interface JspExecution {
+
+ String getRenderedResponse();
+}
Deleted: tags/jsptest-0.17/jsptest-generic/jsptest-framework/pom.xml
===================================================================
--- trunk/jsptest-generic/jsptest-framework/pom.xml 2008-04-14 12:41:31 UTC (rev 217)
+++ tags/jsptest-0.17/jsptest-generic/jsptest-framework/pom.xml 2008-04-24 17:15:35 UTC (rev 226)
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-generic</artifactId>
- <version>0.16-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jsptest-framework</artifactId>
- <version>0.16-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.16-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-common</artifactId>
- <version>0.16-SNAPSHOT</version>
- </dependency>
- </dependencies>
-</project>
Copied: tags/jsptest-0.17/jsptest-generic/jsptest-framework/pom.xml (from rev 225, trunk/jsptest-generic/jsptest-framework/pom.xml)
===================================================================
--- tags/jsptest-0.17/jsptest-generic/jsptest-framework/pom.xml (rev 0)
+++ tags/jsptest-0.17/jsptest-generic/jsptest-framework/pom.xml 2008-04-24 17:15:35 UTC (rev 226)
@@ -0,0 +1,26 @@
+<?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.17</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jsptest-framework</artifactId>
+ <version>0.17</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.17</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.jsptest</groupId>
+ <artifactId>jsptest-common</artifactId>
+ <version>0.17</version>
+ </dependency>
+ </dependencies>
+</project>
Deleted: tags/jsptest-0.17/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest...
[truncated message content] |
|
From: <lko...@us...> - 2008-04-24 17:14:26
|
Revision: 225
http://jsptest.svn.sourceforge.net/jsptest/?rev=225&view=rev
Author: lkoskela
Date: 2008-04-24 10:14:17 -0700 (Thu, 24 Apr 2008)
Log Message:
-----------
[maven-release-plugin] prepare release jsptest-0.17
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:12:17 UTC (rev 224)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml 2008-04-24 17:14:17 UTC (rev 225)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-acceptance</artifactId>
- <version>0.17-SNAPSHOT</version>
+ <version>0.17</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:12:17 UTC (rev 224)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml 2008-04-24 17:14:17 UTC (rev 225)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-acceptance</artifactId>
- <version>0.17-SNAPSHOT</version>
+ <version>0.17</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:12:17 UTC (rev 224)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml 2008-04-24 17:14:17 UTC (rev 225)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-acceptance</artifactId>
- <version>0.17-SNAPSHOT</version>
+ <version>0.17</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-acceptance-jsp21</artifactId>
- <version>0.17-SNAPSHOT</version>
+ <version>0.17</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:12:17 UTC (rev 224)
+++ trunk/jsptest-acceptance/pom.xml 2008-04-24 17:14:17 UTC (rev 225)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.17-SNAPSHOT</version>
+ <version>0.17</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:12:17 UTC (rev 224)
+++ trunk/jsptest-generic/jsptest-common/pom.xml 2008-04-24 17:14:17 UTC (rev 225)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-generic</artifactId>
- <version>0.17-SNAPSHOT</version>
+ <version>0.17</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-common</artifactId>
- <version>0.17-SNAPSHOT</version>
+ <version>0.17</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:12:17 UTC (rev 224)
+++ trunk/jsptest-generic/jsptest-compiler-api/pom.xml 2008-04-24 17:14:17 UTC (rev 225)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-generic</artifactId>
- <version>0.17-SNAPSHOT</version>
+ <version>0.17</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-compiler-api</artifactId>
- <version>0.17-SNAPSHOT</version>
+ <version>0.17</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:12:17 UTC (rev 224)
+++ trunk/jsptest-generic/jsptest-framework/pom.xml 2008-04-24 17:14:17 UTC (rev 225)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-generic</artifactId>
- <version>0.17-SNAPSHOT</version>
+ <version>0.17</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-framework</artifactId>
- <version>0.17-SNAPSHOT</version>
+ <version>0.17</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-SNAPSHOT</version>
+ <version>0.17</version>
</dependency>
<dependency>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-common</artifactId>
- <version>0.17-SNAPSHOT</version>
+ <version>0.17</version>
</dependency>
</dependencies>
</project>
Modified: trunk/jsptest-generic/pom.xml
===================================================================
--- trunk/jsptest-generic/pom.xml 2008-04-24 17:12:17 UTC (rev 224)
+++ trunk/jsptest-generic/pom.xml 2008-04-24 17:14:17 UTC (rev 225)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.17-SNAPSHOT</version>
+ <version>0.17</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-generic</artifactId>
- <version>0.17-SNAPSHOT</version>
+ <version>0.17</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:12:17 UTC (rev 224)
+++ trunk/jsptest-jsp12/pom.xml 2008-04-24 17:14:17 UTC (rev 225)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.17-SNAPSHOT</version>
+ <version>0.17</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:12:17 UTC (rev 224)
+++ trunk/jsptest-jsp20/pom.xml 2008-04-24 17:14:17 UTC (rev 225)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.17-SNAPSHOT</version>
+ <version>0.17</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:12:17 UTC (rev 224)
+++ trunk/jsptest-jsp21/pom.xml 2008-04-24 17:14:17 UTC (rev 225)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.17-SNAPSHOT</version>
+ <version>0.17</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-jsp21</artifactId>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2008-04-24 17:12:17 UTC (rev 224)
+++ trunk/pom.xml 2008-04-24 17:14:17 UTC (rev 225)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.17-SNAPSHOT</version>
+ <version>0.17</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.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>
</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-04-24 17:12:25
|
Revision: 224
http://jsptest.svn.sourceforge.net/jsptest/?rev=224&view=rev
Author: lkoskela
Date: 2008-04-24 10:12:17 -0700 (Thu, 24 Apr 2008)
Log Message:
-----------
Replaced JDK 1.5 API calls with JDK 1.4 compliant implementations
Modified Paths:
--------------
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/XML.java
trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/assertion/DOMAssertion.java
trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/TestHtmlTestCaseElementAssertions.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/mock/MockHttpServletRequest.java
Added Paths:
-----------
trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/Strings.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
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-16 20:12:52 UTC (rev 223)
+++ trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/Path.java 2008-04-24 17:12:17 UTC (rev 224)
@@ -73,7 +73,7 @@
String prefix = "jar:file:";
if (url.startsWith(prefix)) {
String file = url.substring(prefix.length());
- if (file.contains("!")) {
+ if (file.indexOf("!") > -1) {
file = file.substring(0, file.indexOf('!'));
}
add(new File(file));
Added: 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 (rev 0)
+++ trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/Strings.java 2008-04-24 17:12:17 UTC (rev 224)
@@ -0,0 +1,18 @@
+package net.sf.jsptest.utils;
+
+public class Strings {
+
+ 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-04-16 20:12:52 UTC (rev 223)
+++ trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/XML.java 2008-04-24 17:12:17 UTC (rev 224)
@@ -10,23 +10,39 @@
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;
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++) {
+ Node child = children.item(i);
+ if (child.getNodeType() == Node.ELEMENT_NODE) {
+ textContent.append(textContentOf((Element) child));
+ } else {
+ textContent.append(child.getNodeValue().trim());
+ }
+ }
+ return textContent.toString();
+ }
}
Added: 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 (rev 0)
+++ trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/StringsTest.java 2008-04-24 17:12:17 UTC (rev 224)
@@ -0,0 +1,35 @@
+package net.sf.jsptest.utils;
+
+import junit.framework.TestCase;
+
+public class StringsTest extends TestCase {
+
+ public void testReplacingNonexistentNeedle() throws Exception {
+ assertEquals("no such thing here", Strings.replace(
+ "no such thing here", "needle", "foo"));
+ }
+
+ public void testReplacingOneInstance() throws Exception {
+ assertEquals("Macs are cool", Strings.replace("what are cool", "what",
+ "Macs"));
+ }
+
+ public void testReplacingMultipleInstances() throws Exception {
+ assertEquals("Macs and Macs are cool", Strings.replace(
+ "what and what are cool", "what", "Macs"));
+ }
+
+ public void testReplacingWithTheSameValue() throws Exception {
+ assertEquals("abcabcabc", Strings.replace("abcabcabc", "bc", "bc"));
+ }
+
+ public void testReplacingWithSomethingThatContainsTheSameValue()
+ throws Exception {
+ assertEquals("a_bc_a_bc_a_bc_", Strings.replace("abcabcabc", "bc",
+ "_bc_"));
+ }
+
+ public void testReplacingEmptyStrings() throws Exception {
+ assertEquals("", Strings.replace("", "", ""));
+ }
+}
Added: 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 (rev 0)
+++ trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/XMLTest.java 2008-04-24 17:12:17 UTC (rev 224)
@@ -0,0 +1,43 @@
+package net.sf.jsptest.utils;
+
+import java.io.StringReader;
+
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+
+import junit.framework.TestCase;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.xml.sax.InputSource;
+
+public class XMLTest extends TestCase {
+
+ public void testCollectingTextContentForEmptyElement() throws Exception {
+ Element element = parse("<root></root>");
+ assertEquals("", XML.textContentOf(element));
+ }
+
+ public void testCollectingTextContentForNonEmptyElement() throws Exception {
+ Element element = parse("<parent>text</parent>");
+ assertEquals("text", XML.textContentOf(element));
+ }
+
+ public void testCollectingTextContentElementWithChildren() throws Exception {
+ Element element = parse("<parent>parent<child>child</child></parent>");
+ assertEquals("parentchild", XML.textContentOf(element));
+ }
+
+ public void testWhitespaceBetweenTextNodesIsRemoved() throws Exception {
+ Element element = parse("<parent>\n parent\n <child>\n child\n </child>\n</parent>");
+ assertEquals("parentchild", XML.textContentOf(element));
+ }
+
+ private Element parse(String xmlSnippet) throws Exception {
+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ DocumentBuilder parser = dbf.newDocumentBuilder();
+ String xml = "<?xml version='1.0'?>\n" + xmlSnippet;
+ Document doc = parser.parse(new InputSource(new StringReader(xml)));
+ return doc.getDocumentElement();
+ }
+}
Modified: 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/DOMAssertion.java 2008-04-16 20:12:52 UTC (rev 223)
+++ trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/assertion/DOMAssertion.java 2008-04-24 17:12:17 UTC (rev 224)
@@ -32,7 +32,7 @@
* The (partial) content that should be found.
*/
public void shouldContain(String text) {
- assertContains(context.getTextContent(), text);
+ assertContains(XML.textContentOf(context), text);
}
/**
@@ -42,7 +42,7 @@
* The (partial) content that should not be found.
*/
public void shouldNotContain(String text) {
- assertDoesNotContain(context.getTextContent(), text);
+ assertDoesNotContain(XML.textContentOf(context), text);
}
/**
Modified: trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/TestHtmlTestCaseElementAssertions.java
===================================================================
--- trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/TestHtmlTestCaseElementAssertions.java 2008-04-16 20:12:52 UTC (rev 223)
+++ trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/TestHtmlTestCaseElementAssertions.java 2008-04-24 17:12:17 UTC (rev 224)
@@ -18,6 +18,8 @@
import junit.framework.AssertionFailedError;
+import net.sf.jsptest.utils.XML;
+
import org.w3c.dom.Element;
/**
@@ -102,6 +104,6 @@
Element element = testcase.element("//P[@CLASS='p2']")
.getElement();
assertNotNull(element);
- assertEquals("this is p2", element.getTextContent());
+ assertEquals("this is p2", XML.textContentOf(element));
}
}
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-04-16 20:12:52 UTC (rev 223)
+++ trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperCompiler.java 2008-04-24 17:12:17 UTC (rev 224)
@@ -39,6 +39,7 @@
import net.sf.jsptest.compiler.jsp20.mock.MockServletConfig;
import net.sf.jsptest.compiler.jsp20.mock.MockTagInfo;
import net.sf.jsptest.utils.Path;
+import net.sf.jsptest.utils.Strings;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -376,7 +377,7 @@
}
private void resolveClassFileLocation(JspCompilationInfo info) {
- String file = info.getJavaSource().replace(".java", ".class");
+ String file = Strings.replace(info.getJavaSource(), ".java", ".class");
info.setClassFile(file);
}
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-04-16 20:12:52 UTC (rev 223)
+++ trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockHttpServletRequest.java 2008-04-24 17:12:17 UTC (rev 224)
@@ -318,7 +318,7 @@
}
public String toString() {
- StringBuilder buffer = new StringBuilder();
+ StringBuffer buffer = new StringBuffer();
buffer.append(getClass().getName()).append("{");
Enumeration enumeration = getParameterNames();
while (enumeration.hasMoreElements()) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lko...@us...> - 2008-04-16 20:12:55
|
Revision: 223
http://jsptest.svn.sourceforge.net/jsptest/?rev=223&view=rev
Author: lkoskela
Date: 2008-04-16 13:12:52 -0700 (Wed, 16 Apr 2008)
Log Message:
-----------
Formatting and minor refactoring
Modified Paths:
--------------
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
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-16 18:05:56 UTC (rev 222)
+++ trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/CommandLineJavac.java 2008-04-16 20:12:52 UTC (rev 223)
@@ -28,73 +28,73 @@
*/
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();
- 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-04-16 18:05:56 UTC (rev 222)
+++ trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/JavaCompiler.java 2008-04-16 20:12:52 UTC (rev 223)
@@ -23,26 +23,25 @@
*/
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.
- */
- public abstract 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.
- */
- public abstract boolean isAvailable();
+ /**
+ * Indicates whether this Java compiler implementation is available on the
+ * current system.
+ */
+ boolean isAvailable();
}
\ No newline at end of file
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-16 18:05:56 UTC (rev 222)
+++ trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/compiler/java/SunJavaC.java 2008-04-16 20:12:52 UTC (rev 223)
@@ -6,65 +6,75 @@
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);
- return ((Integer)compilerMethod.invoke(compilerClass.newInstance(), new Object[] { args })).intValue() == 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();
- 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 {
- Class c = getCompileClass();
- resolveCompilerMethod(c);
- 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[] {}).getClass() });
- }
+ private Method resolveCompilerMethod(Class compilerClass)
+ throws NoSuchMethodException {
+ return compilerClass.getMethod("compile", new Class[] { (new String[0])
+ .getClass() });
+ }
- private Class getCompileClass() throws ClassNotFoundException {
- Class c = Class.forName("com.sun.tools.javac.Main");
- return c;
- }
+ private Class getCompileClass() throws ClassNotFoundException {
+ return Class.forName("com.sun.tools.javac.Main");
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lko...@us...> - 2008-04-16 18:05:58
|
Revision: 222
http://jsptest.svn.sourceforge.net/jsptest/?rev=222&view=rev
Author: lkoskela
Date: 2008-04-16 11:05:56 -0700 (Wed, 16 Apr 2008)
Log Message:
-----------
No longer writing the rendering output into a temp file
Modified Paths:
--------------
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/test/java/net/sf/jsptest/compiler/dummy/FakeJspCompiler.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/test/java/net/sf/jsptest/compiler/jsp20/TestJspImpl.java
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-04-16 17:56:48 UTC (rev 221)
+++ trunk/jsptest-generic/jsptest-compiler-api/src/main/java/net/sf/jsptest/compiler/api/JspExecution.java 2008-04-16 18:05:56 UTC (rev 222)
@@ -1,8 +1,6 @@
package net.sf.jsptest.compiler.api;
-import java.io.File;
-
public interface JspExecution {
- File getRenderedResponse();
+ String getRenderedResponse();
}
Modified: trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/HtmlTestCase.java
===================================================================
--- trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/HtmlTestCase.java 2008-04-16 17:56:48 UTC (rev 221)
+++ trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/HtmlTestCase.java 2008-04-16 18:05:56 UTC (rev 222)
@@ -19,6 +19,7 @@
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
+import java.io.IOException;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -29,6 +30,7 @@
import net.sf.jsptest.assertion.FormAssertion;
import net.sf.jsptest.assertion.NameChooser;
import net.sf.jsptest.assertion.PageAssertion;
+import net.sf.jsptest.utils.IO;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -43,118 +45,117 @@
*/
public abstract class HtmlTestCase extends JspTestCase {
- private Document renderedDocument;
+ private Document renderedDocument;
- private String renderedDocumentPath;
+ private String renderedDocumentPath;
- private Tidy tidy;
+ private Tidy tidy;
- private DocumentBuilder documentBuilder;
+ private DocumentBuilder documentBuilder;
- /**
- * Simulate an HTTP request to a JSP, parsing the rendered output as HTML.
- *
- * @param path
- * The path to the JSP to execute.
- * @param httpMethod
- * "GET" or "POST".
- */
- protected void request(String path, String httpMethod)
- throws Exception {
- super.request(path, httpMethod);
- parseRenderedHtml();
- }
+ /**
+ * Simulate an HTTP request to a JSP, parsing the rendered output as HTML.
+ *
+ * @param path
+ * The path to the JSP to execute.
+ * @param httpMethod
+ * "GET" or "POST".
+ */
+ protected void request(String path, String httpMethod) throws Exception {
+ super.request(path, httpMethod);
+ parseRenderedHtml();
+ }
- /**
- * Returns the rendered HTML as an <tt>org.w3c.dom.Document</tt>.
- */
- protected Document getRenderedHtml() {
- return renderedDocument;
- }
+ /**
+ * Returns the rendered HTML as an <tt>org.w3c.dom.Document</tt>.
+ */
+ protected Document getRenderedHtml() {
+ return renderedDocument;
+ }
- /**
- * Returns the path to the rendered (and pretty-printed) HTML document.
- */
- protected String getRenderedHtmlPath() {
- return renderedDocumentPath;
- }
+ /**
+ * Returns the path to the rendered (and pretty-printed) HTML document.
+ */
+ protected String getRenderedHtmlPath() {
+ return renderedDocumentPath;
+ }
- private void parseRenderedHtml() {
- File original = getRenderedResponse();
- File tidyHtml = new File(original.getAbsolutePath()
- + ".tidy.html");
- parseRenderedOutput(original, tidyHtml);
- }
+ private void parseRenderedHtml() {
+ try {
+ File original = File.createTempFile("renderedHtml", ".html");
+ IO.write(getRenderedResponse(), original);
+ File tidyHtml = new File(original.getAbsolutePath() + ".tidy.html");
+ parseRenderedOutput(original, tidyHtml);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
- private void parseRenderedOutput(File html, File prettyPrinted) {
- try {
- configureTidy().parse(new FileInputStream(html),
- new FileOutputStream(prettyPrinted));
- DocumentBuilder db = configureDocumentBuilder();
- renderedDocument = db.parse(prettyPrinted);
- renderedDocumentPath = prettyPrinted.getAbsolutePath();
- } catch (Throwable e) {
- throw new RuntimeException(e.getMessage() + " ("
- + html.getAbsolutePath() + ")", e);
- }
- }
+ private void parseRenderedOutput(File html, File prettyPrinted) {
+ try {
+ configureTidy().parse(new FileInputStream(html),
+ new FileOutputStream(prettyPrinted));
+ DocumentBuilder db = configureDocumentBuilder();
+ renderedDocument = db.parse(prettyPrinted);
+ renderedDocumentPath = prettyPrinted.getAbsolutePath();
+ } catch (Throwable e) {
+ throw new RuntimeException(e.getMessage() + " ("
+ + html.getAbsolutePath() + ")", e);
+ }
+ }
- private synchronized DocumentBuilder configureDocumentBuilder()
- throws ParserConfigurationException {
- if (documentBuilder == null) {
- DocumentBuilderFactory dbf = DocumentBuilderFactory
- .newInstance();
- documentBuilder = dbf.newDocumentBuilder();
- }
- return documentBuilder;
- }
+ private synchronized DocumentBuilder configureDocumentBuilder()
+ throws ParserConfigurationException {
+ if (documentBuilder == null) {
+ DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+ documentBuilder = dbf.newDocumentBuilder();
+ }
+ return documentBuilder;
+ }
- private synchronized Tidy configureTidy() {
- if (tidy == null) {
- tidy = new Tidy();
- tidy.setMakeClean(true);
- tidy.setXmlOut(true);
- tidy.setTidyMark(false);
- tidy.setQuiet(true);
- tidy.setShowWarnings(false);
- tidy.setUpperCaseTags(true);
- tidy.setUpperCaseAttrs(true);
- }
- return tidy;
- }
+ private synchronized Tidy configureTidy() {
+ if (tidy == null) {
+ tidy = new Tidy();
+ tidy.setMakeClean(true);
+ tidy.setXmlOut(true);
+ tidy.setTidyMark(false);
+ tidy.setQuiet(true);
+ tidy.setShowWarnings(false);
+ tidy.setUpperCaseTags(true);
+ tidy.setUpperCaseAttrs(true);
+ }
+ return tidy;
+ }
- /**
- * Returns a handle for making assertions about the specified HTML form.
- */
- public FormAssertion form(String name) {
- return new FormAssertion(getRenderedHtml(), new NameChooser(
- name));
- }
+ /**
+ * Returns a handle for making assertions about the specified HTML form.
+ */
+ public FormAssertion form(String name) {
+ return new FormAssertion(getRenderedHtml(), new NameChooser(name));
+ }
- /**
- * Returns a handle for making assertions about an HTML form.
- */
- public FormAssertion form() {
- return new FormAssertion(getRenderedHtml(),
- new ElementChooser() {
- public boolean accept(Element element) {
- return true;
- }
- });
- }
+ /**
+ * Returns a handle for making assertions about an HTML form.
+ */
+ public FormAssertion form() {
+ return new FormAssertion(getRenderedHtml(), new ElementChooser() {
+ public boolean accept(Element element) {
+ return true;
+ }
+ });
+ }
- /**
- * Returns a handle for making assertions about the rendered HTML page.
- */
- public PageAssertion page() {
- return new PageAssertion(getRenderedHtml());
- }
+ /**
+ * Returns a handle for making assertions about the rendered HTML page.
+ */
+ public PageAssertion page() {
+ return new PageAssertion(getRenderedHtml());
+ }
- /**
- * Returns a handle for making assertions about the specified HTML element.
- */
- public ElementAssertion element(String xpathExpression) {
- return new ElementAssertion(getRenderedHtml(),
- xpathExpression);
- }
+ /**
+ * Returns a handle for making assertions about the specified HTML element.
+ */
+ public ElementAssertion element(String xpathExpression) {
+ return new ElementAssertion(getRenderedHtml(), xpathExpression);
+ }
}
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-04-16 17:56:48 UTC (rev 221)
+++ trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/JspTestCase.java 2008-04-16 18:05:56 UTC (rev 222)
@@ -17,20 +17,18 @@
package net.sf.jsptest;
import java.io.File;
-import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import org.apache.log4j.Logger;
-
import junit.framework.TestCase;
import net.sf.jsptest.assertion.OutputAssertion;
import net.sf.jsptest.compiler.api.Jsp;
import net.sf.jsptest.compiler.api.JspCompiler;
import net.sf.jsptest.compiler.api.JspCompilerFactory;
import net.sf.jsptest.compiler.api.JspExecution;
-import net.sf.jsptest.utils.IO;
+import org.apache.log4j.Logger;
+
/**
* An abstract base class to be extended by the user. The <tt>JspTestCase</tt>
* class provides a facility for rendering a JSP and a set of assertion methods
@@ -40,150 +38,142 @@
*/
public abstract class JspTestCase extends TestCase {
- private Logger log;
+ private Logger log;
- private Map requestAttributes;
+ private Map requestAttributes;
- private Map sessionAttributes;
+ private Map sessionAttributes;
- private Map substituteTaglibs;
+ private Map substituteTaglibs;
- private JspExecution execution;
+ private JspExecution execution;
- public JspTestCase() {
- log = Logger.getLogger(getClass());
- }
+ public JspTestCase() {
+ log = Logger.getLogger(getClass());
+ }
- /**
- * The standard JUnit <tt>setUp()</tt> method. <b>Remember to invoke
- * <tt>super.setUp()</tt> if you override this!</b>
- */
- protected void setUp() throws Exception {
- requestAttributes = new HashMap();
- sessionAttributes = new HashMap();
- substituteTaglibs = new HashMap();
- }
+ /**
+ * The standard JUnit <tt>setUp()</tt> method. <b>Remember to invoke
+ * <tt>super.setUp()</tt> if you override this!</b>
+ */
+ protected void setUp() throws Exception {
+ requestAttributes = new HashMap();
+ sessionAttributes = new HashMap();
+ substituteTaglibs = new HashMap();
+ }
- /**
- * Override this method to tell the JSP compiler where the "web" files are
- * located. Defaults to the current working directory.
- */
- protected String getWebRoot() {
- return ".";
- }
+ /**
+ * Override this method to tell the JSP compiler where the "web" files are
+ * located. Defaults to the current working directory.
+ */
+ protected String getWebRoot() {
+ return ".";
+ }
- /**
- * Sets a session attribute for the current session.
- *
- * @param attribute
- * Name of the attribute.
- * @param value
- * Value for the attribute.
- */
- protected void setSessionAttribute(String attribute, Object value) {
- sessionAttributes.put(attribute, value);
- }
+ /**
+ * Sets a session attribute for the current session.
+ *
+ * @param attribute
+ * Name of the attribute.
+ * @param value
+ * Value for the attribute.
+ */
+ protected void setSessionAttribute(String attribute, Object value) {
+ sessionAttributes.put(attribute, value);
+ }
- /**
- * Sets a request attribute for the next request.
- *
- * @param attribute
- * Name of the attribute.
- * @param value
- * Value for the attribute.
- */
- protected void setRequestAttribute(String attribute, Object value) {
- requestAttributes.put(attribute, value);
- }
+ /**
+ * Sets a request attribute for the next request.
+ *
+ * @param attribute
+ * Name of the attribute.
+ * @param value
+ * Value for the attribute.
+ */
+ protected void setRequestAttribute(String attribute, Object value) {
+ requestAttributes.put(attribute, value);
+ }
- /**
- * Simulate a HTTP GET request to the specified JSP file.
- *
- * @param path
- * The JSP file to render. The path should start with a "/"
- * and is interpreted to be relative to the web root
- * specified by <tt>getWebRoot</tt>.
- */
- protected void get(String path) throws Exception {
- request(path, "GET");
- }
+ /**
+ * Simulate a HTTP GET request to the specified JSP file.
+ *
+ * @param path
+ * The JSP file to render. The path should start with a "/" and
+ * is interpreted to be relative to the web root specified by
+ * <tt>getWebRoot</tt>.
+ */
+ protected void get(String path) throws Exception {
+ request(path, "GET");
+ }
- /**
- * Simulate a HTTP POST request to the specified JSP file.
- *
- * @param path
- * The JSP file to render. The path should start with a "/"
- * and is interpreted to be relative to the web root
- * specified by <tt>getWebRoot</tt>.
- */
- protected void post(String path) throws Exception {
- request(path, "POST");
- }
+ /**
+ * Simulate a HTTP POST request to the specified JSP file.
+ *
+ * @param path
+ * The JSP file to render. The path should start with a "/" and
+ * is interpreted to be relative to the web root specified by
+ * <tt>getWebRoot</tt>.
+ */
+ protected void post(String path) throws Exception {
+ request(path, "POST");
+ }
- /**
- * Simulate an HTTP request to a JSP.
- *
- * @param path
- * The path to the JSP to execute.
- * @param httpMethod
- * "GET" or "POST".
- */
- protected void request(String path, String httpMethod)
- throws Exception {
- validatePath(path);
- JspCompiler compiler = JspCompilerFactory.newInstance();
- log.debug("Using compiler " + compiler.getClass().getName()
- + " and webroot "
- + new File(getWebRoot()).getAbsolutePath());
- compiler.setWebRoot(getWebRoot());
- compiler.setOutputDirectory(getOutputDirectory());
- Jsp jsp = compiler.compile(path, substituteTaglibs);
- log.debug("Simulating a request to " + path);
- execution = jsp.request(httpMethod, requestAttributes,
- sessionAttributes);
- }
+ /**
+ * Simulate an HTTP request to a JSP.
+ *
+ * @param path
+ * The path to the JSP to execute.
+ * @param httpMethod
+ * "GET" or "POST".
+ */
+ protected void request(String path, String httpMethod) throws Exception {
+ validatePath(path);
+ JspCompiler compiler = JspCompilerFactory.newInstance();
+ log.debug("Using compiler " + compiler.getClass().getName()
+ + " and webroot " + new File(getWebRoot()).getAbsolutePath());
+ compiler.setWebRoot(getWebRoot());
+ compiler.setOutputDirectory(getOutputDirectory());
+ Jsp jsp = compiler.compile(path, substituteTaglibs);
+ log.debug("Simulating a request to " + path);
+ execution = jsp.request(httpMethod, requestAttributes,
+ sessionAttributes);
+ }
- private void validatePath(String path) {
- if (!path.startsWith("/")) {
- throw new IllegalArgumentException(
- "The JSP path must start with a \"/\"");
- }
- }
+ private void validatePath(String path) {
+ if (!path.startsWith("/")) {
+ throw new IllegalArgumentException(
+ "The JSP path must start with a \"/\"");
+ }
+ }
- private String getOutputDirectory() {
- return "target/jsptest";
- }
+ private String getOutputDirectory() {
+ return "target/jsptest";
+ }
- /**
- * Returns a handle to a file containing the rendered output.
- */
- protected File getRenderedResponse() {
- return execution.getRenderedResponse();
- }
+ /**
+ * Returns the rendered output.
+ */
+ protected String getRenderedResponse() {
+ return execution.getRenderedResponse();
+ }
- /**
- * Returns a handle for making assertions about the rendered content.
- */
- public OutputAssertion output() {
- try {
- return new OutputAssertion(IO
- .readToString(getRenderedResponse()));
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
+ /**
+ * Returns a handle for making assertions about the rendered content.
+ */
+ public OutputAssertion output() {
+ return new OutputAssertion(getRenderedResponse());
+ }
- /**
- * 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 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 substituteTaglib(String name, Class newImplementation) {
+ substituteTaglibs.put(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-04-16 17:56:48 UTC (rev 221)
+++ trunk/jsptest-generic/jsptest-framework/src/test/java/net/sf/jsptest/compiler/dummy/FakeJspCompiler.java 2008-04-16 18:05:56 UTC (rev 222)
@@ -1,71 +1,60 @@
package net.sf.jsptest.compiler.dummy;
-import java.io.File;
-import java.io.IOException;
import java.util.Map;
import net.sf.jsptest.compiler.api.Jsp;
import net.sf.jsptest.compiler.api.JspCompiler;
import net.sf.jsptest.compiler.api.JspExecution;
-import net.sf.jsptest.utils.IO;
public class FakeJspCompiler implements JspCompiler {
- private static StringBuffer fakedOutput = new StringBuffer(2000);
+ private static StringBuffer fakedOutput = new StringBuffer(2000);
- private static String lastCompiledPath;
+ private static String lastCompiledPath;
- private static String lastCompiledWebRoot;
+ private static String lastCompiledWebRoot;
- private String webRoot;
+ private String webRoot;
- public void setWebRoot(String directory) {
- this.webRoot = directory;
- }
+ public void setWebRoot(String directory) {
+ this.webRoot = directory;
+ }
- protected String getWebRoot() {
- return webRoot;
- }
+ protected String getWebRoot() {
+ return webRoot;
+ }
- public static void cleanOutput() {
- fakedOutput.setLength(0);
- }
+ public static void cleanOutput() {
+ fakedOutput.setLength(0);
+ }
- public static void appendOutput(String content) {
- fakedOutput.append(content);
- }
+ public static void appendOutput(String content) {
+ fakedOutput.append(content);
+ }
- public Jsp compile(String path, Map taglibs) {
- lastCompiledWebRoot = getWebRoot();
- lastCompiledPath = path;
- return new Jsp() {
- public JspExecution request(String httpMethod,
- Map requestAttributes, Map sessionAttributes) {
- return new JspExecution() {
- public File getRenderedResponse() {
- try {
- File file = File.createTempFile(
- "dummyOutput", ".html");
- file.deleteOnExit();
- IO.write(fakedOutput.toString(), file);
- return file;
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
- };
- }
- };
- }
+ public Jsp compile(String path, Map taglibs) {
+ lastCompiledWebRoot = getWebRoot();
+ lastCompiledPath = path;
+ return new Jsp() {
+ public JspExecution request(String httpMethod,
+ Map requestAttributes, Map sessionAttributes) {
+ return new JspExecution() {
+ public String getRenderedResponse() {
+ return fakedOutput.toString();
+ }
+ };
+ }
+ };
+ }
- public static String lastCompiledPath() {
- return lastCompiledPath;
- }
+ public static String lastCompiledPath() {
+ return lastCompiledPath;
+ }
- public static String lastCompiledWebRoot() {
- return lastCompiledWebRoot;
- }
+ public static String lastCompiledWebRoot() {
+ return lastCompiledWebRoot;
+ }
- public void setOutputDirectory(String directory) {
- }
+ public void setOutputDirectory(String directory) {
+ }
}
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-04-16 17:56:48 UTC (rev 221)
+++ trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JspExecutionImpl.java 2008-04-16 18:05:56 UTC (rev 222)
@@ -1,18 +1,16 @@
package net.sf.jsptest.compiler.jsp20;
-import java.io.File;
-
import net.sf.jsptest.compiler.api.JspExecution;
public class JspExecutionImpl implements JspExecution {
- private final File renderedOutput;
+ private final String renderedOutput;
- public JspExecutionImpl(File renderedOutput) {
- this.renderedOutput = renderedOutput;
- }
+ public JspExecutionImpl(String output) {
+ this.renderedOutput = output;
+ }
- public File getRenderedResponse() {
- return renderedOutput;
- }
+ public String getRenderedResponse() {
+ return 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-04-16 17:56:48 UTC (rev 221)
+++ trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JspImpl.java 2008-04-16 18:05:56 UTC (rev 222)
@@ -1,7 +1,5 @@
package net.sf.jsptest.compiler.jsp20;
-import java.io.File;
-import java.io.IOException;
import java.util.Map;
import javax.servlet.ServletConfig;
@@ -12,9 +10,6 @@
import javax.servlet.http.HttpSession;
import javax.servlet.jsp.JspFactory;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
import net.sf.jsptest.compiler.api.Jsp;
import net.sf.jsptest.compiler.api.JspExecution;
import net.sf.jsptest.compiler.jsp20.mock.MockHttpServletRequest;
@@ -25,137 +20,78 @@
import net.sf.jsptest.compiler.jsp20.mock.MockPageContext;
import net.sf.jsptest.compiler.jsp20.mock.MockServletConfig;
import net.sf.jsptest.compiler.jsp20.mock.MockServletContext;
-import net.sf.jsptest.utils.IO;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
public class JspImpl implements Jsp {
- private static final Log log = LogFactory.getLog(JspImpl.class);
+ private static final Log log = LogFactory.getLog(JspImpl.class);
- private final Class servletClass;
+ private final Class servletClass;
- private MockPageContext pageContext;
+ private MockPageContext pageContext;
- public JspImpl(Class servletClass) {
- this.servletClass = servletClass;
- }
+ public JspImpl(Class servletClass) {
+ this.servletClass = servletClass;
+ }
- public JspExecution request(String httpMethod,
- Map requestAttributes, Map sessionAttributes) {
- ServletContext servletContext = new MockServletContext();
- ServletConfig servletConfig = new MockServletConfig(
- servletContext);
+ public JspExecution request(String httpMethod, Map requestAttributes,
+ Map sessionAttributes) {
+ ServletContext servletContext = new MockServletContext();
+ ServletConfig servletConfig = new MockServletConfig(servletContext);
- MockHttpSession httpSession = new MockHttpSession();
- httpSession.setAttributes(sessionAttributes);
+ MockHttpSession httpSession = new MockHttpSession();
+ httpSession.setAttributes(sessionAttributes);
- MockHttpServletRequest request = new MockHttpServletRequest();
- request.setSession(httpSession);
- request.setMethod(httpMethod);
- request.setAttributes(requestAttributes);
+ MockHttpServletRequest request = new MockHttpServletRequest();
+ request.setSession(httpSession);
+ request.setMethod(httpMethod);
+ request.setAttributes(requestAttributes);
- MockHttpServletResponse response = new MockHttpServletResponse();
+ MockHttpServletResponse response = new MockHttpServletResponse();
- MockJspWriter jspWriter = configureJspFactory(servletContext,
- request, httpSession);
+ MockJspWriter jspWriter = configureJspFactory(servletContext, request,
+ httpSession);
- initializeAndInvokeJsp(servletClass, servletConfig, request,
- response);
+ initializeAndInvokeJsp(servletClass, servletConfig, request, response);
- return writeOutputToTempFile(jspWriter.getContents());
- }
+ return createExecutionResult(jspWriter.getContents());
+ }
- protected MockJspWriter configureJspFactory(
- ServletContext httpContext,
- HttpServletRequest httpRequest, HttpSession httpSession) {
- pageContext = new MockPageContext();
- pageContext.setRequest(httpRequest);
- pageContext.setServletContext(httpContext);
- pageContext.setSession(httpSession);
- MockJspWriter jspWriter = new MockJspWriter();
- pageContext.setJspWriter(jspWriter);
- JspFactory.setDefaultFactory(new MockJspFactory(pageContext));
- return jspWriter;
- }
+ protected MockJspWriter configureJspFactory(ServletContext httpContext,
+ HttpServletRequest httpRequest, HttpSession httpSession) {
+ pageContext = new MockPageContext();
+ pageContext.setRequest(httpRequest);
+ pageContext.setServletContext(httpContext);
+ pageContext.setSession(httpSession);
+ MockJspWriter jspWriter = new MockJspWriter();
+ pageContext.setJspWriter(jspWriter);
+ JspFactory.setDefaultFactory(new MockJspFactory(pageContext));
+ return jspWriter;
+ }
- protected void initializeAndInvokeJsp(Class jspClass,
- ServletConfig servletConfig, HttpServletRequest request,
- HttpServletResponse response) {
- try {
- log.debug("Instantiating Servlet: " + jspClass.getName());
- HttpServlet servlet = (HttpServlet) jspClass
- .newInstance();
- log.debug("Initializing Servlet: " + jspClass.getName());
- servlet.init(servletConfig);
- log.debug("Invoking Servlet: " + jspClass.getName());
- servlet.service(request, response);
- if (pageContext.getException() != null) {
- log.debug("An exception was stored into PageContext. Rethrowing it...");
- throw new RuntimeException(pageContext.getException());
- }
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
+ protected void initializeAndInvokeJsp(Class jspClass,
+ ServletConfig servletConfig, HttpServletRequest request,
+ HttpServletResponse response) {
+ try {
+ log.debug("Instantiating Servlet: " + jspClass.getName());
+ HttpServlet servlet = (HttpServlet) jspClass.newInstance();
+ log.debug("Initializing Servlet: " + jspClass.getName());
+ servlet.init(servletConfig);
+ log.debug("Invoking Servlet: " + jspClass.getName());
+ servlet.service(request, response);
+ if (pageContext.getException() != null) {
+ log
+ .debug("An exception was stored into PageContext. Rethrowing it...");
+ throw new RuntimeException(pageContext.getException());
+ }
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
- protected JspExecution writeOutputToTempFile(String output) {
- try {
- File temp = File.createTempFile("generated_html_",
- ".html");
- temp.createNewFile();
- log.debug("Writing " + output.length() + " bytes to "
- + temp.getAbsolutePath());
- IO.write(output, temp);
- return new JspExecutionImpl(temp);
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- // public JspExecution request(String httpMethod,
- // Map requestAttributes, Map sessionAttributes) {
- // try {
- // final File responseFile = File.createTempFile(
- // "jsptest-response", ".txt");
- // HttpServlet servlet = (HttpServlet) servletClass
- // .newInstance();
- // servlet.init(new MockServletConfig(
- // new MockServletContext()));
- //
- // ServletRequest request = createServletRequest(httpMethod,
- // requestAttributes, sessionAttributes);
- // ServletResponse response = createServletResponse(responseFile);
- //
- // servlet.service(request, response);
- //
- // response.flushBuffer();
- //
- // return createJspExecution(responseFile);
- // } catch (Exception e) {
- // throw new RuntimeException(e);
- // }
- // }
- //
- // protected JspExecution createJspExecution(final File responseFile) {
- // return new JspExecution() {
- // public File getRenderedResponse() {
- // return responseFile;
- // }
- // };
- // }
- //
- // protected ServletResponse createServletResponse(File output)
- // throws FileNotFoundException {
- // return new MockHttpServletResponse(output);
- // }
- //
- // private ServletRequest createServletRequest(String httpMethod,
- // Map requestAttributes, Map sessionAttributes) {
- // MockHttpSession session = new MockHttpSession();
- // session.setAttributes(sessionAttributes);
- // MockHttpServletRequest request = new MockHttpServletRequest();
- // request.setMethod(httpMethod);
- // request.setAttributes(requestAttributes);
- // request.setSession(session);
- // return request;
- // }
+ protected JspExecution createExecutionResult(String output) {
+ return new JspExecutionImpl(output);
+ }
}
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-04-16 17:56:48 UTC (rev 221)
+++ trunk/jsptest-jsp20/src/test/java/net/sf/jsptest/compiler/jsp20/TestJspImpl.java 2008-04-16 18:05:56 UTC (rev 222)
@@ -1,6 +1,5 @@
package net.sf.jsptest.compiler.jsp20;
-import java.io.File;
import java.io.IOException;
import java.util.Enumeration;
import java.util.HashMap;
@@ -57,7 +56,7 @@
}
}
- protected File responseFile;
+ protected String responseOutput;
private JspImpl jspImpl;
@@ -109,7 +108,7 @@
private void simulateRequest(String method) {
JspExecution execution = jspImpl.request(method, requestAttributes,
sessionAttributes);
- responseFile = execution.getRenderedResponse();
+ responseOutput = execution.getRenderedResponse();
}
private void assertOutputContains(String string) throws IOException {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lko...@us...> - 2008-04-16 17:56:54
|
Revision: 221
http://jsptest.svn.sourceforge.net/jsptest/?rev=221&view=rev
Author: lkoskela
Date: 2008-04-16 10:56:48 -0700 (Wed, 16 Apr 2008)
Log Message:
-----------
Formatting
Modified Paths:
--------------
trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/TestMockingTaglibs.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-04-14 13:18:06 UTC (rev 220)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/TestMockingTaglibs.java 2008-04-16 17:56:48 UTC (rev 221)
@@ -27,37 +27,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 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");
- }
+ public void testRenderingJspUsingCustomTaglibs() throws Exception {
+ substituteTaglib("custom", MockCustomTag.class);
+ get("/taglibs/custom-taglib.jsp");
+ output()
+ .shouldContain("This content is coming from the mock CustomTag");
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lko...@us...> - 2008-04-14 13:18:13
|
Revision: 220
http://jsptest.svn.sourceforge.net/jsptest/?rev=220&view=rev
Author: lkoskela
Date: 2008-04-14 06:18:06 -0700 (Mon, 14 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-14 13:17:46 UTC (rev 219)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml 2008-04-14 13:18:06 UTC (rev 220)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-acceptance</artifactId>
- <version>0.16</version>
+ <version>0.17-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-14 13:17:46 UTC (rev 219)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml 2008-04-14 13:18:06 UTC (rev 220)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-acceptance</artifactId>
- <version>0.16</version>
+ <version>0.17-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-14 13:17:46 UTC (rev 219)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml 2008-04-14 13:18:06 UTC (rev 220)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-acceptance</artifactId>
- <version>0.16</version>
+ <version>0.17-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-acceptance-jsp21</artifactId>
- <version>0.16</version>
+ <version>0.17-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-14 13:17:46 UTC (rev 219)
+++ trunk/jsptest-acceptance/pom.xml 2008-04-14 13:18:06 UTC (rev 220)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.16</version>
+ <version>0.17-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-14 13:17:46 UTC (rev 219)
+++ trunk/jsptest-generic/jsptest-common/pom.xml 2008-04-14 13:18:06 UTC (rev 220)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-generic</artifactId>
- <version>0.16</version>
+ <version>0.17-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-common</artifactId>
- <version>0.16</version>
+ <version>0.17-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-14 13:17:46 UTC (rev 219)
+++ trunk/jsptest-generic/jsptest-compiler-api/pom.xml 2008-04-14 13:18:06 UTC (rev 220)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-generic</artifactId>
- <version>0.16</version>
+ <version>0.17-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-compiler-api</artifactId>
- <version>0.16</version>
+ <version>0.17-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-14 13:17:46 UTC (rev 219)
+++ trunk/jsptest-generic/jsptest-framework/pom.xml 2008-04-14 13:18:06 UTC (rev 220)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-generic</artifactId>
- <version>0.16</version>
+ <version>0.17-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-framework</artifactId>
- <version>0.16</version>
+ <version>0.17-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.16</version>
+ <version>0.17-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-common</artifactId>
- <version>0.16</version>
+ <version>0.17-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Modified: trunk/jsptest-generic/pom.xml
===================================================================
--- trunk/jsptest-generic/pom.xml 2008-04-14 13:17:46 UTC (rev 219)
+++ trunk/jsptest-generic/pom.xml 2008-04-14 13:18:06 UTC (rev 220)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.16</version>
+ <version>0.17-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-generic</artifactId>
- <version>0.16</version>
+ <version>0.17-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-14 13:17:46 UTC (rev 219)
+++ trunk/jsptest-jsp12/pom.xml 2008-04-14 13:18:06 UTC (rev 220)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.16</version>
+ <version>0.17-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-14 13:17:46 UTC (rev 219)
+++ trunk/jsptest-jsp20/pom.xml 2008-04-14 13:18:06 UTC (rev 220)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.16</version>
+ <version>0.17-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-14 13:17:46 UTC (rev 219)
+++ trunk/jsptest-jsp21/pom.xml 2008-04-14 13:18:06 UTC (rev 220)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.16</version>
+ <version>0.17-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-jsp21</artifactId>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2008-04-14 13:17:46 UTC (rev 219)
+++ trunk/pom.xml 2008-04-14 13:18:06 UTC (rev 220)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.16</version>
+ <version>0.17-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.16</connection>
- <developerConnection>scm:svn:https://jsptest.svn.sourceforge.net/svnroot/jsptest/tags/jsptest-0.16</developerConnection>
- <url>http://jsptest.svn.sourceforge.net/viewvc/jsptest/tags/jsptest-0.16</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.
|
|
From: <lko...@us...> - 2008-04-14 13:17:52
|
Revision: 219
http://jsptest.svn.sourceforge.net/jsptest/?rev=219&view=rev
Author: lkoskela
Date: 2008-04-14 06:17:46 -0700 (Mon, 14 Apr 2008)
Log Message:
-----------
[maven-release-plugin] copy for tag jsptest-0.16
Added Paths:
-----------
tags/jsptest-0.16/
tags/jsptest-0.16/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml
tags/jsptest-0.16/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml
tags/jsptest-0.16/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml
tags/jsptest-0.16/jsptest-acceptance/pom.xml
tags/jsptest-0.16/jsptest-generic/jsptest-common/pom.xml
tags/jsptest-0.16/jsptest-generic/jsptest-compiler-api/pom.xml
tags/jsptest-0.16/jsptest-generic/jsptest-framework/pom.xml
tags/jsptest-0.16/jsptest-generic/pom.xml
tags/jsptest-0.16/jsptest-jsp12/pom.xml
tags/jsptest-0.16/jsptest-jsp20/pom.xml
tags/jsptest-0.16/jsptest-jsp21/pom.xml
tags/jsptest-0.16/pom.xml
Removed Paths:
-------------
tags/jsptest-0.16/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml
tags/jsptest-0.16/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml
tags/jsptest-0.16/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml
tags/jsptest-0.16/jsptest-acceptance/pom.xml
tags/jsptest-0.16/jsptest-generic/jsptest-common/pom.xml
tags/jsptest-0.16/jsptest-generic/jsptest-compiler-api/pom.xml
tags/jsptest-0.16/jsptest-generic/jsptest-framework/pom.xml
tags/jsptest-0.16/jsptest-generic/pom.xml
tags/jsptest-0.16/jsptest-jsp12/pom.xml
tags/jsptest-0.16/jsptest-jsp20/pom.xml
tags/jsptest-0.16/jsptest-jsp21/pom.xml
tags/jsptest-0.16/pom.xml
Copied: tags/jsptest-0.16 (from rev 217, trunk)
Deleted: tags/jsptest-0.16/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml
===================================================================
--- trunk/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml 2008-04-14 12:41:31 UTC (rev 217)
+++ tags/jsptest-0.16/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml 2008-04-14 13:17:46 UTC (rev 219)
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-acceptance</artifactId>
- <version>0.16-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jsptest-acceptance-jsp12</artifactId>
- <packaging>jar</packaging>
- <name>Acceptance tests for the JspTest variant for the JSP 1.2 specification.</name>
- <description />
- <dependencies>
- <dependency>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-jsp12</artifactId>
- </dependency>
- </dependencies>
-</project>
Copied: tags/jsptest-0.16/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml (from rev 218, trunk/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml)
===================================================================
--- tags/jsptest-0.16/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml (rev 0)
+++ tags/jsptest-0.16/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml 2008-04-14 13:17:46 UTC (rev 219)
@@ -0,0 +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-acceptance</artifactId>
+ <version>0.16</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>
Deleted: tags/jsptest-0.16/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml
===================================================================
--- trunk/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml 2008-04-14 12:41:31 UTC (rev 217)
+++ tags/jsptest-0.16/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml 2008-04-14 13:17:46 UTC (rev 219)
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-acceptance</artifactId>
- <version>0.16-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jsptest-acceptance-jsp20</artifactId>
- <packaging>jar</packaging>
- <name>Acceptance tests for the JspTest variant for the JSP 2.0 specification.</name>
- <description />
- <dependencies>
- <dependency>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-jsp20</artifactId>
- </dependency>
- </dependencies>
-</project>
Copied: tags/jsptest-0.16/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml (from rev 218, trunk/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml)
===================================================================
--- tags/jsptest-0.16/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml (rev 0)
+++ tags/jsptest-0.16/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml 2008-04-14 13:17:46 UTC (rev 219)
@@ -0,0 +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-acceptance</artifactId>
+ <version>0.16</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>
Deleted: tags/jsptest-0.16/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml
===================================================================
--- trunk/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml 2008-04-14 12:41:31 UTC (rev 217)
+++ tags/jsptest-0.16/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml 2008-04-14 13:17:46 UTC (rev 219)
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-acceptance</artifactId>
- <version>0.16-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jsptest-acceptance-jsp21</artifactId>
- <version>0.16-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>Acceptance tests for the JspTest variant for the JSP 2.1 specification.</name>
- <description />
- <dependencies>
- <dependency>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-jsp21</artifactId>
- </dependency>
- </dependencies>
-</project>
Copied: tags/jsptest-0.16/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml (from rev 218, trunk/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml)
===================================================================
--- tags/jsptest-0.16/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml (rev 0)
+++ tags/jsptest-0.16/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml 2008-04-14 13:17:46 UTC (rev 219)
@@ -0,0 +1,20 @@
+<?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.16</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jsptest-acceptance-jsp21</artifactId>
+ <version>0.16</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>
Deleted: tags/jsptest-0.16/jsptest-acceptance/pom.xml
===================================================================
--- trunk/jsptest-acceptance/pom.xml 2008-04-14 12:41:31 UTC (rev 217)
+++ tags/jsptest-0.16/jsptest-acceptance/pom.xml 2008-04-14 13:17:46 UTC (rev 219)
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest</artifactId>
- <version>0.16-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jsptest-acceptance</artifactId>
- <name>JspTest root project for acceptance test modules</name>
- <description>This POM acts as a virtual root for the acceptance test projects for different JSP specification variants of JspTest.</description>
- <packaging>pom</packaging>
- <modules>
- <module>jsptest-acceptance-jsp12</module>
- <module>jsptest-acceptance-jsp20</module>
- <module>jsptest-acceptance-jsp21</module>
- </modules>
-</project>
Copied: tags/jsptest-0.16/jsptest-acceptance/pom.xml (from rev 218, trunk/jsptest-acceptance/pom.xml)
===================================================================
--- tags/jsptest-0.16/jsptest-acceptance/pom.xml (rev 0)
+++ tags/jsptest-0.16/jsptest-acceptance/pom.xml 2008-04-14 13:17:46 UTC (rev 219)
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>net.sf.jsptest</groupId>
+ <artifactId>jsptest</artifactId>
+ <version>0.16</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jsptest-acceptance</artifactId>
+ <name>JspTest root project for acceptance test modules</name>
+ <description>This POM acts as a virtual root for the acceptance test projects for different JSP specification variants of JspTest.</description>
+ <packaging>pom</packaging>
+ <modules>
+ <module>jsptest-acceptance-jsp12</module>
+ <module>jsptest-acceptance-jsp20</module>
+ <module>jsptest-acceptance-jsp21</module>
+ </modules>
+</project>
Deleted: tags/jsptest-0.16/jsptest-generic/jsptest-common/pom.xml
===================================================================
--- trunk/jsptest-generic/jsptest-common/pom.xml 2008-04-14 12:41:31 UTC (rev 217)
+++ tags/jsptest-0.16/jsptest-generic/jsptest-common/pom.xml 2008-04-14 13:17:46 UTC (rev 219)
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-generic</artifactId>
- <version>0.16-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jsptest-common</artifactId>
- <version>0.16-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>Common utilities</name>
- <description>Common utilities for the components of JspTest, including the JSP version-specific compiler implementations.</description>
- <profiles>
- <profile>
- <id>default-tools.jar</id>
- <activation>
- <property>
- <name>java.vendor</name>
- <value>Sun Microsystems Inc.</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.sun</groupId>
- <artifactId>tools</artifactId>
- <version>1.4.2</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-</project>
Copied: tags/jsptest-0.16/jsptest-generic/jsptest-common/pom.xml (from rev 218, trunk/jsptest-generic/jsptest-common/pom.xml)
===================================================================
--- tags/jsptest-0.16/jsptest-generic/jsptest-common/pom.xml (rev 0)
+++ tags/jsptest-0.16/jsptest-generic/jsptest-common/pom.xml 2008-04-14 13:17:46 UTC (rev 219)
@@ -0,0 +1,34 @@
+<?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.16</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jsptest-common</artifactId>
+ <version>0.16</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>
Deleted: tags/jsptest-0.16/jsptest-generic/jsptest-compiler-api/pom.xml
===================================================================
--- trunk/jsptest-generic/jsptest-compiler-api/pom.xml 2008-04-14 12:41:31 UTC (rev 217)
+++ tags/jsptest-0.16/jsptest-generic/jsptest-compiler-api/pom.xml 2008-04-14 13:17:46 UTC (rev 219)
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-generic</artifactId>
- <version>0.16-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jsptest-compiler-api</artifactId>
- <version>0.16-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>Internal compiler API</name>
- <description>A common internal API for the different versions of JSP version-specific compilers.</description>
-</project>
Copied: tags/jsptest-0.16/jsptest-generic/jsptest-compiler-api/pom.xml (from rev 218, trunk/jsptest-generic/jsptest-compiler-api/pom.xml)
===================================================================
--- tags/jsptest-0.16/jsptest-generic/jsptest-compiler-api/pom.xml (rev 0)
+++ tags/jsptest-0.16/jsptest-generic/jsptest-compiler-api/pom.xml 2008-04-14 13:17:46 UTC (rev 219)
@@ -0,0 +1,14 @@
+<?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.16</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jsptest-compiler-api</artifactId>
+ <version>0.16</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>
Deleted: tags/jsptest-0.16/jsptest-generic/jsptest-framework/pom.xml
===================================================================
--- trunk/jsptest-generic/jsptest-framework/pom.xml 2008-04-14 12:41:31 UTC (rev 217)
+++ tags/jsptest-0.16/jsptest-generic/jsptest-framework/pom.xml 2008-04-14 13:17:46 UTC (rev 219)
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-generic</artifactId>
- <version>0.16-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jsptest-framework</artifactId>
- <version>0.16-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.16-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-common</artifactId>
- <version>0.16-SNAPSHOT</version>
- </dependency>
- </dependencies>
-</project>
Copied: tags/jsptest-0.16/jsptest-generic/jsptest-framework/pom.xml (from rev 218, trunk/jsptest-generic/jsptest-framework/pom.xml)
===================================================================
--- tags/jsptest-0.16/jsptest-generic/jsptest-framework/pom.xml (rev 0)
+++ tags/jsptest-0.16/jsptest-generic/jsptest-framework/pom.xml 2008-04-14 13:17:46 UTC (rev 219)
@@ -0,0 +1,26 @@
+<?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.16</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jsptest-framework</artifactId>
+ <version>0.16</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.16</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.jsptest</groupId>
+ <artifactId>jsptest-common</artifactId>
+ <version>0.16</version>
+ </dependency>
+ </dependencies>
+</project>
Deleted: tags/jsptest-0.16/jsptest-generic/pom.xml
===================================================================
--- trunk/jsptest-generic/pom.xml 2008-04-14 12:41:31 UTC (rev 217)
+++ tags/jsptest-0.16/jsptest-generic/pom.xml 2008-04-14 13:17:46 UTC (rev 219)
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest</artifactId>
- <version>0.16-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jsptest-generic</artifactId>
- <version>0.16-SNAPSHOT</version>
- <name>JspTest root project for the generic components</name>
- <description>This POM acts as a virtual root for the set of generic components that make up JspTest.</description>
- <packaging>pom</packaging>
- <modules>
- <module>jsptest-common</module>
- <module>jsptest-compiler-api</module>
- <module>jsptest-framework</module>
- </modules>
- <dependencies>
- <dependency>
- <groupId>jtidy</groupId>
- <artifactId>jtidy</artifactId>
- <version>4aug2000r7-dev</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.13</version>
- </dependency>
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>1.1.1</version>
- </dependency>
- </dependencies>
-</project>
Copied: tags/jsptest-0.16/jsptest-generic/pom.xml (from rev 218, trunk/jsptest-generic/pom.xml)
===================================================================
--- tags/jsptest-0.16/jsptest-generic/pom.xml (rev 0)
+++ tags/jsptest-0.16/jsptest-generic/pom.xml 2008-04-14 13:17:46 UTC (rev 219)
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>net.sf.jsptest</groupId>
+ <artifactId>jsptest</artifactId>
+ <version>0.16</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jsptest-generic</artifactId>
+ <version>0.16</version>
+ <name>JspTest root project for the generic components</name>
+ <description>This POM acts as a virtual root for the set of generic components that make up JspTest.</description>
+ <packaging>pom</packaging>
+ <modules>
+ <module>jsptest-common</module>
+ <module>jsptest-compiler-api</module>
+ <module>jsptest-framework</module>
+ </modules>
+ <dependencies>
+ <dependency>
+ <groupId>jtidy</groupId>
+ <artifactId>jtidy</artifactId>
+ <version>4aug2000r7-dev</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
+ </dependency>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ </dependencies>
+</project>
Deleted: tags/jsptest-0.16/jsptest-jsp12/pom.xml
===================================================================
--- trunk/jsptest-jsp12/pom.xml 2008-04-14 12:41:31 UTC (rev 217)
+++ tags/jsptest-0.16/jsptest-jsp12/pom.xml 2008-04-14 13:17:46 UTC (rev 219)
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest</artifactId>
- <version>0.16-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>
-</project>
Copied: tags/jsptest-0.16/jsptest-jsp12/pom.xml (from rev 218, trunk/jsptest-jsp12/pom.xml)
===================================================================
--- tags/jsptest-0.16/jsptest-jsp12/pom.xml (rev 0)
+++ tags/jsptest-0.16/jsptest-jsp12/pom.xml 2008-04-14 13:17:46 UTC (rev 219)
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>net.sf.jsptest</groupId>
+ <artifactId>jsptest</artifactId>
+ <version>0.16</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>
+</project>
Deleted: tags/jsptest-0.16/jsptest-jsp20/pom.xml
===================================================================
--- trunk/jsptest-jsp20/pom.xml 2008-04-14 12:41:31 UTC (rev 217)
+++ tags/jsptest-0.16/jsptest-jsp20/pom.xml 2008-04-14 13:17:46 UTC (rev 219)
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest</artifactId>
- <version>0.16-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>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
Copied: tags/jsptest-0.16/jsptest-jsp20/pom.xml (from rev 218, trunk/jsptest-jsp20/pom.xml)
===================================================================
--- tags/jsptest-0.16/jsptest-jsp20/pom.xml (rev 0)
+++ tags/jsptest-0.16/jsptest-jsp20/pom.xml 2008-04-14 13:17:46 UTC (rev 219)
@@ -0,0 +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.16</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>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Deleted: tags/jsptest-0.16/jsptest-jsp21/pom.xml
===================================================================
--- trunk/jsptest-jsp21/pom.xml 2008-04-14 12:41:31 UTC (rev 217)
+++ tags/jsptest-0.16/jsptest-jsp21/pom.xml 2008-04-14 13:17:46 UTC (rev 219)
@@ -1,36 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest</artifactId>
- <version>0.16-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>
-</project>
Copied: tags/jsptest-0.16/jsptest-jsp21/pom.xml (from rev 218, trunk/jsptest-jsp21/pom.xml)
===================================================================
--- tags/jsptest-0.16/jsptest-jsp21/pom.xml (rev 0)
+++ tags/jsptest-0.16/jsptest-jsp21/pom.xml 2008-04-14 13:17:46 UTC (rev 219)
@@ -0,0 +1,36 @@
+<?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.16</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>
+</project>
Deleted: tags/jsptest-0.16/pom.xml
===================================================================
--- trunk/pom.xml 2008-04-14 12:41:31 UTC (rev 217)
+++ tags/jsptest-0.16/pom.xml 2008-04-14 13:17:46 UTC (rev 219)
@@ -1,239 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest</artifactId>
- <version>0.16-SNAPSHOT</version>
- <name>JspTest root project</name>
- <description>This POM acts as a virtual root for the set of JSP version-specific combinations of the contained subprojects.</description>
- <packaging>pom</packaging>
- <url>http://jsptest.sourceforge.net</url>
- <inceptionYear>2006</inceptionYear>
- <organization>
- <name>JspTest developers</name>
- <url>http://jsptest.sourceforge.net</url>
- </organization>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
- <issueManagement>
- <system>sourceforge</system>
- <url>https://sourceforge.net/tracker/?group_id=164388</url>
- </issueManagement>
- <distributionManagement>
- <repository>
- <id>jsptest.sourceforge.net</id>
- <name>JspTest Maven2 repository at SourceForge</name>
- <url>scp://shell.sourceforge.net:/home/groups/j/js/jsptest/htdocs/maven2</url>
- </repository>
- </distributionManagement>
- <scm>
- <connection>scm:svn:https://jsptest.svn.sourceforge.net/svnroot/jsptest/tags/jsptest-0.11</connection>
- <developerConnection>scm:svn:https://jsptest.svn.sourceforge.net/svnroot/jsptest/tags/jsptest-0.11</developerConnection>
- <url>http://jsptest.svn.sourceforge.net/viewvc/jsptest/tags/jsptest-0.11</url>
- </scm>
- <mailingLists />
- <developers>
- <developer>
- <name>Lasse Koskela</name>
- <id>lkoskela</id>
- <email>lko...@us...</email>
- </developer>
- </developers>
- <modules>
- <module>jsptest-generic</module>
- <module>jsptest-jsp12</module>
- <module>jsptest-jsp20</module>
- <module>jsptest-jsp21</module>
- <module>jsptest-acceptance</module>
- </modules>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>sun.jdk</groupId>
- <artifactId>tools</artifactId>
- <version>1.4</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
- <dependency>
- <groupId>jtidy</groupId>
- <artifactId>jtidy</artifactId>
- <version>4aug2000r7-dev</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.13</version>
- </dependency>
- <dependency>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-jsp12</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-jsp20</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-jsp21</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-compiler-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-framework</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
- <build>
- <resources>
- <resource>
- <targetPath>/</targetPath>
- <filtering>false</filtering>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- </resources>
-<!-- define build plugins to be used (TODO: should this be moved to the jar POMs?) -->
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <fork>true</fork>
- <source>1.4</source>
- <target>1.4</target>
- </configuration>
- </plugin>
- <plugin>
- <inherited>true</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <minmemory>128m</minmemory>
- <maxmemory>256m</maxmemory>
- </configuration>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <inherited>true</inherited>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-sources</id>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <preparationGoals>clean install</preparationGoals>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/jsp12.xml</descriptor>
- <descriptor>src/main/assembly/jsp20.xml</descriptor>
- <descriptor>src/main/assembly/jsp21.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.3</version>
- <configuration>
- <includes>
- <include>**/*Test.java</include>
- <include>**/Test*.java</include>
- </includes>
- <testFailureIgnore>true</testFailureIgnore>
- <forkMode>once</forkMode>
- <useSystemClassLoader>true</useSystemClassLoader>
- <skip>false</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>surefire-report-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.0</version>
- </plugin>
- </plugins>
- </build>
- <reporting>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-project-info-reports-plugin</artifactId>
- <reportSets>
- <reportSet>
- <reports>
- <report>dependencies</report>
- <report>project-team</report>
- <report>mailing-list</report>
- <report>issue-tracking</report>
- <report>license</report>
- <report>scm</report>
- </reports>
- </reportSet>
- </reportSets>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>surefire-report-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>cobertura-maven-plugin</artifactId>
- <version>2.0</version>
- </plugin>
- </plugins>
- </reporting>
-</project>
Copied: tags/jsptest-0.16/pom.xml (from rev 218, trunk/pom.xml)
===================================================================
--- tags/jsptest-0.16/pom.xml (rev 0)
+++ tags/jsptest-0.16/pom.xml 2008-04-14 13:17:46 UTC (rev 219)
@@ -0,0 +1,239 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>net.sf.jsptest</groupId>
+ <artifactId>jsptest</artifactId>
+ <version>0.16</version>
+ <name>JspTest root project</name>
+ <description>This POM acts as a virtual root for the set of JSP version-specific combinations of the contained subprojects.</description>
+ <packaging>pom</packaging>
+ <url>http://jsptest.sourceforge.net</url>
+ <inceptionYear>2006</inceptionYear>
+ <organization>
+ <name>JspTest developers</name>
+ <url>http://jsptest.sourceforge.net</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <issueManagement>
+ <system>sourceforge</system>
+ <url>https://sourceforge.net/tracker/?group_id=164388</url>
+ </issueManagement>
+ <distributionManagement>
+ <repository>
+ <id>jsptest.sourceforge.net</id>
+ <name>JspTest Maven2 repository at SourceForge</name>
+ <url>scp://shell.sourceforge.net:/home/groups/j/js/jsptest/htdocs/maven2</url>
+ </repository>
+ </distributionManagement>
+ <scm>
+ <connection>scm:svn:https://jsptest.svn.sourceforge.net/svnroot/jsptest/tags/jsptest-0.16</connection>
+ <developerConnection>scm:svn:https://jsptest.svn.sourceforge.net/svnroot/jsptest/tags/jsptest-0.16</developerConnection>
+ <url>http://jsptest.svn.sourceforge.net/viewvc/jsptest/tags/jsptest-0.16</url>
+ </scm>
+ <mailingLists />
+ <developers>
+ <developer>
+ <name>Lasse Koskela</name>
+ <id>lkoskela</id>
+ <email>lko...@us...</email>
+ </developer>
+ </developers>
+ <modules>
+ <module>jsptest-generic</module>
+ <module>jsptest-jsp12</module>
+ <module>jsptest-jsp20</module>
+ <module>jsptest-jsp21</module>
+ <module>jsptest-acceptance</module>
+ </modules>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>sun.jdk</groupId>
+ <artifactId>tools</artifactId>
+ <version>1.4</version>
+ <scope>system</scope>
+ <systemPath>${java.home}/../lib/tools.jar</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>jtidy</groupId>
+ <artifactId>jtidy</artifactId>
+ <version>4aug2000r7-dev</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.jsptest</groupId>
+ <artifactId>jsptest-jsp12</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.jsptest</groupId>
+ <artifactId>jsptest-jsp20</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.jsptest</groupId>
+ <artifactId>jsptest-jsp21</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.jsptest</groupId>
+ <artifactId>jsptest-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.jsptest</groupId>
+ <artifactId>jsptest-compiler-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.jsptest</groupId>
+ <artifactId>jsptest-framework</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <build>
+ <resources>
+ <resource>
+ <targetPath>/</targetPath>
+ <filtering>false</filtering>
+ <directory>${basedir}/src/main/resources</directory>
+ </resource>
+ </resources>
+<!-- define build plugins to be used (TODO: should this be moved to the jar POMs?) -->
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <fork>true</fork>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <inherited>true</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <minmemory>128m</minmemory>
+ <maxmemory>256m</maxmemory>
+ </configuration>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <inherited>true</inherited>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-sources</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <preparationGoals>clean install</preparationGoals>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/jsp12.xml</descriptor>
+ <descriptor>src/main/assembly/jsp20.xml</descriptor>
+ <descriptor>src/main/assembly/jsp21.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <includes>
+ <include>**/*Test.java</include>
+ <include>**/Test*.java</include>
+ </includes>
+ <testFailureIgnore>true</testFailureIgnore>
+ <forkMode>once</forkMode>
+ <useSystemClassLoader>true</useSystemClassLoader>
+ <skip>false</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>surefire-report-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.0</version>
+ </plugin>
+ </plugins>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <reportSets>
+ <reportSet>
+ <reports>
+ <report>dependencies</report>
+ <report>project-team</report>
+ <report>mailing-list</report>
+ <report>issue-tracking</report>
+ <report>license</report>
+ <report>scm</report>
+ </reports>
+ </reportSet>
+ </reportSets>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>surefire-report-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>cobertura-maven-plugin</artifactId>
+ <version>2.0</version>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lko...@us...> - 2008-04-14 13:17:17
|
Revision: 218
http://jsptest.svn.sourceforge.net/jsptest/?rev=218&view=rev
Author: lkoskela
Date: 2008-04-14 06:17:15 -0700 (Mon, 14 Apr 2008)
Log Message:
-----------
[maven-release-plugin] prepare release jsptest-0.16
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-14 12:41:31 UTC (rev 217)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml 2008-04-14 13:17:15 UTC (rev 218)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-acceptance</artifactId>
- <version>0.16-SNAPSHOT</version>
+ <version>0.16</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-14 12:41:31 UTC (rev 217)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml 2008-04-14 13:17:15 UTC (rev 218)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-acceptance</artifactId>
- <version>0.16-SNAPSHOT</version>
+ <version>0.16</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-14 12:41:31 UTC (rev 217)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml 2008-04-14 13:17:15 UTC (rev 218)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-acceptance</artifactId>
- <version>0.16-SNAPSHOT</version>
+ <version>0.16</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-acceptance-jsp21</artifactId>
- <version>0.16-SNAPSHOT</version>
+ <version>0.16</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-14 12:41:31 UTC (rev 217)
+++ trunk/jsptest-acceptance/pom.xml 2008-04-14 13:17:15 UTC (rev 218)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.16-SNAPSHOT</version>
+ <version>0.16</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-14 12:41:31 UTC (rev 217)
+++ trunk/jsptest-generic/jsptest-common/pom.xml 2008-04-14 13:17:15 UTC (rev 218)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-generic</artifactId>
- <version>0.16-SNAPSHOT</version>
+ <version>0.16</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-common</artifactId>
- <version>0.16-SNAPSHOT</version>
+ <version>0.16</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-14 12:41:31 UTC (rev 217)
+++ trunk/jsptest-generic/jsptest-compiler-api/pom.xml 2008-04-14 13:17:15 UTC (rev 218)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-generic</artifactId>
- <version>0.16-SNAPSHOT</version>
+ <version>0.16</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-compiler-api</artifactId>
- <version>0.16-SNAPSHOT</version>
+ <version>0.16</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-14 12:41:31 UTC (rev 217)
+++ trunk/jsptest-generic/jsptest-framework/pom.xml 2008-04-14 13:17:15 UTC (rev 218)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-generic</artifactId>
- <version>0.16-SNAPSHOT</version>
+ <version>0.16</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-framework</artifactId>
- <version>0.16-SNAPSHOT</version>
+ <version>0.16</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.16-SNAPSHOT</version>
+ <version>0.16</version>
</dependency>
<dependency>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-common</artifactId>
- <version>0.16-SNAPSHOT</version>
+ <version>0.16</version>
</dependency>
</dependencies>
</project>
Modified: trunk/jsptest-generic/pom.xml
===================================================================
--- trunk/jsptest-generic/pom.xml 2008-04-14 12:41:31 UTC (rev 217)
+++ trunk/jsptest-generic/pom.xml 2008-04-14 13:17:15 UTC (rev 218)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.16-SNAPSHOT</version>
+ <version>0.16</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-generic</artifactId>
- <version>0.16-SNAPSHOT</version>
+ <version>0.16</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-14 12:41:31 UTC (rev 217)
+++ trunk/jsptest-jsp12/pom.xml 2008-04-14 13:17:15 UTC (rev 218)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.16-SNAPSHOT</version>
+ <version>0.16</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-jsp12</artifactId>
Modified: trunk/jsptest-jsp20/pom.xml
===================================================================
--- trunk/jsptest-jsp20/pom.xml 2008-04-14 12:41:31 UTC (rev 217)
+++ trunk/jsptest-jsp20/pom.xml 2008-04-14 13:17:15 UTC (rev 218)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.16-SNAPSHOT</version>
+ <version>0.16</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-jsp20</artifactId>
Modified: trunk/jsptest-jsp21/pom.xml
===================================================================
--- trunk/jsptest-jsp21/pom.xml 2008-04-14 12:41:31 UTC (rev 217)
+++ trunk/jsptest-jsp21/pom.xml 2008-04-14 13:17:15 UTC (rev 218)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.16-SNAPSHOT</version>
+ <version>0.16</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-jsp21</artifactId>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2008-04-14 12:41:31 UTC (rev 217)
+++ trunk/pom.xml 2008-04-14 13:17:15 UTC (rev 218)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.16-SNAPSHOT</version>
+ <version>0.16</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.16</connection>
+ <developerConnection>scm:svn:https://jsptest.svn.sourceforge.net/svnroot/jsptest/tags/jsptest-0.16</developerConnection>
+ <url>http://jsptest.svn.sourceforge.net/viewvc/jsptest/tags/jsptest-0.16</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-04-14 12:41:33
|
Revision: 217
http://jsptest.svn.sourceforge.net/jsptest/?rev=217&view=rev
Author: lkoskela
Date: 2008-04-14 05:41:31 -0700 (Mon, 14 Apr 2008)
Log Message:
-----------
Bumped year to 2008
Modified Paths:
--------------
trunk/LICENSE.txt
Modified: trunk/LICENSE.txt
===================================================================
--- trunk/LICENSE.txt 2008-04-14 11:36:05 UTC (rev 216)
+++ trunk/LICENSE.txt 2008-04-14 12:41:31 UTC (rev 217)
@@ -187,7 +187,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.
- 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.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lko...@us...> - 2008-04-14 11:36:10
|
Revision: 216
http://jsptest.svn.sourceforge.net/jsptest/?rev=216&view=rev
Author: lkoskela
Date: 2008-04-14 04:36:05 -0700 (Mon, 14 Apr 2008)
Log Message:
-----------
Added direct unit tests for Path. Fixed a NullPointerException that was thrown when certain JSP/Servlet libraries were loaded by the bootstrap classloader (platform-dependent behavior, exhibited by at least Apple's 1.5.0_13 JVM).
Modified Paths:
--------------
trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/Path.java
Added Paths:
-----------
trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/PathTest.java
trunk/jsptest-generic/jsptest-common/src/test/resources/
trunk/jsptest-generic/jsptest-common/src/test/resources/PathTest.res
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-14 11:34:17 UTC (rev 215)
+++ trunk/jsptest-generic/jsptest-common/src/main/java/net/sf/jsptest/utils/Path.java 2008-04-14 11:36:05 UTC (rev 216)
@@ -8,64 +8,75 @@
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++) {
- add(new File(systemClasspath[i]));
- }
- }
- }
+ 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 = "/"
- + klass.getName().replaceAll("\\.", "/") + ".class";
- addJarFile(klass.getResource(resource));
- try {
- Enumeration en = klass.getClassLoader().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 void addJarFile(URL url) {
- if (url != null) {
- addJarFile(url.toExternalForm());
- }
- }
+ private String resourcePathFor(Class klass) {
+ String resource = klass.getName().replaceAll("\\.", "/");
+ return "/" + resource + ".class";
+ }
- private void addJarFile(String url) {
- String prefix = "jar:file:";
- if (url.startsWith(prefix)) {
- String file = url.substring(prefix.length());
- if (file.contains("!")) {
- file = file.substring(0, file.indexOf('!'));
- }
- add(new File(file));
- }
- }
+ 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.contains("!")) {
+ file = file.substring(0, file.indexOf('!'));
+ }
+ add(new File(file));
+ }
+ }
}
Added: 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 (rev 0)
+++ trunk/jsptest-generic/jsptest-common/src/test/java/net/sf/jsptest/utils/PathTest.java 2008-04-14 11:36:05 UTC (rev 216)
@@ -0,0 +1,80 @@
+package net.sf.jsptest.utils;
+
+import java.io.File;
+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;
+
+ 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 {
+ file1.delete();
+ file2.delete();
+ super.tearDown();
+ }
+
+ public void testEmptyPath() throws Exception {
+ assertEquals(0, path.toStringArray().length);
+ }
+
+ public void testAddingFileObjects() throws Exception {
+ path.add(file1);
+ path.add(file2);
+ pathShouldBe(file1.getAbsolutePath(), file2.getAbsolutePath());
+ }
+
+ public void testAddingObjects() throws Exception {
+ path.add(file1.getAbsolutePath());
+ path.add(file2.getAbsolutePath());
+ pathShouldBe(file1.getAbsolutePath(), file2.getAbsolutePath());
+ }
+
+ public void testAddedEntriesDontHaveToBeExistingFiles() throws Exception {
+ String nonExistingPath = "nosuch/file.txt";
+ String nonExistingAbsolutePath = "/no/such/file.txt";
+ path.add(nonExistingPath);
+ path.add(nonExistingAbsolutePath);
+ pathShouldBe(nonExistingPath, nonExistingAbsolutePath);
+ }
+
+ public void testAddingSystemProperties() throws Exception {
+ System.setProperty("NO_SUCH_FILE", "no/such/file.txt");
+ System.setProperty("EXISTING_FILE", "src/test/resources/PathTest.res");
+ path.addSystemProperty("NO_SUCH_FILE");
+ path.addSystemProperty("EXISTING_FILE");
+ pathShouldBe(System.getProperty("NO_SUCH_FILE"), new File(System
+ .getProperty("EXISTING_FILE")).getAbsolutePath());
+ }
+
+ public void testAddContainer() throws Exception {
+ path.addContainer(junit.framework.Assert.class);
+ assertEquals(1, path.toStringArray().length);
+ assertTrue(path.toString().indexOf("junit") != -1);
+ }
+
+ public void testAddContainerWithClassLoadedByBootstrapClassLoader()
+ throws Exception {
+ path.addContainer(String.class);
+ assertEquals(1, path.toStringArray().length);
+ }
+
+ private void pathShouldBe(String firstEntry, String secondEntry) {
+ List expected = new ArrayList();
+ expected.add(firstEntry);
+ expected.add(secondEntry);
+ assertEquals(expected, Arrays.asList(path.toStringArray()));
+ }
+}
Added: trunk/jsptest-generic/jsptest-common/src/test/resources/PathTest.res
===================================================================
--- trunk/jsptest-generic/jsptest-common/src/test/resources/PathTest.res (rev 0)
+++ trunk/jsptest-generic/jsptest-common/src/test/resources/PathTest.res 2008-04-14 11:36:05 UTC (rev 216)
@@ -0,0 +1 @@
+needed for PathTest
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lko...@us...> - 2008-04-14 11:34:21
|
Revision: 215
http://jsptest.svn.sourceforge.net/jsptest/?rev=215&view=rev
Author: lkoskela
Date: 2008-04-14 04:34:17 -0700 (Mon, 14 Apr 2008)
Log Message:
-----------
Added a comment
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-04-11 12:10:38 UTC (rev 214)
+++ trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperCompiler.java 2008-04-14 11:34:17 UTC (rev 215)
@@ -369,6 +369,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", "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-04-11 12:10:43
|
Revision: 214
http://jsptest.svn.sourceforge.net/jsptest/?rev=214&view=rev
Author: lkoskela
Date: 2008-04-11 05:10:38 -0700 (Fri, 11 Apr 2008)
Log Message:
-----------
Deleting accidental tags
Removed Paths:
-------------
tags/jsptest-common-0.12/
tags/jsptest-compiler-api-0.12/
tags/jsptest-generic-0.12/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lko...@us...> - 2008-04-09 21:07:57
|
Revision: 213
http://jsptest.svn.sourceforge.net/jsptest/?rev=213&view=rev
Author: lkoskela
Date: 2008-04-09 14:07:55 -0700 (Wed, 09 Apr 2008)
Log Message:
-----------
Added javadocs
Modified Paths:
--------------
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/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
Modified: trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/HtmlTestCase.java
===================================================================
--- trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/HtmlTestCase.java 2008-04-09 20:02:28 UTC (rev 212)
+++ trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/HtmlTestCase.java 2008-04-09 21:07:55 UTC (rev 213)
@@ -51,16 +51,30 @@
private DocumentBuilder documentBuilder;
+ /**
+ * Simulate an HTTP request to a JSP, parsing the rendered output as HTML.
+ *
+ * @param path
+ * The path to the JSP to execute.
+ * @param httpMethod
+ * "GET" or "POST".
+ */
protected void request(String path, String httpMethod)
throws Exception {
super.request(path, httpMethod);
parseRenderedHtml();
}
+ /**
+ * Returns the rendered HTML as an <tt>org.w3c.dom.Document</tt>.
+ */
protected Document getRenderedHtml() {
return renderedDocument;
}
+ /**
+ * Returns the path to the rendered (and pretty-printed) HTML document.
+ */
protected String getRenderedHtmlPath() {
return renderedDocumentPath;
}
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-04-09 20:02:28 UTC (rev 212)
+++ trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/JspTestCase.java 2008-04-09 21:07:55 UTC (rev 213)
@@ -54,6 +54,10 @@
log = Logger.getLogger(getClass());
}
+ /**
+ * The standard JUnit <tt>setUp()</tt> method. <b>Remember to invoke
+ * <tt>super.setUp()</tt> if you override this!</b>
+ */
protected void setUp() throws Exception {
requestAttributes = new HashMap();
sessionAttributes = new HashMap();
@@ -116,6 +120,14 @@
request(path, "POST");
}
+ /**
+ * Simulate an HTTP request to a JSP.
+ *
+ * @param path
+ * The path to the JSP to execute.
+ * @param httpMethod
+ * "GET" or "POST".
+ */
protected void request(String path, String httpMethod)
throws Exception {
validatePath(path);
@@ -142,6 +154,9 @@
return "target/jsptest";
}
+ /**
+ * Returns a handle to a file containing the rendered output.
+ */
protected File getRenderedResponse() {
return execution.getRenderedResponse();
}
Modified: 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/OutputAssertion.java 2008-04-09 20:02:28 UTC (rev 212)
+++ trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/assertion/OutputAssertion.java 2008-04-09 21:07:55 UTC (rev 213)
@@ -1,22 +1,42 @@
package net.sf.jsptest.assertion;
/**
+ * Provides assertion methods related to raw text output.
+ *
* @author Lasse Koskela
*/
public class OutputAssertion extends AbstractAssertion {
private final String content;
+ /**
+ * @param content
+ * The raw output to perform assertions on.
+ */
public OutputAssertion(String content) {
this.content = content;
}
+ /**
+ * Assert that the output should contain the given text.
+ *
+ * @param text
+ * The (partial) content that should be found from the
+ * output.
+ */
public void shouldContain(String text) {
String msg = "Rendered output did not contain the expected text <"
+ text + ">:\n" + content;
assertContains(msg, content, text);
}
+ /**
+ * Assert that the output should not contain the given text.
+ *
+ * @param text
+ * The (partial) content that shouldn't be found from the
+ * output.
+ */
public void shouldNotContain(String text) {
String msg = "Rendered output contained unexpected text <"
+ text + ">:\n" + content;
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-04-09 20:02:28 UTC (rev 212)
+++ trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/assertion/PageAssertion.java 2008-04-09 21:07:55 UTC (rev 213)
@@ -7,14 +7,26 @@
import org.w3c.dom.Document;
/**
+ * Provides assertion methods related to an HTML page.
+ *
* @author Lasse Koskela
*/
public class PageAssertion extends DOMAssertion {
+ /**
+ * @param content
+ * The DOM tree to interpret as an HTML page.
+ */
public PageAssertion(Document content) {
this.context = content.getDocumentElement();
}
+ /**
+ * 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()")
@@ -25,6 +37,9 @@
}
}
+ /**
+ * Returns a handle for making assertions related to link elements.
+ */
public LinkAssertion shouldHaveLink() {
return new LinkAssertion(context);
}
Modified: 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/Form.java 2008-04-09 20:02:28 UTC (rev 212)
+++ trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/html/Form.java 2008-04-09 21:07:55 UTC (rev 213)
@@ -3,21 +3,41 @@
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
+/**
+ * Representation of an HTML form.
+ *
+ * @author Lasse Koskela
+ */
public class Form {
private Element element;
private NodeList fields;
+ /**
+ * Build a <tt>Form</tt> from an HTML element.
+ *
+ * @param element
+ * The HTML form element to represent.
+ */
public Form(Element element) {
this.element = element;
fields = element.getElementsByTagName("INPUT");
}
+ /**
+ * Returns the name of the HTML form.
+ */
public String getName() {
return element.getAttribute("NAME");
}
+ /**
+ * Indicates whether the form has an input field by the given name.
+ *
+ * @param name
+ * The name of the input field.
+ */
public boolean hasInputField(String name) {
if (getInputField(name) != null) {
return true;
@@ -25,6 +45,13 @@
return false;
}
+ /**
+ * Returns the specified input field or <tt>null</tt> if no such field
+ * exists on the form.
+ *
+ * @param name
+ * The name of the input field.
+ */
public FormField getInputField(String name) {
for (int i = 0; i < fields.getLength(); i++) {
FormField field = new FormField((Element) fields.item(i));
@@ -35,6 +62,12 @@
return null;
}
+ /**
+ * Indicates whether the form has a submit button by the given name.
+ *
+ * @param name
+ * The name of the submit button.
+ */
public boolean hasSubmitButton(String name) {
NodeList elems = element.getElementsByTagName("INPUT");
for (int i = 0; i < elems.getLength(); i++) {
@@ -52,6 +85,9 @@
return false;
}
+ /**
+ * Indicates whether the form has a submit button.
+ */
public boolean hasSubmitButton() {
NodeList elems = element.getElementsByTagName("INPUT");
for (int i = 0; i < elems.getLength(); i++) {
Modified: trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/html/FormField.java
===================================================================
--- trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/html/FormField.java 2008-04-09 20:02:28 UTC (rev 212)
+++ trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/html/FormField.java 2008-04-09 21:07:55 UTC (rev 213)
@@ -2,20 +2,36 @@
import org.w3c.dom.Element;
+/**
+ * Representation of a form input field.
+ *
+ * @author Lasse Koskela
+ */
public class FormField {
private Element element;
+ /**
+ * Build an input field from the given HTML element.
+ *
+ * @param element
+ * The HTML input element.
+ */
public FormField(Element element) {
this.element = element;
}
- public String getValue() {
- return element.getAttribute("VALUE");
- }
-
+ /**
+ * Returns the name of the field.
+ */
public String getName() {
return element.getAttribute("NAME");
}
+ /**
+ * Returns the value of the field.
+ */
+ public String getValue() {
+ return element.getAttribute("VALUE");
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lko...@us...> - 2008-04-09 20:02:37
|
Revision: 212
http://jsptest.svn.sourceforge.net/jsptest/?rev=212&view=rev
Author: lkoskela
Date: 2008-04-09 13:02:28 -0700 (Wed, 09 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-09 20:01:48 UTC (rev 211)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml 2008-04-09 20:02:28 UTC (rev 212)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-acceptance</artifactId>
- <version>0.15</version>
+ <version>0.16-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-09 20:01:48 UTC (rev 211)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml 2008-04-09 20:02:28 UTC (rev 212)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-acceptance</artifactId>
- <version>0.15</version>
+ <version>0.16-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-09 20:01:48 UTC (rev 211)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml 2008-04-09 20:02:28 UTC (rev 212)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-acceptance</artifactId>
- <version>0.15</version>
+ <version>0.16-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-acceptance-jsp21</artifactId>
- <version>0.15</version>
+ <version>0.16-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-09 20:01:48 UTC (rev 211)
+++ trunk/jsptest-acceptance/pom.xml 2008-04-09 20:02:28 UTC (rev 212)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.15</version>
+ <version>0.16-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-09 20:01:48 UTC (rev 211)
+++ trunk/jsptest-generic/jsptest-common/pom.xml 2008-04-09 20:02:28 UTC (rev 212)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-generic</artifactId>
- <version>0.15</version>
+ <version>0.16-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-common</artifactId>
- <version>0.15</version>
+ <version>0.16-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-09 20:01:48 UTC (rev 211)
+++ trunk/jsptest-generic/jsptest-compiler-api/pom.xml 2008-04-09 20:02:28 UTC (rev 212)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-generic</artifactId>
- <version>0.15</version>
+ <version>0.16-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-compiler-api</artifactId>
- <version>0.15</version>
+ <version>0.16-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-09 20:01:48 UTC (rev 211)
+++ trunk/jsptest-generic/jsptest-framework/pom.xml 2008-04-09 20:02:28 UTC (rev 212)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-generic</artifactId>
- <version>0.15</version>
+ <version>0.16-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-framework</artifactId>
- <version>0.15</version>
+ <version>0.16-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.15</version>
+ <version>0.16-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-common</artifactId>
- <version>0.15</version>
+ <version>0.16-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Modified: trunk/jsptest-generic/pom.xml
===================================================================
--- trunk/jsptest-generic/pom.xml 2008-04-09 20:01:48 UTC (rev 211)
+++ trunk/jsptest-generic/pom.xml 2008-04-09 20:02:28 UTC (rev 212)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.15</version>
+ <version>0.16-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-generic</artifactId>
- <version>0.15</version>
+ <version>0.16-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-09 20:01:48 UTC (rev 211)
+++ trunk/jsptest-jsp12/pom.xml 2008-04-09 20:02:28 UTC (rev 212)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.15</version>
+ <version>0.16-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-09 20:01:48 UTC (rev 211)
+++ trunk/jsptest-jsp20/pom.xml 2008-04-09 20:02:28 UTC (rev 212)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.15</version>
+ <version>0.16-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-09 20:01:48 UTC (rev 211)
+++ trunk/jsptest-jsp21/pom.xml 2008-04-09 20:02:28 UTC (rev 212)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.15</version>
+ <version>0.16-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-jsp21</artifactId>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2008-04-09 20:01:48 UTC (rev 211)
+++ trunk/pom.xml 2008-04-09 20:02:28 UTC (rev 212)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.15</version>
+ <version>0.16-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.15</connection>
- <developerConnection>scm:svn:https://jsptest.svn.sourceforge.net/svnroot/jsptest/tags/jsptest-0.15</developerConnection>
- <url>http://jsptest.svn.sourceforge.net/viewvc/jsptest/tags/jsptest-0.15</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.
|
|
From: <lko...@us...> - 2008-04-09 20:02:02
|
Revision: 211
http://jsptest.svn.sourceforge.net/jsptest/?rev=211&view=rev
Author: lkoskela
Date: 2008-04-09 13:01:48 -0700 (Wed, 09 Apr 2008)
Log Message:
-----------
[maven-release-plugin] copy for tag jsptest-0.15
Added Paths:
-----------
tags/jsptest-0.15/
tags/jsptest-0.15/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml
tags/jsptest-0.15/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml
tags/jsptest-0.15/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml
tags/jsptest-0.15/jsptest-acceptance/pom.xml
tags/jsptest-0.15/jsptest-generic/jsptest-common/pom.xml
tags/jsptest-0.15/jsptest-generic/jsptest-compiler-api/pom.xml
tags/jsptest-0.15/jsptest-generic/jsptest-framework/pom.xml
tags/jsptest-0.15/jsptest-generic/pom.xml
tags/jsptest-0.15/jsptest-jsp12/pom.xml
tags/jsptest-0.15/jsptest-jsp20/pom.xml
tags/jsptest-0.15/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperCompiler.java
tags/jsptest-0.15/jsptest-jsp21/pom.xml
tags/jsptest-0.15/pom.xml
Removed Paths:
-------------
tags/jsptest-0.15/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml
tags/jsptest-0.15/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml
tags/jsptest-0.15/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml
tags/jsptest-0.15/jsptest-acceptance/pom.xml
tags/jsptest-0.15/jsptest-generic/jsptest-common/pom.xml
tags/jsptest-0.15/jsptest-generic/jsptest-compiler-api/pom.xml
tags/jsptest-0.15/jsptest-generic/jsptest-framework/pom.xml
tags/jsptest-0.15/jsptest-generic/pom.xml
tags/jsptest-0.15/jsptest-jsp12/pom.xml
tags/jsptest-0.15/jsptest-jsp20/pom.xml
tags/jsptest-0.15/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperCompiler.java
tags/jsptest-0.15/jsptest-jsp21/pom.xml
tags/jsptest-0.15/pom.xml
Copied: tags/jsptest-0.15 (from rev 208, trunk)
Deleted: tags/jsptest-0.15/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml
===================================================================
--- trunk/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml 2008-04-09 19:52:32 UTC (rev 208)
+++ tags/jsptest-0.15/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml 2008-04-09 20:01:48 UTC (rev 211)
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-acceptance</artifactId>
- <version>0.15-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jsptest-acceptance-jsp12</artifactId>
- <packaging>jar</packaging>
- <name>Acceptance tests for the JspTest variant for the JSP 1.2 specification.</name>
- <description />
- <dependencies>
- <dependency>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-jsp12</artifactId>
- </dependency>
- </dependencies>
-</project>
Copied: tags/jsptest-0.15/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml (from rev 210, trunk/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml)
===================================================================
--- tags/jsptest-0.15/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml (rev 0)
+++ tags/jsptest-0.15/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml 2008-04-09 20:01:48 UTC (rev 211)
@@ -0,0 +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-acceptance</artifactId>
+ <version>0.15</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>
Deleted: tags/jsptest-0.15/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml
===================================================================
--- trunk/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml 2008-04-09 19:52:32 UTC (rev 208)
+++ tags/jsptest-0.15/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml 2008-04-09 20:01:48 UTC (rev 211)
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-acceptance</artifactId>
- <version>0.15-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jsptest-acceptance-jsp20</artifactId>
- <packaging>jar</packaging>
- <name>Acceptance tests for the JspTest variant for the JSP 2.0 specification.</name>
- <description />
- <dependencies>
- <dependency>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-jsp20</artifactId>
- </dependency>
- </dependencies>
-</project>
Copied: tags/jsptest-0.15/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml (from rev 210, trunk/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml)
===================================================================
--- tags/jsptest-0.15/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml (rev 0)
+++ tags/jsptest-0.15/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml 2008-04-09 20:01:48 UTC (rev 211)
@@ -0,0 +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-acceptance</artifactId>
+ <version>0.15</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>
Deleted: tags/jsptest-0.15/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml
===================================================================
--- trunk/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml 2008-04-09 19:52:32 UTC (rev 208)
+++ tags/jsptest-0.15/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml 2008-04-09 20:01:48 UTC (rev 211)
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-acceptance</artifactId>
- <version>0.15-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jsptest-acceptance-jsp21</artifactId>
- <version>0.15-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>Acceptance tests for the JspTest variant for the JSP 2.1 specification.</name>
- <description />
- <dependencies>
- <dependency>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-jsp21</artifactId>
- </dependency>
- </dependencies>
-</project>
Copied: tags/jsptest-0.15/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml (from rev 210, trunk/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml)
===================================================================
--- tags/jsptest-0.15/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml (rev 0)
+++ tags/jsptest-0.15/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml 2008-04-09 20:01:48 UTC (rev 211)
@@ -0,0 +1,20 @@
+<?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.15</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jsptest-acceptance-jsp21</artifactId>
+ <version>0.15</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>
Deleted: tags/jsptest-0.15/jsptest-acceptance/pom.xml
===================================================================
--- trunk/jsptest-acceptance/pom.xml 2008-04-09 19:52:32 UTC (rev 208)
+++ tags/jsptest-0.15/jsptest-acceptance/pom.xml 2008-04-09 20:01:48 UTC (rev 211)
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest</artifactId>
- <version>0.15-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jsptest-acceptance</artifactId>
- <name>JspTest root project for acceptance test modules</name>
- <description>This POM acts as a virtual root for the acceptance test projects for different JSP specification variants of JspTest.</description>
- <packaging>pom</packaging>
- <modules>
- <module>jsptest-acceptance-jsp12</module>
- <module>jsptest-acceptance-jsp20</module>
- <module>jsptest-acceptance-jsp21</module>
- </modules>
-</project>
Copied: tags/jsptest-0.15/jsptest-acceptance/pom.xml (from rev 210, trunk/jsptest-acceptance/pom.xml)
===================================================================
--- tags/jsptest-0.15/jsptest-acceptance/pom.xml (rev 0)
+++ tags/jsptest-0.15/jsptest-acceptance/pom.xml 2008-04-09 20:01:48 UTC (rev 211)
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>net.sf.jsptest</groupId>
+ <artifactId>jsptest</artifactId>
+ <version>0.15</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jsptest-acceptance</artifactId>
+ <name>JspTest root project for acceptance test modules</name>
+ <description>This POM acts as a virtual root for the acceptance test projects for different JSP specification variants of JspTest.</description>
+ <packaging>pom</packaging>
+ <modules>
+ <module>jsptest-acceptance-jsp12</module>
+ <module>jsptest-acceptance-jsp20</module>
+ <module>jsptest-acceptance-jsp21</module>
+ </modules>
+</project>
Deleted: tags/jsptest-0.15/jsptest-generic/jsptest-common/pom.xml
===================================================================
--- trunk/jsptest-generic/jsptest-common/pom.xml 2008-04-09 19:52:32 UTC (rev 208)
+++ tags/jsptest-0.15/jsptest-generic/jsptest-common/pom.xml 2008-04-09 20:01:48 UTC (rev 211)
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-generic</artifactId>
- <version>0.15-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jsptest-common</artifactId>
- <version>0.15-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>Common utilities</name>
- <description>Common utilities for the components of JspTest, including the JSP version-specific compiler implementations.</description>
- <profiles>
- <profile>
- <id>default-tools.jar</id>
- <activation>
- <property>
- <name>java.vendor</name>
- <value>Sun Microsystems Inc.</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.sun</groupId>
- <artifactId>tools</artifactId>
- <version>1.4.2</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-</project>
Copied: tags/jsptest-0.15/jsptest-generic/jsptest-common/pom.xml (from rev 210, trunk/jsptest-generic/jsptest-common/pom.xml)
===================================================================
--- tags/jsptest-0.15/jsptest-generic/jsptest-common/pom.xml (rev 0)
+++ tags/jsptest-0.15/jsptest-generic/jsptest-common/pom.xml 2008-04-09 20:01:48 UTC (rev 211)
@@ -0,0 +1,34 @@
+<?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.15</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jsptest-common</artifactId>
+ <version>0.15</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>
Deleted: tags/jsptest-0.15/jsptest-generic/jsptest-compiler-api/pom.xml
===================================================================
--- trunk/jsptest-generic/jsptest-compiler-api/pom.xml 2008-04-09 19:52:32 UTC (rev 208)
+++ tags/jsptest-0.15/jsptest-generic/jsptest-compiler-api/pom.xml 2008-04-09 20:01:48 UTC (rev 211)
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-generic</artifactId>
- <version>0.15-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jsptest-compiler-api</artifactId>
- <version>0.15-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>Internal compiler API</name>
- <description>A common internal API for the different versions of JSP version-specific compilers.</description>
-</project>
Copied: tags/jsptest-0.15/jsptest-generic/jsptest-compiler-api/pom.xml (from rev 210, trunk/jsptest-generic/jsptest-compiler-api/pom.xml)
===================================================================
--- tags/jsptest-0.15/jsptest-generic/jsptest-compiler-api/pom.xml (rev 0)
+++ tags/jsptest-0.15/jsptest-generic/jsptest-compiler-api/pom.xml 2008-04-09 20:01:48 UTC (rev 211)
@@ -0,0 +1,14 @@
+<?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.15</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jsptest-compiler-api</artifactId>
+ <version>0.15</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>
Deleted: tags/jsptest-0.15/jsptest-generic/jsptest-framework/pom.xml
===================================================================
--- trunk/jsptest-generic/jsptest-framework/pom.xml 2008-04-09 19:52:32 UTC (rev 208)
+++ tags/jsptest-0.15/jsptest-generic/jsptest-framework/pom.xml 2008-04-09 20:01:48 UTC (rev 211)
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-generic</artifactId>
- <version>0.15-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jsptest-framework</artifactId>
- <version>0.15-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.15-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-common</artifactId>
- <version>0.15-SNAPSHOT</version>
- </dependency>
- </dependencies>
-</project>
Copied: tags/jsptest-0.15/jsptest-generic/jsptest-framework/pom.xml (from rev 210, trunk/jsptest-generic/jsptest-framework/pom.xml)
===================================================================
--- tags/jsptest-0.15/jsptest-generic/jsptest-framework/pom.xml (rev 0)
+++ tags/jsptest-0.15/jsptest-generic/jsptest-framework/pom.xml 2008-04-09 20:01:48 UTC (rev 211)
@@ -0,0 +1,26 @@
+<?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.15</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jsptest-framework</artifactId>
+ <version>0.15</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.15</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.jsptest</groupId>
+ <artifactId>jsptest-common</artifactId>
+ <version>0.15</version>
+ </dependency>
+ </dependencies>
+</project>
Deleted: tags/jsptest-0.15/jsptest-generic/pom.xml
===================================================================
--- trunk/jsptest-generic/pom.xml 2008-04-09 19:52:32 UTC (rev 208)
+++ tags/jsptest-0.15/jsptest-generic/pom.xml 2008-04-09 20:01:48 UTC (rev 211)
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest</artifactId>
- <version>0.15-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jsptest-generic</artifactId>
- <version>0.15-SNAPSHOT</version>
- <name>JspTest root project for the generic components</name>
- <description>This POM acts as a virtual root for the set of generic components that make up JspTest.</description>
- <packaging>pom</packaging>
- <modules>
- <module>jsptest-common</module>
- <module>jsptest-compiler-api</module>
- <module>jsptest-framework</module>
- </modules>
- <dependencies>
- <dependency>
- <groupId>jtidy</groupId>
- <artifactId>jtidy</artifactId>
- <version>4aug2000r7-dev</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.13</version>
- </dependency>
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>1.1.1</version>
- </dependency>
- </dependencies>
-</project>
Copied: tags/jsptest-0.15/jsptest-generic/pom.xml (from rev 210, trunk/jsptest-generic/pom.xml)
===================================================================
--- tags/jsptest-0.15/jsptest-generic/pom.xml (rev 0)
+++ tags/jsptest-0.15/jsptest-generic/pom.xml 2008-04-09 20:01:48 UTC (rev 211)
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>net.sf.jsptest</groupId>
+ <artifactId>jsptest</artifactId>
+ <version>0.15</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jsptest-generic</artifactId>
+ <version>0.15</version>
+ <name>JspTest root project for the generic components</name>
+ <description>This POM acts as a virtual root for the set of generic components that make up JspTest.</description>
+ <packaging>pom</packaging>
+ <modules>
+ <module>jsptest-common</module>
+ <module>jsptest-compiler-api</module>
+ <module>jsptest-framework</module>
+ </modules>
+ <dependencies>
+ <dependency>
+ <groupId>jtidy</groupId>
+ <artifactId>jtidy</artifactId>
+ <version>4aug2000r7-dev</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
+ </dependency>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ </dependencies>
+</project>
Deleted: tags/jsptest-0.15/jsptest-jsp12/pom.xml
===================================================================
--- trunk/jsptest-jsp12/pom.xml 2008-04-09 19:52:32 UTC (rev 208)
+++ tags/jsptest-0.15/jsptest-jsp12/pom.xml 2008-04-09 20:01:48 UTC (rev 211)
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest</artifactId>
- <version>0.15-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>
-</project>
Copied: tags/jsptest-0.15/jsptest-jsp12/pom.xml (from rev 210, trunk/jsptest-jsp12/pom.xml)
===================================================================
--- tags/jsptest-0.15/jsptest-jsp12/pom.xml (rev 0)
+++ tags/jsptest-0.15/jsptest-jsp12/pom.xml 2008-04-09 20:01:48 UTC (rev 211)
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>net.sf.jsptest</groupId>
+ <artifactId>jsptest</artifactId>
+ <version>0.15</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>
+</project>
Deleted: tags/jsptest-0.15/jsptest-jsp20/pom.xml
===================================================================
--- trunk/jsptest-jsp20/pom.xml 2008-04-09 19:52:32 UTC (rev 208)
+++ tags/jsptest-0.15/jsptest-jsp20/pom.xml 2008-04-09 20:01:48 UTC (rev 211)
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest</artifactId>
- <version>0.15-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>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
Copied: tags/jsptest-0.15/jsptest-jsp20/pom.xml (from rev 210, trunk/jsptest-jsp20/pom.xml)
===================================================================
--- tags/jsptest-0.15/jsptest-jsp20/pom.xml (rev 0)
+++ tags/jsptest-0.15/jsptest-jsp20/pom.xml 2008-04-09 20:01:48 UTC (rev 211)
@@ -0,0 +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.15</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>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Deleted: tags/jsptest-0.15/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-04-09 19:52:32 UTC (rev 208)
+++ tags/jsptest-0.15/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperCompiler.java 2008-04-09 20:01:48 UTC (rev 211)
@@ -1,416 +0,0 @@
-/*
- * Copyright 2007 Lasse Koskela.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.sf.jsptest.compiler.jsp20;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.jsp.tagext.TagInfo;
-
-import net.sf.jsptest.compiler.JspCompilationInfo;
-import net.sf.jsptest.compiler.java.CommandLineJavac;
-import net.sf.jsptest.compiler.java.JavaCompiler;
-import net.sf.jsptest.compiler.java.SunJavaC;
-import net.sf.jsptest.compiler.jsp20.mock.MockOptions;
-import net.sf.jsptest.compiler.jsp20.mock.MockServletConfig;
-import net.sf.jsptest.compiler.jsp20.mock.MockTagInfo;
-import net.sf.jsptest.utils.Path;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.jasper.EmbeddedServletOptions;
-import org.apache.jasper.JasperException;
-import org.apache.jasper.JspCompilationContext;
-import org.apache.jasper.Options;
-import org.apache.jasper.compiler.AntCompiler;
-import org.apache.jasper.compiler.Compiler;
-import org.apache.jasper.compiler.JspRuntimeContext;
-import org.apache.jasper.compiler.ServletWriter;
-import org.apache.jasper.servlet.JspCServletContext;
-import org.apache.jasper.servlet.JspServletWrapper;
-
-/**
- * The <tt>JasperTestCase</tt> provides a facility for compiling JavaServer
- * Pages outside a real Servlet/JSP container.
- * <p>
- * It makes use of Jakarta Tomcat's Jasper JSP compiler to compile a JSP file
- * into Java source code, and then Sun's javac implementation to compile the
- * Java source code into Java bytecode.
- * <p>
- * The resulting .class file is written under a "WEB-INF/classes" directory
- * under the "web root" defined by concrete subclasses through the
- * implementation of <tt>getWebRoot()</tt>. If you want the .class files to
- * be generated somewhere else than under the web root, you can also override
- * <tt>getClassOutputBaseDir()</tt>, which specifies the root directory for
- * the compiled .class files.
- * <p>
- * The resulting Servlet class gets its package based on the
- * <tt>getJspPackageName()</tt> method which can be overridden if necessary.
- * The default is "jsp" which means that, for example, a JSP named
- * "front_page.jsp" would eventually be translated into a class file
- * "[webroot]/WEB-INF/classes/jsp/front_page_jsp.class" where "jsp/" is the JSP
- * package name and "front_page_jsp.class" the normalized class name derived
- * from the source JSP file's name.
- *
- * @author Lasse Koskela
- */
-public class JasperCompiler {
-
- private static final Log log = LogFactory
- .getLog(JasperCompiler.class);
-
- private static JavaCompiler COMPILER = determineJavaCompiler();
-
- private String webRoot;
-
- private String classOutputBaseDir;
-
- private String jspPackageName;
-
- public JasperCompiler() {
- webRoot = ".";
- classOutputBaseDir = ".";
- }
-
- /**
- * Sets the "web root", i.e. the root directory of your exploded J2EE web
- * application. In other words, this is the directory under which you should
- * have a subdirectory named "WEB-INF".
- */
- public void setWebRoot(String webRoot) {
- this.webRoot = webRoot;
- }
-
- /**
- * Sets the directory where generated .class file(s) should be written..
- */
- public void setClassOutputBaseDir(String directory) {
- this.classOutputBaseDir = directory;
- }
-
- /**
- * Compile the specified JSP source file into bytecode.
- *
- * @param path
- * The path to the JSP source file to compile, given relative
- * to the web root.
- * @param mockTaglibs
- * Mapping of tagnames to tag handler classes
- */
- public JspCompilationInfo compile(String path, Map mockTaglibs)
- throws Exception {
- JspCompilationInfo info = createJspCompilationInfo(path,
- mockTaglibs);
- if (info.jspCompilationRequired()) {
- compileJsp(info);
- compileJavaToBytecode(info);
- } else {
- log.debug(" No compilation needed for "
- + info.getJspSource());
- }
- return info;
- }
-
- /**
- * Sets the package name for the generated Java classes. The default package
- * name is "jsp".
- */
- public void setJspPackageName(String packageName) {
- this.jspPackageName = packageName;
- }
-
- /**
- * Returns the package name for the generated Java class.
- */
- private String getJspPackageName() {
- if (jspPackageName != null) {
- return jspPackageName;
- } else {
- return "jsp";
- }
- }
-
- private JspCompilationInfo createJspCompilationInfo(String jsp,
- Map mockTaglibs) {
- JspCompilationInfo info = new JspCompilationInfo();
- info.setJspPath(jsp);
- info.setClassOutputDir(classOutputBaseDir);
- info.setJspSource(resolveJspSourceFile(jsp));
- info.setWebRoot(getWebRoot());
- info.setTaglibs(mockTaglibs);
- resolveJavaSourceFile(info);
- resolveClassFileLocation(info);
- resolveClassName(info);
- return info;
- }
-
- private String getWebRoot() {
- File root = new File(webRoot);
- if (root.exists() && root.isDirectory()) {
- return root.getAbsolutePath();
- } else {
- return resolveWebRootFromClassPath();
- }
- }
-
- private String resolveWebRootFromClassPath() {
- String path = webRoot;
- if (path.startsWith("./")) {
- path = path.substring(2);
- }
- URL url = getClass().getClassLoader().getResource(path);
- if (url == null) {
- return webRoot;
- }
- if (!url.toExternalForm().startsWith("file:")) {
- log
- .info("Web root referenced a non-filesystem resource: "
- + url);
- return webRoot;
- }
- return new File(url.toExternalForm().substring(
- "file:".length())).getAbsolutePath();
- }
-
- private void compileJsp(JspCompilationInfo info) throws Exception {
- assertTrue("Source file "
- + new File(info.getJspSource()).getAbsolutePath()
- + " does not exist", new File(info.getJspSource())
- .exists());
- PrintWriter logWriter = new PrintWriter(new StringWriter());
- URL baseUrl = new File(info.getWebRoot()).toURL();
- ServletContext sContext = new JspCServletContext(logWriter,
- baseUrl);
- ServletConfig sConfig = new MockServletConfig(sContext);
- Options options = createOptions(sContext, sConfig, info);
- JspRuntimeContext rtContext = new JspRuntimeContext(sContext,
- options);
- JspServletWrapper sWrapper = makeWrapper(sContext, options,
- rtContext);
- JspCompilationContext cContext = createJspCompilationContext(
- info, sContext, options, rtContext, sWrapper,
- new StringWriter());
- logCompilation(info.getJspSource(), info.getClassOutputDir());
- compileJspToJava(sWrapper, cContext);
- File javaFile = new File(info.getJavaSource());
- assertTrue("Failed to generate .java source code to "
- + javaFile.getAbsolutePath(), javaFile.exists());
- info.compilationWasSuccessful();
- }
-
- private void compileJspToJava(
- JspServletWrapper jspServletWrapper,
- JspCompilationContext jspCompilationContext)
- throws FileNotFoundException, JasperException, Exception {
- Compiler compiler = new AntCompiler();
- compiler.init(jspCompilationContext, jspServletWrapper);
- compiler.compile();
- }
-
- private JspCompilationContext createJspCompilationContext(
- JspCompilationInfo info, ServletContext servletContext,
- Options options, JspRuntimeContext jspRuntimeContext,
- JspServletWrapper jspServletWrapper,
- StringWriter stringWriter) {
- boolean isErrorPage = false;
- JspCompilationContext cContext = new JspCompilationContext(
- info.getJspPath(), isErrorPage, options,
- servletContext, jspServletWrapper, jspRuntimeContext);
- cContext.getOutputDir(); // forces creation of the directory tree
- cContext.setServletJavaFileName(info.getJavaSource());
- cContext.setServletPackageName(getJspPackageName());
- cContext.setWriter(new ServletWriter(new PrintWriter(
- stringWriter)));
- createPathToGeneratedJavaSource(info);
- return cContext;
- }
-
- private void createPathToGeneratedJavaSource(
- JspCompilationInfo info) {
- new File(info.getJavaSource()).getParentFile().mkdirs();
- }
-
- private JspServletWrapper makeWrapper(
- ServletContext servletContext, Options options,
- JspRuntimeContext jspRuntimeContext)
- throws MalformedURLException, JasperException {
- TagInfo tagInfo = new MockTagInfo();
- String tagFilePath = "/";
- URL tagFileJarUrl = new File(".").toURL();
- JspServletWrapper wrapper = new JspServletWrapper(
- servletContext, options, tagFilePath, tagInfo,
- jspRuntimeContext, tagFileJarUrl);
- return wrapper;
- }
-
- private Options createOptions(ServletContext ctx,
- ServletConfig cfg, JspCompilationInfo info) {
- Options options = new EmbeddedServletOptions(cfg, ctx);
- return new MockOptions(options, ctx, info.getTaglibs());
- }
-
- private void resolveJavaSourceFile(JspCompilationInfo info) {
- File dir = new File(info.getClassOutputDir());
- if (getJspPackageName().length() > 0) {
- dir = new File(dir, getJspPackageName().replace('.', '/'));
- }
- dir.mkdirs();
- String name = resolveJavaSourceFileName(info.getJspPath());
- info.setJavaSource(new File(dir, name).getPath());
- }
-
- private String resolveJavaSourceFileName(String jspPath) {
- String name = encodeSpecialCharacters(jspPath);
- // name = name.replace(".jsp", "_jsp.java");
- if (name.startsWith("/")) {
- name = name.substring(1);
- }
- return name + ".java";
- }
-
- private String encodeSpecialCharacters(String name) {
- StringBuffer result = new StringBuffer();
- char[] chars = name.toCharArray();
- for (int i = 0; i < chars.length; i++) {
- if (chars[i] == '-') {
- result.append("_002d");
- } else if (chars[i] == '_') {
- result.append("_005f");
- } else if (chars[i] == '.') {
- result.append("_002e");
- } else {
- result.append(chars[i]);
- }
- }
- return result.toString();
- }
-
- private String resolveJspSourceFile(String jsp) {
- if (jsp.startsWith("/")) {
- jsp = jsp.substring(1);
- }
- return new File(getWebRoot(), jsp).getPath();
- }
-
- private void resolveClassName(JspCompilationInfo info) {
- String baseName = new File(info.getJavaSource()).getName();
- baseName = baseName.substring(0, baseName.indexOf("."));
- String packageName = getPackagePrefix()
- + getSubDirPackagePrefix(info);
- info.setClassName(packageName + baseName);
- }
-
- private String getPackagePrefix() {
- String packagePrefix = getJspPackageName();
- if (packagePrefix != null && packagePrefix.length() > 0) {
- packagePrefix = packagePrefix + ".";
- }
- return packagePrefix;
- }
-
- private String getSubDirPackagePrefix(JspCompilationInfo info) {
- String dirPrefix = info.getJspPath();
- if (dirPrefix.startsWith("/")) {
- dirPrefix = dirPrefix.substring(1);
- }
- int lastSlashIndex = dirPrefix.lastIndexOf("/");
- if (lastSlashIndex != -1) {
- dirPrefix = dirPrefix.substring(0, lastSlashIndex);
- dirPrefix = encodeSpecialCharacters(dirPrefix);
- dirPrefix = dirPrefix.replace('/', '.') + ".";
- } else {
- dirPrefix = "";
- }
- return dirPrefix;
- }
-
- private void compileJavaToBytecode(JspCompilationInfo info)
- throws Exception {
- File classFile = new File(info.getClassFile());
- classFile.delete();
- logCompilation(info.getJavaSource(), info.getClassOutputDir());
- boolean ok = javac().compile(info.getJavaSource(),
- info.getClassOutputDir(), getClassPath());
- assertTrue("javac failed", ok);
- assertTrue("Failed to compile .java file to "
- + classFile.getAbsolutePath(), classFile.exists());
- }
-
- private String[] getClassPath() {
- Path cp = new Path();
- cp.addSystemProperty("java.class.path");
- cp.addContainer(javax.servlet.jsp.tagext.JspTag.class);
- cp.addContainer(javax.servlet.jsp.jstl.core.LoopTag.class);
- cp.addContainer(javax.servlet.http.HttpServlet.class);
- cp.addContainer(org.apache.taglibs.standard.Version.class);
- cp.addContainer(org.apache.jasper.JspC.class);
- cp.addContainer(org.apache.jasper.compiler.Compiler.class);
- cp.addContainer(org.apache.jasper.runtime.HttpJspBase.class);
- cp.add(new File("target", "test-classes"));
- cp.add(new File("target", "classes").getAbsolutePath());
- return cp.toStringArray();
- }
-
- private void resolveClassFileLocation(JspCompilationInfo info) {
- String file = info.getJavaSource().replace(".java", ".class");
- info.setClassFile(file);
- }
-
- private static void assertTrue(String errorMessage,
- boolean condition) {
- if (!condition) {
- throw new RuntimeException(errorMessage);
- }
- }
-
- private static JavaCompiler determineJavaCompiler() {
- List compilers = new ArrayList();
- // this doesn't work because with Maven we need to set the classpath
- // explicitly as the "current" classpath does not include our
- // dependencies
- compilers.add(new SunJavaC());
- compilers.add(new CommandLineJavac());
- for (Iterator i = compilers.iterator(); i.hasNext();) {
- JavaCompiler compiler = (JavaCompiler) i.next();
- if (compiler.isAvailable()) {
- log.debug("Using JavaCompiler: "
- + compiler.getClass().getName());
- return compiler;
- }
- }
- throw new RuntimeException(
- "No JavaCompiler implementation available on the system");
- }
-
- private static JavaCompiler javac() {
- return COMPILER;
- }
-
- private void logCompilation(String src, String dst) {
- log.debug(" Compiling " + src + " to " + dst);
- }
-}
Copied: tags/jsptest-0.15/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperCompiler.java (from rev 209, trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperCompiler.java)
===================================================================
--- tags/jsptest-0.15/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperCompiler.java (rev 0)
+++ tags/jsptest-0.15/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperCompiler.java 2008-04-09 20:01:48 UTC (rev 211)
@@ -0,0 +1,415 @@
+/*
+ * Copyright 2007 Lasse Koskela.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.sf.jsptest.compiler.jsp20;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.jsp.tagext.TagInfo;
+
+import net.sf.jsptest.compiler.JspCompilationInfo;
+import net.sf.jsptest.compiler.java.CommandLineJavac;
+import net.sf.jsptest.compiler.java.JavaCompiler;
+import net.sf.jsptest.compiler.java.SunJavaC;
+import net.sf.jsptest.compiler.jsp20.mock.MockOptions;
+import net.sf.jsptest.compiler.jsp20.mock.MockServletConfig;
+import net.sf.jsptest.compiler.jsp20.mock.MockTagInfo;
+import net.sf.jsptest.utils.Path;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.jasper.EmbeddedServletOptions;
+import org.apache.jasper.JasperException;
+import org.apache.jasper.JspCompilationContext;
+import org.apache.jasper.Options;
+import org.apache.jasper.compiler.AntCompiler;
+import org.apache.jasper.compiler.Compiler;
+import org.apache.jasper.compiler.JspRuntimeContext;
+import org.apache.jasper.compiler.ServletWriter;
+import org.apache.jasper.servlet.JspCServletContext;
+import org.apache.jasper.servlet.JspServletWrapper;
+
+/**
+ * The <tt>JasperTestCase</tt> provides a facility for compiling JavaServer
+ * Pages outside a real Servlet/JSP container.
+ * <p>
+ * It makes use of Jakarta Tomcat's Jasper JSP compiler to compile a JSP file
+ * into Java source code, and then Sun's javac implementation to compile the
+ * Java source code into Java bytecode.
+ * <p>
+ * The resulting .class file is written under a "WEB-INF/classes" directory
+ * under the "web root" defined by concrete subclasses through the
+ * implementation of <tt>getWebRoot()</tt>. If you want the .class files to
+ * be generated somewhere else than under the web root, you can also override
+ * <tt>getClassOutputBaseDir()</tt>, which specifies the root directory for
+ * the compiled .class files.
+ * <p>
+ * The resulting Servlet class gets its package based on the
+ * <tt>getJspPackageName()</tt> method which can be overridden if necessary.
+ * The default is "jsp" which means that, for example, a JSP named
+ * "front_page.jsp" would eventually be translated into a class file
+ * "[webroot]/WEB-INF/classes/jsp/front_page_jsp.class" where "jsp/" is the JSP
+ * package name and "front_page_jsp.class" the normalized class name derived
+ * from the source JSP file's name.
+ *
+ * @author Lasse Koskela
+ */
+public class JasperCompiler {
+
+ private static final Log log = LogFactory
+ .getLog(JasperCompiler.class);
+
+ private static JavaCompiler COMPILER = determineJavaCompiler();
+
+ private String webRoot;
+
+ private String classOutputBaseDir;
+
+ private String jspPackageName;
+
+ public JasperCompiler() {
+ webRoot = ".";
+ classOutputBaseDir = ".";
+ }
+
+ /**
+ * Sets the "web root", i.e. the root directory of your exploded J2EE web
+ * application. In other words, this is the directory under which you should
+ * have a subdirectory named "WEB-INF".
+ */
+ public void setWebRoot(String webRoot) {
+ this.webRoot = webRoot;
+ }
+
+ /**
+ * Sets the directory where generated .class file(s) should be written..
+ */
+ public void setClassOutputBaseDir(String directory) {
+ this.classOutputBaseDir = directory;
+ }
+
+ /**
+ * Compile the specified JSP source file into bytecode.
+ *
+ * @param path
+ * The path to the JSP source file to compile, given relative
+ * to the web root.
+ * @param mockTaglibs
+ * Mapping of tagnames to tag handler classes
+ */
+ public JspCompilationInfo compile(String path, Map mockTaglibs)
+ throws Exception {
+ JspCompilationInfo info = createJspCompilationInfo(path,
+ mockTaglibs);
+ if (info.jspCompilationRequired()) {
+ compileJsp(info);
+ compileJavaToBytecode(info);
+ } else {
+ log.debug(" No compilation needed for "
+ + info.getJspSource());
+ }
+ return info;
+ }
+
+ /**
+ * Sets the package name for the generated Java classes. The default package
+ * name is "jsp".
+ */
+ public void setJspPackageName(String packageName) {
+ this.jspPackageName = packageName;
+ }
+
+ /**
+ * Returns the package name for the generated Java class.
+ */
+ private String getJspPackageName() {
+ if (jspPackageName != null) {
+ return jspPackageName;
+ } else {
+ return "jsp";
+ }
+ }
+
+ private JspCompilationInfo createJspCompilationInfo(String jsp,
+ Map mockTaglibs) {
+ JspCompilationInfo info = new JspCompilationInfo();
+ info.setJspPath(jsp);
+ info.setClassOutputDir(classOutputBaseDir);
+ info.setJspSource(resolveJspSourceFile(jsp));
+ info.setWebRoot(getWebRoot());
+ info.setTaglibs(mockTaglibs);
+ resolveJavaSourceFile(info);
+ resolveClassFileLocation(info);
+ resolveClassName(info);
+ return info;
+ }
+
+ private String getWebRoot() {
+ File root = new File(webRoot);
+ if (root.exists() && root.isDirectory()) {
+ return root.getAbsolutePath();
+ } else {
+ return resolveWebRootFromClassPath();
+ }
+ }
+
+ private String resolveWebRootFromClassPath() {
+ String path = webRoot;
+ if (path.startsWith("./")) {
+ path = path.substring(2);
+ }
+ URL url = getClass().getClassLoader().getResource(path);
+ if (url == null) {
+ return webRoot;
+ }
+ if (!url.toExternalForm().startsWith("file:")) {
+ log
+ .info("Web root referenced a non-filesystem resource: "
+ + url);
+ return webRoot;
+ }
+ return new File(url.toExternalForm().substring(
+ "file:".length())).getAbsolutePath();
+ }
+
+ private void compileJsp(JspCompilationInfo info) throws Exception {
+ assertTrue("Source file "
+ + new File(info.getJspSource()).getAbsolutePath()
+ + " does not exist", new File(info.getJspSource())
+ .exists());
+ PrintWriter logWriter = new PrintWriter(new StringWriter());
+ URL baseUrl = new File(info.getWebRoot()).toURL();
+ ServletContext sContext = new JspCServletContext(logWriter,
+ baseUrl);
+ ServletConfig sConfig = new MockServletConfig(sContext);
+ Options options = createOptions(sContext, sConfig, info);
+ JspRuntimeContext rtContext = new JspRuntimeContext(sContext,
+ options);
+ JspServletWrapper sWrapper = makeWrapper(sContext, options,
+ rtContext);
+ JspCompilationContext cContext = createJspCompilationContext(
+ info, sContext, options, rtContext, sWrapper,
+ new StringWriter());
+ logCompilation(info.getJspSource(), info.getClassOutputDir());
+ compileJspToJava(sWrapper, cContext);
+ File javaFile = new File(info.getJavaSource());
+ assertTrue("Failed to generate .java source code to "
+ + javaFile.getAbsolutePath(), javaFile.exists());
+ info.compilationWasSuccessful();
+ }
+
+ private void compileJspToJava(
+ JspServletWrapper jspServletWrapper,
+ JspCompilationContext jspCompilationContext)
+ throws FileNotFoundException, JasperException, Exception {
+ Compiler compiler = new AntCompiler();
+ compiler.init(jspCompilationContext, jspServletWrapper);
+ compiler.compile();
+ }
+
+ private JspCompilationContext createJspCompilationContext(
+ JspCompilationInfo info, ServletContext servletContext,
+ Options options, JspRuntimeContext jspRuntimeContext,
+ JspServletWrapper jspServletWrapper,
+ StringWriter stringWriter) {
+ boolean isErrorPage = false;
+ JspCompilationContext cContext = new JspCompilationContext(
+ info.getJspPath(), isErrorPage, options,
+ servletContext, jspServletWrapper, jspRuntimeContext);
+ cContext.getOutputDir(); // forces creation of the directory tree
+ cContext.setServletJavaFileName(info.getJavaSource());
+ cContext.setServletPackageName(getJspPackageName());
+ cContext.setWriter(new ServletWriter(new PrintWriter(
+ stringWriter)));
+ createPathToGeneratedJavaSource(info);
+ return cContext;
+ }
+
+ private void createPathToGeneratedJavaSource(
+ JspCompilationInfo info) {
+ new File(info.getJavaSource()).getParentFile().mkdirs();
+ }
+
+ private JspServletWrapper makeWrapper(
+ ServletContext servletContext, Options options,
+ JspRuntimeContext jspRuntimeContext)
+ throws MalformedURLException, JasperException {
+ TagInfo tagInfo = new MockTagInfo();
+ String tagFilePath = "/";
+ URL tagFileJarUrl = new File(".").toURL();
+ JspServletWrapper wrapper = new JspServletWrapper(
+ servletContext, options, tagFilePath, tagInfo,
+ jspRuntimeContext, tagFileJarUrl);
+ return wrapper;
+ }
+
+ private Options createOptions(ServletContext ctx,
+ ServletConfig cfg, JspCompilationInfo info) {
+ Options options = new EmbeddedServletOptions(cfg, ctx);
+ return new MockOptions(options, ctx, info.getTaglibs());
+ }
+
+ private void resolveJavaSourceFile(JspCompilationInfo info) {
+ File dir = new File(info.getClassOutputDir());
+ if (getJspPackageName().length() > 0) {
+ dir = new File(dir, getJspPackageName().replace('.', '/'));
+ }
+ dir.mkdirs();
+ String name = resolveJavaSourceFileName(info.getJspPath());
+ info.setJavaSource(new File(dir, name).getPath());
+ }
+
+ private String resolveJavaSourceFileName(String jspPath) {
+ String name = encodeSpecialCharacters(jspPath);
+ if (name.startsWith("/")) {
+ name = name.substring(1);
+ }
+ return name + ".java";
+ }
+
+ private String encodeSpecialCharacters(String name) {
+ StringBuffer result = new StringBuffer();
+ char[] chars = name.toCharArray();
+ for (int i = 0; i < chars.length; i++) {
+ if (chars[i] == '-') {
+ result.append("_002d");
+ } else if (chars[i] == '_') {
+ result.append("_005f");
+ } else if (chars[i] == '.') {
+ result.append("_");
+ } else {
+ result.append(chars[i]);
+ }
+ }
+ return result.toString();
+ }
+
+ private String resolveJspSourceFile(String jsp) {
+ if (jsp.startsWith("/")) {
+ jsp = jsp.substring(1);
+ }
+ return new File(getWebRoot(), jsp).getPath();
+ }
+
+ private void resolveClassName(JspCompilationInfo info) {
+ String baseName = new File(info.getJavaSource()).getName();
+ baseName = baseName.substring(0, baseName.indexOf("."));
+ String packageName = getPackagePrefix()
+ + getSubDirPackagePrefix(info);
+ info.setClassName(packageName + baseName);
+ }
+
+ private String getPackagePrefix() {
+ String packagePrefix = getJspPackageName();
+ if (packagePrefix != null && packagePrefix.length() > 0) {
+ packagePrefix = packagePrefix + ".";
+ }
+ return packagePrefix;
+ }
+
+ private String getSubDirPackagePrefix(JspCompilationInfo info) {
+ String dirPrefix = info.getJspPath();
+ if (dirPrefi...
[truncated message content] |
|
From: <lko...@us...> - 2008-04-09 20:01:25
|
Revision: 210
http://jsptest.svn.sourceforge.net/jsptest/?rev=210&view=rev
Author: lkoskela
Date: 2008-04-09 13:01:08 -0700 (Wed, 09 Apr 2008)
Log Message:
-----------
[maven-release-plugin] prepare release jsptest-0.15
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-09 19:57:49 UTC (rev 209)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml 2008-04-09 20:01:08 UTC (rev 210)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-acceptance</artifactId>
- <version>0.15-SNAPSHOT</version>
+ <version>0.15</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-09 19:57:49 UTC (rev 209)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml 2008-04-09 20:01:08 UTC (rev 210)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-acceptance</artifactId>
- <version>0.15-SNAPSHOT</version>
+ <version>0.15</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-09 19:57:49 UTC (rev 209)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml 2008-04-09 20:01:08 UTC (rev 210)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-acceptance</artifactId>
- <version>0.15-SNAPSHOT</version>
+ <version>0.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-acceptance-jsp21</artifactId>
- <version>0.15-SNAPSHOT</version>
+ <version>0.15</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-09 19:57:49 UTC (rev 209)
+++ trunk/jsptest-acceptance/pom.xml 2008-04-09 20:01:08 UTC (rev 210)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.15-SNAPSHOT</version>
+ <version>0.15</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-09 19:57:49 UTC (rev 209)
+++ trunk/jsptest-generic/jsptest-common/pom.xml 2008-04-09 20:01:08 UTC (rev 210)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-generic</artifactId>
- <version>0.15-SNAPSHOT</version>
+ <version>0.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-common</artifactId>
- <version>0.15-SNAPSHOT</version>
+ <version>0.15</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-09 19:57:49 UTC (rev 209)
+++ trunk/jsptest-generic/jsptest-compiler-api/pom.xml 2008-04-09 20:01:08 UTC (rev 210)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-generic</artifactId>
- <version>0.15-SNAPSHOT</version>
+ <version>0.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-compiler-api</artifactId>
- <version>0.15-SNAPSHOT</version>
+ <version>0.15</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-09 19:57:49 UTC (rev 209)
+++ trunk/jsptest-generic/jsptest-framework/pom.xml 2008-04-09 20:01:08 UTC (rev 210)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-generic</artifactId>
- <version>0.15-SNAPSHOT</version>
+ <version>0.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-framework</artifactId>
- <version>0.15-SNAPSHOT</version>
+ <version>0.15</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.15-SNAPSHOT</version>
+ <version>0.15</version>
</dependency>
<dependency>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-common</artifactId>
- <version>0.15-SNAPSHOT</version>
+ <version>0.15</version>
</dependency>
</dependencies>
</project>
Modified: trunk/jsptest-generic/pom.xml
===================================================================
--- trunk/jsptest-generic/pom.xml 2008-04-09 19:57:49 UTC (rev 209)
+++ trunk/jsptest-generic/pom.xml 2008-04-09 20:01:08 UTC (rev 210)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.15-SNAPSHOT</version>
+ <version>0.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-generic</artifactId>
- <version>0.15-SNAPSHOT</version>
+ <version>0.15</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-09 19:57:49 UTC (rev 209)
+++ trunk/jsptest-jsp12/pom.xml 2008-04-09 20:01:08 UTC (rev 210)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.15-SNAPSHOT</version>
+ <version>0.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-jsp12</artifactId>
Modified: trunk/jsptest-jsp20/pom.xml
===================================================================
--- trunk/jsptest-jsp20/pom.xml 2008-04-09 19:57:49 UTC (rev 209)
+++ trunk/jsptest-jsp20/pom.xml 2008-04-09 20:01:08 UTC (rev 210)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.15-SNAPSHOT</version>
+ <version>0.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-jsp20</artifactId>
Modified: trunk/jsptest-jsp21/pom.xml
===================================================================
--- trunk/jsptest-jsp21/pom.xml 2008-04-09 19:57:49 UTC (rev 209)
+++ trunk/jsptest-jsp21/pom.xml 2008-04-09 20:01:08 UTC (rev 210)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.15-SNAPSHOT</version>
+ <version>0.15</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-jsp21</artifactId>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2008-04-09 19:57:49 UTC (rev 209)
+++ trunk/pom.xml 2008-04-09 20:01:08 UTC (rev 210)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.15-SNAPSHOT</version>
+ <version>0.15</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.15</connection>
+ <developerConnection>scm:svn:https://jsptest.svn.sourceforge.net/svnroot/jsptest/tags/jsptest-0.15</developerConnection>
+ <url>http://jsptest.svn.sourceforge.net/viewvc/jsptest/tags/jsptest-0.15</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-04-09 19:58:08
|
Revision: 209
http://jsptest.svn.sourceforge.net/jsptest/?rev=209&view=rev
Author: lkoskela
Date: 2008-04-09 12:57:49 -0700 (Wed, 09 Apr 2008)
Log Message:
-----------
Fixed a mismatch between generated .java file name and the class name
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-04-09 19:52:32 UTC (rev 208)
+++ trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperCompiler.java 2008-04-09 19:57:49 UTC (rev 209)
@@ -285,7 +285,6 @@
private String resolveJavaSourceFileName(String jspPath) {
String name = encodeSpecialCharacters(jspPath);
- // name = name.replace(".jsp", "_jsp.java");
if (name.startsWith("/")) {
name = name.substring(1);
}
@@ -301,7 +300,7 @@
} else if (chars[i] == '_') {
result.append("_005f");
} else if (chars[i] == '.') {
- result.append("_002e");
+ result.append("_");
} else {
result.append(chars[i]);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lko...@us...> - 2008-04-09 19:53:01
|
Revision: 208
http://jsptest.svn.sourceforge.net/jsptest/?rev=208&view=rev
Author: lkoskela
Date: 2008-04-09 12:52:32 -0700 (Wed, 09 Apr 2008)
Log Message:
-----------
Applied Mathias Broekelmann's patch, adding support for special characters (. and -) in the directory path of a JSP file.
Modified Paths:
--------------
trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/BasicJspTest.java
trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperCompiler.java
Added Paths:
-----------
trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/resources/websrc/su-b.dir/
trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/resources/websrc/su-b.dir/page_in_sub.dir.jsp
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-04-09 17:56:07 UTC (rev 207)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/BasicJspTest.java 2008-04-09 19:52:32 UTC (rev 208)
@@ -61,6 +61,12 @@
output().shouldContain("Hello from Jasper");
}
+ public void testJspFileInSubDirectoryWithSpecialCharsInPath()
+ throws Exception {
+ get("/su-b.dir/page_in_sub.dir.jsp");
+ output().shouldContain("Hello from Jasper");
+ }
+
public void testJspPathNotStartingWithSlash() throws Exception {
try {
get("sub/dir/page_in_subdir.jsp");
Added: trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/resources/websrc/su-b.dir/page_in_sub.dir.jsp
===================================================================
--- trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/resources/websrc/su-b.dir/page_in_sub.dir.jsp (rev 0)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/resources/websrc/su-b.dir/page_in_sub.dir.jsp 2008-04-09 19:52:32 UTC (rev 208)
@@ -0,0 +1,7 @@
+<%@ page language="Java" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
+<html>
+ <body>
+ <p>Hello <%= "from" %> Jasper</p>
+ </body>
+</html>
\ No newline at end of file
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-04-09 17:56:07 UTC (rev 207)
+++ trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperCompiler.java 2008-04-09 19:52:32 UTC (rev 208)
@@ -285,11 +285,11 @@
private String resolveJavaSourceFileName(String jspPath) {
String name = encodeSpecialCharacters(jspPath);
- name = name.replace(".jsp", "_jsp.java");
+ // name = name.replace(".jsp", "_jsp.java");
if (name.startsWith("/")) {
name = name.substring(1);
}
- return name;
+ return name + ".java";
}
private String encodeSpecialCharacters(String name) {
@@ -300,6 +300,8 @@
result.append("_002d");
} else if (chars[i] == '_') {
result.append("_005f");
+ } else if (chars[i] == '.') {
+ result.append("_002e");
} else {
result.append(chars[i]);
}
@@ -317,8 +319,9 @@
private void resolveClassName(JspCompilationInfo info) {
String baseName = new File(info.getJavaSource()).getName();
baseName = baseName.substring(0, baseName.indexOf("."));
- info.setClassName(getPackagePrefix()
- + getSubDirPackagePrefix(info) + baseName);
+ String packageName = getPackagePrefix()
+ + getSubDirPackagePrefix(info);
+ info.setClassName(packageName + baseName);
}
private String getPackagePrefix() {
@@ -334,9 +337,10 @@
if (dirPrefix.startsWith("/")) {
dirPrefix = dirPrefix.substring(1);
}
- if (dirPrefix.lastIndexOf("/") != -1) {
- dirPrefix = dirPrefix.substring(0, dirPrefix
- .lastIndexOf("/"));
+ int lastSlashIndex = dirPrefix.lastIndexOf("/");
+ if (lastSlashIndex != -1) {
+ dirPrefix = dirPrefix.substring(0, lastSlashIndex);
+ dirPrefix = encodeSpecialCharacters(dirPrefix);
dirPrefix = dirPrefix.replace('/', '.') + ".";
} else {
dirPrefix = "";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lko...@us...> - 2008-04-09 17:56:16
|
Revision: 207
http://jsptest.svn.sourceforge.net/jsptest/?rev=207&view=rev
Author: lkoskela
Date: 2008-04-09 10:56:07 -0700 (Wed, 09 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-09 17:55:41 UTC (rev 206)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml 2008-04-09 17:56:07 UTC (rev 207)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-acceptance</artifactId>
- <version>0.14</version>
+ <version>0.15-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-09 17:55:41 UTC (rev 206)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml 2008-04-09 17:56:07 UTC (rev 207)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-acceptance</artifactId>
- <version>0.14</version>
+ <version>0.15-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-09 17:55:41 UTC (rev 206)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml 2008-04-09 17:56:07 UTC (rev 207)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-acceptance</artifactId>
- <version>0.14</version>
+ <version>0.15-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-acceptance-jsp21</artifactId>
- <version>0.14</version>
+ <version>0.15-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-09 17:55:41 UTC (rev 206)
+++ trunk/jsptest-acceptance/pom.xml 2008-04-09 17:56:07 UTC (rev 207)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.14</version>
+ <version>0.15-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-09 17:55:41 UTC (rev 206)
+++ trunk/jsptest-generic/jsptest-common/pom.xml 2008-04-09 17:56:07 UTC (rev 207)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-generic</artifactId>
- <version>0.14</version>
+ <version>0.15-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-common</artifactId>
- <version>0.14</version>
+ <version>0.15-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-09 17:55:41 UTC (rev 206)
+++ trunk/jsptest-generic/jsptest-compiler-api/pom.xml 2008-04-09 17:56:07 UTC (rev 207)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-generic</artifactId>
- <version>0.14</version>
+ <version>0.15-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-compiler-api</artifactId>
- <version>0.14</version>
+ <version>0.15-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-09 17:55:41 UTC (rev 206)
+++ trunk/jsptest-generic/jsptest-framework/pom.xml 2008-04-09 17:56:07 UTC (rev 207)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-generic</artifactId>
- <version>0.14</version>
+ <version>0.15-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-framework</artifactId>
- <version>0.14</version>
+ <version>0.15-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.14</version>
+ <version>0.15-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-common</artifactId>
- <version>0.14</version>
+ <version>0.15-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Modified: trunk/jsptest-generic/pom.xml
===================================================================
--- trunk/jsptest-generic/pom.xml 2008-04-09 17:55:41 UTC (rev 206)
+++ trunk/jsptest-generic/pom.xml 2008-04-09 17:56:07 UTC (rev 207)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.14</version>
+ <version>0.15-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-generic</artifactId>
- <version>0.14</version>
+ <version>0.15-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-09 17:55:41 UTC (rev 206)
+++ trunk/jsptest-jsp12/pom.xml 2008-04-09 17:56:07 UTC (rev 207)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.14</version>
+ <version>0.15-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-09 17:55:41 UTC (rev 206)
+++ trunk/jsptest-jsp20/pom.xml 2008-04-09 17:56:07 UTC (rev 207)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.14</version>
+ <version>0.15-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-09 17:55:41 UTC (rev 206)
+++ trunk/jsptest-jsp21/pom.xml 2008-04-09 17:56:07 UTC (rev 207)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.14</version>
+ <version>0.15-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-jsp21</artifactId>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2008-04-09 17:55:41 UTC (rev 206)
+++ trunk/pom.xml 2008-04-09 17:56:07 UTC (rev 207)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.14</version>
+ <version>0.15-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.14</connection>
- <developerConnection>scm:svn:https://jsptest.svn.sourceforge.net/svnroot/jsptest/tags/jsptest-0.14</developerConnection>
- <url>http://jsptest.svn.sourceforge.net/viewvc/jsptest/tags/jsptest-0.14</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.
|
|
From: <lko...@us...> - 2008-04-09 17:55:55
|
Revision: 206
http://jsptest.svn.sourceforge.net/jsptest/?rev=206&view=rev
Author: lkoskela
Date: 2008-04-09 10:55:41 -0700 (Wed, 09 Apr 2008)
Log Message:
-----------
[maven-release-plugin] copy for tag jsptest-0.14
Added Paths:
-----------
tags/jsptest-0.14/
tags/jsptest-0.14/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml
tags/jsptest-0.14/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml
tags/jsptest-0.14/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/RequestAndSessionAttributeTest.java
tags/jsptest-0.14/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml
tags/jsptest-0.14/jsptest-acceptance/pom.xml
tags/jsptest-0.14/jsptest-generic/
tags/jsptest-0.14/jsptest-generic/jsptest-common/pom.xml
tags/jsptest-0.14/jsptest-generic/jsptest-compiler-api/pom.xml
tags/jsptest-0.14/jsptest-generic/jsptest-framework/
tags/jsptest-0.14/jsptest-generic/jsptest-framework/pom.xml
tags/jsptest-0.14/jsptest-generic/jsptest-framework/src/
tags/jsptest-0.14/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/JspTestCase.java
tags/jsptest-0.14/jsptest-generic/pom.xml
tags/jsptest-0.14/jsptest-jsp12/pom.xml
tags/jsptest-0.14/jsptest-jsp20/pom.xml
tags/jsptest-0.14/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperCompiler.java
tags/jsptest-0.14/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperExecution.java
tags/jsptest-0.14/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/ClasspathTldLocator.java
tags/jsptest-0.14/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/MockTldLocationsCache.java
tags/jsptest-0.14/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/TldLocation.java
tags/jsptest-0.14/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/TldUriMappings.java
tags/jsptest-0.14/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/WebInfLibTldLocator.java
tags/jsptest-0.14/jsptest-jsp20/src/test/java/net/sf/jsptest/compiler/jsp20/mock/
tags/jsptest-0.14/jsptest-jsp20/src/test/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/TestClasspathTldLocator.java
tags/jsptest-0.14/jsptest-jsp20/src/test/resources/META-INF/
tags/jsptest-0.14/jsptest-jsp21/pom.xml
tags/jsptest-0.14/pom.xml
Removed Paths:
-------------
tags/jsptest-0.14/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml
tags/jsptest-0.14/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml
tags/jsptest-0.14/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/RequestAndSessionAttributeTest.java
tags/jsptest-0.14/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml
tags/jsptest-0.14/jsptest-acceptance/pom.xml
tags/jsptest-0.14/jsptest-generic/
tags/jsptest-0.14/jsptest-generic/jsptest-common/pom.xml
tags/jsptest-0.14/jsptest-generic/jsptest-compiler-api/pom.xml
tags/jsptest-0.14/jsptest-generic/jsptest-framework/
tags/jsptest-0.14/jsptest-generic/jsptest-framework/pom.xml
tags/jsptest-0.14/jsptest-generic/jsptest-framework/src/
tags/jsptest-0.14/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/JspTestCase.java
tags/jsptest-0.14/jsptest-generic/pom.xml
tags/jsptest-0.14/jsptest-jsp12/pom.xml
tags/jsptest-0.14/jsptest-jsp20/pom.xml
tags/jsptest-0.14/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperCompiler.java
tags/jsptest-0.14/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperExecution.java
tags/jsptest-0.14/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/MockTldLocationsCache.java
tags/jsptest-0.14/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/ClasspathTldLocator.java
tags/jsptest-0.14/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/MockTldLocationsCache.java
tags/jsptest-0.14/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/TldLocation.java
tags/jsptest-0.14/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/WebInfLibTldLocator.java
tags/jsptest-0.14/jsptest-jsp20/src/test/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/TestClasspathTldLocator.java
tags/jsptest-0.14/jsptest-jsp21/pom.xml
tags/jsptest-0.14/pom.xml
Copied: tags/jsptest-0.14 (from rev 199, trunk)
Deleted: tags/jsptest-0.14/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml
===================================================================
--- trunk/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml 2008-04-04 07:01:10 UTC (rev 199)
+++ tags/jsptest-0.14/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml 2008-04-09 17:55:41 UTC (rev 206)
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-acceptance</artifactId>
- <version>0.14-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jsptest-acceptance-jsp12</artifactId>
- <packaging>jar</packaging>
- <name>Acceptance tests for the JspTest variant for the JSP 1.2 specification.</name>
- <description />
- <dependencies>
- <dependency>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-jsp12</artifactId>
- </dependency>
- </dependencies>
-</project>
Copied: tags/jsptest-0.14/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml (from rev 205, trunk/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml)
===================================================================
--- tags/jsptest-0.14/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml (rev 0)
+++ tags/jsptest-0.14/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml 2008-04-09 17:55:41 UTC (rev 206)
@@ -0,0 +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-acceptance</artifactId>
+ <version>0.14</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>
Deleted: tags/jsptest-0.14/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml
===================================================================
--- trunk/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml 2008-04-04 07:01:10 UTC (rev 199)
+++ tags/jsptest-0.14/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml 2008-04-09 17:55:41 UTC (rev 206)
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-acceptance</artifactId>
- <version>0.14-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jsptest-acceptance-jsp20</artifactId>
- <packaging>jar</packaging>
- <name>Acceptance tests for the JspTest variant for the JSP 2.0 specification.</name>
- <description />
- <dependencies>
- <dependency>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-jsp20</artifactId>
- </dependency>
- </dependencies>
-</project>
Copied: tags/jsptest-0.14/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml (from rev 205, trunk/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml)
===================================================================
--- tags/jsptest-0.14/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml (rev 0)
+++ tags/jsptest-0.14/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml 2008-04-09 17:55:41 UTC (rev 206)
@@ -0,0 +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-acceptance</artifactId>
+ <version>0.14</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>
Deleted: tags/jsptest-0.14/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-04-04 07:01:10 UTC (rev 199)
+++ tags/jsptest-0.14/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/RequestAndSessionAttributeTest.java 2008-04-09 17:55:41 UTC (rev 206)
@@ -1,54 +0,0 @@
-/*
- * Copyright 2007 Lasse Koskela.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.sf.jsptest.acceptance.jsp;
-
-import net.sf.jsptest.JspTestCase;
-
-/**
- * Unit testing JavaServer Pages has never been this easy!
- */
-public class RequestAndSessionAttributeTest extends JspTestCase {
-
- protected String getWebRoot() {
- return "src/test/resources/websrc";
- }
-
- public void testRequestAttributes() throws Exception {
- setRequestAttribute("Rn1", "Rv1");
- setRequestAttribute("Rn2", "Rv2");
- get("/echo_attributes.jsp");
- output().shouldContain("request attribute: 'Rn1'='Rv1'");
- output().shouldContain("request attribute: 'Rn2'='Rv2'");
- }
-
- public void testSessionAttributes() throws Exception {
- setSessionAttribute("Sn1", "Sv1");
- setSessionAttribute("Sn2", "Sv2");
- get("/echo_attributes.jsp");
- output().shouldContain("session attribute: 'Sn1'='Sv1'");
- output().shouldContain("session attribute: 'Sn2'='Sv2'");
- }
-
- public void testSessionAndRequestAttributesDontOverrideEachOther()
- throws Exception {
- setRequestAttribute("name", "request");
- setSessionAttribute("name", "session");
- get("/echo_attributes.jsp");
- output().shouldContain("request attribute: 'name'='request'");
- output().shouldContain("session attribute: 'name'='session'");
- }
-}
Copied: tags/jsptest-0.14/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/RequestAndSessionAttributeTest.java (from rev 202, trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/RequestAndSessionAttributeTest.java)
===================================================================
--- tags/jsptest-0.14/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/RequestAndSessionAttributeTest.java (rev 0)
+++ tags/jsptest-0.14/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/RequestAndSessionAttributeTest.java 2008-04-09 17:55:41 UTC (rev 206)
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2007 Lasse Koskela.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.sf.jsptest.acceptance.jsp;
+
+import net.sf.jsptest.JspTestCase;
+
+/**
+ * Unit testing JavaServer Pages has never been this easy!
+ */
+public class RequestAndSessionAttributeTest extends JspTestCase {
+
+ protected String getWebRoot() {
+ return "src/test/resources/websrc";
+ }
+
+ public void testRequestAttributes() throws Exception {
+ setRequestAttribute("Rn1", "Rv1");
+ setRequestAttribute("Rn2", "Rv2");
+ get("/echo_attributes.jsp");
+ output().shouldContain("request attribute: 'Rn1'='Rv1'");
+ output().shouldContain("request attribute: 'Rn2'='Rv2'");
+ }
+
+ public void testSessionAttributes() throws Exception {
+ setSessionAttribute("Sn1", "Sv1");
+ setSessionAttribute("Sn2", "Sv2");
+ get("/echo_attributes.jsp");
+ output().shouldContain("session attribute: 'Sn1'='Sv1'");
+ output().shouldContain("session attribute: 'Sn2'='Sv2'");
+ }
+
+ public void testRequestAndSessionAttributesCanBeObjects()
+ throws Exception {
+ setRequestAttribute("request", (Object) "1");
+ setSessionAttribute("session", (Object) new Integer(2));
+ get("/echo_attributes.jsp");
+ output().shouldContain("request attribute: 'request'='1'");
+ output().shouldContain("session attribute: 'session'='2'");
+ }
+
+ public void testSessionAndRequestAttributesDontOverrideEachOther()
+ throws Exception {
+ setRequestAttribute("name", "request");
+ setSessionAttribute("name", "session");
+ get("/echo_attributes.jsp");
+ output().shouldContain("request attribute: 'name'='request'");
+ output().shouldContain("session attribute: 'name'='session'");
+ }
+}
Deleted: tags/jsptest-0.14/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml
===================================================================
--- trunk/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml 2008-04-04 07:01:10 UTC (rev 199)
+++ tags/jsptest-0.14/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml 2008-04-09 17:55:41 UTC (rev 206)
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-acceptance</artifactId>
- <version>0.14-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jsptest-acceptance-jsp21</artifactId>
- <version>0.13-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>Acceptance tests for the JspTest variant for the JSP 2.1 specification.</name>
- <description />
- <dependencies>
- <dependency>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-jsp21</artifactId>
- </dependency>
- </dependencies>
-</project>
Copied: tags/jsptest-0.14/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml (from rev 205, trunk/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml)
===================================================================
--- tags/jsptest-0.14/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml (rev 0)
+++ tags/jsptest-0.14/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml 2008-04-09 17:55:41 UTC (rev 206)
@@ -0,0 +1,20 @@
+<?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.14</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jsptest-acceptance-jsp21</artifactId>
+ <version>0.14</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>
Deleted: tags/jsptest-0.14/jsptest-acceptance/pom.xml
===================================================================
--- trunk/jsptest-acceptance/pom.xml 2008-04-04 07:01:10 UTC (rev 199)
+++ tags/jsptest-0.14/jsptest-acceptance/pom.xml 2008-04-09 17:55:41 UTC (rev 206)
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest</artifactId>
- <version>0.14-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jsptest-acceptance</artifactId>
- <name>JspTest root project for acceptance test modules</name>
- <description>This POM acts as a virtual root for the acceptance test projects for different JSP specification variants of JspTest.</description>
- <packaging>pom</packaging>
- <modules>
- <module>jsptest-acceptance-jsp12</module>
- <module>jsptest-acceptance-jsp20</module>
- <module>jsptest-acceptance-jsp21</module>
- </modules>
-</project>
Copied: tags/jsptest-0.14/jsptest-acceptance/pom.xml (from rev 205, trunk/jsptest-acceptance/pom.xml)
===================================================================
--- tags/jsptest-0.14/jsptest-acceptance/pom.xml (rev 0)
+++ tags/jsptest-0.14/jsptest-acceptance/pom.xml 2008-04-09 17:55:41 UTC (rev 206)
@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>net.sf.jsptest</groupId>
+ <artifactId>jsptest</artifactId>
+ <version>0.14</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jsptest-acceptance</artifactId>
+ <name>JspTest root project for acceptance test modules</name>
+ <description>This POM acts as a virtual root for the acceptance test projects for different JSP specification variants of JspTest.</description>
+ <packaging>pom</packaging>
+ <modules>
+ <module>jsptest-acceptance-jsp12</module>
+ <module>jsptest-acceptance-jsp20</module>
+ <module>jsptest-acceptance-jsp21</module>
+ </modules>
+</project>
Copied: tags/jsptest-0.14/jsptest-generic (from rev 201, trunk/jsptest-generic)
Deleted: tags/jsptest-0.14/jsptest-generic/jsptest-common/pom.xml
===================================================================
--- trunk/jsptest-generic/jsptest-common/pom.xml 2008-04-09 17:38:59 UTC (rev 201)
+++ tags/jsptest-0.14/jsptest-generic/jsptest-common/pom.xml 2008-04-09 17:55:41 UTC (rev 206)
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-generic</artifactId>
- <version>0.14-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jsptest-common</artifactId>
- <version>0.14-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>Common utilities</name>
- <description>Common utilities for the components of JspTest, including the JSP version-specific compiler implementations.</description>
- <profiles>
- <profile>
- <id>default-tools.jar</id>
- <activation>
- <property>
- <name>java.vendor</name>
- <value>Sun Microsystems Inc.</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>com.sun</groupId>
- <artifactId>tools</artifactId>
- <version>1.4.2</version>
- <scope>system</scope>
- <systemPath>${java.home}/../lib/tools.jar</systemPath>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-</project>
Copied: tags/jsptest-0.14/jsptest-generic/jsptest-common/pom.xml (from rev 205, trunk/jsptest-generic/jsptest-common/pom.xml)
===================================================================
--- tags/jsptest-0.14/jsptest-generic/jsptest-common/pom.xml (rev 0)
+++ tags/jsptest-0.14/jsptest-generic/jsptest-common/pom.xml 2008-04-09 17:55:41 UTC (rev 206)
@@ -0,0 +1,34 @@
+<?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.14</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jsptest-common</artifactId>
+ <version>0.14</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>
Deleted: tags/jsptest-0.14/jsptest-generic/jsptest-compiler-api/pom.xml
===================================================================
--- trunk/jsptest-generic/jsptest-compiler-api/pom.xml 2008-04-09 17:38:59 UTC (rev 201)
+++ tags/jsptest-0.14/jsptest-generic/jsptest-compiler-api/pom.xml 2008-04-09 17:55:41 UTC (rev 206)
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-generic</artifactId>
- <version>0.14-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jsptest-compiler-api</artifactId>
- <version>0.14-SNAPSHOT</version>
- <packaging>jar</packaging>
- <name>Internal compiler API</name>
- <description>A common internal API for the different versions of JSP version-specific compilers.</description>
-</project>
Copied: tags/jsptest-0.14/jsptest-generic/jsptest-compiler-api/pom.xml (from rev 205, trunk/jsptest-generic/jsptest-compiler-api/pom.xml)
===================================================================
--- tags/jsptest-0.14/jsptest-generic/jsptest-compiler-api/pom.xml (rev 0)
+++ tags/jsptest-0.14/jsptest-generic/jsptest-compiler-api/pom.xml 2008-04-09 17:55:41 UTC (rev 206)
@@ -0,0 +1,14 @@
+<?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.14</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jsptest-compiler-api</artifactId>
+ <version>0.14</version>
+ <packaging>jar</packaging>
+ <name>Internal compiler API</name>
+ <description>A common internal API for the different versions of JSP version-specific compilers.</description>
+</project>
Copied: tags/jsptest-0.14/jsptest-generic/jsptest-framework (from rev 202, trunk/jsptest-generic/jsptest-framework)
Deleted: tags/jsptest-0.14/jsptest-generic/jsptest-framework/pom.xml
===================================================================
--- trunk/jsptest-generic/jsptest-framework/pom.xml 2008-04-09 17:46:22 UTC (rev 202)
+++ tags/jsptest-0.14/jsptest-generic/jsptest-framework/pom.xml 2008-04-09 17:55:41 UTC (rev 206)
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-generic</artifactId>
- <version>0.14-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jsptest-framework</artifactId>
- <version>0.14-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.14-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest-common</artifactId>
- <version>0.14-SNAPSHOT</version>
- </dependency>
- </dependencies>
-</project>
Copied: tags/jsptest-0.14/jsptest-generic/jsptest-framework/pom.xml (from rev 205, trunk/jsptest-generic/jsptest-framework/pom.xml)
===================================================================
--- tags/jsptest-0.14/jsptest-generic/jsptest-framework/pom.xml (rev 0)
+++ tags/jsptest-0.14/jsptest-generic/jsptest-framework/pom.xml 2008-04-09 17:55:41 UTC (rev 206)
@@ -0,0 +1,26 @@
+<?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.14</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jsptest-framework</artifactId>
+ <version>0.14</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.14</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.jsptest</groupId>
+ <artifactId>jsptest-common</artifactId>
+ <version>0.14</version>
+ </dependency>
+ </dependencies>
+</project>
Copied: tags/jsptest-0.14/jsptest-generic/jsptest-framework/src (from rev 201, trunk/jsptest-generic/jsptest-framework/src)
Deleted: tags/jsptest-0.14/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-04-09 17:38:59 UTC (rev 201)
+++ tags/jsptest-0.14/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/JspTestCase.java 2008-04-09 17:55:41 UTC (rev 206)
@@ -1,174 +0,0 @@
-/*
- * Copyright 2007 Lasse Koskela.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.sf.jsptest;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.log4j.Logger;
-
-import junit.framework.TestCase;
-import net.sf.jsptest.assertion.OutputAssertion;
-import net.sf.jsptest.compiler.api.Jsp;
-import net.sf.jsptest.compiler.api.JspCompiler;
-import net.sf.jsptest.compiler.api.JspCompilerFactory;
-import net.sf.jsptest.compiler.api.JspExecution;
-import net.sf.jsptest.utils.IO;
-
-/**
- * An abstract base class to be extended by the user. The <tt>JspTestCase</tt>
- * class provides a facility for rendering a JSP and a set of assertion methods
- * for verifying that the JSP under test renders the expected kind of output.
- *
- * @author Lasse Koskela
- */
-public abstract class JspTestCase extends TestCase {
-
- private Logger log;
-
- private Map requestAttributes;
-
- private Map sessionAttributes;
-
- private Map substituteTaglibs;
-
- private JspExecution execution;
-
- public JspTestCase() {
- log = Logger.getLogger(getClass());
- }
-
- protected void setUp() throws Exception {
- requestAttributes = new HashMap();
- sessionAttributes = new HashMap();
- substituteTaglibs = new HashMap();
- }
-
- /**
- * Override this method to tell the JSP compiler where the "web" files are
- * located. Defaults to the current working directory.
- */
- protected String getWebRoot() {
- return ".";
- }
-
- /**
- * Sets a session attribute for the current session.
- *
- * @param attribute
- * Name of the attribute.
- * @param value
- * Value for the attribute.
- */
- protected void setSessionAttribute(String attribute, String value) {
- sessionAttributes.put(attribute, value);
- }
-
- /**
- * Sets a request attribute for the next request.
- *
- * @param attribute
- * Name of the attribute.
- * @param value
- * Value for the attribute.
- */
- protected void setRequestAttribute(String attribute, String value) {
- requestAttributes.put(attribute, value);
- }
-
- /**
- * Simulate a HTTP GET request to the specified JSP file.
- *
- * @param path
- * The JSP file to render. The path should start with a "/"
- * and is interpreted to be relative to the web root
- * specified by <tt>getWebRoot</tt>.
- */
- protected void get(String path) throws Exception {
- request(path, "GET");
- }
-
- /**
- * Simulate a HTTP POST request to the specified JSP file.
- *
- * @param path
- * The JSP file to render. The path should start with a "/"
- * and is interpreted to be relative to the web root
- * specified by <tt>getWebRoot</tt>.
- */
- protected void post(String path) throws Exception {
- request(path, "POST");
- }
-
- protected void request(String path, String httpMethod)
- throws Exception {
- validatePath(path);
- JspCompiler compiler = JspCompilerFactory.newInstance();
- log.debug("Using compiler " + compiler.getClass().getName()
- + " and webroot "
- + new File(getWebRoot()).getAbsolutePath());
- compiler.setWebRoot(getWebRoot());
- compiler.setOutputDirectory(getOutputDirectory());
- Jsp jsp = compiler.compile(path, substituteTaglibs);
- log.debug("Simulating a request to " + path);
- execution = jsp.request(httpMethod, requestAttributes,
- sessionAttributes);
- }
-
- private void validatePath(String path) {
- if (!path.startsWith("/")) {
- throw new IllegalArgumentException(
- "The JSP path must start with a \"/\"");
- }
- }
-
- private String getOutputDirectory() {
- return "target/jsptest";
- }
-
- protected File getRenderedResponse() {
- return execution.getRenderedResponse();
- }
-
- /**
- * Returns a handle for making assertions about the rendered content.
- */
- public OutputAssertion output() {
- try {
- return new OutputAssertion(IO
- .readToString(getRenderedResponse()));
- } catch (IOException e) {
- throw new RuntimeException(e);
- }
- }
-
- /**
- * 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 substituteTaglib(String name,
- Class newImplementation) {
- substituteTaglibs.put(name, newImplementation);
- }
-}
Copied: tags/jsptest-0.14/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/JspTestCase.java (from rev 202, trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/JspTestCase.java)
===================================================================
--- tags/jsptest-0.14/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/JspTestCase.java (rev 0)
+++ tags/jsptest-0.14/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/JspTestCase.java 2008-04-09 17:55:41 UTC (rev 206)
@@ -0,0 +1,174 @@
+/*
+ * Copyright 2007 Lasse Koskela.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.sf.jsptest;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.log4j.Logger;
+
+import junit.framework.TestCase;
+import net.sf.jsptest.assertion.OutputAssertion;
+import net.sf.jsptest.compiler.api.Jsp;
+import net.sf.jsptest.compiler.api.JspCompiler;
+import net.sf.jsptest.compiler.api.JspCompilerFactory;
+import net.sf.jsptest.compiler.api.JspExecution;
+import net.sf.jsptest.utils.IO;
+
+/**
+ * An abstract base class to be extended by the user. The <tt>JspTestCase</tt>
+ * class provides a facility for rendering a JSP and a set of assertion methods
+ * for verifying that the JSP under test renders the expected kind of output.
+ *
+ * @author Lasse Koskela
+ */
+public abstract class JspTestCase extends TestCase {
+
+ private Logger log;
+
+ private Map requestAttributes;
+
+ private Map sessionAttributes;
+
+ private Map substituteTaglibs;
+
+ private JspExecution execution;
+
+ public JspTestCase() {
+ log = Logger.getLogger(getClass());
+ }
+
+ protected void setUp() throws Exception {
+ requestAttributes = new HashMap();
+ sessionAttributes = new HashMap();
+ substituteTaglibs = new HashMap();
+ }
+
+ /**
+ * Override this method to tell the JSP compiler where the "web" files are
+ * located. Defaults to the current working directory.
+ */
+ protected String getWebRoot() {
+ return ".";
+ }
+
+ /**
+ * Sets a session attribute for the current session.
+ *
+ * @param attribute
+ * Name of the attribute.
+ * @param value
+ * Value for the attribute.
+ */
+ protected void setSessionAttribute(String attribute, Object value) {
+ sessionAttributes.put(attribute, value);
+ }
+
+ /**
+ * Sets a request attribute for the next request.
+ *
+ * @param attribute
+ * Name of the attribute.
+ * @param value
+ * Value for the attribute.
+ */
+ protected void setRequestAttribute(String attribute, Object value) {
+ requestAttributes.put(attribute, value);
+ }
+
+ /**
+ * Simulate a HTTP GET request to the specified JSP file.
+ *
+ * @param path
+ * The JSP file to render. The path should start with a "/"
+ * and is interpreted to be relative to the web root
+ * specified by <tt>getWebRoot</tt>.
+ */
+ protected void get(String path) throws Exception {
+ request(path, "GET");
+ }
+
+ /**
+ * Simulate a HTTP POST request to the specified JSP file.
+ *
+ * @param path
+ * The JSP file to render. The path should start with a "/"
+ * and is interpreted to be relative to the web root
+ * specified by <tt>getWebRoot</tt>.
+ */
+ protected void post(String path) throws Exception {
+ request(path, "POST");
+ }
+
+ protected void request(String path, String httpMethod)
+ throws Exception {
+ validatePath(path);
+ JspCompiler compiler = JspCompilerFactory.newInstance();
+ log.debug("Using compiler " + compiler.getClass().getName()
+ + " and webroot "
+ + new File(getWebRoot()).getAbsolutePath());
+ compiler.setWebRoot(getWebRoot());
+ compiler.setOutputDirectory(getOutputDirectory());
+ Jsp jsp = compiler.compile(path, substituteTaglibs);
+ log.debug("Simulating a request to " + path);
+ execution = jsp.request(httpMethod, requestAttributes,
+ sessionAttributes);
+ }
+
+ private void validatePath(String path) {
+ if (!path.startsWith("/")) {
+ throw new IllegalArgumentException(
+ "The JSP path must start with a \"/\"");
+ }
+ }
+
+ private String getOutputDirectory() {
+ return "target/jsptest";
+ }
+
+ protected File getRenderedResponse() {
+ return execution.getRenderedResponse();
+ }
+
+ /**
+ * Returns a handle for making assertions about the rendered content.
+ */
+ public OutputAssertion output() {
+ try {
+ return new OutputAssertion(IO
+ .readToString(getRenderedResponse()));
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ /**
+ * 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 substituteTaglib(String name,
+ Class newImplementation) {
+ substituteTaglibs.put(name, newImplementation);
+ }
+}
Deleted: tags/jsptest-0.14/jsptest-generic/pom.xml
===================================================================
--- trunk/jsptest-generic/pom.xml 2008-04-09 17:38:59 UTC (rev 201)
+++ tags/jsptest-0.14/jsptest-generic/pom.xml 2008-04-09 17:55:41 UTC (rev 206)
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest</artifactId>
- <version>0.14-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jsptest-generic</artifactId>
- <version>0.14-SNAPSHOT</version>
- <name>JspTest root project for the generic components</name>
- <description>This POM acts as a virtual root for the set of generic components that make up JspTest.</description>
- <packaging>pom</packaging>
- <modules>
- <module>jsptest-common</module>
- <module>jsptest-compiler-api</module>
- <module>jsptest-framework</module>
- </modules>
- <dependencies>
- <dependency>
- <groupId>jtidy</groupId>
- <artifactId>jtidy</artifactId>
- <version>4aug2000r7-dev</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.2</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.13</version>
- </dependency>
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>1.1.1</version>
- </dependency>
- </dependencies>
-</project>
Copied: tags/jsptest-0.14/jsptest-generic/pom.xml (from rev 205, trunk/jsptest-generic/pom.xml)
===================================================================
--- tags/jsptest-0.14/jsptest-generic/pom.xml (rev 0)
+++ tags/jsptest-0.14/jsptest-generic/pom.xml 2008-04-09 17:55:41 UTC (rev 206)
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>net.sf.jsptest</groupId>
+ <artifactId>jsptest</artifactId>
+ <version>0.14</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jsptest-generic</artifactId>
+ <version>0.14</version>
+ <name>JspTest root project for the generic components</name>
+ <description>This POM acts as a virtual root for the set of generic components that make up JspTest.</description>
+ <packaging>pom</packaging>
+ <modules>
+ <module>jsptest-common</module>
+ <module>jsptest-compiler-api</module>
+ <module>jsptest-framework</module>
+ </modules>
+ <dependencies>
+ <dependency>
+ <groupId>jtidy</groupId>
+ <artifactId>jtidy</artifactId>
+ <version>4aug2000r7-dev</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
+ </dependency>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ </dependencies>
+</project>
Deleted: tags/jsptest-0.14/jsptest-jsp12/pom.xml
===================================================================
--- trunk/jsptest-jsp12/pom.xml 2008-04-04 07:01:10 UTC (rev 199)
+++ tags/jsptest-0.14/jsptest-jsp12/pom.xml 2008-04-09 17:55:41 UTC (rev 206)
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest</artifactId>
- <version>0.14-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>
-</project>
Copied: tags/jsptest-0.14/jsptest-jsp12/pom.xml (from rev 205, trunk/jsptest-jsp12/pom.xml)
===================================================================
--- tags/jsptest-0.14/jsptest-jsp12/pom.xml (rev 0)
+++ tags/jsptest-0.14/jsptest-jsp12/pom.xml 2008-04-09 17:55:41 UTC (rev 206)
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>net.sf.jsptest</groupId>
+ <artifactId>jsptest</artifactId>
+ <version>0.14</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>
+</project>
Deleted: tags/jsptest-0.14/jsptest-jsp20/pom.xml
===================================================================
--- trunk/jsptest-jsp20/pom.xml 2008-04-04 07:01:10 UTC (rev 199)
+++ tags/jsptest-0.14/jsptest-jsp20/pom.xml 2008-04-09 17:55:41 UTC (rev 206)
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>net.sf.jsptest</groupId>
- <artifactId>jsptest</artifactId>
- <version>0.14-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>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
Copied: tags/jsptest-0.14/jsptest-jsp20/pom.xml (from rev 205, trunk/jsptest-jsp20/pom.xml)
===================================================================
--- tags/jsptest-0.14/jsptest-jsp20/pom.xml (rev 0)
+++ tags/jsptest-0.14/jsptest-jsp20/pom.xml 2008-04-09 17:55:41 UTC (rev 206)
@@ -0,0 +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.14</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>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Deleted: tags/jsptest-0.14/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-04-04 07:01:10 UTC (rev 199)
+++ tags/jsptest-0.14/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperCompiler.java 2008-04-09 17:55:41 UTC (rev 206)
@@ -1,412 +0,0 @@
-/*
- * Copyright 2007 Lasse Koskela.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package net.sf.jsptest.compiler.jsp20;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.jsp.tagext.TagInfo;
-
-import net.sf.jsptest.compiler.JspCompilationInfo;
-import net.sf.jsptest.compiler.java.CommandLineJavac;
-import net.sf.jsptest.compiler.java.JavaCompiler;
-import net.sf.jsptest.compiler.java.SunJavaC;
-import net.sf.jsptest.compiler.jsp20.mock.MockOptions;
-import net.sf.jsptest.compiler.jsp20.mock.MockServletConfig;
-import net.sf.jsptest.compiler.jsp20.mock.MockTagInfo;
-import net.sf.jsptest.utils.Path;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.jasper.EmbeddedServletOptions;
-import org.apache.jasper.JasperException;
-import org.apache.jasper.JspCompilationContext;
-import org.apache.jasper.Options;
-import org.apache.jasper.compiler.AntCompiler;
-import org.apache.jasper.compiler.Compiler;
-import org.apache.jasper.compiler.JspRuntimeContext;
-import org.apache.jasper.compiler.ServletWriter;
-import org.apache.jasper.servlet.JspCServletContext;
-import org.apache.jasper.servlet.JspServletWrapper;
-
-/**
- * The <tt>JasperTestCase</tt> provides a facility for compiling JavaServer
- * Pages outside a real Servlet/JSP container.
- * <p>
- * It makes use of Jakarta Tomcat's Jasper JSP compiler to compile a JSP file
- * into Java source code, and then Sun's javac implementation to compile the
- * Java source code into Java bytecode.
- * <p>
- * The resulting .class file is written under a "WEB-INF/classes" directory
- * under the "web root" defined by concrete subclasses through the
- * implementation of <tt>getWebRoot()</tt>. If you want the .class files to
- * be generated somewhere else than under the web root, you can also override
- * <tt>getClassOutputBaseDir()</tt>, which specifies the root directory for
- * the compiled .class files.
- * <p>
- * The resulting Servlet class gets its package based on the
- * <tt>getJspPackageName()</tt> method which can be overridden if necessary.
- * The default is "jsp" which means that, for example, a JSP named
- * "front_page.jsp" would eventually be translated into a class file
- * "[webroot]/WEB-INF/classes/jsp/front_page_jsp.class" where "jsp/" is the JSP
- * package name and "front_page_jsp.class" the normalized class name derived
- * from the source JSP file's name.
- *
- * @author Lasse Koskela
- */
-public class JasperCompiler {
-
- private static final Log log = LogFactory
- .getLog(JasperCompiler.class);
-
- private static JavaCompiler COMPILER = determineJavaCompiler();
-
- private String webRoot;
-
- private String classOutputBaseDir;
-
- private String jspPackageName;
-
- public JasperCompiler() {
- webRoot = ".";
- classOutputBaseDir = ".";
- }
-
- /**
- * Sets the "web root", i.e. the root directory of your exploded J2EE web
- * application. In other words, this is the directory under which you should
- * have a subdirectory named "WEB-INF".
- */
- public void setWebRoot(String webRoot) {
- this.webRoot = webRoot;
- }
-
- /**
- * Sets the directory where generated .class file(s) should be written..
- */
- public void setClassOutputBaseDir(String directory) {
- this.classOutputBaseDir = directory;
- }
-
- /**
- * Compile the specified JSP source file into bytecode.
- *
- * @param mockTaglibs
- * Mapping of tagnames to tag handler classes
- * @param jspPath
- * The path to the JSP source file to compile, given relative
- * to the web root.
- */
- public JspCompilationInfo compile(String path, Map mockTaglibs)
- throws Exception {
- JspCompilationInfo info = createJspCompilationInfo(path,
- mockTaglibs);
- if (info.jspCompilationRequired()) {
- compileJsp(info);
- compileJavaToBytecode(info);
- } else {
- log.debug(" No compilation needed for "
- + info.getJspSource());
- }
- return info;
- }
-
- /**
- * Sets the package name for the generated Java classes. The default package
- * name is "jsp".
- */
- public void setJspPackageName(String packageName) {
- this.jspPackageName = packageName;
- }
-
- /**
- * Returns the package name for the generated Java class.
- */
- private String getJspPackageName() {
- if (jspPackageName != null) {
- return jspPackageName;
- } else {
- return "jsp";
- }
- }
-
- private JspCompilationInfo createJspCompilationInfo(String jsp,
- Map mockTaglibs) {
- JspCompilationInfo info = new JspCompilationInfo();
- info.setJspPath(jsp);
- info.setClassOutputDir(classOutputBaseDir);
- info.setJspSource(resolveJspSourceFile(jsp));
- info.setWebRoot(getWebRoot());
- info.setTaglibs(mockTaglibs);
- resolveJavaSourceFile(info);
- resolveClassFileLocation(info);
- resolveClassName(info);
- return info;
- }
-
- private String getWebRoot() {
- File root = new File(webRoot);
- if (root.exists() && root.isDirectory()) {
- return root.getAbsolutePath();
- } else {
- return resolveWebRootFromClassPath();
- }
- }
-
- private String resolveWebRootFromClassPath() {
- String path = webRoot;
- if (path.startsWith("./")) {
- path = path.substring(2);
- }
- URL url = getClass().getClassLoader().getResource(path);
- if (url == null) {
- return webRoot;
- }
- if (!url.toExternalForm().startsWith("file:")) {
- log
- .info("Web root referenced a non-filesystem resource: "
- + url);
- return webRoot;
- }
- return new File(url.toExternalForm().substring(
- "file:".length())).getAbsolutePath();
- }
-
- private void compileJsp(JspCompilationInfo info) throws Exception {
- assertTrue("Source file "
- + new File(info.getJspSource()).getAbsolutePath()
- + " does not exist", new File(info.getJspSource())
- .exists());
- PrintWriter logWriter = new PrintWriter(new StringWriter());
- URL baseUrl = new File(info.getWebRoot()).toURL();
- ServletContext sContext = new JspCServletContext(logWriter,
- baseUrl);
- ServletConfig sConfig = new MockServletConfig(sContext);
- Options options = createOptions(sContext, sConfig, info);
- JspRuntimeContext rtContext = new JspRuntimeContext(sContext,
- options);
- JspServletWrapper sWrapper = makeWrapper(sContext, options,
- rtContext);
- JspCompilationContext cContext = createJspCompilationContext(
- info, sContext, options, rtContext, sWrapper,
- new StringWriter());
- logCompilation(info.getJspSource(), info.getClassOutputDir());
- compileJspToJava(sWrapper, cContext);
- File javaFile = new File(info.getJavaSource());
- assertTrue("Failed to generate .java source code to "
- + javaFile.getAbsolutePath(), javaFile.exists());
- info.compilationWasSuccessful();
- }
-
- private void compileJspToJava(
- JspServletWrapper jspServletWrapper,
- JspCompilationContext jspCompilationContext)
- throws FileNotFoundException, JasperException, Exception {
- Compiler compiler = new AntCompiler();
- compiler.init(jspCompilationContext, jspServletWrapper);
...
[truncated message content] |
|
From: <lko...@us...> - 2008-04-09 17:54:41
|
Revision: 205
http://jsptest.svn.sourceforge.net/jsptest/?rev=205&view=rev
Author: lkoskela
Date: 2008-04-09 10:54:21 -0700 (Wed, 09 Apr 2008)
Log Message:
-----------
[maven-release-plugin] prepare release jsptest-0.14
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-09 17:49:49 UTC (rev 204)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp12/pom.xml 2008-04-09 17:54:21 UTC (rev 205)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-acceptance</artifactId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</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-09 17:49:49 UTC (rev 204)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp20/pom.xml 2008-04-09 17:54:21 UTC (rev 205)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-acceptance</artifactId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</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-09 17:49:49 UTC (rev 204)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp21/pom.xml 2008-04-09 17:54:21 UTC (rev 205)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-acceptance</artifactId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-acceptance-jsp21</artifactId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</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-09 17:49:49 UTC (rev 204)
+++ trunk/jsptest-acceptance/pom.xml 2008-04-09 17:54:21 UTC (rev 205)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</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-09 17:49:49 UTC (rev 204)
+++ trunk/jsptest-generic/jsptest-common/pom.xml 2008-04-09 17:54:21 UTC (rev 205)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-generic</artifactId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-common</artifactId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</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-09 17:49:49 UTC (rev 204)
+++ trunk/jsptest-generic/jsptest-compiler-api/pom.xml 2008-04-09 17:54:21 UTC (rev 205)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-generic</artifactId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-compiler-api</artifactId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</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-09 17:49:49 UTC (rev 204)
+++ trunk/jsptest-generic/jsptest-framework/pom.xml 2008-04-09 17:54:21 UTC (rev 205)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-generic</artifactId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-framework</artifactId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</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.14-SNAPSHOT</version>
+ <version>0.14</version>
</dependency>
<dependency>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest-common</artifactId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
</dependency>
</dependencies>
</project>
Modified: trunk/jsptest-generic/pom.xml
===================================================================
--- trunk/jsptest-generic/pom.xml 2008-04-09 17:49:49 UTC (rev 204)
+++ trunk/jsptest-generic/pom.xml 2008-04-09 17:54:21 UTC (rev 205)
@@ -3,11 +3,11 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-generic</artifactId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</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-09 17:49:49 UTC (rev 204)
+++ trunk/jsptest-jsp12/pom.xml 2008-04-09 17:54:21 UTC (rev 205)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-jsp12</artifactId>
Modified: trunk/jsptest-jsp20/pom.xml
===================================================================
--- trunk/jsptest-jsp20/pom.xml 2008-04-09 17:49:49 UTC (rev 204)
+++ trunk/jsptest-jsp20/pom.xml 2008-04-09 17:54:21 UTC (rev 205)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-jsp20</artifactId>
Modified: trunk/jsptest-jsp21/pom.xml
===================================================================
--- trunk/jsptest-jsp21/pom.xml 2008-04-09 17:49:49 UTC (rev 204)
+++ trunk/jsptest-jsp21/pom.xml 2008-04-09 17:54:21 UTC (rev 205)
@@ -3,7 +3,7 @@
<parent>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>jsptest-jsp21</artifactId>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2008-04-09 17:49:49 UTC (rev 204)
+++ trunk/pom.xml 2008-04-09 17:54:21 UTC (rev 205)
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.sf.jsptest</groupId>
<artifactId>jsptest</artifactId>
- <version>0.14-SNAPSHOT</version>
+ <version>0.14</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.14</connection>
+ <developerConnection>scm:svn:https://jsptest.svn.sourceforge.net/svnroot/jsptest/tags/jsptest-0.14</developerConnection>
+ <url>http://jsptest.svn.sourceforge.net/viewvc/jsptest/tags/jsptest-0.14</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-04-09 17:49:59
|
Revision: 204
http://jsptest.svn.sourceforge.net/jsptest/?rev=204&view=rev
Author: lkoskela
Date: 2008-04-09 10:49:49 -0700 (Wed, 09 Apr 2008)
Log Message:
-----------
Fixed the issue with locating TLD files from inside archives in the class path (reported by Mathias Broekelmann)
Modified Paths:
--------------
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/TldLocation.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/mock/taglibs/TestClasspathTldLocator.java
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-04-09 17:47:50 UTC (rev 203)
+++ trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/ClasspathTldLocator.java 2008-04-09 17:49:49 UTC (rev 204)
@@ -22,14 +22,28 @@
public TldLocation find(String filename) {
try {
- String pathInsideArchive = "/META-INF/" + filename;
- URL resource = getClass().getResource(pathInsideArchive);
+ URL resource = getClass().getResource(
+ "/META-INF/" + filename);
if (resource != null) {
- return TldLocation.foundFromClassPath(resource,
- pathInsideArchive);
+ String filePath = extractFileUrlFrom(resource);
+ String resourcePath = null;
+ if ("jar".equals(resource.getProtocol())) {
+ resourcePath = "META-INF/" + filename;
+ }
+ return TldLocation.foundFromClassPath(filePath,
+ resourcePath);
}
} catch (Exception ignored) {
+ ignored.printStackTrace();
}
return TldLocation.notFound();
}
+
+ private String extractFileUrlFrom(URL resource) {
+ String path = resource.getPath();
+ if (path.indexOf("!") > -1) {
+ path = path.substring(0, path.indexOf("!"));
+ }
+ return path;
+ }
}
\ No newline at end of file
Modified: 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/TldLocation.java 2008-04-09 17:47:50 UTC (rev 203)
+++ trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/TldLocation.java 2008-04-09 17:49:49 UTC (rev 204)
@@ -16,74 +16,83 @@
package net.sf.jsptest.compiler.jsp20.mock.taglibs;
-import java.io.File;
-import java.net.MalformedURLException;
-import java.net.URL;
-
+/**
+ * @author Lasse Koskela
+ */
public class TldLocation {
- private final boolean wasFound;
+ private final boolean wasFound;
- protected TldLocation(boolean wasFound) {
- this.wasFound = wasFound;
- }
+ /**
+ * @param wasFound
+ * <tt>true</tt> means the TLD location was found,
+ * <tt>false</tt> means it wasn't found.
+ */
+ protected TldLocation(boolean wasFound) {
+ this.wasFound = wasFound;
+ }
- /**
- * Indicates whether the location was found or not.
- *
- * @return true if the TLD was found, false if it wasn't.
- */
- public boolean wasFound() {
- return wasFound;
- }
+ /**
+ * Indicates whether the location was found or not.
+ *
+ * @return true if the TLD was found, false if it wasn't.
+ */
+ public boolean wasFound() {
+ return wasFound;
+ }
- /**
- * <p>
- * Formats the location of the TLD into the array format used by
- * <tt>TldLocationsCache</tt>, i.e. an array in one of these formats:
- * </p>
- * <p> { "/WEB-INF/foo.tld", null } for exploded TLD files<br/> {
- * "file://url/to/taglibs.jar", "META-INF/foo.tld } for TLD files found in
- * archives
- * </p>
- */
- public String[] toArray() {
- return null;
- }
+ /**
+ * <p>
+ * Formats the location of the TLD into the array format used by
+ * <tt>TldLocationsCache</tt>, i.e. an array in one of these formats:
+ * </p>
+ * <p> { "/WEB-INF/foo.tld", null } for exploded TLD files<br/> {
+ * "file:/url/to/taglibs.jar", "META-INF/foo.tld } for TLD files found in
+ * archives
+ * </p>
+ */
+ public String[] toArray() {
+ return null;
+ }
- public static TldLocation notFound() {
- return new TldLocation(false);
- }
+ /**
+ * Creates a "not found" instance of TldLocation.
+ */
+ public static TldLocation notFound() {
+ return new TldLocation(false);
+ }
- public static TldLocation foundFromWebInf(final String filename) {
- return new TldLocation(true) {
- public String[] toArray() {
- return new String[] { "/WEB-INF/" + filename, null };
- }
- };
- }
+ /**
+ * Creates a <tt>TldLocation</tt> instance for a file located under
+ * WEB-INF.
+ *
+ * @param filename
+ * The base name of the TLD file, e.g. "c-rt.tld".
+ */
+ public static TldLocation foundFromWebInf(final String filename) {
+ return new TldLocation(true) {
+ public String[] toArray() {
+ return new String[] { "/WEB-INF/" + filename, null };
+ }
+ };
+ }
- public static TldLocation foundFromArchive(final File archive,
- final String archiveEntry) {
- return new TldLocation(true) {
- public String[] toArray() {
- try {
- String pathToArchive = archive.toURL().toExternalForm();
- return new String[] { pathToArchive, archiveEntry };
- } catch (MalformedURLException e) {
- throw new RuntimeException(e);
- }
- }
- };
- }
-
- public static TldLocation foundFromClassPath(final URL archive,
- final String pathInsideArchive) {
- return new TldLocation(true) {
- public String[] toArray() {
- String pathToArchive = archive.toExternalForm();
- return new String[] { pathToArchive, pathInsideArchive };
- }
- };
- }
+ /**
+ * Creates a <tt>TldLocation</tt> instance for a file located from the
+ * class path.
+ *
+ * @param pathToArchive
+ * URL to the archive containing the TLD file
+ * @param pathInsideArchive
+ * Path to the TLD file inside the archive
+ */
+ public static TldLocation foundFromClassPath(
+ final String pathToArchive, final String pathInsideArchive) {
+ return new TldLocation(true) {
+ public String[] toArray() {
+ return new String[] { pathToArchive,
+ pathInsideArchive };
+ }
+ };
+ }
}
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-04-09 17:47:50 UTC (rev 203)
+++ trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/WebInfLibTldLocator.java 2008-04-09 17:49:49 UTC (rev 204)
@@ -24,42 +24,45 @@
public class WebInfLibTldLocator implements TldLocator {
- private final String webRoot;
+ private final String webRoot;
- public WebInfLibTldLocator(String webRoot) {
- this.webRoot = webRoot;
- }
+ public WebInfLibTldLocator(String webRoot) {
+ this.webRoot = webRoot;
+ }
- public TldLocation find(String filename) {
- File webInfLib = new File(new File(webRoot, "WEB-INF"), "lib");
- if (webInfLib.exists()) {
- File[] archives = findArchivesFrom(webInfLib);
- return findTldFromArchives(filename, archives);
- } else {
- return TldLocation.notFound();
- }
- }
+ public TldLocation find(String filename) {
+ File webInfLib = new File(new File(webRoot, "WEB-INF"), "lib");
+ if (webInfLib.exists()) {
+ File[] archives = findArchivesFrom(webInfLib);
+ return findTldFromArchives(filename, archives);
+ } else {
+ return TldLocation.notFound();
+ }
+ }
- private TldLocation findTldFromArchives(String filename, File[] archives) {
- for (int i = 0; i < archives.length; i++) {
- try {
- JarFile archive = new JarFile(archives[i]);
- JarEntry entry = archive.getJarEntry("META-INF/" + filename);
- if (entry != null) {
- return TldLocation.foundFromArchive(archives[i],
- "META-INF/" + filename);
- }
- } catch (IOException ignored) {
- }
- }
- return TldLocation.notFound();
- }
+ private TldLocation findTldFromArchives(String filename,
+ File[] archives) {
+ for (int i = 0; i < archives.length; i++) {
+ try {
+ JarFile archive = new JarFile(archives[i]);
+ JarEntry entry = archive.getJarEntry("META-INF/"
+ + filename);
+ if (entry != null) {
+ return TldLocation.foundFromClassPath(archives[i]
+ .toURL().toString(), "META-INF/"
+ + filename);
+ }
+ } catch (IOException ignored) {
+ }
+ }
+ return TldLocation.notFound();
+ }
- private File[] findArchivesFrom(File dir) {
- return dir.listFiles(new FilenameFilter() {
- public boolean accept(File directory, String name) {
- return name.endsWith(".jar");
- }
- });
- }
+ private File[] findArchivesFrom(File dir) {
+ return dir.listFiles(new FilenameFilter() {
+ public boolean accept(File directory, String name) {
+ return name.endsWith(".jar");
+ }
+ });
+ }
}
\ No newline at end of file
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-04-09 17:47:50 UTC (rev 203)
+++ trunk/jsptest-jsp20/src/test/java/net/sf/jsptest/compiler/jsp20/mock/taglibs/TestClasspathTldLocator.java 2008-04-09 17:49:49 UTC (rev 204)
@@ -1,22 +1,41 @@
package net.sf.jsptest.compiler.jsp20.mock.taglibs;
+import java.io.File;
+
import junit.framework.TestCase;
public class TestClasspathTldLocator extends TestCase {
- private ClasspathTldLocator locator;
+ private TldLocator locator;
protected void setUp() throws Exception {
super.setUp();
locator = new ClasspathTldLocator();
}
+ public void testMissingFilesAreReportedAsNotFound()
+ throws Exception {
+ assertFalse(locator.find("nosuchfile.tld").wasFound());
+ }
+
public void testTldFilesAreFoundFromClasspath() throws Exception {
- assertTrue(locator.find("exists.tld").wasFound());
+ TldLocation location = locator.find("exists.tld");
+ assertTrue(location.wasFound());
+ assertTrue(new File(location.toArray()[0]).exists());
+ assertNull(location.toArray()[1]);
}
- public void testMissingFilesAreReportedAsNotFound()
+ public void testValidLocationIfTldFilesAreFoundFromJarInClasspath()
throws Exception {
- assertFalse(locator.find("nosuchfile.tld").wasFound());
+ TldLocation location = locator.find("c.tld");
+ assertTrue(location.wasFound());
+ String[] array = location.toArray();
+ assertEquals(2, array.length);
+ assertFalse("location must not start with 'jar:' : "
+ + array[0], array[0].startsWith("jar:"));
+ assertFalse(
+ "location must not end with '.tld' : " + array[0],
+ array[0].endsWith(".tld"));
+ assertEquals(array[1], "META-INF/c.tld");
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lko...@us...> - 2008-04-09 17:48:03
|
Revision: 203
http://jsptest.svn.sourceforge.net/jsptest/?rev=203&view=rev
Author: lkoskela
Date: 2008-04-09 10:47:50 -0700 (Wed, 09 Apr 2008)
Log Message:
-----------
Fixed javadocs
Modified Paths:
--------------
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
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-04-09 17:46:22 UTC (rev 202)
+++ trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperCompiler.java 2008-04-09 17:47:50 UTC (rev 203)
@@ -115,11 +115,11 @@
/**
* Compile the specified JSP source file into bytecode.
*
+ * @param path
+ * The path to the JSP source file to compile, given relative
+ * to the web root.
* @param mockTaglibs
* Mapping of tagnames to tag handler classes
- * @param jspPath
- * The path to the JSP source file to compile, given relative
- * to the web root.
*/
public JspCompilationInfo compile(String path, Map mockTaglibs)
throws Exception {
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-04-09 17:46:22 UTC (rev 202)
+++ trunk/jsptest-jsp20/src/main/java/net/sf/jsptest/compiler/jsp20/JasperExecution.java 2008-04-09 17:47:50 UTC (rev 203)
@@ -116,7 +116,6 @@
*
* @param path
* The resource path to query.
- * @return The rendered page.
* @throws Exception
*/
protected void get(String path) throws Exception {
@@ -129,7 +128,6 @@
*
* @param path
* The resource path to query.
- * @return The rendered page.
* @throws Exception
*/
protected void post(String path) throws Exception {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <lko...@us...> - 2008-04-09 17:46:31
|
Revision: 202
http://jsptest.svn.sourceforge.net/jsptest/?rev=202&view=rev
Author: lkoskela
Date: 2008-04-09 10:46:22 -0700 (Wed, 09 Apr 2008)
Log Message:
-----------
Request and session attributes can now be Objects rather than Strings
Modified Paths:
--------------
trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/RequestAndSessionAttributeTest.java
trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/JspTestCase.java
Property Changed:
----------------
trunk/jsptest-generic/jsptest-framework/
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-04-09 17:38:59 UTC (rev 201)
+++ trunk/jsptest-acceptance/jsptest-acceptance-jsp20/src/test/java/net/sf/jsptest/acceptance/jsp/RequestAndSessionAttributeTest.java 2008-04-09 17:46:22 UTC (rev 202)
@@ -43,6 +43,15 @@
output().shouldContain("session attribute: 'Sn2'='Sv2'");
}
+ public void testRequestAndSessionAttributesCanBeObjects()
+ throws Exception {
+ setRequestAttribute("request", (Object) "1");
+ setSessionAttribute("session", (Object) new Integer(2));
+ get("/echo_attributes.jsp");
+ output().shouldContain("request attribute: 'request'='1'");
+ output().shouldContain("session attribute: 'session'='2'");
+ }
+
public void testSessionAndRequestAttributesDontOverrideEachOther()
throws Exception {
setRequestAttribute("name", "request");
Property changes on: trunk/jsptest-generic/jsptest-framework
___________________________________________________________________
Name: svn:ignore
- .classpath
.project
.settings
target
+ .classpath
.project
.settings
target
agitar
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-04-09 17:38:59 UTC (rev 201)
+++ trunk/jsptest-generic/jsptest-framework/src/main/java/net/sf/jsptest/JspTestCase.java 2008-04-09 17:46:22 UTC (rev 202)
@@ -76,7 +76,7 @@
* @param value
* Value for the attribute.
*/
- protected void setSessionAttribute(String attribute, String value) {
+ protected void setSessionAttribute(String attribute, Object value) {
sessionAttributes.put(attribute, value);
}
@@ -88,7 +88,7 @@
* @param value
* Value for the attribute.
*/
- protected void setRequestAttribute(String attribute, String value) {
+ protected void setRequestAttribute(String attribute, Object value) {
requestAttributes.put(attribute, value);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
