You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by lh...@apache.org on 2012/07/25 02:59:54 UTC
svn commit: r1365378 - in /shiro/branches/1.2.x: pom.xml
samples/spring-hibernate/src/main/webapp/WEB-INF/web.xml
samples/spring/src/main/webapp/WEB-INF/web.xml samples/web/pom.xml
samples/web/src/main/webapp/WEB-INF/web.xml
Author: lhazlewood
Date: Wed Jul 25 00:59:54 2012
New Revision: 1365378
URL: http://svn.apache.org/viewvc?rev=1365378&view=rev
Log:
Upgraded web.xml files to Servlet 2.5 and JSTL to 1.2 (tests were failing during release)
Modified:
shiro/branches/1.2.x/pom.xml
shiro/branches/1.2.x/samples/spring-hibernate/src/main/webapp/WEB-INF/web.xml
shiro/branches/1.2.x/samples/spring/src/main/webapp/WEB-INF/web.xml
shiro/branches/1.2.x/samples/web/pom.xml
shiro/branches/1.2.x/samples/web/src/main/webapp/WEB-INF/web.xml
Modified: shiro/branches/1.2.x/pom.xml
URL: http://svn.apache.org/viewvc/shiro/branches/1.2.x/pom.xml?rev=1365378&r1=1365377&r2=1365378&view=diff
==============================================================================
--- shiro/branches/1.2.x/pom.xml (original)
+++ shiro/branches/1.2.x/pom.xml Wed Jul 25 00:59:54 2012
@@ -819,12 +819,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- <version>1.1.2</version>
- <scope>test</scope>
- </dependency>
</dependencies>
</dependencyManagement>
Modified: shiro/branches/1.2.x/samples/spring-hibernate/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/shiro/branches/1.2.x/samples/spring-hibernate/src/main/webapp/WEB-INF/web.xml?rev=1365378&r1=1365377&r2=1365378&view=diff
==============================================================================
--- shiro/branches/1.2.x/samples/spring-hibernate/src/main/webapp/WEB-INF/web.xml (original)
+++ shiro/branches/1.2.x/samples/spring-hibernate/src/main/webapp/WEB-INF/web.xml Wed Jul 25 00:59:54 2012
@@ -17,10 +17,9 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<web-app version="2.4"
- xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ version="2.5">
<!-- ===================================================================
- Context parameters
Modified: shiro/branches/1.2.x/samples/spring/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/shiro/branches/1.2.x/samples/spring/src/main/webapp/WEB-INF/web.xml?rev=1365378&r1=1365377&r2=1365378&view=diff
==============================================================================
--- shiro/branches/1.2.x/samples/spring/src/main/webapp/WEB-INF/web.xml (original)
+++ shiro/branches/1.2.x/samples/spring/src/main/webapp/WEB-INF/web.xml Wed Jul 25 00:59:54 2012
@@ -18,10 +18,9 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<web-app version="2.4"
- xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ version="2.5">
<!-- ==================================================================
Context parameters
Modified: shiro/branches/1.2.x/samples/web/pom.xml
URL: http://svn.apache.org/viewvc/shiro/branches/1.2.x/samples/web/pom.xml?rev=1365378&r1=1365377&r2=1365378&view=diff
==============================================================================
--- shiro/branches/1.2.x/samples/web/pom.xml (original)
+++ shiro/branches/1.2.x/samples/web/pom.xml Wed Jul 25 00:59:54 2012
@@ -68,6 +68,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -111,10 +112,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>taglibs</groupId>
- <artifactId>standard</artifactId>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<scope>runtime</scope>
Modified: shiro/branches/1.2.x/samples/web/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/shiro/branches/1.2.x/samples/web/src/main/webapp/WEB-INF/web.xml?rev=1365378&r1=1365377&r2=1365378&view=diff
==============================================================================
--- shiro/branches/1.2.x/samples/web/src/main/webapp/WEB-INF/web.xml (original)
+++ shiro/branches/1.2.x/samples/web/src/main/webapp/WEB-INF/web.xml Wed Jul 25 00:59:54 2012
@@ -17,10 +17,9 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<web-app version="2.4"
- xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ version="2.5">
<listener>
<listener-class>org.apache.shiro.web.env.EnvironmentLoaderListener</listener-class>