You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by ms...@apache.org on 2014/08/25 11:55:17 UTC
[13/22] began work on generating the additional spec tests and the
portlet tab library tests again in order to improve structure and correct
problems in test case names.
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_6_RenderConfig2.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_6_RenderConfig2.java b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_6_RenderConfig2.java
new file mode 100644
index 0000000..870b2a4
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_6_RenderConfig2.java
@@ -0,0 +1,132 @@
+/* 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 javax.portlet.tck.portlets;
+
+import java.io.*;
+import java.util.*;
+import java.util.logging.*;
+import static java.util.logging.Logger.*;
+import javax.xml.namespace.QName;
+import javax.portlet.*;
+import javax.portlet.filter.*;
+import javax.servlet.*;
+import javax.servlet.http.*;
+import javax.portlet.tck.beans.*;
+import javax.portlet.tck.constants.*;
+import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*;
+import static javax.portlet.tck.constants.Constants.*;
+import static javax.portlet.PortletSession.*;
+import static javax.portlet.ResourceURL.*;
+
+/**
+ * This portlet implements several test cases for the JSR 362 TCK. The test case names
+ * are defined in the /src/main/resources/xml-resources/additionalTCs.xml
+ * file. The build process will integrate the test case names defined in the
+ * additionalTCs.xml file into the complete list of test case names for execution by the driver.
+ *
+ * This is the main portlet for the test cases. If the test cases call for events, this portlet
+ * will initiate the events, but not process them. The processing is done in the companion
+ * portlet AddlPortletTests_SPEC2_6_RenderConfig2_event
+ *
+ */
+public class AddlPortletTests_SPEC2_6_RenderConfig2 implements Portlet, ResourceServingPortlet {
+ private static final String LOG_CLASS =
+ AddlPortletTests_SPEC2_6_RenderConfig2.class.getName();
+ private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+
+ private PortletConfig portletConfig = null;
+
+ @Override
+ public void init(PortletConfig config) throws PortletException {
+ this.portletConfig = config;
+ }
+
+ @Override
+ public void destroy() {
+ }
+
+ @Override
+ public void processAction(ActionRequest portletReq, ActionResponse portletResp)
+ throws PortletException, IOException {
+ LOGGER.entering(LOG_CLASS, "main portlet processAction entry");
+
+ portletResp.setRenderParameters(portletReq.getParameterMap());
+ long tid = Thread.currentThread().getId();
+ portletReq.setAttribute(THREADID_ATTR, tid);
+
+ StringWriter writer = new StringWriter();
+
+ }
+
+ @Override
+ public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
+ throws PortletException, IOException {
+ LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
+
+ long tid = Thread.currentThread().getId();
+ portletReq.setAttribute(THREADID_ATTR, tid);
+
+ PrintWriter writer = portletResp.getWriter();
+
+ }
+
+ @Override
+ public void render(RenderRequest portletReq, RenderResponse portletResp)
+ throws PortletException, IOException {
+ LOGGER.entering(LOG_CLASS, "main portlet render entry");
+
+ long tid = Thread.currentThread().getId();
+ portletReq.setAttribute(THREADID_ATTR, tid);
+
+ PrintWriter writer = portletResp.getWriter();
+
+ JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
+
+ // Create result objects for the tests
+
+ /* TestCase: V2AddlPortletTests_SPEC2_6_RenderConfig2_getResourceBundle8 */
+ /* Details: "If no resource bundle is defined, the value defined in */
+ /* the deployment descriptor <title> element is returned by the */
+ /* corresponding getString method call" */
+ TestResult tr0 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG2_GETRESOURCEBUNDLE8);
+ /* TODO: implement test */
+ tr0.appendTcDetail("Not implemented.");
+ tr0.writeTo(writer);
+
+ /* TestCase: V2AddlPortletTests_SPEC2_6_RenderConfig2_getResourceBundle9 */
+ /* Details: "If no resource bundle is defined, the value defined in */
+ /* the deployment descriptor <short-title> element is returned by the */
+ /* corresponding getString method call" */
+ TestResult tr1 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG2_GETRESOURCEBUNDLE9);
+ /* TODO: implement test */
+ tr1.appendTcDetail("Not implemented.");
+ tr1.writeTo(writer);
+
+ /* TestCase: V2AddlPortletTests_SPEC2_6_RenderConfig2_getResourceBundle10 */
+ /* Details: "If no resource bundle is defined, the value defined in */
+ /* the deployment descriptor <keywords> element is returned by the */
+ /* corresponding getString method call" */
+ TestResult tr2 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG2_GETRESOURCEBUNDLE10);
+ /* TODO: implement test */
+ tr2.appendTcDetail("Not implemented.");
+ tr2.writeTo(writer);
+
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_6_RenderConfig3.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_6_RenderConfig3.java b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_6_RenderConfig3.java
new file mode 100644
index 0000000..425e7fa
--- /dev/null
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_6_RenderConfig3.java
@@ -0,0 +1,135 @@
+/* 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 javax.portlet.tck.portlets;
+
+import java.io.*;
+import java.util.*;
+import java.util.logging.*;
+import static java.util.logging.Logger.*;
+import javax.xml.namespace.QName;
+import javax.portlet.*;
+import javax.portlet.filter.*;
+import javax.servlet.*;
+import javax.servlet.http.*;
+import javax.portlet.tck.beans.*;
+import javax.portlet.tck.constants.*;
+import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*;
+import static javax.portlet.tck.constants.Constants.*;
+import static javax.portlet.PortletSession.*;
+import static javax.portlet.ResourceURL.*;
+
+/**
+ * This portlet implements several test cases for the JSR 362 TCK. The test case names
+ * are defined in the /src/main/resources/xml-resources/additionalTCs.xml
+ * file. The build process will integrate the test case names defined in the
+ * additionalTCs.xml file into the complete list of test case names for execution by the driver.
+ *
+ * This is the main portlet for the test cases. If the test cases call for events, this portlet
+ * will initiate the events, but not process them. The processing is done in the companion
+ * portlet AddlPortletTests_SPEC2_6_RenderConfig3_event
+ *
+ */
+public class AddlPortletTests_SPEC2_6_RenderConfig3 implements Portlet, ResourceServingPortlet {
+ private static final String LOG_CLASS =
+ AddlPortletTests_SPEC2_6_RenderConfig3.class.getName();
+ private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
+
+ private PortletConfig portletConfig = null;
+
+ @Override
+ public void init(PortletConfig config) throws PortletException {
+ this.portletConfig = config;
+ }
+
+ @Override
+ public void destroy() {
+ }
+
+ @Override
+ public void processAction(ActionRequest portletReq, ActionResponse portletResp)
+ throws PortletException, IOException {
+ LOGGER.entering(LOG_CLASS, "main portlet processAction entry");
+
+ portletResp.setRenderParameters(portletReq.getParameterMap());
+ long tid = Thread.currentThread().getId();
+ portletReq.setAttribute(THREADID_ATTR, tid);
+
+ StringWriter writer = new StringWriter();
+
+ }
+
+ @Override
+ public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
+ throws PortletException, IOException {
+ LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
+
+ long tid = Thread.currentThread().getId();
+ portletReq.setAttribute(THREADID_ATTR, tid);
+
+ PrintWriter writer = portletResp.getWriter();
+
+ }
+
+ @Override
+ public void render(RenderRequest portletReq, RenderResponse portletResp)
+ throws PortletException, IOException {
+ LOGGER.entering(LOG_CLASS, "main portlet render entry");
+
+ long tid = Thread.currentThread().getId();
+ portletReq.setAttribute(THREADID_ATTR, tid);
+
+ PrintWriter writer = portletResp.getWriter();
+
+ JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
+
+ // Create result objects for the tests
+
+ /* TestCase: V2AddlPortletTests_SPEC2_6_RenderConfig3_getResourceBundle5 */
+ /* Details: "If the resource bundle does not contain a */
+ /* \"javax.portlet.title\" property, the value defined in the */
+ /* deployment descriptor <title> element is returned by the */
+ /* corresponding getString method call" */
+ TestResult tr0 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG3_GETRESOURCEBUNDLE5);
+ /* TODO: implement test */
+ tr0.appendTcDetail("Not implemented.");
+ tr0.writeTo(writer);
+
+ /* TestCase: V2AddlPortletTests_SPEC2_6_RenderConfig3_getResourceBundle6 */
+ /* Details: "If the resource bundle does not contain a */
+ /* \"javax.portlet.short-title\" property, the value defined in the */
+ /* deployment descriptor <short-title> element is returned by the */
+ /* corresponding getString method call" */
+ TestResult tr1 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG3_GETRESOURCEBUNDLE6);
+ /* TODO: implement test */
+ tr1.appendTcDetail("Not implemented.");
+ tr1.writeTo(writer);
+
+ /* TestCase: V2AddlPortletTests_SPEC2_6_RenderConfig3_getResourceBundle7 */
+ /* Details: "If the resource bundle does not contain a */
+ /* \"javax.portlet.keywords\" property, the value defined in the */
+ /* deployment descriptor <keywords> element is returned by the */
+ /* corresponding getString method call" */
+ TestResult tr2 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_6_RENDERCONFIG3_GETRESOURCEBUNDLE7);
+ /* TODO: implement test */
+ tr2.appendTcDetail("Not implemented.");
+ tr2.writeTo(writer);
+
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_8_PortletModes.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_8_PortletModes.java b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_8_PortletModes.java
index 69157e5..0ac459e 100644
--- a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_8_PortletModes.java
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_8_PortletModes.java
@@ -18,29 +18,34 @@
package javax.portlet.tck.portlets;
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
+import java.io.*;
+import java.util.*;
+import java.util.logging.*;
+import static java.util.logging.Logger.*;
+import javax.xml.namespace.QName;
import javax.portlet.*;
import javax.portlet.filter.*;
-import javax.portlet.tck.beans.ClassChecker;
-import javax.portlet.tck.beans.TestCaseDetails;
-import javax.portlet.tck.beans.JSR286SpecTestCaseDetails;
+import javax.servlet.*;
+import javax.servlet.http.*;
+import javax.portlet.tck.beans.*;
+import javax.portlet.tck.constants.*;
import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*;
-import javax.portlet.tck.beans.TestResult;
+import static javax.portlet.tck.constants.Constants.*;
+import static javax.portlet.PortletSession.*;
+import static javax.portlet.ResourceURL.*;
/**
* This portlet implements several test cases for the JSR 362 TCK. The test case names
* are defined in the /src/main/resources/xml-resources/additionalTCs.xml
* file. The build process will integrate the test case names defined in the
* additionalTCs.xml file into the complete list of test case names for execution by the driver.
+ *
+ * This is the main portlet for the test cases. If the test cases call for events, this portlet
+ * will initiate the events, but not process them. The processing is done in the companion
+ * portlet AddlPortletTests_SPEC2_8_PortletModes_event
+ *
*/
-public class AddlPortletTests_SPEC2_8_PortletModes implements Portlet {
+public class AddlPortletTests_SPEC2_8_PortletModes implements Portlet, ResourceServingPortlet {
private static final String LOG_CLASS =
AddlPortletTests_SPEC2_8_PortletModes.class.getName();
private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
@@ -57,100 +62,123 @@ public class AddlPortletTests_SPEC2_8_PortletModes implements Portlet {
}
@Override
- public void processAction(ActionRequest actionRequest, ActionResponse actionResponse)
+ public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
+ LOGGER.entering(LOG_CLASS, "main portlet processAction entry");
+
+ portletResp.setRenderParameters(portletReq.getParameterMap());
+ long tid = Thread.currentThread().getId();
+ portletReq.setAttribute(THREADID_ATTR, tid);
+
+ StringWriter writer = new StringWriter();
+
}
@Override
- public void render(RenderRequest renderRequest, RenderResponse renderResponse)
+ public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
throws PortletException, IOException {
-
- if (LOGGER.isLoggable(Level.FINE)) {
- LOGGER.logp(Level.FINE, LOG_CLASS, "render", "Entry");
- }
+ LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
+
+ long tid = Thread.currentThread().getId();
+ portletReq.setAttribute(THREADID_ATTR, tid);
+
+ PrintWriter writer = portletResp.getWriter();
+
+ }
+
+ @Override
+ public void render(RenderRequest portletReq, RenderResponse portletResp)
+ throws PortletException, IOException {
+ LOGGER.entering(LOG_CLASS, "main portlet render entry");
+
+ long tid = Thread.currentThread().getId();
+ portletReq.setAttribute(THREADID_ATTR, tid);
+
+ PrintWriter writer = portletResp.getWriter();
- PrintWriter writer = renderResponse.getWriter();
JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
// Create result objects for the tests
- /* TestCase: SPEC2_8_PortletModes_declaringPortletModes1 */
+ /* TestCase: V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes1 */
/* Details: "Support for the VIEW mode does not need to be declared */
/* in the deployment descriptor" */
- TestResult tr0 = tcd.getTestResultFailed(SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES1);
+ TestResult tr0 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES1);
/* TODO: implement test */
+ tr0.appendTcDetail("Not implemented.");
+ tr0.writeTo(writer);
- /* TestCase: SPEC2_8_PortletModes_declaringPortletModes2 */
+ /* TestCase: V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes2 */
/* Details: "Support for the HELP mode must be declared in the */
/* deployment descriptor" */
- TestResult tr1 = tcd.getTestResultFailed(SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES2);
+ TestResult tr1 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES2);
/* TODO: implement test */
+ tr1.appendTcDetail("Not implemented.");
+ tr1.writeTo(writer);
- /* TestCase: SPEC2_8_PortletModes_declaringPortletModes3 */
+ /* TestCase: V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes3 */
/* Details: "A custom portlet mode may be declared in the deployment */
/* descriptor" */
- TestResult tr2 = tcd.getTestResultFailed(SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES3);
+ TestResult tr2 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES3);
/* TODO: implement test */
+ tr2.appendTcDetail("Not implemented.");
+ tr2.writeTo(writer);
- /* TestCase: SPEC2_8_PortletModes_declaringPortletModes4 */
+ /* TestCase: V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes4 */
/* Details: "A custom portlet mode with */
/* <portal-managed>false</portal-managed> may be declared in the */
/* deployment descriptor" */
- TestResult tr3 = tcd.getTestResultFailed(SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES4);
+ TestResult tr3 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES4);
/* TODO: implement test */
+ tr3.appendTcDetail("Not implemented.");
+ tr3.writeTo(writer);
- /* TestCase: SPEC2_8_PortletModes_declaringPortletModes5 */
+ /* TestCase: V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes5 */
/* Details: "The PortletRequest.isPortletModeAllowed method must */
/* return FALSE for a custom portlet mode with */
/* <portal-managed>true</portal-managed> that is not supported by the */
/* portlet container" */
- TestResult tr4 = tcd.getTestResultFailed(SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES5);
+ TestResult tr4 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES5);
/* TODO: implement test */
+ tr4.appendTcDetail("Not implemented.");
+ tr4.writeTo(writer);
- /* TestCase: SPEC2_8_PortletModes_declaringPortletModes6 */
+ /* TestCase: V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes6 */
/* Details: "The portlet container must ignore all custom portlet */
/* modes in the deployment descriptor with */
/* <portal-managed>true</portal-managed> that is not supported by the */
/* portlet container" */
- TestResult tr5 = tcd.getTestResultFailed(SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES6);
+ TestResult tr5 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES6);
/* TODO: implement test */
+ tr5.appendTcDetail("Not implemented.");
+ tr5.writeTo(writer);
- /* TestCase: SPEC2_8_PortletModes_declaringPortletModes7 */
+ /* TestCase: V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes7 */
/* Details: "A custom portlet mode with */
/* <portal-managed>false</portal-managed> corresponds to the VIEW */
/* mode from the portal point of view" */
- TestResult tr6 = tcd.getTestResultFailed(SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES7);
+ TestResult tr6 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES7);
/* TODO: implement test */
+ tr6.appendTcDetail("Not implemented.");
+ tr6.writeTo(writer);
- /* TestCase: SPEC2_8_PortletModes_declaringPortletModes8 */
+ /* TestCase: V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes8 */
/* Details: "A custom portlet mode can have a localized decoration */
/* name in the resource bundle with the name of */
/* javax.portlet.app.custom-portlet-mode.<name>.decoration-name" */
- TestResult tr7 = tcd.getTestResultFailed(SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES8);
+ TestResult tr7 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES8);
/* TODO: implement test */
+ tr7.appendTcDetail("Not implemented.");
+ tr7.writeTo(writer);
- /* TestCase: SPEC2_8_PortletModes_declaringPortletModes9 */
+ /* TestCase: V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes9 */
/* Details: "The portlet must not be invoked in a mode that has not */
/* been declared to be supported for a given markup type" */
- TestResult tr8 = tcd.getTestResultFailed(SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES9);
+ TestResult tr8 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_8_PORTLETMODES_DECLARINGPORTLETMODES9);
/* TODO: implement test */
-
-
-
- // Write the results to the output stream
-
- tr0.writeTo(writer);
- tr1.writeTo(writer);
- tr2.writeTo(writer);
- tr3.writeTo(writer);
- tr4.writeTo(writer);
- tr5.writeTo(writer);
- tr6.writeTo(writer);
- tr7.writeTo(writer);
+ tr8.appendTcDetail("Not implemented.");
tr8.writeTo(writer);
-
}
}
-
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_9_WindowStates.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_9_WindowStates.java b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_9_WindowStates.java
index b341387..6a23bf2 100644
--- a/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_9_WindowStates.java
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/java/javax/portlet/tck/portlets/AddlPortletTests_SPEC2_9_WindowStates.java
@@ -18,29 +18,34 @@
package javax.portlet.tck.portlets;
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import java.util.Enumeration;
-import java.util.Locale;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
+import java.io.*;
+import java.util.*;
+import java.util.logging.*;
+import static java.util.logging.Logger.*;
+import javax.xml.namespace.QName;
import javax.portlet.*;
import javax.portlet.filter.*;
-import javax.portlet.tck.beans.ClassChecker;
-import javax.portlet.tck.beans.TestCaseDetails;
-import javax.portlet.tck.beans.JSR286SpecTestCaseDetails;
+import javax.servlet.*;
+import javax.servlet.http.*;
+import javax.portlet.tck.beans.*;
+import javax.portlet.tck.constants.*;
import static javax.portlet.tck.beans.JSR286SpecTestCaseDetails.*;
-import javax.portlet.tck.beans.TestResult;
+import static javax.portlet.tck.constants.Constants.*;
+import static javax.portlet.PortletSession.*;
+import static javax.portlet.ResourceURL.*;
/**
* This portlet implements several test cases for the JSR 362 TCK. The test case names
* are defined in the /src/main/resources/xml-resources/additionalTCs.xml
* file. The build process will integrate the test case names defined in the
* additionalTCs.xml file into the complete list of test case names for execution by the driver.
+ *
+ * This is the main portlet for the test cases. If the test cases call for events, this portlet
+ * will initiate the events, but not process them. The processing is done in the companion
+ * portlet AddlPortletTests_SPEC2_9_WindowStates_event
+ *
*/
-public class AddlPortletTests_SPEC2_9_WindowStates implements Portlet {
+public class AddlPortletTests_SPEC2_9_WindowStates implements Portlet, ResourceServingPortlet {
private static final String LOG_CLASS =
AddlPortletTests_SPEC2_9_WindowStates.class.getName();
private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
@@ -57,82 +62,103 @@ public class AddlPortletTests_SPEC2_9_WindowStates implements Portlet {
}
@Override
- public void processAction(ActionRequest actionRequest, ActionResponse actionResponse)
+ public void processAction(ActionRequest portletReq, ActionResponse portletResp)
throws PortletException, IOException {
+ LOGGER.entering(LOG_CLASS, "main portlet processAction entry");
+
+ portletResp.setRenderParameters(portletReq.getParameterMap());
+ long tid = Thread.currentThread().getId();
+ portletReq.setAttribute(THREADID_ATTR, tid);
+
+ StringWriter writer = new StringWriter();
+
}
@Override
- public void render(RenderRequest renderRequest, RenderResponse renderResponse)
+ public void serveResource(ResourceRequest portletReq, ResourceResponse portletResp)
throws PortletException, IOException {
-
- if (LOGGER.isLoggable(Level.FINE)) {
- LOGGER.logp(Level.FINE, LOG_CLASS, "render", "Entry");
- }
+ LOGGER.entering(LOG_CLASS, "main portlet serveResource entry");
+
+ long tid = Thread.currentThread().getId();
+ portletReq.setAttribute(THREADID_ATTR, tid);
+
+ PrintWriter writer = portletResp.getWriter();
+
+ }
+
+ @Override
+ public void render(RenderRequest portletReq, RenderResponse portletResp)
+ throws PortletException, IOException {
+ LOGGER.entering(LOG_CLASS, "main portlet render entry");
+
+ long tid = Thread.currentThread().getId();
+ portletReq.setAttribute(THREADID_ATTR, tid);
+
+ PrintWriter writer = portletResp.getWriter();
- PrintWriter writer = renderResponse.getWriter();
JSR286SpecTestCaseDetails tcd = new JSR286SpecTestCaseDetails();
// Create result objects for the tests
- /* TestCase: SPEC2_9_WindowStates_declaringWindowStates1 */
+ /* TestCase: V2AddlPortletTests_SPEC2_9_WindowStates_declaringWindowStates1 */
/* Details: "Support for the NORMAL window state does not need to be */
/* declared in the deployment descriptor" */
- TestResult tr0 = tcd.getTestResultFailed(SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES1);
+ TestResult tr0 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES1);
/* TODO: implement test */
+ tr0.appendTcDetail("Not implemented.");
+ tr0.writeTo(writer);
- /* TestCase: SPEC2_9_WindowStates_declaringWindowStates2 */
+ /* TestCase: V2AddlPortletTests_SPEC2_9_WindowStates_declaringWindowStates2 */
/* Details: "Support for the MINIMIZED window state does not need to */
/* be declared in the deployment descriptor" */
- TestResult tr1 = tcd.getTestResultFailed(SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES2);
+ TestResult tr1 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES2);
/* TODO: implement test */
+ tr1.appendTcDetail("Not implemented.");
+ tr1.writeTo(writer);
- /* TestCase: SPEC2_9_WindowStates_declaringWindowStates3 */
+ /* TestCase: V2AddlPortletTests_SPEC2_9_WindowStates_declaringWindowStates3 */
/* Details: "Support for the MAXIMIZED window state does not need to */
/* be declared in the deployment descriptor" */
- TestResult tr2 = tcd.getTestResultFailed(SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES3);
+ TestResult tr2 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES3);
/* TODO: implement test */
+ tr2.appendTcDetail("Not implemented.");
+ tr2.writeTo(writer);
- /* TestCase: SPEC2_9_WindowStates_declaringWindowStates4 */
+ /* TestCase: V2AddlPortletTests_SPEC2_9_WindowStates_declaringWindowStates4 */
/* Details: "A custom window state may be declared in the deployment */
/* descriptor" */
- TestResult tr3 = tcd.getTestResultFailed(SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES4);
+ TestResult tr3 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES4);
/* TODO: implement test */
+ tr3.appendTcDetail("Not implemented.");
+ tr3.writeTo(writer);
- /* TestCase: SPEC2_9_WindowStates_declaringWindowStates5 */
+ /* TestCase: V2AddlPortletTests_SPEC2_9_WindowStates_declaringWindowStates5 */
/* Details: "The PortletRequest.isWindowStateAllowed method must */
/* return FALSE for a custom window state that is not supported by */
/* the portlet container" */
- TestResult tr4 = tcd.getTestResultFailed(SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES5);
+ TestResult tr4 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES5);
/* TODO: implement test */
+ tr4.appendTcDetail("Not implemented.");
+ tr4.writeTo(writer);
- /* TestCase: SPEC2_9_WindowStates_declaringWindowStates6 */
+ /* TestCase: V2AddlPortletTests_SPEC2_9_WindowStates_declaringWindowStates6 */
/* Details: "The portlet container must ignore all custom window */
/* states in the deployment descriptor that are not supported by the */
/* portal" */
- TestResult tr5 = tcd.getTestResultFailed(SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES6);
+ TestResult tr5 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES6);
/* TODO: implement test */
+ tr5.appendTcDetail("Not implemented.");
+ tr5.writeTo(writer);
- /* TestCase: SPEC2_9_WindowStates_declaringWindowStates7 */
+ /* TestCase: V2AddlPortletTests_SPEC2_9_WindowStates_declaringWindowStates7 */
/* Details: "The portlet must not be invoked in a window state other */
/* than NORMAL, MINIMIZED, or MAXIMIZED that has not been declared to */
/* be supported for a given markup type" */
- TestResult tr6 = tcd.getTestResultFailed(SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES7);
+ TestResult tr6 = tcd.getTestResultFailed(V2ADDLPORTLETTESTS_SPEC2_9_WINDOWSTATES_DECLARINGWINDOWSTATES7);
/* TODO: implement test */
-
-
-
- // Write the results to the output stream
-
- tr0.writeTo(writer);
- tr1.writeTo(writer);
- tr2.writeTo(writer);
- tr3.writeTo(writer);
- tr4.writeTo(writer);
- tr5.writeTo(writer);
+ tr6.appendTcDetail("Not implemented.");
tr6.writeTo(writer);
-
}
}
-
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlPortletTests/src/main/resources/xml-resources/additionalTCs.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/resources/xml-resources/additionalTCs.xml b/portlet-tck_3.0/V2AddlPortletTests/src/main/resources/xml-resources/additionalTCs.xml
index 4c64d10..94a4b6f 100644
--- a/portlet-tck_3.0/V2AddlPortletTests/src/main/resources/xml-resources/additionalTCs.xml
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/resources/xml-resources/additionalTCs.xml
@@ -17,144 +17,126 @@
specific language governing permissions and limitations
under the License.
-->
-<!--
- Defines the test cases for this module.
- For this module, the test case names are not automatically generated from.
- the deployment descriptor, so edit this file to add new test cases.
- This allows a portlet to define multiple test cases.
--->
<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
<properties>
<!-- JSR 286 API AddlPortletTests test case names and page mappings -->
-<entry key="SPEC2_2_Compatibility_deployJSR168_1">V2AddlPortletTests</entry>
-<entry key="SPEC2_2_Compatibility_deployJSR168_2">V2AddlPortletTests</entry>
-<entry key="SPEC2_5_Initialization_initialization6">V2AddlPortletTests</entry>
-<entry key="SPEC2_5_RequestHandling_action2">V2AddlPortletTests</entry>
-<entry key="SPEC2_5_RequestHandling_action5">V2AddlPortletTests</entry>
-<entry key="SPEC2_5_RequestHandling_action6">V2AddlPortletTests</entry>
-<entry key="SPEC2_5_RequestHandling_action7">V2AddlPortletTests</entry>
-<entry key="SPEC2_5_RequestHandling_render1">V2AddlPortletTests</entry>
-<entry key="SPEC2_5_RequestHandling_render3">V2AddlPortletTests</entry>
-<entry key="SPEC2_5_RequestHandling_resource1">V2AddlPortletTests</entry>
-<entry key="SPEC2_5_RequestHandling_resource3">V2AddlPortletTests</entry>
-<entry key="SPEC2_5_RequestHandling_exception1">V2AddlPortletTests</entry>
-<entry key="SPEC2_5_RequestHandling_exception2">V2AddlPortletTests</entry>
-<entry key="SPEC2_5_RequestHandling_exception4">V2AddlPortletTests</entry>
-<entry key="SPEC2_5_RequestHandling_exception5">V2AddlPortletTests</entry>
-<entry key="SPEC2_5_GenericPortlet_actionDispatching2">V2AddlPortletTests</entry>
-<entry key="SPEC2_5_GenericPortlet_eventDispatching1">V2AddlPortletTests</entry>
-<entry key="SPEC2_5_GenericPortlet_eventDispatching2">V2AddlPortletTests</entry>
-<entry key="SPEC2_5_GenericPortlet_renderDispatching8">V2AddlPortletTests</entry>
-<entry key="SPEC2_5_GenericPortlet_renderDispatching9">V2AddlPortletTests</entry>
-<entry key="SPEC2_6_Config_getResourceBundle1">V2AddlPortletTests</entry>
-<entry key="SPEC2_6_Config_getResourceBundle2">V2AddlPortletTests</entry>
-<entry key="SPEC2_6_Config_getResourceBundle3">V2AddlPortletTests</entry>
-<entry key="SPEC2_6_Config_getResourceBundle4">V2AddlPortletTests</entry>
-<entry key="SPEC2_6_Config_getResourceBundle5">V2AddlPortletTests</entry>
-<entry key="SPEC2_6_Config_getResourceBundle6">V2AddlPortletTests</entry>
-<entry key="SPEC2_6_Config_getResourceBundle7">V2AddlPortletTests</entry>
-<entry key="SPEC2_6_Config_getResourceBundle8">V2AddlPortletTests</entry>
-<entry key="SPEC2_6_Config_getResourceBundle9">V2AddlPortletTests</entry>
-<entry key="SPEC2_6_Config_getResourceBundle10">V2AddlPortletTests</entry>
-<entry key="SPEC2_6_Config_getPublishingEventQnames3">V2AddlPortletTests</entry>
-<entry key="SPEC2_6_Config_getPublishingEventQnames4">V2AddlPortletTests</entry>
-<entry key="SPEC2_6_Config_getProcessingEventQnames3">V2AddlPortletTests</entry>
-<entry key="SPEC2_6_Config_getProcessingEventQnames4">V2AddlPortletTests</entry>
-<entry key="SPEC2_6_Config_getContainerRuntimeOptions6">V2AddlPortletTests</entry>
-<entry key="SPEC2_6_Config_getContainerRuntimeOptions7">V2AddlPortletTests</entry>
-<entry key="SPEC2_6_Config_getContainerRuntimeOptions8">V2AddlPortletTests</entry>
-<entry key="SPEC2_6_Config_getContainerRuntimeOptions9">V2AddlPortletTests</entry>
-<entry key="SPEC2_8_PortletModes_declaringPortletModes1">V2AddlPortletTests</entry>
-<entry key="SPEC2_8_PortletModes_declaringPortletModes2">V2AddlPortletTests</entry>
-<entry key="SPEC2_8_PortletModes_declaringPortletModes3">V2AddlPortletTests</entry>
-<entry key="SPEC2_8_PortletModes_declaringPortletModes4">V2AddlPortletTests</entry>
-<entry key="SPEC2_8_PortletModes_declaringPortletModes5">V2AddlPortletTests</entry>
-<entry key="SPEC2_8_PortletModes_declaringPortletModes6">V2AddlPortletTests</entry>
-<entry key="SPEC2_8_PortletModes_declaringPortletModes7">V2AddlPortletTests</entry>
-<entry key="SPEC2_8_PortletModes_declaringPortletModes8">V2AddlPortletTests</entry>
-<entry key="SPEC2_8_PortletModes_declaringPortletModes9">V2AddlPortletTests</entry>
-<entry key="SPEC2_9_WindowStates_declaringWindowStates1">V2AddlPortletTests</entry>
-<entry key="SPEC2_9_WindowStates_declaringWindowStates2">V2AddlPortletTests</entry>
-<entry key="SPEC2_9_WindowStates_declaringWindowStates3">V2AddlPortletTests</entry>
-<entry key="SPEC2_9_WindowStates_declaringWindowStates4">V2AddlPortletTests</entry>
-<entry key="SPEC2_9_WindowStates_declaringWindowStates5">V2AddlPortletTests</entry>
-<entry key="SPEC2_9_WindowStates_declaringWindowStates6">V2AddlPortletTests</entry>
-<entry key="SPEC2_9_WindowStates_declaringWindowStates7">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServing_properties3">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServing_properties4">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServing_properties7">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServing_properties8">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServing_resourceURLs2">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServing_resourceURLs3">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServing_resourceURLs4">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServing_resourceURLs5">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServing_resourceURLs6">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServing_resourceURLs7">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServing_resourceURLs8">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServing_resourceURLs9">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_caching1">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_caching2">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_caching3">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingFULL1">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingFULL2">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingFULL3">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingFULL4">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingFULL5">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingFULL6">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingFULL7">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingFULL8">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingFULL9">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingPORTLET1">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingPORTLET2">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingPORTLET3">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingPORTLET4">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingPORTLET5">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingPORTLET6">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingPORTLET7">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingPORTLET8">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingPORTLET9">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingPAGE1">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingPAGE2">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingPAGE3">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingPAGE4">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingPAGE5">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingPAGE6">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingPAGE7">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingPAGE8">V2AddlPortletTests</entry>
-<entry key="SPEC2_13_ResourceServingCache_cachingPAGE9">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_event1">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_event2">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_event3">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_event4">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_event5">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_event6">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_event7">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_event8">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_event9">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_event10">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_event11">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_event12">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_event13">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_event14">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_event15">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_event16">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_eventProcessAction1">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_eventProcessAction2">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_eventProcessAction3">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_eventProcessAction4">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_eventProcessAction5">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_eventProcessAction6">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_eventProcessAction7">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_eventProcessAction8">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_eventProcessAction9">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_eventProcessEvent1">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_eventProcessEvent2">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_eventProcessEvent3">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_eventProcessEvent4">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_eventProcessEvent5">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_eventProcessEvent6">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_eventProcessEvent7">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_eventProcessEvent8">V2AddlPortletTests</entry>
-<entry key="SPEC2_15_Event_eventProcessEvent9">V2AddlPortletTests</entry>
-
+<entry key="V2AddlPortletTests_SPEC2_2_Compatibility_deployJSR168_1">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_2_Compatibility_deployJSR168_2">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_5_Initialization_initialization6">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_5_ActionHandling_action5">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_5_ActionHandling_action6">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_5_ActionHandling_action7">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_5_ActionHandling_exception1">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_5_ActionHandling_exception2">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_5_RenderHandling_render1">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_5_ResourceHandling_resource1">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_5_EventHandling_exception4">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_5_EventHandling_exception5">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_5_RenderGenericPortlet_actionDispatching2">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_5_RenderGenericPortlet_eventDispatching1">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_5_RenderGenericPortlet_eventDispatching2">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_5_RenderGenericPortlet_renderDispatching8">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_5_RenderGenericPortlet_renderDispatching9">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig_getResourceBundle1">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig_getResourceBundle2">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig_getResourceBundle3">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig_getResourceBundle4">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig_getPublishingEventQnames3">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig_getPublishingEventQnames4">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig_getProcessingEventQnames3">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig_getProcessingEventQnames4">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig_getContainerRuntimeOptions6">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig_getContainerRuntimeOptions7">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig_getContainerRuntimeOptions8">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig_getContainerRuntimeOptions9">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig2_getResourceBundle8">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig2_getResourceBundle9">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig2_getResourceBundle10">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig3_getResourceBundle5">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig3_getResourceBundle6">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_6_RenderConfig3_getResourceBundle7">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes1">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes2">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes3">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes4">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes5">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes6">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes7">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes8">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_8_PortletModes_declaringPortletModes9">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_9_WindowStates_declaringWindowStates1">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_9_WindowStates_declaringWindowStates2">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_9_WindowStates_declaringWindowStates3">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_9_WindowStates_declaringWindowStates4">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_9_WindowStates_declaringWindowStates5">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_9_WindowStates_declaringWindowStates6">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_9_WindowStates_declaringWindowStates7">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServing_resourceURLs2">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServing_resourceURLs4">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServing_resourceURLs5">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServing_resourceURLs6">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServing_resourceURLs7">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServing_resourceURLs8">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServing_resourceURLs9">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_caching1">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_caching2">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_caching3">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingFULL1">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingFULL2">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingFULL3">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingFULL4">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingFULL5">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingFULL6">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingFULL7">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingFULL8">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingFULL9">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPORTLET1">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPORTLET2">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPORTLET3">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPORTLET4">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPORTLET5">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPORTLET6">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPORTLET7">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPORTLET8">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPORTLET9">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPAGE1">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPAGE2">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPAGE3">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPAGE4">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPAGE5">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPAGE6">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPAGE7">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPAGE8">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_13_ResourceServingCache_cachingPAGE9">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_Event_event1">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_RenderEventHandling_event2">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_RenderEventHandling_event3">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_RenderEventHandling_event4">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_EventEventHandling_event5">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_EventEventHandling_event6">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_EventEventHandling_event7">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_EventEventHandling_event8">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_EventEventHandling_event9">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_EventEventHandling_event10">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_EventEventHandling_event11">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_EventEventHandling_event15">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_EventEventHandling_event16">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent1">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent2">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent3">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent4">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent5">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent6">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent7">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent8">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_EventEventHandling_eventProcessEvent9">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction1">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction2">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction3">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction4">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction5">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction6">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction7">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction8">V2AddlPortletTests</entry>
+<entry key="V2AddlPortletTests_SPEC2_15_ActionEventHandling_eventProcessAction9">V2AddlPortletTests</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlPortletTests/src/main/webapp/WEB-INF/portlet.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/webapp/WEB-INF/portlet.xml b/portlet-tck_3.0/V2AddlPortletTests/src/main/webapp/WEB-INF/portlet.xml
index 06a6912..f98f7e7 100644
--- a/portlet-tck_3.0/V2AddlPortletTests/src/main/webapp/WEB-INF/portlet.xml
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/webapp/WEB-INF/portlet.xml
@@ -20,25 +20,16 @@
<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
- version="2.0" id="javax.portlet-tck-AddlPortletTests">
-
+ xmlns:tck="http://www.apache.org/portals/pluto/portlet-tck_3.0"
+ version="2.0" id="V2AddlPortletTests">
<portlet>
<portlet-name>AddlPortletTests_SPEC2_2_Compatibility</portlet-name>
<portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_2_Compatibility</portlet-class>
-
- <init-param>
- <name>TestParameter</name>
- <value>TestValue</value>
- </init-param>
-
<expiration-cache>0</expiration-cache>
-
<supports>
<mime-type>text/html</mime-type>
</supports>
-
<supported-locale>en_US</supported-locale>
-
<portlet-info>
<title>AddlPortletTests_SPEC2_2_Compatibility</title>
</portlet-info>
@@ -47,108 +38,147 @@
<portlet>
<portlet-name>AddlPortletTests_SPEC2_5_Initialization</portlet-name>
<portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_5_Initialization</portlet-class>
-
- <init-param>
- <name>TestParameter</name>
- <value>TestValue</value>
- </init-param>
-
<expiration-cache>0</expiration-cache>
-
<supports>
<mime-type>text/html</mime-type>
</supports>
-
<supported-locale>en_US</supported-locale>
-
<portlet-info>
<title>AddlPortletTests_SPEC2_5_Initialization</title>
</portlet-info>
</portlet>
<portlet>
- <portlet-name>AddlPortletTests_SPEC2_5_RequestHandling</portlet-name>
- <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_5_RequestHandling</portlet-class>
-
- <init-param>
- <name>TestParameter</name>
- <value>TestValue</value>
- </init-param>
-
+ <portlet-name>AddlPortletTests_SPEC2_5_ActionHandling</portlet-name>
+ <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_5_ActionHandling</portlet-class>
<expiration-cache>0</expiration-cache>
-
<supports>
<mime-type>text/html</mime-type>
</supports>
-
<supported-locale>en_US</supported-locale>
-
<portlet-info>
- <title>AddlPortletTests_SPEC2_5_RequestHandling</title>
+ <title>AddlPortletTests_SPEC2_5_ActionHandling</title>
</portlet-info>
</portlet>
<portlet>
- <portlet-name>AddlPortletTests_SPEC2_5_GenericPortlet</portlet-name>
- <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_5_GenericPortlet</portlet-class>
-
- <init-param>
- <name>TestParameter</name>
- <value>TestValue</value>
- </init-param>
-
+ <portlet-name>AddlPortletTests_SPEC2_5_RenderHandling</portlet-name>
+ <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_5_RenderHandling</portlet-class>
<expiration-cache>0</expiration-cache>
-
<supports>
<mime-type>text/html</mime-type>
</supports>
-
<supported-locale>en_US</supported-locale>
+ <portlet-info>
+ <title>AddlPortletTests_SPEC2_5_RenderHandling</title>
+ </portlet-info>
+ </portlet>
+ <portlet>
+ <portlet-name>AddlPortletTests_SPEC2_5_ResourceHandling</portlet-name>
+ <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_5_ResourceHandling</portlet-class>
+ <expiration-cache>0</expiration-cache>
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
+ <supported-locale>en_US</supported-locale>
<portlet-info>
- <title>AddlPortletTests_SPEC2_5_GenericPortlet</title>
+ <title>AddlPortletTests_SPEC2_5_ResourceHandling</title>
</portlet-info>
</portlet>
<portlet>
- <portlet-name>AddlPortletTests_SPEC2_6_Config</portlet-name>
- <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_6_Config</portlet-class>
+ <portlet-name>AddlPortletTests_SPEC2_5_EventHandling</portlet-name>
+ <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_5_EventHandling</portlet-class>
+ <expiration-cache>0</expiration-cache>
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
+ <supported-locale>en_US</supported-locale>
+ <portlet-info>
+ <title>AddlPortletTests_SPEC2_5_EventHandling</title>
+ </portlet-info>
+ <supported-publishing-event>
+ <qname>tck:AddlPortletTests_SPEC2_5_EventHandling</qname>
+ </supported-publishing-event>
+ </portlet>
- <init-param>
- <name>TestParameter</name>
- <value>TestValue</value>
- </init-param>
+ <portlet>
+ <portlet-name>AddlPortletTests_SPEC2_5_EventHandling_event</portlet-name>
+ <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_5_EventHandling_event</portlet-class>
+ <expiration-cache>0</expiration-cache>
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
+ <supported-locale>en_US</supported-locale>
+ <portlet-info>
+ <title>AddlPortletTests_SPEC2_5_EventHandling_event</title>
+ </portlet-info>
+ <supported-processing-event>
+ <qname>tck:AddlPortletTests_SPEC2_5_EventHandling</qname>
+ </supported-processing-event>
+ </portlet>
+ <portlet>
+ <portlet-name>AddlPortletTests_SPEC2_5_RenderGenericPortlet</portlet-name>
+ <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_5_RenderGenericPortlet</portlet-class>
<expiration-cache>0</expiration-cache>
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
+ <supported-locale>en_US</supported-locale>
+ <portlet-info>
+ <title>AddlPortletTests_SPEC2_5_RenderGenericPortlet</title>
+ </portlet-info>
+ </portlet>
+ <portlet>
+ <portlet-name>AddlPortletTests_SPEC2_6_RenderConfig</portlet-name>
+ <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_6_RenderConfig</portlet-class>
+ <expiration-cache>0</expiration-cache>
<supports>
<mime-type>text/html</mime-type>
</supports>
+ <supported-locale>en_US</supported-locale>
+ <portlet-info>
+ <title>AddlPortletTests_SPEC2_6_RenderConfig</title>
+ </portlet-info>
+ </portlet>
+ <portlet>
+ <portlet-name>AddlPortletTests_SPEC2_6_RenderConfig2</portlet-name>
+ <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_6_RenderConfig2</portlet-class>
+ <expiration-cache>0</expiration-cache>
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
<supported-locale>en_US</supported-locale>
+ <portlet-info>
+ <title>AddlPortletTests_SPEC2_6_RenderConfig2</title>
+ </portlet-info>
+ </portlet>
+ <portlet>
+ <portlet-name>AddlPortletTests_SPEC2_6_RenderConfig3</portlet-name>
+ <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_6_RenderConfig3</portlet-class>
+ <expiration-cache>0</expiration-cache>
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
+ <supported-locale>en_US</supported-locale>
<portlet-info>
- <title>AddlPortletTests_SPEC2_6_Config</title>
+ <title>AddlPortletTests_SPEC2_6_RenderConfig3</title>
</portlet-info>
</portlet>
<portlet>
<portlet-name>AddlPortletTests_SPEC2_8_PortletModes</portlet-name>
<portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_8_PortletModes</portlet-class>
-
- <init-param>
- <name>TestParameter</name>
- <value>TestValue</value>
- </init-param>
-
<expiration-cache>0</expiration-cache>
-
<supports>
<mime-type>text/html</mime-type>
</supports>
-
<supported-locale>en_US</supported-locale>
-
<portlet-info>
<title>AddlPortletTests_SPEC2_8_PortletModes</title>
</portlet-info>
@@ -157,20 +187,11 @@
<portlet>
<portlet-name>AddlPortletTests_SPEC2_9_WindowStates</portlet-name>
<portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_9_WindowStates</portlet-class>
-
- <init-param>
- <name>TestParameter</name>
- <value>TestValue</value>
- </init-param>
-
<expiration-cache>0</expiration-cache>
-
<supports>
<mime-type>text/html</mime-type>
</supports>
-
<supported-locale>en_US</supported-locale>
-
<portlet-info>
<title>AddlPortletTests_SPEC2_9_WindowStates</title>
</portlet-info>
@@ -179,20 +200,11 @@
<portlet>
<portlet-name>AddlPortletTests_SPEC2_13_ResourceServing</portlet-name>
<portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_13_ResourceServing</portlet-class>
-
- <init-param>
- <name>TestParameter</name>
- <value>TestValue</value>
- </init-param>
-
<expiration-cache>0</expiration-cache>
-
<supports>
<mime-type>text/html</mime-type>
</supports>
-
<supported-locale>en_US</supported-locale>
-
<portlet-info>
<title>AddlPortletTests_SPEC2_13_ResourceServing</title>
</portlet-info>
@@ -201,20 +213,11 @@
<portlet>
<portlet-name>AddlPortletTests_SPEC2_13_ResourceServingCache</portlet-name>
<portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_13_ResourceServingCache</portlet-class>
-
- <init-param>
- <name>TestParameter</name>
- <value>TestValue</value>
- </init-param>
-
<expiration-cache>0</expiration-cache>
-
<supports>
<mime-type>text/html</mime-type>
</supports>
-
<supported-locale>en_US</supported-locale>
-
<portlet-info>
<title>AddlPortletTests_SPEC2_13_ResourceServingCache</title>
</portlet-info>
@@ -223,25 +226,110 @@
<portlet>
<portlet-name>AddlPortletTests_SPEC2_15_Event</portlet-name>
<portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_15_Event</portlet-class>
-
- <init-param>
- <name>TestParameter</name>
- <value>TestValue</value>
- </init-param>
-
<expiration-cache>0</expiration-cache>
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
+ <supported-locale>en_US</supported-locale>
+ <portlet-info>
+ <title>AddlPortletTests_SPEC2_15_Event</title>
+ </portlet-info>
+ <supported-publishing-event>
+ <qname>tck:AddlPortletTests_SPEC2_15_Event</qname>
+ </supported-publishing-event>
+ </portlet>
+ <portlet>
+ <portlet-name>AddlPortletTests_SPEC2_15_Event_event</portlet-name>
+ <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_15_Event_event</portlet-class>
+ <expiration-cache>0</expiration-cache>
<supports>
<mime-type>text/html</mime-type>
</supports>
+ <supported-locale>en_US</supported-locale>
+ <portlet-info>
+ <title>AddlPortletTests_SPEC2_15_Event_event</title>
+ </portlet-info>
+ <supported-processing-event>
+ <qname>tck:AddlPortletTests_SPEC2_15_Event</qname>
+ </supported-processing-event>
+ </portlet>
+ <portlet>
+ <portlet-name>AddlPortletTests_SPEC2_15_RenderEventHandling</portlet-name>
+ <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_15_RenderEventHandling</portlet-class>
+ <expiration-cache>0</expiration-cache>
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
<supported-locale>en_US</supported-locale>
+ <portlet-info>
+ <title>AddlPortletTests_SPEC2_15_RenderEventHandling</title>
+ </portlet-info>
+ </portlet>
+ <portlet>
+ <portlet-name>AddlPortletTests_SPEC2_15_EventEventHandling</portlet-name>
+ <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_15_EventEventHandling</portlet-class>
+ <expiration-cache>0</expiration-cache>
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
+ <supported-locale>en_US</supported-locale>
<portlet-info>
- <title>AddlPortletTests_SPEC2_15_Event</title>
+ <title>AddlPortletTests_SPEC2_15_EventEventHandling</title>
</portlet-info>
+ <supported-publishing-event>
+ <qname>tck:AddlPortletTests_SPEC2_15_EventEventHandling</qname>
+ </supported-publishing-event>
</portlet>
+ <portlet>
+ <portlet-name>AddlPortletTests_SPEC2_15_EventEventHandling_event</portlet-name>
+ <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_15_EventEventHandling_event</portlet-class>
+ <expiration-cache>0</expiration-cache>
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
+ <supported-locale>en_US</supported-locale>
+ <portlet-info>
+ <title>AddlPortletTests_SPEC2_15_EventEventHandling_event</title>
+ </portlet-info>
+ <supported-processing-event>
+ <qname>tck:AddlPortletTests_SPEC2_15_EventEventHandling</qname>
+ </supported-processing-event>
+ </portlet>
+ <portlet>
+ <portlet-name>AddlPortletTests_SPEC2_15_ActionEventHandling</portlet-name>
+ <portlet-class>javax.portlet.tck.portlets.AddlPortletTests_SPEC2_15_ActionEventHandling</portlet-class>
+ <expiration-cache>0</expiration-cache>
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
+ <supported-locale>en_US</supported-locale>
+ <portlet-info>
+ <title>AddlPortletTests_SPEC2_15_ActionEventHandling</title>
+ </portlet-info>
+ </portlet>
+ <event-definition>
+ <qname>tck:AddlPortletTests_SPEC2_5_EventHandling</qname>
+ <value-type>java.lang.String</value-type>
+ </event-definition>
+
+ <event-definition>
+ <qname>tck:AddlPortletTests_SPEC2_15_Event</qname>
+ <value-type>java.lang.String</value-type>
+ </event-definition>
+
+ <event-definition>
+ <qname>tck:AddlPortletTests_SPEC2_15_EventEventHandling</qname>
+ <value-type>java.lang.String</value-type>
+ </event-definition>
+
+ <public-render-parameter>
+ <identifier>tckPRP1</identifier>
+ <qname>tck:tckPRP1</qname>
+ </public-render-parameter>
</portlet-app>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlPortletTests/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlPortletTests/src/main/webapp/WEB-INF/web.xml b/portlet-tck_3.0/V2AddlPortletTests/src/main/webapp/WEB-INF/web.xml
index d3f543a..bb82e3b 100644
--- a/portlet-tck_3.0/V2AddlPortletTests/src/main/webapp/WEB-INF/web.xml
+++ b/portlet-tck_3.0/V2AddlPortletTests/src/main/webapp/WEB-INF/web.xml
@@ -18,6 +18,6 @@
under the License.
-->
<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>javax.portlet-tck-AddlPortletTests</display-name>
-</web-app>
+ <display-name>javax.portlet-tck-AddlPortletTests</display-name>
+</web-app>
http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/23a1c547/portlet-tck_3.0/V2AddlRequestTests/pom.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AddlRequestTests/pom.xml b/portlet-tck_3.0/V2AddlRequestTests/pom.xml
index 8fcbd0d..7ab1cef 100644
--- a/portlet-tck_3.0/V2AddlRequestTests/pom.xml
+++ b/portlet-tck_3.0/V2AddlRequestTests/pom.xml
@@ -1,123 +1,127 @@
-<!--
- 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.
--->
-<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>
-
- <parent>
- <groupId>javax.portlet</groupId>
- <artifactId>tck</artifactId>
- <version>3.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>tck-V2AddlRequestTests</artifactId>
- <packaging>war</packaging>
-
- <dependencies>
- <dependency>
- <groupId>javax.portlet</groupId>
- <artifactId>portlet-api</artifactId>
- </dependency>
- <dependency>
- <groupId>javax.portlet</groupId>
- <artifactId>tck-common</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-
- <properties>
-
- <!-- This project contains additional test cases to run with the portlets -->
- <additional.testcase.uri>file:///${basedir}/src/main/resources/xml-resources/additionalTCs.xml</additional.testcase.uri>
-
- <!-- Set to true for modules that define all test cases in a file (TCs are not generated from the portlet.xml) -->
- <additional.testcases.only>true</additional.testcases.only>
-
- <!-- put all portlets from this module on the same page -->
- <page.file.xsl>plutoMultiPortletPage.xsl</page.file.xsl>
-
- </properties>
-
- <build>
- <finalName>${project.artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- </plugin>
- <!-- Transform the portlet XML into test properties XML file -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xml-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
-
- <profiles>
- <profile>
- <id>pluto</id>
-
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>jstl</artifactId>
- </dependency>
- <dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
- </configuration>
- </plugin>
- <!-- bind 'pluto:assemble' goal to 'generate-resources' lifecycle -->
- <plugin>
- <groupId>org.apache.portals.pluto</groupId>
- <artifactId>maven-pluto-plugin</artifactId>
- <executions>
- <execution>
- <phase>generate-resources</phase>
- <goals>
- <goal>assemble</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
+<!--
+ 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.
+-->
+<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>
+
+ <parent>
+ <groupId>javax.portlet</groupId>
+ <artifactId>tck</artifactId>
+ <version>3.0-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>tck-V2AddlRequestTests</artifactId>
+ <packaging>war</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.portlet</groupId>
+ <artifactId>portlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.portlet</groupId>
+ <artifactId>tck-common</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <properties>
+
+ <!-- This project contains additional test cases to run with the portlets -->
+ <additional.testcase.uri>file:///${basedir}/src/main/resources/xml-resources/additionalTCs.xml</additional.testcase.uri>
+
+ <!-- Set to true for modules that define all test cases in a file (TCs are not generated from the portlet.xml) -->
+ <additional.testcases.only>true</additional.testcases.only>
+
+ <!-- put all portlets from this module on the same page -->
+ <page.file.xsl>plutoMultiPortletPage.xsl</page.file.xsl>
+
+ </properties>
+
+ <build>
+ <finalName>${project.artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ </plugin>
+ <!-- Transform the portlet XML into test properties XML file -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xml-maven-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+
+ <profiles>
+ <profile>
+ <id>pluto</id>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webXml>${project.build.directory}/pluto-resources/web.xml</webXml>
+ </configuration>
+ </plugin>
+ <!-- bind 'pluto:assemble' goal to 'generate-resources' lifecycle -->
+ <plugin>
+ <groupId>org.apache.portals.pluto</groupId>
+ <artifactId>maven-pluto-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>assemble</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
+</project>