You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2014/02/12 00:46:06 UTC
svn commit: r1567466 - in /jspwiki/trunk: ./ jspwiki-war/src/main/config/wro/
jspwiki-war/src/main/java/org/apache/wiki/api/engine/
jspwiki-war/src/main/webapp/templates/default/skins/CleanBlue/
jspwiki-wikipages/ jspwiki-wikipages/assembly/
Author: juanpablo
Date: Tue Feb 11 23:46:05 2014
New Revision: 1567466
URL: http://svn.apache.org/r1567466
Log:
added missing AL headers and some more RAT exclusions
Modified:
jspwiki/trunk/jspwiki-war/src/main/config/wro/wro.properties
jspwiki/trunk/jspwiki-war/src/main/config/wro/wro.xml
jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/engine/AdminBeanManager.java
jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/skins/CleanBlue/skin.js
jspwiki/trunk/jspwiki-wikipages/.corepages
jspwiki/trunk/jspwiki-wikipages/assembly/zip.xml
jspwiki/trunk/pom.xml
Modified: jspwiki/trunk/jspwiki-war/src/main/config/wro/wro.properties
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/config/wro/wro.properties?rev=1567466&r1=1567465&r2=1567466&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/config/wro/wro.properties (original)
+++ jspwiki/trunk/jspwiki-war/src/main/config/wro/wro.properties Tue Feb 11 23:46:05 2014
@@ -1,2 +1,19 @@
+# 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.
+
preProcessors=lessCss,semicolonAppender
postProcessors=cssMinJawr,uglifyJs
\ No newline at end of file
Modified: jspwiki/trunk/jspwiki-war/src/main/config/wro/wro.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/config/wro/wro.xml?rev=1567466&r1=1567465&r2=1567466&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/config/wro/wro.xml (original)
+++ jspwiki/trunk/jspwiki-war/src/main/config/wro/wro.xml Tue Feb 11 23:46:05 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/main/java/org/apache/wiki/api/engine/AdminBeanManager.java
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/engine/AdminBeanManager.java?rev=1567466&r1=1567465&r2=1567466&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/engine/AdminBeanManager.java (original)
+++ jspwiki/trunk/jspwiki-war/src/main/java/org/apache/wiki/api/engine/AdminBeanManager.java Tue Feb 11 23:46:05 2014
@@ -1,3 +1,22 @@
+/*
+ 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.api.engine;
import java.util.List;
Modified: jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/skins/CleanBlue/skin.js
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/skins/CleanBlue/skin.js?rev=1567466&r1=1567465&r2=1567466&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/skins/CleanBlue/skin.js (original)
+++ jspwiki/trunk/jspwiki-war/src/main/webapp/templates/default/skins/CleanBlue/skin.js Tue Feb 11 23:46:05 2014
@@ -1,3 +1,24 @@
+/*
+ *
+ * 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.
+ *
+*/
+
/**
* SkinQute javascript extensions
* needed to initialise RoundedCorner elements.
Modified: jspwiki/trunk/jspwiki-wikipages/.corepages
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-wikipages/.corepages?rev=1567466&r1=1567465&r2=1567466&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-wikipages/.corepages (original)
+++ jspwiki/trunk/jspwiki-wikipages/.corepages Tue Feb 11 23:46:05 2014
@@ -1,3 +1,23 @@
+# 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.
+#
+# Custom configuration file used by most JUnit tests overriding
+# certain default values in src/main/resources/ini/jspwiki.properties
+#
About.txt
ApprovalRequiredForPageChanges.txt
ApprovalRequiredForUserProfiles.txt
Modified: jspwiki/trunk/jspwiki-wikipages/assembly/zip.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/jspwiki-wikipages/assembly/zip.xml?rev=1567466&r1=1567465&r2=1567466&view=diff
==============================================================================
--- jspwiki/trunk/jspwiki-wikipages/assembly/zip.xml (original)
+++ jspwiki/trunk/jspwiki-wikipages/assembly/zip.xml Tue Feb 11 23:46:05 2014
@@ -1,4 +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.
+-->
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
Modified: jspwiki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/jspwiki/trunk/pom.xml?rev=1567466&r1=1567465&r2=1567466&view=diff
==============================================================================
--- jspwiki/trunk/pom.xml (original)
+++ jspwiki/trunk/pom.xml Tue Feb 11 23:46:05 2014
@@ -493,9 +493,11 @@
<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>.svnignore</exclude> <!-- svn exclusions -->
<exclude>**/src/main/config/doc/LICENSE.*</exclude> <!-- 3rd party License files -->
<exclude>**/src/main/config/wikipages/**</exclude> <!-- Default wikipages -->
<exclude>**/src/main/config/dev/OldChangeLog</exclude> <!-- ChangeLog excluded by default, this is, well, an old ChangeLog -->
+ <exclude>**/src/main/scripts/posteditor.js</exclude> <!-- minified file -->
<exclude>**/src/main/webapp/scripts/*.js</exclude> <!-- minified files -->
<exclude>**/src/test/resources/TextFormattingRules.txt</exclude> <!-- test input data -->
<exclude>**/src/test/resources/test-repo/*.txt</exclude> <!-- web tests input data -->