You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by lh...@apache.org on 2012/01/19 00:15:03 UTC
svn commit: r1233109 - in /shiro/trunk: ./
core/src/main/java/org/apache/shiro/env/
core/src/test/java/org/apache/shiro/test/ core/src/test/resources/
web/src/main/java/org/apache/shiro/web/filter/authc/
web/src/test/groovy/org/apache/shiro/web/filter/...
Author: lhazlewood
Date: Wed Jan 18 23:15:02 2012
New Revision: 1233109
URL: http://svn.apache.org/viewvc?rev=1233109&view=rev
Log:
SHIRO-339: preparing for 1.2 release. Added license headers per RAT plugin.
Modified:
shiro/trunk/core/src/main/java/org/apache/shiro/env/EnvironmentException.java
shiro/trunk/core/src/main/java/org/apache/shiro/env/NamedObjectEnvironment.java
shiro/trunk/core/src/main/java/org/apache/shiro/env/RequiredTypeException.java
shiro/trunk/core/src/test/java/org/apache/shiro/test/AbstractShiroTest.java
shiro/trunk/core/src/test/java/org/apache/shiro/test/ExampleShiroIntegrationTest.java
shiro/trunk/core/src/test/java/org/apache/shiro/test/ExampleShiroUnitTest.java
shiro/trunk/core/src/test/resources/log4j.properties
shiro/trunk/core/src/test/resources/test.shiro.ini
shiro/trunk/pom.xml
shiro/trunk/web/src/main/java/org/apache/shiro/web/filter/authc/LogoutFilter.java
shiro/trunk/web/src/test/groovy/org/apache/shiro/web/filter/session/NoSessionCreationFilterTest.groovy
shiro/trunk/web/src/test/groovy/org/apache/shiro/web/servlet/IniShiroFilterTest.groovy
shiro/trunk/web/src/test/java/org/apache/shiro/web/filter/PathMatchingFilterTest.java
shiro/trunk/web/src/test/java/org/apache/shiro/web/servlet/OncePerRequestFilterTest.java
Modified: shiro/trunk/core/src/main/java/org/apache/shiro/env/EnvironmentException.java
URL: http://svn.apache.org/viewvc/shiro/trunk/core/src/main/java/org/apache/shiro/env/EnvironmentException.java?rev=1233109&r1=1233108&r2=1233109&view=diff
==============================================================================
--- shiro/trunk/core/src/main/java/org/apache/shiro/env/EnvironmentException.java (original)
+++ shiro/trunk/core/src/main/java/org/apache/shiro/env/EnvironmentException.java Wed Jan 18 23:15:02 2012
@@ -1,3 +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.
+ */
package org.apache.shiro.env;
import org.apache.shiro.ShiroException;
Modified: shiro/trunk/core/src/main/java/org/apache/shiro/env/NamedObjectEnvironment.java
URL: http://svn.apache.org/viewvc/shiro/trunk/core/src/main/java/org/apache/shiro/env/NamedObjectEnvironment.java?rev=1233109&r1=1233108&r2=1233109&view=diff
==============================================================================
--- shiro/trunk/core/src/main/java/org/apache/shiro/env/NamedObjectEnvironment.java (original)
+++ shiro/trunk/core/src/main/java/org/apache/shiro/env/NamedObjectEnvironment.java Wed Jan 18 23:15:02 2012
@@ -1,3 +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.
+ */
package org.apache.shiro.env;
/**
Modified: shiro/trunk/core/src/main/java/org/apache/shiro/env/RequiredTypeException.java
URL: http://svn.apache.org/viewvc/shiro/trunk/core/src/main/java/org/apache/shiro/env/RequiredTypeException.java?rev=1233109&r1=1233108&r2=1233109&view=diff
==============================================================================
--- shiro/trunk/core/src/main/java/org/apache/shiro/env/RequiredTypeException.java (original)
+++ shiro/trunk/core/src/main/java/org/apache/shiro/env/RequiredTypeException.java Wed Jan 18 23:15:02 2012
@@ -1,3 +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.
+ */
package org.apache.shiro.env;
/**
Modified: shiro/trunk/core/src/test/java/org/apache/shiro/test/AbstractShiroTest.java
URL: http://svn.apache.org/viewvc/shiro/trunk/core/src/test/java/org/apache/shiro/test/AbstractShiroTest.java?rev=1233109&r1=1233108&r2=1233109&view=diff
==============================================================================
--- shiro/trunk/core/src/test/java/org/apache/shiro/test/AbstractShiroTest.java (original)
+++ shiro/trunk/core/src/test/java/org/apache/shiro/test/AbstractShiroTest.java Wed Jan 18 23:15:02 2012
@@ -1,3 +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.
+ */
package org.apache.shiro.test;
import org.apache.shiro.SecurityUtils;
Modified: shiro/trunk/core/src/test/java/org/apache/shiro/test/ExampleShiroIntegrationTest.java
URL: http://svn.apache.org/viewvc/shiro/trunk/core/src/test/java/org/apache/shiro/test/ExampleShiroIntegrationTest.java?rev=1233109&r1=1233108&r2=1233109&view=diff
==============================================================================
--- shiro/trunk/core/src/test/java/org/apache/shiro/test/ExampleShiroIntegrationTest.java (original)
+++ shiro/trunk/core/src/test/java/org/apache/shiro/test/ExampleShiroIntegrationTest.java Wed Jan 18 23:15:02 2012
@@ -1,3 +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.
+ */
package org.apache.shiro.test;
import org.apache.shiro.config.IniSecurityManagerFactory;
Modified: shiro/trunk/core/src/test/java/org/apache/shiro/test/ExampleShiroUnitTest.java
URL: http://svn.apache.org/viewvc/shiro/trunk/core/src/test/java/org/apache/shiro/test/ExampleShiroUnitTest.java?rev=1233109&r1=1233108&r2=1233109&view=diff
==============================================================================
--- shiro/trunk/core/src/test/java/org/apache/shiro/test/ExampleShiroUnitTest.java (original)
+++ shiro/trunk/core/src/test/java/org/apache/shiro/test/ExampleShiroUnitTest.java Wed Jan 18 23:15:02 2012
@@ -1,3 +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.
+ */
package org.apache.shiro.test;
import org.apache.shiro.subject.Subject;
Modified: shiro/trunk/core/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/shiro/trunk/core/src/test/resources/log4j.properties?rev=1233109&r1=1233108&r2=1233109&view=diff
==============================================================================
--- shiro/trunk/core/src/test/resources/log4j.properties (original)
+++ shiro/trunk/core/src/test/resources/log4j.properties Wed Jan 18 23:15:02 2012
@@ -16,6 +16,7 @@
# specific language governing permissions and limitations
# under the License.
#
+
log4j.rootLogger=TRACE, stdout
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
Modified: shiro/trunk/core/src/test/resources/test.shiro.ini
URL: http://svn.apache.org/viewvc/shiro/trunk/core/src/test/resources/test.shiro.ini?rev=1233109&r1=1233108&r2=1233109&view=diff
==============================================================================
--- shiro/trunk/core/src/test/resources/test.shiro.ini (original)
+++ shiro/trunk/core/src/test/resources/test.shiro.ini Wed Jan 18 23:15:02 2012
@@ -1,2 +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.
+#
+
[users]
jsmith = jsmith,role1
\ No newline at end of file
Modified: shiro/trunk/pom.xml
URL: http://svn.apache.org/viewvc/shiro/trunk/pom.xml?rev=1233109&r1=1233108&r2=1233109&view=diff
==============================================================================
--- shiro/trunk/pom.xml (original)
+++ shiro/trunk/pom.xml Wed Jan 18 23:15:02 2012
@@ -214,11 +214,10 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.7</version>
+ <version>0.8</version>
<configuration>
<!-- note that this configuration needs to be maintain both in pluginManagement and reporting sections -->
<excludes>
- <exclude>README-runtime-requirements.txt</exclude>
<exclude>**/.externalToolBuilders/*</exclude>
<!-- Apparently some test in samples/spring-client generates velocity log - would better to reconfigure to output to target/ -->
<exclude>velocity.log</exclude>
@@ -906,11 +905,10 @@
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
- <version>0.7</version>
+ <version>0.8</version>
<configuration>
<!-- note that this configuration needs to be maintain both in pluginManagement and reporting sections -->
<excludes>
- <exclude>README-runtime-requirements.txt</exclude>
<exclude>**/.externalToolBuilders/*</exclude>
<!-- Apparently some test in samples/spring-client generates velocity log - would better to reconfigure to output to target/ -->
<exclude>velocity.log</exclude>
Modified: shiro/trunk/web/src/main/java/org/apache/shiro/web/filter/authc/LogoutFilter.java
URL: http://svn.apache.org/viewvc/shiro/trunk/web/src/main/java/org/apache/shiro/web/filter/authc/LogoutFilter.java?rev=1233109&r1=1233108&r2=1233109&view=diff
==============================================================================
--- shiro/trunk/web/src/main/java/org/apache/shiro/web/filter/authc/LogoutFilter.java (original)
+++ shiro/trunk/web/src/main/java/org/apache/shiro/web/filter/authc/LogoutFilter.java Wed Jan 18 23:15:02 2012
@@ -1,3 +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.
+ */
package org.apache.shiro.web.filter.authc;
import org.apache.shiro.SecurityUtils;
Modified: shiro/trunk/web/src/test/groovy/org/apache/shiro/web/filter/session/NoSessionCreationFilterTest.groovy
URL: http://svn.apache.org/viewvc/shiro/trunk/web/src/test/groovy/org/apache/shiro/web/filter/session/NoSessionCreationFilterTest.groovy?rev=1233109&r1=1233108&r2=1233109&view=diff
==============================================================================
--- shiro/trunk/web/src/test/groovy/org/apache/shiro/web/filter/session/NoSessionCreationFilterTest.groovy (original)
+++ shiro/trunk/web/src/test/groovy/org/apache/shiro/web/filter/session/NoSessionCreationFilterTest.groovy Wed Jan 18 23:15:02 2012
@@ -1,3 +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.
+ */
package org.apache.shiro.web.filter.session
import javax.servlet.ServletRequest
Modified: shiro/trunk/web/src/test/groovy/org/apache/shiro/web/servlet/IniShiroFilterTest.groovy
URL: http://svn.apache.org/viewvc/shiro/trunk/web/src/test/groovy/org/apache/shiro/web/servlet/IniShiroFilterTest.groovy?rev=1233109&r1=1233108&r2=1233109&view=diff
==============================================================================
--- shiro/trunk/web/src/test/groovy/org/apache/shiro/web/servlet/IniShiroFilterTest.groovy (original)
+++ shiro/trunk/web/src/test/groovy/org/apache/shiro/web/servlet/IniShiroFilterTest.groovy Wed Jan 18 23:15:02 2012
@@ -1,3 +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.
+ */
package org.apache.shiro.web.servlet
import javax.servlet.FilterConfig
Modified: shiro/trunk/web/src/test/java/org/apache/shiro/web/filter/PathMatchingFilterTest.java
URL: http://svn.apache.org/viewvc/shiro/trunk/web/src/test/java/org/apache/shiro/web/filter/PathMatchingFilterTest.java?rev=1233109&r1=1233108&r2=1233109&view=diff
==============================================================================
--- shiro/trunk/web/src/test/java/org/apache/shiro/web/filter/PathMatchingFilterTest.java (original)
+++ shiro/trunk/web/src/test/java/org/apache/shiro/web/filter/PathMatchingFilterTest.java Wed Jan 18 23:15:02 2012
@@ -1,16 +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.filter;
-import org.apache.shiro.web.servlet.OncePerRequestFilter;
import org.junit.Before;
import org.junit.Test;
-import javax.servlet.FilterChain;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
import javax.servlet.http.HttpServletRequest;
import static org.easymock.EasyMock.*;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
/**
* Unit tests for the {@link PathMatchingFilter} implementation.
Modified: shiro/trunk/web/src/test/java/org/apache/shiro/web/servlet/OncePerRequestFilterTest.java
URL: http://svn.apache.org/viewvc/shiro/trunk/web/src/test/java/org/apache/shiro/web/servlet/OncePerRequestFilterTest.java?rev=1233109&r1=1233108&r2=1233109&view=diff
==============================================================================
--- shiro/trunk/web/src/test/java/org/apache/shiro/web/servlet/OncePerRequestFilterTest.java (original)
+++ shiro/trunk/web/src/test/java/org/apache/shiro/web/servlet/OncePerRequestFilterTest.java Wed Jan 18 23:15:02 2012
@@ -1,3 +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.
+ */
package org.apache.shiro.web.servlet;
import org.junit.Before;
@@ -10,7 +28,8 @@ import javax.servlet.ServletResponse;
import java.io.IOException;
import static org.easymock.EasyMock.*;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
/**
* Unit tests for the {@link OncePerRequestFilter} implementation.