You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2010/10/13 14:49:01 UTC
svn commit: r1022081 - in /myfaces/tobago/trunk: ./ tobago-assembly/
tobago-assembly/src/main/resources/ tobago-core/src/main/appended-resources/
tobago-core/src/main/appended-resources/META-INF/
tobago-core/src/main/resources/META-INF/ tobago-extensio...
Author: bommel
Date: Wed Oct 13 12:48:59 2010
New Revision: 1022081
URL: http://svn.apache.org/viewvc?rev=1022081&view=rev
Log:
update plugins upate license and notice files
Added:
myfaces/tobago/trunk/tobago-core/src/main/appended-resources/
myfaces/tobago/trunk/tobago-core/src/main/appended-resources/META-INF/
myfaces/tobago/trunk/tobago-core/src/main/appended-resources/META-INF/NOTICE (contents, props changed)
- copied, changed from r1021408, myfaces/tobago/trunk/tobago-core/src/main/resources/META-INF/NOTICE.txt
myfaces/tobago/trunk/tobago-extension/tobago-fileupload/src/main/appended-resouces/
myfaces/tobago/trunk/tobago-extension/tobago-fileupload/src/main/appended-resouces/META-INF/
myfaces/tobago/trunk/tobago-extension/tobago-fileupload/src/main/appended-resouces/META-INF/NOTICE (contents, props changed)
- copied, changed from r1021408, myfaces/tobago/trunk/tobago-extension/tobago-fileupload/src/main/resources/META-INF/NOTICE.txt
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/appended-resources/
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/appended-resources/META-INF/
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/appended-resources/META-INF/NOTICE (contents, props changed)
- copied, changed from r1021408, myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/NOTICE.txt
myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/appended-resources/
myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/appended-resources/META-INF/
myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/appended-resources/META-INF/NOTICE (contents, props changed)
- copied, changed from r1021408, myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/resources/META-INF/NOTICE.txt
myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/appended-resources/
myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/appended-resources/META-INF/
myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/appended-resources/META-INF/NOTICE (contents, props changed)
- copied, changed from r1021408, myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/NOTICE.txt
myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/appended-resources/
myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/appended-resources/META-INF/
myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/appended-resources/META-INF/NOTICE (contents, props changed)
- copied, changed from r1021408, myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/NOTICE.txt
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/appended-resources/
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/appended-resources/META-INF/
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/appended-resources/META-INF/LICENSE (contents, props changed)
- copied, changed from r1021408, myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/LICENSE.txt
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/appended-resources/META-INF/NOTICE (contents, props changed)
- copied, changed from r1021408, myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/NOTICE.txt
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/appended-resources/
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/appended-resources/META-INF/
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/appended-resources/META-INF/NOTICE (contents, props changed)
- copied, changed from r1021408, myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/NOTICE.txt
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/appended-resources/
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/appended-resources/META-INF/
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/appended-resources/META-INF/LICENSE (contents, props changed)
- copied, changed from r1021408, myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/LICENSE.txt
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/appended-resources/META-INF/NOTICE (contents, props changed)
- copied, changed from r1021408, myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/NOTICE.txt
myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/appended-resouces/
myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/appended-resouces/META-INF/
myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/appended-resouces/META-INF/NOTICE (contents, props changed)
- copied, changed from r1021408, myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/resources/META-INF/NOTICE.txt
myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/appended-resouces/
myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/appended-resouces/META-INF/
myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/appended-resouces/META-INF/NOTICE (contents, props changed)
- copied, changed from r1021408, myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/META-INF/NOTICE.txt
Removed:
myfaces/tobago/trunk/tobago-core/src/main/resources/META-INF/LICENSE.txt
myfaces/tobago/trunk/tobago-core/src/main/resources/META-INF/NOTICE.txt
myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/resources/
myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/resources/META-INF/LICENSE.txt
myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/resources/META-INF/NOTICE.txt
myfaces/tobago/trunk/tobago-extension/tobago-fileupload/src/main/resources/META-INF/LICENSE.txt
myfaces/tobago/trunk/tobago-extension/tobago-fileupload/src/main/resources/META-INF/NOTICE.txt
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/LICENSE.txt
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/NOTICE.txt
myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/resources/META-INF/LICENSE.txt
myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/resources/META-INF/NOTICE.txt
myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/resources/
myfaces/tobago/trunk/tobago-jsf-compat/src/main/resources/
myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/LICENSE.txt
myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/NOTICE.txt
myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/LICENSE.txt
myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/NOTICE.txt
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/LICENSE.txt
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/NOTICE.txt
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/LICENSE.txt
myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/NOTICE.txt
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/LICENSE.txt
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/NOTICE.txt
myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/resources/
myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/META-INF/
Modified:
myfaces/tobago/trunk/pom.xml
myfaces/tobago/trunk/tobago-assembly/pom.xml
myfaces/tobago/trunk/tobago-assembly/src/main/resources/LICENSE.txt
myfaces/tobago/trunk/tobago-assembly/src/main/resources/NOTICE.txt
myfaces/tobago/trunk/tobago-jsf-compat/pom.xml
Modified: myfaces/tobago/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/pom.xml?rev=1022081&r1=1022080&r2=1022081&view=diff
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Wed Oct 13 12:48:59 2010
@@ -172,9 +172,8 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.2</version>
+ <version>2.7</version>
<configuration>
- <aggregate>true</aggregate>
<linksource>true</linksource>
<breakiterator>true</breakiterator>
<quiet>true</quiet>
@@ -182,9 +181,8 @@
<source>${maven.compile.source}</source>
<charset>${maven.compile.encoding}</charset>
<links>
- <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
- <link>http://java.sun.com/j2ee/1.4/docs/api</link>
- <link>http://java.sun.com/javaee/javaserverfaces/1.1_01/docs/api</link>
+ <link>http://download-llnw.oracle.com/javase/1.5.0/docs/api/</link>
+ <link>http://download.oracle.com/javaee/5/api/</link>
<link>http://jakarta.apache.org/commons/collections/api-${commons-collection.version}/</link>
<link>http://jakarta.apache.org/commons/lang/api-${commons-lang.version}/</link>
<link>http://jakarta.apache.org/commons/fileupload/apidocs</link>
@@ -234,9 +232,9 @@
<plugin>
<inherited>false</inherited>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>changelog-maven-plugin</artifactId>
- <version>2.0-beta-1</version>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-changelog-plugin</artifactId>
+ <version>2.2</version>
<configuration>
<basedir>${basedir}</basedir>
</configuration>
@@ -318,7 +316,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
- <version>2.0.1</version>
+ <version>2.3.1</version>
<configuration>
<threshold>Low</threshold>
<effort>Max</effort>
@@ -362,6 +360,12 @@
</reportSets>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-linkcheck-plugin</artifactId>
+ <version>1.0.1</version>
+ </plugin>
+
</plugins>
</reporting>
@@ -385,14 +389,12 @@
<artifactId>jsp-api</artifactId>
<version>2.1</version>
<optional>true</optional>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<optional>true</optional>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -408,6 +410,7 @@
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
+ <optional>true</optional>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
@@ -525,6 +528,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
@@ -671,14 +675,25 @@
</execution>
</executions>
</plugin>
-
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>animal-sniffer-maven-plugin</artifactId>
+ <version>1.6</version>
+ <configuration>
+ <signature>
+ <groupId>org.codehaus.mojo.signature</groupId>
+ <artifactId>java15</artifactId>
+ <version>1.0</version>
+ </signature>
+ </configuration>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>maven-theme-plugin</artifactId>
- <version>1.0.25</version>
+ <version>1.0.30</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -753,7 +768,7 @@
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
- <version>0.3.1</version>
+ <version>1.0.3</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -811,7 +826,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.2</version>
+ <version>2.7</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -830,17 +845,22 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.0.2</version>
+ <version>2.1-beta-1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.3</version>
+ <version>2.4.3</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
- <version>2.2</version>
+ <version>2.4.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.1.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -900,7 +920,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-4</version>
+ <version>2.2</version>
</plugin>
<plugin>
@@ -1037,30 +1057,23 @@
</execution>
</executions>
</plugin>
- <!-- TODO test animal sniffer plugin
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>animal-sniffer-maven-plugin</artifactId>
- <version>1.4</version>
<executions>
<execution>
<phase>test</phase>
<goals>
<goal>check</goal>
</goals>
- <configuration>
- <signature>
- <groupId>org.codehaus.mojo.signature</groupId>
- <artifactId>java15</artifactId>
- <version>1.0</version>
- </signature>
- </configuration>
</execution>
</executions>
- </plugin-->
+ </plugin>
+
<plugin>
<artifactId>maven-source-plugin</artifactId>
- <version>2.0.2</version>
+ <version>2.1.2</version>
<executions>
<execution>
<id>attach-sources</id>
@@ -1072,7 +1085,7 @@
</plugin>
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.2</version>
+ <version>2.7</version>
<executions>
<execution>
<id>attach-javadocs</id>
@@ -1422,14 +1435,12 @@
<artifactId>jsp-api</artifactId>
<version>2.0</version>
<optional>true</optional>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
<optional>true</optional>
- <scope>provided</scope>
</dependency>
</dependencies>
</dependencyManagement>
@@ -1472,7 +1483,6 @@
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<optional>true</optional>
- <scope>provided</scope>
</dependency>
</dependencies>
</dependencyManagement>
@@ -1509,14 +1519,12 @@
<artifactId>jsp-api</artifactId>
<version>2.0</version>
<optional>true</optional>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.4</version>
<optional>true</optional>
- <scope>provided</scope>
</dependency>
</dependencies>
</dependencyManagement>
@@ -1565,7 +1573,6 @@
<artifactId>jsp-api</artifactId>
<version>2.1</version>
<optional>true</optional>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -1626,7 +1633,6 @@
<artifactId>servlet-api</artifactId>
<version>2.5</version>
<optional>true</optional>
- <scope>provided</scope>
</dependency>
</dependencies>
</dependencyManagement>
@@ -1680,7 +1686,7 @@
todo: update after releasing, needed for unit tests with JSF 1.1
<myfaces-test12.version>1.0.1-SNAPSHOT</myfaces-test12.version>
-->
- <myfaces20.version>2.0.0</myfaces20.version>
+ <myfaces20.version>2.0.2</myfaces20.version>
<mojarra11.version>1.1_02</mojarra11.version>
<mojarra12.version>1.2_14</mojarra12.version>
<mojarra20.version>2.0.3-SNAPSHOT</mojarra20.version>
Modified: myfaces/tobago/trunk/tobago-assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-assembly/pom.xml?rev=1022081&r1=1022080&r2=1022081&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-assembly/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-assembly/pom.xml Wed Oct 13 12:48:59 2010
@@ -99,6 +99,28 @@
<version>${project.version}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>net.sf.retrotranslator</groupId>
+ <artifactId>retrotranslator-runtime</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
Modified: myfaces/tobago/trunk/tobago-assembly/src/main/resources/LICENSE.txt
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-assembly/src/main/resources/LICENSE.txt?rev=1022081&r1=1022080&r2=1022081&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-assembly/src/main/resources/LICENSE.txt (original)
+++ myfaces/tobago/trunk/tobago-assembly/src/main/resources/LICENSE.txt Wed Oct 13 12:48:59 2010
@@ -276,3 +276,52 @@ compiled with JDK 5.0 into classes that
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
THE POSSIBILITY OF SUCH DAMAGE.
+ For jQuery:
+
+ Copyright (c) 2010 John Resig, http://jquery.com/
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+ For SLF4J:
+
+ Copyright (c) 2004-2008 QOS.ch
+ All rights reserved.
+
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the
+ "Software"), to deal in the Software without restriction, including
+ without limitation the rights to use, copy, modify, merge, publish,
+ distribute, sublicense, and/or sell copies of the Software, and to
+ permit persons to whom the Software is furnished to do so, subject to
+ the following conditions:
+
+ The above copyright notice and this permission notice shall be
+ included in all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
Modified: myfaces/tobago/trunk/tobago-assembly/src/main/resources/NOTICE.txt
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-assembly/src/main/resources/NOTICE.txt?rev=1022081&r1=1022080&r2=1022081&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-assembly/src/main/resources/NOTICE.txt (original)
+++ myfaces/tobago/trunk/tobago-assembly/src/main/resources/NOTICE.txt Wed Oct 13 12:48:59 2010
@@ -17,5 +17,9 @@ Thomas Fuchs (the Ruby on Rails Ajax jav
This product includes software developed by
Taras Puchko (Retrotranslator) (http://sourceforge.net/projects/retrotranslator).
+This product includes software developed by
+The jQuery Project (http://jquery.org/)
+This product includes software developed by
+QOS.ch (slf4j) (http://QOS.ch/)
Copied: myfaces/tobago/trunk/tobago-core/src/main/appended-resources/META-INF/NOTICE (from r1021408, myfaces/tobago/trunk/tobago-core/src/main/resources/META-INF/NOTICE.txt)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/appended-resources/META-INF/NOTICE?p2=myfaces/tobago/trunk/tobago-core/src/main/appended-resources/META-INF/NOTICE&p1=myfaces/tobago/trunk/tobago-core/src/main/resources/META-INF/NOTICE.txt&r1=1021408&r2=1022081&rev=1022081&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/resources/META-INF/NOTICE.txt (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/appended-resources/META-INF/NOTICE Wed Oct 13 12:48:59 2010
@@ -1,9 +1,3 @@
-Apache Tobago
-Copyright 2005-2010 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
Based on source code originally developed by
Atanion GmbH (http://www.atanion.com/)
Copyright 2002-2005 Atanion GmbH.
Propchange: myfaces/tobago/trunk/tobago-core/src/main/appended-resources/META-INF/NOTICE
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-core/src/main/appended-resources/META-INF/NOTICE
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/tobago-extension/tobago-fileupload/src/main/appended-resouces/META-INF/NOTICE (from r1021408, myfaces/tobago/trunk/tobago-extension/tobago-fileupload/src/main/resources/META-INF/NOTICE.txt)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-fileupload/src/main/appended-resouces/META-INF/NOTICE?p2=myfaces/tobago/trunk/tobago-extension/tobago-fileupload/src/main/appended-resouces/META-INF/NOTICE&p1=myfaces/tobago/trunk/tobago-extension/tobago-fileupload/src/main/resources/META-INF/NOTICE.txt&r1=1021408&r2=1022081&rev=1022081&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-fileupload/src/main/resources/META-INF/NOTICE.txt (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-fileupload/src/main/appended-resouces/META-INF/NOTICE Wed Oct 13 12:48:59 2010
@@ -1,9 +1,3 @@
-Apache Tobago
-Copyright 2005-2010 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
Based on source code originally developed by
Atanion GmbH (http://www.atanion.com/).
Propchange: myfaces/tobago/trunk/tobago-extension/tobago-fileupload/src/main/appended-resouces/META-INF/NOTICE
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-extension/tobago-fileupload/src/main/appended-resouces/META-INF/NOTICE
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/appended-resources/META-INF/NOTICE (from r1021408, myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/NOTICE.txt)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/appended-resources/META-INF/NOTICE?p2=myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/appended-resources/META-INF/NOTICE&p1=myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/NOTICE.txt&r1=1021408&r2=1022081&rev=1022081&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/resources/META-INF/NOTICE.txt (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/appended-resources/META-INF/NOTICE Wed Oct 13 12:48:59 2010
@@ -1,9 +1,3 @@
-Apache Tobago
-Copyright 2005-2010 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
Based on source code originally developed by
Atanion GmbH (http://www.atanion.com/)
Copyright 2002-2005 Atanion GmbH,
Propchange: myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/appended-resources/META-INF/NOTICE
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/appended-resources/META-INF/NOTICE
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/appended-resources/META-INF/NOTICE (from r1021408, myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/resources/META-INF/NOTICE.txt)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/appended-resources/META-INF/NOTICE?p2=myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/appended-resources/META-INF/NOTICE&p1=myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/resources/META-INF/NOTICE.txt&r1=1021408&r2=1022081&rev=1022081&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/resources/META-INF/NOTICE.txt (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/appended-resources/META-INF/NOTICE Wed Oct 13 12:48:59 2010
@@ -1,9 +1,3 @@
-Apache Tobago
-Copyright 2005-2010 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
Based on source code originally developed by
Atanion GmbH (http://www.atanion.com/)
Copyright 2002-2005 Atanion GmbH.
Propchange: myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/appended-resources/META-INF/NOTICE
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-extension/tobago-security/src/main/appended-resources/META-INF/NOTICE
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/tobago/trunk/tobago-jsf-compat/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/pom.xml?rev=1022081&r1=1022080&r2=1022081&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-jsf-compat/pom.xml Wed Oct 13 12:48:59 2010
@@ -104,7 +104,7 @@
<configuration>
<classifier>jdk14retro</classifier>
<attach>true</attach>
- <verify>true</verify>
+ <verify>false</verify>
<verifyClasspath>
<element>${java14.home}/${java.classes.jar}</element>
</verifyClasspath>
Copied: myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/appended-resources/META-INF/NOTICE (from r1021408, myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/NOTICE.txt)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/appended-resources/META-INF/NOTICE?p2=myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/appended-resources/META-INF/NOTICE&p1=myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/NOTICE.txt&r1=1021408&r2=1022081&rev=1022081&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/resources/META-INF/NOTICE.txt (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/appended-resources/META-INF/NOTICE Wed Oct 13 12:48:59 2010
@@ -1,9 +1,3 @@
-Apache Tobago
-Copyright 2005-2010 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
Based on source code originally developed by
Atanion GmbH (http://www.atanion.com/)
Copyright 2002-2005 Atanion GmbH.
Propchange: myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/appended-resources/META-INF/NOTICE
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-theme/tobago-theme-charlotteville/src/main/appended-resources/META-INF/NOTICE
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/appended-resources/META-INF/NOTICE (from r1021408, myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/NOTICE.txt)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/appended-resources/META-INF/NOTICE?p2=myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/appended-resources/META-INF/NOTICE&p1=myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/NOTICE.txt&r1=1021408&r2=1022081&rev=1022081&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/resources/META-INF/NOTICE.txt (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/appended-resources/META-INF/NOTICE Wed Oct 13 12:48:59 2010
@@ -1,9 +1,3 @@
-Apache Tobago
-Copyright 2005-2010 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
Based on source code originally developed by
Atanion GmbH (http://www.atanion.com/)
Copyright 2002-2005 Atanion GmbH.
Propchange: myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/appended-resources/META-INF/NOTICE
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-theme/tobago-theme-richmond/src/main/appended-resources/META-INF/NOTICE
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/appended-resources/META-INF/LICENSE (from r1021408, myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/LICENSE.txt)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/appended-resources/META-INF/LICENSE?p2=myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/appended-resources/META-INF/LICENSE&p1=myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/LICENSE.txt&r1=1021408&r2=1022081&rev=1022081&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/LICENSE.txt (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/appended-resources/META-INF/LICENSE Wed Oct 13 12:48:59 2010
@@ -1,206 +1,3 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- 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.
-
For the Prototype JavaScript framework:
Copyright (c) 2005 Sam Stephenson
Propchange: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/appended-resources/META-INF/LICENSE
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/appended-resources/META-INF/LICENSE
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/appended-resources/META-INF/NOTICE (from r1021408, myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/NOTICE.txt)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/appended-resources/META-INF/NOTICE?p2=myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/appended-resources/META-INF/NOTICE&p1=myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/NOTICE.txt&r1=1021408&r2=1022081&rev=1022081&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/META-INF/NOTICE.txt (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/appended-resources/META-INF/NOTICE Wed Oct 13 12:48:59 2010
@@ -1,9 +1,3 @@
-Apache Tobago
-Copyright 2005-2010 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
Based on source code originally developed by
Atanion GmbH (http://www.atanion.com/)
Copyright 2002-2005 Atanion GmbH.
Propchange: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/appended-resources/META-INF/NOTICE
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/appended-resources/META-INF/NOTICE
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/appended-resources/META-INF/NOTICE (from r1021408, myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/NOTICE.txt)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/appended-resources/META-INF/NOTICE?p2=myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/appended-resources/META-INF/NOTICE&p1=myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/NOTICE.txt&r1=1021408&r2=1022081&rev=1022081&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/META-INF/NOTICE.txt (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/appended-resources/META-INF/NOTICE Wed Oct 13 12:48:59 2010
@@ -1,9 +1,3 @@
-Apache Tobago
-Copyright 2005-2010 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
Based on source code originally developed by
Atanion GmbH (http://www.atanion.com/)
Copyright 2002-2005 Atanion GmbH.
Propchange: myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/appended-resources/META-INF/NOTICE
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/appended-resources/META-INF/NOTICE
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/appended-resources/META-INF/LICENSE (from r1021408, myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/LICENSE.txt)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/appended-resources/META-INF/LICENSE?p2=myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/appended-resources/META-INF/LICENSE&p1=myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/LICENSE.txt&r1=1021408&r2=1022081&rev=1022081&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/LICENSE.txt (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/appended-resources/META-INF/LICENSE Wed Oct 13 12:48:59 2010
@@ -1,207 +1,3 @@
-
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- 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.
-
-
For the Prototype JavaScript framework:
Copyright (c) 2005 Sam Stephenson
Propchange: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/appended-resources/META-INF/LICENSE
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/appended-resources/META-INF/LICENSE
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/appended-resources/META-INF/NOTICE (from r1021408, myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/NOTICE.txt)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/appended-resources/META-INF/NOTICE?p2=myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/appended-resources/META-INF/NOTICE&p1=myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/NOTICE.txt&r1=1021408&r2=1022081&rev=1022081&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/NOTICE.txt (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/appended-resources/META-INF/NOTICE Wed Oct 13 12:48:59 2010
@@ -1,9 +1,3 @@
-Apache Tobago
-Copyright 2005-2010 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
Based on source code originally developed by
Atanion GmbH (http://www.atanion.com/)
Copyright 2002-2005 Atanion GmbH.
Propchange: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/appended-resources/META-INF/NOTICE
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/appended-resources/META-INF/NOTICE
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/appended-resouces/META-INF/NOTICE (from r1021408, myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/resources/META-INF/NOTICE.txt)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/appended-resouces/META-INF/NOTICE?p2=myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/appended-resouces/META-INF/NOTICE&p1=myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/resources/META-INF/NOTICE.txt&r1=1021408&r2=1022081&rev=1022081&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/resources/META-INF/NOTICE.txt (original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/appended-resouces/META-INF/NOTICE Wed Oct 13 12:48:59 2010
@@ -1,9 +1,3 @@
-Apache Tobago
-Copyright 2005-2010 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
Based on source code originally developed by
Atanion GmbH (http://www.atanion.com/)
Copyright 2002-2005 Atanion GmbH.
Propchange: myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/appended-resouces/META-INF/NOTICE
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-tool/tobago-tool-annotation/src/main/appended-resouces/META-INF/NOTICE
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/appended-resouces/META-INF/NOTICE (from r1021408, myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/META-INF/NOTICE.txt)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/appended-resouces/META-INF/NOTICE?p2=myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/appended-resouces/META-INF/NOTICE&p1=myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/META-INF/NOTICE.txt&r1=1021408&r2=1022081&rev=1022081&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/resources/META-INF/NOTICE.txt (original)
+++ myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/appended-resouces/META-INF/NOTICE Wed Oct 13 12:48:59 2010
@@ -1,9 +1,3 @@
-Apache Tobago
-Copyright 2005-2010 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
Based on source code originally developed by
Atanion GmbH (http://www.atanion.com/)
Copyright 2002-2005 Atanion GmbH.
Propchange: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/appended-resouces/META-INF/NOTICE
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/tobago/trunk/tobago-tool/tobago-tool-apt/src/main/appended-resouces/META-INF/NOTICE
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL