(TRINIDAD-2550)
Create a Trinidad 2.2.x version with more jsf 2.2 features
initial changes
diff --git a/pom.xml b/pom.xml
index e0c3502..f3372e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,15 +60,16 @@
<properties>
<!-- Standards -->
- <jdk.version>1.6</jdk.version>
- <servlet.version>2.5</servlet.version>
+ <jdk.version>1.7</jdk.version>
+ <servlet.version>3.0</servlet.version>
<portlet.version>2.0</portlet.version>
<validation.version>1.0.0.GA</validation.version>
<jsp.version>2.1</jsp.version>
<jstl.version>1.2</jstl.version>
+ <!-- TODO jsf spec 2.2 -->
<jsf-spec.version>2.1</jsf-spec.version>
- <jsf-ri.version>2.1.29-08</jsf-ri.version>
- <jsf-myfaces.version>2.1.18</jsf-myfaces.version>
+ <jsf-ri.version>2.2.14</jsf-ri.version>
+ <jsf-myfaces.version>2.2.12</jsf-myfaces.version>
<portlet-bridge.version>2.0.0</portlet-bridge.version>
<commons-lang.version>2.4</commons-lang.version>
<commons-io.version>2.0</commons-io.version>
@@ -77,19 +78,19 @@
<pluto-embedded.version>1.0.1</pluto-embedded.version>
<!-- Testing -->
- <shale.version>1.0.5</shale.version>
+ <myfaces-test.version>1.0.5</myfaces-test.version>
<jmock.version>1.2.0</jmock.version>
<junit.version>4.4</junit.version>
<!-- Plugins -->
- <trinidad-plugins.version>2.0.8</trinidad-plugins.version>
+ <trinidad-plugins.version>2.0.9-SNAPSHOT</trinidad-plugins.version>
<wagon-plugin.version>1.0.6</wagon-plugin.version>
- <jetty.groupId>org.mortbay.jetty</jetty.groupId>
- <jetty-plugin.version>7.6.9.v20130131</jetty-plugin.version>
+ <jetty.groupId>org.eclipse.jetty</jetty.groupId>
+ <jetty-plugin.version>9.2.21.v20170120</jetty-plugin.version>
<pluto.version>1.1.6</pluto.version>
<pluto.package>org.apache.pluto</pluto.package>
<myfaces-builder-plugin.version>1.0.9</myfaces-builder-plugin.version>
-
+ <slf4j.version>1.5.10</slf4j.version>
<!-- Enforcer -->
<maven.min-version>3.0</maven.min-version>
<jdk.min-version>1.6.0</jdk.min-version>
@@ -204,23 +205,50 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${servlet.version}</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <version>1.0</version>
<scope>provided</scope>
</dependency>
-
+ <!-- JSP 2.1 -->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jsp_2.1_spec</artifactId>
+ <version>1.0.1</version>
+ <scope>provided</scope>
+ <exclusions>
+ <!-- we want to use el 2.2 -->
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_1.0_spec</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- JSTL 1.2 -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
- <version>${jstl.version}</version>
+ <version>1.2</version>
+ <scope>provided</scope>
+ <exclusions>
+ <!-- we already have a jsp-api -->
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- el 2.2 (javax.el.*) -->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_2.2_spec</artifactId>
+ <version>1.0.1</version>
<scope>provided</scope>
</dependency>
-
+ <!-- bean-validation 1.0 (javax.validation.*) -->
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
- <version>${jsp.version}</version>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-validation_1.0_spec</artifactId>
<scope>provided</scope>
</dependency>
@@ -335,9 +363,16 @@
</dependency>
<dependency>
- <groupId>org.apache.shale</groupId>
- <artifactId>shale-test</artifactId>
- <version>${shale.version}</version>
+ <groupId>org.apache.myfaces.test</groupId>
+ <artifactId>myfaces-test22</artifactId>
+ <version>1.0.7</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.1</version>
<scope>test</scope>
</dependency>
@@ -1035,23 +1070,7 @@
</dependencies>
</dependencyManagement>
</profile>
-
- <profile>
- <id>jsfversion</id>
- <activation>
- <property>
- <name>jsfversion</name>
- <value>2.2</value>
- </property>
- </activation>
- <properties>
- <jsf-ri.version>2.2.14</jsf-ri.version>
- <jsf-myfaces.version>2.2.12</jsf-myfaces.version>
- <jetty.groupId>org.eclipse.jetty</jetty.groupId>
- <jetty-plugin.version>9.2.21.v20170120</jetty-plugin.version>
- </properties>
- </profile>
-
+
</profiles>
</project>
diff --git a/trinidad-api/pom.xml b/trinidad-api/pom.xml
index 4fcd5f2..e7260d7 100644
--- a/trinidad-api/pom.xml
+++ b/trinidad-api/pom.xml
@@ -46,13 +46,18 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jsp_2.1_spec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_2.2_spec</artifactId>
</dependency>
<dependency>
@@ -65,7 +70,6 @@
<artifactId>validation-api</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.myfaces.portlet-bridge</groupId>
<artifactId>portlet-bridge-api</artifactId>
@@ -90,8 +94,13 @@
</dependency>
<dependency>
- <groupId>org.apache.shale</groupId>
- <artifactId>shale-test</artifactId>
+ <groupId>org.apache.myfaces.test</groupId>
+ <artifactId>myfaces-test22</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
</dependency>
<dependency>
@@ -103,7 +112,7 @@
<groupId>jmock</groupId>
<artifactId>jmock-cglib</artifactId>
</dependency>
- <dependency>
+ <dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<scope>test</scope>
@@ -262,7 +271,7 @@
<configuration>
<typePrefix>org.apache</typePrefix>
<packageContains>org.apache</packageContains>
- <jsfVersion>#{jsf-spec.version}</jsfVersion>
+ <jsfVersion>${jsf-spec.version}</jsfVersion>
<!--suppressListenerMethods>true</suppressListenerMethods-->
<force>true</force>
<generatedSourceDirectory>${project.build.directory}/generated-sources/maven-faces-plugin</generatedSourceDirectory>
diff --git a/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/ConverterTestCase.java b/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/ConverterTestCase.java
index 399769c..05bc92c 100644
--- a/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/ConverterTestCase.java
+++ b/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/ConverterTestCase.java
@@ -25,7 +25,7 @@
import org.apache.myfaces.trinidadbuild.test.AbstractBaseTestCase;
import org.apache.myfaces.trinidadbuild.test.MockUIComponentWrapper;
-import org.apache.shale.test.mock.MockFacesContext;
+import org.apache.myfaces.test.mock.MockFacesContext;
import org.jmock.Mock;
/**
diff --git a/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/JsfDateTimeConverterTest.java b/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/JsfDateTimeConverterTest.java
index 7ccc71e..7d42c42 100644
--- a/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/JsfDateTimeConverterTest.java
+++ b/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/JsfDateTimeConverterTest.java
@@ -26,7 +26,7 @@
import junit.framework.TestSuite;
import org.apache.myfaces.trinidadbuild.test.MockUIComponentWrapper;
-import org.apache.shale.test.mock.MockFacesContext;
+import org.apache.myfaces.test.mock.MockFacesContext;
public class JsfDateTimeConverterTest extends DateTimeConverterTestCase
{
diff --git a/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/JsfNumberConverterTest.java b/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/JsfNumberConverterTest.java
index 178c6d0..a72126c 100644
--- a/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/JsfNumberConverterTest.java
+++ b/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/JsfNumberConverterTest.java
@@ -28,7 +28,7 @@
import junit.framework.TestSuite;
import org.apache.myfaces.trinidadbuild.test.MockUIComponentWrapper;
-import org.apache.shale.test.mock.MockFacesContext;
+import org.apache.myfaces.test.mock.MockFacesContext;
/**
* Test JSF NumberConverter
diff --git a/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/NumberConverterTestCase.java b/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/NumberConverterTestCase.java
index c271893..d5fcc17 100644
--- a/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/NumberConverterTestCase.java
+++ b/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/NumberConverterTestCase.java
@@ -26,7 +26,7 @@
import org.apache.myfaces.trinidad.convert.ConverterTestCase;
import org.apache.myfaces.trinidadbuild.test.MockUIComponentWrapper;
-import org.apache.shale.test.mock.MockFacesContext;
+import org.apache.myfaces.test.mock.MockFacesContext;
import org.jmock.Mock;
/**
diff --git a/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadDateTimeConverterTest.java b/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadDateTimeConverterTest.java
index d529c49..734c58d 100644
--- a/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadDateTimeConverterTest.java
+++ b/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadDateTimeConverterTest.java
@@ -34,7 +34,7 @@
import org.apache.myfaces.trinidad.context.MockRequestContext;
import org.apache.myfaces.trinidad.convert.DateTimeConverter;
import org.apache.myfaces.trinidadbuild.test.MockUIComponentWrapper;
-import org.apache.shale.test.mock.MockFacesContext;
+import org.apache.myfaces.test.mock.MockFacesContext;
import org.jmock.Mock;
public class TrinidadDateTimeConverterTest extends DateTimeConverterTestCase
diff --git a/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadNumberConverterTest.java b/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadNumberConverterTest.java
index bcf37c2..bde1056 100644
--- a/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadNumberConverterTest.java
+++ b/trinidad-api/src/test/java/org/apache/myfaces/trinidad/convert/TrinidadNumberConverterTest.java
@@ -30,7 +30,7 @@
import org.apache.myfaces.trinidad.context.MockRequestContext;
import org.apache.myfaces.trinidadbuild.test.MockUIComponentWrapper;
import org.apache.myfaces.trinidadbuild.test.MockFacesContext12;
-import org.apache.shale.test.mock.MockFacesContext;
+import org.apache.myfaces.test.mock.MockFacesContext;
import org.jmock.Mock;
import junit.framework.Test;
diff --git a/trinidad-api/src/test/java/org/apache/myfaces/trinidad/model/ChildPropertyTreeModelTest.java b/trinidad-api/src/test/java/org/apache/myfaces/trinidad/model/ChildPropertyTreeModelTest.java
index 876da57..c249860 100644
--- a/trinidad-api/src/test/java/org/apache/myfaces/trinidad/model/ChildPropertyTreeModelTest.java
+++ b/trinidad-api/src/test/java/org/apache/myfaces/trinidad/model/ChildPropertyTreeModelTest.java
@@ -29,7 +29,7 @@
import org.apache.myfaces.trinidad.model.ChildPropertyTreeModel;
import org.apache.myfaces.trinidad.model.TreeModel;
-import org.apache.shale.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.AbstractJsfTestCase;
public class ChildPropertyTreeModelTest extends AbstractJsfTestCase
{
diff --git a/trinidad-api/src/test/java/org/apache/myfaces/trinidad/model/RowKeySetImplTest.java b/trinidad-api/src/test/java/org/apache/myfaces/trinidad/model/RowKeySetImplTest.java
index 8198807..c2732ac 100644
--- a/trinidad-api/src/test/java/org/apache/myfaces/trinidad/model/RowKeySetImplTest.java
+++ b/trinidad-api/src/test/java/org/apache/myfaces/trinidad/model/RowKeySetImplTest.java
@@ -38,7 +38,7 @@
import org.apache.myfaces.trinidad.model.CollectionModel;
import org.apache.myfaces.trinidad.model.ModelUtils;
import org.apache.myfaces.trinidad.model.RowKeySetImpl;
-import org.apache.shale.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.AbstractJsfTestCase;
/**
* Test for the RowKeySetImpl class.
diff --git a/trinidad-api/src/test/java/org/apache/myfaces/trinidad/model/RowKeySetTreeImplTest.java b/trinidad-api/src/test/java/org/apache/myfaces/trinidad/model/RowKeySetTreeImplTest.java
index eef41f2..765c92d 100644
--- a/trinidad-api/src/test/java/org/apache/myfaces/trinidad/model/RowKeySetTreeImplTest.java
+++ b/trinidad-api/src/test/java/org/apache/myfaces/trinidad/model/RowKeySetTreeImplTest.java
@@ -35,7 +35,7 @@
import org.apache.myfaces.trinidad.model.RowKeySet;
import org.apache.myfaces.trinidad.model.RowKeySetTreeImpl;
import org.apache.myfaces.trinidad.model.TreeModel;
-import org.apache.shale.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.AbstractJsfTestCase;
/**
* There is a hardcoded dependency between this test and the SortableModel implementation that
diff --git a/trinidad-api/src/test/java/org/apache/myfaces/trinidad/model/SortableModelTest.java b/trinidad-api/src/test/java/org/apache/myfaces/trinidad/model/SortableModelTest.java
index 614963a..ae37cbe 100644
--- a/trinidad-api/src/test/java/org/apache/myfaces/trinidad/model/SortableModelTest.java
+++ b/trinidad-api/src/test/java/org/apache/myfaces/trinidad/model/SortableModelTest.java
@@ -30,7 +30,7 @@
import org.apache.myfaces.trinidad.model.CollectionModel;
import org.apache.myfaces.trinidad.model.SortCriterion;
import org.apache.myfaces.trinidad.model.SortableModel;
-import org.apache.shale.test.base.AbstractJsfTestCase;
+import org.apache.myfaces.test.base.AbstractJsfTestCase;
/**
*/
diff --git a/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/DateRestrictionValidatorTest.java b/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/DateRestrictionValidatorTest.java
index 64c947f..916db83 100644
--- a/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/DateRestrictionValidatorTest.java
+++ b/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/DateRestrictionValidatorTest.java
@@ -32,7 +32,7 @@
import org.apache.myfaces.trinidad.context.MockRequestContext;
import org.apache.myfaces.trinidadbuild.test.MockUIComponentWrapper;
-import org.apache.shale.test.mock.MockApplication;
+import org.apache.myfaces.test.mock.MockApplication;
import org.jmock.Mock;
/**
diff --git a/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/DateTimeRangeValidatorTest.java b/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/DateTimeRangeValidatorTest.java
index a8a9c76..fabf8be 100644
--- a/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/DateTimeRangeValidatorTest.java
+++ b/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/DateTimeRangeValidatorTest.java
@@ -28,7 +28,7 @@
import junit.framework.TestSuite;
import org.apache.myfaces.trinidadbuild.test.MockUIComponentWrapper;
-import org.apache.shale.test.mock.MockApplication;
+import org.apache.myfaces.test.mock.MockApplication;
import org.jmock.Mock;
/**
diff --git a/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/ValidatorTestCase.java b/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/ValidatorTestCase.java
index 5d4f4ba..d7924c1 100644
--- a/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/ValidatorTestCase.java
+++ b/trinidad-api/src/test/java/org/apache/myfaces/trinidad/validator/ValidatorTestCase.java
@@ -28,7 +28,7 @@
import org.apache.myfaces.trinidadbuild.test.AbstractBaseTestCase;
import org.apache.myfaces.trinidadbuild.test.MockUIComponentWrapper;
-import org.apache.shale.test.mock.MockFacesContext;
+import org.apache.myfaces.test.mock.MockFacesContext;
import org.jmock.Mock;
/**
diff --git a/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/AbstractBaseTestCase.java b/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/AbstractBaseTestCase.java
index 0fb3bff..9758d6b 100644
--- a/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/AbstractBaseTestCase.java
+++ b/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/AbstractBaseTestCase.java
@@ -25,7 +25,7 @@
import javax.faces.component.UIViewRoot;
import javax.faces.context.FacesContext;
-import org.apache.shale.test.jmock.AbstractJmockJsfTestCase;
+import org.apache.myfaces.test.jmock.AbstractJmockJsfTestCase;
import org.jmock.Mock;
public abstract class AbstractBaseTestCase extends AbstractJmockJsfTestCase
diff --git a/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/FacesTestCase.java b/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/FacesTestCase.java
index 7e43f66..3b67369 100644
--- a/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/FacesTestCase.java
+++ b/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/FacesTestCase.java
@@ -29,9 +29,9 @@
import javax.faces.render.RenderKit;
import javax.faces.render.RenderKitFactory;
-import org.apache.shale.test.jmock.AbstractJmockJsfTestCase;
-import org.apache.shale.test.mock.MockFacesContext;
-import org.apache.shale.test.mock.MockRenderKitFactory;
+import org.apache.myfaces.test.jmock.AbstractJmockJsfTestCase;
+import org.apache.myfaces.test.mock.MockFacesContext;
+import org.apache.myfaces.test.mock.MockRenderKitFactory;
import org.jmock.Mock;
/**
diff --git a/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/MockFacesContext12.java b/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/MockFacesContext12.java
index 70674d2..e0729db 100644
--- a/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/MockFacesContext12.java
+++ b/trinidad-api/src/test/java/org/apache/myfaces/trinidadbuild/test/MockFacesContext12.java
@@ -36,8 +36,8 @@
import javax.faces.event.SystemEvent;
import javax.faces.lifecycle.Lifecycle;
-import org.apache.shale.test.mock.MockFacesContext;
-import org.apache.shale.test.mock.MockApplication12;
+import org.apache.myfaces.test.mock.MockFacesContext;
+import org.apache.myfaces.test.mock.MockApplication12;
public class MockFacesContext12 extends MockFacesContext
diff --git a/trinidad-assembly/pom.xml b/trinidad-assembly/pom.xml
index dd3524f..6c2d695 100644
--- a/trinidad-assembly/pom.xml
+++ b/trinidad-assembly/pom.xml
@@ -159,6 +159,14 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jsp_2.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -173,6 +181,14 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jsp_2.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -187,6 +203,14 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jsp_2.1_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
diff --git a/trinidad-example/pom.xml b/trinidad-example/pom.xml
index 3443a84..baff626 100644
--- a/trinidad-example/pom.xml
+++ b/trinidad-example/pom.xml
@@ -248,6 +248,21 @@
<groupId>org.apache.myfaces.core</groupId>
<artifactId>myfaces-impl</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
</dependencies>
</profile>
diff --git a/trinidad-example/trinidad-blank/src/main/webapp/index.html b/trinidad-example/trinidad-blank/src/main/webapp/index.html
index 2e88b28..12a47c9 100644
--- a/trinidad-example/trinidad-blank/src/main/webapp/index.html
+++ b/trinidad-example/trinidad-blank/src/main/webapp/index.html
@@ -18,7 +18,10 @@
-->
<html>
-<head>
-<meta http-equiv="refresh" content="0; URL=faces/page1.jspx">
-</head>
+ <head>
+ <meta http-equiv="refresh" content="0; URL=faces/page1.jspx">
+ <meta http-equiv="cache-control" content="no-cache" />
+ <meta http-equiv="expires" content="0" />
+ <meta http-equiv="pragma" content="no-cache" />
+ </head>
</html>
diff --git a/trinidad-example/trinidad-components-showcase/pom.xml b/trinidad-example/trinidad-components-showcase/pom.xml
index 6c650f2..b546efc 100644
--- a/trinidad-example/trinidad-components-showcase/pom.xml
+++ b/trinidad-example/trinidad-components-showcase/pom.xml
@@ -37,13 +37,18 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jsp_2.1_spec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_2.2_spec</artifactId>
</dependency>
<dependency>
diff --git a/trinidad-example/trinidad-demo/pom.xml b/trinidad-example/trinidad-demo/pom.xml
index 6dcd9c8..4c2b1ac 100644
--- a/trinidad-example/trinidad-demo/pom.xml
+++ b/trinidad-example/trinidad-demo/pom.xml
@@ -39,15 +39,17 @@
<artifactId>hibernate-validator</artifactId>
<version>4.0.0.GA</version>
</dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.4.2</version>
+ <version>${slf4j.version}</version>
</dependency>
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>1.4.2</version>
+ <version>${slf4j.version}</version>
</dependency>
<dependency>
@@ -63,13 +65,18 @@
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jsp_2.1_spec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_2.2_spec</artifactId>
</dependency>
<dependency>
diff --git a/trinidad-impl/pom.xml b/trinidad-impl/pom.xml
index a33d311..d7487e2 100644
--- a/trinidad-impl/pom.xml
+++ b/trinidad-impl/pom.xml
@@ -36,13 +36,18 @@
<dependencies>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
</dependency>
<dependency>
- <groupId>javax.servlet.jsp</groupId>
- <artifactId>jsp-api</artifactId>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jsp_2.1_spec</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_2.2_spec</artifactId>
</dependency>
<dependency>
@@ -112,11 +117,16 @@
</dependency>
<dependency>
- <groupId>org.apache.shale</groupId>
- <artifactId>shale-test</artifactId>
+ <groupId>org.apache.myfaces.test</groupId>
+ <artifactId>myfaces-test22</artifactId>
</dependency>
<dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>
</dependency>
diff --git a/trinidad-impl/src/main/resources/META-INF/trinidad-version.txt b/trinidad-impl/src/main/resources/META-INF/trinidad-version.txt
index 2c32340..8230346 100644
--- a/trinidad-impl/src/main/resources/META-INF/trinidad-version.txt
+++ b/trinidad-impl/src/main/resources/META-INF/trinidad-version.txt
@@ -1 +1 @@
-2_1_3_SNAPSHOT
+2_2_0_SNAPSHOT
diff --git a/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MFacesContext.java b/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MFacesContext.java
index 879e4f3..853d31a 100644
--- a/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MFacesContext.java
+++ b/trinidad-impl/src/test/java/org/apache/myfaces/trinidadinternal/renderkit/MFacesContext.java
@@ -43,8 +43,8 @@
import org.apache.myfaces.trinidad.context.RequestContext;
import org.apache.myfaces.trinidadinternal.share.config.Configuration;
import org.apache.myfaces.trinidadbuild.test.MockFacesContext12;
-import org.apache.shale.test.mock.MockExternalContext;
-import org.apache.shale.test.mock.MockServletContext;
+import org.apache.myfaces.test.mock.MockExternalContext;
+import org.apache.myfaces.test.mock.MockServletContext;
/**
* Mock faces context for use with unit tests
