You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by jf...@apache.org on 2004/02/27 09:40:46 UTC
cvs commit: jakarta-commons/daemon/src/native/unix/support apfunctions.m4 apjava.m4 apsupport.m4 buildconf.sh
jfclere 2004/02/27 00:40:46
Modified: daemon/src/native/nt/procrun procrun.rc
daemon/src/native/unix Makedefs.in Makefile.in configure.in
daemon/src/native/unix/support apfunctions.m4 apjava.m4
apsupport.m4 buildconf.sh
Log:
Last? files with the old license.
Revision Changes Path
1.7 +13 -55 jakarta-commons/daemon/src/native/nt/procrun/procrun.rc
Index: procrun.rc
===================================================================
RCS file: /home/cvs/jakarta-commons/daemon/src/native/nt/procrun/procrun.rc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- procrun.rc 23 Oct 2003 14:06:58 -0000 1.6
+++ procrun.rc 27 Feb 2004 08:40:46 -0000 1.7
@@ -1,59 +1,17 @@
-/* ====================================================================
- * The Apache Software License, Version 1.1
+/*
+ * Copyright 1999-2004 The Apache Software Foundation
*
- * Copyright (c) 2000-2003 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 "Apache" 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. For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- *
- * Portions of this software are based upon public domain software
- * originally written at the National Center for Supercomputing Applications,
- * University of Illinois, Urbana-Champaign.
+ * 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.
*/
#include "procrun.h"
1.2 +16 -57 jakarta-commons/daemon/src/native/unix/Makedefs.in
Index: Makedefs.in
===================================================================
RCS file: /home/cvs/jakarta-commons/daemon/src/native/unix/Makedefs.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makedefs.in 4 Sep 2003 23:28:20 -0000 1.1
+++ Makedefs.in 27 Feb 2004 08:40:46 -0000 1.2
@@ -1,59 +1,18 @@
-# ========================================================================= #
-# #
-# The Apache Software License, Version 1.1 #
-# #
-# Copyright (c) 1999-2001 The Apache Software Foundation. #
-# All rights reserved. #
-# #
-# ========================================================================= #
-# #
-# Redistribution and use in source and binary forms, with or without modi- #
-# fication, are permitted provided that the following conditions are met: #
-# #
-# 1. Redistributions of source code must retain the above copyright notice #
-# 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 acknowlegement: #
-# #
-# "This product includes software developed by the Apache Software #
-# Foundation <http://www.apache.org/>." #
-# #
-# Alternately, this acknowlegement may appear in the software itself, if #
-# and wherever such third-party acknowlegements normally appear. #
-# #
-# 4. The names "The Jakarta Project", "WebApp", 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 <ap...@apache.org>. #
-# #
-# 5. Products derived from this software may not be called "Apache" nor may #
-# "Apache" appear in their names 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 indivi- #
-# duals on behalf of the Apache Software Foundation. For more information #
-# on the Apache Software Foundation, please see <http://www.apache.org/>. #
-# #
-# ========================================================================= #
+#
+# 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.
+#
# @author Pier Fumagalli <ma...@eng.sun.com>
# @version $Id$
1.2 +16 -57 jakarta-commons/daemon/src/native/unix/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/jakarta-commons/daemon/src/native/unix/Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.in 4 Sep 2003 23:28:20 -0000 1.1
+++ Makefile.in 27 Feb 2004 08:40:46 -0000 1.2
@@ -1,59 +1,18 @@
-# ========================================================================= #
-# #
-# The Apache Software License, Version 1.1 #
-# #
-# Copyright (c) 1999-2001 The Apache Software Foundation. #
-# All rights reserved. #
-# #
-# ========================================================================= #
-# #
-# Redistribution and use in source and binary forms, with or without modi- #
-# fication, are permitted provided that the following conditions are met: #
-# #
-# 1. Redistributions of source code must retain the above copyright notice #
-# 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 acknowlegement: #
-# #
-# "This product includes software developed by the Apache Software #
-# Foundation <http://www.apache.org/>." #
-# #
-# Alternately, this acknowlegement may appear in the software itself, if #
-# and wherever such third-party acknowlegements normally appear. #
-# #
-# 4. The names "The Jakarta Project", "WebApp", 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 <ap...@apache.org>. #
-# #
-# 5. Products derived from this software may not be called "Apache" nor may #
-# "Apache" appear in their names 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 indivi- #
-# duals on behalf of the Apache Software Foundation. For more information #
-# on the Apache Software Foundation, please see <http://www.apache.org/>. #
-# #
-# ========================================================================= #
+#
+# 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.
+#
# @author Pier Fumagalli <ma...@eng.sun.com>
# @version $Id$
1.3 +13 -54 jakarta-commons/daemon/src/native/unix/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/jakarta-commons/daemon/src/native/unix/configure.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- configure.in 12 Sep 2003 09:08:51 -0000 1.2
+++ configure.in 27 Feb 2004 08:40:46 -0000 1.3
@@ -1,59 +1,18 @@
-dnl =========================================================================
dnl
-dnl The Apache Software License, Version 1.1
+dnl Copyright 1999-2004 The Apache Software Foundation
dnl
-dnl Copyright (c) 1999-2001 The Apache Software Foundation.
-dnl All rights reserved.
+dnl Licensed under the Apache License, Version 2.0 (the "License");
+dnl you may not use this file except in compliance with the License.
+dnl You may obtain a copy of the License at
+dnl
+dnl http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing, software
+dnl distributed under the License is distributed on an "AS IS" BASIS,
+dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+dnl See the License for the specific language governing permissions and
+dnl limitations under the License.
dnl
-dnl =========================================================================
-dnl
-dnl Redistribution and use in source and binary forms, with or without modi-
-dnl fication, are permitted provided that the following conditions are met:
-dnl
-dnl 1. Redistributions of source code must retain the above copyright notice
-dnl notice, this list of conditions and the following disclaimer.
-dnl
-dnl 2. Redistributions in binary form must reproduce the above copyright
-dnl notice, this list of conditions and the following disclaimer in the
-dnl documentation and/or other materials provided with the distribution.
-dnl
-dnl 3. The end-user documentation included with the redistribution, if any,
-dnl must include the following acknowlegement:
-dnl
-dnl "This product includes software developed by the Apache Software
-dnl Foundation <http://www.apache.org/>."
-dnl
-dnl Alternately, this acknowlegement may appear in the software itself, if
-dnl and wherever such third-party acknowlegements normally appear.
-dnl
-dnl 4. The names "The Jakarta Project", "WebApp", and "Apache Software
-dnl Foundation" must not be used to endorse or promote products derived
-dnl from this software without prior written permission. For written
-dnl permission, please contact <ap...@apache.org>.
-dnl
-dnl 5. Products derived from this software may not be called "Apache" nor may
-dnl "Apache" appear in their names without prior written permission of the
-dnl Apache Software Foundation.
-dnl
-dnl THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES
-dnl INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-dnl AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-dnl THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY
-dnl DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-dnl DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-dnl OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-dnl HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-dnl STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-dnl ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-dnl POSSIBILITY OF SUCH DAMAGE.
-dnl
-dnl =========================================================================
-dnl
-dnl This software consists of voluntary contributions made by many indivi-
-dnl duals on behalf of the Apache Software Foundation. For more information
-dnl on the Apache Software Foundation, please see <http://www.apache.org/>.
-dnl
-dnl =========================================================================
dnl -------------------------------------------------------------------------
dnl Author Pier Fumagalli <ma...@eng.sun.com>
1.2 +13 -54 jakarta-commons/daemon/src/native/unix/support/apfunctions.m4
Index: apfunctions.m4
===================================================================
RCS file: /home/cvs/jakarta-commons/daemon/src/native/unix/support/apfunctions.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- apfunctions.m4 4 Sep 2003 23:28:20 -0000 1.1
+++ apfunctions.m4 27 Feb 2004 08:40:46 -0000 1.2
@@ -1,59 +1,18 @@
-dnl =========================================================================
dnl
-dnl The Apache Software License, Version 1.1
+dnl Copyright 1999-2004 The Apache Software Foundation
dnl
-dnl Copyright (c) 1999-2001 The Apache Software Foundation.
-dnl All rights reserved.
+dnl Licensed under the Apache License, Version 2.0 (the "License");
+dnl you may not use this file except in compliance with the License.
+dnl You may obtain a copy of the License at
+dnl
+dnl http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing, software
+dnl distributed under the License is distributed on an "AS IS" BASIS,
+dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+dnl See the License for the specific language governing permissions and
+dnl limitations under the License.
dnl
-dnl =========================================================================
-dnl
-dnl Redistribution and use in source and binary forms, with or without modi-
-dnl fication, are permitted provided that the following conditions are met:
-dnl
-dnl 1. Redistributions of source code must retain the above copyright notice
-dnl notice, this list of conditions and the following disclaimer.
-dnl
-dnl 2. Redistributions in binary form must reproduce the above copyright
-dnl notice, this list of conditions and the following disclaimer in the
-dnl documentation and/or other materials provided with the distribution.
-dnl
-dnl 3. The end-user documentation included with the redistribution, if any,
-dnl must include the following acknowlegement:
-dnl
-dnl "This product includes software developed by the Apache Software
-dnl Foundation <http://www.apache.org/>."
-dnl
-dnl Alternately, this acknowlegement may appear in the software itself, if
-dnl and wherever such third-party acknowlegements normally appear.
-dnl
-dnl 4. The names "The Jakarta Project", "WebApp", and "Apache Software
-dnl Foundation" must not be used to endorse or promote products derived
-dnl from this software without prior written permission. For written
-dnl permission, please contact <ap...@apache.org>.
-dnl
-dnl 5. Products derived from this software may not be called "Apache" nor may
-dnl "Apache" appear in their names without prior written permission of the
-dnl Apache Software Foundation.
-dnl
-dnl THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES
-dnl INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-dnl AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-dnl THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY
-dnl DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-dnl DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-dnl OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-dnl HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-dnl STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-dnl ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-dnl POSSIBILITY OF SUCH DAMAGE.
-dnl
-dnl =========================================================================
-dnl
-dnl This software consists of voluntary contributions made by many indivi-
-dnl duals on behalf of the Apache Software Foundation. For more information
-dnl on the Apache Software Foundation, please see <http://www.apache.org/>.
-dnl
-dnl =========================================================================
dnl -------------------------------------------------------------------------
dnl Author Pier Fumagalli <ma...@eng.sun.com>
1.3 +13 -54 jakarta-commons/daemon/src/native/unix/support/apjava.m4
Index: apjava.m4
===================================================================
RCS file: /home/cvs/jakarta-commons/daemon/src/native/unix/support/apjava.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- apjava.m4 25 Sep 2003 11:13:02 -0000 1.2
+++ apjava.m4 27 Feb 2004 08:40:46 -0000 1.3
@@ -1,59 +1,18 @@
-dnl =========================================================================
dnl
-dnl The Apache Software License, Version 1.1
+dnl Copyright 1999-2004 The Apache Software Foundation
dnl
-dnl Copyright (c) 1999-2001 The Apache Software Foundation.
-dnl All rights reserved.
+dnl Licensed under the Apache License, Version 2.0 (the "License");
+dnl you may not use this file except in compliance with the License.
+dnl You may obtain a copy of the License at
+dnl
+dnl http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing, software
+dnl distributed under the License is distributed on an "AS IS" BASIS,
+dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+dnl See the License for the specific language governing permissions and
+dnl limitations under the License.
dnl
-dnl =========================================================================
-dnl
-dnl Redistribution and use in source and binary forms, with or without modi-
-dnl fication, are permitted provided that the following conditions are met:
-dnl
-dnl 1. Redistributions of source code must retain the above copyright notice
-dnl notice, this list of conditions and the following disclaimer.
-dnl
-dnl 2. Redistributions in binary form must reproduce the above copyright
-dnl notice, this list of conditions and the following disclaimer in the
-dnl documentation and/or other materials provided with the distribution.
-dnl
-dnl 3. The end-user documentation included with the redistribution, if any,
-dnl must include the following acknowlegement:
-dnl
-dnl "This product includes software developed by the Apache Software
-dnl Foundation <http://www.apache.org/>."
-dnl
-dnl Alternately, this acknowlegement may appear in the software itself, if
-dnl and wherever such third-party acknowlegements normally appear.
-dnl
-dnl 4. The names "The Jakarta Project", "WebApp", and "Apache Software
-dnl Foundation" must not be used to endorse or promote products derived
-dnl from this software without prior written permission. For written
-dnl permission, please contact <ap...@apache.org>.
-dnl
-dnl 5. Products derived from this software may not be called "Apache" nor may
-dnl "Apache" appear in their names without prior written permission of the
-dnl Apache Software Foundation.
-dnl
-dnl THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES
-dnl INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-dnl AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-dnl THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY
-dnl DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-dnl DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-dnl OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-dnl HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-dnl STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-dnl ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-dnl POSSIBILITY OF SUCH DAMAGE.
-dnl
-dnl =========================================================================
-dnl
-dnl This software consists of voluntary contributions made by many indivi-
-dnl duals on behalf of the Apache Software Foundation. For more information
-dnl on the Apache Software Foundation, please see <http://www.apache.org/>.
-dnl
-dnl =========================================================================
dnl -------------------------------------------------------------------------
dnl Author Pier Fumagalli <ma...@eng.sun.com>
1.4 +13 -54 jakarta-commons/daemon/src/native/unix/support/apsupport.m4
Index: apsupport.m4
===================================================================
RCS file: /home/cvs/jakarta-commons/daemon/src/native/unix/support/apsupport.m4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- apsupport.m4 25 Sep 2003 13:38:27 -0000 1.3
+++ apsupport.m4 27 Feb 2004 08:40:46 -0000 1.4
@@ -1,59 +1,18 @@
-dnl =========================================================================
dnl
-dnl The Apache Software License, Version 1.1
+dnl Copyright 1999-2004 The Apache Software Foundation
dnl
-dnl Copyright (c) 1999-2001 The Apache Software Foundation.
-dnl All rights reserved.
+dnl Licensed under the Apache License, Version 2.0 (the "License");
+dnl you may not use this file except in compliance with the License.
+dnl You may obtain a copy of the License at
+dnl
+dnl http://www.apache.org/licenses/LICENSE-2.0
+dnl
+dnl Unless required by applicable law or agreed to in writing, software
+dnl distributed under the License is distributed on an "AS IS" BASIS,
+dnl WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+dnl See the License for the specific language governing permissions and
+dnl limitations under the License.
dnl
-dnl =========================================================================
-dnl
-dnl Redistribution and use in source and binary forms, with or without modi-
-dnl fication, are permitted provided that the following conditions are met:
-dnl
-dnl 1. Redistributions of source code must retain the above copyright notice
-dnl notice, this list of conditions and the following disclaimer.
-dnl
-dnl 2. Redistributions in binary form must reproduce the above copyright
-dnl notice, this list of conditions and the following disclaimer in the
-dnl documentation and/or other materials provided with the distribution.
-dnl
-dnl 3. The end-user documentation included with the redistribution, if any,
-dnl must include the following acknowlegement:
-dnl
-dnl "This product includes software developed by the Apache Software
-dnl Foundation <http://www.apache.org/>."
-dnl
-dnl Alternately, this acknowlegement may appear in the software itself, if
-dnl and wherever such third-party acknowlegements normally appear.
-dnl
-dnl 4. The names "The Jakarta Project", "WebApp", and "Apache Software
-dnl Foundation" must not be used to endorse or promote products derived
-dnl from this software without prior written permission. For written
-dnl permission, please contact <ap...@apache.org>.
-dnl
-dnl 5. Products derived from this software may not be called "Apache" nor may
-dnl "Apache" appear in their names without prior written permission of the
-dnl Apache Software Foundation.
-dnl
-dnl THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED WARRANTIES
-dnl INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-dnl AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-dnl THE APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY
-dnl DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-dnl DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-dnl OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-dnl HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-dnl STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-dnl ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-dnl POSSIBILITY OF SUCH DAMAGE.
-dnl
-dnl =========================================================================
-dnl
-dnl This software consists of voluntary contributions made by many indivi-
-dnl duals on behalf of the Apache Software Foundation. For more information
-dnl on the Apache Software Foundation, please see <http://www.apache.org/>.
-dnl
-dnl =========================================================================
dnl -------------------------------------------------------------------------
dnl Author Pier Fumagalli <ma...@eng.sun.com>
1.3 +16 -57 jakarta-commons/daemon/src/native/unix/support/buildconf.sh
Index: buildconf.sh
===================================================================
RCS file: /home/cvs/jakarta-commons/daemon/src/native/unix/support/buildconf.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- buildconf.sh 12 Sep 2003 09:05:57 -0000 1.2
+++ buildconf.sh 27 Feb 2004 08:40:46 -0000 1.3
@@ -1,60 +1,19 @@
#!/bin/sh
-# ========================================================================= #
-# #
-# The Apache Software License, Version 1.1 #
-# #
-# Copyright (c) 1999-2001 The Apache Software Foundation. #
-# All rights reserved. #
-# #
-# ========================================================================= #
-# #
-# Redistribution and use in source and binary forms, with or without modi- #
-# fication, are permitted provided that the following conditions are met: #
-# #
-# 1. Redistributions of source code must retain the above copyright notice #
-# 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 acknowlegement: #
-# #
-# "This product includes software developed by the Apache Software #
-# Foundation <http://www.apache.org/>." #
-# #
-# Alternately, this acknowlegement may appear in the software itself, if #
-# and wherever such third-party acknowlegements normally appear. #
-# #
-# 4. The names "The Jakarta Project", "WebApp", 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 <ap...@apache.org>. #
-# #
-# 5. Products derived from this software may not be called "Apache" nor may #
-# "Apache" appear in their names 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 indivi- #
-# duals on behalf of the Apache Software Foundation. For more information #
-# on the Apache Software Foundation, please see <http://www.apache.org/>. #
-# #
-# ========================================================================= #
+#
+# 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.
+#
# @author Pier Fumagalli <ma...@eng.sun.com>
# @version $Id$
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org