Skip to content

refactor: path-swap to /resource-server/ + drop resource-server-content overlay #277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bjagg merged 2 commits into from
May 8, 2026
Merged

refactor: path-swap to /resource-server/ + drop resource-server-content overlay #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45f30c2
refactor(webproxy): path-swap legacy /ResourceServingWebapp/ -> /reso…
bjagg May 6, 2026
8197bc2
chore(deps): drop resource-server-content overlay (lingering lodash +…
bjagg May 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docs/gateway_config.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ The description of the portlet itself lives in the portlet definition file:
custom operations, in this case to also set the window name to the calculated field.
-->
<bean class="org.jasig.portlet.proxy.mvc.portlet.gateway.GatewayEntry" p:name="MyZimbra"
p:iconUrl="/ResourceServingWebapp/rs/tango/0.8.90/32x32/apps/internet-mail.png"
p:iconUrl="/resource-server/rs/tango/0.8.90/32x32/apps/internet-mail.png"
p:javascriptFile="/WebProxyPortlet/scripts/custom-javascript.js">

<!-- Custom java form fields. Beans in list must implement org.jasig.portlet.proxy.mvc.service.web.IAuthenticationFormModifier
Expand Down Expand Up @@ -273,7 +273,7 @@ This is how you might add IAuthenticationFormModifier to your portlet definition

```
<bean class="org.jasig.portlet.proxy.mvc.portlet.gateway.GatewayEntry" p:name="MyZimbra"
p:iconUrl="/ResourceServingWebapp/rs/tango/0.8.90/32x32/apps/internet-mail.png">
p:iconUrl="/resource-server/rs/tango/0.8.90/32x32/apps/internet-mail.png">

<property name="authenticationFormModifier">
<util:list>
Expand Down Expand Up @@ -302,7 +302,7 @@ GatewayEntry bean; e.g.

```
<bean class="org.jasig.portlet.proxy.mvc.portlet.gateway.GatewayEntry" p:name="WebAdvisor"
p:iconUrl="/ResourceServingWebapp/rs/tango/0.8.90/32x32/apps/internet-web-browser.png"
p:iconUrl="/resource-server/rs/tango/0.8.90/32x32/apps/internet-web-browser.png"
p:javascriptFile="/WebProxyPortlet/scripts/custom-javascript.js">
...
</bean>
Expand Down
20 changes: 0 additions & 20 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,12 +153,6 @@
<artifactId>bcutil-jdk18on</artifactId>
<version>${bouncycastle.version}</version>
</dependency>
<dependency>
<groupId>org.jasig.resourceserver</groupId>
<artifactId>resource-server-content</artifactId>
<version>${resource-server.version}</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.jsoup</groupId>
<artifactId>jsoup</artifactId>
Expand Down Expand Up @@ -316,20 +310,6 @@
<attachClasses>true</attachClasses>
<warName>${project.artifactId}</warName>
<webXml>src/main/webapp/WEB-INF/web.xml</webXml>
<overlays>
<overlay>
<groupId>org.jasig.resourceserver</groupId>
<artifactId>resource-server-content</artifactId>
<includes>
<include>rs/jquery/1.12.2/</include>
<include>rs/jquery/1.11.0/</include>
<include>/rs/jqueryui/1.8.24/</include>
<include>/rs/famfamfam/silk/1.3/error.png</include>
<include>/rs/famfamfam/silk/1.3/application_delete.png</include>
<include>/rs/famfamfam/silk/1.3/application_edit.png</include>
</includes>
</overlay>
</overlays>
</configuration>
</plugin>
<plugin>
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/WEB-INF/context/portlet/gateway-sso-portlet.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
-->
<!--
<bean class="org.jasig.portlet.proxy.mvc.portlet.gateway.GatewayEntry" p:name="MyZimbra"
p:iconUrl="/ResourceServingWebapp/rs/tango/0.8.90/32x32/apps/internet-mail.png">
p:iconUrl="/resource-server/rs/tango/0.8.90/32x32/apps/internet-mail.png">

<property name="contentRequests">
<util:map>
Expand Down Expand Up @@ -115,7 +115,7 @@
-->
<!--
<bean class="org.jasig.portlet.proxy.mvc.portlet.gateway.GatewayEntry" p:name="WebAdvisor"
p:iconUrl="/ResourceServingWebapp/rs/tango/0.8.90/32x32/apps/internet-web-browser.png"
p:iconUrl="/resource-server/rs/tango/0.8.90/32x32/apps/internet-web-browser.png"
p:javascriptFile="/WebProxyPortlet/scripts/custom-javascript.js">

<!- beans in list must implement org.jasig.portlet.proxy.mvc.service.web.IAuthenticationFormModifier
Expand Down
Loading