Updated Branches: refs/heads/develop 29b22583c -> 094984842
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/platform/marmotta-sparql/src/main/resources/web/admin/snorql/NOTICE ---------------------------------------------------------------------- diff --git a/platform/marmotta-sparql/src/main/resources/web/admin/snorql/NOTICE b/platform/marmotta-sparql/src/main/resources/web/admin/snorql/NOTICE deleted file mode 100644 index 7474373..0000000 --- a/platform/marmotta-sparql/src/main/resources/web/admin/snorql/NOTICE +++ /dev/null @@ -1,5 +0,0 @@ -Snorql includes the xml-to-html.xsl files, witch has copyright 2006 by -Dave Beckett (DAWG), Jeen Broekstra (DAWG) and Andy Seaborne (SPARQler). - -Snorql includes the sparql.js files, witch has copyright 2006, 2007 -Lee Feigenbaum, Elias Torres and Wing Yung. http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/platform/marmotta-sparql/src/main/resources/web/admin/snorql/namespaces.js ---------------------------------------------------------------------- diff --git a/platform/marmotta-sparql/src/main/resources/web/admin/snorql/namespaces.js b/platform/marmotta-sparql/src/main/resources/web/admin/snorql/namespaces.js index 7eccd80..7db1f83 100755 --- a/platform/marmotta-sparql/src/main/resources/web/admin/snorql/namespaces.js +++ b/platform/marmotta-sparql/src/main/resources/web/admin/snorql/namespaces.js @@ -1,6 +1,4 @@ /* - * Copyright (c) 2007 Richard Cyganiak - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/platform/marmotta-sparql/src/main/resources/web/admin/snorql/prototype.js ---------------------------------------------------------------------- diff --git a/platform/marmotta-sparql/src/main/resources/web/admin/snorql/prototype.js b/platform/marmotta-sparql/src/main/resources/web/admin/snorql/prototype.js index 35a6913..3548fc0 100755 --- a/platform/marmotta-sparql/src/main/resources/web/admin/snorql/prototype.js +++ b/platform/marmotta-sparql/src/main/resources/web/admin/snorql/prototype.js @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ /* Prototype JavaScript framework, version 1.6.0.2 * (c) 2005-2008 Sam Stephenson * @@ -4218,4 +4235,4 @@ Object.extend(Element.ClassNames.prototype, Enumerable); /*--------------------------------------------------------------------------*/ -Element.addMethods(); +Element.addMethods(); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous/builder.js ---------------------------------------------------------------------- diff --git a/platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous/builder.js b/platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous/builder.js index 8301999..afa33df 100755 --- a/platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous/builder.js +++ b/platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous/builder.js @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ // script.aculo.us builder.js v1.8.1, Thu Jan 03 22:07:12 -0500 2008 // Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous/controls.js ---------------------------------------------------------------------- diff --git a/platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous/controls.js b/platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous/controls.js index 7ab3eff..278f99b 100755 --- a/platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous/controls.js +++ b/platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous/controls.js @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ // script.aculo.us controls.js v1.8.1, Thu Jan 03 22:07:12 -0500 2008 // Autocompleter.Base handles all the autocompletion functionality http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous/dragdrop.js ---------------------------------------------------------------------- diff --git a/platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous/dragdrop.js b/platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous/dragdrop.js index 2cceb0f..dde6393 100755 --- a/platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous/dragdrop.js +++ b/platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous/dragdrop.js @@ -1,10 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ // script.aculo.us dragdrop.js v1.8.1, Thu Jan 03 22:07:12 -0500 2008 -// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) -// -// script.aculo.us is freely distributable under the terms of an MIT-style license. -// For details, see the script.aculo.us web site: http://script.aculo.us/ - if(Object.isUndefined(Effect)) throw("dragdrop.js requires including script.aculo.us' effects.js library"); http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous/effects.js ---------------------------------------------------------------------- diff --git a/platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous/effects.js b/platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous/effects.js index f136b56..113aff6 100755 --- a/platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous/effects.js +++ b/platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous/effects.js @@ -1,10 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ // script.aculo.us effects.js v1.8.1, Thu Jan 03 22:07:12 -0500 2008 -// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) -// -// script.aculo.us is freely distributable under the terms of an MIT-style license. -// For details, see the script.aculo.us web site: http://script.aculo.us/ - // converts rgb() and #xxx to #xxxxxx format, // returns self (or first argument) if not convertable String.prototype.parseColor = function() { http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous/scriptaculous.js ---------------------------------------------------------------------- diff --git a/platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous/scriptaculous.js b/platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous/scriptaculous.js index e84bd9c..6d5a6ee 100755 --- a/platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous/scriptaculous.js +++ b/platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous/scriptaculous.js @@ -1,10 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ // script.aculo.us scriptaculous.js v1.8.1, Thu Jan 03 22:07:12 -0500 2008 -// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) -// -// script.aculo.us is freely distributable under the terms of an MIT-style license. -// For details, see the script.aculo.us web site: http://script.aculo.us/ - var Scriptaculous = { Version: '1.8.1', require: function(libraryName) { @@ -37,4 +49,4 @@ var Scriptaculous = { } } -Scriptaculous.load(); +Scriptaculous.load(); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous/slider.js ---------------------------------------------------------------------- diff --git a/platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous/slider.js b/platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous/slider.js index 75a1b96..1279f94 100755 --- a/platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous/slider.js +++ b/platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous/slider.js @@ -1,10 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ // script.aculo.us slider.js v1.8.1, Thu Jan 03 22:07:12 -0500 2008 -// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) -// -// script.aculo.us is freely distributable under the terms of an MIT-style license. -// For details, see the script.aculo.us web site: http://script.aculo.us/ - if (!Control) var Control = { }; // options: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous/sound.js ---------------------------------------------------------------------- diff --git a/platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous/sound.js b/platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous/sound.js index a61a43a..4d1b027 100755 --- a/platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous/sound.js +++ b/platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous/sound.js @@ -1,10 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ // script.aculo.us sound.js v1.8.1, Thu Jan 03 22:07:12 -0500 2008 -// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) -// -// script.aculo.us is freely distributable under the terms of an MIT-style license. -// For details, see the script.aculo.us web site: http://script.aculo.us/ - Sound = { tracks: {}, _enabled: true, http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous/unittest.js ---------------------------------------------------------------------- diff --git a/platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous/unittest.js b/platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous/unittest.js index 6cadccd..e40149c 100755 --- a/platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous/unittest.js +++ b/platform/marmotta-sparql/src/main/resources/web/admin/snorql/scriptaculous/unittest.js @@ -1,10 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ // script.aculo.us unittest.js v1.8.1, Thu Jan 03 22:07:12 -0500 2008 -// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) -// -// script.aculo.us is freely distributable under the terms of an MIT-style license. -// For details, see the script.aculo.us web site: http://script.aculo.us/ - // experimental, Firefox-only Event.simulateMouse = function(element, eventName) { var options = Object.extend({ @@ -563,4 +575,4 @@ Test.context = function(name, spec, log){ } } new Test.Unit.Runner(compiledSpec, { titles: titles, testLog: log || 'testlog', context: name }); -}; +}; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/platform/marmotta-sparql/src/main/resources/web/admin/snorql/snorql.html ---------------------------------------------------------------------- diff --git a/platform/marmotta-sparql/src/main/resources/web/admin/snorql/snorql.html b/platform/marmotta-sparql/src/main/resources/web/admin/snorql/snorql.html index aead0a1..b45fcac 100755 --- a/platform/marmotta-sparql/src/main/resources/web/admin/snorql/snorql.html +++ b/platform/marmotta-sparql/src/main/resources/web/admin/snorql/snorql.html @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - Copyright (c) 2007 Richard Cyganiak Licensed to the Apache Software Foundation (ASF) under one or more contributor license agreements. See the NOTICE file http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/platform/marmotta-sparql/src/main/resources/web/admin/snorql/snorql.js ---------------------------------------------------------------------- diff --git a/platform/marmotta-sparql/src/main/resources/web/admin/snorql/snorql.js b/platform/marmotta-sparql/src/main/resources/web/admin/snorql/snorql.js index df47c72..22f3b6a 100755 --- a/platform/marmotta-sparql/src/main/resources/web/admin/snorql/snorql.js +++ b/platform/marmotta-sparql/src/main/resources/web/admin/snorql/snorql.js @@ -1,6 +1,4 @@ /* - * Copyright (c) 2007 Richard Cyganiak - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/platform/marmotta-sparql/src/main/resources/web/admin/snorql/sparql.js ---------------------------------------------------------------------- diff --git a/platform/marmotta-sparql/src/main/resources/web/admin/snorql/sparql.js b/platform/marmotta-sparql/src/main/resources/web/admin/snorql/sparql.js index 613c53f..2b34538 100755 --- a/platform/marmotta-sparql/src/main/resources/web/admin/snorql/sparql.js +++ b/platform/marmotta-sparql/src/main/resources/web/admin/snorql/sparql.js @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. + */ /********************************************************** Copyright (c) 2006, 2007 Lee Feigenbaum ( lee AT thefigtrees DOT net ) http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/platform/marmotta-sparql/src/main/resources/web/admin/snorql/style.css ---------------------------------------------------------------------- diff --git a/platform/marmotta-sparql/src/main/resources/web/admin/snorql/style.css b/platform/marmotta-sparql/src/main/resources/web/admin/snorql/style.css index 329379a..f94ce4b 100755 --- a/platform/marmotta-sparql/src/main/resources/web/admin/snorql/style.css +++ b/platform/marmotta-sparql/src/main/resources/web/admin/snorql/style.css @@ -1,6 +1,4 @@ /** - * Copyright (c) 2007 Richard Cyganiak - * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/platform/marmotta-sparql/src/main/resources/web/cm/LICENSE.txt ---------------------------------------------------------------------- diff --git a/platform/marmotta-sparql/src/main/resources/web/cm/LICENSE.txt b/platform/marmotta-sparql/src/main/resources/web/cm/LICENSE.txt deleted file mode 100644 index 482d55e..0000000 --- a/platform/marmotta-sparql/src/main/resources/web/cm/LICENSE.txt +++ /dev/null @@ -1,23 +0,0 @@ -Copyright (C) 2013 by Marijn Haverbeke <[email protected]> - -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. - -Please note that some subdirectories of the CodeMirror distribution -include their own LICENSE files, and are released under different -licences. http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/platform/marmotta-sparql/src/main/resources/web/cm/codemirror.css ---------------------------------------------------------------------- diff --git a/platform/marmotta-sparql/src/main/resources/web/cm/codemirror.css b/platform/marmotta-sparql/src/main/resources/web/cm/codemirror.css index a554b5a..b5385d7 100644 --- a/platform/marmotta-sparql/src/main/resources/web/cm/codemirror.css +++ b/platform/marmotta-sparql/src/main/resources/web/cm/codemirror.css @@ -1,23 +1,19 @@ /** - * Copyright (C) 2013 by Marijn Haverbeke <[email protected]> - * - * 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. + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. */ #center .CodeMirror, .CodeMirror { line-height: 1em; http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/platform/marmotta-sparql/src/main/resources/web/cm/codemirror.js ---------------------------------------------------------------------- diff --git a/platform/marmotta-sparql/src/main/resources/web/cm/codemirror.js b/platform/marmotta-sparql/src/main/resources/web/cm/codemirror.js index a745ac2..72609ee 100644 --- a/platform/marmotta-sparql/src/main/resources/web/cm/codemirror.js +++ b/platform/marmotta-sparql/src/main/resources/web/cm/codemirror.js @@ -1,25 +1,20 @@ -/** - * Copyright (C) 2013 by Marijn Haverbeke <[email protected]> - * - * 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. +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. */ - // CodeMirror version 2.24 // // All functions that need access to the editor's state live inside http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/platform/marmotta-sparql/src/main/resources/web/cm/simple-hint.css ---------------------------------------------------------------------- diff --git a/platform/marmotta-sparql/src/main/resources/web/cm/simple-hint.css b/platform/marmotta-sparql/src/main/resources/web/cm/simple-hint.css index 37ad0d4..c7a040c 100644 --- a/platform/marmotta-sparql/src/main/resources/web/cm/simple-hint.css +++ b/platform/marmotta-sparql/src/main/resources/web/cm/simple-hint.css @@ -1,25 +1,20 @@ /** - * Copyright (C) 2013 by Marijn Haverbeke <[email protected]> - * - * 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. + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. */ - #center .CodeMirror-completions, .CodeMirror-completions { position: absolute; z-index: 10; http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/platform/marmotta-sparql/src/main/resources/web/cm/simple-hint.js ---------------------------------------------------------------------- diff --git a/platform/marmotta-sparql/src/main/resources/web/cm/simple-hint.js b/platform/marmotta-sparql/src/main/resources/web/cm/simple-hint.js index f1c2b1b..27f8ead 100644 --- a/platform/marmotta-sparql/src/main/resources/web/cm/simple-hint.js +++ b/platform/marmotta-sparql/src/main/resources/web/cm/simple-hint.js @@ -1,25 +1,20 @@ -/** - * Copyright (C) 2013 by Marijn Haverbeke <[email protected]> - * - * 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. +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. */ - (function() { CodeMirror.simpleHint = function(editor, getHints) { // We want a single cursor position. http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/platform/marmotta-sparql/src/main/resources/web/cm/sparql.js ---------------------------------------------------------------------- diff --git a/platform/marmotta-sparql/src/main/resources/web/cm/sparql.js b/platform/marmotta-sparql/src/main/resources/web/cm/sparql.js index a089abb..ff3ad70 100644 --- a/platform/marmotta-sparql/src/main/resources/web/cm/sparql.js +++ b/platform/marmotta-sparql/src/main/resources/web/cm/sparql.js @@ -1,25 +1,20 @@ -/** - * Copyright (C) 2013 by Marijn Haverbeke <[email protected]> - * - * 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. +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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. */ - CodeMirror.defineMode("sparql", function(config) { var indentUnit = config.indentUnit; var curPunc; http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/platform/marmotta-user/pom.xml ---------------------------------------------------------------------- diff --git a/platform/marmotta-user/pom.xml b/platform/marmotta-user/pom.xml index 0f0b7d5..c134b26 100644 --- a/platform/marmotta-user/pom.xml +++ b/platform/marmotta-user/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.marmotta</groupId> <artifactId>marmotta-parent</artifactId> - <version>3.0.0-incubating-SNAPSHOT</version> + <version>3.1.0-incubating-SNAPSHOT</version> <relativePath>../../parent</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/platform/marmotta-versioning/pom.xml ---------------------------------------------------------------------- diff --git a/platform/marmotta-versioning/pom.xml b/platform/marmotta-versioning/pom.xml index 3b6d6ac..0f3bbb1 100644 --- a/platform/marmotta-versioning/pom.xml +++ b/platform/marmotta-versioning/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.marmotta</groupId> <artifactId>marmotta-parent</artifactId> - <version>3.0.0-incubating-SNAPSHOT</version> + <version>3.1.0-incubating-SNAPSHOT</version> <relativePath>../../parent</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/platform/pom.xml ---------------------------------------------------------------------- diff --git a/platform/pom.xml b/platform/pom.xml index c34c6de..8c7a027 100644 --- a/platform/pom.xml +++ b/platform/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.marmotta</groupId> <artifactId>marmotta-parent</artifactId> - <version>3.0.0-incubating-SNAPSHOT</version> + <version>3.1.0-incubating-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/09498484/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 3f3b938..dbb2d40 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ <parent> <groupId>org.apache.marmotta</groupId> <artifactId>marmotta-parent</artifactId> - <version>3.0.0-incubating-SNAPSHOT</version> + <version>3.1.0-incubating-SNAPSHOT</version> <relativePath>parent</relativePath> </parent> @@ -329,14 +329,7 @@ <include name="*.tar.gz" /> </fileset> </checksum> - <checksum file="${basedir}/target/${project.version}/apache-marmotta-${project.version}-installer.zip" algorithm="SHA1" property="checksum.installer.zip" /> - <checksum file="${basedir}/target/${project.version}/apache-marmotta-${project.version}-installer.tar.gz" algorithm="SHA1" property="checksum.installer.tgz" /> - <checksum file="${basedir}/target/${project.version}/apache-marmotta-${project.version}-ldpath.zip" algorithm="SHA1" property="checksum.ldpath.zip" /> - <checksum file="${basedir}/target/${project.version}/apache-marmotta-${project.version}-ldpath.tar.gz" algorithm="SHA1" property="checksum.ldpath.tgz" /> - <checksum file="${basedir}/target/${project.version}/apache-marmotta-${project.version}-src.zip" algorithm="SHA1" property="checksum.src.zip" /> - <checksum file="${basedir}/target/${project.version}/apache-marmotta-${project.version}-src.tar.gz" algorithm="SHA1" property="checksum.src.tgz" /> - <checksum file="${basedir}/target/${project.version}/apache-marmotta-${project.version}-webapp.zip" algorithm="SHA1" property="checksum.webapp.zip" /> - <checksum file="${basedir}/target/${project.version}/apache-marmotta-${project.version}-webapp.tar.gz" algorithm="SHA1" property="checksum.webapp.tgz" /> + <checksum file="${basedir}/target/${project.version}/apache-marmotta-${project.version}-src.zip" algorithm="SHA1" property="checksum" /> <echo file="${basedir}/target/vote.txt"> From: ${username}@apache.org To: [email protected] @@ -346,23 +339,11 @@ A candidate for the Marmotta ${project.version} release is available at: https://dist.apache.org/repos/dist/dev/incubator/marmotta/${project.version}/ -The release candidate is based on the sources tagged with ${project.version} in: +The release candidate is a zip archive of the sources in: https://git-wip-us.apache.org/repos/asf/incubator-marmotta.git -The release candidate consists of the following distribution archives: -- apache-marmotta-${project.version}-installer.[zip|tar.gz] - SHA1 of ZIP: ${checksum.installer.zip} - SHA1 of TGZ: ${checksum.installer.tgz} -- apache-marmotta-${project.version}-ldpath.[zip|tar.gz] - SHA1 of ZIP: ${checksum.ldpath.zip} - SHA1 of TGZ: ${checksum.ldpath.tgz} -- apache-marmotta-${project.version}-src.[zip|tar.gz] - SHA1 of ZIP: ${checksum.src.zip} - SHA1 of TGZ: ${checksum.src.tgz} -- apache-marmotta-${project.version}-webapp.[zip|tar.gz] - SHA1 of ZIP: ${checksum.webapp.zip} - SHA1 of TGZ: ${checksum.webapp.tgz} +The SHA1 checksum of the archive is ${checksum}. A staged Maven repository is available for review at:
