From 6eb7836d28a056f41e1756e36cf766c5ae097b72 Mon Sep 17 00:00:00 2001
From: Francois Papon
Date: Fri, 10 Jan 2020 18:04:28 +0100
Subject: [PATCH] [SHIRO-734] Remove Spring-client sample
---
samples/pom.xml | 1 -
samples/spring-client/pom.xml | 153 -----------------
.../samples/spring/ui/WebStartDriver.java | 38 -----
.../shiro/samples/spring/ui/WebStartView.java | 158 ------------------
.../main/jnlp/resources/jsecurity-sample.jks | Bin 1250 -> 0 bytes
.../spring-client/src/main/jnlp/template.vm | 53 ------
.../spring-client/src/main/resources/logo.png | Bin 10883 -> 0 bytes
.../src/main/resources/webstart.spring.xml | 49 ------
samples/spring-mvc/pom.xml | 38 -----
.../shiro/samples/spring/SampleManager.java | 2 +-
.../webapp/WEB-INF/resources/sampleIndex.jsp | 8 -
11 files changed, 1 insertion(+), 499 deletions(-)
delete mode 100644 samples/spring-client/pom.xml
delete mode 100644 samples/spring-client/src/main/java/org/apache/shiro/samples/spring/ui/WebStartDriver.java
delete mode 100644 samples/spring-client/src/main/java/org/apache/shiro/samples/spring/ui/WebStartView.java
delete mode 100644 samples/spring-client/src/main/jnlp/resources/jsecurity-sample.jks
delete mode 100644 samples/spring-client/src/main/jnlp/template.vm
delete mode 100644 samples/spring-client/src/main/resources/logo.png
delete mode 100644 samples/spring-client/src/main/resources/webstart.spring.xml
rename samples/{spring-client => spring-mvc}/src/main/java/org/apache/shiro/samples/spring/SampleManager.java (99%)
diff --git a/samples/pom.xml b/samples/pom.xml
index 4090905ff5..0dcababe52 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -40,7 +40,6 @@
aspectj
quickstart
web
- spring-client
spring
spring-mvc
spring-hibernate
diff --git a/samples/spring-client/pom.xml b/samples/spring-client/pom.xml
deleted file mode 100644
index 517be6db71..0000000000
--- a/samples/spring-client/pom.xml
+++ /dev/null
@@ -1,153 +0,0 @@
-
-
-
-
-
-
- org.apache.shiro.samples
- shiro-samples
- 1.5.0-SNAPSHOT
- ../pom.xml
-
-
- 4.0.0
- samples-spring-client
- Apache Shiro :: Samples :: Spring Client
- A webstart application used to demonstrate Apache Shiro session and security management.
- jar
-
-
- ${sessionId}
- 1.5
-
-
-
-
- log4j
- log4j
- runtime
-
-
- org.apache.shiro
- shiro-core
-
-
- commons-beanutils
- commons-beanutils
-
-
-
-
- org.apache.shiro
- shiro-spring
-
-
- org.apache.shiro
- shiro-web
-
-
- org.springframework
- spring-context
-
-
- org.springframework
- spring-webmvc
-
-
- org.slf4j
- slf4j-api
-
-
- org.slf4j
- slf4j-log4j12
- runtime
-
-
- org.slf4j
- jcl-over-slf4j
- runtime
-
-
-
-
-
-
- org.codehaus.mojo
- webstart-maven-plugin
- 1.0-beta-7
-
-
- package
-
- jnlp-inline
-
-
-
-
-
-
-
-
-
- shiro.jnlp.jsp
-
- org.apache.shiro.samples.spring.ui.WebStartDriver
-
-
-
- ${project.build.directory}/jnlp/jsecurity-sample.jks
- jsecurity
- jsecurity
- false
-
-
-
- false
-
- false
-
-
-
-
- org.codehaus.mojo
- keytool-api
- ${keytoolVersion}
-
-
- org.codehaus.mojo
- keytool-api-1.5
- ${keytoolVersion}
-
-
- org.codehaus.mojo
- keytool-api-1.6
- ${keytoolVersion}
-
-
- org.codehaus.mojo
- keytool-api-1.7
- ${keytoolVersion}
-
-
-
-
-
-
-
diff --git a/samples/spring-client/src/main/java/org/apache/shiro/samples/spring/ui/WebStartDriver.java b/samples/spring-client/src/main/java/org/apache/shiro/samples/spring/ui/WebStartDriver.java
deleted file mode 100644
index bfe257fbad..0000000000
--- a/samples/spring-client/src/main/java/org/apache/shiro/samples/spring/ui/WebStartDriver.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.shiro.samples.spring.ui;
-
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-/**
- * Driver class used to launch the web start application by loading a
- * Spring application context. Once the Spring application context is
- * loaded, the initialization of the {@link WebStartView} does the rest.
- *
- * @since 0.1
- */
-public class WebStartDriver {
- public static String LAUNCH_SESSION_ID;
-
- public static void main(String[] args) {
- // Store the session id given as argument to a static property to make it available for Spring context
- if (args.length > 0) LAUNCH_SESSION_ID = args[0];
- new ClassPathXmlApplicationContext("webstart.spring.xml");
- }
-}
diff --git a/samples/spring-client/src/main/java/org/apache/shiro/samples/spring/ui/WebStartView.java b/samples/spring-client/src/main/java/org/apache/shiro/samples/spring/ui/WebStartView.java
deleted file mode 100644
index ff62fbf9b2..0000000000
--- a/samples/spring-client/src/main/java/org/apache/shiro/samples/spring/ui/WebStartView.java
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.shiro.samples.spring.ui;
-
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import javax.swing.*;
-
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.core.io.ClassPathResource;
-
-import org.apache.shiro.authz.AuthorizationException;
-import org.apache.shiro.samples.spring.SampleManager;
-
-
-/**
- * Simple web start application that helps to demo single sign-on and
- * remoting authorization using Shiro. The injected SampleManager
- * is hosted by the Spring sample web application and remotely invoked
- * when the buttons in this view are clicked.
- *
- * @since 0.1
- */
-public class WebStartView implements ActionListener, InitializingBean {
-
- /*--------------------------------------------
- | C O N S T A N T S |
- ============================================*/
-
- /*--------------------------------------------
- | I N S T A N C E V A R I A B L E S |
- ============================================*/
- private SampleManager sampleManager;
- private JTextField valueField;
- private JButton saveButton;
- private JButton refreshButton;
- private JButton secureMethod1Button;
- private JButton secureMethod2Button;
- private JButton secureMethod3Button;
- private JFrame frame;
-
- /*--------------------------------------------
- | C O N S T R U C T O R S |
- ============================================*/
-
- /*--------------------------------------------
- | A C C E S S O R S / M O D I F I E R S |
- ============================================*/
-
- public void setSampleManager(SampleManager sampleManager) {
- this.sampleManager = sampleManager;
- }
-
- /*--------------------------------------------
- | M E T H O D S |
- ============================================*/
- public void afterPropertiesSet() throws Exception {
- ClassPathResource resource = new ClassPathResource("logo.png");
- ImageIcon icon = new ImageIcon(resource.getURL());
- JLabel logo = new JLabel(icon);
-
- valueField = new JTextField(20);
- updateValueLabel();
-
- saveButton = new JButton("Save Value");
- saveButton.addActionListener(this);
-
- refreshButton = new JButton("Refresh Value");
- refreshButton.addActionListener(this);
-
- JPanel valuePanel = new JPanel(new FlowLayout(FlowLayout.CENTER));
- valuePanel.add(valueField);
- valuePanel.add(saveButton);
- valuePanel.add(refreshButton);
-
- secureMethod1Button = new JButton("Method #1");
- secureMethod1Button.addActionListener(this);
-
- secureMethod2Button = new JButton("Method #2");
- secureMethod2Button.addActionListener(this);
-
- secureMethod3Button = new JButton("Method #3");
- secureMethod3Button.addActionListener(this);
-
- JPanel methodPanel = new JPanel(new FlowLayout(FlowLayout.CENTER));
- methodPanel.add(secureMethod1Button);
- methodPanel.add(secureMethod2Button);
- methodPanel.add(secureMethod3Button);
-
- frame = new JFrame("Apache Shiro Sample Application");
- frame.setSize(500, 200);
-
- Container panel = frame.getContentPane();
- panel.setLayout(new BorderLayout());
- panel.add(logo, BorderLayout.NORTH);
- panel.add(valuePanel, BorderLayout.CENTER);
- panel.add(methodPanel, BorderLayout.SOUTH);
-
- frame.setVisible(true);
- frame.addWindowListener(new WindowAdapter() {
- public void windowClosing(WindowEvent e) {
- System.exit(0);
- }
- });
- }
-
- private void updateValueLabel() {
- valueField.setText(sampleManager.getValue());
- }
-
- public void actionPerformed(ActionEvent e) {
- try {
-
- if (e.getSource() == saveButton) {
- sampleManager.setValue(valueField.getText());
-
- } else if (e.getSource() == refreshButton) {
- updateValueLabel();
-
- } else if (e.getSource() == secureMethod1Button) {
- sampleManager.secureMethod1();
- JOptionPane.showMessageDialog(frame, "Method #1 successfully called.", "Success", JOptionPane.INFORMATION_MESSAGE);
-
- } else if (e.getSource() == secureMethod2Button) {
- sampleManager.secureMethod2();
- JOptionPane.showMessageDialog(frame, "Method #2 successfully called.", "Success", JOptionPane.INFORMATION_MESSAGE);
- } else if (e.getSource() == secureMethod3Button) {
- sampleManager.secureMethod3();
- JOptionPane.showMessageDialog(frame, "Method #3 successfully called.", "Success", JOptionPane.INFORMATION_MESSAGE);
-
- } else {
- throw new RuntimeException("Unexpected action event from source: " + e.getSource());
- }
-
- } catch (AuthorizationException ae) {
- JOptionPane.showMessageDialog(frame, "Unauthorized to perform action: " + ae.getMessage(), "Unauthorized", JOptionPane.WARNING_MESSAGE);
- }
- }
-}
diff --git a/samples/spring-client/src/main/jnlp/resources/jsecurity-sample.jks b/samples/spring-client/src/main/jnlp/resources/jsecurity-sample.jks
deleted file mode 100644
index eb2ff9bf142e721cae018edc0e5e32f7382959a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1250
zcmezO_TO6u1_mY|W&~r-tm4$<(xS|gN}veW%5cuZK)Ti%F1?
zk(Gg^iLspj>yt;UPBLB>PH#BKA^l3x?LrAlSd{EWuV`(R=O<1tT&~kzE%xVYQD>RrkYX>GgBPx4$i2=U$v4^{h{NF7JW#zN-pW
zsSM)h=c{$8|C#)u>`&6E`D+EUKT6F$AR;NX;0F60+1?eVKbtqs-p5?gW2>oueobKc
z1Mbo
z5RhE`t^3oBy7xwMC4KgxNz9yGhVR_`?YVLtnD6ne-{0_T-MbC7Cs#HaCS0`Nvh&xm
zwAHoRN?#eSY{ISrba
zSq++)4l}X1IKK@r;AUgjYV$Z}!NSbSV31+RZNSOK9LmBb%oG|7<8TNwxjPyP0HYKr
z!!FG3Sdx>NSCVKbWFP<%;S%Qb3Wg>Fm>4$}F=iw&137VC12Y2?Lvuq*V(03&UYK
z`-W|SYMHLF4oZQ)BW-&le(gW{b(g`n)3ZZ!t~XjY$eQGTN=w+DJu_hGlKJyruv7~u
z9rEA3^7_B+$E1H)hd)2IVwosE%kSoImygOFW-<*CjuM+_^sV&sI_<>kTJJw8F-y+9
z=)riLNt9uFLO{Q$GWVHHlXf;OdfmePAwuRW$Z6jnE@-_r+xFh+J*#8Pc7*S&oU(rR
zFRNEgKf`^vZP}aB10%!xc3p||e^$sY(AcoWQ>;+=g^z}q@b>eZMm;B%J+u+4>JF*t
z)p)RYot*aOWu+7I7T0tCQZ!Ba_&ceJQN{Yql8^gV1WxE&(R}}5)YJKFle*L58mdE8
zQy6`$|DE^LVs30@0J-Bmmz)iu=-uud
zpEun%og;j`Nse-+>z65q`7WOOU8X#d)we5r3FC#IiEbw+%=(||SHit6WOwo*(RGry
zmsGRvS?wjOS>HN6_1)9Xvc
-<%@ page contentType="application/x-java-jnlp-file" %>
-
-
-
- $project.Name
- $project.Organization.Name
-
- $project.Description
-
-
- #if($offlineAllowed)
-
- #end
-
-
-
- #if($allPermissions)
-
-
-
-
- #end
-
-
-
- $dependencies
- <%-- reading custom system properties requires more permissions than available in sandbox mode,
- thus we need to sign the jars (although we are using an argument instead of a property to set this)
-
- --%>
-
-
- ${sessionId}
-
-
\ No newline at end of file
diff --git a/samples/spring-client/src/main/resources/logo.png b/samples/spring-client/src/main/resources/logo.png
deleted file mode 100644
index 901d6ecc0dc30dfe5db7bcb83aa314feade4f822..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 10883
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
W#vAIWDF+q
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
Z1^@$EDbA4oDwqHO002ovPDHLkV1h6lr?LP5
diff --git a/samples/spring-client/src/main/resources/webstart.spring.xml b/samples/spring-client/src/main/resources/webstart.spring.xml
deleted file mode 100644
index 431acc8678..0000000000
--- a/samples/spring-client/src/main/resources/webstart.spring.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/samples/spring-mvc/pom.xml b/samples/spring-mvc/pom.xml
index fe48a4b08b..2740c913fc 100644
--- a/samples/spring-mvc/pom.xml
+++ b/samples/spring-mvc/pom.xml
@@ -52,48 +52,10 @@
-
- org.apache.maven.plugins
- maven-dependency-plugin
-
-
- generate-resources
-
- unpack
-
-
-
-
-
-
- org.apache.shiro.samples
- samples-spring-client
- ${project.version}
- zip
-
-
- ${project.build.directory}/extra/WEB-INF/resources
-
-
-
- org.apache.maven.plugins
- maven-war-plugin
-
-
-
- ${project.build.directory}/extra
-
-
-
-
-
- org.apache.shiro.samples
- samples-spring-client
-
org.apache.shiro
shiro-core
diff --git a/samples/spring-client/src/main/java/org/apache/shiro/samples/spring/SampleManager.java b/samples/spring-mvc/src/main/java/org/apache/shiro/samples/spring/SampleManager.java
similarity index 99%
rename from samples/spring-client/src/main/java/org/apache/shiro/samples/spring/SampleManager.java
rename to samples/spring-mvc/src/main/java/org/apache/shiro/samples/spring/SampleManager.java
index 3919b5456f..cf2999cc2a 100644
--- a/samples/spring-client/src/main/java/org/apache/shiro/samples/spring/SampleManager.java
+++ b/samples/spring-mvc/src/main/java/org/apache/shiro/samples/spring/SampleManager.java
@@ -61,4 +61,4 @@ public interface SampleManager {
*/
@RequiresPermissions("permission2")
void secureMethod3();
-}
+}
\ No newline at end of file
diff --git a/samples/spring-mvc/src/main/webapp/WEB-INF/resources/sampleIndex.jsp b/samples/spring-mvc/src/main/webapp/WEB-INF/resources/sampleIndex.jsp
index a748cfa1f4..0541051a9b 100644
--- a/samples/spring-mvc/src/main/webapp/WEB-INF/resources/sampleIndex.jsp
+++ b/samples/spring-mvc/src/main/webapp/WEB-INF/resources/sampleIndex.jsp
@@ -61,20 +61,12 @@
You do not have permission 2.
-
" method="POST">
Enter value here to store in session:
';">Refresh
-
-
- Click ">here to launch webstart
- application.
-
-
-
Click ">here to logout.