portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From msnickl...@apache.org
Subject [2/5] portals-pluto git commit: Merge branch 'master' into neil
Date Mon, 10 Oct 2016 11:25:01 GMT
Merge branch 'master' into neil


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

Branch: refs/heads/master
Commit: a41aab2db6e4f18716f7851bf70c382a04f357ea
Parents: cb76c0b 2b2276b
Author: Scott Nicklous <msnicklous@apache.org>
Authored: Tue Oct 4 14:50:06 2016 +0200
Committer: Scott Nicklous <msnicklous@apache.org>
Committed: Tue Oct 4 14:50:06 2016 +0200

----------------------------------------------------------------------
 .../bean/processor/AnnotatedMethod.java         |  18 ++
 .../bean/processor/AnnotationRecognizer.java    |   6 -
 .../processor/MethodAnnotationRecognizer.java   |   1 -
 .../processor/PortletAnnotationRecognizer.java  |  48 ----
 .../bean/processor/PortletCDIExtension.java     |   1 -
 .../om/portlet/impl/ConfigurationHolder.java    |  21 +-
 .../om/portlet/impl/ConfigurationProcessor.java |  45 +++-
 .../src/main/docs/ModuleAssertions.csv          |   7 +-
 .../portlet/tck/portlets/HeaderSetter.java      |  51 ++++
 .../portlets/PortletHubTests_SPEC_23_JS.java    |  78 +++---
 .../portlet/tck/util/ModuleTestCaseDetails.java |   4 +-
 .../resources/xml-resources/additionalTCs.xml   |   1 -
 .../src/main/webapp/WEB-INF/beans.xml           |   7 +
 .../javascript/PortletHubTests_SPEC_23_JS.js    | 109 ++++----
 .../src/main/webapp/javascript/promise.js       | 255 +++++++++++++++++++
 .../javax/portlet/tck/beans/ResourceLink.java   |   2 +-
 .../portlet/tck/beans/TestCaseDetails.java      |  28 ++
 .../javax/portlet/tck/beans/TestResult.java     |  12 +-
 .../portlet/tck/beans/TestResultAsync.java      | 189 ++++++++++++++
 .../javax/portlet/tck/constants/Constants.java  |   2 +
 portlet-tck_3.0/driver/pom.xml                  |  31 ++-
 .../portlet/tck/driver/TCKSimpleTestDriver.java |  59 ++++-
 portlet-tck_3.0/pom.xml                         |  13 +
 23 files changed, 775 insertions(+), 213 deletions(-)
----------------------------------------------------------------------



Mime
View raw message