WW-4963 Implements new PortletContextAware interface

that uses withPortletContext instead of setPortletContext

plugins/portlet/src/main/java/org/apache/struts2/portlet/action/PortletContextAware.java

@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 org.apache.struts2.portlet.action;
+
+import javax.portlet.PortletContext;
+
+/**
+ * @since 2.6
+ */
+public interface PortletContextAware {
+
+    void withPortletContext(PortletContext portletContext);
+
+}

plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletAwareInterceptor.java

@@ -71,6 +71,12 @@ public class PortletAwareInterceptor extends AbstractInterceptor implements Stru
             PortletContext portletContext = (PortletContext) context.get(StrutsStatics.STRUTS_PORTLET_CONTEXT);
             ((PortletContextAware) action).setPortletContext(portletContext);
         }
+
+        if (action instanceof org.apache.struts2.portlet.action.PortletContextAware) {
+            PortletContext portletContext = (PortletContext) context.get(StrutsStatics.STRUTS_PORTLET_CONTEXT);
+            ((org.apache.struts2.portlet.action.PortletContextAware) action).withPortletContext(portletContext);
+        }
+
         if (action instanceof PortletPreferencesAware) {
         	PortletRequest request = (PortletRequest) context.get(PortletConstants.REQUEST);
             

plugins/portlet/src/main/java/org/apache/struts2/portlet/interceptor/PortletContextAware.java

@@ -20,8 +20,15 @@ package org.apache.struts2.portlet.interceptor;
 
 import javax.portlet.PortletContext;
 
+/**
+ * @deprecated please use {@link org.apache.struts2.portlet.action.PortletContextAware} instead
+ */
+@Deprecated
 public interface PortletContextAware {
 
-	void setPortletContext(PortletContext portletContext);
+    /**
+     * @deprecated please use {@link org.apache.struts2.portlet.action.PortletContextAware#withPortletContext(PortletContext)} instead
+     */
+    void setPortletContext(PortletContext portletContext);
 
 }