Merge pull request #2524 from GIP-RECIA/feat_alternativeMaximizedLinkTarget

cbeach47 · web-flow · commit 071a0c1d7170 · 2022-09-08T11:10:42.000-05:00
feat: new portlet definition attribute: alternativeMaximizedLinkTarget
diff --git a/uPortal-api/uPortal-api-internal/src/test/java/org/apereo/portal/portlets/layout/dlm/remoting/registry/v43/PortletDefinitionBeanTest.java b/uPortal-api/uPortal-api-internal/src/test/java/org/apereo/portal/portlets/layout/dlm/remoting/registry/v43/PortletDefinitionBeanTest.java
@@ -494,6 +494,11 @@ public String getAlternativeMaximizedLink() {
             return null;
         }
 
+        @Override
+        public String getAlternativeMaximizedLinkTarget() {
+            return null;
+        }
+
         @Override
         public String getTarget() {
             return null;
diff --git a/uPortal-api/uPortal-api-rest/src/main/java/org/apereo/portal/rest/LayoutRESTController.java b/uPortal-api/uPortal-api-rest/src/main/java/org/apereo/portal/rest/LayoutRESTController.java
@@ -156,6 +156,7 @@ private void setAltMaxURL(
         if (alternativeMaximizedLink != null) {
             portlet.setUrl(alternativeMaximizedLink);
             portlet.setAltMaxUrl(true);
+            portlet.setTarget(def.getAlternativeMaximizedLinkTarget());
         } else {
             // get the maximized URL for this portlet
             final IPortalUrlBuilder portalUrlBuilder =
diff --git a/uPortal-content/uPortal-content-portlet/src/main/java/org/apereo/portal/portlet/dao/jpa/PortletDefinitionImpl.java b/uPortal-content/uPortal-content-portlet/src/main/java/org/apereo/portal/portlet/dao/jpa/PortletDefinitionImpl.java
@@ -507,6 +507,23 @@ public String getAlternativeMaximizedLink() {
         return null;
     }
 
+    @Override
+    public String getAlternativeMaximizedLinkTarget() {
+        final IPortletDefinitionParameter alternativeMaximizedLinkTargetParameter =
+                getParameter(ALT_MAX_LINK_TARGET_PARAM);
+
+        if (null != alternativeMaximizedLinkTargetParameter) {
+            final String alternativeMaximizedLinkTarget =
+                    alternativeMaximizedLinkTargetParameter.getValue();
+
+            if (StringUtils.hasText(alternativeMaximizedLinkTarget)) {
+                return alternativeMaximizedLinkTarget;
+            }
+        }
+
+        return null;
+    }
+
     @Override
     public String getTarget() {
         final IPortletDefinitionParameter targetParameter = getParameter(TARGET_PARAM);
diff --git a/uPortal-core/src/main/java/org/apereo/portal/portlet/om/IPortletDefinition.java b/uPortal-core/src/main/java/org/apereo/portal/portlet/om/IPortletDefinition.java
@@ -41,6 +41,15 @@ public interface IPortletDefinition extends IBasicEntity, IPortalData {
      */
     String ALT_MAX_LINK_PARAM = "alternativeMaximizedLink";
 
+    /**
+     * The name of the portlet parameter that if present represents an alternative URL target that
+     * ought to be used to "maximize" the defined portlet, eg: _blank, _self, etc...
+     *
+     * <p>This is useful for portlets that when maximized ought to instead be the external URL or
+     * web application that they're representing in the portal.
+     */
+    String ALT_MAX_LINK_TARGET_PARAM = "alternativeMaximizedLinkTarget";
+
     /** A portlet parameter that specifies a target for the flyout, eg : _blank */
     String TARGET_PARAM = "target";
 
@@ -149,6 +158,17 @@ public interface IPortletDefinition extends IBasicEntity, IPortalData {
      */
     String getAlternativeMaximizedLink();
 
+    /**
+     * Returns the alternative maximized link window target associated with this portlet definition,
+     * or null if none.
+     *
+     * <p>Syntactic sugar for parsing potential alternative maximized link window target
+     *
+     * @return String representing the window target, or null if none.
+     * @since 4.2
+     */
+    String getAlternativeMaximizedLinkTarget();
+
     /**
      * Syntactic sugar for getting the target parameter from the portlet parameters.
      *
diff --git a/uPortal-core/src/test/java/org/apereo/portal/portlet/om/PortletParameterUtilityTest.java b/uPortal-core/src/test/java/org/apereo/portal/portlet/om/PortletParameterUtilityTest.java
@@ -21,14 +21,18 @@ public void convertsParameterMapToStringMap() {
         IPortletDefinitionParameter altMaxUrlParam =
                 new PortletDefinitionParameter(
                         "alternativeMaximizedLink", "https://public.my.wisc.edu");
+        IPortletDefinitionParameter altMaxUrlTargetParam =
+                new PortletDefinitionParameter("alternativeMaximizedLinkTarget", "_self");
 
         input.put("icon", iconParam);
         input.put("alternativeMaximizedLink", altMaxUrlParam);
+        input.put("alternativeMaximizedLinkTarget", altMaxUrlTargetParam);
 
         Map<String, String> expected = new HashMap<>(2);
 
         expected.put("icon", "dashboard");
         expected.put("alternativeMaximizedLink", "https://public.my.wisc.edu");
+        expected.put("alternativeMaximizedLinkTarget", "_self");
 
         assertEquals(expected, PortletParameterUtility.parameterMapToStringStringMap(input));
     }
diff --git a/uPortal-layout/uPortal-layout-core/src/main/java/org/apereo/portal/layout/LayoutPortlet.java b/uPortal-layout/uPortal-layout-core/src/main/java/org/apereo/portal/layout/LayoutPortlet.java
@@ -68,6 +68,7 @@ public LayoutPortlet(IPortletDefinition portletDef) {
             url = portletDef.getAlternativeMaximizedLink();
             target = portletDef.getTarget();
             isAltMaxUrl = StringUtils.isNotBlank(url);
+            if (isAltMaxUrl) target = portletDef.getAlternativeMaximizedLinkTarget();
             IPortletDefinitionParameter iconParam = portletDef.getParameter("iconUrl");
             if (iconParam != null) {
                 this.setIconUrl(iconParam.getValue());
diff --git a/uPortal-layout/uPortal-layout-impl/src/main/java/org/apereo/portal/layout/dlm/MissingPortletDefinition.java b/uPortal-layout/uPortal-layout-impl/src/main/java/org/apereo/portal/layout/dlm/MissingPortletDefinition.java
@@ -75,6 +75,11 @@ public String getAlternativeMaximizedLink() {
         return null;
     }
 
+    @Override
+    public String getAlternativeMaximizedLinkTarget() {
+        return null;
+    }
+
     @Override
     public String getTarget() {
         return null;
diff --git a/uPortal-marketplace/src/main/java/org/apereo/portal/portlet/marketplace/MarketplacePortletDefinition.java b/uPortal-marketplace/src/main/java/org/apereo/portal/portlet/marketplace/MarketplacePortletDefinition.java
@@ -552,6 +552,11 @@ public String getAlternativeMaximizedLink() {
         return this.portletDefinition.getAlternativeMaximizedLink();
     }
 
+    @Override
+    public String getAlternativeMaximizedLinkTarget() {
+        return this.portletDefinition.getAlternativeMaximizedLinkTarget();
+    }
+
     @Override
     public void setFName(String fname) {
         this.portletDefinition.setFName(fname);
diff --git a/uPortal-marketplace/src/test/java/org/apereo/portal/portlet/marketplace/MarketplacePortletDefinitionTest.java b/uPortal-marketplace/src/test/java/org/apereo/portal/portlet/marketplace/MarketplacePortletDefinitionTest.java
@@ -68,6 +68,18 @@ public void testRenderUrlIsAlternativeMaximizedLinkWhenPresent() {
         assertEquals("http://apereo.org", marketplacePortletDefinition.getRenderUrl());
     }
 
+    /**
+     * Test that a MarketplacePortletDefinition passes through the alternativeMaximizedLinkTarget of
+     * the IPortletDefinition it wraps.
+     */
+    @Test
+    public void testReflectsWrappedDefinitionAlternativeMaximizedLinkTarget() {
+
+        when(portletDefinition.getAlternativeMaximizedLinkTarget()).thenReturn("_self");
+
+        assertEquals("_self", marketplacePortletDefinition.getAlternativeMaximizedLinkTarget());
+    }
+
     /** Test implementation of equals(). */
     @Test
     public void testEquals() {
diff --git a/uPortal-rendering/src/main/java/org/apereo/portal/portlet/registry/PortletEntityRegistryImpl.java b/uPortal-rendering/src/main/java/org/apereo/portal/portlet/registry/PortletEntityRegistryImpl.java
@@ -965,6 +965,11 @@ public String getAlternativeMaximizedLink() {
                     return null;
                 }
 
+                @Override
+                public String getAlternativeMaximizedLinkTarget() {
+                    return null;
+                }
+
                 @Override
                 public String getTitle() {
                     return null;
diff --git a/uPortal-webapp/src/main/resources/layout/structure/columns/columns.xsl b/uPortal-webapp/src/main/resources/layout/structure/columns/columns.xsl
@@ -282,6 +282,18 @@
                                         </xsl:attribute>
                                     </xsl:when>
                                 </xsl:choose>
+                                <xsl:choose>
+                                  <xsl:when test="parameter[@name='PORTLET.alternativeMaximizedLinkTarget']">
+                                    <xsl:attribute name="alternativeMaximizedLinkTarget">
+                                      <xsl:value-of select="parameter[@name='PORTLET.alternativeMaximizedLinkTarget']/@value"/>
+                                    </xsl:attribute>
+                                  </xsl:when>
+                                  <xsl:when test="parameter[@name='alternativeMaximizedLinkTarget']">
+                                    <xsl:attribute name="alternativeMaximizedLinkTarget">
+                                      <xsl:value-of select="parameter[@name='alternativeMaximizedLinkTarget']/@value"/>
+                                    </xsl:attribute>
+                                  </xsl:when>
+                                </xsl:choose>
                             </sidebarChannel>
                         </xsl:for-each>
                     </xsl:for-each>
@@ -416,6 +428,18 @@
                             </xsl:attribute>
                         </xsl:when>
                     </xsl:choose>
+                    <xsl:choose>
+                        <xsl:when test="parameter[@name='PORTLET.alternativeMaximizedLinkTarget']">
+                            <xsl:attribute name="alternativeMaximizedLinkTarget">
+                                <xsl:value-of select="parameter[@name='PORTLET.alternativeMaximizedLinkTarget']/@value"/>
+                            </xsl:attribute>
+                        </xsl:when>
+                        <xsl:when test="parameter[@name='alternativeMaximizedLinkTarget']">
+                            <xsl:attribute name="alternativeMaximizedLinkTarget">
+                                <xsl:value-of select="parameter[@name='alternativeMaximizedLinkTarget']/@value"/>
+                            </xsl:attribute>
+                        </xsl:when>
+                    </xsl:choose>
                 </tabChannel>
     </xsl:template>
 
@@ -430,4 +454,4 @@
         </footer>
     </xsl:template>
 
-</xsl:stylesheet>
+</xsl:stylesheet>
diff --git a/uPortal-webapp/src/main/resources/layout/theme/respondr/content.xsl b/uPortal-webapp/src/main/resources/layout/theme/respondr/content.xsl
@@ -340,7 +340,14 @@
           <xsl:choose>
             <xsl:when test="parameter[@name='alternativeMaximizedLink'] and string-length(parameter[@name='alternativeMaximizedLink']/@value) > 0">
               <xsl:attribute name="href"><xsl:value-of select="parameter[@name='alternativeMaximizedLink']/@value" /></xsl:attribute>
-              <xsl:attribute name="target">_blank</xsl:attribute>
+              <xsl:choose>
+                <xsl:when test="parameter[@name='alternativeMaximizedLinkTarget'] and string-length(parameter[@name='alternativeMaximizedLinkTarget']/@value) > 0">
+                  <xsl:attribute name="target"><xsl:value-of select="parameter[@name='alternativeMaximizedLinkTarget']/@value" /></xsl:attribute>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:attribute name="target">_blank</xsl:attribute>
+                </xsl:otherwise>
+              </xsl:choose>
               <xsl:attribute name="rel">noopener noreferrer</xsl:attribute>
               <xsl:attribute name="class">externalLink</xsl:attribute>
             </xsl:when>
@@ -559,7 +566,14 @@
             <xsl:choose>
               <xsl:when test="parameter[@name='alternativeMaximizedLink'] and string-length(parameter[@name='alternativeMaximizedLink']/@value) > 0">
                 <xsl:attribute name="href"><xsl:value-of select="parameter[@name='alternativeMaximizedLink']/@value" /></xsl:attribute>
-                <xsl:attribute name="target">_blank</xsl:attribute>
+                <xsl:choose>
+                  <xsl:when test="parameter[@name='alternativeMaximizedLinkTarget'] and string-length(parameter[@name='alternativeMaximizedLinkTarget']/@value) > 0">
+                    <xsl:attribute name="target"><xsl:value-of select="parameter[@name='alternativeMaximizedLinkTarget']/@value" /></xsl:attribute>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <xsl:attribute name="target">_blank</xsl:attribute>
+                  </xsl:otherwise>
+                </xsl:choose>
                 <xsl:attribute name="rel">noopener noreferrer</xsl:attribute>
                 <xsl:attribute name="class">up-portlet-control focus externalLink</xsl:attribute>
               </xsl:when>
@@ -758,4 +772,4 @@
   </xsl:template>
   <!-- ========== TEMPLATE: PORTLET CONTROLS ========== -->
 
-</xsl:stylesheet>
+</xsl:stylesheet>
diff --git a/uPortal-webapp/src/main/resources/layout/theme/respondr/navigation.xsl b/uPortal-webapp/src/main/resources/layout/theme/respondr/navigation.xsl
@@ -368,7 +368,14 @@
             <xsl:choose>
               <xsl:when test="@alternativeMaximizedLink and string-length(@alternativeMaximizedLink) > 0">
                 <xsl:attribute name="href"><xsl:value-of select="@alternativeMaximizedLink" /></xsl:attribute>
-                <xsl:attribute name="target">_blank</xsl:attribute>
+                <xsl:choose>
+                  <xsl:when test="@alternativeMaximizedLinkTarget and string-length(@alternativeMaximizedLinkTarget) > 0">
+                    <xsl:attribute name="target"><xsl:value-of select="@alternativeMaximizedLinkTarget" /></xsl:attribute>
+                  </xsl:when>
+                  <xsl:otherwise>
+                    <xsl:attribute name="target">_blank</xsl:attribute>
+                  </xsl:otherwise>
+                </xsl:choose>
                 <xsl:attribute name="rel">noopener noreferrer</xsl:attribute>
                 <xsl:attribute name="class">portal-subnav-link externalLink</xsl:attribute>
               </xsl:when>
@@ -417,4 +424,4 @@
   </xsl:template>
   <!-- =================================================== -->
 
-</xsl:stylesheet>
+</xsl:stylesheet>
diff --git a/uPortal-webapp/src/main/resources/org/apereo/portal/portlets/SharedParameters.cpd.xml b/uPortal-webapp/src/main/resources/org/apereo/portal/portlets/SharedParameters.cpd.xml
@@ -51,6 +51,13 @@
             <single-text-parameter-input display="text"/>
         </parameter>
 
+        <parameter>
+            <name>alternativeMaximizedLinkTarget</name>
+            <label>open.alternative.url.target.in.maximized.view</label>
+            <description>Window target of alternate URL to display when the portlet is in MAXIMIZED mode.</description>
+            <single-text-parameter-input display="text"/>
+        </parameter>
+
         <parameter>
             <name>chromeStyle</name>
             <label>chrome.style</label>
@@ -121,4 +128,4 @@
 
     </step>
 
-</portlet-publishing-definition>
+</portlet-publishing-definition>
diff --git a/uPortal-webapp/src/main/resources/properties/i18n/Messages.properties b/uPortal-webapp/src/main/resources/properties/i18n/Messages.properties
@@ -446,6 +446,7 @@ number.times=# Times
 object.count=Object count
 on.disk.hits=On disk hits
 open.alternative.url.in.maximized.view=Alternative link in maximized view
+open.alternative.url.target.in.maximized.view=Window target of alternative link in maximized view
 option=Option
 org.apereo.portal.tenants.AttributeValidatingOperationsListener.name=Attribute Validation
 org.apereo.portal.tenants.JpaPersistenceTenantOperationsListener.name=Tenant Persistence
@@ -809,4 +810,4 @@ available.reports=Available Reports
 report.list=Report List
 generate.new.report=Generate a new {0} Report
 # The placeholder $0 is used by Javascript to substitute a parameter into
-report.titleWithSingularFields={0}: $0
+report.titleWithSingularFields={0}: $0
diff --git a/uPortal-webapp/src/main/resources/properties/i18n/Messages_de.properties b/uPortal-webapp/src/main/resources/properties/i18n/Messages_de.properties
@@ -317,6 +317,8 @@ nothing.selected=Nichts ausgew\u00e4hlt
 number.times=# Times
 object.count=Object z\u00e4hlen
 on.disk.hits=Auf der Festplatte Treffern
+open.alternative.url.in.maximized.view=Alternativen Links in maximierter Ansicht
+open.alternative.url.target.in.maximized.view=Fensterziel des alternativen Links in maximierter Ansicht
 option=Option
 original.value=Original Preis
 owner=Besitzer
@@ -517,4 +519,4 @@ you.are.signed.in.as=Sie sind angemeldet als
 your.account.has.been.successfully.updated.your.changes.will.be.visible.upon.your.next.login=Ihr Konto wurde erfolgreich aktualisiert. Ihre \u00c4nderungen werden sichtbar bei Ihrem n\u00e4chsten Login.
 your.password.has.been.updated.successfully=Ihr Passwort wurde erfolgreich aktualisiert
 your.selection=Ihre Auswahl
-your.selections=Ihre Auswahl
+your.selections=Ihre Auswahl
diff --git a/uPortal-webapp/src/main/resources/properties/i18n/Messages_es.properties b/uPortal-webapp/src/main/resources/properties/i18n/Messages_es.properties
@@ -442,6 +442,7 @@ number.times=# veces
 object.count=Objeto de contar con
 on.disk.hits=El disco de \u00e9xitos
 open.alternative.url.in.maximized.view=Enlace alternativo en vista maximizada
+open.alternative.url.target.in.maximized.view=Ventana de destino de enlace alternativo en vista maximizada
 option=Opci\u00f3n
 org.apereo.portal.tenants.AttributeValidatingOperationsListener.name=Validaci\u00f3n de atributos
 org.apereo.portal.tenants.JpaPersistenceTenantOperationsListener.name=Persistencia del inquilino
@@ -788,4 +789,4 @@ you.are.signed.in.as=Has accedido como
 your.account.has.been.successfully.updated.your.changes.will.be.visible.upon.your.next.login=Su cuenta ha sido actualizado correctamente. Los cambios ser\u00e1n visibles en el siguiente inicio de sesi\u00f3n.
 your.password.has.been.updated.successfully=Su contrase\u00f1a se ha actualizado con \u00e9xito
 your.selection=Su Selecci\u00f3n
-your.selections=Con su selecci\u00f3n
+your.selections=Con su selecci\u00f3n
diff --git a/uPortal-webapp/src/main/resources/properties/i18n/Messages_fr.properties b/uPortal-webapp/src/main/resources/properties/i18n/Messages_fr.properties
@@ -444,6 +444,7 @@ number.times=# Nombre de fois
 object.count=Nombre d''objets
 on.disk.hits=Sur les acc\u00E8s disques
 open.alternative.url.in.maximized.view=Lien alternatif en vue maximis\u00E9e
+open.alternative.url.target.in.maximized.view=Fen\u00Eatre cible du lien alternatif en vue maximis\u00E9e
 option=Option
 org.apereo.portal.tenants.AttributeValidatingOperationsListener.name=Validation de l''attribut
 org.apereo.portal.tenants.JpaPersistenceTenantOperationsListener.name=Persistance du tenant
@@ -805,4 +806,4 @@ report.titleWithSingularFields={0}\u00A0: $0
 principals.and.categories=Principals et cat\u00E9gories
 success.add.folder=\u00C9l\u00E9ment ajout\u00E9
 success.move.element=D\u00E9placement r\u00E9ussi
-success.element.update=Mise \u00E0 jour r\u00E9ussie
+success.element.update=Mise \u00E0 jour r\u00E9ussie
diff --git a/uPortal-webapp/src/main/resources/properties/i18n/Messages_ja.properties b/uPortal-webapp/src/main/resources/properties/i18n/Messages_ja.properties
@@ -316,6 +316,8 @@ no.results=\u691c\u7d22\u7d50\u679c\u306a\u3057
 nothing.selected=\u9078\u629e\u306a\u3057
 number.times=\u56de\u6570
 object.count=\u30aa\u30d6\u30b8\u30a7\u30af\u30c8\u6570
+open.alternative.url.in.maximized.view=\u6700\u5927\u5316\u3055\u308c\u305f\u30d3\u30e5\u30fc\u306e\u4ee3\u66ff\u30ea\u30f3\u30af
+open.alternative.url.target.in.maximized.view=\u6700\u5927\u5316\u3055\u308c\u305f\u30d3\u30e5\u30fc\u3067\u306e\u4ee3\u66ff\u30ea\u30f3\u30af\u306e\u30a6\u30a3\u30f3\u30c9\u30a6\u30bf\u30fc\u30b2\u30c3\u30c8
 on.disk.hits=\u30aa\u30f3\u30c7\u30a3\u30b9\u30af\u30d2\u30c3\u30c8\u6570
 option=\u30aa\u30d7\u30b7\u30e7\u30f3
 original.value=\u5143\u306e\u5024
@@ -517,4 +519,4 @@ you.are.signed.in.as=\u30b5\u30a4\u30f3\u30a4\u30f3\u30e6\u30fc\u30b6\uff1a
 your.account.has.been.successfully.updated.your.changes.will.be.visible.upon.your.next.login=\u30a2\u30ab\u30a6\u30f3\u30c8\u304c\u66f4\u65b0\u3055\u308c\u307e\u3057\u305f\uff0e\u5909\u66f4\u5185\u5bb9\u306f\u6b21\u56de\u306e\u30ed\u30b0\u30a4\u30f3\u4ee5\u964d\u306b\u78ba\u8a8d\u3067\u304d\u307e\u3059\uff0e
 your.password.has.been.updated.successfully=\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u66f4\u65b0\u3055\u308c\u307e\u3057\u305f
 your.selection=\u9078\u629e\u5185\u5bb9
-your.selections=\u9078\u629e\u5185\u5bb9
+your.selections=\u9078\u629e\u5185\u5bb9
diff --git a/uPortal-webapp/src/main/resources/properties/i18n/Messages_lv.properties b/uPortal-webapp/src/main/resources/properties/i18n/Messages_lv.properties
@@ -329,6 +329,8 @@ nothing.selected=Nekas nav izv\u0113l\u0113ts
 number.times=# Reizes
 object.count=Objektu skaits
 on.disk.hits=Tr\u0101p\u012bjumi disk\u0101
+open.alternative.url.in.maximized.view=Alternat\u012bva saite maksimiz\u0113t\u0101 skat\u0101
+open.alternative.url.target.in.maximized.view=Alternat\u012bv\u0101s saites loga m\u0113r\u0137is maksimiz\u0113taj\u0101 skat\u0101
 option=Iesp\u0113ja
 original.value=S\u0101kotn\u0113j\u0101 v\u0113rt\u012bba
 owner=\u012apa\u0161nieks
@@ -539,4 +541,4 @@ you.are.signed.in.as=J\u016bs esat ien\u0101cis k\u0101
 your.account.has.been.successfully.updated.your.changes.will.be.visible.upon.your.next.login=J\u016bsu konts ir veiksm\u012bgi atjaunin\u0101ts. J\u016bsu veikt\u0101s izmai\u0146as b\u016bs redzama uz j\u016bsu n\u0101kamo pieteik\u0161an\u0101s.
 your.password.has.been.updated.successfully=J\u016bsu parole ir veiksm\u012bgi iestat\u012bta
 your.selection=J\u016bsu izv\u0113le
-your.selections=J\u016bsu izv\u0113les
+your.selections=J\u016bsu izv\u0113les
diff --git a/uPortal-webapp/src/main/resources/properties/i18n/Messages_mk.properties b/uPortal-webapp/src/main/resources/properties/i18n/Messages_mk.properties
diff --git a/uPortal-webapp/src/main/resources/properties/i18n/Messages_sv.properties b/uPortal-webapp/src/main/resources/properties/i18n/Messages_sv.properties
diff --git a/uPortal-webapp/src/main/webapp/WEB-INF/jsp/Favorites/view.jsp b/uPortal-webapp/src/main/webapp/WEB-INF/jsp/Favorites/view.jsp
diff --git a/uPortal-webapp/src/main/webapp/WEB-INF/jsp/Invoker/sitemap.jsp b/uPortal-webapp/src/main/webapp/WEB-INF/jsp/Invoker/sitemap.jsp
diff --git a/uPortal-webapp/src/test/java/org/apereo/portal/portlet/dao/jpa/PortletDefinitionImplTest.java b/uPortal-webapp/src/test/java/org/apereo/portal/portlet/dao/jpa/PortletDefinitionImplTest.java
