Return-Path: Delivered-To: apmail-incubator-jspwiki-commits-archive@locus.apache.org Received: (qmail 62459 invoked from network); 1 Apr 2008 22:09:09 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 1 Apr 2008 22:09:09 -0000 Received: (qmail 58934 invoked by uid 500); 1 Apr 2008 22:09:08 -0000 Delivered-To: apmail-incubator-jspwiki-commits-archive@incubator.apache.org Received: (qmail 58921 invoked by uid 500); 1 Apr 2008 22:09:08 -0000 Mailing-List: contact jspwiki-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: jspwiki-dev@incubator.apache.org Delivered-To: mailing list jspwiki-commits@incubator.apache.org Received: (qmail 58912 invoked by uid 99); 1 Apr 2008 22:09:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Apr 2008 15:09:08 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Apr 2008 22:08:35 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9D1231A983A; Tue, 1 Apr 2008 15:08:47 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r643618 - in /incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions: AllPermission.java AllPermissionCollection.java GroupPermission.java PagePermission.java PermissionFactory.java WikiPermission.java Date: Tue, 01 Apr 2008 22:08:42 -0000 To: jspwiki-commits@incubator.apache.org From: jalkanen@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080401220847.9D1231A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jalkanen Date: Tue Apr 1 15:08:41 2008 New Revision: 643618 URL: http://svn.apache.org/viewvc?rev=643618&view=rev Log: Changed preamble to ASF copyright. Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions/AllPermission.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions/AllPermissionCollection.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions/GroupPermission.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions/PagePermission.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions/PermissionFactory.java incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions/WikiPermission.java Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions/AllPermission.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions/AllPermission.java?rev=643618&r1=643617&r2=643618&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions/AllPermission.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions/AllPermission.java Tue Apr 1 15:08:41 2008 @@ -1,21 +1,22 @@ -/* +/* JSPWiki - a JSP-based WikiWiki clone. - Copyright (C) 2001-2007 Janne Jalkanen (Janne.Jalkanen@iki.fi) + 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 - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. + http://www.apache.org/licenses/LICENSE-2.0 - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 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 com.ecyrd.jspwiki.auth.permissions; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions/AllPermissionCollection.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions/AllPermissionCollection.java?rev=643618&r1=643617&r2=643618&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions/AllPermissionCollection.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions/AllPermissionCollection.java Tue Apr 1 15:08:41 2008 @@ -1,21 +1,22 @@ -/* +/* JSPWiki - a JSP-based WikiWiki clone. - Copyright (C) 2001-2007 Janne Jalkanen (Janne.Jalkanen@iki.fi) + 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 - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. + http://www.apache.org/licenses/LICENSE-2.0 - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 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 com.ecyrd.jspwiki.auth.permissions; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions/GroupPermission.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions/GroupPermission.java?rev=643618&r1=643617&r2=643618&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions/GroupPermission.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions/GroupPermission.java Tue Apr 1 15:08:41 2008 @@ -1,22 +1,23 @@ -/* - JSPWiki - a JSP-based WikiWiki clone. +/* + JSPWiki - a JSP-based WikiWiki clone. - Copyright (C) 2001-2006 JSPWiki Development Team + 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 - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. + http://www.apache.org/licenses/LICENSE-2.0 - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ + 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 com.ecyrd.jspwiki.auth.permissions; import java.security.AccessControlContext; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions/PagePermission.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions/PagePermission.java?rev=643618&r1=643617&r2=643618&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions/PagePermission.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions/PagePermission.java Tue Apr 1 15:08:41 2008 @@ -1,21 +1,22 @@ -/* +/* JSPWiki - a JSP-based WikiWiki clone. - Copyright (C) 2001-2007 JSPWiki development group + 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 - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. + http://www.apache.org/licenses/LICENSE-2.0 - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 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 com.ecyrd.jspwiki.auth.permissions; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions/PermissionFactory.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions/PermissionFactory.java?rev=643618&r1=643617&r2=643618&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions/PermissionFactory.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions/PermissionFactory.java Tue Apr 1 15:08:41 2008 @@ -1,21 +1,22 @@ /* JSPWiki - a JSP-based WikiWiki clone. - Copyright (C) 2001-2007 JSPWiki development group + 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 - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. + http://www.apache.org/licenses/LICENSE-2.0 - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 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 com.ecyrd.jspwiki.auth.permissions; Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions/WikiPermission.java URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions/WikiPermission.java?rev=643618&r1=643617&r2=643618&view=diff ============================================================================== --- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions/WikiPermission.java (original) +++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/auth/permissions/WikiPermission.java Tue Apr 1 15:08:41 2008 @@ -1,21 +1,22 @@ -/* +/* JSPWiki - a JSP-based WikiWiki clone. - Copyright (C) 2001-2007 JSPWiki development group + 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 - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as published by - the Free Software Foundation; either version 2.1 of the License, or - (at your option) any later version. + http://www.apache.org/licenses/LICENSE-2.0 - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 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 com.ecyrd.jspwiki.auth.permissions;