consequently put in the reference to the new BSD license

BeamApp · Jul 22, 2012 · da26a49 · da26a49
1 parent d37d6b7
commit da26a49
Show file tree

Hide file tree

Showing 23 changed files with 87 additions and 147 deletions.
diff --git a/BeamMusicPlayerExample/BeamAppDelegate.h b/BeamMusicPlayerExample/BeamAppDelegate.h
@@ -1,37 +1,11 @@
 //
 //  BeamAppDelegate.h
-//  Part of MusicPlayerViewController
+//  Part of BeamMusicPlayerViewController (license: New BSD)
+//  -> https://github.com/BeamApp/MusicPlayerViewController
 //
 //  Created by Moritz Haarmann on 30.05.12.
 //  Copyright (c) 2012 BeamApp UG. All rights reserved.
 //
-// Redistribution and use 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.
-// 
-// Neither the name of the project's author nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-// 
-// 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
-// HOLDER 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.
-//
 
 #import <UIKit/UIKit.h>
 

diff --git a/BeamMusicPlayerExample/BeamAppDelegate.m b/BeamMusicPlayerExample/BeamAppDelegate.m
@@ -1,37 +1,11 @@
 //
 //  BeamAppDelegate.m
-//  Part of MusicPlayerViewController
+//  Part of BeamMusicPlayerViewController (license: New BSD)
+//  -> https://github.com/BeamApp/MusicPlayerViewController
 //
 //  Created by Moritz Haarmann on 30.05.12.
 //  Copyright (c) 2012 BeamApp UG. All rights reserved.
 //
-// Redistribution and use 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.
-// 
-// Neither the name of the project's author nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-// 
-// 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
-// HOLDER 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.
-//
 
 #import "BeamAppDelegate.h"
 

diff --git a/BeamMusicPlayerExample/Example Providers/BeamMinimalExampleProvider.h b/BeamMusicPlayerExample/Example Providers/BeamMinimalExampleProvider.h
@@ -1,9 +1,10 @@
 //
 //  BeamMinimalExampleProvider.h
-//  BeamMusicPlayerExample
+//  Part of BeamMusicPlayerViewController (license: New BSD)
+//  -> https://github.com/BeamApp/MusicPlayerViewController
 //
 //  Created by Moritz Haarmann on 01.06.12.
-//  Copyright (c) 2012 n/a. All rights reserved.
+//  Copyright (c) 2012 BeamApp UG. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>

diff --git a/BeamMusicPlayerExample/Example Providers/BeamMinimalExampleProvider.m b/BeamMusicPlayerExample/Example Providers/BeamMinimalExampleProvider.m
@@ -1,9 +1,10 @@
 //
 //  BeamMinimalExampleProvider.m
-//  BeamMusicPlayerExample
+//  Part of BeamMusicPlayerViewController (license: New BSD)
+//  -> https://github.com/BeamApp/MusicPlayerViewController
 //
 //  Created by Moritz Haarmann on 01.06.12.
-//  Copyright (c) 2012 n/a. All rights reserved.
+//  Copyright (c) 2012 BeamApp UG. All rights reserved.
 //
 
 #import "BeamMinimalExampleProvider.h"

diff --git a/BeamMusicPlayerExample/main.m b/BeamMusicPlayerExample/main.m
@@ -1,9 +1,10 @@
 //
 //  main.m
-//  BeamMusicPlayerExample
+//  Part of BeamMusicPlayerViewController (license: New BSD)
+//  -> https://github.com/BeamApp/MusicPlayerViewController
 //
 //  Created by Moritz Haarmann on 30.05.12.
-//  Copyright (c) 2012 n/a. All rights reserved.
+//  Copyright (c) 2012 BeamApp UG. All rights reserved.
 //
 
 #import <UIKit/UIKit.h>

diff --git a/BeamMusicPlayerExampleTests/BeamMPMusicPlayerProviderTests.h b/BeamMusicPlayerExampleTests/BeamMPMusicPlayerProviderTests.h
@@ -1,9 +1,10 @@
 //
 //  BeamMPMusicPlayerProvider.h
-//  BeamMusicPlayerExample
+//  Part of BeamMusicPlayerViewController (license: New BSD)
+//  -> https://github.com/BeamApp/MusicPlayerViewController
 //
 //  Created by Heiko Behrens on 18.07.12.
-//  Copyright (c) 2012 n/a. All rights reserved.
+//  Copyright (c) 2012 BeamApp UG. All rights reserved.
 //
 
 #import <SenTestingKit/SenTestingKit.h>

diff --git a/BeamMusicPlayerExampleTests/BeamMPMusicPlayerProviderTests.m b/BeamMusicPlayerExampleTests/BeamMPMusicPlayerProviderTests.m
@@ -1,9 +1,10 @@
 //
 //  BeamMPMusicPlayerProvider.m
