From da6ffd78bbb76e69451f99e1d5eed4c8a56dd75a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Besson?= <sbesson@glencoesoftware.com> Date: Fri, 10 Nov 2023 14:43:05 +0000 Subject: [PATCH] Update license headers for all Java sources of the OME-XML library --- .../ome/specification/XMLMockObjects.java | 6 +-- .../java/ome/specification/XMLWriter.java | 6 +-- ome-xml/src/main/java/ome/units/UNITS.java | 39 +++++++++++-------- .../main/java/ome/units/quantity/Angle.java | 31 +++++++++------ .../ome/units/quantity/ElectricPotential.java | 31 +++++++++------ .../java/ome/units/quantity/Frequency.java | 31 +++++++++------ .../main/java/ome/units/quantity/Length.java | 31 +++++++++------ .../main/java/ome/units/quantity/Power.java | 31 +++++++++------ .../java/ome/units/quantity/Pressure.java | 31 +++++++++------ .../java/ome/units/quantity/Quantity.java | 31 +++++++++------ .../java/ome/units/quantity/Temperature.java | 31 +++++++++------ .../main/java/ome/units/quantity/Time.java | 31 +++++++++------ .../src/main/java/ome/units/unit/Unit.java | 31 +++++++++------ .../ome/xml/meta/AbstractOMEXMLMetadata.java | 2 +- .../main/java/ome/xml/meta/BaseMetadata.java | 2 +- .../src/main/java/ome/xml/meta/IMetadata.java | 2 +- .../java/ome/xml/meta/MetadataConverter.java | 2 +- .../main/java/ome/xml/meta/MetadataRoot.java | 2 +- .../java/ome/xml/meta/OMEXMLMetadata.java | 2 +- .../java/ome/xml/meta/OMEXMLMetadataRoot.java | 2 +- .../ome/xml/model/AbstractOMEModelObject.java | 2 +- .../src/main/java/ome/xml/model/MapPair.java | 10 ++--- .../src/main/java/ome/xml/model/OMEModel.java | 2 +- .../main/java/ome/xml/model/OMEModelImpl.java | 2 +- .../java/ome/xml/model/OMEModelObject.java | 2 +- .../java/ome/xml/model/ReferenceList.java | 2 +- .../java/ome/xml/model/enums/Enumeration.java | 2 +- .../xml/model/enums/EnumerationException.java | 2 +- .../enums/handlers/IEnumerationHandler.java | 2 +- .../java/ome/xml/model/primitives/Color.java | 2 +- .../model/primitives/NonNegativeFloat.java | 2 +- .../model/primitives/NonNegativeInteger.java | 2 +- .../xml/model/primitives/NonNegativeLong.java | 2 +- .../xml/model/primitives/PercentFraction.java | 2 +- .../xml/model/primitives/PositiveFloat.java | 2 +- .../xml/model/primitives/PositiveInteger.java | 2 +- .../xml/model/primitives/PositiveLong.java | 2 +- .../xml/model/primitives/PrimitiveNumber.java | 2 +- .../xml/model/primitives/PrimitiveType.java | 2 +- .../ome/xml/model/primitives/Timestamp.java | 2 +- ome-xml/src/main/java/ome/xml/package.html | 2 +- .../ome/xml/model/omemodel.properties | 31 +++++++++++++++ .../test/java/ome/xml/utests/ColorTest.java | 2 +- .../java/ome/xml/utests/EnumHandlerTest.java | 2 +- .../ome/xml/utests/NonNegativeFloatTest.java | 2 +- .../xml/utests/NonNegativeIntegerTest.java | 2 +- .../ome/xml/utests/NonNegativeLongTest.java | 2 +- .../ome/xml/utests/PercentFractionTest.java | 2 +- .../ome/xml/utests/PositiveFloatTest.java | 2 +- .../ome/xml/utests/PositiveIntegerTest.java | 2 +- .../java/ome/xml/utests/PositiveLongTest.java | 2 +- .../xml/utests/SingularBackReferenceTest.java | 2 +- .../java/ome/xml/utests/TimestampTest.java | 2 +- ome-xml/src/test/resources/logback.xml | 32 +++++++++++++++ ome-xml/src/test/resources/testng.xml | 2 +- 55 files changed, 324 insertions(+), 188 deletions(-) diff --git a/ome-xml/src/main/java/ome/specification/XMLMockObjects.java b/ome-xml/src/main/java/ome/specification/XMLMockObjects.java index 0993b5fdd..dd99e541e 100644 --- a/ome-xml/src/main/java/ome/specification/XMLMockObjects.java +++ b/ome-xml/src/main/java/ome/specification/XMLMockObjects.java @@ -1,6 +1,6 @@ /* * #%L - * The OME Data Model specification + * OME XML library * %% * Copyright (C) 2003 - 2016 Open Microscopy Environment: * - Board of Regents of the University of Wisconsin-Madison @@ -9,13 +9,13 @@ * %% * 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. - * + * * 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 diff --git a/ome-xml/src/main/java/ome/specification/XMLWriter.java b/ome-xml/src/main/java/ome/specification/XMLWriter.java index 44af8831c..0ef47c559 100644 --- a/ome-xml/src/main/java/ome/specification/XMLWriter.java +++ b/ome-xml/src/main/java/ome/specification/XMLWriter.java @@ -1,6 +1,6 @@ /* * #%L - * The OME Data Model specification + * OME XML library * %% * Copyright (C) 2003 - 2016 Open Microscopy Environment: * - Board of Regents of the University of Wisconsin-Madison @@ -9,13 +9,13 @@ * %% * 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. - * + * * 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 diff --git a/ome-xml/src/main/java/ome/units/UNITS.java b/ome-xml/src/main/java/ome/units/UNITS.java index ac4bf7c98..7413a7585 100644 --- a/ome-xml/src/main/java/ome/units/UNITS.java +++ b/ome-xml/src/main/java/ome/units/UNITS.java @@ -1,25 +1,32 @@ /* * #%L - * The OME Data Model specification + * OME XML library * %% - * Copyright (C) 2014 - 2016 Open Microscopy Environment: - * - Board of Regents of the University of Wisconsin-Madison - * - Glencoe Software, Inc. - * - University of Dundee + * Copyright (C) 2006 - 2023 Open Microscopy Environment: + * - Board of Regents of the University of Wisconsin-Madison + * - Glencoe Software, Inc. + * - University of Dundee * %% - * 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, either version 2 of the - * License, or (at your option) any later version. + * Redistribution and use 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. + * 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. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * 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 HOLDERS 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. * #L% */ diff --git a/ome-xml/src/main/java/ome/units/quantity/Angle.java b/ome-xml/src/main/java/ome/units/quantity/Angle.java index e629489bc..a9eec2e9f 100644 --- a/ome-xml/src/main/java/ome/units/quantity/Angle.java +++ b/ome-xml/src/main/java/ome/units/quantity/Angle.java @@ -1,25 +1,32 @@ /* * #%L - * The OME Data Model specification + * OME XML library * %% * Copyright (C) 2014 - 2016 Open Microscopy Environment: * - Board of Regents of the University of Wisconsin-Madison * - Glencoe Software, Inc. * - University of Dundee * %% - * 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, either version 2 of the - * License, or (at your option) any later version. + * Redistribution and use 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. + * 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. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * 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 HOLDERS 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. * #L% */ diff --git a/ome-xml/src/main/java/ome/units/quantity/ElectricPotential.java b/ome-xml/src/main/java/ome/units/quantity/ElectricPotential.java index 3871d24b5..fb3451a07 100644 --- a/ome-xml/src/main/java/ome/units/quantity/ElectricPotential.java +++ b/ome-xml/src/main/java/ome/units/quantity/ElectricPotential.java @@ -1,25 +1,32 @@ /* * #%L - * The OME Data Model specification + * OME XML library * %% * Copyright (C) 2014 - 2016 Open Microscopy Environment: * - Board of Regents of the University of Wisconsin-Madison * - Glencoe Software, Inc. * - University of Dundee * %% - * 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, either version 2 of the - * License, or (at your option) any later version. + * Redistribution and use 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. + * 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. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * 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 HOLDERS 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. * #L% */ diff --git a/ome-xml/src/main/java/ome/units/quantity/Frequency.java b/ome-xml/src/main/java/ome/units/quantity/Frequency.java index dc359b3a6..4f047ffb6 100644 --- a/ome-xml/src/main/java/ome/units/quantity/Frequency.java +++ b/ome-xml/src/main/java/ome/units/quantity/Frequency.java @@ -1,25 +1,32 @@ /* * #%L - * The OME Data Model specification + * OME XML library * %% * Copyright (C) 2014 - 2016 Open Microscopy Environment: * - Board of Regents of the University of Wisconsin-Madison * - Glencoe Software, Inc. * - University of Dundee * %% - * 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, either version 2 of the - * License, or (at your option) any later version. + * Redistribution and use 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. + * 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. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * 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 HOLDERS 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. * #L% */ diff --git a/ome-xml/src/main/java/ome/units/quantity/Length.java b/ome-xml/src/main/java/ome/units/quantity/Length.java index 7eb6d9e96..6911b7c73 100644 --- a/ome-xml/src/main/java/ome/units/quantity/Length.java +++ b/ome-xml/src/main/java/ome/units/quantity/Length.java @@ -1,25 +1,32 @@ /* * #%L - * The OME Data Model specification + * OME XML library * %% * Copyright (C) 2014 - 2016 Open Microscopy Environment: * - Board of Regents of the University of Wisconsin-Madison * - Glencoe Software, Inc. * - University of Dundee * %% - * 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, either version 2 of the - * License, or (at your option) any later version. + * Redistribution and use 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. + * 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. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * 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 HOLDERS 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. * #L% */ diff --git a/ome-xml/src/main/java/ome/units/quantity/Power.java b/ome-xml/src/main/java/ome/units/quantity/Power.java index 14486a195..d2ae92b95 100644 --- a/ome-xml/src/main/java/ome/units/quantity/Power.java +++ b/ome-xml/src/main/java/ome/units/quantity/Power.java @@ -1,25 +1,32 @@ /* * #%L - * The OME Data Model specification + * OME XML library * %% * Copyright (C) 2014 - 2016 Open Microscopy Environment: * - Board of Regents of the University of Wisconsin-Madison * - Glencoe Software, Inc. * - University of Dundee * %% - * 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, either version 2 of the - * License, or (at your option) any later version. + * Redistribution and use 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. + * 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. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * 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 HOLDERS 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. * #L% */ diff --git a/ome-xml/src/main/java/ome/units/quantity/Pressure.java b/ome-xml/src/main/java/ome/units/quantity/Pressure.java index 0f9579803..b8a5998e9 100644 --- a/ome-xml/src/main/java/ome/units/quantity/Pressure.java +++ b/ome-xml/src/main/java/ome/units/quantity/Pressure.java @@ -1,25 +1,32 @@ /* * #%L - * The OME Data Model specification + * OME XML library * %% * Copyright (C) 2014 - 2016 Open Microscopy Environment: * - Board of Regents of the University of Wisconsin-Madison * - Glencoe Software, Inc. * - University of Dundee * %% - * 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, either version 2 of the - * License, or (at your option) any later version. + * Redistribution and use 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. + * 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. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * 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 HOLDERS 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. * #L% */ diff --git a/ome-xml/src/main/java/ome/units/quantity/Quantity.java b/ome-xml/src/main/java/ome/units/quantity/Quantity.java index 4f3219c45..0e99a4e1e 100644 --- a/ome-xml/src/main/java/ome/units/quantity/Quantity.java +++ b/ome-xml/src/main/java/ome/units/quantity/Quantity.java @@ -1,25 +1,32 @@ /* * #%L - * The OME Data Model specification + * OME XML library * %% * Copyright (C) 2014 - 2016 Open Microscopy Environment: * - Board of Regents of the University of Wisconsin-Madison * - Glencoe Software, Inc. * - University of Dundee * %% - * 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, either version 2 of the - * License, or (at your option) any later version. + * Redistribution and use 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. + * 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. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * 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 HOLDERS 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. * #L% */ diff --git a/ome-xml/src/main/java/ome/units/quantity/Temperature.java b/ome-xml/src/main/java/ome/units/quantity/Temperature.java index a746ccd17..201ee2033 100644 --- a/ome-xml/src/main/java/ome/units/quantity/Temperature.java +++ b/ome-xml/src/main/java/ome/units/quantity/Temperature.java @@ -1,25 +1,32 @@ /* * #%L - * The OME Data Model specification + * OME XML library * %% * Copyright (C) 2014 - 2016 Open Microscopy Environment: * - Board of Regents of the University of Wisconsin-Madison * - Glencoe Software, Inc. * - University of Dundee * %% - * 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, either version 2 of the - * License, or (at your option) any later version. + * Redistribution and use 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. + * 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. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * 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 HOLDERS 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. * #L% */ diff --git a/ome-xml/src/main/java/ome/units/quantity/Time.java b/ome-xml/src/main/java/ome/units/quantity/Time.java index 4c51ef7a6..bc3f7a0bf 100644 --- a/ome-xml/src/main/java/ome/units/quantity/Time.java +++ b/ome-xml/src/main/java/ome/units/quantity/Time.java @@ -1,25 +1,32 @@ /* * #%L - * The OME Data Model specification + * OME XML library * %% * Copyright (C) 2014 - 2016 Open Microscopy Environment: * - Board of Regents of the University of Wisconsin-Madison * - Glencoe Software, Inc. * - University of Dundee * %% - * 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, either version 2 of the - * License, or (at your option) any later version. + * Redistribution and use 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. + * 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. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * 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 HOLDERS 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. * #L% */ diff --git a/ome-xml/src/main/java/ome/units/unit/Unit.java b/ome-xml/src/main/java/ome/units/unit/Unit.java index 388898fdb..1029fbdbd 100644 --- a/ome-xml/src/main/java/ome/units/unit/Unit.java +++ b/ome-xml/src/main/java/ome/units/unit/Unit.java @@ -1,25 +1,32 @@ /* * #%L - * The OME Data Model specification + * OME XML library * %% * Copyright (C) 2014 - 2016 Open Microscopy Environment: * - Board of Regents of the University of Wisconsin-Madison * - Glencoe Software, Inc. * - University of Dundee * %% - * 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, either version 2 of the - * License, or (at your option) any later version. + * Redistribution and use 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. + * 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. * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-2.0.html>. + * 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 HOLDERS 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. * #L% */ diff --git a/ome-xml/src/main/java/ome/xml/meta/AbstractOMEXMLMetadata.java b/ome-xml/src/main/java/ome/xml/meta/AbstractOMEXMLMetadata.java index 58f145983..35cbc0bd0 100644 --- a/ome-xml/src/main/java/ome/xml/meta/AbstractOMEXMLMetadata.java +++ b/ome-xml/src/main/java/ome/xml/meta/AbstractOMEXMLMetadata.java @@ -1,6 +1,6 @@ /* * #%L - * OME-XML Java library for working with OME-XML metadata structures. + * OME XML library * %% * Copyright (C) 2006 - 2016 Open Microscopy Environment: * - Massachusetts Institute of Technology diff --git a/ome-xml/src/main/java/ome/xml/meta/BaseMetadata.java b/ome-xml/src/main/java/ome/xml/meta/BaseMetadata.java index d6e09d271..63ce3516b 100644 --- a/ome-xml/src/main/java/ome/xml/meta/BaseMetadata.java +++ b/ome-xml/src/main/java/ome/xml/meta/BaseMetadata.java @@ -1,6 +1,6 @@ /* * #%L - * OME-XML Java library for working with OME-XML metadata structures. + * OME XML library * %% * Copyright (C) 2006 - 2016 Open Microscopy Environment: * - Massachusetts Institute of Technology diff --git a/ome-xml/src/main/java/ome/xml/meta/IMetadata.java b/ome-xml/src/main/java/ome/xml/meta/IMetadata.java index d6b2bab69..931f28ee4 100644 --- a/ome-xml/src/main/java/ome/xml/meta/IMetadata.java +++ b/ome-xml/src/main/java/ome/xml/meta/IMetadata.java @@ -1,6 +1,6 @@ /* * #%L - * OME-XML Java library for working with OME-XML metadata structures. + * OME XML library * %% * Copyright (C) 2006 - 2016 Open Microscopy Environment: * - Massachusetts Institute of Technology diff --git a/ome-xml/src/main/java/ome/xml/meta/MetadataConverter.java b/ome-xml/src/main/java/ome/xml/meta/MetadataConverter.java index 295464580..ea9e8f2bd 100644 --- a/ome-xml/src/main/java/ome/xml/meta/MetadataConverter.java +++ b/ome-xml/src/main/java/ome/xml/meta/MetadataConverter.java @@ -1,6 +1,6 @@ /* * #%L - * OME-XML Java library for working with OME-XML metadata structures. + * OME XML library * %% * Copyright (C) 2006 - 2023 Open Microscopy Environment: * - Massachusetts Institute of Technology diff --git a/ome-xml/src/main/java/ome/xml/meta/MetadataRoot.java b/ome-xml/src/main/java/ome/xml/meta/MetadataRoot.java index 0382d5e9e..2bdb35711 100644 --- a/ome-xml/src/main/java/ome/xml/meta/MetadataRoot.java +++ b/ome-xml/src/main/java/ome/xml/meta/MetadataRoot.java @@ -1,6 +1,6 @@ /* * #%L - * OME-XML Java library for working with OME-XML metadata structures. + * OME XML library * %% * Copyright (C) 2006 - 2016 Open Microscopy Environment: * - Massachusetts Institute of Technology diff --git a/ome-xml/src/main/java/ome/xml/meta/OMEXMLMetadata.java b/ome-xml/src/main/java/ome/xml/meta/OMEXMLMetadata.java index f353c1b95..86bbaec14 100644 --- a/ome-xml/src/main/java/ome/xml/meta/OMEXMLMetadata.java +++ b/ome-xml/src/main/java/ome/xml/meta/OMEXMLMetadata.java @@ -1,6 +1,6 @@ /* * #%L - * OME-XML Java library for working with OME-XML metadata structures. + * OME XML library * %% * Copyright (C) 2006 - 2016 Open Microscopy Environment: * - Massachusetts Institute of Technology diff --git a/ome-xml/src/main/java/ome/xml/meta/OMEXMLMetadataRoot.java b/ome-xml/src/main/java/ome/xml/meta/OMEXMLMetadataRoot.java index 9e49fb450..944451ca5 100644 --- a/ome-xml/src/main/java/ome/xml/meta/OMEXMLMetadataRoot.java +++ b/ome-xml/src/main/java/ome/xml/meta/OMEXMLMetadataRoot.java @@ -1,6 +1,6 @@ /* * #%L - * OME-XML Java library for working with OME-XML metadata structures. + * OME XML library * %% * Copyright (C) 2006 - 2016 Open Microscopy Environment: * - Massachusetts Institute of Technology diff --git a/ome-xml/src/main/java/ome/xml/model/AbstractOMEModelObject.java b/ome-xml/src/main/java/ome/xml/model/AbstractOMEModelObject.java index f0ddef0cd..da2bae7e3 100644 --- a/ome-xml/src/main/java/ome/xml/model/AbstractOMEModelObject.java +++ b/ome-xml/src/main/java/ome/xml/model/AbstractOMEModelObject.java @@ -1,6 +1,6 @@ /* * #%L - * OME-XML Java library for working with OME-XML metadata structures. + * OME XML library * %% * Copyright (C) 2006 - 2016 Open Microscopy Environment: * - Massachusetts Institute of Technology diff --git a/ome-xml/src/main/java/ome/xml/model/MapPair.java b/ome-xml/src/main/java/ome/xml/model/MapPair.java index a4525b1ce..661790cdc 100644 --- a/ome-xml/src/main/java/ome/xml/model/MapPair.java +++ b/ome-xml/src/main/java/ome/xml/model/MapPair.java @@ -1,6 +1,6 @@ /* * #%L - * OME-XML Java library for working with OME-XML metadata structures. + * OME XML library * %% * Copyright (C) 2014 - 2016 Open Microscopy Environment: * - Massachusetts Institute of Technology @@ -11,13 +11,13 @@ * %% * 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. - * + * * 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 @@ -29,10 +29,6 @@ * 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. - * - * The views and conclusions contained in the software and documentation are - * those of the authors and should not be interpreted as representing official - * policies, either expressed or implied, of any organization. * #L% */ diff --git a/ome-xml/src/main/java/ome/xml/model/OMEModel.java b/ome-xml/src/main/java/ome/xml/model/OMEModel.java index 60f71414f..f3745d1e5 100644 --- a/ome-xml/src/main/java/ome/xml/model/OMEModel.java +++ b/ome-xml/src/main/java/ome/xml/model/OMEModel.java @@ -1,6 +1,6 @@ /* * #%L - * OME-XML Java library for working with OME-XML metadata structures. + * OME XML library * %% * Copyright (C) 2006 - 2016 Open Microscopy Environment: * - Massachusetts Institute of Technology diff --git a/ome-xml/src/main/java/ome/xml/model/OMEModelImpl.java b/ome-xml/src/main/java/ome/xml/model/OMEModelImpl.java index 2bf8708f6..0d3c82987 100644 --- a/ome-xml/src/main/java/ome/xml/model/OMEModelImpl.java +++ b/ome-xml/src/main/java/ome/xml/model/OMEModelImpl.java @@ -1,6 +1,6 @@ /* * #%L - * OME-XML Java library for working with OME-XML metadata structures. + * OME XML library * %% * Copyright (C) 2006 - 2016 Open Microscopy Environment: * - Massachusetts Institute of Technology diff --git a/ome-xml/src/main/java/ome/xml/model/OMEModelObject.java b/ome-xml/src/main/java/ome/xml/model/OMEModelObject.java index a3ab0b22a..fb8925c70 100644 --- a/ome-xml/src/main/java/ome/xml/model/OMEModelObject.java +++ b/ome-xml/src/main/java/ome/xml/model/OMEModelObject.java @@ -1,6 +1,6 @@ /* * #%L - * OME-XML Java library for working with OME-XML metadata structures. + * OME XML library * %% * Copyright (C) 2006 - 2016 Open Microscopy Environment: * - Massachusetts Institute of Technology diff --git a/ome-xml/src/main/java/ome/xml/model/ReferenceList.java b/ome-xml/src/main/java/ome/xml/model/ReferenceList.java index 4a1aa5301..525fb780e 100644 --- a/ome-xml/src/main/java/ome/xml/model/ReferenceList.java +++ b/ome-xml/src/main/java/ome/xml/model/ReferenceList.java @@ -1,6 +1,6 @@ /* * #%L - * OME-XML Java library for working with OME-XML metadata structures. + * OME XML library * %% * Copyright (C) 2006 - 2016 Open Microscopy Environment: * - Massachusetts Institute of Technology diff --git a/ome-xml/src/main/java/ome/xml/model/enums/Enumeration.java b/ome-xml/src/main/java/ome/xml/model/enums/Enumeration.java index 74cc03a9a..467000d76 100644 --- a/ome-xml/src/main/java/ome/xml/model/enums/Enumeration.java +++ b/ome-xml/src/main/java/ome/xml/model/enums/Enumeration.java @@ -1,6 +1,6 @@ /* * #%L - * OME-XML Java library for working with OME-XML metadata structures. + * OME XML library * %% * Copyright (C) 2006 - 2016 Open Microscopy Environment: * - Massachusetts Institute of Technology diff --git a/ome-xml/src/main/java/ome/xml/model/enums/EnumerationException.java b/ome-xml/src/main/java/ome/xml/model/enums/EnumerationException.java index 4b7689d8d..0dad0a9f2 100644 --- a/ome-xml/src/main/java/ome/xml/model/enums/EnumerationException.java +++ b/ome-xml/src/main/java/ome/xml/model/enums/EnumerationException.java @@ -1,6 +1,6 @@ /* * #%L - * OME-XML Java library for working with OME-XML metadata structures. + * OME XML library * %% * Copyright (C) 2006 - 2016 Open Microscopy Environment: * - Massachusetts Institute of Technology diff --git a/ome-xml/src/main/java/ome/xml/model/enums/handlers/IEnumerationHandler.java b/ome-xml/src/main/java/ome/xml/model/enums/handlers/IEnumerationHandler.java index d1ae0c2cf..b7cca0525 100644 --- a/ome-xml/src/main/java/ome/xml/model/enums/handlers/IEnumerationHandler.java +++ b/ome-xml/src/main/java/ome/xml/model/enums/handlers/IEnumerationHandler.java @@ -1,6 +1,6 @@ /* * #%L - * OME-XML Java library for working with OME-XML metadata structures. + * OME XML library * %% * Copyright (C) 2006 - 2016 Open Microscopy Environment: * - Massachusetts Institute of Technology diff --git a/ome-xml/src/main/java/ome/xml/model/primitives/Color.java b/ome-xml/src/main/java/ome/xml/model/primitives/Color.java index f9416bfb1..80e1f09eb 100644 --- a/ome-xml/src/main/java/ome/xml/model/primitives/Color.java +++ b/ome-xml/src/main/java/ome/xml/model/primitives/Color.java @@ -1,6 +1,6 @@ /* * #%L - * OME-XML Java library for working with OME-XML metadata structures. + * OME XML library * %% * Copyright (C) 2006 - 2016 Open Microscopy Environment: * - Massachusetts Institute of Technology diff --git a/ome-xml/src/main/java/ome/xml/model/primitives/NonNegativeFloat.java b/ome-xml/src/main/java/ome/xml/model/primitives/NonNegativeFloat.java index 7b992690c..145b50f75 100644 --- a/ome-xml/src/main/java/ome/xml/model/primitives/NonNegativeFloat.java +++ b/ome-xml/src/main/java/ome/xml/model/primitives/NonNegativeFloat.java @@ -1,6 +1,6 @@ /* * #%L - * OME-XML Java library for working with OME-XML metadata structures. + * OME XML library * %% * Copyright (C) 2006 - 2016 Open Microscopy Environment: * - Massachusetts Institute of Technology diff --git a/ome-xml/src/main/java/ome/xml/model/primitives/NonNegativeInteger.java b/ome-xml/src/main/java/ome/xml/model/primitives/NonNegativeInteger.java index b6e1e8520..eaa38d6dc 100644 --- a/ome-xml/src/main/java/ome/xml/model/primitives/NonNegativeInteger.java +++ b/ome-xml/src/main/java/ome/xml/model/primitives/NonNegativeInteger.java @@ -1,6 +1,6 @@ /* * #%L - * OME-XML Java library for working with OME-XML metadata structures. + * OME XML library * %% * Copyright (C) 2006 - 2016 Open Microscopy Environment: * - Massachusetts Institute of Technology diff --git a/ome-xml/src/main/java/ome/xml/model/primitives/NonNegativeLong.java b/ome-xml/src/main/java/ome/xml/model/primitives/NonNegativeLong.java index f053e21c4..b4c5c67e2 100644 --- a/ome-xml/src/main/java/ome/xml/model/primitives/NonNegativeLong.java +++ b/ome-xml/src/main/java/ome/xml/model/primitives/NonNegativeLong.java @@ -1,6 +1,6 @@ /* * #%L - * OME-XML Java library for working with OME-XML metadata structures. + * OME XML library * %% * Copyright (C) 2006 - 2016 Open Microscopy Environment: * - Massachusetts Institute of Technology diff --git a/ome-xml/src/main/java/ome/xml/model/primitives/PercentFraction.java b/ome-xml/src/main/java/ome/xml/model/primitives/PercentFraction.java index c5a64d71e..fc99f7e41 100644 --- a/ome-xml/src/main/java/ome/xml/model/primitives/PercentFraction.java +++ b/ome-xml/src/main/java/ome/xml/model/primitives/PercentFraction.java @@ -1,6 +1,6 @@ /* * #%L - * OME-XML Java library for working with OME-XML metadata structures. + * OME XML library * %% * Copyright (C) 2006 - 2016 Open Microscopy Environment: * - Massachusetts Institute of Technology diff --git a/ome-xml/src/main/java/ome/xml/model/primitives/PositiveFloat.java b/ome-xml/src/main/java/ome/xml/model/primitives/PositiveFloat.java index 2ab183177..e093f5e00 100644 --- a/ome-xml/src/main/java/ome/xml/model/primitives/PositiveFloat.java +++ b/ome-xml/src/main/java/ome/xml/model/primitives/PositiveFloat.java @@ -1,6 +1,6 @@ /* * #%L - * OME-XML Java library for working with OME-XML metadata structures. + * OME XML library * %% * Copyright (C) 2006 - 2016 Open Microscopy Environment: * - Massachusetts Institute of Technology diff --git a/ome-xml/src/main/java/ome/xml/model/primitives/PositiveInteger.java b/ome-xml/src/main/java/ome/xml/model/primitives/PositiveInteger.java index 73711b914..f423444a2 100644 --- a/ome-xml/src/main/java/ome/xml/model/primitives/PositiveInteger.java +++ b/ome-xml/src/main/java/ome/xml/model/primitives/PositiveInteger.java @@ -1,6 +1,6 @@ /* * #%L - * OME-XML Java library for working with OME-XML metadata structures. + * OME XML library * %% * Copyright (C) 2006 - 2016 Open Microscopy Environment: * - Massachusetts Institute of Technology diff --git a/ome-xml/src/main/java/ome/xml/model/primitives/PositiveLong.java b/ome-xml/src/main/java/ome/xml/model/primitives/PositiveLong.java index 40198c5d8..577068c3b 100644 --- a/ome-xml/src/main/java/ome/xml/model/primitives/PositiveLong.java +++ b/ome-xml/src/main/java/ome/xml/model/primitives/PositiveLong.java @@ -1,6 +1,6 @@ /* * #%L - * OME-XML Java library for working with OME-XML metadata structures. + * OME XML library * %% * Copyright (C) 2006 - 2016 Open Microscopy Environment: * - Massachusetts Institute of Technology diff --git a/ome-xml/src/main/java/ome/xml/model/primitives/PrimitiveNumber.java b/ome-xml/src/main/java/ome/xml/model/primitives/PrimitiveNumber.java index 1963c3ec3..428936c00 100644 --- a/ome-xml/src/main/java/ome/xml/model/primitives/PrimitiveNumber.java +++ b/ome-xml/src/main/java/ome/xml/model/primitives/PrimitiveNumber.java @@ -1,6 +1,6 @@ /* * #%L - * OME-XML Java library for working with OME-XML metadata structures. + * OME XML library * %% * Copyright (C) 2006 - 2016 Open Microscopy Environment: * - Massachusetts Institute of Technology diff --git a/ome-xml/src/main/java/ome/xml/model/primitives/PrimitiveType.java b/ome-xml/src/main/java/ome/xml/model/primitives/PrimitiveType.java index b0ed58a74..9e671ffb0 100644 --- a/ome-xml/src/main/java/ome/xml/model/primitives/PrimitiveType.java +++ b/ome-xml/src/main/java/ome/xml/model/primitives/PrimitiveType.java @@ -1,6 +1,6 @@ /* * #%L - * OME-XML Java library for working with OME-XML metadata structures. + * OME XML library * %% * Copyright (C) 2006 - 2016 Open Microscopy Environment: * - Massachusetts Institute of Technology diff --git a/ome-xml/src/main/java/ome/xml/model/primitives/Timestamp.java b/ome-xml/src/main/java/ome/xml/model/primitives/Timestamp.java index 990b28edb..b9ed0dc44 100644 --- a/ome-xml/src/main/java/ome/xml/model/primitives/Timestamp.java +++ b/ome-xml/src/main/java/ome/xml/model/primitives/Timestamp.java @@ -1,6 +1,6 @@ /* * #%L - * OME-XML Java library for working with OME-XML metadata structures. + * OME XML library * %% * Copyright (C) 2006 - 2016 Open Microscopy Environment: * - Massachusetts Institute of Technology diff --git a/ome-xml/src/main/java/ome/xml/package.html b/ome-xml/src/main/java/ome/xml/package.html index 4d69857ed..34b0a0e5b 100644 --- a/ome-xml/src/main/java/ome/xml/package.html +++ b/ome-xml/src/main/java/ome/xml/package.html @@ -1,6 +1,6 @@ <!-- #%L - OME-XML Java library for working with OME-XML metadata structures. + OME XML library %% Copyright (C) 2006 - 2016 Open Microscopy Environment: - Massachusetts Institute of Technology diff --git a/ome-xml/src/main/resources/ome/xml/model/omemodel.properties b/ome-xml/src/main/resources/ome/xml/model/omemodel.properties index 067804095..b3515f0cc 100644 --- a/ome-xml/src/main/resources/ome/xml/model/omemodel.properties +++ b/ome-xml/src/main/resources/ome/xml/model/omemodel.properties @@ -1 +1,32 @@ +### +# #%L +# OME XML library +# %% +# Copyright (C) 2006 - 2023 Open Microscopy Environment: +# - Board of Regents of the University of Wisconsin-Madison +# - Glencoe Software, Inc. +# - University of Dundee +# %% +# 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. +# +# 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 HOLDERS 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. +# #L% +### schema.version = ${ome.model.schemaver} diff --git a/ome-xml/src/test/java/ome/xml/utests/ColorTest.java b/ome-xml/src/test/java/ome/xml/utests/ColorTest.java index 1b746f116..58d8b96f5 100644 --- a/ome-xml/src/test/java/ome/xml/utests/ColorTest.java +++ b/ome-xml/src/test/java/ome/xml/utests/ColorTest.java @@ -1,6 +1,6 @@ /* * #%L - * OME-XML Java library for working with OME-XML metadata structures. + * OME XML library * %% * Copyright (C) 2006 - 2016 Open Microscopy Environment: * - Massachusetts Institute of Technology diff --git a/ome-xml/src/test/java/ome/xml/utests/EnumHandlerTest.java b/ome-xml/src/test/java/ome/xml/utests/EnumHandlerTest.java index b8d21c5d2..2f20ae208 100644 --- a/ome-xml/src/test/java/ome/xml/utests/EnumHandlerTest.java +++ b/ome-xml/src/test/java/ome/xml/utests/EnumHandlerTest.java @@ -1,6 +1,6 @@ /* * #%L - * OME-XML Java library for working with OME-XML metadata structures. + * OME XML library * %% * Copyright (C) 2006 - 2016 Open Microscopy Environment: * - Massachusetts Institute of Technology diff --git a/ome-xml/src/test/java/ome/xml/utests/NonNegativeFloatTest.java b/ome-xml/src/test/java/ome/xml/utests/NonNegativeFloatTest.java index d06870a6f..1abcfb841 100644 --- a/ome-xml/src/test/java/ome/xml/utests/NonNegativeFloatTest.java +++ b/ome-xml/src/test/java/ome/xml/utests/NonNegativeFloatTest.java @@ -1,6 +1,6 @@ /* * #%L - * OME-XML Java library for working with OME-XML metadata structures. + * OME XML library * %% * Copyright (C) 2006 - 2016 Open Microscopy Environment: * - Massachusetts Institute of Technology diff --git a/ome-xml/src/test/java/ome/xml/utests/NonNegativeIntegerTest.java b/ome-xml/src/test/java/ome/xml/utests/NonNegativeIntegerTest.java index 6a6833f87..71e0fb311 100644 --- a/ome-xml/src/test/java/ome/xml/utests/NonNegativeIntegerTest.java +++ b/ome-xml/src/test/java/ome/xml/utests/NonNegativeIntegerTest.java @@ -1,6 +1,6 @@ /* * #%L - * OME-XML Java library for working with OME-XML metadata structures. + * OME XML library * %% * Copyright (C) 2006 - 2016 Open Microscopy Environment: * - Massachusetts Institute of Technology diff --git a/ome-xml/src/test/java/ome/xml/utests/NonNegativeLongTest.java b/ome-xml/src/test/java/ome/xml/utests/NonNegativeLongTest.java index b40ce16f5..c269def6e 100644 --- a/ome-xml/src/test/java/ome/xml/utests/NonNegativeLongTest.java +++ b/ome-xml/src/test/java/ome/xml/utests/NonNegativeLongTest.java @@ -1,6 +1,6 @@ /* * #%L - * OME-XML Java library for working with OME-XML metadata structures. + * OME XML library * %% * Copyright (C) 2006 - 2016 Open Microscopy Environment: * - Massachusetts Institute of Technology diff --git a/ome-xml/src/test/java/ome/xml/utests/PercentFractionTest.java b/ome-xml/src/test/java/ome/xml/utests/PercentFractionTest.java index 6d6dabf63..f0e45a2b3 100644 --- a/ome-xml/src/test/java/ome/xml/utests/PercentFractionTest.java +++ b/ome-xml/src/test/java/ome/xml/utests/PercentFractionTest.java @@ -1,6 +1,6 @@ /* * #%L - * OME-XML Java library for working with OME-XML metadata structures. + * OME XML library * %% * Copyright (C) 2006 - 2016 Open Microscopy Environment: * - Massachusetts Institute of Technology diff --git a/ome-xml/src/test/java/ome/xml/utests/PositiveFloatTest.java b/ome-xml/src/test/java/ome/xml/utests/PositiveFloatTest.java index f81c63c2f..efe029e41 100644 --- a/ome-xml/src/test/java/ome/xml/utests/PositiveFloatTest.java +++ b/ome-xml/src/test/java/ome/xml/utests/PositiveFloatTest.java @@ -1,6 +1,6 @@ /* * #%L - * OME-XML Java library for working with OME-XML metadata structures. + * OME XML library * %% * Copyright (C) 2006 - 2016 Open Microscopy Environment: * - Massachusetts Institute of Technology diff --git a/ome-xml/src/test/java/ome/xml/utests/PositiveIntegerTest.java b/ome-xml/src/test/java/ome/xml/utests/PositiveIntegerTest.java index 82a368acc..a529272d9 100644 --- a/ome-xml/src/test/java/ome/xml/utests/PositiveIntegerTest.java +++ b/ome-xml/src/test/java/ome/xml/utests/PositiveIntegerTest.java @@ -1,6 +1,6 @@ /* * #%L - * OME-XML Java library for working with OME-XML metadata structures. + * OME XML library * %% * Copyright (C) 2006 - 2016 Open Microscopy Environment: * - Massachusetts Institute of Technology diff --git a/ome-xml/src/test/java/ome/xml/utests/PositiveLongTest.java b/ome-xml/src/test/java/ome/xml/utests/PositiveLongTest.java index 045a8ec55..a6080c084 100644 --- a/ome-xml/src/test/java/ome/xml/utests/PositiveLongTest.java +++ b/ome-xml/src/test/java/ome/xml/utests/PositiveLongTest.java @@ -1,6 +1,6 @@ /* * #%L - * OME-XML Java library for working with OME-XML metadata structures. + * OME XML library * %% * Copyright (C) 2006 - 2016 Open Microscopy Environment: * - Massachusetts Institute of Technology diff --git a/ome-xml/src/test/java/ome/xml/utests/SingularBackReferenceTest.java b/ome-xml/src/test/java/ome/xml/utests/SingularBackReferenceTest.java index 7c87690a4..4d87e2b28 100644 --- a/ome-xml/src/test/java/ome/xml/utests/SingularBackReferenceTest.java +++ b/ome-xml/src/test/java/ome/xml/utests/SingularBackReferenceTest.java @@ -1,6 +1,6 @@ /* * #%L - * OME-XML Java library for working with OME-XML metadata structures. + * OME XML library * %% * Copyright (C) 2006 - 2016 Open Microscopy Environment: * - Massachusetts Institute of Technology diff --git a/ome-xml/src/test/java/ome/xml/utests/TimestampTest.java b/ome-xml/src/test/java/ome/xml/utests/TimestampTest.java index 16f00e2c3..643ed2ec1 100644 --- a/ome-xml/src/test/java/ome/xml/utests/TimestampTest.java +++ b/ome-xml/src/test/java/ome/xml/utests/TimestampTest.java @@ -1,6 +1,6 @@ /* * #%L - * OME-XML Java library for working with OME-XML metadata structures. + * OME XML library * %% * Copyright (C) 2006 - 2016 Open Microscopy Environment: * - Massachusetts Institute of Technology diff --git a/ome-xml/src/test/resources/logback.xml b/ome-xml/src/test/resources/logback.xml index 16d0f9af1..7410c3d26 100644 --- a/ome-xml/src/test/resources/logback.xml +++ b/ome-xml/src/test/resources/logback.xml @@ -1,4 +1,36 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + OME XML library + %% + Copyright (C) 2006 - 2023 Open Microscopy Environment: + - Board of Regents of the University of Wisconsin-Madison + - Glencoe Software, Inc. + - University of Dundee + %% + 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. + + 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 HOLDERS 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. + #L% + --> + <configuration> <appender name="stdout" class="ch.qos.logback.core.ConsoleAppender"> <encoder> diff --git a/ome-xml/src/test/resources/testng.xml b/ome-xml/src/test/resources/testng.xml index 922d060a0..ff252be5d 100644 --- a/ome-xml/src/test/resources/testng.xml +++ b/ome-xml/src/test/resources/testng.xml @@ -1,6 +1,6 @@ <!-- #%L - OME-XML Java library for working with OME-XML metadata structures. + OME XML library %% Copyright (C) 2006 - 2016 Open Microscopy Environment: - Massachusetts Institute of Technology