Skip to content

Commit

Permalink
[INTERNAL] Correct license by adding copyright notice and API section
Browse files Browse the repository at this point in the history
- Add a NOTICE.txt file declaring the SAP copyright (no, this does not
affect the Open Source nature of OpenUI5, it's actually required by the
Apache Open Source license)
- Add a section regarding SAP API usage to the LICENSE.txt
- Remove some references to SAPUI5 within OpenUI5 (e.g. in copyright
headers in files, also in some test pages)
- Adapt grunt tasks for bower package creation to copy NOTICE file as
well and use the changed header


Change-Id: Ieb908be467e02c0446758471a9a5a29c319e9732
Fixes SAP#550
  • Loading branch information
akudev committed Jul 29, 2015
1 parent 7cabd88 commit 3b13f7e
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 10 deletions.
21 changes: 19 additions & 2 deletions LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -202,10 +202,27 @@
limitations under the License.



The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

--------------------------------------------------------------------------------------------------------------------------
SAPUI5 SUBCOMPONENTS:
APIs

This project may include APIs to SAP or third party products or services. The use of these APIs, products and services may be subject to additional agreements. In no event shall the application of the Apache Software License, v.2 to this project grant any rights in or to these APIs, products or services that would alter, expand, be inconsistent with, or supersede any terms of these additional agreements. “API” means application programming interfaces, as well as their respective specifications and implementing code that allows other software products to communicate with or call on SAP or third party products or services (for example, SAP Enterprise Services, BAPIs, Idocs, RFCs and ABAP calls or other user exits) and may be made available through SAP or third party products, SDKs, documentation or other media.

------------------------------------------------------------------------------
OpenUI5 SUBCOMPONENTS:

SAPUI5 includes the following subcomponents that are subject to separate license terms.
OpenUI5 includes the following subcomponents that are subject to separate license terms.
Your use of these subcomponents is subject to the seperate license terms applicable to
each subcomponent.

Expand Down
1 change: 1 addition & 0 deletions NOTICE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Copyright (c) 2009-2015 SAP SE or an SAP affiliate company.
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,20 @@
What is it?
-----------
OpenUI5 lets you build enterprise-ready web applications, responsive to all devices, running on almost
any browser of your choice. Its based on JavaScript, using jQuery as its foundation and follows web standards.
any browser of your choice. It's based on JavaScript, using jQuery as its foundation and follows web standards.
It eases your development with a client-side HTML5 rendering library including a rich set of controls
and supports data binding to different data models (JSON, XML and OData).

And... it's free and open source: OpenUI5 is licensed under the Apache License, Version 2.0 - see LICENSE.txt

Try it!
-------
Check out our [interactive control playground](https://openui5.hana.ondemand.com/#content/Controls/index.html)
as well as a number of [sample applications](https://openui5.hana.ondemand.com/#demoapps.html).

Get it!
-------
It's free. Go to the [download page](http://openui5.org/download.html) and get the complete UI5 runtime
Go to the [download page](http://openui5.org/download.html) and get the complete UI5 runtime
and the UI5 SDK containing the documentation and many example apps as well as the complete runtime.

You can also consume [each OpenUI5 library](https://github.com/openui5?query=packaged-) individually via [bower](http://bower.io/), for example:
Expand All @@ -37,3 +39,4 @@ Hack it!
--------
You can get the sources and build UI5 on your own, please check the [documentation for the UI5 development setup](docs/developing.md). You might then want to understand how [control libraries are structured and controls are developed](docs/controllibraries.md).
Maybe there's a bug you could analyze and fix?

6 changes: 5 additions & 1 deletion grunt/config/copy.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,14 @@ module.exports = function(grunt, config) {
src: '**',
dest: '../packaged-' + library.name
},
// license file should also be present in each bower repo
// license and notice file should also be present in each bower repo
{
src: 'LICENSE.txt',
dest: '../packaged-' + library.name + '/LICENSE.txt'
},
{
src: 'NOTICE.txt',
dest: '../packaged-' + library.name + '/NOTICE.txt'
}
]
};
Expand Down
2 changes: 1 addition & 1 deletion grunt/config/replace.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ module.exports = function(grunt, config) {
{
from: /(?:\$\{copyright\}|@copyright@)/g,
to:
'SAP UI development toolkit for HTML5 (SAPUI5/OpenUI5)' + '\n' +
'UI development toolkit for HTML5 (OpenUI5)' + '\n' +
' * (c) Copyright 2009-' + new Date().getFullYear() + ' SAP SE or an SAP affiliate company.' + '\n' +
' * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.'
},
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@

<!-- filtering properties -->
<version>${project.version}</version>
<copyright><![CDATA[SAP UI development toolkit for HTML5 (SAPUI5/OpenUI5)
<copyright><![CDATA[UI development toolkit for HTML5 (OpenUI5)
* (c) Copyright 2009-2015 SAP SE or an SAP affiliate company.
* Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
]]></copyright>
Expand Down
4 changes: 2 additions & 2 deletions src/sap.ui.commons/test/sap/ui/commons/Dialog.html
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
opener: btn
});

dialog.addContent(new sap.ui.commons.Image({decorative: true, src: 'https://sapui5.neo.ondemand.com/sdk/resources/sap/ui/core/mimes/logo/icotxt_white_220x72_blue.png'}));
dialog.addContent(new sap.ui.commons.Image({decorative: true, src: 'https://openui5.hana.ondemand.com/resources/sap/ui/core/mimes/logo/icotxt_white_220x72_blue.png'}));
dialog.addContent(new sap.ui.commons.TextField());
dialog.addContent(new sap.ui.commons.TextField());

Expand All @@ -193,7 +193,7 @@
var dialog2 = new sap.ui.commons.Dialog({modal: true, showCloseButton: true});

dialog2.addContent(new sap.ui.commons.TextField());
dialog2.addContent(new sap.ui.commons.Image({decorative: true, src: 'https://sapui5.neo.ondemand.com/sdk/resources/sap/ui/core/mimes/logo/icotxt_white_220x72_blue.png'}));
dialog2.addContent(new sap.ui.commons.Image({decorative: true, src: 'https://openui5.hana.ondemand.com/resources/sap/ui/core/mimes/logo/icotxt_white_220x72_blue.png'}));
dialog2.addContent(new sap.ui.commons.TextField());

btn2.attachPress(function() { dialog2.open() });
Expand Down
2 changes: 1 addition & 1 deletion src/sap.ui.core/test/sap/ui/core/tmpl/TemplateBinding.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<script
id='sap-ui-bootstrap'
type='text/javascript'
src='https://sapui5.netweaver.ondemand.com/resources/sap-ui-core.js'
src='../../../../../resources/sap-ui-core.js'
data-sap-ui-xx-bindingSyntax="complex"
data-sap-ui-theme='sap_bluecrystal'
data-sap-ui-libs='sap.m, sap.ui.commons, sap.ui.core, sap.ui.layout, sap.ui.ux3'
Expand Down

0 comments on commit 3b13f7e

Please sign in to comment.