Author: szabyg
Date: Tue Feb 28 16:56:02 2012
New Revision: 1294730
URL: http://svn.apache.org/viewvc?rev=1294730&view=rev
Log:
Fix missing license info (STANBOL-274) and upgrade annotate.js, VIE, jquery,
hallo, backbone.
Added:
incubator/stanbol/trunk/demos/webvie/src/main/resources/org/apache/stanbol/commons/web/vie/static/lib/jquery-1.7.1.js
Removed:
incubator/stanbol/trunk/demos/webvie/src/main/resources/org/apache/stanbol/commons/web/vie/static/lib/jquery-1.5.1.js
incubator/stanbol/trunk/demos/webvie/src/main/resources/org/apache/stanbol/commons/web/vie/static/test.js
Modified:
incubator/stanbol/trunk/demos/webvie/pom.xml
incubator/stanbol/trunk/demos/webvie/src/main/java/org/apache/stanbol/commons/web/vie/fragment/EnhancerVieWebFragment.java
incubator/stanbol/trunk/demos/webvie/src/main/resources/org/apache/stanbol/commons/web/vie/static/annotate.css
incubator/stanbol/trunk/demos/webvie/src/main/resources/org/apache/stanbol/commons/web/vie/static/lib/Smoothness/jquery.ui.base.css
incubator/stanbol/trunk/demos/webvie/src/main/resources/org/apache/stanbol/commons/web/vie/static/lib/annotate.js
incubator/stanbol/trunk/demos/webvie/src/main/resources/org/apache/stanbol/commons/web/vie/static/lib/backbone.js
incubator/stanbol/trunk/demos/webvie/src/main/resources/org/apache/stanbol/commons/web/vie/static/lib/hallo/format.js
incubator/stanbol/trunk/demos/webvie/src/main/resources/org/apache/stanbol/commons/web/vie/static/lib/hallo/hallo.js
incubator/stanbol/trunk/demos/webvie/src/main/resources/org/apache/stanbol/commons/web/vie/static/lib/vie/vie-latest.debug.js
incubator/stanbol/trunk/demos/webvie/src/main/resources/org/apache/stanbol/commons/web/vie/static/lib/vie/vie-latest.js
incubator/stanbol/trunk/demos/webvie/src/main/resources/org/apache/stanbol/commons/web/vie/templates/org/apache/stanbol/commons/web/vie/resource/EnhancerVieRootResource/index.ftl
incubator/stanbol/trunk/parent/pom.xml
Modified: incubator/stanbol/trunk/demos/webvie/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/demos/webvie/pom.xml?rev=1294730&r1=1294729&r2=1294730&view=diff
==============================================================================
--- incubator/stanbol/trunk/demos/webvie/pom.xml (original)
+++ incubator/stanbol/trunk/demos/webvie/pom.xml Tue Feb 28 16:56:02 2012
@@ -58,6 +58,36 @@
</instructions>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>.svnignore</exclude>
+ <exclude>README.md</exclude>
+ <exclude>src/license/THIRD-PARTY.properties</exclude>
+ <!-- rdfQuery has MIT licence -->
+
<exclude>src/main/resources/org/apache/stanbol/commons/web/vie/static/lib/jquery.rdfquery.min.js</exclude>
+ <!--
+ Annotate.js: MIT License
+ underscore.js: MIT license
+ backbone.js: MIT license
+
<exclude>src/main/resources/org/apache/stanbol/commons/web/vie/static/lib/underscore-min.js</exclude>
+
<exclude>src/main/resources/org/apache/stanbol/commons/web/vie/static/lib/annotate.js</exclude>
+
<exclude>src/main/resources/org/apache/stanbol/commons/web/vie/static/lib/backbone.js</exclude>
+
<exclude>src/main/resources/org/apache/stanbol/commons/web/vie/static/lib/vie/vie-latest.js</exclude>
+
<exclude>src/main/resources/org/apache/stanbol/commons/web/vie/static/lib/vie/vie-latest.debug.js</exclude>
+
<exclude>src/main/resources/org/apache/stanbol/commons/web/vie/static/lib/backbone-min.js</exclude>
+
<exclude>src/main/resources/org/apache/stanbol/commons/web/vie/static/lib/jquery.rdfquery.min.js</exclude>
+
<exclude>src/main/resources/org/apache/stanbol/commons/web/vie/static/annotate.coffee</exclude>
+
<exclude>src/main/resources/org/apache/stanbol/commons/web/vie/static/annotate.css</exclude>
+
<exclude>src/main/resources/org/apache/stanbol/commons/web/vie/static/lib/hallo/format.js</exclude>
+
<exclude>src/main/resources/org/apache/stanbol/commons/web/vie/static/lib/hallo/hallo.js</exclude>
+
<exclude>src/main/resources/org/apache/stanbol/commons/web/vie/static/test.js</exclude>
+ -->
+ </excludes>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified:
incubator/stanbol/trunk/demos/webvie/src/main/java/org/apache/stanbol/commons/web/vie/fragment/EnhancerVieWebFragment.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/demos/webvie/src/main/java/org/apache/stanbol/commons/web/vie/fragment/EnhancerVieWebFragment.java?rev=1294730&r1=1294729&r2=1294730&view=diff
==============================================================================
---
incubator/stanbol/trunk/demos/webvie/src/main/java/org/apache/stanbol/commons/web/vie/fragment/EnhancerVieWebFragment.java
(original)
+++
incubator/stanbol/trunk/demos/webvie/src/main/java/org/apache/stanbol/commons/web/vie/fragment/EnhancerVieWebFragment.java
Tue Feb 28 16:56:02 2012
@@ -99,7 +99,7 @@ public class EnhancerVieWebFragment impl
@Override
public List<ScriptResource> getScriptResources() {
List<ScriptResource> resources = new ArrayList<ScriptResource>();
- resources.add(new ScriptResource("text/javascript",
"lib/jquery-1.5.1.js", this, 10));
+ resources.add(new ScriptResource("text/javascript",
"lib/jquery-1.7.1.js", this, 10));
resources.add(new ScriptResource("text/javascript",
"lib/jquery-ui.1.9m5.js", this, 10));
resources.add(new ScriptResource("text/javascript",
"lib/underscore-min.js", this, 10));
resources.add(new ScriptResource("text/javascript", "lib/backbone.js",
this, 10));
Modified:
incubator/stanbol/trunk/demos/webvie/src/main/resources/org/apache/stanbol/commons/web/vie/static/annotate.css
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/demos/webvie/src/main/resources/org/apache/stanbol/commons/web/vie/static/annotate.css?rev=1294730&r1=1294729&r2=1294730&view=diff
==============================================================================
---
incubator/stanbol/trunk/demos/webvie/src/main/resources/org/apache/stanbol/commons/web/vie/static/annotate.css
(original)
+++
incubator/stanbol/trunk/demos/webvie/src/main/resources/org/apache/stanbol/commons/web/vie/static/annotate.css
Tue Feb 28 16:56:02 2012
@@ -1,3 +1,7 @@
+/*
+ (c) 2011 Szaby Gruenwald, IKS Consortium
+ Annotate may be freely distributed under the MIT license
+*/
.entity, a[typeof][about] {
z-index: -1;
padding: 0 3px;
@@ -29,4 +33,6 @@ a[typeof][about].organisation {backgroun
top: 10px;
right: 10px;
}
-
+.ui-dialog, .ui-tooltip {
+ font-size: 95%;
+}
Modified:
incubator/stanbol/trunk/demos/webvie/src/main/resources/org/apache/stanbol/commons/web/vie/static/lib/Smoothness/jquery.ui.base.css
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/demos/webvie/src/main/resources/org/apache/stanbol/commons/web/vie/static/lib/Smoothness/jquery.ui.base.css?rev=1294730&r1=1294729&r2=1294730&view=diff
==============================================================================
---
incubator/stanbol/trunk/demos/webvie/src/main/resources/org/apache/stanbol/commons/web/vie/static/lib/Smoothness/jquery.ui.base.css
(original)
+++
incubator/stanbol/trunk/demos/webvie/src/main/resources/org/apache/stanbol/commons/web/vie/static/lib/Smoothness/jquery.ui.base.css
Tue Feb 28 16:56:02 2012
@@ -1,3 +1,11 @@
+/*
+ * jQuery UI Accordion 1.8.13
+ *
+ * Copyright 2011, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ */
@import url("jquery.ui.core.css");
@import url("jquery.ui.resizable.css");
@import url("jquery.ui.selectable.css");
@@ -8,4 +16,4 @@
@import url("jquery.ui.slider.css");
@import url("jquery.ui.tabs.css");
@import url("jquery.ui.datepicker.css");
-@import url("jquery.ui.progressbar.css");
\ No newline at end of file
+@import url("jquery.ui.progressbar.css");