shiro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bdem...@apache.org
Subject shiro git commit: Minor changes to make all of the web samples work via a war. (mvn jetty:run-war)
Date Thu, 15 Dec 2016 19:12:07 GMT
Repository: shiro
Updated Branches:
  refs/heads/master 71282d677 -> 213d7ffed


Minor changes to make all of the web samples work via a war. (mvn jetty:run-war)


Project: http://git-wip-us.apache.org/repos/asf/shiro/repo
Commit: http://git-wip-us.apache.org/repos/asf/shiro/commit/213d7ffe
Tree: http://git-wip-us.apache.org/repos/asf/shiro/tree/213d7ffe
Diff: http://git-wip-us.apache.org/repos/asf/shiro/diff/213d7ffe

Branch: refs/heads/master
Commit: 213d7ffedf57df9bfafb9782c813fcff6524aa65
Parents: 71282d6
Author: Brian Demers <bdemers@apache.org>
Authored: Thu Dec 15 11:11:40 2016 -0800
Committer: Brian Demers <bdemers@apache.org>
Committed: Thu Dec 15 11:11:40 2016 -0800

----------------------------------------------------------------------
 samples/servlet-plugin/pom.xml                              | 6 ++++++
 samples/spring-mvc/pom.xml                                  | 9 +++++++--
 samples/spring-xml/pom.xml                                  | 8 +++++---
 .../src/main/webapp/WEB-INF/resources-servlet.xml           | 4 ++--
 4 files changed, 20 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/shiro/blob/213d7ffe/samples/servlet-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/samples/servlet-plugin/pom.xml b/samples/servlet-plugin/pom.xml
index 95388d7..5bf53b7 100644
--- a/samples/servlet-plugin/pom.xml
+++ b/samples/servlet-plugin/pom.xml
@@ -72,6 +72,12 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
+            <!-- Required for any libraries that expect to call the commons logging APIs
-->
+            <groupId>org.slf4j</groupId>
+            <artifactId>jcl-over-slf4j</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
             <scope>runtime</scope>

http://git-wip-us.apache.org/repos/asf/shiro/blob/213d7ffe/samples/spring-mvc/pom.xml
----------------------------------------------------------------------
diff --git a/samples/spring-mvc/pom.xml b/samples/spring-mvc/pom.xml
index 9157beb..7846fca 100644
--- a/samples/spring-mvc/pom.xml
+++ b/samples/spring-mvc/pom.xml
@@ -127,12 +127,17 @@
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-log4j12</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
             <artifactId>jcl-over-slf4j</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>
-            <groupId>ch.qos.logback</groupId>
-            <artifactId>logback-classic</artifactId>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
             <scope>runtime</scope>
         </dependency>
         <dependency>

http://git-wip-us.apache.org/repos/asf/shiro/blob/213d7ffe/samples/spring-xml/pom.xml
----------------------------------------------------------------------
diff --git a/samples/spring-xml/pom.xml b/samples/spring-xml/pom.xml
index 0983397..47e04cb 100644
--- a/samples/spring-xml/pom.xml
+++ b/samples/spring-xml/pom.xml
@@ -49,9 +49,6 @@
                     </httpConnector>
                     <webApp>
                         <contextPath>/shiro-samples-spring</contextPath>
-                        <baseResource implementation="org.eclipse.jetty.util.resource.ResourceCollection">
-                            <resourcesAsCSV>${project.build.directory}/extra/,src/main/webapp</resourcesAsCSV>
-                        </baseResource>
                     </webApp>
                 </configuration>
             </plugin>
@@ -107,6 +104,11 @@
             <artifactId>shiro-ehcache</artifactId>
         </dependency>
         <dependency>
+            <groupId>net.sf.ehcache</groupId>
+            <artifactId>ehcache-core</artifactId>
+            <optional>false</optional>
+        </dependency>
+        <dependency>
             <groupId>org.apache.shiro</groupId>
             <artifactId>shiro-spring</artifactId>
         </dependency>

http://git-wip-us.apache.org/repos/asf/shiro/blob/213d7ffe/samples/spring-xml/src/main/webapp/WEB-INF/resources-servlet.xml
----------------------------------------------------------------------
diff --git a/samples/spring-xml/src/main/webapp/WEB-INF/resources-servlet.xml b/samples/spring-xml/src/main/webapp/WEB-INF/resources-servlet.xml
index 8e06bd6..0f04938 100644
--- a/samples/spring-xml/src/main/webapp/WEB-INF/resources-servlet.xml
+++ b/samples/spring-xml/src/main/webapp/WEB-INF/resources-servlet.xml
@@ -17,8 +17,6 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
-
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xmlns:mvc="http://www.springframework.org/schema/mvc"
@@ -30,5 +28,7 @@
                     http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd">
 
     <mvc:resources mapping="/*.jar" location="/WEB-INF/resources/" />
+    <mvc:resources mapping="/*.css" location="/" />
+    <mvc:resources mapping="/*.png" location="/" />
 
 </beans>
\ No newline at end of file


Mime
View raw message