You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2012/08/07 10:02:40 UTC
svn commit: r1370135 - in /incubator/syncope/trunk: ./ LICENSE NOTICE
legal_ext/LICENSE legal_ext/NOTICE
Author: ilgrosso
Date: Tue Aug 7 08:02:40 2012
New Revision: 1370135
URL: http://svn.apache.org/viewvc?rev=1370135&view=rev
Log:
Merge from 1_0_X
Modified:
incubator/syncope/trunk/ (props changed)
incubator/syncope/trunk/LICENSE
incubator/syncope/trunk/NOTICE
incubator/syncope/trunk/legal_ext/LICENSE
incubator/syncope/trunk/legal_ext/NOTICE
Propchange: incubator/syncope/trunk/
------------------------------------------------------------------------------
Merged /incubator/syncope/branches/1_0_X:r1368565-1370134
Modified: incubator/syncope/trunk/LICENSE
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/LICENSE?rev=1370135&r1=1370134&r2=1370135&view=diff
==============================================================================
--- incubator/syncope/trunk/LICENSE (original)
+++ incubator/syncope/trunk/LICENSE Tue Aug 7 08:02:40 2012
@@ -200,3 +200,51 @@
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.
+
+==
+
+For jQuery (http://jquery.com/):
+
+jquery-1.4.2.min.js
+jquery-ui-1.8.5.custom.min.js
+jquery.ui.button.js
+jquery.ui.core.js
+jquery.ui.dialog.js
+jquery.ui.draggable.js
+jquery.ui.mouse.js
+jquery.ui.position.js
+jquery.ui.resizable.js
+jquery.ui.tabs.js
+jquery.ui.widget.js
+
+This is licensed under the terms of the MIT license.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+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.
+
+==
+
+For CodeMirror (http://codemirror.net/):
+
+codemirror.js
+xmlpure.js
+
+This is licensed under the terms of the MIT license, see above.
+
+==
Modified: incubator/syncope/trunk/NOTICE
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/NOTICE?rev=1370135&r1=1370134&r2=1370135&view=diff
==============================================================================
--- incubator/syncope/trunk/NOTICE (original)
+++ incubator/syncope/trunk/NOTICE Tue Aug 7 08:02:40 2012
@@ -3,3 +3,21 @@ Copyright 2012 The Apache Software Found
This product includes software developed by:
The Apache Software Foundation (http://www.apache.org/).
+
+The following copyright notice(s) were affixed to portions of this code
+with which this file is now or was at one time distributed.
+
+==
+
+This product includes the jQuery JavaScript Library.
+Copyright (c) 2012 jQuery Foundation and other contributors,
+jQuery is dually licensed under the MIT and GPL licenses, and
+is included in this software distribution under the MIT license.
+For details, see the jQuery web site: http://jquery.com/
+
+==
+
+This product includes the CodeMirror JavaScript component.
+Copyright (C) 2012 by Marijn Haverbeke <ma...@gmail.com>
+
+==
Modified: incubator/syncope/trunk/legal_ext/LICENSE
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/legal_ext/LICENSE?rev=1370135&r1=1370134&r2=1370135&view=diff
==============================================================================
--- incubator/syncope/trunk/legal_ext/LICENSE (original)
+++ incubator/syncope/trunk/legal_ext/LICENSE Tue Aug 7 08:02:40 2012
@@ -786,3 +786,49 @@ For Joda Time (http://joda-time.sourcefo
This is licensed under the AL 2.0, see above.
==
+
+For jQuery (http://jquery.com/):
+
+jquery-1.4.2.min.js
+jquery-ui-1.8.5.custom.min.js
+jquery.ui.button.js
+jquery.ui.core.js
+jquery.ui.dialog.js
+jquery.ui.draggable.js
+jquery.ui.mouse.js
+jquery.ui.position.js
+jquery.ui.resizable.js
+jquery.ui.tabs.js
+jquery.ui.widget.js
+
+This is licensed under the terms of the MIT license.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+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.
+
+==
+
+For CodeMirror (http://codemirror.net/):
+
+codemirror.js
+xmlpure.js
+
+This is licensed under the terms of the MIT license, see above.
+
+==
Modified: incubator/syncope/trunk/legal_ext/NOTICE
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/legal_ext/NOTICE?rev=1370135&r1=1370134&r2=1370135&view=diff
==============================================================================
--- incubator/syncope/trunk/legal_ext/NOTICE (original)
+++ incubator/syncope/trunk/legal_ext/NOTICE Tue Aug 7 08:02:40 2012
@@ -7,11 +7,11 @@ The Apache Software Foundation (http://w
The following copyright notice(s) were affixed to portions of this code
with which this file is now or was at one time distributed.
-===
+==
This product includes software developed by the Code Generation Library project.
-===
+==
This product includes software developed by QOS.ch.
Copyright (C) 1999-2011, QOS.ch. All rights reserved.
@@ -136,3 +136,16 @@ All Rights Reserved.
This product includes software developed by the Joda Time project.
==
+
+This product includes the jQuery JavaScript Library.
+Copyright (c) 2012 jQuery Foundation and other contributors,
+jQuery is dually licensed under the MIT and GPL licenses, and
+is included in this software distribution under the MIT license.
+For details, see the jQuery web site: http://jquery.com/
+
+==
+
+This product includes the CodeMirror JavaScript component.
+Copyright (C) 2012 by Marijn Haverbeke <ma...@gmail.com>
+
+==