You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mh...@apache.org on 2004/02/26 23:22:43 UTC
cvs commit: xml-xalan/c/Projects/Win32/VC7/Utils/Localization BuildMessages.mak tools.ini
mhoyt 2004/02/26 14:22:43
Modified: c/Projects/MacOS/ProjectBuilder/XalanLib XalanLib_Prefix.h
c/Projects/MacOS/ProjectBuilder/XalanSamples
xalan_sample_prefix.h
c/Projects/Win32/VC6/Utils/Localization BuildMessages.mak
tools.ini
c/Projects/Win32/VC7/Utils/Localization BuildMessages.mak
tools.ini
Log:
Update to Apache 2.0 License
Revision Changes Path
1.4 +12 -52 xml-xalan/c/Projects/MacOS/ProjectBuilder/XalanLib/XalanLib_Prefix.h
Index: XalanLib_Prefix.h
===================================================================
RCS file: /home/cvs/xml-xalan/c/Projects/MacOS/ProjectBuilder/XalanLib/XalanLib_Prefix.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XalanLib_Prefix.h 6 Jan 2004 02:41:25 -0000 1.3
+++ XalanLib_Prefix.h 26 Feb 2004 22:22:42 -0000 1.4
@@ -1,57 +1,17 @@
/*
- * The Apache Software License, Version 1.1
+ * Copyright 1999-2004 The Apache Software Foundation.
*
- * Copyright (c) 1999-2004 The Apache Software Foundation. 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. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Xerces" and "Apache Software Foundation" must
- * not be used to endorse or promote products derived from this
- * software without prior written permission. For written
- * permission, please contact apache\@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- * nor may "Apache" appear in their name, without prior written
- * permission of the Apache Software Foundation.
- *
- * 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 APACHE SOFTWARE FOUNDATION OR
- * ITS 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 Apache Software Foundation, and was
- * originally based on software copyright (c) 2001, International
- * Business Machines, Inc., http://www.ibm.com . For more information
- * on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
+ * 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.
*/
//
1.4 +13 -53 xml-xalan/c/Projects/MacOS/ProjectBuilder/XalanSamples/xalan_sample_prefix.h
Index: xalan_sample_prefix.h
===================================================================
RCS file: /home/cvs/xml-xalan/c/Projects/MacOS/ProjectBuilder/XalanSamples/xalan_sample_prefix.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xalan_sample_prefix.h 6 Jan 2004 02:41:25 -0000 1.3
+++ xalan_sample_prefix.h 26 Feb 2004 22:22:42 -0000 1.4
@@ -1,57 +1,17 @@
/*
- * The Apache Software License, Version 1.1
+ * Copyright 1999-2004 The Apache Software Foundation.
*
- * Copyright (c) 1999-2004 The Apache Software Foundation. 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. The end-user documentation included with the redistribution,
- * if any, must include the following acknowledgment:
- * "This product includes software developed by the
- * Apache Software Foundation (http://www.apache.org/)."
- * Alternately, this acknowledgment may appear in the software itself,
- * if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Xerces" and "Apache Software Foundation" must
- * not be used to endorse or promote products derived from this
- * software without prior written permission. For written
- * permission, please contact apache\@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- * nor may "Apache" appear in their name, without prior written
- * permission of the Apache Software Foundation.
- *
- * 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 APACHE SOFTWARE FOUNDATION OR
- * ITS 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 Apache Software Foundation, and was
- * originally based on software copyright (c) 2001, International
- * Business Machines, Inc., http://www.ibm.com . For more information
- * on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
+ * 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.
*/
/*
1.2 +15 -0 xml-xalan/c/Projects/Win32/VC6/Utils/Localization/BuildMessages.mak
Index: BuildMessages.mak
===================================================================
RCS file: /home/cvs/xml-xalan/c/Projects/Win32/VC6/Utils/Localization/BuildMessages.mak,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BuildMessages.mak 29 Jan 2004 23:28:25 -0000 1.1
+++ BuildMessages.mak 26 Feb 2004 22:22:42 -0000 1.2
@@ -1,4 +1,19 @@
# This makefike requires Tools.ini file with settings
+#
+# Copyright 1999-2004 The Apache Software Foundation.
+#
+# 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.
+#
# Check parameters:
# Should be defined:
1.5 +15 -0 xml-xalan/c/Projects/Win32/VC6/Utils/Localization/tools.ini
Index: tools.ini
===================================================================
RCS file: /home/cvs/xml-xalan/c/Projects/Win32/VC6/Utils/Localization/tools.ini,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tools.ini 5 Jan 2004 22:27:39 -0000 1.4
+++ tools.ini 26 Feb 2004 22:22:42 -0000 1.5
@@ -1,3 +1,18 @@
+#
+# Copyright 1999-2004 The Apache Software Foundation.
+#
+# 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.
+#
[NMAKE]
CFG=Release
# can be Win32 or Win64
1.2 +15 -0 xml-xalan/c/Projects/Win32/VC7/Utils/Localization/BuildMessages.mak
Index: BuildMessages.mak
===================================================================
RCS file: /home/cvs/xml-xalan/c/Projects/Win32/VC7/Utils/Localization/BuildMessages.mak,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BuildMessages.mak 11 Feb 2004 01:14:18 -0000 1.1
+++ BuildMessages.mak 26 Feb 2004 22:22:43 -0000 1.2
@@ -1,4 +1,19 @@
# This makefike requires Tools.ini file with settings
+#
+# Copyright 1999-2004 The Apache Software Foundation.
+#
+# 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.
+#
# Check parameters:
# Should be defined:
1.2 +15 -0 xml-xalan/c/Projects/Win32/VC7/Utils/Localization/tools.ini
Index: tools.ini
===================================================================
RCS file: /home/cvs/xml-xalan/c/Projects/Win32/VC7/Utils/Localization/tools.ini,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tools.ini 11 Feb 2004 01:14:18 -0000 1.1
+++ tools.ini 26 Feb 2004 22:22:43 -0000 1.2
@@ -1,3 +1,18 @@
+#
+# Copyright 1999-2004 The Apache Software Foundation.
+#
+# 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.
+#
[NMAKE]
CFG=Release
# can be Win32 or Win64
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org