You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ja...@apache.org on 2008/04/01 23:42:39 UTC
svn commit: r643598 - in /incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url:
DefaultURLConstructor.java ShortURLConstructor.java
ShortViewURLConstructor.java URLConstructor.java
Author: jalkanen
Date: Tue Apr 1 14:42:37 2008
New Revision: 643598
URL: http://svn.apache.org/viewvc?rev=643598&view=rev
Log:
Changed preamble to ASF copyright and removed extra @author tags.
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/DefaultURLConstructor.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/ShortURLConstructor.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/ShortViewURLConstructor.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/URLConstructor.java
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/DefaultURLConstructor.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/DefaultURLConstructor.java?rev=643598&r1=643597&r2=643598&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/DefaultURLConstructor.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/DefaultURLConstructor.java Tue Apr 1 14:42:37 2008
@@ -1,22 +1,23 @@
/*
- JSPWiki - a JSP-based WikiWiki clone.
+ JSPWiki - a JSP-based WikiWiki clone.
- Copyright (C) 2001-2005 Janne Jalkanen (Janne.Jalkanen@iki.fi)
-
- 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.
-
- 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
-*/
+ 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 com.ecyrd.jspwiki.url;
import java.io.UnsupportedEncodingException;
@@ -39,7 +40,6 @@
* JSP pages. This is what JSPWiki by default is using. For example,
* WikiContext.VIEW points at "Wiki.jsp", etc.
*
- * @author Janne Jalkanen
* @since 2.2
*/
public class DefaultURLConstructor
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/ShortURLConstructor.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/ShortURLConstructor.java?rev=643598&r1=643597&r2=643598&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/ShortURLConstructor.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/ShortURLConstructor.java Tue Apr 1 14:42:37 2008
@@ -1,22 +1,23 @@
/*
- JSPWiki - a JSP-based WikiWiki clone.
+ JSPWiki - a JSP-based WikiWiki clone.
- Copyright (C) 2001-2005 Janne Jalkanen (Janne.Jalkanen@iki.fi)
-
- 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.
-
- 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
-*/
+ 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 com.ecyrd.jspwiki.url;
import java.io.UnsupportedEncodingException;
@@ -35,7 +36,6 @@
/**
* Provides a way to do short URLs of the form /wiki/PageName.
*
- * @author Janne Jalkanen
*
* @since 2.2
*/
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/ShortViewURLConstructor.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/ShortViewURLConstructor.java?rev=643598&r1=643597&r2=643598&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/ShortViewURLConstructor.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/ShortViewURLConstructor.java Tue Apr 1 14:42:37 2008
@@ -1,22 +1,23 @@
/*
JSPWiki - a JSP-based WikiWiki clone.
- Copyright (C) 2001-2005 Janne Jalkanen (Janne.Jalkanen@iki.fi)
-
- 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.
-
- 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
-*/
+ 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 com.ecyrd.jspwiki.url;
import java.util.Properties;
@@ -30,7 +31,6 @@
* A specific URL constructor that returns easy-to-grok URLs for
* VIEW and ATTACH contexts, but goes through JSP pages otherwise.
*
- * @author jalkanen
*
* @since 2.2
*/
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/URLConstructor.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/URLConstructor.java?rev=643598&r1=643597&r2=643598&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/URLConstructor.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/url/URLConstructor.java Tue Apr 1 14:42:37 2008
@@ -1,22 +1,23 @@
/*
- JSPWiki - a JSP-based WikiWiki clone.
+ JSPWiki - a JSP-based WikiWiki clone.
- Copyright (C) 2001-2005 Janne Jalkanen (Janne.Jalkanen@iki.fi)
-
- 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.
-
- 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
-*/
+ 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 com.ecyrd.jspwiki.url;
import java.util.Properties;
@@ -32,7 +33,6 @@
* if you need to find an URL to the editor page for page "TextFormattingRules",
* you would call makeURL( WikiContext.EDIT, "TextFormattingRules", false, null );
*
- * @author Janne Jalkanen
* @since 2.2
*/
public interface URLConstructor