You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shiro.apache.org by ka...@apache.org on 2012/01/19 01:03:55 UTC
svn commit: r1233136 - in /shiro/trunk: pom.xml
samples/spring/src/main/java/org/apache/shiro/samples/spring/realm/SaltAwareJdbcRealm.java
samples/web/src/main/webapp/WEB-INF/shiro.ini
Author: kaosko
Date: Thu Jan 19 00:03:55 2012
New Revision: 1233136
URL: http://svn.apache.org/viewvc?rev=1233136&view=rev
Log:
Fix license errors reported by apache-rat
Modified:
shiro/trunk/pom.xml
shiro/trunk/samples/spring/src/main/java/org/apache/shiro/samples/spring/realm/SaltAwareJdbcRealm.java
shiro/trunk/samples/web/src/main/webapp/WEB-INF/shiro.ini
Modified: shiro/trunk/pom.xml
URL: http://svn.apache.org/viewvc/shiro/trunk/pom.xml?rev=1233136&r1=1233135&r2=1233136&view=diff
==============================================================================
--- shiro/trunk/pom.xml (original)
+++ shiro/trunk/pom.xml Thu Jan 19 00:03:55 2012
@@ -219,6 +219,7 @@
<!-- note that this configuration needs to be maintain both in pluginManagement and reporting sections -->
<excludes>
<exclude>**/.externalToolBuilders/*</exclude>
+ <exclude>**/infinitest.filters</exclude>
<!-- Apparently some test in samples/spring-client generates velocity log - would better to reconfigure to output to target/ -->
<exclude>velocity.log</exclude>
</excludes>
@@ -910,6 +911,7 @@
<!-- note that this configuration needs to be maintain both in pluginManagement and reporting sections -->
<excludes>
<exclude>**/.externalToolBuilders/*</exclude>
+ <exclude>**/infinitest.filters</exclude>
<!-- Apparently some test in samples/spring-client generates velocity log - would better to reconfigure to output to target/ -->
<exclude>velocity.log</exclude>
</excludes>
Modified: shiro/trunk/samples/spring/src/main/java/org/apache/shiro/samples/spring/realm/SaltAwareJdbcRealm.java
URL: http://svn.apache.org/viewvc/shiro/trunk/samples/spring/src/main/java/org/apache/shiro/samples/spring/realm/SaltAwareJdbcRealm.java?rev=1233136&r1=1233135&r2=1233136&view=diff
==============================================================================
--- shiro/trunk/samples/spring/src/main/java/org/apache/shiro/samples/spring/realm/SaltAwareJdbcRealm.java (original)
+++ shiro/trunk/samples/spring/src/main/java/org/apache/shiro/samples/spring/realm/SaltAwareJdbcRealm.java Thu Jan 19 00:03:55 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.samples.spring.realm;
import org.apache.shiro.authc.*;
Modified: shiro/trunk/samples/web/src/main/webapp/WEB-INF/shiro.ini
URL: http://svn.apache.org/viewvc/shiro/trunk/samples/web/src/main/webapp/WEB-INF/shiro.ini?rev=1233136&r1=1233135&r2=1233136&view=diff
==============================================================================
--- shiro/trunk/samples/web/src/main/webapp/WEB-INF/shiro.ini (original)
+++ shiro/trunk/samples/web/src/main/webapp/WEB-INF/shiro.ini Thu Jan 19 00:03:55 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.
+
# INI configuration is very powerful and flexible, while still remaining succinct.
# Please http://shiro.apache.org/configuration.html and
# http://shiro.apache.org/web.html for more.