Author: dwoods
Date: Mon Jan 25 18:28:22 2010
New Revision: 902910
URL: http://svn.apache.org/viewvc?rev=902910&view=rev
Log:
add trademark line and another 2010 copyright year update
Modified:
openjpa/branches/2.0.0-beta/NOTICE.txt
openjpa/branches/2.0.0-beta/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm
openjpa/branches/2.0.0-beta/openjpa-project/CHANGES.txt
openjpa/branches/2.0.0-beta/openjpa-project/NOTICE.txt
openjpa/branches/2.0.0-beta/openjpa-project/RELEASE-NOTES.html
openjpa/branches/2.0.0-beta/openjpa/src/main/appended-resources/META-INF/NOTICE.vm
Modified: openjpa/branches/2.0.0-beta/NOTICE.txt
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.0.0-beta/NOTICE.txt?rev=902910&r1=902909&r2=902910&view=diff
==============================================================================
--- openjpa/branches/2.0.0-beta/NOTICE.txt (original)
+++ openjpa/branches/2.0.0-beta/NOTICE.txt Mon Jan 25 18:28:22 2010
@@ -5,6 +5,7 @@
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
+Apache, the Apache feather logo and OpenJPA are trademarks of The Apache
Software Foundation.
COPYRIGHT NOTICES
Modified:
openjpa/branches/2.0.0-beta/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.0.0-beta/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm?rev=902910&r1=902909&r2=902910&view=diff
==============================================================================
---
openjpa/branches/2.0.0-beta/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm
(original)
+++
openjpa/branches/2.0.0-beta/openjpa-all/src/main/appended-resources/META-INF/NOTICE.vm
Mon Jan 25 18:28:22 2010
@@ -1,4 +1,6 @@
+Apache, the Apache feather logo and OpenJPA are trademarks of Apache Software
Foundation.
+
openjpa-all includes software developed by the:
Apache Commons Collections project
Apache Commons Lang project
Modified: openjpa/branches/2.0.0-beta/openjpa-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.0.0-beta/openjpa-project/CHANGES.txt?rev=902910&r1=902909&r2=902910&view=diff
==============================================================================
--- openjpa/branches/2.0.0-beta/openjpa-project/CHANGES.txt (original)
+++ openjpa/branches/2.0.0-beta/openjpa-project/CHANGES.txt Mon Jan 25 18:28:22
2010
@@ -71,6 +71,7 @@
Notices
-------
Copyright 2006,2010 The Apache Software Foundation
+ Apache, the Apache feather logo and OpenJPA are trademarks of The Apache
Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: openjpa/branches/2.0.0-beta/openjpa-project/NOTICE.txt
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.0.0-beta/openjpa-project/NOTICE.txt?rev=902910&r1=902909&r2=902910&view=diff
==============================================================================
--- openjpa/branches/2.0.0-beta/openjpa-project/NOTICE.txt (original)
+++ openjpa/branches/2.0.0-beta/openjpa-project/NOTICE.txt Mon Jan 25 18:28:22
2010
@@ -5,6 +5,8 @@
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
+Apache, the Apache feather logo and OpenJPA are trademarks of The Apache
Software Foundation.
+
The OpenJPA binary assembly includes software developed by the:
Apache Commons Collections project
Apache Commons Lang project
Modified: openjpa/branches/2.0.0-beta/openjpa-project/RELEASE-NOTES.html
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.0.0-beta/openjpa-project/RELEASE-NOTES.html?rev=902910&r1=902909&r2=902910&view=diff
==============================================================================
--- openjpa/branches/2.0.0-beta/openjpa-project/RELEASE-NOTES.html (original)
+++ openjpa/branches/2.0.0-beta/openjpa-project/RELEASE-NOTES.html Mon Jan 25
18:28:22 2010
@@ -737,7 +737,7 @@
</ul></p>
<hr>
-<p>Copyright (C) 2006-2009 Apache Software Foundation. Licensed under Apache
License 2.0.<br>
-Apache and the Apache feather logo are trademarks of Apache Software
Foundation.<br>
+<p>Copyright (C) 2006,2010 The Apache Software Foundation. Licensed under
Apache License 2.0.<br>
+Apache, the Apache feather logo and OpenJPA are trademarks of The Apache
Software Foundation.<br>
</body>
</html>
Modified:
openjpa/branches/2.0.0-beta/openjpa/src/main/appended-resources/META-INF/NOTICE.vm
URL:
http://svn.apache.org/viewvc/openjpa/branches/2.0.0-beta/openjpa/src/main/appended-resources/META-INF/NOTICE.vm?rev=902910&r1=902909&r2=902910&view=diff
==============================================================================
---
openjpa/branches/2.0.0-beta/openjpa/src/main/appended-resources/META-INF/NOTICE.vm
(original)
+++
openjpa/branches/2.0.0-beta/openjpa/src/main/appended-resources/META-INF/NOTICE.vm
Mon Jan 25 18:28:22 2010
@@ -1,4 +1,6 @@
+Apache, the Apache feather logo and OpenJPA are trademarks of Apache Software
Foundation.
+
OpenJPA includes software developed by the SERP project
Copyright (c) 2002-2006, A. Abram White. All rights reserved.
