Author: fmeschbe
Date: Sun Dec 2 18:44:51 2012
New Revision: 1416228
URL: http://svn.apache.org/viewvc?rev=1416228&view=rev
Log:
FELIX-3770 Update to JQuery UI 1.9.2 and JQuery 1.8.3
- Add a debug profile serving the non-minified versions of
the JQuery libraries and CSS files for debugging purposes
Added:
felix/trunk/webconsole/src/main/debug-resources/
felix/trunk/webconsole/src/main/debug-resources/res/
felix/trunk/webconsole/src/main/debug-resources/res/lib/
felix/trunk/webconsole/src/main/debug-resources/res/lib/jquery-1.8.3.js
felix/trunk/webconsole/src/main/debug-resources/res/lib/jquery-ui-1.9.2.js
felix/trunk/webconsole/src/main/debug-resources/res/lib/themes/
felix/trunk/webconsole/src/main/debug-resources/res/lib/themes/base/
felix/trunk/webconsole/src/main/debug-resources/res/lib/themes/base/jquery-ui.css
- copied, changed from r1416227,
felix/trunk/webconsole/src/main/resources/res/lib/themes/base/jquery-ui.css
felix/trunk/webconsole/src/main/debug-resources/res/lib/themes/base/jquery.ui.accordion.css
felix/trunk/webconsole/src/main/debug-resources/res/lib/themes/base/jquery.ui.all.css
felix/trunk/webconsole/src/main/debug-resources/res/lib/themes/base/jquery.ui.autocomplete.css
felix/trunk/webconsole/src/main/debug-resources/res/lib/themes/base/jquery.ui.base.css
felix/trunk/webconsole/src/main/debug-resources/res/lib/themes/base/jquery.ui.button.css
felix/trunk/webconsole/src/main/debug-resources/res/lib/themes/base/jquery.ui.core.css
- copied, changed from r1416227,
felix/trunk/webconsole/src/main/resources/res/lib/themes/base/ui.core.css
felix/trunk/webconsole/src/main/debug-resources/res/lib/themes/base/jquery.ui.datepicker.css
- copied, changed from r1416227,
felix/trunk/webconsole/src/main/resources/res/lib/themes/base/ui.datepicker.css
felix/trunk/webconsole/src/main/debug-resources/res/lib/themes/base/jquery.ui.dialog.css
felix/trunk/webconsole/src/main/debug-resources/res/lib/themes/base/jquery.ui.menu.css
felix/trunk/webconsole/src/main/debug-resources/res/lib/themes/base/jquery.ui.progressbar.css
felix/trunk/webconsole/src/main/debug-resources/res/lib/themes/base/jquery.ui.resizable.css
- copied, changed from r1416227,
felix/trunk/webconsole/src/main/resources/res/lib/themes/base/ui.resizable.css
felix/trunk/webconsole/src/main/debug-resources/res/lib/themes/base/jquery.ui.selectable.css
felix/trunk/webconsole/src/main/debug-resources/res/lib/themes/base/jquery.ui.slider.css
- copied, changed from r1416227,
felix/trunk/webconsole/src/main/resources/res/lib/themes/base/ui.slider.css
felix/trunk/webconsole/src/main/debug-resources/res/lib/themes/base/jquery.ui.spinner.css
felix/trunk/webconsole/src/main/debug-resources/res/lib/themes/base/jquery.ui.tabs.css
felix/trunk/webconsole/src/main/debug-resources/res/lib/themes/base/jquery.ui.theme.css
- copied, changed from r1416227,
felix/trunk/webconsole/src/main/resources/res/lib/themes/base/ui.theme.css
felix/trunk/webconsole/src/main/debug-resources/res/lib/themes/base/jquery.ui.tooltip.css
felix/trunk/webconsole/src/main/resources/res/lib/jquery-1.8.3.js
felix/trunk/webconsole/src/main/resources/res/lib/jquery-ui-1.9.2.js
Removed:
felix/trunk/webconsole/src/main/resources/res/lib/jquery-1.3.2.js
felix/trunk/webconsole/src/main/resources/res/lib/jquery-ui-1.7.2.js
felix/trunk/webconsole/src/main/resources/res/lib/themes/base/ui.accordion.css
felix/trunk/webconsole/src/main/resources/res/lib/themes/base/ui.all.css
felix/trunk/webconsole/src/main/resources/res/lib/themes/base/ui.base.css
felix/trunk/webconsole/src/main/resources/res/lib/themes/base/ui.core.css
felix/trunk/webconsole/src/main/resources/res/lib/themes/base/ui.datepicker.css
felix/trunk/webconsole/src/main/resources/res/lib/themes/base/ui.dialog.css
felix/trunk/webconsole/src/main/resources/res/lib/themes/base/ui.progressbar.css
felix/trunk/webconsole/src/main/resources/res/lib/themes/base/ui.resizable.css
felix/trunk/webconsole/src/main/resources/res/lib/themes/base/ui.slider.css
felix/trunk/webconsole/src/main/resources/res/lib/themes/base/ui.tabs.css
felix/trunk/webconsole/src/main/resources/res/lib/themes/base/ui.theme.css
Modified:
felix/trunk/webconsole/pom.xml
felix/trunk/webconsole/src/main/appended-resources/META-INF/LICENSE
felix/trunk/webconsole/src/main/resources/res/lib/themes/base/jquery-ui.css
felix/trunk/webconsole/src/main/resources/res/ui/bundles.js
felix/trunk/webconsole/src/main/resources/templates/main_header.html
Modified: felix/trunk/webconsole/pom.xml
URL:
http://svn.apache.org/viewvc/felix/trunk/webconsole/pom.xml?rev=1416228&r1=1416227&r2=1416228&view=diff
==============================================================================
--- felix/trunk/webconsole/pom.xml (original)
+++ felix/trunk/webconsole/pom.xml Sun Dec 2 18:44:51 2012
@@ -180,8 +180,8 @@
</includes>
<excludes>
<exclude>src/main/appended-resources/**</exclude>
-
<exclude>src/main/resources/res/lib/jquery-1.3.2.js</exclude>
-
<exclude>src/main/resources/res/lib/jquery-ui-1.7.2.js</exclude>
+
<exclude>src/main/resources/res/lib/jquery-1.8.3.js</exclude>
+
<exclude>src/main/resources/res/lib/jquery-ui-1.9.2.js</exclude>
<exclude>src/main/resources/res/lib/jquery-ui-i18n-1.7.2.js</exclude>
<exclude>src/main/resources/res/lib/jquery.cookies-2.2.0.js</exclude>
<exclude>src/main/resources/res/lib/jquery.multifile-1.4.6.js</exclude>
@@ -190,6 +190,7 @@
<exclude>src/main/resources/res/lib/themes/**</exclude>
<exclude>src/main/resources/res/ui/ui.tabs.paging.js</exclude>
<exclude>src/main/resources/templates/*.html</exclude>
+ <exclude>src/main/debug-resources/res/lib/**</exclude>
</excludes>
</configuration>
</plugin>
@@ -279,6 +280,65 @@
</plugins>
</build>
</profile>
+
+ <!--
+ The "debug" profile builds a bundle using the non-minified
+ JQuery libraries and CSS files instead to make debugging
+ JQuery related issues easier.
+ -->
+ <profile>
+ <id>debug-bundle</id>
+ <activation><activeByDefault>true</activeByDefault></activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>debug-bundle</id>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ <configuration>
+ <classifier>debug</classifier>
+ <instructions>
+ <Bundle-Name>
+ ${project.name} (JQuery Debug)
+ </Bundle-Name>
+ <Bundle-SymbolicName>
+ ${project.artifactId}.debug
+ </Bundle-SymbolicName>
+ <Include-Resource>
+ {maven-resources},
+ res=src/main/debug-resources/res
+ </Include-Resource>
+ </instructions>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!--
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-remote-resources-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>process</goal>
+ </goals>
+ <configuration>
+ <resourceBundles>
+
<resourceBundle>org.apache:apache-jar-resource-bundle:1.4</resourceBundle>
+ </resourceBundles>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ -->
+ </plugins>
+ </build>
+ </profile>
</profiles>
<dependencies>
Modified: felix/trunk/webconsole/src/main/appended-resources/META-INF/LICENSE
URL:
http://svn.apache.org/viewvc/felix/trunk/webconsole/src/main/appended-resources/META-INF/LICENSE?rev=1416228&r1=1416227&r2=1416228&view=diff
==============================================================================
--- felix/trunk/webconsole/src/main/appended-resources/META-INF/LICENSE
(original)
+++ felix/trunk/webconsole/src/main/appended-resources/META-INF/LICENSE Sun Dec
2 18:44:51 2012
@@ -10,7 +10,8 @@ conditions of the following licenses.
For the JQuery component:
-Copyright (c) 2009 John Resig, http://jquery.com/
+Copyright 2012 jQuery Foundation and other contributors
+http://jquery.com/
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
@@ -34,7 +35,13 @@ WITH THE SOFTWARE OR THE USE OR OTHER DE
For the JQuery UI component:
-Copyright (c) 2009 AUTHORS.txt, http://jqueryui.com/
+Copyright 2012 jQuery Foundation and other contributors,
+http://jqueryui.com/
+
+This software consists of voluntary contributions made by many
+individuals (AUTHORS.txt, http://jqueryui.com/about) For exact
+contribution history, see the revision history and logs, available
+at http://jquery-ui.googlecode.com/svn/
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
