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 2011/09/19 22:15:34 UTC
svn commit: r1172792 - in /shiro/trunk: NOTICE
core/src/main/java/org/apache/shiro/jndi/JndiObjectFactory.java
core/src/test/groovy/org/apache/shiro/codec/
core/src/test/java/org/apache/shiro/config/SimpleBeanFactory.java
Author: lhazlewood
Date: Mon Sep 19 20:15:34 2011
New Revision: 1172792
URL: http://svn.apache.org/viewvc?rev=1172792&view=rev
Log:
SHIRO-217: Added ASF 2.0 license header
Added:
shiro/trunk/core/src/test/groovy/org/apache/shiro/codec/
Modified:
shiro/trunk/NOTICE
shiro/trunk/core/src/main/java/org/apache/shiro/jndi/JndiObjectFactory.java
shiro/trunk/core/src/test/java/org/apache/shiro/config/SimpleBeanFactory.java
Modified: shiro/trunk/NOTICE
URL: http://svn.apache.org/viewvc/shiro/trunk/NOTICE?rev=1172792&r1=1172791&r2=1172792&view=diff
==============================================================================
--- shiro/trunk/NOTICE (original)
+++ shiro/trunk/NOTICE Mon Sep 19 20:15:34 2011
@@ -12,17 +12,4 @@ with continued modifications.
Certain parts (StringUtils etc.) of the source code for this
product was copied for simplicity and to reduce dependencies
from the source code developed by the Spring Framework Project
-(http://www.springframework.org).
-
-Shiro's BCrypt Hashing support is a modification of Damien Miller's
-jBCrypt project at http://www.mindrot.org/projects/jBCrypt/, a
-port of OpenBSD's BCrypt algorithm to Java. Per his BSD-style
-license, the following remains in-tact:
-// Copyright (c) 2006 Damien Miller <dj...@mindrot.org>
-//
-// Permission to use, copy, modify, and distribute this software for
-// any purpose with or without fee is hereby granted, provided that
-// the above copyright notice and this permission notice appear in
-// all copies.
-Note that this attribution statement applies to Shiro's BCrypt hash
-class only, not Shiro in general.
+(http://www.springframework.org).
\ No newline at end of file
Modified: shiro/trunk/core/src/main/java/org/apache/shiro/jndi/JndiObjectFactory.java
URL: http://svn.apache.org/viewvc/shiro/trunk/core/src/main/java/org/apache/shiro/jndi/JndiObjectFactory.java?rev=1172792&r1=1172791&r2=1172792&view=diff
==============================================================================
--- shiro/trunk/core/src/main/java/org/apache/shiro/jndi/JndiObjectFactory.java (original)
+++ shiro/trunk/core/src/main/java/org/apache/shiro/jndi/JndiObjectFactory.java Mon Sep 19 20:15:34 2011
@@ -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.jndi;
import org.apache.shiro.util.Factory;
Modified: shiro/trunk/core/src/test/java/org/apache/shiro/config/SimpleBeanFactory.java
URL: http://svn.apache.org/viewvc/shiro/trunk/core/src/test/java/org/apache/shiro/config/SimpleBeanFactory.java?rev=1172792&r1=1172791&r2=1172792&view=diff
==============================================================================
--- shiro/trunk/core/src/test/java/org/apache/shiro/config/SimpleBeanFactory.java (original)
+++ shiro/trunk/core/src/test/java/org/apache/shiro/config/SimpleBeanFactory.java Mon Sep 19 20:15:34 2011
@@ -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.config;
import org.apache.shiro.util.Factory;
Re: svn commit: r1172792 - in /shiro/trunk: NOTICE core/src/main/java/org/apache/shiro/jndi/JndiObjectFactory.java
core/src/test/groovy/org/apache/shiro/codec/ core/src/test/java/org/apache/shiro/config/SimpleBeanFactory.java
Posted by Jared Bunting <ja...@peachjean.com>.
Thanks for adding that Les. I'll go add that to my templates now.
On 09/19/2011 03:15 PM, lhazlewood@apache.org wrote:
> Author: lhazlewood
> Date: Mon Sep 19 20:15:34 2011
> New Revision: 1172792
>
> URL: http://svn.apache.org/viewvc?rev=1172792&view=rev
> Log:
> SHIRO-217: Added ASF 2.0 license header
>
> Added:
> shiro/trunk/core/src/test/groovy/org/apache/shiro/codec/
> Modified:
> shiro/trunk/NOTICE
> shiro/trunk/core/src/main/java/org/apache/shiro/jndi/JndiObjectFactory.java
> shiro/trunk/core/src/test/java/org/apache/shiro/config/SimpleBeanFactory.java
>
> Modified: shiro/trunk/NOTICE
> URL: http://svn.apache.org/viewvc/shiro/trunk/NOTICE?rev=1172792&r1=1172791&r2=1172792&view=diff
> ==============================================================================
> --- shiro/trunk/NOTICE (original)
> +++ shiro/trunk/NOTICE Mon Sep 19 20:15:34 2011
> @@ -12,17 +12,4 @@ with continued modifications.
> Certain parts (StringUtils etc.) of the source code for this
> product was copied for simplicity and to reduce dependencies
> from the source code developed by the Spring Framework Project
> -(http://www.springframework.org).
> -
> -Shiro's BCrypt Hashing support is a modification of Damien Miller's
> -jBCrypt project at http://www.mindrot.org/projects/jBCrypt/, a
> -port of OpenBSD's BCrypt algorithm to Java. Per his BSD-style
> -license, the following remains in-tact:
> -// Copyright (c) 2006 Damien Miller <dj...@mindrot.org>
> -//
> -// Permission to use, copy, modify, and distribute this software for
> -// any purpose with or without fee is hereby granted, provided that
> -// the above copyright notice and this permission notice appear in
> -// all copies.
> -Note that this attribution statement applies to Shiro's BCrypt hash
> -class only, not Shiro in general.
> +(http://www.springframework.org).
> \ No newline at end of file
>
> Modified: shiro/trunk/core/src/main/java/org/apache/shiro/jndi/JndiObjectFactory.java
> URL: http://svn.apache.org/viewvc/shiro/trunk/core/src/main/java/org/apache/shiro/jndi/JndiObjectFactory.java?rev=1172792&r1=1172791&r2=1172792&view=diff
> ==============================================================================
> --- shiro/trunk/core/src/main/java/org/apache/shiro/jndi/JndiObjectFactory.java (original)
> +++ shiro/trunk/core/src/main/java/org/apache/shiro/jndi/JndiObjectFactory.java Mon Sep 19 20:15:34 2011
> @@ -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.jndi;
>
> import org.apache.shiro.util.Factory;
>
> Modified: shiro/trunk/core/src/test/java/org/apache/shiro/config/SimpleBeanFactory.java
> URL: http://svn.apache.org/viewvc/shiro/trunk/core/src/test/java/org/apache/shiro/config/SimpleBeanFactory.java?rev=1172792&r1=1172791&r2=1172792&view=diff
> ==============================================================================
> --- shiro/trunk/core/src/test/java/org/apache/shiro/config/SimpleBeanFactory.java (original)
> +++ shiro/trunk/core/src/test/java/org/apache/shiro/config/SimpleBeanFactory.java Mon Sep 19 20:15:34 2011
> @@ -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.config;
>
> import org.apache.shiro.util.Factory;
>
>