shiro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lhazlew...@apache.org
Subject svn commit: r807303 - in /incubator/shiro/trunk: core/src/main/java/org/apache/shiro/package-info.java samples/spring-hibernate/src/main/webapp/WEB-INF/sprhib-servlet.xml samples/standalone/src/main/resources/log4j.properties
Date Mon, 24 Aug 2009 16:47:26 GMT
Author: lhazlewood
Date: Mon Aug 24 16:47:26 2009
New Revision: 807303

URL: http://svn.apache.org/viewvc?rev=807303&view=rev
Log:
SHIRO-87 - applied patch and fixed remaining org.shiro occurrences to org.apache.shiro

Modified:
    incubator/shiro/trunk/core/src/main/java/org/apache/shiro/package-info.java
    incubator/shiro/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/sprhib-servlet.xml
    incubator/shiro/trunk/samples/standalone/src/main/resources/log4j.properties

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=807303&r1=807302&r2=807303&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 Mon Aug 24
16:47:26 2009
@@ -21,4 +21,4 @@
  * by applications, {@link org.apache.shiro.SecurityUtils SecurityUtils} and
  * {@link org.apache.shiro.ShiroException ShiroException}.
  */
-package org.shiro;
+package org.apache.shiro;

Modified: incubator/shiro/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/sprhib-servlet.xml
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/sprhib-servlet.xml?rev=807303&r1=807302&r2=807303&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/sprhib-servlet.xml
(original)
+++ incubator/shiro/trunk/samples/spring-hibernate/src/main/webapp/WEB-INF/sprhib-servlet.xml
Mon Aug 24 16:47:26 2009
@@ -18,10 +18,10 @@
   ~ under the License.
   -->
 <beans xmlns="http://www.springframework.org/schema/beans"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:p="http://www.springframework.org/schema/p"
-    xmlns:context="http://www.springframework.org/schema/context"
-    xsi:schemaLocation="
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:p="http://www.springframework.org/schema/p"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xsi:schemaLocation="
         http://www.springframework.org/schema/beans
         http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
         http://www.springframework.org/schema/context
@@ -29,7 +29,7 @@
 
     <!-- Enable annotation component scanning and autowiring of web package -->
     <context:annotation-config/>
-    <context:component-scan base-package="org.shiro.samples.sprhib.web"/>
+    <context:component-scan base-package="org.apache.shiro.samples.sprhib.web"/>
 
     <!-- Required for security annotations to work in this servlet -->
     <bean class="org.springframework.aop.framework.autoproxy.DefaultAdvisorAutoProxyCreator"/>
@@ -37,17 +37,19 @@
 
 
     <!-- Enable annotation-based controllers using @Controller annotations -->
-    <bean id="annotationUrlMapping" class="org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping">
+    <bean id="annotationUrlMapping"
+          class="org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping">
         <property name="interceptors" ref="currentUserInterceptor"/>
     </bean>
 
-    <bean id="annotationMethodHandlerAdapter" class="org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter"/>
+    <bean id="annotationMethodHandlerAdapter"
+          class="org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter"/>
 
     <!-- All views are JSPs loaded from /WEB-INF/jsp -->
     <bean id="viewResolver" class="org.springframework.web.servlet.view.UrlBasedViewResolver">
         <property name="viewClass" value="org.springframework.web.servlet.view.JstlView"/>
         <property name="prefix" value="/WEB-INF/jsp/"/>
         <property name="suffix" value=".jsp"/>
-    </bean>    
+    </bean>
 
 </beans>
\ No newline at end of file

Modified: incubator/shiro/trunk/samples/standalone/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/samples/standalone/src/main/resources/log4j.properties?rev=807303&r1=807302&r2=807303&view=diff
==============================================================================
--- incubator/shiro/trunk/samples/standalone/src/main/resources/log4j.properties (original)
+++ incubator/shiro/trunk/samples/standalone/src/main/resources/log4j.properties Mon Aug 24
16:47:26 2009
@@ -29,7 +29,7 @@
 log4j.logger.org.springframework=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



Mime
View raw message