Author: apetrelli
Date: Tue Jun 30 12:43:14 2009
New Revision: 789695
URL: http://svn.apache.org/viewvc?rev=789695&view=rev
Log:
TILES-356
Upgraded commons-digester to 2.0.
Upgraded portlet-api to 2.0 and removed some @SuppressWarning annotation.
Modified:
tiles/framework/trunk/tiles-core/pom.xml
tiles/framework/trunk/tiles-portlet/pom.xml
tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletApplicationScopeMap.java
tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletInitParamMap.java
tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletParamMap.java
tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletParamValuesMap.java
tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletRequestScopeMap.java
tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletSessionScopeMap.java
Modified: tiles/framework/trunk/tiles-core/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/pom.xml?rev=789695&r1=789694&r2=789695&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-core/pom.xml (original)
+++ tiles/framework/trunk/tiles-core/pom.xml Tue Jun 30 12:43:14 2009
@@ -94,7 +94,7 @@
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
- <version>1.8.1</version>
+ <version>2.0</version>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>
@@ -160,7 +160,7 @@
<dependency>
<groupId>org.mvel</groupId>
<artifactId>mvel2</artifactId>
- <version>2.0.10</version>
+ <version>2.0.11</version>
<optional>true</optional>
</dependency>
Modified: tiles/framework/trunk/tiles-portlet/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-portlet/pom.xml?rev=789695&r1=789694&r2=789695&view=diff
==============================================================================
--- tiles/framework/trunk/tiles-portlet/pom.xml (original)
+++ tiles/framework/trunk/tiles-portlet/pom.xml Tue Jun 30 12:43:14 2009
@@ -114,7 +114,7 @@
<dependency>
<groupId>javax.portlet</groupId>
<artifactId>portlet-api</artifactId>
- <version>1.0</version>
+ <version>2.0</version>
<scope>provided</scope>
</dependency>
Modified:
tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletApplicationScopeMap.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletApplicationScopeMap.java?rev=789695&r1=789694&r2=789695&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletApplicationScopeMap.java
(original)
+++
tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletApplicationScopeMap.java
Tue Jun 30 12:43:14 2009
@@ -77,7 +77,6 @@
/** {...@inheritdoc} */
- @SuppressWarnings("unchecked")
public boolean containsValue(Object value) {
if (value == null) {
return (false);
@@ -94,7 +93,6 @@
/** {...@inheritdoc} */
- @SuppressWarnings("unchecked")
public Set<Map.Entry<String, Object>> entrySet() {
Set<Map.Entry<String, Object>> set = new HashSet<Map.Entry<String,
Object>>();
Enumeration<String> keys = context.getAttributeNames();
@@ -108,7 +106,6 @@
/** {...@inheritdoc} */
- @SuppressWarnings("unchecked")
public boolean equals(Object o) {
PortletContext otherContext = ((PortletApplicationScopeMap) o).context;
boolean retValue = true;
@@ -145,7 +142,6 @@
/** {...@inheritdoc} */
- @SuppressWarnings("unchecked")
public Set<String> keySet() {
Set<String> set = new HashSet<String>();
Enumeration<String> keys = context.getAttributeNames();
@@ -188,7 +184,6 @@
/** {...@inheritdoc} */
- @SuppressWarnings("unchecked")
public int size() {
int n = 0;
Enumeration<String> keys = context.getAttributeNames();
@@ -201,7 +196,6 @@
/** {...@inheritdoc} */
- @SuppressWarnings("unchecked")
public Collection<Object> values() {
List<Object> list = new ArrayList<Object>();
Enumeration<String> keys = context.getAttributeNames();
Modified:
tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletInitParamMap.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletInitParamMap.java?rev=789695&r1=789694&r2=789695&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletInitParamMap.java
(original)
+++
tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletInitParamMap.java
Tue Jun 30 12:43:14 2009
@@ -85,7 +85,6 @@
/** {...@inheritdoc} */
- @SuppressWarnings("unchecked")
public Set<Map.Entry<String, String>> entrySet() {
Set<Map.Entry<String, String>> set = new HashSet<Map.Entry<String,
String>>();
Enumeration<String> keys = context.getInitParameterNames();
@@ -99,7 +98,6 @@
/** {...@inheritdoc} */
- @SuppressWarnings("unchecked")
public boolean equals(Object o) {
PortletContext otherContext = ((PortletInitParamMap) o).context;
boolean retValue = true;
@@ -136,7 +134,6 @@
/** {...@inheritdoc} */
- @SuppressWarnings("unchecked")
public Set<String> keySet() {
Set<String> set = new HashSet<String>();
Enumeration<String> keys = context.getInitParameterNames();
@@ -166,7 +163,6 @@
/** {...@inheritdoc} */
- @SuppressWarnings("unchecked")
public int size() {
int n = 0;
Enumeration<String> keys = context.getInitParameterNames();
@@ -179,7 +175,6 @@
/** {...@inheritdoc} */
- @SuppressWarnings("unchecked")
public Collection<String> values() {
List<String> list = new ArrayList<String>();
Enumeration<String> keys = context.getInitParameterNames();
Modified:
tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletParamMap.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletParamMap.java?rev=789695&r1=789694&r2=789695&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletParamMap.java
(original)
+++
tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletParamMap.java
Tue Jun 30 12:43:14 2009
@@ -85,7 +85,6 @@
/** {...@inheritdoc} */
- @SuppressWarnings("unchecked")
public Set<Map.Entry<String, String>> entrySet() {
Set<Map.Entry<String, String>> set = new HashSet<Map.Entry<String,
String>>();
Enumeration<String> keys = request.getParameterNames();
@@ -100,7 +99,6 @@
/** {...@inheritdoc} */
- @SuppressWarnings("unchecked")
public boolean equals(Object o) {
PortletRequest otherRequest = ((PortletParamMap) o).request;
boolean retValue = true;
@@ -137,7 +135,6 @@
/** {...@inheritdoc} */
- @SuppressWarnings("unchecked")
public Set<String> keySet() {
Set<String> set = new HashSet<String>();
Enumeration<String> keys = request.getParameterNames();
@@ -167,7 +164,6 @@
/** {...@inheritdoc} */
- @SuppressWarnings("unchecked")
public int size() {
int n = 0;
Enumeration<String> keys = request.getParameterNames();
@@ -180,7 +176,6 @@
/** {...@inheritdoc} */
- @SuppressWarnings("unchecked")
public Collection<String> values() {
List<String> list = new ArrayList<String>();
Enumeration<String> keys = request.getParameterNames();
Modified:
tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletParamValuesMap.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletParamValuesMap.java?rev=789695&r1=789694&r2=789695&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletParamValuesMap.java
(original)
+++
tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletParamValuesMap.java
Tue Jun 30 12:43:14 2009
@@ -100,7 +100,6 @@
/** {...@inheritdoc} */
- @SuppressWarnings("unchecked")
public Set<Map.Entry<String, String[]>> entrySet() {
Set<Map.Entry<String, String[]>> set = new HashSet<Map.Entry<String,
String[]>>();
Enumeration<String> keys = request.getParameterNames();
@@ -115,7 +114,6 @@
/** {...@inheritdoc} */
- @SuppressWarnings("unchecked")
public boolean equals(Object o) {
PortletRequest otherRequest = ((PortletParamValuesMap) o).request;
boolean retValue = true;
@@ -152,7 +150,6 @@
/** {...@inheritdoc} */
- @SuppressWarnings("unchecked")
public Set<String> keySet() {
Set<String> set = new HashSet<String>();
Enumeration<String> keys = request.getParameterNames();
@@ -182,7 +179,6 @@
/** {...@inheritdoc} */
- @SuppressWarnings("unchecked")
public int size() {
int n = 0;
Enumeration<String> keys = request.getParameterNames();
@@ -195,7 +191,6 @@
/** {...@inheritdoc} */
- @SuppressWarnings("unchecked")
public Collection<String[]> values() {
List<String[]> list = new ArrayList<String[]>();
Enumeration<String> keys = request.getParameterNames();
Modified:
tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletRequestScopeMap.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletRequestScopeMap.java?rev=789695&r1=789694&r2=789695&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletRequestScopeMap.java
(original)
+++
tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletRequestScopeMap.java
Tue Jun 30 12:43:14 2009
@@ -76,7 +76,6 @@
/** {...@inheritdoc} */
- @SuppressWarnings("unchecked")
public boolean containsValue(Object value) {
if (value == null) {
return (false);
@@ -93,7 +92,6 @@
/** {...@inheritdoc} */
- @SuppressWarnings("unchecked")
public Set<Map.Entry<String, Object>> entrySet() {
Set<Map.Entry<String, Object>> set = new HashSet<Map.Entry<String,
Object>>();
Enumeration<String> keys = request.getAttributeNames();
@@ -108,7 +106,6 @@
/** {...@inheritdoc} */
- @SuppressWarnings("unchecked")
public boolean equals(Object o) {
PortletRequest otherRequest = ((PortletRequestScopeMap) o).request;
boolean retValue = true;
@@ -145,7 +142,6 @@
/** {...@inheritdoc} */
- @SuppressWarnings("unchecked")
public Set<String> keySet() {
Set<String> set = new HashSet<String>();
Enumeration<String> keys = request.getAttributeNames();
@@ -188,7 +184,6 @@
/** {...@inheritdoc} */
- @SuppressWarnings("unchecked")
public int size() {
int n = 0;
Enumeration<String> keys = request.getAttributeNames();
@@ -201,7 +196,6 @@
/** {...@inheritdoc} */
- @SuppressWarnings("unchecked")
public Collection<Object> values() {
List<Object> list = new ArrayList<Object>();
Enumeration<String> keys = request.getAttributeNames();
Modified:
tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletSessionScopeMap.java
URL:
http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletSessionScopeMap.java?rev=789695&r1=789694&r2=789695&view=diff
==============================================================================
---
tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletSessionScopeMap.java
(original)
+++
tiles/framework/trunk/tiles-portlet/src/main/java/org/apache/tiles/portlet/context/PortletSessionScopeMap.java
Tue Jun 30 12:43:14 2009
@@ -76,7 +76,6 @@
/** {...@inheritdoc} */
- @SuppressWarnings("unchecked")
public boolean containsValue(Object value) {
if (value == null) {
return (false);
@@ -94,7 +93,6 @@
/** {...@inheritdoc} */
- @SuppressWarnings("unchecked")
public Set<Map.Entry<String, Object>> entrySet() {
Set<Map.Entry<String, Object>> set = new HashSet<Map.Entry<String,
Object>>();
Enumeration<String> keys =
@@ -109,7 +107,6 @@
/** {...@inheritdoc} */
- @SuppressWarnings("unchecked")
public boolean equals(Object o) {
PortletSession otherSession = ((PortletSessionScopeMap) o).session;
boolean retValue = true;
@@ -146,7 +143,6 @@
/** {...@inheritdoc} */
- @SuppressWarnings("unchecked")
public Set<String> keySet() {
Set<String> set = new HashSet<String>();
Enumeration<String> keys =
@@ -190,7 +186,6 @@
/** {...@inheritdoc} */
- @SuppressWarnings("unchecked")
public int size() {
int n = 0;
Enumeration<String> keys =
@@ -204,7 +199,6 @@
/** {...@inheritdoc} */
- @SuppressWarnings("unchecked")
public Collection<Object> values() {
List<Object> list = new ArrayList<Object>();
Enumeration<String> keys =
