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 2010/05/19 04:03:59 UTC
svn commit: r945995 - in
/incubator/shiro/branches/session_manager_API_change: ./ core/src/ pom.xml
samples/spring-hibernate/
support/spring/src/main/java/org/apache/shiro/spring/web/package-info.java
Author: lhazlewood
Date: Wed May 19 02:03:59 2010
New Revision: 945995
URL: http://svn.apache.org/viewvc?rev=945995&view=rev
Log:
SHIRO-164 - Integrated recent changes from trunk into the branch - prepping for merge back in to trunk
Modified:
incubator/shiro/branches/session_manager_API_change/ (props changed)
incubator/shiro/branches/session_manager_API_change/core/src/ (props changed)
incubator/shiro/branches/session_manager_API_change/pom.xml
incubator/shiro/branches/session_manager_API_change/samples/spring-hibernate/ (props changed)
incubator/shiro/branches/session_manager_API_change/support/spring/src/main/java/org/apache/shiro/spring/web/package-info.java
Propchange: incubator/shiro/branches/session_manager_API_change/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 19 02:03:59 2010
@@ -1 +1 @@
-/incubator/shiro/trunk:945461-945509
+/incubator/shiro/trunk:945461-945832
Propchange: incubator/shiro/branches/session_manager_API_change/core/src/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 19 02:03:59 2010
@@ -1,2 +1,2 @@
/incubator/jsecurity/import/trunk/src:711429-749338
-/incubator/shiro/trunk/core/src:945461-945509
+/incubator/shiro/trunk/core/src:945461-945832
Modified: incubator/shiro/branches/session_manager_API_change/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shiro/branches/session_manager_API_change/pom.xml?rev=945995&r1=945994&r2=945995&view=diff
==============================================================================
--- incubator/shiro/branches/session_manager_API_change/pom.xml (original)
+++ incubator/shiro/branches/session_manager_API_change/pom.xml Wed May 19 02:03:59 2010
@@ -577,7 +577,7 @@
</build>
</profile>
<profile>
- <id>release-profile</id>
+ <id>apache-release</id>
<distributionManagement>
<site>
<id>incubator.website</id>
Propchange: incubator/shiro/branches/session_manager_API_change/samples/spring-hibernate/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 19 02:03:59 2010
@@ -1,2 +1,2 @@
/incubator/jsecurity/import/trunk/samples/spring-hibernate:720066-749338
-/incubator/shiro/trunk/samples/spring-hibernate:945461-945509
+/incubator/shiro/trunk/samples/spring-hibernate:945461-945832
Modified: incubator/shiro/branches/session_manager_API_change/support/spring/src/main/java/org/apache/shiro/spring/web/package-info.java
URL: http://svn.apache.org/viewvc/incubator/shiro/branches/session_manager_API_change/support/spring/src/main/java/org/apache/shiro/spring/web/package-info.java?rev=945995&r1=945994&r2=945995&view=diff
==============================================================================
--- incubator/shiro/branches/session_manager_API_change/support/spring/src/main/java/org/apache/shiro/spring/web/package-info.java (original)
+++ incubator/shiro/branches/session_manager_API_change/support/spring/src/main/java/org/apache/shiro/spring/web/package-info.java Wed May 19 02:03:59 2010
@@ -18,7 +18,7 @@
*/
/**
* Spring-specific components for use in Spring-based web applications.
- *
+ *
* @see ShiroFilterFactoryBean ShiroFilterFactoryBean
*/
-package or.apache.shiro.spring.web;
\ No newline at end of file
+package org.apache.shiro.spring.web;
\ No newline at end of file