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 2016/04/22 10:58:45 UTC

[26/30] portals-pluto git commit: For Jayendran Anil Kumar: Completed the V2 annotation tests. Corrected typo in log output in the case of an invalid processing QName.

 For Jayendran Anil Kumar: Completed the V2 annotation tests. Corrected typo
 in log output in the case of an invalid processing QName.


Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/8f8a2d69
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/8f8a2d69
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/8f8a2d69

Branch: refs/heads/master
Commit: 8f8a2d6999d5a3e8c07a8bc6d258bf12f1c2eeeb
Parents: c53495b
Author: Scott Nicklous <ms...@apache.org>
Authored: Thu Apr 21 15:44:19 2016 +0200
Committer: Scott Nicklous <ms...@apache.org>
Committed: Thu Apr 21 15:44:19 2016 +0200

----------------------------------------------------------------------
 .../impl/JSR286ConfigurationProcessor.java      |  2 +-
 ...AnnotationTests_ProcessAction_ApiAction.java | 50 +++++++-------
 .../AnnotationTests_ProcessEvent_ApiEvent.java  | 64 ++++++++----------
 ...tationTests_ProcessEvent_ApiEvent_event.java | 69 ++++++++++++--------
 .../AnnotationTests_RenderMode_ApiRender.java   | 46 +++++--------
 .../src/main/resources/logging.properties       |  2 +-
 .../src/main/webapp/WEB-INF/portlet.xml         | 13 +++-
 7 files changed, 127 insertions(+), 119 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8f8a2d69/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/JSR286ConfigurationProcessor.java
