diff --git a/clc/modules/bootstrap/src/main/native/eucalyptus-bootstrap.c b/clc/modules/bootstrap/src/main/native/eucalyptus-bootstrap.c index 9718724aa12..cf698981e97 100644 --- a/clc/modules/bootstrap/src/main/native/eucalyptus-bootstrap.c +++ b/clc/modules/bootstrap/src/main/native/eucalyptus-bootstrap.c @@ -1,74 +1,51 @@ /************************************************************************* - * Copyright 2009-2016 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2016 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * 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. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. + * 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 + * COPYRIGHT OWNER 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. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. * * This file may incorporate work covered under the following copyright * and permission notice: * - * Software License Agreement (BSD License) - * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software 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. - * - * 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 - * COPYRIGHT OWNER 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. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Copyright 2001-2004 The Apache Software Foundation. + * Copyright 2001-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 + * 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, diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/binding/HoldMe.java b/clc/modules/msgs/src/main/java/com/eucalyptus/binding/HoldMe.java index f739e6350da..9bbfd673660 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/binding/HoldMe.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/binding/HoldMe.java @@ -1,83 +1,57 @@ /************************************************************************* - * Copyright 2009-2014 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2014 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * 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. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. + * 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 + * COPYRIGHT OWNER 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. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. * * This file may incorporate work covered under the following copyright * and permission notice: * - * Software License Agreement (BSD License) + * Copyright 2001-2004 The Apache Software Foundation * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. - * - * Redistribution and use of this software 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. - * - * 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 - * COPYRIGHT OWNER 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. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you 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 + * 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. + * 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. ************************************************************************/ package com.eucalyptus.binding; diff --git a/clc/modules/msgs/src/main/java/com/eucalyptus/org/apache/tools/ant/util/DateUtils.java b/clc/modules/msgs/src/main/java/com/eucalyptus/org/apache/tools/ant/util/DateUtils.java index 3141bc590ba..8216572c998 100644 --- a/clc/modules/msgs/src/main/java/com/eucalyptus/org/apache/tools/ant/util/DateUtils.java +++ b/clc/modules/msgs/src/main/java/com/eucalyptus/org/apache/tools/ant/util/DateUtils.java @@ -1,75 +1,51 @@ /************************************************************************* - * Copyright 2009-2012 Eucalyptus Systems, Inc. + * Copyright 2008 Regents of the University of California + * Copyright 2009-2012 Ent. Services Development Corporation LP * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 3 of the License. + * Redistribution and use of this software in source and binary forms, + * with or without modification, are permitted provided that the + * following conditions are met: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see http://www.gnu.org/licenses/. + * 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. * - * Please contact Eucalyptus Systems, Inc., 6755 Hollister Ave., Goleta - * CA 93117, USA or visit http://www.eucalyptus.com/licenses/ if you need - * additional information or have any questions. + * 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 + * COPYRIGHT OWNER 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. USERS OF THIS SOFTWARE ACKNOWLEDGE + * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, + * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, + * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING + * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, + * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, + * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, + * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO + * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT + * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. * * This file may incorporate work covered under the following copyright * and permission notice: * - * Software License Agreement (BSD License) + * Copyright 2001-2004 The Apache Software Foundation * - * Copyright (c) 2008, Regents of the University of California - * All rights reserved. + * 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 * - * Redistribution and use of this software 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. - * - * 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 - * COPYRIGHT OWNER 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. USERS OF THIS SOFTWARE ACKNOWLEDGE - * THE POSSIBLE PRESENCE OF OTHER OPEN SOURCE LICENSED MATERIAL, - * COPYRIGHTED MATERIAL OR PATENTED MATERIAL IN THIS SOFTWARE, - * AND IF ANY SUCH MATERIAL IS DISCOVERED THE PARTY DISCOVERING - * IT MAY INFORM DR. RICH WOLSKI AT THE UNIVERSITY OF CALIFORNIA, - * SANTA BARBARA WHO WILL THEN ASCERTAIN THE MOST APPROPRIATE REMEDY, - * WHICH IN THE REGENTS' DISCRETION MAY INCLUDE, WITHOUT LIMITATION, - * REPLACEMENT OF THE CODE SO IDENTIFIED, LICENSING OF THE CODE SO - * IDENTIFIED, OR WITHDRAWAL OF THE CODE CAPABILITY TO THE EXTENT - * NEEDED TO COMPLY WITH ANY SUCH LICENSES OR RIGHTS. - * - * This file may incorporate work covered under the following copyright - * and permission notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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 + * 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,