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 2009/06/21 21:52:17 UTC
svn commit: r787082 - in /incubator/jspwiki/trunk: ./
src/java/org/apache/wiki/ tests/etc/ tests/etc/ini/
Author: jalkanen
Date: Sun Jun 21 19:52:16 2009
New Revision: 787082
URL: http://svn.apache.org/viewvc?rev=787082&view=rev
Log:
* JSPWIKI-545: Fixed hopefully the last of the RAT issues.
* Removed generation of jspwiki_rcs and jspwiki_vers.properties
from unit tests, since they are no longer used.
Removed:
incubator/jspwiki/trunk/tests/etc/jspwiki_rcs.properties.tmpl
incubator/jspwiki/trunk/tests/etc/jspwiki_vers.properties.tmpl
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/build.xml
incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
incubator/jspwiki/trunk/tests/etc/ini/jspwiki_module.xml
incubator/jspwiki/trunk/tests/etc/jspwiki-testUserPolicy.policy
incubator/jspwiki/trunk/tests/etc/jspwiki.policy
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=787082&r1=787081&r2=787082&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sun Jun 21 19:52:16 2009
@@ -1,3 +1,12 @@
+2009-06-07 Janne Jalkanen <ja...@apache.org>
+
+ * 3.0.0-svn-132
+
+ * JSPWIKI-545: Fixed hopefully the last of the RAT issues.
+
+ * Removed generation of jspwiki_rcs and jspwiki_vers.properties
+ from unit tests, since they are no longer used.
+
2009-06-21 Dirk Frederickx <brushed AT apache DOT org>
* 3.0.0-svn-131
Modified: incubator/jspwiki/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=787082&r1=787081&r2=787082&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Sun Jun 21 19:52:16 2009
@@ -192,16 +192,10 @@
description="Builds the correct propertyfile from the build.properties">
<copy file="etc/jspwiki.properties.tmpl" tofile="${code.web}/WEB-INF/jspwiki.properties" />
<copy file="${tests}/etc/jspwiki.properties.tmpl" tofile="${tests}/etc/jspwiki.properties" />
- <copy file="${tests}/etc/jspwiki_rcs.properties.tmpl" tofile="${tests}/etc/jspwiki_rcs.properties" />
- <copy file="${tests}/etc/jspwiki_vers.properties.tmpl" tofile="${tests}/etc/jspwiki_vers.properties" />
<replace file="${code.web}/WEB-INF/jspwiki.properties"
replacefilterfile="${build.properties}" />
<replace file="${tests}/etc/jspwiki.properties"
replacefilterfile="${build.properties}" />
- <replace file="${tests}/etc/jspwiki_rcs.properties"
- replacefilterfile="${build.properties}" />
- <replace file="${tests}/etc/jspwiki_vers.properties"
- replacefilterfile="${build.properties}" />
</target>
<!-- Removes the build directory and the tests build directory -->
@@ -211,8 +205,6 @@
<delete dir="${tests.build}" />
<delete file="${code.web}/WEB-INF/jspwiki.properties" />
<delete file="${tests}/etc/jspwiki.properties" />
- <delete file="${tests}/etc/jspwiki_rcs.properties" />
- <delete file="${tests}/etc/jspwiki_vers.properties" />
<delete>
<fileset dir="." includes="**/*~" defaultexcludes="no"/>
<fileset dir="." includes="**/#*#" defaultexcludes="no"/>
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java?rev=787082&r1=787081&r2=787082&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Sun Jun 21 19:52:16 2009
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "131";
+ public static final String BUILD = "132";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/tests/etc/ini/jspwiki_module.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/ini/jspwiki_module.xml?rev=787082&r1=787081&r2=787082&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/ini/jspwiki_module.xml (original)
+++ incubator/jspwiki/trunk/tests/etc/ini/jspwiki_module.xml Sun Jun 21 19:52:16 2009
@@ -1,4 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ JSPWiki - a JSP-based WikiWiki clone.
+
+ 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.
+ -->
<!--
This is a part of the JSPWiki plugin test suite.
-->
Modified: incubator/jspwiki/trunk/tests/etc/jspwiki-testUserPolicy.policy
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/jspwiki-testUserPolicy.policy?rev=787082&r1=787081&r2=787082&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/jspwiki-testUserPolicy.policy (original)
+++ incubator/jspwiki/trunk/tests/etc/jspwiki-testUserPolicy.policy Sun Jun 21 19:52:16 2009
@@ -1,3 +1,22 @@
+// JSPWiki - a JSP-based WikiWiki clone.
+//
+// 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.
+
grant principal org.apache.wiki.auth.authorize.Role "All" {
permission org.apache.wiki.auth.permissions.WikiPermission "*", "login";
};
Modified: incubator/jspwiki/trunk/tests/etc/jspwiki.policy
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/jspwiki.policy?rev=787082&r1=787081&r2=787082&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/jspwiki.policy (original)
+++ incubator/jspwiki/trunk/tests/etc/jspwiki.policy Sun Jun 21 19:52:16 2009
@@ -1,3 +1,22 @@
+// JSPWiki - a JSP-based WikiWiki clone.
+//
+// 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.
+
// $Id: jspwiki.policy,v 1.11 2007-05-29 05:18:53 arj Exp $
//
// This file contains the local security policy for JSPWiki.