Author: nick Date: Thu Feb 21 08:44:46 2008 New Revision: 629865 URL: http://svn.apache.org/viewvc?rev=629865&view=rev Log: At the request of legal-discuss, shuffle the ooxml xsd licence details into LICENSE from NOTICE
Modified: poi/trunk/legal/LICENSE poi/trunk/legal/NOTICE Modified: poi/trunk/legal/LICENSE URL: http://svn.apache.org/viewvc/poi/trunk/legal/LICENSE?rev=629865&r1=629864&r2=629865&view=diff ============================================================================== --- poi/trunk/legal/LICENSE (original) +++ poi/trunk/legal/LICENSE Thu Feb 21 08:44:46 2008 @@ -200,3 +200,20 @@ 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. + + + + +Office Open XML (OOXML) xsds: +----------------------------- + +These were downloaded as part of the Office Open XML ECMA Specification +from <http://www.ecma-international.org/publications/standards/Ecma-376.htm> + +These are included within the Apache POI distribution, and are available +under compatible licensing terms. + +Copyright - ECMA International, "made available without restriction" + http://www.ecma-international.org/memento/Ecmabylaws.htm - section 9.4 +Patent License - Microsoft Open Specification Promise (OSP) + http://www.microsoft.com/interop/osp/ Modified: poi/trunk/legal/NOTICE URL: http://svn.apache.org/viewvc/poi/trunk/legal/NOTICE?rev=629865&r1=629864&r2=629865&view=diff ============================================================================== --- poi/trunk/legal/NOTICE (original) +++ poi/trunk/legal/NOTICE Thu Feb 21 08:44:46 2008 @@ -19,19 +19,14 @@ See http://www.gnome.ru/projects/vsdump_en.html -Office Open XML experimental support: - XML Beans - http://xmlbeans.apache.org/ - Apache Licence Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - DOM4J - http://www.dom4j.org/ - BSD Licence - http://www.dom4j.org/license.html - Jaxen - http://jaxen.org/ - Apache Style Licence - http://jaxen.org/license.html - OpenXml4J - http://www.openxml4j.org/ - BSD Licence or Apache Licence Version 2.0 - - http://www.openxml4j.org/Licensing/Default.html - Office Open XML ECMA Specification - - http://www.ecma-international.org/publications/standards/Ecma-376.htm - Copyright - ECMA International, made available without restriction - http://www.ecma-international.org/memento/Ecmabylaws.htm - section 9.4 - Patent - Microsoft Open Specification Promise (OSP) - http://www.microsoft.com/interop/osp/ +The Office Open XML experimental support had additional dependencies, +with their own licensing: + * XML Beans - http://xmlbeans.apache.org/ + Apache Licence Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 + * DOM4J - http://www.dom4j.org/ + BSD Licence - http://www.dom4j.org/license.html + * Jaxen - http://jaxen.org/ + Apache Style Licence - http://jaxen.org/license.html + * OpenXml4J - http://www.openxml4j.org/ + BSD Licence or Apache Licence Version 2.0 - + http://www.openxml4j.org/Licensing/Default.html --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]