cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aadamc...@apache.org
Subject svn commit: r1147566 - in /cayenne/main/trunk/framework/cayenne-legal-unpublished/src/main/resources/META-INF/cayenne: LICENSE.txt NOTICE.txt
Date Sun, 17 Jul 2011 09:34:21 GMT
Author: aadamchik
Date: Sun Jul 17 09:34:20 2011
New Revision: 1147566

URL: http://svn.apache.org/viewvc?rev=1147566&view=rev
Log:
license audit for 3.1

Modified:
    cayenne/main/trunk/framework/cayenne-legal-unpublished/src/main/resources/META-INF/cayenne/LICENSE.txt
    cayenne/main/trunk/framework/cayenne-legal-unpublished/src/main/resources/META-INF/cayenne/NOTICE.txt

Modified: cayenne/main/trunk/framework/cayenne-legal-unpublished/src/main/resources/META-INF/cayenne/LICENSE.txt
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-legal-unpublished/src/main/resources/META-INF/cayenne/LICENSE.txt?rev=1147566&r1=1147565&r2=1147566&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-legal-unpublished/src/main/resources/META-INF/cayenne/LICENSE.txt
(original)
+++ cayenne/main/trunk/framework/cayenne-legal-unpublished/src/main/resources/META-INF/cayenne/LICENSE.txt
Sun Jul 17 09:34:20 2011
@@ -351,62 +351,6 @@ CAUCHO LICENSE
  * individuals on behalf of the ASHWOOD Project and was originally
  * created by Andriy Shapochka.
  */
-
-=====================================================================
-JDOM LICENSE 
-
- LICENSE.jdom.txt
-
- Copyright (C) 2000-2003 Jason Hunter & Brett McLaughlin.
- All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 
- 1. Redistributions of source code must retain the above copyright
-    notice, this list of conditions, and the following disclaimer.
- 
- 2. Redistributions in binary form must reproduce the above copyright
-    notice, this list of conditions, and the disclaimer that follows 
-    these conditions in the documentation and/or other materials 
-    provided with the distribution.
-
- 3. The name "JDOM" must not be used to endorse or promote products
-    derived from this software without prior written permission.  For
-    written permission, please contact <license AT jdom DOT org>.
- 
- 4. Products derived from this software may not be called "JDOM", nor
-    may "JDOM" appear in their name, without prior written permission
-    from the JDOM Project Management <pm AT jdom DOT org>.
- 
- In addition, we request (but do not require) that you include in the 
- end-user documentation provided with the redistribution and/or in the 
- software itself an acknowledgement equivalent to the following:
-     "This product includes software developed by the
-      JDOM Project (http://www.jdom.org/)."
- Alternatively, the acknowledgment may be graphical using the logos 
- available at http://www.jdom.org/images/logos.
-
- THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN NO EVENT SHALL THE JDOM AUTHORS OR THE PROJECT
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
-
- This software consists of voluntary contributions made by many 
- individuals on behalf of the JDOM Project and was originally 
- created by Jason Hunter <jhunter AT jdom DOT org> and
- Brett McLaughlin <brett AT jdom DOT org>.  For more information on
- the JDOM Project, please see <http://www.jdom.org/>.
-
 =====================================================================
 JGOODIES LICENSE
 
@@ -442,42 +386,6 @@ OTHERWISE) ARISING IN ANY WAY OUT OF THE
 EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 =====================================================================
-SCOPE LICENSE
-
-Scope: a generic MVC framework.
-Copyright (c) 2000-2002, The Scope team
-All rights reserved.
-
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-Neither the name "Scope" nor the names of its contributors
-may be used to endorse or promote products derived from this software
-without specific prior written permission.
-
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-=====================================================================
 7. OGNL LICENSE
 
 //	Copyright (c) 1998-2004, Drew Davidson and Luke Blanshard
@@ -510,77 +418,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI
 //  DAMAGE.
 
 =====================================================================