----------------------------------------------------------------------
diff --git a/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/JSR286ConfigurationProcessor.java b/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/JSR286ConfigurationProcessor.java
index eaccf25..5987e9e 100644
--- a/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/JSR286ConfigurationProcessor.java
+++ b/pluto-container/src/main/java/org/apache/pluto/container/om/portlet/impl/JSR286ConfigurationProcessor.java
@@ -1014,7 +1014,7 @@ public class JSR286ConfigurationProcessor extends JSR168ConfigurationProcessor {
             QName qname = edr.getQualifiedName();
             if (pad.getEventDefinition(qname) == null) {
                txt.setLength(0);
-               txt.append("Bad publishing event definition reference. No event definition found for qname: ");
+               txt.append("Bad processing event definition reference. No event definition found for qname: ");
                txt.append(qname);
                txt.append(". Valid QNames: ");
                String sep = "";

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8f8a2d69/portlet-tck_3.0/V2AnnotationTests/src/main/java/javax/portlet/tck/portlets/AnnotationTests_ProcessAction_ApiAction.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AnnotationTests/src/main/java/javax/portlet/tck/portlets/AnnotationTests_ProcessAction_ApiAction.java b/portlet-tck_3.0/V2AnnotationTests/src/main/java/javax/portlet/tck/portlets/AnnotationTests_ProcessAction_ApiAction.java
index 50fbf6b..964e37b 100644
--- a/portlet-tck_3.0/V2AnnotationTests/src/main/java/javax/portlet/tck/portlets/AnnotationTests_ProcessAction_ApiAction.java
+++ b/portlet-tck_3.0/V2AnnotationTests/src/main/java/javax/portlet/tck/portlets/AnnotationTests_ProcessAction_ApiAction.java
@@ -18,21 +18,32 @@
 
 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.JSR286ApiTestCaseDetails.*;
-import static javax.portlet.tck.constants.Constants.*;
-import static javax.portlet.PortletSession.*;
-import static javax.portlet.ResourceURL.*;
+import static javax.portlet.PortletSession.APPLICATION_SCOPE;
+import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2ANNOTATIONTESTS_PROCESSACTION_APIACTION_NAME;
+import static javax.portlet.tck.constants.Constants.RESULT_ATTR_PREFIX;
+import static javax.portlet.tck.constants.Constants.THREADID_ATTR;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.logging.Logger;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.Portlet;
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletException;
+import javax.portlet.PortletSession;
+import javax.portlet.PortletURL;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.ResourceRequest;
+import javax.portlet.ResourceResponse;
+import javax.portlet.ResourceServingPortlet;
+import javax.portlet.tck.beans.JSR286ApiTestCaseDetails;
+import javax.portlet.tck.beans.TestButton;
+import javax.portlet.tck.beans.TestResult;
+import javax.portlet.tck.constants.Constants;
 
 /**
  * This portlet implements several test cases for the JSR 362 TCK. The test case names
@@ -50,11 +61,8 @@ public class AnnotationTests_ProcessAction_ApiAction implements Portlet, Resourc
          AnnotationTests_ProcessAction_ApiAction.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
@@ -75,10 +83,6 @@ public class AnnotationTests_ProcessAction_ApiAction implements Portlet, Resourc
 
       JSR286ApiTestCaseDetails tcd = new JSR286ApiTestCaseDetails();
 
-      // Create result objects for the tests
-
-      ClassChecker cc = new ClassChecker(javax.portlet.ProcessAction.class);
-
       /* TestCase: V2AnnotationTests_ProcessAction_ApiAction_name             */
       /* Details: "Method name(): On an action request, the method is         */
       /* executed if the parameter \"javax.portlet.action\" matches the       */
@@ -105,8 +109,6 @@ public class AnnotationTests_ProcessAction_ApiAction implements Portlet, Resourc
       long tid = Thread.currentThread().getId();
       portletReq.setAttribute(THREADID_ATTR, tid);
 
-      PrintWriter writer = portletResp.getWriter();
-
    }
 
    @Override

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8f8a2d69/portlet-tck_3.0/V2AnnotationTests/src/main/java/javax/portlet/tck/portlets/AnnotationTests_ProcessEvent_ApiEvent.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AnnotationTests/src/main/java/javax/portlet/tck/portlets/AnnotationTests_ProcessEvent_ApiEvent.java b/portlet-tck_3.0/V2AnnotationTests/src/main/java/javax/portlet/tck/portlets/AnnotationTests_ProcessEvent_ApiEvent.java
index 33fd0ed..2139aca 100644
--- a/portlet-tck_3.0/V2AnnotationTests/src/main/java/javax/portlet/tck/portlets/AnnotationTests_ProcessEvent_ApiEvent.java
+++ b/portlet-tck_3.0/V2AnnotationTests/src/main/java/javax/portlet/tck/portlets/AnnotationTests_ProcessEvent_ApiEvent.java
@@ -18,21 +18,25 @@
 
 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.JSR286ApiTestCaseDetails.*;
 import static javax.portlet.tck.constants.Constants.*;
-import static javax.portlet.PortletSession.*;
-import static javax.portlet.ResourceURL.*;
+import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2ANNOTATIONTESTS_PROCESSEVENT_APIEVENT_QNAME;
+import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2ANNOTATIONTESTS_PROCESSEVENT_APIEVENT_NAME;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.logging.Logger;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.GenericPortlet;
+import javax.portlet.PortletException;
+import javax.portlet.PortletURL;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.ResourceRequest;
+import javax.portlet.ResourceResponse;
+import javax.portlet.tck.beans.TestButton;
+import javax.xml.namespace.QName;
 
 /**
  * This portlet implements several test cases for the JSR 362 TCK. The test case names
@@ -45,21 +49,10 @@ import static javax.portlet.ResourceURL.*;
  * portlet AnnotationTests_ProcessEvent_ApiEvent_event
  *
  */
-public class AnnotationTests_ProcessEvent_ApiEvent implements Portlet, ResourceServingPortlet {
+public class AnnotationTests_ProcessEvent_ApiEvent extends GenericPortlet {
    private static final String LOG_CLASS = 
          AnnotationTests_ProcessEvent_ApiEvent.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)
@@ -70,11 +63,14 @@ public class AnnotationTests_ProcessEvent_ApiEvent implements Portlet, ResourceS
       long tid = Thread.currentThread().getId();
       portletReq.setAttribute(THREADID_ATTR, tid);
 
-      StringWriter writer = new StringWriter();
-
-      QName eventQName = new QName(TCKNAMESPACE,
-             "AnnotationTests_ProcessEvent_ApiEvent");
-      portletResp.setEvent(eventQName, "Hi!");
+      if (portletReq.getParameter(BUTTON_PARAM_NAME).startsWith(V2ANNOTATIONTESTS_PROCESSEVENT_APIEVENT_QNAME)) {
+         QName eventQName = new QName(TCKNAMESPACE, "AnnotationTests_ProcessEvent_ApiEvent");
+         portletResp.setEvent(eventQName, "Hi!");
+         LOGGER.finest("Firing event: " + eventQName.toString());
+      } else if (portletReq.getParameter(BUTTON_PARAM_NAME).startsWith(V2ANNOTATIONTESTS_PROCESSEVENT_APIEVENT_NAME)) {
+         portletResp.setEvent("AnnotationTests_ProcessEvent_ApiEvent2", "Hi!");
+         LOGGER.finest("Firing event: AnnotationTests_ProcessEvent_ApiEvent2");
+      }
    }
 
    @Override
@@ -85,8 +81,6 @@ public class AnnotationTests_ProcessEvent_ApiEvent implements Portlet, ResourceS
       long tid = Thread.currentThread().getId();
       portletReq.setAttribute(THREADID_ATTR, tid);
 
-      PrintWriter writer = portletResp.getWriter();
-
    }
 
    @Override
