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 2015/01/14 08:08:04 UTC
[4/4] portals-pluto git commit: Merge branch 'master' into PortletHub
Merge branch 'master' into PortletHub
Project: http://git-wip-us.apache.org/repos/asf/portals-pluto/repo
Commit: http://git-wip-us.apache.org/repos/asf/portals-pluto/commit/5a5bdb7f
Tree: http://git-wip-us.apache.org/repos/asf/portals-pluto/tree/5a5bdb7f
Diff: http://git-wip-us.apache.org/repos/asf/portals-pluto/diff/5a5bdb7f
Branch: refs/heads/PortletHub
Commit: 5a5bdb7f97dfab6dcacff26766637de998a16634
Parents: ad7e067 98763f7
Author: Scott Nicklous <ms...@apache.org>
Authored: Wed Jan 14 07:37:24 2015 +0100
Committer: Scott Nicklous <ms...@apache.org>
Committed: Wed Jan 14 07:37:24 2015 +0100
----------------------------------------------------------------------
.../portlets/TestModule3_Portlet1.java | 189 +++++++--------
.../src/main/webapp/WEB-INF/portlet.xml | 101 ++++----
.../portlets/TestModule3_Portlet2.java | 230 +++++++++++--------
.../src/main/webapp/WEB-INF/portlet.xml | 101 ++++----
.../xml-resources/tck-TestModule3-tests.xml | 10 +-
.../tck/beans/TestModule3Definitions.java | 46 ++++
6 files changed, 390 insertions(+), 287 deletions(-)
----------------------------------------------------------------------