You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by bd...@apache.org on 2016/12/15 03:17:18 UTC
[2/2] shiro git commit: fixed spring-mvc war packaging issue (now
runs as a proper war with `mvn jetty:run-war`
fixed spring-mvc war packaging issue (now runs as a proper war with `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/71282d67
Tree: http://git-wip-us.apache.org/repos/asf/shiro/tree/71282d67
Diff: http://git-wip-us.apache.org/repos/asf/shiro/diff/71282d67
Branch: refs/heads/master
Commit: 71282d677d0cf6967d6632f86b4512b9a09df729
Parents: 59ffa69
Author: Brian Demers <bd...@apache.org>
Authored: Wed Dec 14 19:17:09 2016 -0800
Committer: Brian Demers <bd...@apache.org>
Committed: Wed Dec 14 19:17:09 2016 -0800
----------------------------------------------------------------------
samples/spring-mvc/README.md | 2 +-
samples/spring-mvc/pom.xml | 31 ++++++++++++++++---------------
2 files changed, 17 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/shiro/blob/71282d67/samples/spring-mvc/README.md
----------------------------------------------------------------------
diff --git a/samples/spring-mvc/README.md b/samples/spring-mvc/README.md
index 6c3861e..ffba06f 100644
--- a/samples/spring-mvc/README.md
+++ b/samples/spring-mvc/README.md
@@ -7,7 +7,7 @@ Run the Example
---------------
```
-mvn jetty:run
+mvn jetty:run-war
```
Browse to `http://localhost:8080/shiro-samples-spring`
http://git-wip-us.apache.org/repos/asf/shiro/blob/71282d67/samples/spring-mvc/pom.xml
----------------------------------------------------------------------
diff --git a/samples/spring-mvc/pom.xml b/samples/spring-mvc/pom.xml
index 9a09877..9157beb 100644
--- a/samples/spring-mvc/pom.xml
+++ b/samples/spring-mvc/pom.xml
@@ -36,10 +36,14 @@
as the web start application.
</description>
+ <properties>
+ <jetty.version>9.4.0.v20161208</jetty.version>
+ </properties>
+
<build>
<plugins>
<plugin>
- <!-- Note that you need to run mvn jetty:run-exploded to test the webstart application -->
+ <!-- Note that you need to run mvn jetty:run-war to test the webstart application -->
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<version>${jetty.version}</version>
@@ -49,9 +53,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>
@@ -81,10 +82,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
+ <version>3.0.0</version>
<configuration>
<webResources>
<resource>
- <!-- this is relative to the pom.xml directory -->
<directory>${project.build.directory}/extra</directory>
</resource>
</webResources>
@@ -107,6 +108,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>
@@ -121,23 +127,18 @@
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
+ <artifactId>jcl-over-slf4j</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>runtime</scope>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
</dependency>
- <!--<dependency>-->
- <!--<groupId>org.springframework</groupId>-->
- <!--<artifactId>spring-context</artifactId>-->
- <!--</dependency>-->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>