You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by me...@apache.org on 2014/05/20 19:00:46 UTC
svn commit: r1596313 - in /jspwiki/trunk:
jspwiki-war/src/main/config/wro/wro-haddock.xml
jspwiki-war/src/test/java/org/apache/wiki/PropertyReaderTest.java
jspwiki-war/src/test/resources/jspwiki-custom.properties pom.xml
Author: metskem
Date: Tue May 20 17:00:45 2014
New Revision: 1596313
URL: http://svn.apache.org/r1596313
Log:
a couple of obvious RAT improvements
Modified:
jspwiki/trunk/jspwiki-war/src/main/config/wro/wro-haddock.xml
jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/PropertyReaderTest.java
jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-custom.properties
jspwiki/trunk/pom.xml
Modified: jspwiki/trunk/jspwiki-war/src/main/config/wro/wro-haddock.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/config/wro/wro-haddock.xml?rev=1596313&r1=1596312&r2=1596313&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/config/wro/wro-haddock.xml (original)
+++ jspwiki/trunk/jspwiki-war/src/main/config/wro/wro-haddock.xml Tue May 20 17:00:45 2014
@@ -1,5 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
-
+<!--
+ 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.
+-->
<groups xmlns="http://www.isdc.ro/wro"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.isdc.ro/wro wro.xsd">
Modified: jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/PropertyReaderTest.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/PropertyReaderTest.java?rev=1596313&r1=1596312&r2=1596313&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/PropertyReaderTest.java (original)
+++ jspwiki/trunk/jspwiki-war/src/test/java/org/apache/wiki/PropertyReaderTest.java Tue May 20 17:00:45 2014
@@ -1,15 +1,20 @@
/*
- * Licensed 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.
+ 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.wiki;
Modified: jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-custom.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-custom.properties?rev=1596313&r1=1596312&r2=1596313&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-custom.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/test/resources/jspwiki-custom.properties Tue May 20 17:00:45 2014
@@ -33,7 +33,7 @@ jspwiki.referenceStyle = relative
jspwiki.authorizer=org.apache.wiki.TestAuthorizer
# log file under ./target
-log4j.appender.FileLog.File=./target/jspwiki.log
+log4j.appender.FileLog.File=./target/logs/jspwiki.log
# RSS under ./target
jspwiki.rss.fileName=./target/rss.rdf
@@ -45,10 +45,9 @@ jspwiki.rss.fileName=./target/rss.rdf
jspwiki.xmlGroupDatabaseFile = target/test-classes/groupdatabase.xml
jspwiki.xmlUserDatabaseFile = target/test-classes/userdatabase.xml
-log4j.appender.FileLog.File = target/test-classes/jspwikitests.log
log4j.logger.SecurityLog=INFO, SecurityAppender
log4j.appender.SecurityAppender = org.apache.log4j.RollingFileAppender
-log4j.appender.SecurityAppender.File = target/test-classes/logs/security.log
+log4j.appender.SecurityAppender.File = ./target/logs/security.log
log4j.appender.SecurityAppender.layout = org.apache.log4j.PatternLayout
log4j.appender.SecurityAppender.layout.ConversionPattern=%d %p - %m%n
Modified: jspwiki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/pom.xml?rev=1596313&r1=1596312&r2=1596313&view=diff
==============================================================================
--- jspwiki/trunk/pom.xml (original)
+++ jspwiki/trunk/pom.xml Tue May 20 17:00:45 2014
@@ -501,7 +501,7 @@
<version>0.10</version>
<configuration>
<excludes>
- <exclude>mvn_cheat-sheet.txt</exclude> <!-- handy list of maven commands; will be moved to site once we've switched to Maven -->
+ <exclude>mvn_cheat-sheet.md</exclude> <!-- handy list of maven commands; will be moved to site once we've switched to Maven -->
<exclude>.svnignore</exclude> <!-- svn exclusions -->
<exclude>**/src/main/config/doc/LICENSE.*</exclude> <!-- 3rd party License files -->
<exclude>**/src/main/config/wikipages/**</exclude> <!-- Default wikipages -->