@@ -105,7 +99,7 @@ public class AnnotationTests_ProcessEvent_ApiEvent implements Portlet, ResourceS
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
-         TestButton tb = new TestButton("V2AnnotationTests_ProcessEvent_ApiEvent_qname", aurl);
+         TestButton tb = new TestButton(V2ANNOTATIONTESTS_PROCESSEVENT_APIEVENT_QNAME, aurl);
          tb.writeTo(writer);
       }
 
@@ -115,7 +109,7 @@ public class AnnotationTests_ProcessEvent_ApiEvent implements Portlet, ResourceS
       {
          PortletURL aurl = portletResp.createActionURL();
          aurl.setParameters(portletReq.getPrivateParameterMap());
-         TestButton tb = new TestButton("V2AnnotationTests_ProcessEvent_ApiEvent_name", aurl);
+         TestButton tb = new TestButton(V2ANNOTATIONTESTS_PROCESSEVENT_APIEVENT_NAME, aurl);
          tb.writeTo(writer);
       }
 

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8f8a2d69/portlet-tck_3.0/V2AnnotationTests/src/main/java/javax/portlet/tck/portlets/AnnotationTests_ProcessEvent_ApiEvent_event.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AnnotationTests/src/main/java/javax/portlet/tck/portlets/AnnotationTests_ProcessEvent_ApiEvent_event.java b/portlet-tck_3.0/V2AnnotationTests/src/main/java/javax/portlet/tck/portlets/AnnotationTests_ProcessEvent_ApiEvent_event.java
index 65574b8..734e48a 100644
--- a/portlet-tck_3.0/V2AnnotationTests/src/main/java/javax/portlet/tck/portlets/AnnotationTests_ProcessEvent_ApiEvent_event.java
+++ b/portlet-tck_3.0/V2AnnotationTests/src/main/java/javax/portlet/tck/portlets/AnnotationTests_ProcessEvent_ApiEvent_event.java
@@ -18,20 +18,32 @@
 
 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.constants.Constants.*;
