Strolch
/
strolch
mirror of https://github.com/strolch-li/strolch.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Project] Changed all licence references to Apache License 2.0

This commit is contained in:
Robert von Burg 2013-12-15 13:10:35 +01:00
parent 45c1734dd5
commit d585a9e3d6
3 changed files with 30 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
LICENSE
View File

@ -1,4 +1,5 @@
Apache License
Apache License
Version 2.0, January 2004 Version 2.0, January 2004
http://www.apache.org/licenses/ http://www.apache.org/licenses/
@ -178,7 +179,7 @@ Apache License
APPENDIX: How to apply the Apache License to your work. APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "{}" boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a comment syntax for the file format. We also recommend that a
@ -186,7 +187,7 @@ Apache License
same "printed page" as the copyright notice for easier same "printed page" as the copyright notice for easier
identification within third-party archives. identification within third-party archives.
Copyright {yyyy} {name of copyright owner} Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -199,4 +200,3 @@ Apache License
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.

32
src/main/java/li/strolch/tutorialapp/main/Main.java
View File

@ -1,23 +1,17 @@
/* /*
* Copyright (c) 2012, Robert von Burg * Copyright 2013 Robert von Burg <eitch@eitchnet.ch>
* *
* 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.
* This file is part of the XXX. * You may obtain a copy of the License at
* *
* XXX is free software: you can redistribute * http://www.apache.org/licenses/LICENSE-2.0
* it and/or modify it under the terms of the GNU General Public License as *
* published by the Free Software Foundation, either version 3 of the License, * Unless required by applicable law or agreed to in writing, software
* or (at your option) any later version. * distributed under the License is distributed on an "AS IS" BASIS,
* * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* XXX is distributed in the hope that it will * See the License for the specific language governing permissions and
* be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * limitations under the License.
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with XXX. If not, see
* <http://www.gnu.org/licenses/>.
*/ */
package li.strolch.tutorialapp.main; package li.strolch.tutorialapp.main;

32
src/main/java/li/strolch/tutorialapp/postinitializer/PostInitializer.java
View File

@ -1,23 +1,17 @@
/* /*
* Copyright (c) 2012, Robert von Burg * Copyright 2013 Robert von Burg <eitch@eitchnet.ch>
* *
* 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.
* This file is part of the XXX. * You may obtain a copy of the License at
* *
* XXX is free software: you can redistribute * http://www.apache.org/licenses/LICENSE-2.0
* it and/or modify it under the terms of the GNU General Public License as *
* published by the Free Software Foundation, either version 3 of the License, * Unless required by applicable law or agreed to in writing, software
* or (at your option) any later version. * distributed under the License is distributed on an "AS IS" BASIS,
* * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* XXX is distributed in the hope that it will * See the License for the specific language governing permissions and
* be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of * limitations under the License.
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with XXX. If not, see
* <http://www.gnu.org/licenses/>.
*/ */
package li.strolch.tutorialapp.postinitializer; package li.strolch.tutorialapp.postinitializer;