You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2015/10/30 15:45:11 UTC
svn commit: r1711485 - in /openmeetings/branches/3.0.x: LICENSE ivy.xml
src/web/java/org/apache/openmeetings/web/app/Application.java
Author: solomax
Date: Fri Oct 30 14:45:11 2015
New Revision: 1711485
URL: http://svn.apache.org/viewvc?rev=1711485&view=rev
Log:
[OPENMEETINGS-1259] wicketstuff version was reverted to 7.0.0
Modified:
openmeetings/branches/3.0.x/LICENSE
openmeetings/branches/3.0.x/ivy.xml
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/Application.java
Modified: openmeetings/branches/3.0.x/LICENSE
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/LICENSE?rev=1711485&r1=1711484&r2=1711485&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/LICENSE (original)
+++ openmeetings/branches/3.0.x/LICENSE Fri Oct 30 14:45:11 2015
@@ -421,9 +421,9 @@ webapps/openmeetings/WEB-INF/lib/wicket-
webapps/openmeetings/WEB-INF/lib/wicket-native-websocket-core-jar-7.1.0.jar
webapps/openmeetings/WEB-INF/lib/wicket-native-websocket-javax-jar-7.1.0.jar
webapps/openmeetings/WEB-INF/lib/wicket-request-jar-7.1.0.jar
-webapps/openmeetings/WEB-INF/lib/wicketstuff-html5-jar-7.1.0.jar
-webapps/openmeetings/WEB-INF/lib/wicketstuff-select2-jar-7.1.0.jar
-webapps/openmeetings/WEB-INF/lib/wicketstuff-urlfragment-jar-7.1.0.jar
+webapps/openmeetings/WEB-INF/lib/wicketstuff-html5-jar-7.0.0.jar
+webapps/openmeetings/WEB-INF/lib/wicketstuff-select2-jar-7.0.0.jar
+webapps/openmeetings/WEB-INF/lib/wicketstuff-urlfragment-jar-7.0.0.jar
webapps/openmeetings/WEB-INF/lib/wicket-util-jar-7.1.0.jar
webapps/openmeetings/WEB-INF/lib/woden-core-bundle-1.0-SNAPSHOT.jar
webapps/openmeetings/WEB-INF/lib/woodstox-core-asl-jar-4.2.0.jar
Modified: openmeetings/branches/3.0.x/ivy.xml
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/ivy.xml?rev=1711485&r1=1711484&r2=1711485&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/ivy.xml (original)
+++ openmeetings/branches/3.0.x/ivy.xml Fri Oct 30 14:45:11 2015
@@ -274,16 +274,16 @@
<dependency org="com.google.code.gson" name="gson" rev="2.2.4" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.wicketstuff" name="wicketstuff-urlfragment" rev="7.1.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.wicketstuff" name="wicketstuff-urlfragment" rev="7.0.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.wicketstuff" name="wicketstuff-html5" rev="7.1.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.wicketstuff" name="wicketstuff-html5" rev="7.0.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.wicketstuff" name="wicketstuff-select2" rev="7.1.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.wicketstuff" name="wicketstuff-select2" rev="7.0.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
- <dependency org="org.wicketstuff" name="jqplot" rev="7.1.0" conf="openmeetings->*" transitive="false">
+ <dependency org="org.wicketstuff" name="jqplot" rev="7.0.0" conf="openmeetings->*" transitive="false">
<include type="jar" />
</dependency>
<dependency org="br.com.digilabs.jqplot" name="jqplot4java" rev="1.3.0" conf="openmeetings->*" transitive="false">
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/Application.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/Application.java?rev=1711485&r1=1711484&r2=1711485&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/Application.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/app/Application.java Fri Oct 30 14:45:11 2015
@@ -111,7 +111,7 @@ public class Application extends Authent
//Resource Loader for a the property key
getResourceSettings().getStringResourceLoaders().add(0, new LabelResourceLoader());
- ApplicationSettings.get().setIncludeJavascriptFull(true);
+ ApplicationSettings.get().setIncludeJqueryUI(false);
super.init();
// register some widgets