-import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.*;
-import static javax.portlet.PortletSession.*;
+import static javax.portlet.PortletSession.APPLICATION_SCOPE;
+import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2ANNOTATIONTESTS_PROCESSEVENT_APIEVENT_NAME;
+import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2ANNOTATIONTESTS_PROCESSEVENT_APIEVENT_QNAME;
+import static javax.portlet.tck.constants.Constants.RESULT_ATTR_PREFIX;
+import static javax.portlet.tck.constants.Constants.TCKNAMESPACE;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.EventRequest;
+import javax.portlet.EventResponse;
+import javax.portlet.GenericPortlet;
+import javax.portlet.PortletException;
+import javax.portlet.ProcessEvent;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.ResourceRequest;
+import javax.portlet.ResourceResponse;
+import javax.portlet.tck.beans.JSR286ApiTestCaseDetails;
+import javax.portlet.tck.beans.TestResult;
+import javax.portlet.tck.constants.Constants;
 
 /**
  * This is the event processing portlet for the test cases. This portlet processes events, 
@@ -41,17 +53,6 @@ public class AnnotationTests_ProcessEvent_ApiEvent_event extends GenericPortlet
    private static final String LOG_CLASS = 
          AnnotationTests_ProcessEvent_ApiEvent_event.class.getName();
    private final Logger LOGGER = Logger.getLogger(LOG_CLASS);
-   
-  
-   @Override
-   public void init(PortletConfig config) throws PortletException {
-      
-     
-   }
-   
-   @Override
-   public void destroy() {
-   }
 
    @Override
    public void processAction(ActionRequest portletReq, ActionResponse portletResp)
@@ -65,6 +66,20 @@ public class AnnotationTests_ProcessEvent_ApiEvent_event extends GenericPortlet
       LOGGER.entering(LOG_CLASS, "event companion serveResource - ERROR!!");
    }
    
+   
+   @Override
+   public void processEvent(EventRequest request, EventResponse response) throws PortletException, IOException {
+      
+      if (LOGGER.isLoggable(Level.FINEST)) {
+         StringBuilder txt = new StringBuilder(128);
+         txt.append("Event arrived.");
+         txt.append(" Name: ").append(request.getEvent().getName());
+         txt.append(", QName: ").append(request.getEvent().getQName());
+         LOGGER.fine(txt.toString());
+      }
+      
+      super.processEvent(request, response);
+   }
   
    
   @ProcessEvent(qname="{" + TCKNAMESPACE + "}AnnotationTests_ProcessEvent_ApiEvent")
@@ -95,7 +110,7 @@ public class AnnotationTests_ProcessEvent_ApiEvent_event extends GenericPortlet
 	   
    }
    
- // @ProcessEvent(name="AnnotationTests_ProcessEvent_ApiEvent")
+   @ProcessEvent(name="AnnotationTests_ProcessEvent_ApiEvent2")
    public void nameEvnt(EventRequest req,EventResponse resp)
               throws PortletException,IOException {
 	   StringWriter writer = new StringWriter();
@@ -107,8 +122,6 @@ public class AnnotationTests_ProcessEvent_ApiEvent_event extends GenericPortlet
 	      TestResult tr1 = tcd.getTestResultFailed(V2ANNOTATIONTESTS_PROCESSEVENT_APIEVENT_NAME);
 	      
 	      tr1.setTcSuccess(true);
-	     
-	      tr1.appendTcDetail("Error");
 	    
 	      tr1.writeTo(writer);
 	      

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8f8a2d69/portlet-tck_3.0/V2AnnotationTests/src/main/java/javax/portlet/tck/portlets/AnnotationTests_RenderMode_ApiRender.java
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AnnotationTests/src/main/java/javax/portlet/tck/portlets/AnnotationTests_RenderMode_ApiRender.java b/portlet-tck_3.0/V2AnnotationTests/src/main/java/javax/portlet/tck/portlets/AnnotationTests_RenderMode_ApiRender.java
index 2428c75..5d88938 100644
--- a/portlet-tck_3.0/V2AnnotationTests/src/main/java/javax/portlet/tck/portlets/AnnotationTests_RenderMode_ApiRender.java
+++ b/portlet-tck_3.0/V2AnnotationTests/src/main/java/javax/portlet/tck/portlets/AnnotationTests_RenderMode_ApiRender.java
@@ -18,21 +18,24 @@
 
 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.JSR286ApiTestCaseDetails.*;
-import static javax.portlet.tck.constants.Constants.*;
-import static javax.portlet.PortletSession.*;
-import static javax.portlet.ResourceURL.*;
+import static javax.portlet.tck.beans.JSR286ApiTestCaseDetails.V2ANNOTATIONTESTS_RENDERMODE_APIRENDER_NAME;
+import static javax.portlet.tck.constants.Constants.THREADID_ATTR;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.logging.Logger;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.GenericPortlet;
+import javax.portlet.PortletException;
+import javax.portlet.RenderMode;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.ResourceRequest;
+import javax.portlet.ResourceResponse;
+import javax.portlet.tck.beans.JSR286ApiTestCaseDetails;
+import javax.portlet.tck.beans.TestResult;
 
 /**
  * This portlet implements several test cases for the JSR 362 TCK. The test case names
@@ -70,8 +73,6 @@ public class AnnotationTests_RenderMode_ApiRender extends GenericPortlet {
       long tid = Thread.currentThread().getId();
       portletReq.setAttribute(THREADID_ATTR, tid);
 
-      StringWriter writer = new StringWriter();
-
    }
 
    @Override
@@ -82,8 +83,6 @@ public class AnnotationTests_RenderMode_ApiRender extends GenericPortlet {
       long tid = Thread.currentThread().getId();
       portletReq.setAttribute(THREADID_ATTR, tid);
 
-      PrintWriter writer = portletResp.getWriter();
-
    }
    
    @RenderMode(name="VIEW")
@@ -110,15 +109,6 @@ public class AnnotationTests_RenderMode_ApiRender extends GenericPortlet {
 
       long tid = Thread.currentThread().getId();
       portletReq.setAttribute(THREADID_ATTR, tid);
-
-      PrintWriter writer = portletResp.getWriter();
-
-      JSR286ApiTestCaseDetails tcd = new JSR286ApiTestCaseDetails();
-
-      // Create result objects for the tests
-
-      ClassChecker cc = new ClassChecker(javax.portlet.RenderMode.class);
-
       
       super.render(portletReq, portletResp);
       

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8f8a2d69/portlet-tck_3.0/V2AnnotationTests/src/main/resources/logging.properties
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AnnotationTests/src/main/resources/logging.properties b/portlet-tck_3.0/V2AnnotationTests/src/main/resources/logging.properties
index e71eca6..0abcb1c 100644
--- a/portlet-tck_3.0/V2AnnotationTests/src/main/resources/logging.properties
+++ b/portlet-tck_3.0/V2AnnotationTests/src/main/resources/logging.properties
@@ -10,4 +10,4 @@ org.apache.juli.FileHandler.prefix = javax.portlet-tck.
 java.util.logging.ConsoleHandler.level = FINEST
 java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
 
-javax.portlet.tck.level = FINEST
+javax.portlet.tck.level = FINE

http://git-wip-us.apache.org/repos/asf/portals-pluto/blob/8f8a2d69/portlet-tck_3.0/V2AnnotationTests/src/main/webapp/WEB-INF/portlet.xml
----------------------------------------------------------------------
diff --git a/portlet-tck_3.0/V2AnnotationTests/src/main/webapp/WEB-INF/portlet.xml b/portlet-tck_3.0/V2AnnotationTests/src/main/webapp/WEB-INF/portlet.xml
index cf3f74c..4e2b359 100644
--- a/portlet-tck_3.0/V2AnnotationTests/src/main/webapp/WEB-INF/portlet.xml
+++ b/portlet-tck_3.0/V2AnnotationTests/src/main/webapp/WEB-INF/portlet.xml
@@ -50,6 +50,9 @@
       <supported-publishing-event>
          <qname>tck:AnnotationTests_ProcessEvent_ApiEvent</qname>
       </supported-publishing-event>
+      <supported-publishing-event>
+         <name>AnnotationTests_ProcessEvent_ApiEvent2</name>
+      </supported-publishing-event>
    <supported-public-render-parameter>tckPRP1</supported-public-render-parameter>
    </portlet>
 
@@ -67,6 +70,9 @@
       <supported-processing-event>
          <qname>tck:AnnotationTests_ProcessEvent_ApiEvent</qname> 
       </supported-processing-event>
+      <supported-processing-event>
+         <name>AnnotationTests_ProcessEvent_ApiEvent2</name> 
+      </supported-processing-event>
    </portlet>
 
    <portlet>
@@ -83,13 +89,16 @@
    <supported-public-render-parameter>tckPRP1</supported-public-render-parameter>
    </portlet>
 
-
-
    <event-definition>
       <qname>tck:AnnotationTests_ProcessEvent_ApiEvent</qname>
       <value-type>java.lang.String</value-type>
    </event-definition>
 
+   <event-definition>
+      <name>AnnotationTests_ProcessEvent_ApiEvent2</name>
+      <value-type>java.lang.String</value-type>
+   </event-definition>
+
    <public-render-parameter>
       <identifier>tckPRP1</identifier>
       <qname>tck:tckPRP1</qname>