-HSQLDB LICENSE
-
-ORIGINAL LICENSE (a.k.a. "hypersonic_lic.txt")
-
-For content, code, and products originally developed by Thomas Mueller and the Hypersonic
SQL Group:
-
-Copyright (c) 1995-2000 by the Hypersonic SQL Group.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-
-Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
-
-Neither the name of the Hypersonic SQL Group nor the names of its
-contributors may be used to endorse or promote products derived from this
-software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL THE HYPERSONIC SQL GROUP,
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-This software consists of voluntary contributions made by many individuals on behalf of the
-Hypersonic SQL Group.
-
-For work added by the HSQL Development Group (a.k.a. hsqldb_lic.txt):
-
-Copyright (c) 2001-2005, The HSQL Development Group
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-
-Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
-
-Neither the name of the HSQL Development Group nor the names of its
-contributors may be used to endorse or promote products derived from this
-software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG,
-OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-=====================================================================
 Eclipse Public License -v 1.0
 
 (plain text)
@@ -722,8 +559,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTR
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
-
-
 =====================================================================
 Inflector License
 
@@ -928,3 +763,35 @@ distributed under the License is distrib
 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.
+
+
+=====================================================================
+JGraph License
+
+Copyright (c) <year>, <copyright holder>
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. All advertising materials mentioning features or use of this software
+   must display the following acknowledgement:
+   This product includes software developed by the <organization>.
+4. Neither the name of the <organization> nor the
+   names of its contributors may be used to endorse or promote products
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY <COPYRIGHT HOLDER> ''AS IS'' AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file

Modified: cayenne/main/trunk/framework/cayenne-legal-unpublished/src/main/resources/META-INF/cayenne/NOTICE.txt
URL: http://svn.apache.org/viewvc/cayenne/main/trunk/framework/cayenne-legal-unpublished/src/main/resources/META-INF/cayenne/NOTICE.txt?rev=1147566&r1=1147565&r2=1147566&view=diff
==============================================================================
--- cayenne/main/trunk/framework/cayenne-legal-unpublished/src/main/resources/META-INF/cayenne/NOTICE.txt
(original)
+++ cayenne/main/trunk/framework/cayenne-legal-unpublished/src/main/resources/META-INF/cayenne/NOTICE.txt
Sun Jul 17 09:34:20 2011
@@ -20,25 +20,22 @@ originally developed at The ObjectStyle 
 
 GUI TOOLS
 
-4. CayenneModeler and DVModeler includes JGoodies library developed by Karsten Lentzsch.
+4. CayenneModeler includes JGoodies library developed by Karsten Lentzsch.
 (http://www.jgoodies.com/)
 
-5. CayenneModeler includes the Scope library developed by The Scope team.
-(http://scope.sourceforge.net/)
-
-6. CayenneModeler includes OGNL library developed by Drew Davidson and Luke Blanshard
+5. CayenneModeler includes OGNL library developed by Drew Davidson and Luke Blanshard
 (http://www.ognl.org/)
 
-7. CayenneModeler includes HSQLDB library developed by The HSQL Development Group.
-(http://www.hsqldb.org/)
-
-8. CayenneModeler includes GIF binary images developed by Eclipse Foundation. 
+6. CayenneModeler includes GIF binary images developed by Eclipse Foundation. 
 (http://www.eclipse.org/).
 
-9. CayenneModeler includes jEdit-syntax library developed by Slava Pestov, Artur Biesiadowski,

+7. CayenneModeler includes jEdit-syntax library developed by Slava Pestov, Artur Biesiadowski,

 Clancy Malcolm, Jonathan Revusky, Juha Lindfors and Mike Dillon.
 (http://jedit-syntax.sourceforge.net/)
 
-10. CayenneModeler includes Inflector library developed by the Inflector project
+8. CayenneModeler includes Inflector library developed by the Inflector project
 (https://inflector.dev.java.net/)
 
+8. CayenneModeler includes JGraph library developed by JGraph Ltd
+(http://www.jgraph.com)
+



Mime
View raw message