You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by ad...@apache.org on 2010/05/26 20:34:49 UTC
svn commit: r948527 [20/38] - in /incubator/shiro:
branches/shiro-root-1.0.x/ branches/shiro-root-1.0.x/all/
branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/
branches/shiro-root-1.0.x/core/src/main/java/org/apache/shiro/aop/
branches/shir...
Modified: incubator/shiro/branches/shiro-root-1.0.x/web/src/test/java/org/apache/shiro/web/filter/mgt/PathMatchingFilterChainResolverTest.java
URL: http://svn.apache.org/viewvc/incubator/shiro/branches/shiro-root-1.0.x/web/src/test/java/org/apache/shiro/web/filter/mgt/PathMatchingFilterChainResolverTest.java?rev=948527&r1=948526&r2=948527&view=diff
==============================================================================
--- incubator/shiro/branches/shiro-root-1.0.x/web/src/test/java/org/apache/shiro/web/filter/mgt/PathMatchingFilterChainResolverTest.java (original)
+++ incubator/shiro/branches/shiro-root-1.0.x/web/src/test/java/org/apache/shiro/web/filter/mgt/PathMatchingFilterChainResolverTest.java Wed May 26 18:34:28 2010
@@ -1,128 +1,128 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.shiro.web.filter.mgt;
-
-import org.apache.shiro.util.AntPathMatcher;
-import org.apache.shiro.web.WebTest;
-import org.apache.shiro.web.util.WebUtils;
-import org.junit.Before;
-import org.junit.Test;
-
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import static org.easymock.EasyMock.*;
-import static org.junit.Assert.*;
-
-/**
- * Tests for {@link org.apache.shiro.web.filter.mgt.PathMatchingFilterChainResolver}.
- *
- * @since 1.0
- */
-public class PathMatchingFilterChainResolverTest extends WebTest {
-
- private PathMatchingFilterChainResolver resolver;
-
- @Before
- public void setUp() {
- resolver = new PathMatchingFilterChainResolver();
- }
-
- @Test
- public void testNewInstance() {
- assertNotNull(resolver.getPathMatcher());
- assertTrue(resolver.getPathMatcher() instanceof AntPathMatcher);
- assertNotNull(resolver.getFilterChainManager());
- assertTrue(resolver.getFilterChainManager() instanceof DefaultFilterChainManager);
- }
-
- @Test
- public void testNewInstanceWithFilterConfig() {
- FilterConfig mock = createNiceMockFilterConfig();
- replay(mock);
- resolver = new PathMatchingFilterChainResolver(mock);
- assertNotNull(resolver.getPathMatcher());
- assertTrue(resolver.getPathMatcher() instanceof AntPathMatcher);
- assertNotNull(resolver.getFilterChainManager());
- assertTrue(resolver.getFilterChainManager() instanceof DefaultFilterChainManager);
- assertEquals(((DefaultFilterChainManager) resolver.getFilterChainManager()).getFilterConfig(), mock);
- verify(mock);
- }
-
- @Test
- public void testSetters() {
- resolver.setPathMatcher(new AntPathMatcher());
- assertNotNull(resolver.getPathMatcher());
- assertTrue(resolver.getPathMatcher() instanceof AntPathMatcher);
- resolver.setFilterChainManager(new DefaultFilterChainManager());
- assertNotNull(resolver.getFilterChainManager());
- assertTrue(resolver.getFilterChainManager() instanceof DefaultFilterChainManager);
- }
-
- @Test
- public void testGetChainsWithoutChains() {
- ServletRequest request = createNiceMock(HttpServletRequest.class);
- ServletResponse response = createNiceMock(HttpServletResponse.class);
- FilterChain chain = createNiceMock(FilterChain.class);
- FilterChain resolved = resolver.getChain(request, response, chain);
- assertNull(resolved);
- }
-
- @Test
- public void testGetChainsWithMatch() {
- HttpServletRequest request = createNiceMock(HttpServletRequest.class);
- HttpServletResponse response = createNiceMock(HttpServletResponse.class);
- FilterChain chain = createNiceMock(FilterChain.class);
-
- //ensure at least one chain is defined:
- resolver.getFilterChainManager().addToChain("/index.html", "authcBasic");
-
- expect(request.getAttribute(WebUtils.INCLUDE_CONTEXT_PATH_ATTRIBUTE)).andReturn(null).anyTimes();
- expect(request.getContextPath()).andReturn("");
- expect(request.getRequestURI()).andReturn("/index.html");
- replay(request);
-
- FilterChain resolved = resolver.getChain(request, response, chain);
- assertNotNull(resolved);
- verify(request);
- }
-
- @Test
- public void testGetChainsWithoutMatch() {
- HttpServletRequest request = createNiceMock(HttpServletRequest.class);
- HttpServletResponse response = createNiceMock(HttpServletResponse.class);
- FilterChain chain = createNiceMock(FilterChain.class);
-
- //ensure at least one chain is defined:
- resolver.getFilterChainManager().addToChain("/index.html", "authcBasic");
-
- expect(request.getAttribute(WebUtils.INCLUDE_CONTEXT_PATH_ATTRIBUTE)).andReturn(null).anyTimes();
- expect(request.getContextPath()).andReturn("");
- expect(request.getRequestURI()).andReturn("/");
- replay(request);
-
- FilterChain resolved = resolver.getChain(request, response, chain);
- assertNull(resolved);
- verify(request);
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.shiro.web.filter.mgt;
+
+import org.apache.shiro.util.AntPathMatcher;
+import org.apache.shiro.web.WebTest;
+import org.apache.shiro.web.util.WebUtils;
+import org.junit.Before;
+import org.junit.Test;
+
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import static org.easymock.EasyMock.*;
+import static org.junit.Assert.*;
+
+/**
+ * Tests for {@link org.apache.shiro.web.filter.mgt.PathMatchingFilterChainResolver}.
+ *
+ * @since 1.0
+ */
+public class PathMatchingFilterChainResolverTest extends WebTest {
+
+ private PathMatchingFilterChainResolver resolver;
+
+ @Before
+ public void setUp() {
+ resolver = new PathMatchingFilterChainResolver();
+ }
+
+ @Test
+ public void testNewInstance() {
+ assertNotNull(resolver.getPathMatcher());
+ assertTrue(resolver.getPathMatcher() instanceof AntPathMatcher);
+ assertNotNull(resolver.getFilterChainManager());
+ assertTrue(resolver.getFilterChainManager() instanceof DefaultFilterChainManager);
+ }
+
+ @Test
+ public void testNewInstanceWithFilterConfig() {
+ FilterConfig mock = createNiceMockFilterConfig();
+ replay(mock);
+ resolver = new PathMatchingFilterChainResolver(mock);
+ assertNotNull(resolver.getPathMatcher());
+ assertTrue(resolver.getPathMatcher() instanceof AntPathMatcher);
+ assertNotNull(resolver.getFilterChainManager());
+ assertTrue(resolver.getFilterChainManager() instanceof DefaultFilterChainManager);
+ assertEquals(((DefaultFilterChainManager) resolver.getFilterChainManager()).getFilterConfig(), mock);
+ verify(mock);
+ }
+
+ @Test
+ public void testSetters() {
+ resolver.setPathMatcher(new AntPathMatcher());
+ assertNotNull(resolver.getPathMatcher());
+ assertTrue(resolver.getPathMatcher() instanceof AntPathMatcher);
+ resolver.setFilterChainManager(new DefaultFilterChainManager());
+ assertNotNull(resolver.getFilterChainManager());
+ assertTrue(resolver.getFilterChainManager() instanceof DefaultFilterChainManager);
+ }
+
+ @Test
+ public void testGetChainsWithoutChains() {
+ ServletRequest request = createNiceMock(HttpServletRequest.class);
+ ServletResponse response = createNiceMock(HttpServletResponse.class);
+ FilterChain chain = createNiceMock(FilterChain.class);
+ FilterChain resolved = resolver.getChain(request, response, chain);
+ assertNull(resolved);
+ }
+
+ @Test
+ public void testGetChainsWithMatch() {
+ HttpServletRequest request = createNiceMock(HttpServletRequest.class);
+ HttpServletResponse response = createNiceMock(HttpServletResponse.class);
+ FilterChain chain = createNiceMock(FilterChain.class);
+
+ //ensure at least one chain is defined:
+ resolver.getFilterChainManager().addToChain("/index.html", "authcBasic");
+
+ expect(request.getAttribute(WebUtils.INCLUDE_CONTEXT_PATH_ATTRIBUTE)).andReturn(null).anyTimes();
+ expect(request.getContextPath()).andReturn("");
+ expect(request.getRequestURI()).andReturn("/index.html");
+ replay(request);
+
+ FilterChain resolved = resolver.getChain(request, response, chain);
+ assertNotNull(resolved);
+ verify(request);
+ }
+
+ @Test
+ public void testGetChainsWithoutMatch() {
+ HttpServletRequest request = createNiceMock(HttpServletRequest.class);
+ HttpServletResponse response = createNiceMock(HttpServletResponse.class);
+ FilterChain chain = createNiceMock(FilterChain.class);
+
+ //ensure at least one chain is defined:
+ resolver.getFilterChainManager().addToChain("/index.html", "authcBasic");
+
+ expect(request.getAttribute(WebUtils.INCLUDE_CONTEXT_PATH_ATTRIBUTE)).andReturn(null).anyTimes();
+ expect(request.getContextPath()).andReturn("");
+ expect(request.getRequestURI()).andReturn("/");
+ replay(request);
+
+ FilterChain resolved = resolver.getChain(request, response, chain);
+ assertNull(resolved);
+ verify(request);
+ }
+}
Propchange: incubator/shiro/branches/shiro-root-1.0.x/web/src/test/java/org/apache/shiro/web/filter/mgt/PathMatchingFilterChainResolverTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/shiro/branches/shiro-root-1.0.x/web/src/test/java/org/apache/shiro/web/filter/mgt/SimpleNamedFilterListTest.java
URL: http://svn.apache.org/viewvc/incubator/shiro/branches/shiro-root-1.0.x/web/src/test/java/org/apache/shiro/web/filter/mgt/SimpleNamedFilterListTest.java?rev=948527&r1=948526&r2=948527&view=diff
==============================================================================
--- incubator/shiro/branches/shiro-root-1.0.x/web/src/test/java/org/apache/shiro/web/filter/mgt/SimpleNamedFilterListTest.java (original)
+++ incubator/shiro/branches/shiro-root-1.0.x/web/src/test/java/org/apache/shiro/web/filter/mgt/SimpleNamedFilterListTest.java Wed May 26 18:34:28 2010
@@ -1,154 +1,154 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.shiro.web.filter.mgt;
-
-import org.apache.shiro.util.CollectionUtils;
-import org.apache.shiro.web.filter.authc.UserFilter;
-import org.apache.shiro.web.filter.authz.PermissionsAuthorizationFilter;
-import org.apache.shiro.web.filter.authz.PortFilter;
-import org.apache.shiro.web.filter.authz.RolesAuthorizationFilter;
-import org.apache.shiro.web.filter.authz.SslFilter;
-import org.junit.Test;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import java.util.*;
-
-import static org.easymock.EasyMock.createNiceMock;
-import static org.junit.Assert.*;
-
-/**
- * Test case for the {@link SimpleNamedFilterList} implementation.
- *
- * @since 1.0
- */
-public class SimpleNamedFilterListTest {
-
- @Test
- public void testNewInstance() {
- @SuppressWarnings({"MismatchedQueryAndUpdateOfCollection"})
- SimpleNamedFilterList list = new SimpleNamedFilterList("test");
- assertNotNull(list.getName());
- assertEquals("test", list.getName());
- }
-
- @Test(expected = IllegalArgumentException.class)
- public void testNewInstanceNameless() {
- new SimpleNamedFilterList(null);
- }
-
- @Test
- public void testNewInstanceBackingList() {
- new SimpleNamedFilterList("test", new ArrayList<Filter>());
- }
-
- @Test(expected = NullPointerException.class)
- public void testNewInstanceNullBackingList() {
- new SimpleNamedFilterList("test", null);
- }
-
- /**
- * Exists mainly to increase code coverage as the SimpleNamedFilterList
- * implementation is a direct pass through.
- */
- @Test
- public void testListMethods() {
- FilterChain mock = createNiceMock(FilterChain.class);
- Filter filter = createNiceMock(Filter.class);
-
- NamedFilterList list = new SimpleNamedFilterList("test");
- list.add(filter);
- FilterChain chain = list.proxy(mock);
- assertNotNull(chain);
- assertNotSame(mock, chain);
-
- Filter singleFilter = new SslFilter();
- List<? extends Filter> multipleFilters = CollectionUtils.asList(new PortFilter(), new UserFilter());
-
- list.add(0, singleFilter);
- assertEquals(2, list.size());
- assertTrue(list.get(0) instanceof SslFilter);
- assertTrue(Arrays.equals(list.toArray(), new Object[]{singleFilter, filter}));
-
- list.addAll(multipleFilters);
- assertEquals(4, list.size());
- assertTrue(list.get(2) instanceof PortFilter);
- assertTrue(list.get(3) instanceof UserFilter);
-
- list.addAll(0, CollectionUtils.asList(new PermissionsAuthorizationFilter(), new RolesAuthorizationFilter()));
- assertEquals(6, list.size());
- assertTrue(list.get(0) instanceof PermissionsAuthorizationFilter);
- assertTrue(list.get(1) instanceof RolesAuthorizationFilter);
- assertEquals(2, list.indexOf(singleFilter));
- assertEquals(multipleFilters, list.subList(4, list.size()));
-
- assertTrue(list.contains(singleFilter));
- assertTrue(list.containsAll(multipleFilters));
-
- assertFalse(list.isEmpty());
- list.clear();
- assertTrue(list.isEmpty());
-
- list.add(singleFilter);
- Iterator i = list.iterator();
- assertTrue(i.hasNext());
- assertEquals(i.next(), singleFilter);
-
- ListIterator li = list.listIterator();
- assertTrue(li.hasNext());
- assertEquals(li.next(), singleFilter);
-
- li = list.listIterator(0);
- assertTrue(li.hasNext());
- assertEquals(li.next(), singleFilter);
-
- list.set(0, singleFilter);
- assertEquals(list.get(0), singleFilter);
-
- Filter[] filters = new Filter[list.size()];
- filters = list.toArray(filters);
- assertEquals(1, filters.length);
- assertEquals(filters[0], singleFilter);
-
- assertEquals(0, list.lastIndexOf(singleFilter));
-
- list.remove(singleFilter);
- assertTrue(list.isEmpty());
-
- list.add(singleFilter);
- list.remove(0);
- assertTrue(list.isEmpty());
-
- list.add(singleFilter);
- list.addAll(multipleFilters);
- assertEquals(3, list.size());
- list.removeAll(multipleFilters);
- assertEquals(1, list.size());
- assertEquals(list.get(0), singleFilter);
-
- list.addAll(multipleFilters);
- assertEquals(3, list.size());
- list.retainAll(multipleFilters);
- assertEquals(2, list.size());
- //noinspection unchecked
- assertEquals(new ArrayList(list), multipleFilters);
- }
-
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.shiro.web.filter.mgt;
+
+import org.apache.shiro.util.CollectionUtils;
+import org.apache.shiro.web.filter.authc.UserFilter;
+import org.apache.shiro.web.filter.authz.PermissionsAuthorizationFilter;
+import org.apache.shiro.web.filter.authz.PortFilter;
+import org.apache.shiro.web.filter.authz.RolesAuthorizationFilter;
+import org.apache.shiro.web.filter.authz.SslFilter;
+import org.junit.Test;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import java.util.*;
+
+import static org.easymock.EasyMock.createNiceMock;
+import static org.junit.Assert.*;
+
+/**
+ * Test case for the {@link SimpleNamedFilterList} implementation.
+ *
+ * @since 1.0
+ */
+public class SimpleNamedFilterListTest {
+
+ @Test
+ public void testNewInstance() {
+ @SuppressWarnings({"MismatchedQueryAndUpdateOfCollection"})
+ SimpleNamedFilterList list = new SimpleNamedFilterList("test");
+ assertNotNull(list.getName());
+ assertEquals("test", list.getName());
+ }
+
+ @Test(expected = IllegalArgumentException.class)
+ public void testNewInstanceNameless() {
+ new SimpleNamedFilterList(null);
+ }
+
+ @Test
+ public void testNewInstanceBackingList() {
+ new SimpleNamedFilterList("test", new ArrayList<Filter>());
+ }
+
+ @Test(expected = NullPointerException.class)
+ public void testNewInstanceNullBackingList() {
+ new SimpleNamedFilterList("test", null);
+ }
+
+ /**
+ * Exists mainly to increase code coverage as the SimpleNamedFilterList
+ * implementation is a direct pass through.
+ */
+ @Test
+ public void testListMethods() {
+ FilterChain mock = createNiceMock(FilterChain.class);
+ Filter filter = createNiceMock(Filter.class);
+
+ NamedFilterList list = new SimpleNamedFilterList("test");
+ list.add(filter);
+ FilterChain chain = list.proxy(mock);
+ assertNotNull(chain);
+ assertNotSame(mock, chain);
+
+ Filter singleFilter = new SslFilter();
+ List<? extends Filter> multipleFilters = CollectionUtils.asList(new PortFilter(), new UserFilter());
+
+ list.add(0, singleFilter);
+ assertEquals(2, list.size());
+ assertTrue(list.get(0) instanceof SslFilter);
+ assertTrue(Arrays.equals(list.toArray(), new Object[]{singleFilter, filter}));
+
+ list.addAll(multipleFilters);
+ assertEquals(4, list.size());
+ assertTrue(list.get(2) instanceof PortFilter);
+ assertTrue(list.get(3) instanceof UserFilter);
+
+ list.addAll(0, CollectionUtils.asList(new PermissionsAuthorizationFilter(), new RolesAuthorizationFilter()));
+ assertEquals(6, list.size());
+ assertTrue(list.get(0) instanceof PermissionsAuthorizationFilter);
+ assertTrue(list.get(1) instanceof RolesAuthorizationFilter);
+ assertEquals(2, list.indexOf(singleFilter));
+ assertEquals(multipleFilters, list.subList(4, list.size()));
+
+ assertTrue(list.contains(singleFilter));
+ assertTrue(list.containsAll(multipleFilters));
+
+ assertFalse(list.isEmpty());
+ list.clear();
+ assertTrue(list.isEmpty());
+
+ list.add(singleFilter);
+ Iterator i = list.iterator();
+ assertTrue(i.hasNext());
+ assertEquals(i.next(), singleFilter);
+
+ ListIterator li = list.listIterator();
+ assertTrue(li.hasNext());
+ assertEquals(li.next(), singleFilter);
+
+ li = list.listIterator(0);
+ assertTrue(li.hasNext());
+ assertEquals(li.next(), singleFilter);
+
+ list.set(0, singleFilter);
+ assertEquals(list.get(0), singleFilter);
+
+ Filter[] filters = new Filter[list.size()];
+ filters = list.toArray(filters);
+ assertEquals(1, filters.length);
+ assertEquals(filters[0], singleFilter);
+
+ assertEquals(0, list.lastIndexOf(singleFilter));
+
+ list.remove(singleFilter);
+ assertTrue(list.isEmpty());
+
+ list.add(singleFilter);
+ list.remove(0);
+ assertTrue(list.isEmpty());
+
+ list.add(singleFilter);
+ list.addAll(multipleFilters);
+ assertEquals(3, list.size());
+ list.removeAll(multipleFilters);
+ assertEquals(1, list.size());
+ assertEquals(list.get(0), singleFilter);
+
+ list.addAll(multipleFilters);
+ assertEquals(3, list.size());
+ list.retainAll(multipleFilters);
+ assertEquals(2, list.size());
+ //noinspection unchecked
+ assertEquals(new ArrayList(list), multipleFilters);
+ }
+
+
+}
Propchange: incubator/shiro/branches/shiro-root-1.0.x/web/src/test/java/org/apache/shiro/web/filter/mgt/SimpleNamedFilterListTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/shiro/branches/shiro-root-1.0.x/web/src/test/java/org/apache/shiro/web/mgt/AbstractWebSecurityManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/shiro/branches/shiro-root-1.0.x/web/src/test/java/org/apache/shiro/web/mgt/AbstractWebSecurityManagerTest.java?rev=948527&r1=948526&r2=948527&view=diff
==============================================================================
--- incubator/shiro/branches/shiro-root-1.0.x/web/src/test/java/org/apache/shiro/web/mgt/AbstractWebSecurityManagerTest.java (original)
+++ incubator/shiro/branches/shiro-root-1.0.x/web/src/test/java/org/apache/shiro/web/mgt/AbstractWebSecurityManagerTest.java Wed May 26 18:34:28 2010
@@ -1,33 +1,33 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.shiro.web.mgt;
-
-import org.apache.shiro.util.ThreadContext;
-import org.junit.After;
-
-/**
- * @since 1.0
- */
-public abstract class AbstractWebSecurityManagerTest {
-
- @After
- public void tearDown() {
- ThreadContext.remove();
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.shiro.web.mgt;
+
+import org.apache.shiro.util.ThreadContext;
+import org.junit.After;
+
+/**
+ * @since 1.0
+ */
+public abstract class AbstractWebSecurityManagerTest {
+
+ @After
+ public void tearDown() {
+ ThreadContext.remove();
+ }
+}
Propchange: incubator/shiro/branches/shiro-root-1.0.x/web/src/test/java/org/apache/shiro/web/mgt/AbstractWebSecurityManagerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/web/src/test/java/org/apache/shiro/web/mgt/CookieRememberMeManagerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/web/src/test/java/org/apache/shiro/web/mgt/DefaultWebSecurityManagerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/web/src/test/java/org/apache/shiro/web/servlet/IniShiroFilterTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/web/src/test/java/org/apache/shiro/web/servlet/SimpleCookieTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/branches/shiro-root-1.0.x/web/src/test/java/org/apache/shiro/web/session/mgt/DefaultWebSessionManagerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/shiro/branches/shiro-root-1.0.x/web/src/test/resources/IniShiroFilterTest.ini
URL: http://svn.apache.org/viewvc/incubator/shiro/branches/shiro-root-1.0.x/web/src/test/resources/IniShiroFilterTest.ini?rev=948527&r1=948526&r2=948527&view=diff
==============================================================================
--- incubator/shiro/branches/shiro-root-1.0.x/web/src/test/resources/IniShiroFilterTest.ini (original)
+++ incubator/shiro/branches/shiro-root-1.0.x/web/src/test/resources/IniShiroFilterTest.ini Wed May 26 18:34:28 2010
@@ -1,21 +1,21 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-[filters]
-authc.successUrl = /index.jsp
-
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+[filters]
+authc.successUrl = /index.jsp
+
Propchange: incubator/shiro/branches/shiro-root-1.0.x/web/src/test/resources/IniShiroFilterTest.ini
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/shiro/branches/shiro-root-1.0.x/web/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/shiro/branches/shiro-root-1.0.x/web/src/test/resources/log4j.properties?rev=948527&r1=948526&r2=948527&view=diff
==============================================================================
--- incubator/shiro/branches/shiro-root-1.0.x/web/src/test/resources/log4j.properties (original)
+++ incubator/shiro/branches/shiro-root-1.0.x/web/src/test/resources/log4j.properties Wed May 26 18:34:28 2010
@@ -1,38 +1,38 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-log4j.rootLogger=TRACE, stdout
-
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
-log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - %m %n
-
-# Pattern to output: date priority [category] - message
-log4j.appender.logfile.layout=org.apache.log4j.PatternLayout
-log4j.appender.logfile.layout.ConversionPattern=%d %p [%c] - %m%n
-
-# Spring logging level is WARN
-log4j.logger.org.springframework=WARN
-
-# General Apache libraries is WARN
-log4j.logger.org.apache=WARN
-
-log4j.logger.net.sf.ehcache=WARN
-
-log4j.logger.org.apache.shiro=TRACE
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+log4j.rootLogger=TRACE, stdout
+
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - %m %n
+
+# Pattern to output: date priority [category] - message
+log4j.appender.logfile.layout=org.apache.log4j.PatternLayout
+log4j.appender.logfile.layout.ConversionPattern=%d %p [%c] - %m%n
+
+# Spring logging level is WARN
+log4j.logger.org.springframework=WARN
+
+# General Apache libraries is WARN
+log4j.logger.org.apache=WARN
+
+log4j.logger.net.sf.ehcache=WARN
+
+log4j.logger.org.apache.shiro=TRACE
log4j.logger.org.apache.shiro.util.ThreadContext=WARN
\ No newline at end of file
Propchange: incubator/shiro/branches/shiro-root-1.0.x/web/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/shiro/trunk/LICENSE.txt
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/LICENSE.txt?rev=948527&r1=948526&r2=948527&view=diff
==============================================================================
--- incubator/shiro/trunk/LICENSE.txt (original)
+++ incubator/shiro/trunk/LICENSE.txt Wed May 26 18:34:28 2010
@@ -1,201 +1,201 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
limitations under the License.
\ No newline at end of file
Propchange: incubator/shiro/trunk/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/shiro/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/NOTICE.txt?rev=948527&r1=948526&r2=948527&view=diff
==============================================================================
--- incubator/shiro/trunk/NOTICE.txt (original)
+++ incubator/shiro/trunk/NOTICE.txt Wed May 26 18:34:28 2010
@@ -1,27 +1,27 @@
-Apache Shiro
-Copyright 2008-2010 The Apache Software Foundation
-
-This product includes software developed at
-The Apache Software Foundation (http://www.apache.org/).
-
-=======================================================================
-== NOTICE accounting for Apache Shiro's use of initial ideas from ==
-== Dr. Heinz Kabutz's SoftHashMap implementation. ==
-=======================================================================
-This product includes an org.apache.shiro.util.SoftHashMap
-implementation based on initial ideas from Dr. Heinz Kabutz's publicly
-posted version found here:
- http://www.javaspecialists.eu/archive/Issue015.html
-with continued modifications. Per Heinz Kabutz: "you have my express
-permission to publish it in Apache Shiro - please leave a link in the
-source code pointing to my website":
-
- http://www.javaspecialists.eu
-
-=======================================================================
-== NOTICE from the Spring Framework's 2.5.6 distribution accounting ==
-== for Shiro's use of certain parts of their source code for ==
-== simplicity/re-use (e.g. StringUtils, et. al.) ==
-=======================================================================
-This product includes software developed by the Spring Framework
-Project (http://www.springframework.org).
+Apache Shiro
+Copyright 2008-2010 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+=======================================================================
+== NOTICE accounting for Apache Shiro's use of initial ideas from ==
+== Dr. Heinz Kabutz's SoftHashMap implementation. ==
+=======================================================================
+This product includes an org.apache.shiro.util.SoftHashMap
+implementation based on initial ideas from Dr. Heinz Kabutz's publicly
+posted version found here:
+ http://www.javaspecialists.eu/archive/Issue015.html
+with continued modifications. Per Heinz Kabutz: "you have my express
+permission to publish it in Apache Shiro - please leave a link in the
+source code pointing to my website":
+
+ http://www.javaspecialists.eu
+
+=======================================================================
+== NOTICE from the Spring Framework's 2.5.6 distribution accounting ==
+== for Shiro's use of certain parts of their source code for ==
+== simplicity/re-use (e.g. StringUtils, et. al.) ==
+=======================================================================
+This product includes software developed by the Spring Framework
+Project (http://www.springframework.org).
Propchange: incubator/shiro/trunk/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/shiro/trunk/README.txt
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/README.txt?rev=948527&r1=948526&r2=948527&view=diff
==============================================================================
--- incubator/shiro/trunk/README.txt (original)
+++ incubator/shiro/trunk/README.txt Wed May 26 18:34:28 2010
@@ -1,18 +1,18 @@
-This distribution includes cryptographic software. The country in
-which you currently reside may have restrictions on the import,
-possession, use, and/or re-export to another country, of
-encryption software. BEFORE using any encryption software, please
-check your country's laws, regulations and policies concerning the
-import, possession, or use, and re-export of encryption software, to
-see if this is permitted. See http://www.wassenaar.org for more
-information.
-
-The U.S. Government Department of Commerce, Bureau of Industry and
-Security (BIS), has classified this software as Export Commodity
-Control Number (ECCN) 5D002.C.1, which includes information security
-software using or performing cryptographic functions with asymmetric
-algorithms. The form and manner of this Apache Software Foundation
-distribution makes it eligible for export under the License Exception
-ENC Technology Software Unrestricted (TSU) exception (see the BIS
-Export Administration Regulations, Section 740.13) for both object
-code and source code.
+This distribution includes cryptographic software. The country in
+which you currently reside may have restrictions on the import,
+possession, use, and/or re-export to another country, of
+encryption software. BEFORE using any encryption software, please
+check your country's laws, regulations and policies concerning the
+import, possession, or use, and re-export of encryption software, to
+see if this is permitted. See http://www.wassenaar.org for more
+information.
+
+The U.S. Government Department of Commerce, Bureau of Industry and
+Security (BIS), has classified this software as Export Commodity
+Control Number (ECCN) 5D002.C.1, which includes information security
+software using or performing cryptographic functions with asymmetric
+algorithms. The form and manner of this Apache Software Foundation
+distribution makes it eligible for export under the License Exception
+ENC Technology Software Unrestricted (TSU) exception (see the BIS
+Export Administration Regulations, Section 740.13) for both object
+code and source code.
Propchange: incubator/shiro/trunk/README.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/shiro/trunk/all/pom.xml
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/all/pom.xml?rev=948527&r1=948526&r2=948527&view=diff
==============================================================================
--- incubator/shiro/trunk/all/pom.xml (original)
+++ incubator/shiro/trunk/all/pom.xml Wed May 26 18:34:28 2010
@@ -1,120 +1,120 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one
- ~ or more contributor license agreements. See the NOTICE file
- ~ distributed with this work for additional information
- ~ regarding copyright ownership. The ASF licenses this file
- ~ to you under the Apache License, Version 2.0 (the
- ~ "License"); you may not use this file except in compliance
- ~ with the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing,
- ~ software distributed under the License is distributed on an
- ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- ~ KIND, either express or implied. See the License for the
- ~ specific language governing permissions and limitations
- ~ under the License.
- -->
-<!--suppress osmorcNonOsgiMavenDependency -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <parent>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-root</artifactId>
- <version>1.1.0-incubating-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>shiro-all</artifactId>
- <name>Apache Shiro :: Jar Bundle</name>
- <description>Creates a bundled Shiro .jar from the module jars</description>
- <packaging>jar</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-web</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-ehcache</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-quartz</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-spring</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <version>1.3.1</version>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- <configuration>
- <artifactSet>
- <includes>
- <include>${project.groupId}:shiro-core</include>
- <include>${project.groupId}:shiro-web</include>
- <include>${project.groupId}:shiro-ehcache</include>
- <include>${project.groupId}:shiro-quartz</include>
- <include>${project.groupId}:shiro-spring</include>
- </includes>
- </artifactSet>
- <!-- <transformers>
- <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
- <projectName>Apache ActiveMQ</projectName>
- </transformer>
- </transformers> -->
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <!-- <plugin>
- <groupId>org.apache.geronimo.genesis.plugins</groupId>
- <artifactId>tools-maven-plugin</artifactId>
-
- <executions>
- <execution>
- <id>verify-legal-files</id>
- <phase>verify</phase>
- <goals>
- <goal>verify-legal-files</goal>
- </goals>
- <configuration>
- <strict>false</strict>
- </configuration>
- </execution>
- </executions>
- </plugin> -->
-
- </plugins>
- </build>
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </reporting>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<!--suppress osmorcNonOsgiMavenDependency -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-root</artifactId>
+ <version>1.1.0-incubating-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>shiro-all</artifactId>
+ <name>Apache Shiro :: Jar Bundle</name>
+ <description>Creates a bundled Shiro .jar from the module jars</description>
+ <packaging>jar</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-web</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-ehcache</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-quartz</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-spring</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>1.3.1</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>${project.groupId}:shiro-core</include>
+ <include>${project.groupId}:shiro-web</include>
+ <include>${project.groupId}:shiro-ehcache</include>
+ <include>${project.groupId}:shiro-quartz</include>
+ <include>${project.groupId}:shiro-spring</include>
+ </includes>
+ </artifactSet>
+ <!-- <transformers>
+ <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer">
+ <projectName>Apache ActiveMQ</projectName>
+ </transformer>
+ </transformers> -->
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+ <!-- <plugin>
+ <groupId>org.apache.geronimo.genesis.plugins</groupId>
+ <artifactId>tools-maven-plugin</artifactId>
+
+ <executions>
+ <execution>
+ <id>verify-legal-files</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>verify-legal-files</goal>
+ </goals>
+ <configuration>
+ <strict>false</strict>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin> -->
+
+ </plugins>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
\ No newline at end of file
Propchange: incubator/shiro/trunk/all/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/SecurityUtils.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/UnavailableSecurityManagerException.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/core/src/main/java/org/apache/shiro/UnavailableSecurityManagerException.java?rev=948527&r1=948526&r2=948527&view=diff
==============================================================================
--- incubator/shiro/trunk/core/src/main/java/org/apache/shiro/UnavailableSecurityManagerException.java (original)
+++ incubator/shiro/trunk/core/src/main/java/org/apache/shiro/UnavailableSecurityManagerException.java Wed May 26 18:34:28 2010
@@ -1,36 +1,36 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.shiro;
-
-/**
- * Exception thrown when attempting to acquire the application's {@code SecurityManager} instance, but Shiro's
- * lookup heuristics cannot find one. This typically indicates an invalid application configuration.
- *
- * @since 1.0
- */
-public class UnavailableSecurityManagerException extends ShiroException {
-
- public UnavailableSecurityManagerException(String message) {
- super(message);
- }
-
- public UnavailableSecurityManagerException(String message, Throwable cause) {
- super(message, cause);
- }
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.shiro;
+
+/**
+ * Exception thrown when attempting to acquire the application's {@code SecurityManager} instance, but Shiro's
+ * lookup heuristics cannot find one. This typically indicates an invalid application configuration.
+ *
+ * @since 1.0
+ */
+public class UnavailableSecurityManagerException extends ShiroException {
+
+ public UnavailableSecurityManagerException(String message) {
+ super(message);
+ }
+
+ public UnavailableSecurityManagerException(String message, Throwable cause) {
+ super(message, cause);
+ }
+}
Propchange: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/UnavailableSecurityManagerException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/aop/AnnotationHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/aop/AnnotationMethodInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/aop/MethodInterceptor.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/aop/MethodInterceptorSupport.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/aop/MethodInvocation.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/aop/package-info.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/core/src/main/java/org/apache/shiro/aop/package-info.java?rev=948527&r1=948526&r2=948527&view=diff
==============================================================================
--- incubator/shiro/trunk/core/src/main/java/org/apache/shiro/aop/package-info.java (original)
+++ incubator/shiro/trunk/core/src/main/java/org/apache/shiro/aop/package-info.java Wed May 26 18:34:28 2010
@@ -1,26 +1,26 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/**
- * Components used to support the framework's AOP/interception support classes.
- * <p/>
- * As this package is a root-level package under <tt>org.apache.shiro</tt>, it contains AOP support classes
- * useful for any AOP environment and/or function. Feature-dependent AOP classes (e.g. authorization,
- * authentication, etc) will use these classes as their base in their respective packages.
- */
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+/**
+ * Components used to support the framework's AOP/interception support classes.
+ * <p/>
+ * As this package is a root-level package under <tt>org.apache.shiro</tt>, it contains AOP support classes
+ * useful for any AOP environment and/or function. Feature-dependent AOP classes (e.g. authorization,
+ * authentication, etc) will use these classes as their base in their respective packages.
+ */
package org.apache.shiro.aop;
\ No newline at end of file
Propchange: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/aop/package-info.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AuthenticationInfo.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AuthenticationListener.java
URL: http://svn.apache.org/viewvc/incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AuthenticationListener.java?rev=948527&r1=948526&r2=948527&view=diff
==============================================================================
--- incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AuthenticationListener.java (original)
+++ incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AuthenticationListener.java Wed May 26 18:34:28 2010
@@ -1,56 +1,56 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.shiro.authc;
-
-import org.apache.shiro.subject.PrincipalCollection;
-
-/**
- * An {@code AuthenticationListener} listens for notifications while {@code Subject}s authenticate with the system.
- *
- * @author Les Hazlewood
- * @since 0.9
- */
-public interface AuthenticationListener {
-
- /**
- * Callback triggered when an authentication attempt for a {@code Subject} has succeeded.
- *
- * @param token the authentication token submitted during the {@code Subject} (user)'s authentication attempt.
- * @param info the authentication-related account data acquired after authentication for the corresponding {@code Subject}.
- */
- void onSuccess(AuthenticationToken token, AuthenticationInfo info);
-
- /**
- * Callback triggered when an authentication attempt for a {@code Subject} has failed.
- *
- * @param token the authentication token submitted during the {@code Subject} (user)'s authentication attempt.
- * @param ae the {@code AuthenticationException} that occurred as a result of the attempt.
- */
- void onFailure(AuthenticationToken token, AuthenticationException ae);
-
- /**
- * Callback triggered when a {@code Subject} logs-out of the system.
- * <p/>
- * This method will only be triggered when a Subject explicitly logs-out of the session. It will not
- * be triggered if their Session times out.
- *
- * @param principals the identifying principals of the Subject logging out.
- */
- void onLogout(PrincipalCollection principals);
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.shiro.authc;
+
+import org.apache.shiro.subject.PrincipalCollection;
+
+/**
+ * An {@code AuthenticationListener} listens for notifications while {@code Subject}s authenticate with the system.
+ *
+ * @author Les Hazlewood
+ * @since 0.9
+ */
+public interface AuthenticationListener {
+
+ /**
+ * Callback triggered when an authentication attempt for a {@code Subject} has succeeded.
+ *
+ * @param token the authentication token submitted during the {@code Subject} (user)'s authentication attempt.
+ * @param info the authentication-related account data acquired after authentication for the corresponding {@code Subject}.
+ */
+ void onSuccess(AuthenticationToken token, AuthenticationInfo info);
+
+ /**
+ * Callback triggered when an authentication attempt for a {@code Subject} has failed.
+ *
+ * @param token the authentication token submitted during the {@code Subject} (user)'s authentication attempt.
+ * @param ae the {@code AuthenticationException} that occurred as a result of the attempt.
+ */
+ void onFailure(AuthenticationToken token, AuthenticationException ae);
+
+ /**
+ * Callback triggered when a {@code Subject} logs-out of the system.
+ * <p/>
+ * This method will only be triggered when a Subject explicitly logs-out of the session. It will not
+ * be triggered if their Session times out.
+ *
+ * @param principals the identifying principals of the Subject logging out.
+ */
+ void onLogout(PrincipalCollection principals);
+}
Propchange: incubator/shiro/trunk/core/src/main/java/org/apache/shiro/authc/AuthenticationListener.java
------------------------------------------------------------------------------
svn:eol-style = native