-//  BeamMusicPlayerExample
+//  Part of BeamMusicPlayerViewController (license: New BSD)
+//  -> https://github.com/BeamApp/MusicPlayerViewController
 //
 //  Created by Heiko Behrens on 18.07.12.
-//  Copyright (c) 2012 n/a. All rights reserved.
+//  Copyright (c) 2012 BeamApp UG. All rights reserved.
 //
 
 #import "BeamMPMusicPlayerProviderTests.h"

diff --git a/BeamMusicPlayerExampleTests/BeamMusicPlayerExampleTests.h b/BeamMusicPlayerExampleTests/BeamMusicPlayerExampleTests.h
@@ -1,9 +1,10 @@
 //
 //  BeamMusicPlayerExampleTests.h
-//  BeamMusicPlayerExampleTests
+//  Part of BeamMusicPlayerViewController (license: New BSD)
+//  -> https://github.com/BeamApp/MusicPlayerViewController
 //
 //  Created by Moritz Haarmann on 30.05.12.
-//  Copyright (c) 2012 n/a. All rights reserved.
+//  Copyright (c) 2012 BeamApp UG. All rights reserved.
 //
 
 #import <SenTestingKit/SenTestingKit.h>

diff --git a/BeamMusicPlayerExampleTests/BeamMusicPlayerExampleTests.m b/BeamMusicPlayerExampleTests/BeamMusicPlayerExampleTests.m
@@ -1,9 +1,10 @@
 //
 //  BeamMusicPlayerExampleTests.m
-//  BeamMusicPlayerExampleTests
+//  Part of BeamMusicPlayerViewController (license: New BSD)
+//  -> https://github.com/BeamApp/MusicPlayerViewController
 //
 //  Created by Moritz Haarmann on 30.05.12.
-//  Copyright (c) 2012 n/a. All rights reserved.
+//  Copyright (c) 2012 BeamApp UG. All rights reserved.
 //
 
 #import "BeamMusicPlayerExampleTests.h"

diff --git a/BeamMusicPlayerExampleTests/BeamMusicPlayerViewControllerTests.h b/BeamMusicPlayerExampleTests/BeamMusicPlayerViewControllerTests.h
@@ -1,9 +1,10 @@
 //
 //  BeamMusicPlayerViewControllerTests.h
-//  BeamMusicPlayerExample
+//  Part of BeamMusicPlayerViewController (license: New BSD)
+//  -> https://github.com/BeamApp/MusicPlayerViewController
 //
 //  Created by Heiko Behrens on 01.06.12.
-//  Copyright (c) 2012 n/a. All rights reserved.
+//  Copyright (c) 2012 BeamApp UG. All rights reserved.
 //
 
 #import <SenTestingKit/SenTestingKit.h>

diff --git a/BeamMusicPlayerExampleTests/BeamMusicPlayerViewControllerTests.m b/BeamMusicPlayerExampleTests/BeamMusicPlayerViewControllerTests.m
@@ -1,9 +1,10 @@
 //
 //  BeamMusicPlayerViewControllerTests.m
-//  BeamMusicPlayerExample
+//  Part of BeamMusicPlayerViewController (license: New BSD)
+//  -> https://github.com/BeamApp/MusicPlayerViewController
 //
 //  Created by Heiko Behrens on 01.06.12.
-//  Copyright (c) 2012 n/a. All rights reserved.
+//  Copyright (c) 2012 BeamApp UG. All rights reserved.
 //
 
 #import "BeamMusicPlayerViewControllerTests.h"

diff --git a/LICENSE b/LICENSE
@@ -0,0 +1,27 @@
+Software License Agreement (New BSD License)
+
+Copyright (c) 2012, BeamApp UG All rights reserved.
+
+Redistribution and use 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.
+* Neither the name of BeamApp nor the names of its
+contributors may be used to endorse or promote products derived from this
+software without specific prior written permission.
+
+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 HOLDER 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.
diff --git a/Readme.md b/Readme.md
@@ -27,6 +27,6 @@ The Project contains an example that uses the MediaLibrary to provide data for t
 
 License
 -------
-The Project is licensed under the BSD License.
+The Project is licensed under the new BSD License (see file LICENSE).
 
 © 2012 Beam App UG ( haftungsbeschränkt )
diff --git a/Source/BeamMPMusicPlayerProvider.h b/Source/BeamMPMusicPlayerProvider.h
@@ -1,9 +1,10 @@
 //
 //  BeamIpodExampleProvider.h
-//  BeamMusicPlayerExample
+//  Part of BeamMusicPlayerViewController (license: New BSD)
+//  -> https://github.com/BeamApp/MusicPlayerViewController
 //
 //  Created by Moritz Haarmann on 31.05.12.
