Skip to content

Commit

Permalink
change license from gplv3 to apache 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
chriskapp committed Mar 7, 2015
1 parent 1687823 commit f116730
Show file tree
Hide file tree
Showing 906 changed files with 14,990 additions and 17,791 deletions.
1,135 changes: 514 additions & 621 deletions LICENSE

Large diffs are not rendered by default.

33 changes: 15 additions & 18 deletions bin/psx
Original file line number Diff line number Diff line change
@@ -1,25 +1,22 @@
#!/usr/bin/env php
<?php
/*
* psx
* A object oriented and modular based PHP framework for developing
* dynamic web applications. For the current version and informations
* visit <http://phpsx.org>
* PSX is a open source PHP framework to develop RESTful APIs.
* For the current version and informations visit <http://phpsx.org>
*
* Copyright (c) 2010-2015 Christoph Kappestein <[email protected]>
*
* This file is part of psx. psx 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 3 of the License, or any later version.
*
* psx 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.
*
* You should have received a copy of the GNU General Public License
* along with psx. If not, see <http://www.gnu.org/licenses/>.
* Copyright 2010-2015 Christoph Kappestein <[email protected]>
*
* 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.
*/

$files = array(
Expand Down
66 changes: 30 additions & 36 deletions build/generate-phar.php
Original file line number Diff line number Diff line change
@@ -1,24 +1,21 @@
<?php
/*
* psx
* A object oriented and modular based PHP framework for developing
* dynamic web applications. For the current version and informations
* visit <http://phpsx.org>
* PSX is a open source PHP framework to develop RESTful APIs.
* For the current version and informations visit <http://phpsx.org>
*
* Copyright (c) 2010-2013 Christoph Kappestein <[email protected]>
*
* This file is part of psx. psx 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 3 of the License, or any later version.
*
* psx 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.
*
* You should have received a copy of the GNU General Public License
* along with psx. If not, see <http://www.gnu.org/licenses/>.
* Copyright 2010-2015 Christoph Kappestein <[email protected]>
*
* 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.
*/

if(!isset($_SERVER['argv'][1]))
Expand All @@ -38,25 +35,22 @@

$license = <<<LICENSE
/*
* psx
* A object oriented and modular based PHP framework for developing
* dynamic web applications. For the current version and informations
* visit <http://phpsx.org>
*
* Copyright (c) 2010-2015 Christoph Kappestein <[email protected]>
*
* This file is part of psx. psx 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 3 of the License, or any later version.
*
* psx 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.
* PSX is a open source PHP framework to develop RESTful APIs.
* For the current version and informations visit <http://phpsx.org>
*
* You should have received a copy of the GNU General Public License
* along with psx. If not, see <http://www.gnu.org/licenses/>.
* Copyright 2010-2015 Christoph Kappestein <[email protected]>
*
* 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.
*/
LICENSE;

Expand Down
33 changes: 15 additions & 18 deletions build/get-version.php
Original file line number Diff line number Diff line change
@@ -1,24 +1,21 @@
<?php
/*
* psx
* A object oriented and modular based PHP framework for developing
* dynamic web applications. For the current version and informations
* visit <http://phpsx.org>
* PSX is a open source PHP framework to develop RESTful APIs.
* For the current version and informations visit <http://phpsx.org>
*
* Copyright (c) 2010-2015 Christoph Kappestein <[email protected]>
*
* This file is part of psx. psx 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 3 of the License, or any later version.
*
* psx 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.
*
* You should have received a copy of the GNU General Public License
* along with psx. If not, see <http://www.gnu.org/licenses/>.
* Copyright 2010-2015 Christoph Kappestein <[email protected]>
*
* 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.
*/

$autoloadFile = __DIR__ . '/psx/vendor/autoload.php';
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "PSX Framework",
"keywords": ["REST", "Api", "Framework", "Oauth"],
"homepage": "http://phpsx.org",
"license": "GPL-3.0",
"license": "Apache-2.0",
"authors": [
{
"name": "Christoph Kappestein",
Expand Down
35 changes: 16 additions & 19 deletions library/PSX/ActivityStream/AdditionalObjectPropertiesTrait.php
Original file line number Diff line number Diff line change
@@ -1,24 +1,21 @@
<?php
/*
* psx
* A object oriented and modular based PHP framework for developing
* dynamic web applications. For the current version and informations
* visit <http://phpsx.org>
* PSX is a open source PHP framework to develop RESTful APIs.
* For the current version and informations visit <http://phpsx.org>
*
* Copyright (c) 2010-2015 Christoph Kappestein <[email protected]>
*
* This file is part of psx. psx 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 3 of the License, or any later version.
*
* psx 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.
*
* You should have received a copy of the GNU General Public License
* along with psx. If not, see <http://www.gnu.org/licenses/>.
* Copyright 2010-2015 Christoph Kappestein <[email protected]>
*
* 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.
*/

namespace PSX\ActivityStream;
Expand All @@ -30,7 +27,7 @@
* AdditionalObjectPropertiesTrait
*
* @author Christoph Kappestein <[email protected]>
* @license http://www.gnu.org/licenses/gpl.html GPLv3
* @license http://www.apache.org/licenses/LICENSE-2.0
* @link http://phpsx.org
*/
trait AdditionalObjectPropertiesTrait
Expand Down
35 changes: 16 additions & 19 deletions library/PSX/ActivityStream/Address.php
Original file line number Diff line number Diff line change
@@ -1,24 +1,21 @@
<?php
/*
* psx
* A object oriented and modular based PHP framework for developing
* dynamic web applications. For the current version and informations
* visit <http://phpsx.org>
* PSX is a open source PHP framework to develop RESTful APIs.
* For the current version and informations visit <http://phpsx.org>
*
* Copyright (c) 2010-2015 Christoph Kappestein <[email protected]>
*
* This file is part of psx. psx 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 3 of the License, or any later version.
*
* psx 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.
*
* You should have received a copy of the GNU General Public License
* along with psx. If not, see <http://www.gnu.org/licenses/>.
* Copyright 2010-2015 Christoph Kappestein <[email protected]>
*
* 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.
*/

namespace PSX\ActivityStream;
Expand All @@ -29,7 +26,7 @@
* Address
*
* @author Christoph Kappestein <[email protected]>
* @license http://www.gnu.org/licenses/gpl.html GPLv3
* @license http://www.apache.org/licenses/LICENSE-2.0
* @link http://phpsx.org
*/
class Address extends RecordAbstract
Expand Down
35 changes: 16 additions & 19 deletions library/PSX/ActivityStream/AudienceTargetingTrait.php
Original file line number Diff line number Diff line change
@@ -1,24 +1,21 @@
<?php
/*
* psx
* A object oriented and modular based PHP framework for developing
* dynamic web applications. For the current version and informations
* visit <http://phpsx.org>
* PSX is a open source PHP framework to develop RESTful APIs.
* For the current version and informations visit <http://phpsx.org>
*
* Copyright (c) 2010-2015 Christoph Kappestein <[email protected]>
*
* This file is part of psx. psx 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 3 of the License, or any later version.
*
* psx 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.
*
* You should have received a copy of the GNU General Public License
* along with psx. If not, see <http://www.gnu.org/licenses/>.
* Copyright 2010-2015 Christoph Kappestein <[email protected]>
*
* 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.
*/

namespace PSX\ActivityStream;
Expand All @@ -27,7 +24,7 @@
* AudienceTargetingTrait
*
* @author Christoph Kappestein <[email protected]>
* @license http://www.gnu.org/licenses/gpl.html GPLv3
* @license http://www.apache.org/licenses/LICENSE-2.0
* @link http://phpsx.org
*/
trait AudienceTargetingTrait
Expand Down
35 changes: 16 additions & 19 deletions library/PSX/ActivityStream/Language.php
Original file line number Diff line number Diff line change
@@ -1,24 +1,21 @@
<?php
/*
* psx
* A object oriented and modular based PHP framework for developing
* dynamic web applications. For the current version and informations
* visit <http://phpsx.org>
* PSX is a open source PHP framework to develop RESTful APIs.
* For the current version and informations visit <http://phpsx.org>
*
* Copyright (c) 2010-2015 Christoph Kappestein <[email protected]>
*
* This file is part of psx. psx 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 3 of the License, or any later version.
*
* psx 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.
*
* You should have received a copy of the GNU General Public License
* along with psx. If not, see <http://www.gnu.org/licenses/>.
* Copyright 2010-2015 Christoph Kappestein <[email protected]>
*
* 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.
*/

namespace PSX\ActivityStream;
Expand All @@ -29,7 +26,7 @@
* Language
*
* @author Christoph Kappestein <[email protected]>
* @license http://www.gnu.org/licenses/gpl.html GPLv3
* @license http://www.apache.org/licenses/LICENSE-2.0
* @link http://phpsx.org
*/
class Language
Expand Down
Loading

0 comments on commit f116730

Please sign in to comment.