This is an automated email from the ASF dual-hosted git repository. lprimak pushed a commit to branch 3.x in repository https://gitbox.apache.org/repos/asf/shiro.git
commit 76d392685e21c32731da853e1e0259588b9c7766 Author: lprimak <[email protected]> AuthorDate: Tue Jan 27 23:17:20 2026 -0600 chore: moved web-jakarta back to web/ --- samples/web/README.md | 17 --- samples/web/pom.xml | 143 --------------------- samples/web/src/main/resources/META-INF/NOTICE | 15 --- samples/web/src/main/resources/log4j2.xml | 71 ---------- samples/web/src/main/webapp/WEB-INF/shiro.ini | 62 --------- samples/web/src/main/webapp/WEB-INF/web.xml | 43 ------- samples/web/src/main/webapp/account/index.jsp | 36 ------ samples/web/src/main/webapp/home.jsp | 69 ---------- samples/web/src/main/webapp/include.jsp | 22 ---- samples/web/src/main/webapp/index.jsp | 21 --- samples/web/src/main/webapp/login.jsp | 110 ---------------- samples/web/src/main/webapp/logout.jsp | 34 ----- samples/web/src/main/webapp/style.css | 47 ------- .../shiro/test/WebAppContainerIntegrationIT.java | 59 --------- samples/{ => web}/web-jakarta/pom.xml | 0 .../web-jakarta/src/main/resources/META-INF/NOTICE | 0 .../web-jakarta/src/main/resources/log4j2.xml | 0 .../web-jakarta/src/main/webapp/WEB-INF/shiro.ini | 0 .../web-jakarta/src/main/webapp/WEB-INF/web.xml | 0 .../web-jakarta/src/main/webapp/account/index.jsp | 0 .../{ => web}/web-jakarta/src/main/webapp/home.jsp | 0 .../web-jakarta/src/main/webapp/include.jsp | 0 .../web-jakarta/src/main/webapp/index.jsp | 0 .../web-jakarta/src/main/webapp/login.jsp | 0 .../web-jakarta/src/main/webapp/logout.jsp | 0 .../web-jakarta/src/main/webapp/style.css | 0 .../web/jakarta/JakartaAbstractContainerIT.java | 0 .../shiro/test/web/jakarta/WebContainerIT.java | 0 .../web-jakarta/src/test/resources/log4j2.xml | 0 29 files changed, 749 deletions(-) diff --git a/samples/web/README.md b/samples/web/README.md deleted file mode 100644 index bb263a93a..000000000 --- a/samples/web/README.md +++ /dev/null @@ -1,17 +0,0 @@ -Apache Shiro Web Example -======================== - -An example web application that show how to configure Shiro via a `web.xml` and basic user login. - -Run the Example ---------------- - -``` -mvn jetty:run -``` - -Browse to `http://localhost:9080/` - -Or deploy to Heroku: - -[](https://heroku.com/deploy?template=https://github.com/bdemers/heroku-examples-runner&env\[ARTIFACT_ID\]=samples-web) diff --git a/samples/web/pom.xml b/samples/web/pom.xml deleted file mode 100644 index 95387e262..000000000 --- a/samples/web/pom.xml +++ /dev/null @@ -1,143 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ 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. - --> -<!--suppress osmorcNonOsgiMavenDependency --> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd";> - - <parent> - <groupId>org.apache.shiro.samples</groupId> - <artifactId>shiro-samples</artifactId> - <version>999-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>samples-web</artifactId> - <name>Apache Shiro :: Samples :: Web</name> - <packaging>war</packaging> - - <properties> - <jetty.port>9080</jetty.port> - <jetty.postIT.sleep>1</jetty.postIT.sleep> - </properties> - - <build> - <plugins> - <plugin> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-maven-plugin</artifactId> - <version>${jetty.version}</version> - <configuration> - <contextPath>/</contextPath> - <httpConnector> - <port>9080</port> - <idleTimeout>60000</idleTimeout> - </httpConnector> - <requestLog implementation="org.eclipse.jetty.server.NCSARequestLog"> - <filename>./target/yyyy_mm_dd.request.log</filename> - <retainDays>90</retainDays> - <append>true</append> - <extended>false</extended> - <logTimeZone>GMT</logTimeZone> - </requestLog> - </configuration> - </plugin> - </plugins> - </build> - - <dependencies> - <dependency> - <groupId>org.apache.taglibs</groupId> - <artifactId>taglibs-standard-spec</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.taglibs</groupId> - <artifactId>taglibs-standard-impl</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>jakarta.servlet</groupId> - <artifactId>jakarta.servlet-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.htmlunit</groupId> - <artifactId>htmlunit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.shiro</groupId> - <artifactId>shiro-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.shiro</groupId> - <artifactId>shiro-web</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-reload4j</artifactId> - <version>${slf4j.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty.ee10</groupId> - <artifactId>jetty-ee10-apache-jsp</artifactId> - <version>${jetty.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> - <artifactId>apache-jstl</artifactId> - <version>10.0.26</version> - <type>pom</type> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.eclipse.jetty.ee10</groupId> - <artifactId>jetty-ee10-annotations</artifactId> - <version>${jetty.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.shiro.integrationtests</groupId> - <artifactId>shiro-its-support</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - -</project> diff --git a/samples/web/src/main/resources/META-INF/NOTICE b/samples/web/src/main/resources/META-INF/NOTICE deleted file mode 100644 index bdc909e8c..000000000 --- a/samples/web/src/main/resources/META-INF/NOTICE +++ /dev/null @@ -1,15 +0,0 @@ -Apache Shiro -Copyright 2008-2020 The Apache Software Foundation - -This product includes software developed at -The Apache Software Foundation (http://www.apache.org/). - -The implementation for org.apache.shiro.util.SoftHashMap is based -on initial ideas from Dr. Heinz Kabutz's publicly posted version -available at http://www.javaspecialists.eu/archive/Issue015.html, -with continued modifications. - -Certain parts (StringUtils, IpAddressMatcher, etc.) of the source -code for this product was copied for simplicity and to reduce -dependencies from the source code developed by the Spring Framework -Project (http://www.springframework.org). diff --git a/samples/web/src/main/resources/log4j2.xml b/samples/web/src/main/resources/log4j2.xml deleted file mode 100644 index 4dea7a8b6..000000000 --- a/samples/web/src/main/resources/log4j2.xml +++ /dev/null @@ -1,71 +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. - --> - -<Configuration name="ConfigTest" status="ERROR" monitorInterval="5"> - <!-- - ~ 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. - --> - - <Appenders> - <Console name="Console" target="SYSTEM_OUT"> - <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/> - </Console> - </Appenders> - <Loggers> - <Logger name="org.springframework" level="warn" additivity="false"> - <AppenderRef ref="Console"/> - </Logger> - <Logger name="org.apache" level="warn" additivity="false"> - <AppenderRef ref="Console"/> - </Logger> - <Logger name="org.ehcache" level="warn" additivity="false"> - <AppenderRef ref="Console"/> - </Logger> - <Logger name="org.quartz" level="warn" additivity="false"> - <AppenderRef ref="Console"/> - </Logger> - <Logger name="org.apache.shiro" level="info" additivity="false"> - <AppenderRef ref="Console"/> - </Logger> - <Logger name="org.apache.shiro.util.ThreadContext" level="warn" additivity="false"> - <AppenderRef ref="Console"/> - </Logger> - <Logger name="org.eclipse.jetty.annotations.AnnotationParser" level="error" additivity="false"> - <AppenderRef ref="Console"/> - </Logger> - <Root level="warn"> - <AppenderRef ref="Console"/> - </Root> - </Loggers> -</Configuration> diff --git a/samples/web/src/main/webapp/WEB-INF/shiro.ini b/samples/web/src/main/webapp/WEB-INF/shiro.ini deleted file mode 100644 index 6465310aa..000000000 --- a/samples/web/src/main/webapp/WEB-INF/shiro.ini +++ /dev/null @@ -1,62 +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. - -# INI configuration is very powerful and flexible, while still remaining succinct. -# Please https://shiro.apache.org/configuration.html and -# https://shiro.apache.org/web.html for more. - -[main] -listener = org.apache.shiro.config.ogdl.event.LoggingBeanEventListener - -shiro.loginUrl = /login.jsp -shiro.postOnlyLogout = true - -sessionManager = org.apache.shiro.web.session.mgt.DefaultWebSessionManager -sessionManager.sessionIdCookie.sameSite = NONE - -securityManager.sessionManager = $sessionManager -securityManager.sessionManager.sessionIdUrlRewritingEnabled = false - - -# We need to set the cipherKey, if you want the rememberMe cookie to work after restarting or on multiple nodes. -# YOU MUST SET THIS TO A UNIQUE STRING -securityManager.rememberMeManager.cipherKey = kPH+bIxk5D2deZiIxcaaaA== - -[users] -# format: username = password, role1, role2, ..., roleN -root = secret,admin -guest = guest,guest -presidentskroob = 12345,president -darkhelmet = ludicrousspeed,darklord,schwartz -lonestarr = vespa,goodguy,schwartz - -[roles] -# format: roleName = permission1, permission2, ..., permissionN -admin = * -schwartz = lightsaber:* -goodguy = winnebago:drive:eagle5 - -[urls] -# The /login.jsp is not restricted to authenticated users (otherwise no one could log in!), but -# the 'authc' filter must still be specified for it so it can process that url's -# login submissions. It is 'smart' enough to allow those requests through as specified by the -# shiro.loginUrl above. -/login.jsp = authc -/logout = logout -/account/** = authc -/remoting/** = authc, roles[b2bClient], perms["remote:invoke:lan,wan"] diff --git a/samples/web/src/main/webapp/WEB-INF/web.xml b/samples/web/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index a3c09ecd4..000000000 --- a/samples/web/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,43 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ 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. - --> -<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"; - version="6.0"> - - <listener> - <listener-class>org.apache.shiro.web.env.EnvironmentLoaderListener</listener-class> - </listener> - - <filter> - <filter-name>ShiroFilter</filter-name> - <filter-class>org.apache.shiro.web.servlet.ShiroFilter</filter-class> - </filter> - - <filter-mapping> - <filter-name>ShiroFilter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - <welcome-file-list> - <welcome-file>index.jsp</welcome-file> - </welcome-file-list> - -</web-app> diff --git a/samples/web/src/main/webapp/account/index.jsp b/samples/web/src/main/webapp/account/index.jsp deleted file mode 100644 index 82bb95494..000000000 --- a/samples/web/src/main/webapp/account/index.jsp +++ /dev/null @@ -1,36 +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. - --%> -<%@ include file="../include.jsp" %> - -<html> -<head> - <link type="text/css" rel="stylesheet" href="<c:url value="/style.css"/>"/> -</head> -<body> - -<h2>Users only</h2> - -<p>You are currently logged in.</p> - -<p><a href="<c:url value="/home.jsp"/>">Return to the home page.</a></p> - -<p><a href="<c:url value="/logout"/>" onclick="document.getElementById('logout_form').submit();return false;">Log out.</a></p> -<form id="logout_form" action="<c:url value="/logout"/>" method="post"></form> -</body> -</html> diff --git a/samples/web/src/main/webapp/home.jsp b/samples/web/src/main/webapp/home.jsp deleted file mode 100644 index ae46cde48..000000000 --- a/samples/web/src/main/webapp/home.jsp +++ /dev/null @@ -1,69 +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. - --%> -<%@ include file="include.jsp" %> - -<html> -<head> - <link type="text/css" rel="stylesheet" href="<c:url value="/style.css"/>"/> - <title>Apache Shiro Quickstart</title> -</head> -<body> - -<h1>Apache Shiro Quickstart</h1> - -<p>Hi <shiro:guest>Guest</shiro:guest><shiro:user><shiro:principal/></shiro:user>! - ( <shiro:user> <a href="<c:url value="/logout"/>" onclick="document.getElementById('logout_form').submit();return false;">logout</a> </shiro:user> - <shiro:guest><a href="<c:url value="/login.jsp"/>">Log in</a> (sample accounts provided)</shiro:guest> ) -</p> - -<p>Welcome to the Apache Shiro Quickstart sample application. - This page represents the home page of any web application.</p> - -<shiro:user><p>Visit your <a href="<c:url value="/account"/>">account page</a>.</p></shiro:user> -<shiro:guest><p>If you want to access the user-only <a href="<c:url value="/account"/>">account page</a>, - you will need to log-in first.</p></shiro:guest> - -<h2>Roles</h2> - -<p>To show some taglibs, here are the roles you have and don't have. Log out and log back in under different user - accounts to see different roles.</p> - -<h3>Roles you have</h3> - -<p> - <shiro:hasRole name="admin">admin<br/></shiro:hasRole> - <shiro:hasRole name="president">president<br/></shiro:hasRole> - <shiro:hasRole name="darklord">darklord<br/></shiro:hasRole> - <shiro:hasRole name="goodguy">goodguy<br/></shiro:hasRole> - <shiro:hasRole name="schwartz">schwartz<br/></shiro:hasRole> -</p> - -<h3>Roles you DON'T have</h3> - -<p> - <shiro:lacksRole name="admin">admin<br/></shiro:lacksRole> - <shiro:lacksRole name="president">president<br/></shiro:lacksRole> - <shiro:lacksRole name="darklord">darklord<br/></shiro:lacksRole> - <shiro:lacksRole name="goodguy">goodguy<br/></shiro:lacksRole> - <shiro:lacksRole name="schwartz">schwartz<br/></shiro:lacksRole> -</p> - -<form id="logout_form" action="<c:url value="/logout"/>" method="post"></form> -</body> -</html> diff --git a/samples/web/src/main/webapp/include.jsp b/samples/web/src/main/webapp/include.jsp deleted file mode 100644 index 8472daca1..000000000 --- a/samples/web/src/main/webapp/include.jsp +++ /dev/null @@ -1,22 +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. - --%> -<%@ page import="org.apache.shiro.SecurityUtils" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"; %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"; %> -<%@ taglib prefix="shiro" uri="http://shiro.apache.org/tags"; %> diff --git a/samples/web/src/main/webapp/index.jsp b/samples/web/src/main/webapp/index.jsp deleted file mode 100644 index ec60ad16c..000000000 --- a/samples/web/src/main/webapp/index.jsp +++ /dev/null @@ -1,21 +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. - --%> - -<%-- Forward the user to the home page --%> -<jsp:forward page="home.jsp"/> diff --git a/samples/web/src/main/webapp/login.jsp b/samples/web/src/main/webapp/login.jsp deleted file mode 100644 index c80ee54c8..000000000 --- a/samples/web/src/main/webapp/login.jsp +++ /dev/null @@ -1,110 +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. - --%> -<%@ include file="include.jsp" %> - -<html> -<head> - <link type="text/css" rel="stylesheet" href="<c:url value="/style.css"/>"/> -</head> -<body> - -<h2>Please Log in</h2> - -<shiro:guest> - <p>Here are a few sample accounts to play with in the default text-based Realm (used for this - demo and test installs only). Do you remember the movie these names came from? ;)</p> - - - <style type="text/css"> - table.sample { - border-width: 1px; - border-style: outset; - border-color: blue; - border-collapse: separate; - background-color: rgb(255, 255, 240); - } - - table.sample th { - border-width: 1px; - padding: 1px; - border-style: none; - border-color: blue; - background-color: rgb(255, 255, 240); - } - - table.sample td { - border-width: 1px; - padding: 1px; - border-style: none; - border-color: blue; - background-color: rgb(255, 255, 240); - } - </style> - - - <table class="sample"> - <thead> - <tr> - <th>Username</th> - <th>Password</th> - </tr> - </thead> - <tbody> - <tr> - <td>root</td> - <td>secret</td> - </tr> - <tr> - <td>presidentskroob</td> - <td>12345</td> - </tr> - <tr> - <td>darkhelmet</td> - <td>ludicrousspeed</td> - </tr> - <tr> - <td>lonestarr</td> - <td>vespa</td> - </tr> - </tbody> - </table> - <br/><br/> -</shiro:guest> - -<form name="loginform" action="" method="post"> - <table align="left" border="0" cellspacing="0" cellpadding="3"> - <tr> - <td>Username:</td> - <td><input type="text" name="username" maxlength="30"></td> - </tr> - <tr> - <td>Password:</td> - <td><input type="password" name="password" maxlength="30"></td> - </tr> - <tr> - <td colspan="2" align="left"><input type="checkbox" name="rememberMe"><font size="2">Remember Me</font></td> - </tr> - <tr> - <td colspan="2" align="right"><input type="submit" name="submit" value="Login"></td> - </tr> - </table> -</form> - -</body> -</html> diff --git a/samples/web/src/main/webapp/logout.jsp b/samples/web/src/main/webapp/logout.jsp deleted file mode 100644 index 440ec1c09..000000000 --- a/samples/web/src/main/webapp/logout.jsp +++ /dev/null @@ -1,34 +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. - --%> -<%@ include file="include.jsp" %> - -<html> -<head> - <link type="text/css" rel="stylesheet" href="<c:url value="/style.css"/>"/> -</head> -<body onload="document.getElementById('logout_form').submit();return false;"> - -<h2>If you are not automatically redirected, click the 'Logout' button.</h2> - -<form id="logout_form" name="logout_form" action="<c:url value="/logout"/>" method="post"> - <input type="submit" value="Logout"> -</form> - -</body> -</html> diff --git a/samples/web/src/main/webapp/style.css b/samples/web/src/main/webapp/style.css deleted file mode 100644 index c3e3944cf..000000000 --- a/samples/web/src/main/webapp/style.css +++ /dev/null @@ -1,47 +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. - */ -body { - margin: 15px 0 0 15px; - padding: 1px; /*background: #2370cf;*/ - font: 12px 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; - color: #000; -} - -table, td { - font: 12px 'Lucida Grande', Geneva, Verdana, Arial, sans-serif; - color: #000; -} - -h1 { - font: 24px; -} - -img { - border: thin black solid; -} - -#contentBox { - text-align: center; - width: 50%; - margin: auto; - margin-top: 50px; - color: black; - background: #eee; - border: thick black solid; -} diff --git a/samples/web/src/test/java/org/apache/shiro/test/WebAppContainerIntegrationIT.java b/samples/web/src/test/java/org/apache/shiro/test/WebAppContainerIntegrationIT.java deleted file mode 100644 index 02bc5518c..000000000 --- a/samples/web/src/test/java/org/apache/shiro/test/WebAppContainerIntegrationIT.java +++ /dev/null @@ -1,59 +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.test; - -import org.apache.shiro.testing.web.AbstractContainerIT; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.htmlunit.ElementNotFoundException; -import org.htmlunit.FailingHttpStatusCodeException; -import org.htmlunit.WebClient; -import org.htmlunit.html.HtmlForm; -import org.htmlunit.html.HtmlPage; - -import java.io.IOException; -import java.net.MalformedURLException; - -public class WebAppContainerIntegrationIT extends AbstractContainerIT { - - protected final WebClient webClient = new WebClient(); - - @BeforeEach - public void logOut() throws IOException { - // Make sure we are logged out - final HtmlPage homePage = webClient.getPage(getTlsBaseUri()); - try { - homePage.getAnchorByHref("/logout").click(); - } catch (ElementNotFoundException e) { - //Ignore - } - } - - @Test - void logIn() throws FailingHttpStatusCodeException, MalformedURLException, IOException, InterruptedException { - - HtmlPage page = webClient.getPage(getTlsBaseUri() + "login.jsp"); - HtmlForm form = page.getFormByName("loginform"); - form.getInputByName("username").setValueAttribute("root"); - form.getInputByName("password").setValueAttribute("secret"); - page = form.getInputByName("submit").click(); - // This'll throw an exception if not logged in - page.getAnchorByHref("/logout"); - } -} diff --git a/samples/web-jakarta/pom.xml b/samples/web/web-jakarta/pom.xml similarity index 100% rename from samples/web-jakarta/pom.xml rename to samples/web/web-jakarta/pom.xml diff --git a/samples/web-jakarta/src/main/resources/META-INF/NOTICE b/samples/web/web-jakarta/src/main/resources/META-INF/NOTICE similarity index 100% rename from samples/web-jakarta/src/main/resources/META-INF/NOTICE rename to samples/web/web-jakarta/src/main/resources/META-INF/NOTICE diff --git a/samples/web-jakarta/src/main/resources/log4j2.xml b/samples/web/web-jakarta/src/main/resources/log4j2.xml similarity index 100% rename from samples/web-jakarta/src/main/resources/log4j2.xml rename to samples/web/web-jakarta/src/main/resources/log4j2.xml diff --git a/samples/web-jakarta/src/main/webapp/WEB-INF/shiro.ini b/samples/web/web-jakarta/src/main/webapp/WEB-INF/shiro.ini similarity index 100% rename from samples/web-jakarta/src/main/webapp/WEB-INF/shiro.ini rename to samples/web/web-jakarta/src/main/webapp/WEB-INF/shiro.ini diff --git a/samples/web-jakarta/src/main/webapp/WEB-INF/web.xml b/samples/web/web-jakarta/src/main/webapp/WEB-INF/web.xml similarity index 100% rename from samples/web-jakarta/src/main/webapp/WEB-INF/web.xml rename to samples/web/web-jakarta/src/main/webapp/WEB-INF/web.xml diff --git a/samples/web-jakarta/src/main/webapp/account/index.jsp b/samples/web/web-jakarta/src/main/webapp/account/index.jsp similarity index 100% rename from samples/web-jakarta/src/main/webapp/account/index.jsp rename to samples/web/web-jakarta/src/main/webapp/account/index.jsp diff --git a/samples/web-jakarta/src/main/webapp/home.jsp b/samples/web/web-jakarta/src/main/webapp/home.jsp similarity index 100% rename from samples/web-jakarta/src/main/webapp/home.jsp rename to samples/web/web-jakarta/src/main/webapp/home.jsp diff --git a/samples/web-jakarta/src/main/webapp/include.jsp b/samples/web/web-jakarta/src/main/webapp/include.jsp similarity index 100% rename from samples/web-jakarta/src/main/webapp/include.jsp rename to samples/web/web-jakarta/src/main/webapp/include.jsp diff --git a/samples/web-jakarta/src/main/webapp/index.jsp b/samples/web/web-jakarta/src/main/webapp/index.jsp similarity index 100% rename from samples/web-jakarta/src/main/webapp/index.jsp rename to samples/web/web-jakarta/src/main/webapp/index.jsp diff --git a/samples/web-jakarta/src/main/webapp/login.jsp b/samples/web/web-jakarta/src/main/webapp/login.jsp similarity index 100% rename from samples/web-jakarta/src/main/webapp/login.jsp rename to samples/web/web-jakarta/src/main/webapp/login.jsp diff --git a/samples/web-jakarta/src/main/webapp/logout.jsp b/samples/web/web-jakarta/src/main/webapp/logout.jsp similarity index 100% rename from samples/web-jakarta/src/main/webapp/logout.jsp rename to samples/web/web-jakarta/src/main/webapp/logout.jsp diff --git a/samples/web-jakarta/src/main/webapp/style.css b/samples/web/web-jakarta/src/main/webapp/style.css similarity index 100% rename from samples/web-jakarta/src/main/webapp/style.css rename to samples/web/web-jakarta/src/main/webapp/style.css diff --git a/samples/web-jakarta/src/test/java/org/apache/shiro/test/web/jakarta/JakartaAbstractContainerIT.java b/samples/web/web-jakarta/src/test/java/org/apache/shiro/test/web/jakarta/JakartaAbstractContainerIT.java similarity index 100% rename from samples/web-jakarta/src/test/java/org/apache/shiro/test/web/jakarta/JakartaAbstractContainerIT.java rename to samples/web/web-jakarta/src/test/java/org/apache/shiro/test/web/jakarta/JakartaAbstractContainerIT.java diff --git a/samples/web-jakarta/src/test/java/org/apache/shiro/test/web/jakarta/WebContainerIT.java b/samples/web/web-jakarta/src/test/java/org/apache/shiro/test/web/jakarta/WebContainerIT.java similarity index 100% rename from samples/web-jakarta/src/test/java/org/apache/shiro/test/web/jakarta/WebContainerIT.java rename to samples/web/web-jakarta/src/test/java/org/apache/shiro/test/web/jakarta/WebContainerIT.java diff --git a/samples/web-jakarta/src/test/resources/log4j2.xml b/samples/web/web-jakarta/src/test/resources/log4j2.xml similarity index 100% rename from samples/web-jakarta/src/test/resources/log4j2.xml rename to samples/web/web-jakarta/src/test/resources/log4j2.xml
