Merge branch 'master' into remind-consider-security

CHANGELOG.md

@@ -6,7 +6,17 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to
 [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [Unreleased][]
+## [Unreleased][] (10.0.0)
+
+* Removes embedded rest-proxy. Local implementations of uPortal-home needing a
+  proxy should deploy a proxy alongside rather than within uPortal-home.
+
+## [9.2.0][] - 2019-06-07
+
+Upgrades to uPortal-app-framework 12.2.0 from 12.1.0. Highlights:
+
+* Adds `remote-user` widget type
+* Adds `suppressLaunchButton` `list-of-links` widget configuration option
 
 ### Development process change
 
@@ -18,13 +28,13 @@ and this project adheres to
 
 ## [9.1.0][] - 2019-05-13
 
-### Fixes in unreleased
+### Fixes in 9.1.0
 
 * Generates static content div identifier by fname rather than by
   not-reliably-unique nodeId #876
 * Fixes widget grid not displaying properly in Firefox #881
 
-### Dependency upgrades in unreleased
+### Dependency upgrades in 9.1.0
 
 Upgrades to uPortal-app-framework 12.1.0 from 12.0.0. Highlights:
 
@@ -539,7 +549,8 @@ See also:
 
 * the [6.0.0 milestone](https://github.com/uPortal-Project/uportal-home/milestone/5?closed=1).
 
-[unreleased]: https://github.com/uPortal-Project/uportal-home/compare/uportal-home-parent-9.0.0...HEAD
+[unreleased]: https://github.com/uPortal-Project/uportal-home/compare/uportal-home-parent-9.2.0...HEAD
+[9.2.0]: https://github.com/uPortal-Project/uportal-home/compare/uportal-home-parent-9.1.0...uportal-home-parent-9.2.0
 [9.1.0]: https://github.com/uPortal-Project/uportal-home/compare/uportal-home-parent-9.0.0...uportal-home-parent-9.1.0
 [9.0.0]: https://github.com/uPortal-Project/uportal-home/compare/uportal-home-parent-8.3.6...uportal-home-parent-9.0.0
 [8.3.6]: https://github.com/uPortal-Project/uportal-home/compare/uportal-home-parent-8.3.5...uportal-home-parent-8.3.6

docs/search.md

@@ -59,7 +59,7 @@ Search is configured in `web-config.js`:
 .value('SEARCH_CONFIG', [
   {
     "group" : "UW-Madison",
-    "directorySearchURL" : "/web/api/proxy/wiscdirectory",
+    "directorySearchURL" : "/aries/proxy/wiscdirectory",
     "googleSearchURL" : "/web/api/proxy/wiscedusearch?v=1.0&rsz=10&start=0&cx=02:22m",
     "webSearchURL" : "http://www.wisc.edu/search/?q=",
     "domainResultsLabel" : "Wisc.edu",

mock-portal/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apereo.uportal</groupId>
     <artifactId>uportal-home-parent</artifactId>
-    <version>9.1.1-SNAPSHOT</version>
+    <version>9.2.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>uportal-home-mock-portal</artifactId>

pom.xml

@@ -30,7 +30,7 @@
   <groupId>org.apereo.uportal</groupId>
   <artifactId>uportal-home-parent</artifactId>
   <packaging>pom</packaging>
-  <version>9.1.1-SNAPSHOT</version>
+  <version>9.2.1-SNAPSHOT</version>
   <name>uPortal-home Parent Project</name>
   <description>An alternative homepage for uPortal</description>
   <url>https://github.com/uPortal-Project/uportal-home</url>
@@ -80,11 +80,6 @@
 
   <dependencyManagement>
     <dependencies>
-       <dependency>
-        <groupId>edu.wisc.my.restproxy</groupId>
-        <artifactId>rest-proxy-core</artifactId>
-        <version>3.1.0</version>
-      </dependency>
       <dependency>
         <groupId>commons-codec</groupId>
         <artifactId>commons-codec</artifactId>

web/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apereo.uportal</groupId>
     <artifactId>uportal-home-parent</artifactId>
-    <version>9.1.1-SNAPSHOT</version>
+    <version>9.2.1-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
@@ -42,7 +42,7 @@
       <groupId>org.apereo.uportal</groupId>
       <artifactId>uportal-app-framework</artifactId>
       <type>war</type>
-      <version>12.1.1-SNAPSHOT</version>
+      <version>12.2.1-SNAPSHOT</version>
     </dependency>
 
     <!-- Test -->
@@ -54,10 +54,6 @@
     </dependency>
 
     <!-- compile -->
-    <dependency>
-        <groupId>edu.wisc.my.restproxy</groupId>
-        <artifactId>rest-proxy-core</artifactId>
-    </dependency>
 
     <dependency>
         <groupId>commons-codec</groupId>

web/src/main/resources/.gitignore

@@ -1,2 +1,2 @@
-endpoint.properties
+
 

web/src/main/webapp/WEB-INF/web.xml

@@ -69,29 +69,6 @@
        </init-param>
     </filter>
 
-    <servlet>
-      <servlet-name>rest-proxy-api</servlet-name>
-      <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
-      <load-on-startup>1</load-on-startup>
-      <init-param>
-        <param-name>contextClass</param-name>
-        <param-value>
-          org.springframework.web.context.support.AnnotationConfigWebApplicationContext
-        </param-value>
-      </init-param>
-      <init-param>
-        <param-name>contextConfigLocation</param-name>
-        <param-value>
-          edu.wisc.my.home.api.RestProxyApplicationConfiguration
-        </param-value>
-      </init-param>
-    </servlet>
-
-    <servlet-mapping>
-        <servlet-name>rest-proxy-api</servlet-name>
-        <url-pattern>/api/*</url-pattern>
-    </servlet-mapping>
-
     <servlet>
       <servlet-name>StaticServlet</servlet-name>
       <jsp-file>/index.jsp</jsp-file>

web/src/main/webapp/my-app/search/partials/search-results.html

@@ -18,6 +18,11 @@
     under the License.
 
 -->
+<style>
+  .widget-container {
+    max-width: 310px;
+  }
+</style>
 <frame-page app-title="Search results" app-icon="search" page-title="Search results" white-background="true">
   <md-content class="search-results">
     <p class="search-term">Showing results for <span>"{{ searchTerm }}"</span></p>
@@ -127,6 +132,60 @@
           </md-content>
         </md-tab-body>
       </md-tab>
+
+      <md-tab>
+        <md-tab-label>
+          Other
+        </md-tab-label>
+        <md-tab-body>
+          <md-content>
+            <div style="padding:18px;">
+              In addition to searching within MyUW, you can use MyUW to launch
+              searches into some of the many resources of the university.
+            </div>
+
+            <div layout="row" layout-align="center start"
+              style="flex-wrap:wrap;padding:18px;">
+              <div flex-xs="100" class="widget-container">
+                <widget fname="wisc-kb" fail-silently="true"></widget>
+              </div>
+              <div flex-xs="100" class="widget-container">
+                <widget fname="uwec-kb" fail-silently="true"></widget>
+              </div>
+              <div flex-xs="100" class="widget-container">
+                <widget fname="madison-public-course-search"
+                  fail-silently="true"></widget>
+              </div>
+              <div flex-xs="100" class="widget-container">
+                <widget fname="ResearcherPortlet" fail-silently="true"></widget>
+              </div>
+              <div flex-xs="100" class="widget-container">
+                <widget fname="rprg" fail-silently="true"></widget>
+              </div>
+              <div flex-xs="100" class="widget-container">
+                <widget fname="directory-of-resources-for-researchers"
+                  fail-silently="true"></widget>
+              </div>
+              <div flex-xs="100" class="widget-container">
+                <widget fname="madison-library-catalog"
+                  fail-silently="true"></widget>
+              </div>
+              <div flex-xs="100" class="widget-container">
+                <widget fname="uw-service-center" fail-silently="true"></widget>
+              </div>
+              <div flex-xs="100" class="widget-container">
+                <widget fname="speakers-bureau" fail-silently="true"></widget>
+              </div>
+            </div>
+
+            <div style="padding:18px;">
+              <a href="/portal/p/feedback">Suggest an addition to this page</a>.
+            </div>
+
+            </md-content>
+          </md-tab-body>
+        </md-tab>
+
     </md-tabs>
   </md-content>
 </frame-page>