You are viewing a plain text version of this content. The canonical link for it is here.
Posted to photark-commits@incubator.apache.org by lr...@apache.org on 2009/09/02 16:43:47 UTC
svn commit: r810601 - in /incubator/photark/trunk: assets/NOTICE
distribution/src/main/release/bin/LICENSE
distribution/src/main/release/bin/NOTICE
Author: lresende
Date: Wed Sep 2 16:43:47 2009
New Revision: 810601
URL: http://svn.apache.org/viewvc?rev=810601&view=rev
Log:
Minor updates to LICENSE and NOTES based on Sebb RC candidate feedback
Modified:
incubator/photark/trunk/assets/NOTICE
incubator/photark/trunk/distribution/src/main/release/bin/LICENSE
incubator/photark/trunk/distribution/src/main/release/bin/NOTICE
Modified: incubator/photark/trunk/assets/NOTICE
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/assets/NOTICE?rev=810601&r1=810600&r2=810601&view=diff
==============================================================================
--- incubator/photark/trunk/assets/NOTICE (original)
+++ incubator/photark/trunk/assets/NOTICE Wed Sep 2 16:43:47 2009
@@ -1,5 +1,5 @@
${pom.name}
-Copyright (c) 2005 - 2008 The Apache Software Foundation
+Copyright (c) 2008 - 2009 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: incubator/photark/trunk/distribution/src/main/release/bin/LICENSE
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/distribution/src/main/release/bin/LICENSE?rev=810601&r1=810600&r2=810601&view=diff
==============================================================================
--- incubator/photark/trunk/distribution/src/main/release/bin/LICENSE (original)
+++ incubator/photark/trunk/distribution/src/main/release/bin/LICENSE Wed Sep 2 16:43:47 2009
@@ -225,13 +225,12 @@
addressing-1.3.mar
axiom-api-1.2.7.jar
axiom-impl-1.2.7.jar
- cglib-nodep-2.1_3.jar
+ cglib-nodep-2.2.jar
commons-collections-3.1.jar
commons-codec-1.3.jar
commons-httpclient-3.1.jar
commons-logging-1.1.1.jar
geronimo-activation_1.1_spec-1.0.1.jar
- geronimo-commonj_1.1_spec-1.0.jar
geronimo-javamail_1.4_spec-1.2.jar
jackrabbit-api-1.4.jar
jackrabbit-core-1.4.jar
@@ -1937,98 +1936,6 @@
use in the design, construction, operation or maintenance of any nuclear
facility."
-===============================================================================
-rome-0.9.jar
-
-Copyright 2004 Sun Microsystems, Inc.
-
-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.
-
-===============================================================================
-jdom-1.0.jar :
-
-$Id: LICENSE.txt,v 1.11 2004/02/06 09:32:57 jhunter Exp $
-
- Copyright (C) 2000-2004 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 <request_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 <request_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/>.
-
-========================================================================
-
-dwr-2.0.1.jar :
-
-/*
-* Copyright 2005 Joe Walker
-*
-* 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.
-*/
-
==========================================================================
dojotoolkit V1.0.0:
Modified: incubator/photark/trunk/distribution/src/main/release/bin/NOTICE
URL: http://svn.apache.org/viewvc/incubator/photark/trunk/distribution/src/main/release/bin/NOTICE?rev=810601&r1=810600&r2=810601&view=diff
==============================================================================
--- incubator/photark/trunk/distribution/src/main/release/bin/NOTICE (original)
+++ incubator/photark/trunk/distribution/src/main/release/bin/NOTICE Wed Sep 2 16:43:47 2009
@@ -20,9 +20,6 @@
This product includes/uses the Axion : the Open Source Java Database (http://axion.tigris.org/)
Copyright (c) 2002-2003 Axion Development Team. All rights reserved.
-This product includes/uses DOM4J : the flexible XML framework for java (http://www.dom4j.org/)
- Copyright 2001-2005 (C) MetaStuff, Ltd. All Rights Reserved.
-
This product includes/uses software, AOP alliance (http://aopalliance.sourceforge.net)
License: Public Domain
@@ -35,29 +32,15 @@
This product includes software from the GlassFish project (https://glassfish.dev.java.net/)
Copyright (c) 2006, Sun Microsystems, Inc.
-This product includes software from the Rome project (https://rome.dev.java.net/)
- Copyright (c) 2006, Sun Microsystems, Inc.
-
This product includes/uses the Eclipse Modeling Framework project (http://www.eclipse.org/emf/)
This product includes/uses the Mozilla Rhino project (http://www.mozilla.org/rhino/)
-This product includes/uses the Sourceforge wsdl4j project (http://sourceforge.net/projects/wsdl4j/)i
-
This product includes/uses the Codehaus JRuby project (http://jruby.codehaus.org/)
-
-This product includes/uses JDOM (http://www.jdom.org/)
- Copyright (C) 2000-2004 Jason Hunter & Brett McLaughlin. All rights reserved.
-
-This product includes/uses DWR (http://getahead.org/dwr)
- Copyright 2005 Joe Walker. All rights reserved.
-
+
This product includes/uses dojotoolkit (http://dojotoolkit.org/)
Copyright (c) 2005, The Dojo Foundation. All rights reserved.
-This product includes/uses Howl (http://howl.objectweb.org/)
- Copyright (c) 2004, Bull S.A.
-
This product includes/uses axion (http://axion.tigris.org/)
Copyright (c) 2002-2003 Axion Development Team.