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 2009/06/18 16:37:49 UTC
svn commit: r786086 - in /incubator/shiro/trunk: ./ core/
core/src/main/java/org/apache/shiro/
core/src/main/java/org/apache/shiro/mgt/ samples/ samples/spring-hibernate/
samples/spring-hibernate/src/main/java/org/apache/
samples/spring-hibernate/src/m...
Author: lhazlewood
Date: Thu Jun 18 14:37:47 2009
New Revision: 786086
URL: http://svn.apache.org/viewvc?rev=786086&view=rev
Log:
Additional name change fixes related to jsecurity/ki -> shiro migration (changed case-sensitive references). Re-enabled the spring-hibernate module, cleaned up dependency management by excluding all uses of commons-logging and using jcl-over-slf4j where requried by 3rd-party dependencies. Moved spring-hibernate module's org.jsecurity.* package to org.apache.shiro.*.
Added:
incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/
incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/
incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/
incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/
- copied from r786049, incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/jsecurity/samples/sprhib/
Removed:
incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/jsecurity/samples/sprhib/
Modified:
incubator/shiro/trunk/README-runtime-requirements.txt
incubator/shiro/trunk/core/pom.xml
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/ShiroException.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/mgt/SessionSubjectBinder.java
incubator/shiro/trunk/core/src/main/java/org/apache/shiro/package-info.java
incubator/shiro/trunk/pom.xml
incubator/shiro/trunk/samples/pom.xml
incubator/shiro/trunk/samples/spring-hibernate/pom.xml
incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/dao/BootstrapDataPopulator.java
incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/dao/HibernateDao.java
incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/dao/HibernateUserDAO.java
incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/dao/UserDAO.java
incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/model/Role.java
incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/model/User.java
incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/security/SampleRealm.java
incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/service/DefaultUserService.java
incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/service/UserService.java
incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/CurrentUserInterceptor.java
incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/EditUserCommand.java
incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/EditUserValidator.java
incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/HomeController.java
incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/LoginCommand.java
incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/LoginValidator.java
incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/ManageUsersController.java
incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/SecurityController.java
incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/SignupCommand.java
incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/SignupController.java
incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/SignupValidator.java
incubator/shiro/trunk/samples/spring-hibernate/src/main/resources/ehcache.xml
incubator/shiro/trunk/samples/spring-hibernate/src/main/resources/hibernate.cfg.xml
incubator/shiro/trunk/samples/spring-hibernate/src/main/resources/log4j.properties
incubator/shiro/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/applicationContext.xml
incubator/shiro/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/web.xml
incubator/shiro/trunk/samples/spring/pom.xml
incubator/shiro/trunk/samples/spring/src/main/java/org/apache/shiro/samples/spring/web/LoginController.java
incubator/shiro/trunk/samples/spring/src/main/webapp/WEB-INF/web.xml
incubator/shiro/trunk/samples/web/pom.xml
incubator/shiro/trunk/samples/web/src/main/webapp/WEB-INF/web.xml
incubator/shiro/trunk/src/docbkx/resources/xsl/html_chunk.xsl
incubator/shiro/trunk/support/ehcache/pom.xml
incubator/shiro/trunk/support/quartz/pom.xml
incubator/shiro/trunk/support/spring/pom.xml
incubator/shiro/trunk/support/spring/src/main/java/org/apache/shiro/spring/SpringIniWebConfiguration.java
incubator/shiro/trunk/support/spring/src/main/java/org/apache/shiro/spring/SpringShiroFilter.java
incubator/shiro/trunk/web/pom.xml
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/config/WebConfiguration.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/filter/authc/AnonymousFilter.java
incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/servlet/ShiroFilter.java
Modified: incubator/shiro/trunk/README-runtime-requirements.txt
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/README-runtime-requirements.txt?rev=786086&r1=786085&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/README-runtime-requirements.txt (original)
+++ incubator/shiro/trunk/README-runtime-requirements.txt Thu Jun 18 14:37:47 2009
@@ -16,6 +16,6 @@
Feature-based dependencies
--------------------------
-- .ini based configuration, either for a shiro.ini file in the classpath or embedded .ini in the KiFilter
+- .ini based configuration, either for a shiro.ini file in the classpath or embedded .ini in the ShiroFilter
in web.xml:
. include Jakarta commons-beanutils-core.jar
Modified: incubator/shiro/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/core/pom.xml?rev=786086&r1=786085&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/core/pom.xml (original)
+++ incubator/shiro/trunk/core/pom.xml Thu Jun 18 14:37:47 2009
@@ -52,6 +52,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/ShiroException.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/core/src/main/java/org/apache/shiro/ShiroException.java?rev=786086&r1=786085&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/core/src/main/java/org/apache/shiro/ShiroException.java (original)
+++ incubator/shiro/trunk/core/src/main/java/org/apache/shiro/ShiroException.java Thu Jun 18 14:37:47 2009
@@ -32,14 +32,14 @@
public class ShiroException extends RuntimeException implements Serializable {
/**
- * Creates a new KiException.
+ * Creates a new ShiroException.
*/
public ShiroException() {
super();
}
/**
- * Constructs a new KiException.
+ * Constructs a new ShiroException.
*
* @param message the reason for the exception
*/
@@ -48,7 +48,7 @@
}
/**
- * Constructs a new KiException.
+ * Constructs a new ShiroException.
*
* @param cause the underlying Throwable that caused this exception to be thrown.
*/
@@ -57,7 +57,7 @@
}
/**
- * Constructs a new KiException.
+ * Constructs a new ShiroException.
*
* @param message the reason for the exception
* @param cause the underlying Throwable that caused this exception to be thrown.
Modified: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/mgt/SessionSubjectBinder.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/core/src/main/java/org/apache/shiro/mgt/SessionSubjectBinder.java?rev=786086&r1=786085&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/core/src/main/java/org/apache/shiro/mgt/SessionSubjectBinder.java (original)
+++ incubator/shiro/trunk/core/src/main/java/org/apache/shiro/mgt/SessionSubjectBinder.java Thu Jun 18 14:37:47 2009
@@ -55,7 +55,7 @@
* </ol>
* <p/>
* Indeed this is exactly how Shiro's default behavior works in enterprise server and web-based environments. It is
- * enabled in the <code>KiFilter</code> for web-based environments as well as remote-method-invocation-based
+ * enabled in the <code>ShiroFilter</code> for web-based environments as well as remote-method-invocation-based
* components for non-web environments.
*
* @author Les Hazlewood
Modified: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/package-info.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/core/src/main/java/org/apache/shiro/package-info.java?rev=786086&r1=786085&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/core/src/main/java/org/apache/shiro/package-info.java (original)
+++ incubator/shiro/trunk/core/src/main/java/org/apache/shiro/package-info.java Thu Jun 18 14:37:47 2009
@@ -19,6 +19,6 @@
/**
* This package primarily exists as a root classpath distinction, but it does contain two core classes widely used
* by applications, {@link org.apache.shiro.SecurityUtils SecurityUtils} and
- * {@link org.apache.shiro.ShiroException KiException}.
+ * {@link org.apache.shiro.ShiroException ShiroException}.
*/
package org.shiro;
Modified: incubator/shiro/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/pom.xml?rev=786086&r1=786085&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/pom.xml (original)
+++ incubator/shiro/trunk/pom.xml Thu Jun 18 14:37:47 2009
@@ -60,10 +60,9 @@
</ciManagement>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/jsecurity/import/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/jsecurity/import/trunk
- </developerConnection>
- <url>http://svn.apache.org/repos/asf/incubator/jsecurity/import/trunk</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/shiro/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/shiro/trunk</developerConnection>
+ <url>http://svn.apache.org/repos/asf/incubator/shiro/trunk</url>
</scm>
<properties>
@@ -253,9 +252,23 @@
<scope>test</scope>
</dependency>
<dependency>
+ <!-- Required in the sample apps only for 3rd-party libraries that expect to call
+ the commons logging APIs -->
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.7.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>hsqldb</groupId>
@@ -306,6 +319,81 @@
<artifactId>ehcache</artifactId>
<version>1.4.1</version>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <!-- Used for sample applications only - not required for the framework: -->
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <version>3.2.6.ga</version>
+ <optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ <exclusion>
+ <!--suppress MavenModelInspection -->
+ <groupId>ant-launcher</groupId>
+ <!--suppress MavenModelInspection -->
+ <artifactId>ant-launcher</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>c3p0</groupId>
+ <artifactId>c3p0</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ </exclusion>
+ <exclusion>
+ <!--suppress MavenModelInspection -->
+ <groupId>javax.security</groupId>
+ <!--suppress MavenModelInspection -->
+ <artifactId>jacc</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <!--suppress MavenModelInspection -->
+ <artifactId>jboss-cache</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm-all</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <!--suppress MavenModelInspection -->
+ <artifactId>asm-attrs</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ <version>3.2.1.ga</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>net.sourceforge.retroweaver</groupId>
@@ -331,18 +419,36 @@
<artifactId>spring</artifactId>
<version>${springframeworkVersion}</version>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<version>${springframeworkVersion}</version>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>quartz</groupId>
<artifactId>quartz</artifactId>
<version>1.5.2</version>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>taglibs</groupId>
Modified: incubator/shiro/trunk/samples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/pom.xml?rev=786086&r1=786085&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/pom.xml (original)
+++ incubator/shiro/trunk/samples/pom.xml Thu Jun 18 14:37:47 2009
@@ -36,7 +36,7 @@
<module>quickstart</module>
<module>web</module>
<module>spring</module>
- <!-- <module>sprhib</module> -->
+ <module>spring-hibernate</module>
</modules>
</project>
Modified: incubator/shiro/trunk/samples/spring-hibernate/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/spring-hibernate/pom.xml?rev=786086&r1=786085&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/spring-hibernate/pom.xml (original)
+++ incubator/shiro/trunk/samples/spring-hibernate/pom.xml Thu Jun 18 14:37:47 2009
@@ -27,7 +27,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>samples-spring</artifactId>
+ <artifactId>samples-sprhib</artifactId>
<name>Apache Shiro :: Samples :: Spring-Hibernate</name>
<packaging>war</packaging>
@@ -93,6 +93,18 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <scope>compile</scope>
+ <optional>false</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate-annotations</artifactId>
+ <scope>compile</scope>
+ <optional>false</optional>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
@@ -108,6 +120,11 @@
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
</project>
Modified: incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/dao/BootstrapDataPopulator.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/dao/BootstrapDataPopulator.java?rev=786086&r1=786049&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/dao/BootstrapDataPopulator.java (original)
+++ incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/dao/BootstrapDataPopulator.java Thu Jun 18 14:37:47 2009
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.samples.sprhib.dao;
+package org.apache.shiro.samples.sprhib.dao;
-import org.hibernate.SessionFactory;
import org.apache.shiro.crypto.hash.Sha256Hash;
+import org.hibernate.SessionFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
Modified: incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/dao/HibernateDao.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/dao/HibernateDao.java?rev=786086&r1=786049&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/dao/HibernateDao.java (original)
+++ incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/dao/HibernateDao.java Thu Jun 18 14:37:47 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.samples.sprhib.dao;
+package org.apache.shiro.samples.sprhib.dao;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
Modified: incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/dao/HibernateUserDAO.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/dao/HibernateUserDAO.java?rev=786086&r1=786049&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/dao/HibernateUserDAO.java (original)
+++ incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/dao/HibernateUserDAO.java Thu Jun 18 14:37:47 2009
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.samples.sprhib.dao;
+package org.apache.shiro.samples.sprhib.dao;
-import org.jsecurity.samples.sprhib.model.User;
+import org.apache.shiro.samples.sprhib.model.User;
import org.springframework.stereotype.Repository;
import org.springframework.util.Assert;
Modified: incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/dao/UserDAO.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/dao/UserDAO.java?rev=786086&r1=786049&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/dao/UserDAO.java (original)
+++ incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/dao/UserDAO.java Thu Jun 18 14:37:47 2009
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.samples.sprhib.dao;
+package org.apache.shiro.samples.sprhib.dao;
-import org.jsecurity.samples.sprhib.model.User;
+import org.apache.shiro.samples.sprhib.model.User;
import java.util.List;
Modified: incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/model/Role.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/model/Role.java?rev=786086&r1=786049&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/model/Role.java (original)
+++ incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/model/Role.java Thu Jun 18 14:37:47 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.samples.sprhib.model;
+package org.apache.shiro.samples.sprhib.model;
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;
Modified: incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/model/User.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/model/User.java?rev=786086&r1=786049&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/model/User.java (original)
+++ incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/model/User.java Thu Jun 18 14:37:47 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.samples.sprhib.model;
+package org.apache.shiro.samples.sprhib.model;
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;
Modified: incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/security/SampleRealm.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/security/SampleRealm.java?rev=786086&r1=786049&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/security/SampleRealm.java (original)
+++ incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/security/SampleRealm.java Thu Jun 18 14:37:47 2009
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.samples.sprhib.security;
+package org.apache.shiro.samples.sprhib.security;
import org.apache.shiro.authc.*;
import org.apache.shiro.authc.credential.Sha256CredentialsMatcher;
import org.apache.shiro.authz.AuthorizationInfo;
import org.apache.shiro.authz.SimpleAuthorizationInfo;
import org.apache.shiro.realm.AuthorizingRealm;
-import org.jsecurity.samples.sprhib.dao.UserDAO;
-import org.jsecurity.samples.sprhib.model.Role;
-import org.jsecurity.samples.sprhib.model.User;
+import org.apache.shiro.samples.sprhib.dao.UserDAO;
+import org.apache.shiro.samples.sprhib.model.Role;
+import org.apache.shiro.samples.sprhib.model.User;
import org.apache.shiro.subject.PrincipalCollection;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
Modified: incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/service/DefaultUserService.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/service/DefaultUserService.java?rev=786086&r1=786049&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/service/DefaultUserService.java (original)
+++ incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/service/DefaultUserService.java Thu Jun 18 14:37:47 2009
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.samples.sprhib.service;
+package org.apache.shiro.samples.sprhib.service;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.crypto.hash.Sha256Hash;
-import org.jsecurity.samples.sprhib.dao.UserDAO;
-import org.jsecurity.samples.sprhib.model.User;
+import org.apache.shiro.samples.sprhib.dao.UserDAO;
+import org.apache.shiro.samples.sprhib.model.User;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
Modified: incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/service/UserService.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/service/UserService.java?rev=786086&r1=786049&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/service/UserService.java (original)
+++ incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/service/UserService.java Thu Jun 18 14:37:47 2009
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.samples.sprhib.service;
+package org.apache.shiro.samples.sprhib.service;
-import org.jsecurity.samples.sprhib.model.User;
+import org.apache.shiro.samples.sprhib.model.User;
import java.util.List;
Modified: incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/CurrentUserInterceptor.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/CurrentUserInterceptor.java?rev=786086&r1=786049&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/CurrentUserInterceptor.java (original)
+++ incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/CurrentUserInterceptor.java Thu Jun 18 14:37:47 2009
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.samples.sprhib.web;
+package org.apache.shiro.samples.sprhib.web;
-import org.jsecurity.samples.sprhib.model.User;
-import org.jsecurity.samples.sprhib.service.UserService;
+import org.apache.shiro.samples.sprhib.model.User;
+import org.apache.shiro.samples.sprhib.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.web.servlet.ModelAndView;
Modified: incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/EditUserCommand.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/EditUserCommand.java?rev=786086&r1=786049&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/EditUserCommand.java (original)
+++ incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/EditUserCommand.java Thu Jun 18 14:37:47 2009
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.samples.sprhib.web;
+package org.apache.shiro.samples.sprhib.web;
import org.apache.shiro.crypto.hash.Sha256Hash;
-import org.jsecurity.samples.sprhib.model.User;
+import org.apache.shiro.samples.sprhib.model.User;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
Modified: incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/EditUserValidator.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/EditUserValidator.java?rev=786086&r1=786049&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/EditUserValidator.java (original)
+++ incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/EditUserValidator.java Thu Jun 18 14:37:47 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.samples.sprhib.web;
+package org.apache.shiro.samples.sprhib.web;
import org.apache.shiro.util.StringUtils;
import org.springframework.validation.Errors;
Modified: incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/HomeController.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/HomeController.java?rev=786086&r1=786049&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/HomeController.java (original)
+++ incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/HomeController.java Thu Jun 18 14:37:47 2009
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.samples.sprhib.web;
+package org.apache.shiro.samples.sprhib.web;
-import org.jsecurity.samples.sprhib.service.UserService;
+import org.apache.shiro.samples.sprhib.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
Modified: incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/LoginCommand.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/LoginCommand.java?rev=786086&r1=786049&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/LoginCommand.java (original)
+++ incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/LoginCommand.java Thu Jun 18 14:37:47 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.samples.sprhib.web;
+package org.apache.shiro.samples.sprhib.web;
/**
* Command binding object for logging in.
Modified: incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/LoginValidator.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/LoginValidator.java?rev=786086&r1=786049&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/LoginValidator.java (original)
+++ incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/LoginValidator.java Thu Jun 18 14:37:47 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.samples.sprhib.web;
+package org.apache.shiro.samples.sprhib.web;
import org.springframework.validation.Errors;
import org.springframework.validation.ValidationUtils;
Modified: incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/ManageUsersController.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/ManageUsersController.java?rev=786086&r1=786049&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/ManageUsersController.java (original)
+++ incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/ManageUsersController.java Thu Jun 18 14:37:47 2009
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.samples.sprhib.web;
+package org.apache.shiro.samples.sprhib.web;
import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.jsecurity.samples.sprhib.model.User;
-import org.jsecurity.samples.sprhib.service.UserService;
+import org.apache.shiro.samples.sprhib.model.User;
+import org.apache.shiro.samples.sprhib.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
Modified: incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/SecurityController.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/SecurityController.java?rev=786086&r1=786049&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/SecurityController.java (original)
+++ incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/SecurityController.java Thu Jun 18 14:37:47 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.samples.sprhib.web;
+package org.apache.shiro.samples.sprhib.web;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.AuthenticationException;
Modified: incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/SignupCommand.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/SignupCommand.java?rev=786086&r1=786049&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/SignupCommand.java (original)
+++ incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/SignupCommand.java Thu Jun 18 14:37:47 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.samples.sprhib.web;
+package org.apache.shiro.samples.sprhib.web;
/**
* Command binding object for signing up for a new account.
Modified: incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/SignupController.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/SignupController.java?rev=786086&r1=786049&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/SignupController.java (original)
+++ incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/SignupController.java Thu Jun 18 14:37:47 2009
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.samples.sprhib.web;
+package org.apache.shiro.samples.sprhib.web;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authc.UsernamePasswordToken;
-import org.jsecurity.samples.sprhib.service.UserService;
+import org.apache.shiro.samples.sprhib.service.UserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
Modified: incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/SignupValidator.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/SignupValidator.java?rev=786086&r1=786049&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/SignupValidator.java (original)
+++ incubator/shiro/trunk/samples/spring-hibernate/src/main/java/org/apache/shiro/samples/sprhib/web/SignupValidator.java Thu Jun 18 14:37:47 2009
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.jsecurity.samples.sprhib.web;
+package org.apache.shiro.samples.sprhib.web;
import org.apache.shiro.util.StringUtils;
import org.springframework.validation.Errors;
Modified: incubator/shiro/trunk/samples/spring-hibernate/src/main/resources/ehcache.xml
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/spring-hibernate/src/main/resources/ehcache.xml?rev=786086&r1=786085&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/spring-hibernate/src/main/resources/ehcache.xml (original)
+++ incubator/shiro/trunk/samples/spring-hibernate/src/main/resources/ehcache.xml Thu Jun 18 14:37:47 2009
@@ -18,7 +18,7 @@
-->
<ehcache>
- <diskStore path="java.io.tmpdir/shiro-spring-hibernate-ehcache"/>
+ <diskStore path="java.io.tmpdir/shiro-sprhib-ehcache"/>
<defaultCache
@@ -33,22 +33,22 @@
Hibernate Object Caches
=================================================================-->
- <cache name="org.shiro.samples.sprhib.model.Role"
+ <cache name="org.apache.shiro.samples.sprhib.model.Role"
maxElementsInMemory="100"
timeToLiveSeconds="0"
overflowToDisk="true"/>
- <cache name="org.shiro.samples.sprhib.model.Role.permissions"
+ <cache name="org.apache.shiro.samples.sprhib.model.Role.permissions"
maxElementsInMemory="100"
timeToLiveSeconds="0"
overflowToDisk="true"/>
- <cache name="org.shiro.samples.sprhib.model.User"
+ <cache name="org.apache.shiro.samples.sprhib.model.User"
maxElementsInMemory="1000"
timeToLiveSeconds="3600"
overflowToDisk="true"/>
- <cache name="org.shiro.samples.sprhib.model.User.roles"
+ <cache name="org.apache.shiro.samples.sprhib.model.User.roles"
maxElementsInMemory="1000"
timeToLiveSeconds="3600"
overflowToDisk="true"/>
Modified: incubator/shiro/trunk/samples/spring-hibernate/src/main/resources/hibernate.cfg.xml
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/spring-hibernate/src/main/resources/hibernate.cfg.xml?rev=786086&r1=786085&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/spring-hibernate/src/main/resources/hibernate.cfg.xml (original)
+++ incubator/shiro/trunk/samples/spring-hibernate/src/main/resources/hibernate.cfg.xml Thu Jun 18 14:37:47 2009
@@ -28,8 +28,8 @@
<!-- DB schema will be updated if needed -->
<property name="hbm2ddl.auto">update</property>
- <mapping class="org.shiro.samples.sprhib.model.Role"/>
- <mapping class="org.shiro.samples.sprhib.model.User"/>
+ <mapping class="org.apache.shiro.samples.sprhib.model.Role"/>
+ <mapping class="org.apache.shiro.samples.sprhib.model.User"/>
</session-factory>
</hibernate-configuration>
\ No newline at end of file
Modified: incubator/shiro/trunk/samples/spring-hibernate/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/spring-hibernate/src/main/resources/log4j.properties?rev=786086&r1=786085&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/spring-hibernate/src/main/resources/log4j.properties (original)
+++ incubator/shiro/trunk/samples/spring-hibernate/src/main/resources/log4j.properties Thu Jun 18 14:37:47 2009
@@ -32,7 +32,7 @@
log4j.logger.org.hibernate=WARN
# Default Shiro logging
-log4j.logger.org.shiro=TRACE
+log4j.logger.org.apache.shiro=TRACE
# Disable verbose logging
log4j.logger.org.apache.shiro.util.ThreadContext=WARN
Modified: incubator/shiro/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/applicationContext.xml
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/applicationContext.xml?rev=786086&r1=786085&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/applicationContext.xml (original)
+++ incubator/shiro/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/applicationContext.xml Thu Jun 18 14:37:47 2009
@@ -32,9 +32,9 @@
<context:annotation-config/>
<!-- Scan sample packages for Spring annotations -->
- <context:component-scan base-package="org.shiro.samples.sprhib.dao"/>
- <context:component-scan base-package="org.shiro.samples.sprhib.security"/>
- <context:component-scan base-package="org.shiro.samples.sprhib.service"/>
+ <context:component-scan base-package="org.apache.shiro.samples.sprhib.dao"/>
+ <context:component-scan base-package="org.apache.shiro.samples.sprhib.security"/>
+ <context:component-scan base-package="org.apache.shiro.samples.sprhib.service"/>
<!-- Spring AOP auto-proxy creation (required to support Shiro annotations) -->
<bean class="org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator"/>
Modified: incubator/shiro/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/web.xml?rev=786086&r1=786085&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/shiro/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/web.xml Thu Jun 18 14:37:47 2009
@@ -60,16 +60,16 @@
</filter>
<filter>
- <filter-name>KiFilter</filter-name>
+ <filter-name>ShiroFilter</filter-name>
<filter-class>org.apache.shiro.spring.SpringShiroFilter</filter-class>
<init-param>
<param-name>config</param-name>
<param-value>
- # The KiFilter configuration is very powerful and flexible, while still remaining succinct.
+ # The ShiroFilter configuration is very powerful and flexible, while still remaining succinct.
# Please read the comprehensive example, with full comments and explanations, in the JavaDoc:
#
- # http://shiro.apache.org/api/org/apache/shiro/web/servlet/KiFilter.html
+ # http://shiro.apache.org/api/org/apache/shiro/web/servlet/ShiroFilter.html
# If you'd prefer to not have this configuration in web.xml, you can create a file called shiro.ini
# in the root of your classpath and Shiro will automatically pick it up.
@@ -96,7 +96,7 @@
</filter-mapping>
<filter-mapping>
- <filter-name>KiFilter</filter-name>
+ <filter-name>ShiroFilter</filter-name>
<url-pattern>/s/*</url-pattern>
</filter-mapping>
Modified: incubator/shiro/trunk/samples/spring/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/spring/pom.xml?rev=786086&r1=786085&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/spring/pom.xml (original)
+++ incubator/shiro/trunk/samples/spring/pom.xml Thu Jun 18 14:37:47 2009
@@ -88,6 +88,11 @@
<scope>runtime</scope>
</dependency>
<dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>runtime</scope>
Modified: incubator/shiro/trunk/samples/spring/src/main/java/org/apache/shiro/samples/spring/web/LoginController.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/spring/src/main/java/org/apache/shiro/samples/spring/web/LoginController.java?rev=786086&r1=786085&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/spring/src/main/java/org/apache/shiro/samples/spring/web/LoginController.java (original)
+++ incubator/shiro/trunk/samples/spring/src/main/java/org/apache/shiro/samples/spring/web/LoginController.java Thu Jun 18 14:37:47 2009
@@ -18,16 +18,17 @@
*/
package org.apache.shiro.samples.spring.web;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import org.apache.shiro.authc.AuthenticationException;
+import org.apache.shiro.authc.UsernamePasswordToken;
+import org.apache.shiro.mgt.SecurityManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.validation.BindException;
import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.mvc.SimpleFormController;
-import org.apache.shiro.authc.AuthenticationException;
-import org.apache.shiro.authc.UsernamePasswordToken;
-import org.apache.shiro.mgt.SecurityManager;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
/**
* Spring MVC controller responsible for authenticating the user.
@@ -37,6 +38,8 @@
*/
public class LoginController extends SimpleFormController {
+ private static transient final Logger log = LoggerFactory.getLogger(LoginController.class);
+
/*--------------------------------------------
| C O N S T A N T S |
============================================*/
@@ -44,7 +47,7 @@
/*--------------------------------------------
| I N S T A N C E V A R I A B L E S |
============================================*/
- private org.apache.shiro.mgt.SecurityManager securityManager;
+ private SecurityManager securityManager;
/*--------------------------------------------
| C O N S T R U C T O R S |
@@ -78,9 +81,7 @@
try {
securityManager.login(token);
} catch (AuthenticationException e) {
- if (logger.isDebugEnabled()) {
- logger.debug("Error authenticating.", e);
- }
+ log.debug("Error authenticating.", e);
errors.reject("error.invalidLogin", "The username or password was not correct.");
}
Modified: incubator/shiro/trunk/samples/spring/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/spring/src/main/webapp/WEB-INF/web.xml?rev=786086&r1=786085&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/spring/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/shiro/trunk/samples/spring/src/main/webapp/WEB-INF/web.xml Thu Jun 18 14:37:47 2009
@@ -56,16 +56,16 @@
Filters
================================================================== -->
<filter>
- <filter-name>KiFilter</filter-name>
+ <filter-name>ShiroFilter</filter-name>
<filter-class>org.apache.shiro.spring.SpringShiroFilter</filter-class>
<init-param>
<param-name>config</param-name>
<param-value>
- # The KiFilter configuration is very powerful and flexible, while still remaining succinct.
+ # The ShiroFilter configuration is very powerful and flexible, while still remaining succinct.
# Please read the comprehensive example, with full comments and explanations, in the JavaDoc:
#
- # http://shiro.apache.org/api/org/apache/shiro/web/servlet/KiFilter.html
+ # http://shiro.apache.org/api/org/apache/shiro/web/servlet/ShiroFilter.html
[filters]
shiro.loginUrl = /s/login
@@ -81,11 +81,11 @@
</filter>
<filter-mapping>
- <filter-name>KiFilter</filter-name>
+ <filter-name>ShiroFilter</filter-name>
<url-pattern>/s/*</url-pattern>
</filter-mapping>
<filter-mapping>
- <filter-name>KiFilter</filter-name>
+ <filter-name>ShiroFilter</filter-name>
<url-pattern>/remoting/*</url-pattern>
</filter-mapping>
Modified: incubator/shiro/trunk/samples/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/web/pom.xml?rev=786086&r1=786085&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/web/pom.xml (original)
+++ incubator/shiro/trunk/samples/web/pom.xml Thu Jun 18 14:37:47 2009
@@ -70,6 +70,11 @@
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
</project>
Modified: incubator/shiro/trunk/samples/web/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/web/src/main/webapp/WEB-INF/web.xml?rev=786086&r1=786085&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/web/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/shiro/trunk/samples/web/src/main/webapp/WEB-INF/web.xml Thu Jun 18 14:37:47 2009
@@ -23,16 +23,16 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
<filter>
- <filter-name>KiFilter</filter-name>
+ <filter-name>ShiroFilter</filter-name>
<filter-class>org.apache.shiro.web.servlet.ShiroFilter</filter-class>
<init-param>
<param-name>config</param-name>
<param-value>
- # The KiFilter configuration is very powerful and flexible, while still remaining succinct.
+ # The ShiroFilter configuration is very powerful and flexible, while still remaining succinct.
# Please read the comprehensive example, with full comments and explanations, in the JavaDoc:
#
- # http://shiro.apache.org/api/org/apache/shiro/web/servlet/KiFilter.html
+ # http://shiro.apache.org/api/org/apache/shiro/web/servlet/ShiroFilter.html
[main]
@@ -56,7 +56,7 @@
</filter>
<filter-mapping>
- <filter-name>KiFilter</filter-name>
+ <filter-name>ShiroFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
Modified: incubator/shiro/trunk/src/docbkx/resources/xsl/html_chunk.xsl
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/src/docbkx/resources/xsl/html_chunk.xsl?rev=786086&r1=786085&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/src/docbkx/resources/xsl/html_chunk.xsl (original)
+++ incubator/shiro/trunk/src/docbkx/resources/xsl/html_chunk.xsl Thu Jun 18 14:37:47 2009
@@ -102,8 +102,8 @@
<!-- let's have a Shiro and Anjin banner across the top of each page -->
<xsl:template name="user.header.navigation">
<div style="background-color:white;border:none;height:73px;border:1px solid black;">
- <a style="border:none;" href="http://www.jsecurity.org/" title="Apache Shiro">
- <img style="border:none;" src="images/xdev-jsecurity_logo.jpg"/>
+ <a style="border:none;" href="http://shiro.apache.org/" title="Apache Shiro">
+ <img style="border:none;" src="images/xdev-shiro_logo.jpg"/>
</a>
<!-- <a style="border:none;" href="http://www.anjinllc.com/" title="AnjinLLC">
<img style="border:none;position:absolute;padding-top:5px;right:42px;" src="images/anjin-banner-rhs.png" />
Modified: incubator/shiro/trunk/support/ehcache/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/support/ehcache/pom.xml?rev=786086&r1=786085&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/support/ehcache/pom.xml (original)
+++ incubator/shiro/trunk/support/ehcache/pom.xml Thu Jun 18 14:37:47 2009
@@ -45,6 +45,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: incubator/shiro/trunk/support/quartz/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/support/quartz/pom.xml?rev=786086&r1=786085&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/support/quartz/pom.xml (original)
+++ incubator/shiro/trunk/support/quartz/pom.xml Thu Jun 18 14:37:47 2009
@@ -45,6 +45,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: incubator/shiro/trunk/support/spring/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/support/spring/pom.xml?rev=786086&r1=786085&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/support/spring/pom.xml (original)
+++ incubator/shiro/trunk/support/spring/pom.xml Thu Jun 18 14:37:47 2009
@@ -54,6 +54,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: incubator/shiro/trunk/support/spring/src/main/java/org/apache/shiro/spring/SpringIniWebConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/support/spring/src/main/java/org/apache/shiro/spring/SpringIniWebConfiguration.java?rev=786086&r1=786085&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/support/spring/src/main/java/org/apache/shiro/spring/SpringIniWebConfiguration.java (original)
+++ incubator/shiro/trunk/support/spring/src/main/java/org/apache/shiro/spring/SpringIniWebConfiguration.java Thu Jun 18 14:37:47 2009
@@ -18,27 +18,25 @@
*/
package org.apache.shiro.spring;
-import java.util.Collection;
-import java.util.Map;
-import javax.servlet.ServletContext;
-
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextException;
-import org.springframework.web.context.support.WebApplicationContextUtils;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import org.apache.shiro.ShiroException;
import org.apache.shiro.mgt.RealmSecurityManager;
import org.apache.shiro.mgt.SecurityManager;
import org.apache.shiro.realm.Realm;
import org.apache.shiro.web.config.IniWebConfiguration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextException;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+import javax.servlet.ServletContext;
+import java.util.Collection;
+import java.util.Map;
/**
* <p>Shiro configuration that relies on Spring to define and initialize the Shiro SecurityManager
- * instance (and all of its dependencies) and makes it available to the KiFilter by performing a Spring bean
+ * instance (and all of its dependencies) and makes it available to the ShiroFilter by performing a Spring bean
* lookup. The URL/filter definitions are still .ini based and loaded according to the behavior of the parent class
* {@link org.apache.shiro.web.config.IniWebConfiguration}</p>
* <p/>
Modified: incubator/shiro/trunk/support/spring/src/main/java/org/apache/shiro/spring/SpringShiroFilter.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/support/spring/src/main/java/org/apache/shiro/spring/SpringShiroFilter.java?rev=786086&r1=786085&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/support/spring/src/main/java/org/apache/shiro/spring/SpringShiroFilter.java (original)
+++ incubator/shiro/trunk/support/spring/src/main/java/org/apache/shiro/spring/SpringShiroFilter.java Thu Jun 18 14:37:47 2009
@@ -22,13 +22,13 @@
/**
- * Extension of KiFilter that uses {@link SpringIniWebConfiguration} to configure Shiro in a Spring web
+ * Extension of ShiroFilter that uses {@link SpringIniWebConfiguration} to configure Shiro in a Spring web
* environment.
* <p/>
* Using this class in web.xml essentially enables the following:
* <pre><filter>
- * <filter-name>KiFilter</filter-name>
- * <filter-class>org.apache.shiro.web.servlet.KiFilter</filter-class>
+ * <filter-name>ShiroFilter</filter-name>
+ * <filter-class>org.apache.shiro.web.servlet.ShiroFilter</filter-class>
* <init-param>
* <param-name>configClassName</param-name>
* <param-value>org.apache.shiro.spring.SpringIniWebConfiguration<param-value>
Modified: incubator/shiro/trunk/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/web/pom.xml?rev=786086&r1=786085&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/web/pom.xml (original)
+++ incubator/shiro/trunk/web/pom.xml Thu Jun 18 14:37:47 2009
@@ -54,6 +54,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/config/WebConfiguration.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/config/WebConfiguration.java?rev=786086&r1=786085&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/config/WebConfiguration.java (original)
+++ incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/config/WebConfiguration.java Thu Jun 18 14:37:47 2009
@@ -18,13 +18,13 @@
*/
package org.apache.shiro.web.config;
+import org.apache.shiro.config.Configuration;
+
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import org.apache.shiro.config.Configuration;
-
/**
* A <code>WebConfiguration</code> configures Shiro components in a web-enabled application.
* <p/>
@@ -50,7 +50,7 @@
*
* @param request the incoming ServletRequest
* @param response the outgoing ServletResponse
- * @param originalChain the original <code>FilterChain</code> intercepted by the KiFilter.
+ * @param originalChain the original <code>FilterChain</code> intercepted by the ShiroFilter.
* @return the filter chain that should be executed for the given request, or <code>null</code> if the
* original chain should be used.
*/
Modified: incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/filter/authc/AnonymousFilter.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/filter/authc/AnonymousFilter.java?rev=786086&r1=786085&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/filter/authc/AnonymousFilter.java (original)
+++ incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/filter/authc/AnonymousFilter.java Thu Jun 18 14:37:47 2009
@@ -18,11 +18,11 @@
*/
package org.apache.shiro.web.filter.authc;
+import org.apache.shiro.web.filter.PathMatchingFilter;
+
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
-import org.apache.shiro.web.filter.PathMatchingFilter;
-
/**
* Filter that allows access to a path immeidately without performing security checks of any kind.
* <p/>
@@ -32,7 +32,7 @@
* For example, if you had a user-only section of a website, you might want to require that access to
* any url in that section must be from an authenticated user.
* <p/>
- * Here is how that would look in the KiFilter configuration:
+ * Here is how that would look in the ShiroFilter configuration:
* <p/>
* <code>[urls]<br/>
* /user/** = authc</code>
Modified: incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/servlet/ShiroFilter.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/servlet/ShiroFilter.java?rev=786086&r1=786085&r2=786086&view=diff
==============================================================================
--- incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/servlet/ShiroFilter.java (original)
+++ incubator/shiro/trunk/web/src/main/java/org/apache/shiro/web/servlet/ShiroFilter.java Thu Jun 18 14:37:47 2009
@@ -47,8 +47,8 @@
* The following is a fully commented example that documents how to configure it:
* <p/>
* <pre><filter>
- * <filter-name>KiFilter</filter-name>
- * <filter-class>org.apache.shiro.web.servlet.KiFilter</filter-class>
+ * <filter-name>ShiroFilter</filter-name>
+ * <filter-class>org.apache.shiro.web.servlet.ShiroFilter</filter-class>
* <init-param><param-name>config</param-name><param-value>
* #
* #NOTE: This config looks pretty long - but its not - its only a few lines of actual config.
@@ -216,7 +216,7 @@
* #
* #
* <filter-mapping>
- * <filter-name>KiFilter</filter-name>
+ * <filter-name>ShiroFilter</filter-name>
* <url-pattern>/*</url-pattern>
* </filter-mapping></pre>
*
@@ -397,7 +397,7 @@
* Servlet Specification behavior backed by a {@link org.apache.shiro.subject.Subject Subject} instance.
*
* @param orig the original Servlet Container-provided incoming {@code HttpServletRequest} instance.
- * @return {@link ShiroHttpServletRequest KiHttpServletRequest} instance wrapping the original.
+ * @return {@link ShiroHttpServletRequest ShiroHttpServletRequest} instance wrapping the original.
* @since 1.0
*/
protected ServletRequest wrapServletRequest(HttpServletRequest orig) {
@@ -434,7 +434,7 @@
* Servlet Container HTTP-based sessions).
*
* @param orig the original {@code HttpServletResponse} instance provided by the Servlet Container.
- * @param request the {@code KiHttpServletRequest} instance wrapping the original request.
+ * @param request the {@code ShiroHttpServletRequest} instance wrapping the original request.
* @return the wrapped ServletResponse instance to use during {@link FilterChain} execution.
* @since 1.0
*/