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 2013/04/24 03:06:51 UTC

svn commit: r1471219 - in /openmeetings/trunk/singlewebapp: ./ src/org/apache/openmeetings/session/store/ src/org/apache/openmeetings/web/components/user/dashboard/

Author: solomax
Date: Wed Apr 24 01:06:51 2013
New Revision: 1471219

URL: http://svn.apache.org/r1471219
Log:
Library version were bumped;
code clean-up;

Modified:
    openmeetings/trunk/singlewebapp/ivy.xml
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/DatabaseStore.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/PrivateRoomsWidgetDescriptor.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/StartWidgetDescriptor.java
    openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidgetDescriptor.java

Modified: openmeetings/trunk/singlewebapp/ivy.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/ivy.xml?rev=1471219&r1=1471218&r2=1471219&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/ivy.xml (original)
+++ openmeetings/trunk/singlewebapp/ivy.xml Wed Apr 24 01:06:51 2013
@@ -262,7 +262,7 @@
 		<dependency org="com.googlecode.wicket-jquery-ui" name="wicket-jquery-ui-calendar" rev="6.7.0" conf="openmeetings->*" transitive="false">
 			<include type="jar" />
 		</dependency>
-		<dependency org="ro.fortsoft.wicket.dashboard" name="wicket-dashboard-core" rev="0.6" conf="openmeetings->*" transitive="false">
+		<dependency org="ro.fortsoft.wicket.dashboard" name="wicket-dashboard-core" rev="0.7" conf="openmeetings->*" transitive="false">
 			<include type="jar" />
 		</dependency>
 		<dependency org="com.google.code.gson" name="gson" rev="2.2.3" conf="openmeetings->*" transitive="false">
@@ -292,7 +292,7 @@
 
 		<!-- include type="bundle" / FIXME unable to get openjpa without  sources -->
 		<dependency org="org.mnode.ical4j" name="ical4j" rev="1.0.3" conf="openmeetings.ext->*" transitive="false"/>
-		<dependency org="org.apache.openjpa" name="openjpa" rev="2.2.1" conf="openmeetings.ext->*" transitive="false"/>
+		<dependency org="org.apache.openjpa" name="openjpa" rev="2.2.2" conf="openmeetings.ext->*" transitive="false"/>
 		
 		<dependency org="org.apache.ws.commons.axiom" name="axiom-impl" rev="1.2.14" conf="openmeetings.axis2->*" transitive="true">
 			<exclude name='commons-io' />

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/DatabaseStore.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/DatabaseStore.java?rev=1471219&r1=1471218&r2=1471219&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/DatabaseStore.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/session/store/DatabaseStore.java Wed Apr 24 01:06:51 2013
@@ -40,7 +40,7 @@ public class DatabaseStore implements IC
 	
 	public void clearCache() {
 		
-		List<Server> serverList = serverDao.getActiveServers();
+		//List<Server> serverList = serverDao.getActiveServers();
 		
 		//clientDao.cleanUpClientsWithoutReference();
 	}

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/PrivateRoomsWidgetDescriptor.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/PrivateRoomsWidgetDescriptor.java?rev=1471219&r1=1471218&r2=1471219&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/PrivateRoomsWidgetDescriptor.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/PrivateRoomsWidgetDescriptor.java Wed Apr 24 01:06:51 2013
@@ -41,4 +41,7 @@ public class PrivateRoomsWidgetDescripto
 		return PrivateRoomsWidget.class.getName();
 	}
 
+	public String getTypeName() {
+		return "om.widget.privaterooms";
+	}
 }

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/StartWidgetDescriptor.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/StartWidgetDescriptor.java?rev=1471219&r1=1471218&r2=1471219&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/StartWidgetDescriptor.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/StartWidgetDescriptor.java Wed Apr 24 01:06:51 2013
@@ -41,4 +41,7 @@ public class StartWidgetDescriptor imple
 		return StartWidget.class.getName();
 	}
 
+	public String getTypeName() {
+		return "om.widget.start";
+	}
 }

Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidgetDescriptor.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidgetDescriptor.java?rev=1471219&r1=1471218&r2=1471219&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidgetDescriptor.java (original)
+++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/dashboard/WelcomeWidgetDescriptor.java Wed Apr 24 01:06:51 2013
@@ -41,4 +41,7 @@ public class WelcomeWidgetDescriptor imp
 		return WelcomeWidget.class.getName();
 	}
 
+	public String getTypeName() {
+		return "om.widget.welcome";
+	}
 }