-//  Copyright (c) 2012 n/a. All rights reserved.
+//  Copyright (c) 2012 BeamApp UG. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>

diff --git a/Source/BeamMPMusicPlayerProvider.m b/Source/BeamMPMusicPlayerProvider.m
@@ -1,9 +1,10 @@
 //
 //  BeamIpodExampleProvider.m
-//  BeamMusicPlayerExample
+//  Part of BeamMusicPlayerViewController (license: New BSD)
+//  -> https://github.com/BeamApp/MusicPlayerViewController
 //
 //  Created by Moritz Haarmann on 31.05.12.
-//  Copyright (c) 2012 n/a. All rights reserved.
+//  Copyright (c) 2012 BeamApp UG. All rights reserved.
 //
 
 #import "BeamMPMusicPlayerProvider.h"

diff --git a/Source/BeamMusicPlayerDataSource.h b/Source/BeamMusicPlayerDataSource.h
@@ -1,9 +1,10 @@
 //
 //  BeamMusicPlayerDataSource.h
-//  BeamMusicPlayerExample
+//  Part of BeamMusicPlayerViewController (license: New BSD)
+//  -> https://github.com/BeamApp/MusicPlayerViewController
 //
 //  Created by Moritz Haarmann on 30.05.12.
-//  Copyright (c) 2012 n/a. All rights reserved.
+//  Copyright (c) 2012 BeamApp UG. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>

diff --git a/Source/BeamMusicPlayerDelegate.h b/Source/BeamMusicPlayerDelegate.h
@@ -1,9 +1,10 @@
 //
 //  BeamMusicPlayerDelegate.h
-//  BeamMusicPlayerExample
+//  Part of BeamMusicPlayerViewController (license: New BSD)
+//  -> https://github.com/BeamApp/MusicPlayerViewController
 //
 //  Created by Moritz Haarmann on 30.05.12.
-//  Copyright (c) 2012 n/a. All rights reserved.
+//  Copyright (c) 2012 BeamApp UG. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>

diff --git a/Source/BeamMusicPlayerViewController.h b/Source/BeamMusicPlayerViewController.h
@@ -1,37 +1,11 @@
 //
 //  BeamMusicPlayerViewController.h
-//  Part of MusicPlayerViewController
+//  Part of BeamMusicPlayerViewController (license: New BSD)
+//  -> https://github.com/BeamApp/MusicPlayerViewController
 //
 //  Created by Moritz Haarmann on 30.05.12.
 //  Copyright (c) 2012 BeamApp UG. All rights reserved.
 //
-// Redistribution and use 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.
-// 
-// Neither the name of the project's author nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-// 
-// 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
-// HOLDER 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.
-//
 
 
 #import <UIKit/UIKit.h>

diff --git a/Source/BeamMusicPlayerViewController.m b/Source/BeamMusicPlayerViewController.m
@@ -1,37 +1,11 @@
 //
 //  BeamMusicPlayerViewController.m
-//  Part of MusicPlayerViewController
+//  Part of BeamMusicPlayerViewController (license: New BSD)
+//  -> https://github.com/BeamApp/MusicPlayerViewController
 //
 //  Created by Moritz Haarmann on 30.05.12.
 //  Copyright (c) 2012 BeamApp UG. All rights reserved.
 //
-// Redistribution and use 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.
-// 
-// Neither the name of the project's author nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-// 
-// 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
-// HOLDER 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.
-//
 
 #import "BeamMusicPlayerViewController.h"
 #import "UIImageView+Reflection.h"

diff --git a/Source/NSDateFormatter+Duration.h b/Source/NSDateFormatter+Duration.h
@@ -1,9 +1,10 @@
 //
 //  NSDateFormatter+Duration.h
-//  BeamMusicPlayerExample
+//  Part of BeamMusicPlayerViewController (license: New BSD)
+//  -> https://github.com/BeamApp/MusicPlayerViewController
 //
 //  Created by Moritz Haarmann on 31.05.12.
-//  Copyright (c) 2012 n/a. All rights reserved.
+//  Copyright (c) 2012 BeamApp UG. All rights reserved.
 //
 
 #import <Foundation/Foundation.h>

diff --git a/Source/NSDateFormatter+Duration.m b/Source/NSDateFormatter+Duration.m
@@ -1,9 +1,10 @@
 //
 //  NSDateFormatter+Duration.m
-//  BeamMusicPlayerExample
+//  Part of BeamMusicPlayerViewController (license: New BSD)
+//  -> https://github.com/BeamApp/MusicPlayerViewController
 //
 //  Created by Moritz Haarmann on 31.05.12.
-//  Copyright (c) 2012 n/a. All rights reserved.
+//  Copyright (c) 2012 BeamApp UG. All rights reserved.
 //
 
 #import "NSDateFormatter+Duration.h"