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:44:44 UTC

svn commit: r1711484 - in /openmeetings/trunk/singlewebapp: LICENSE openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java pom.xml

Author: solomax
Date: Fri Oct 30 14:44:44 2015
New Revision: 1711484

URL: http://svn.apache.org/viewvc?rev=1711484&view=rev
Log:
[OPENMEETINGS-980] wicketstuff version was reverted to 7.0.0

Modified:
    openmeetings/trunk/singlewebapp/LICENSE
    openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
    openmeetings/trunk/singlewebapp/pom.xml

Modified: openmeetings/trunk/singlewebapp/LICENSE
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/LICENSE?rev=1711484&r1=1711483&r2=1711484&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/LICENSE (original)
+++ openmeetings/trunk/singlewebapp/LICENSE Fri Oct 30 14:44:44 2015
@@ -405,9 +405,9 @@ webapps/openmeetings/WEB-INF/lib/wicket-
 webapps/openmeetings/WEB-INF/lib/wicket-native-websocket-core-7.1.0.jar
 webapps/openmeetings/WEB-INF/lib/wicket-native-websocket-javax-7.1.0.jar
 webapps/openmeetings/WEB-INF/lib/wicket-request-7.1.0.jar
-webapps/openmeetings/WEB-INF/lib/wicketstuff-select2-7.1.0.jar
-webapps/openmeetings/WEB-INF/lib/wicketstuff-urlfragment-7.1.0.jar
-webapps/openmeetings/WEB-INF/lib/wicketstuff-whiteboard-7.1.0.jar
+webapps/openmeetings/WEB-INF/lib/wicketstuff-select2-7.0.0.jar
+webapps/openmeetings/WEB-INF/lib/wicketstuff-urlfragment-7.0.0.jar
+webapps/openmeetings/WEB-INF/lib/wicketstuff-whiteboard-7.0.0.jar
 webapps/openmeetings/WEB-INF/lib/wicket-util-7.1.0.jar
 webapps/openmeetings/WEB-INF/lib/woodstox-core-asl-4.4.1.jar
 webapps/openmeetings/WEB-INF/lib/wsdl4j-1.6.3.jar

Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java?rev=1711484&r1=1711483&r2=1711484&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.java Fri Oct 30 14:44:44 2015
@@ -124,7 +124,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

Modified: openmeetings/trunk/singlewebapp/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/pom.xml?rev=1711484&r1=1711483&r2=1711484&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/pom.xml Fri Oct 30 14:44:44 2015
@@ -43,7 +43,7 @@
 		<maven-site.version>3.4</maven-site.version>
 		<wicket.version>7.1.0</wicket.version>
 		<wicketju.version>7.1.0</wicketju.version>
-		<wickets.version>7.1.0</wickets.version>
+		<wickets.version>7.0.0</wickets.version>
 		<red5-server.version>1.0.7-SNAPSHOT</red5-server.version>
 		<red5-client.version>1.0.6-RELEASE</red5-client.version>
 		<batik.version>1.7</batik.version>