Author: solomax
Date: Tue May 14 17:46:35 2013
New Revision: 1482484
URL: http://svn.apache.org/r1482484
Log:
[OPENMEETINGS-626] Basic recordings panel is added;
HTML packages are reorganized to has shorter path;
Added:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/AdminBaseForm.java
- copied, changed from r1480259,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminBaseForm.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/AdminPagingNavigator.html
- copied unchanged from r1480259,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminPagingNavigator.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/AdminPagingNavigator.java
- copied, changed from r1480259,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminPagingNavigator.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/AdminPanel.java
- copied, changed from r1480259,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminPanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/AdminSavePanel.html
- copied unchanged from r1480259,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminSavePanel.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/AdminSavePanel.java
- copied, changed from r1480259,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminSavePanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/PagedEntityListPanel.html
- copied unchanged from r1480259,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/PagedEntityListPanel.html
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/PagedEntityListPanel.java
- copied, changed from r1480259,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/PagedEntityListPanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/SearchableDataView.java
- copied, changed from r1480259,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/SearchableDataView.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/backup/
- copied from r1480259,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/
- copied from r1480259,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/
- copied from r1480259,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/
- copied from r1480259,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/ldaps/
- copied from r1480259,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/rooms/
- copied from r1480259,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/rooms/RoomForm.java
- copied, changed from r1481533,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomForm.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/servers/
- copied from r1480259,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/
- copied from r1480259,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/UserForm.java
- copied, changed from r1481618,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UserForm.java
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/backup/BackupPanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/AddUsersForm.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/GroupForm.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/AddLanguageForm.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/LabelsForm.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/LangForm.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/LangPanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/servers/ServerForm.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/servers/ServersPanel.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/UsersPanel.java
Copied:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/AdminBaseForm.java
(from r1480259,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminBaseForm.java)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/AdminBaseForm.java?p2=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/AdminBaseForm.java&p1=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminBaseForm.java&r1=1480259&r2=1482484&rev=1482484&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminBaseForm.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/AdminBaseForm.java
Tue May 14 17:46:35 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.web.components.admin;
+package org.apache.openmeetings.web.admin;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.form.Form;
Copied:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/AdminPagingNavigator.java
(from r1480259,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminPagingNavigator.java)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/AdminPagingNavigator.java?p2=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/AdminPagingNavigator.java&p1=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminPagingNavigator.java&r1=1480259&r2=1482484&rev=1482484&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminPagingNavigator.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/AdminPagingNavigator.java
Tue May 14 17:46:35 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.web.components.admin;
+package org.apache.openmeetings.web.admin;
import
org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigator;
import org.apache.wicket.markup.html.navigation.paging.IPageable;
Copied:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/AdminPanel.java
(from r1480259,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminPanel.java)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/AdminPanel.java?p2=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/AdminPanel.java&p1=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminPanel.java&r1=1480259&r2=1482484&rev=1482484&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/AdminPanel.java
Tue May 14 17:46:35 2013
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.web.components.admin;
+package org.apache.openmeetings.web.admin;
-import org.apache.openmeetings.web.components.BasePanel;
+import org.apache.openmeetings.web.common.BasePanel;
import
org.apache.wicket.authroles.authorization.strategies.role.annotations.AuthorizeInstantiation;
@AuthorizeInstantiation("ADMIN")
Copied:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/AdminSavePanel.java
(from r1480259,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminSavePanel.java)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/AdminSavePanel.java?p2=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/AdminSavePanel.java&p1=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminSavePanel.java&r1=1480259&r2=1482484&rev=1482484&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminSavePanel.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/AdminSavePanel.java
Tue May 14 17:46:35 2013
@@ -16,11 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.web.components.admin;
+package org.apache.openmeetings.web.admin;
import org.apache.openmeetings.web.app.WebSession;
-import org.apache.openmeetings.web.components.ConfirmCallListener;
-import org.apache.openmeetings.web.components.FormSaveRefreshPanel;
+import org.apache.openmeetings.web.common.ConfirmCallListener;
+import org.apache.openmeetings.web.common.FormSaveRefreshPanel;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
Copied:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/PagedEntityListPanel.java
(from r1480259,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/PagedEntityListPanel.java)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/PagedEntityListPanel.java?p2=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/PagedEntityListPanel.java&p1=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/PagedEntityListPanel.java&r1=1480259&r2=1482484&rev=1482484&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/PagedEntityListPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/PagedEntityListPanel.java
Tue May 14 17:46:35 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.web.components.admin;
+package org.apache.openmeetings.web.admin;
import java.util.Arrays;
import java.util.List;
Copied:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/SearchableDataView.java
(from r1480259,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/SearchableDataView.java)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/SearchableDataView.java?p2=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/SearchableDataView.java&p1=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/SearchableDataView.java&r1=1480259&r2=1482484&rev=1482484&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/SearchableDataView.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/SearchableDataView.java
Tue May 14 17:46:35 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.web.components.admin;
+package org.apache.openmeetings.web.admin;
import org.apache.openmeetings.persistence.beans.IDataProviderEntity;
import org.apache.openmeetings.web.data.SearchableDataProvider;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/backup/BackupPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/backup/BackupPanel.java?rev=1482484&r1=1480259&r2=1482484&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/backup/BackupPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/backup/BackupPanel.java
Tue May 14 17:46:35 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.web.components.admin.backup;
+package org.apache.openmeetings.web.admin.backup;
import java.io.File;
import java.io.IOException;
@@ -30,8 +30,8 @@ import org.apache.openmeetings.servlet.o
import org.apache.openmeetings.utils.ImportHelper;
import org.apache.openmeetings.utils.OmFileHelper;
import org.apache.openmeetings.utils.math.CalendarPatterns;
+import org.apache.openmeetings.web.admin.AdminPanel;
import org.apache.openmeetings.web.app.Application;
-import org.apache.openmeetings.web.components.admin.AdminPanel;
import org.apache.openmeetings.web.util.AjaxDownload;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigForm.java?rev=1482484&r1=1480259&r2=1482484&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
Tue May 14 17:46:35 2013
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.web.components.admin.configurations;
+package org.apache.openmeetings.web.admin.configurations;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
import org.apache.openmeetings.persistence.beans.basic.Configuration;
+import org.apache.openmeetings.web.admin.AdminBaseForm;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
-import org.apache.openmeetings.web.components.admin.AdminBaseForm;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormValidatingBehavior;
import org.apache.wicket.datetime.markup.html.basic.DateLabel;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java?rev=1482484&r1=1480259&r2=1482484&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
Tue May 14 17:46:35 2013
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.web.components.admin.configurations;
+package org.apache.openmeetings.web.admin.configurations;
import org.apache.openmeetings.data.basic.dao.ConfigurationDao;
import org.apache.openmeetings.persistence.beans.basic.Configuration;
-import org.apache.openmeetings.web.components.admin.AdminPanel;
-import org.apache.openmeetings.web.components.admin.SearchableDataView;
-import org.apache.openmeetings.web.components.admin.PagedEntityListPanel;
+import org.apache.openmeetings.web.admin.AdminPanel;
+import org.apache.openmeetings.web.admin.PagedEntityListPanel;
+import org.apache.openmeetings.web.admin.SearchableDataView;
import org.apache.openmeetings.web.data.DataViewContainer;
import org.apache.openmeetings.web.data.SearchableDataProvider;
import org.apache.openmeetings.web.data.OrderByBorder;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/AddUsersForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/AddUsersForm.java?rev=1482484&r1=1480259&r2=1482484&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/AddUsersForm.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/AddUsersForm.java
Tue May 14 17:46:35 2013
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.web.components.admin.groups;
+package org.apache.openmeetings.web.admin.groups;
-import static
org.apache.openmeetings.web.components.admin.groups.GroupUsersPanel.getUser;
+import static org.apache.openmeetings.web.admin.groups.GroupUsersPanel.getUser;
import java.util.ArrayList;
import java.util.List;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/GroupForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/GroupForm.java?rev=1482484&r1=1480259&r2=1482484&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/GroupForm.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/GroupForm.java
Tue May 14 17:46:35 2013
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.web.components.admin.groups;
+package org.apache.openmeetings.web.admin.groups;
import org.apache.openmeetings.data.user.dao.OrganisationDao;
import org.apache.openmeetings.persistence.beans.domain.Organisation;
+import org.apache.openmeetings.web.admin.AdminBaseForm;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
-import org.apache.openmeetings.web.components.admin.AdminBaseForm;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormValidatingBehavior;
import org.apache.wicket.markup.html.WebMarkupContainer;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java?rev=1482484&r1=1480259&r2=1482484&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.java
Tue May 14 17:46:35 2013
@@ -16,16 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.web.components.admin.groups;
+package org.apache.openmeetings.web.admin.groups;
import org.apache.openmeetings.data.user.dao.OrganisationUserDao;
import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.web.admin.PagedEntityListPanel;
+import org.apache.openmeetings.web.admin.SearchableDataView;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
-import org.apache.openmeetings.web.components.ConfirmCallListener;
-import org.apache.openmeetings.web.components.admin.SearchableDataView;
-import org.apache.openmeetings.web.components.admin.PagedEntityListPanel;
+import org.apache.openmeetings.web.common.ConfirmCallListener;
import org.apache.openmeetings.web.data.SearchableDataProvider;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/GroupsPanel.java?rev=1482484&r1=1480259&r2=1482484&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
Tue May 14 17:46:35 2013
@@ -16,14 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.web.components.admin.groups;
+package org.apache.openmeetings.web.admin.groups;
import org.apache.openmeetings.data.user.dao.OrganisationDao;
import org.apache.openmeetings.persistence.beans.domain.Organisation;
import org.apache.openmeetings.persistence.beans.domain.Organisation_Users;
-import org.apache.openmeetings.web.components.admin.AdminPanel;
-import org.apache.openmeetings.web.components.admin.SearchableDataView;
-import org.apache.openmeetings.web.components.admin.PagedEntityListPanel;
+import org.apache.openmeetings.web.admin.AdminPanel;
+import org.apache.openmeetings.web.admin.PagedEntityListPanel;
+import org.apache.openmeetings.web.admin.SearchableDataView;
import org.apache.openmeetings.web.data.DataViewContainer;
import org.apache.openmeetings.web.data.SearchableDataProvider;
import org.apache.openmeetings.web.data.OrderByBorder;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/AddLanguageForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/AddLanguageForm.java?rev=1482484&r1=1480259&r2=1482484&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/AddLanguageForm.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/AddLanguageForm.java
Tue May 14 17:46:35 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.web.components.admin.labels;
+package org.apache.openmeetings.web.admin.labels;
import java.util.Date;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/LabelsForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/LabelsForm.java?rev=1482484&r1=1480259&r2=1482484&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/LabelsForm.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/LabelsForm.java
Tue May 14 17:46:35 2013
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.web.components.admin.labels;
+package org.apache.openmeetings.web.admin.labels;
import org.apache.openmeetings.data.basic.FieldLanguagesValuesDao;
import org.apache.openmeetings.data.basic.FieldValueDao;
import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
import org.apache.openmeetings.persistence.beans.lang.Fieldvalues;
+import org.apache.openmeetings.web.admin.AdminBaseForm;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
-import org.apache.openmeetings.web.components.admin.AdminBaseForm;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/LangForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/LangForm.java?rev=1482484&r1=1480259&r2=1482484&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/LangForm.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/LangForm.java
Tue May 14 17:46:35 2013
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.web.components.admin.labels;
+package org.apache.openmeetings.web.admin.labels;
import org.apache.openmeetings.data.basic.FieldLanguageDao;
import org.apache.openmeetings.persistence.beans.lang.FieldLanguage;
import org.apache.openmeetings.web.app.Application;
-import org.apache.openmeetings.web.components.ConfirmCallListener;
+import org.apache.openmeetings.web.common.ConfirmCallListener;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/LangPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/LangPanel.java?rev=1482484&r1=1480259&r2=1482484&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/LangPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/labels/LangPanel.java
Tue May 14 17:46:35 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.web.components.admin.labels;
+package org.apache.openmeetings.web.admin.labels;
import java.util.Iterator;
@@ -25,10 +25,10 @@ import org.apache.openmeetings.data.basi
import org.apache.openmeetings.persistence.beans.lang.FieldLanguage;
import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
import org.apache.openmeetings.persistence.beans.lang.Fieldvalues;
+import org.apache.openmeetings.web.admin.AdminPanel;
+import org.apache.openmeetings.web.admin.PagedEntityListPanel;
+import org.apache.openmeetings.web.admin.SearchableDataView;
import org.apache.openmeetings.web.app.Application;
-import org.apache.openmeetings.web.components.admin.AdminPanel;
-import org.apache.openmeetings.web.components.admin.SearchableDataView;
-import org.apache.openmeetings.web.components.admin.PagedEntityListPanel;
import org.apache.openmeetings.web.data.DataViewContainer;
import org.apache.openmeetings.web.data.SearchableDataProvider;
import org.apache.openmeetings.web.data.OrderByBorder;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/ldaps/LdapForm.java?rev=1482484&r1=1480259&r2=1482484&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
Tue May 14 17:46:35 2013
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.web.components.admin.ldaps;
+package org.apache.openmeetings.web.admin.ldaps;
import org.apache.openmeetings.data.basic.dao.LdapConfigDao;
import org.apache.openmeetings.persistence.beans.basic.LdapConfig;
+import org.apache.openmeetings.web.admin.AdminBaseForm;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
-import org.apache.openmeetings.web.components.admin.AdminBaseForm;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormValidatingBehavior;
import org.apache.wicket.datetime.markup.html.basic.DateLabel;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java?rev=1482484&r1=1480259&r2=1482484&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
Tue May 14 17:46:35 2013
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.web.components.admin.ldaps;
+package org.apache.openmeetings.web.admin.ldaps;
import org.apache.openmeetings.data.basic.dao.LdapConfigDao;
import org.apache.openmeetings.persistence.beans.basic.LdapConfig;
-import org.apache.openmeetings.web.components.admin.AdminPanel;
-import org.apache.openmeetings.web.components.admin.SearchableDataView;
-import org.apache.openmeetings.web.components.admin.PagedEntityListPanel;
+import org.apache.openmeetings.web.admin.AdminPanel;
+import org.apache.openmeetings.web.admin.PagedEntityListPanel;
+import org.apache.openmeetings.web.admin.SearchableDataView;
import org.apache.openmeetings.web.data.DataViewContainer;
import org.apache.openmeetings.web.data.SearchableDataProvider;
import org.apache.openmeetings.web.data.OrderByBorder;
Copied:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/rooms/RoomForm.java
(from r1481533,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomForm.java)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/rooms/RoomForm.java?p2=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/rooms/RoomForm.java&p1=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomForm.java&r1=1481533&r2=1482484&rev=1482484&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomForm.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/rooms/RoomForm.java
Tue May 14 17:46:35 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.web.components.admin.rooms;
+package org.apache.openmeetings.web.admin.rooms;
import java.util.ArrayList;
import java.util.List;
@@ -27,9 +27,9 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.persistence.beans.room.Room;
import org.apache.openmeetings.persistence.beans.room.RoomOrganisation;
import org.apache.openmeetings.persistence.beans.room.RoomType;
+import org.apache.openmeetings.web.admin.AdminBaseForm;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
-import org.apache.openmeetings.web.components.admin.AdminBaseForm;
import org.apache.wicket.ajax.form.AjaxFormValidatingBehavior;
import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.markup.html.form.ChoiceRenderer;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java?rev=1482484&r1=1480259&r2=1482484&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
Tue May 14 17:46:35 2013
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.web.components.admin.rooms;
+package org.apache.openmeetings.web.admin.rooms;
import org.apache.openmeetings.data.conference.dao.RoomDao;
import org.apache.openmeetings.persistence.beans.room.Room;
-import org.apache.openmeetings.web.components.admin.AdminPanel;
-import org.apache.openmeetings.web.components.admin.SearchableDataView;
-import org.apache.openmeetings.web.components.admin.PagedEntityListPanel;
+import org.apache.openmeetings.web.admin.AdminPanel;
+import org.apache.openmeetings.web.admin.PagedEntityListPanel;
+import org.apache.openmeetings.web.admin.SearchableDataView;
import org.apache.openmeetings.web.data.DataViewContainer;
import org.apache.openmeetings.web.data.SearchableDataProvider;
import org.apache.openmeetings.web.data.OrderByBorder;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/servers/ServerForm.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/servers/ServerForm.java?rev=1482484&r1=1480259&r2=1482484&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/servers/ServerForm.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/servers/ServerForm.java
Tue May 14 17:46:35 2013
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.web.components.admin.servers;
+package org.apache.openmeetings.web.admin.servers;
import org.apache.openmeetings.data.basic.dao.ServerDao;
import org.apache.openmeetings.persistence.beans.basic.Server;
+import org.apache.openmeetings.web.admin.AdminBaseForm;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
-import org.apache.openmeetings.web.components.admin.AdminBaseForm;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormValidatingBehavior;
import org.apache.wicket.datetime.markup.html.basic.DateLabel;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/servers/ServersPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/servers/ServersPanel.java?rev=1482484&r1=1480259&r2=1482484&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/servers/ServersPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/servers/ServersPanel.java
Tue May 14 17:46:35 2013
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.web.components.admin.servers;
+package org.apache.openmeetings.web.admin.servers;
import org.apache.openmeetings.data.basic.dao.ServerDao;
import org.apache.openmeetings.persistence.beans.basic.Server;
-import org.apache.openmeetings.web.components.admin.AdminPanel;
-import org.apache.openmeetings.web.components.admin.SearchableDataView;
-import org.apache.openmeetings.web.components.admin.PagedEntityListPanel;
+import org.apache.openmeetings.web.admin.AdminPanel;
+import org.apache.openmeetings.web.admin.PagedEntityListPanel;
+import org.apache.openmeetings.web.admin.SearchableDataView;
import org.apache.openmeetings.web.data.DataViewContainer;
import org.apache.openmeetings.web.data.SearchableDataProvider;
import org.apache.openmeetings.web.data.OrderByBorder;
Copied:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/UserForm.java
(from r1481618,
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UserForm.java)
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/UserForm.java?p2=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/UserForm.java&p1=openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UserForm.java&r1=1481618&r2=1482484&rev=1482484&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/users/UserForm.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/UserForm.java
Tue May 14 17:46:35 2013
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.web.components.admin.users;
+package org.apache.openmeetings.web.admin.users;
import static org.apache.openmeetings.utils.UserHelper.getMinLoginLength;
import static org.apache.openmeetings.web.app.Application.getBean;
@@ -28,10 +28,10 @@ import org.apache.openmeetings.data.basi
import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.persistence.beans.user.User;
import org.apache.openmeetings.utils.crypt.ManageCryptStyle;
+import org.apache.openmeetings.web.admin.AdminBaseForm;
import org.apache.openmeetings.web.app.WebSession;
-import org.apache.openmeetings.web.components.ComunityUserForm;
-import org.apache.openmeetings.web.components.GeneralUserForm;
-import org.apache.openmeetings.web.components.admin.AdminBaseForm;
+import org.apache.openmeetings.web.common.ComunityUserForm;
+import org.apache.openmeetings.web.common.GeneralUserForm;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormValidatingBehavior;
import org.apache.wicket.datetime.markup.html.basic.DateLabel;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/UsersPanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/UsersPanel.java?rev=1482484&r1=1480259&r2=1482484&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/UsersPanel.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/admin/users/UsersPanel.java
Tue May 14 17:46:35 2013
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.openmeetings.web.components.admin.users;
+package org.apache.openmeetings.web.admin.users;
import org.apache.openmeetings.data.user.dao.UsersDao;
import org.apache.openmeetings.persistence.beans.user.User;
+import org.apache.openmeetings.web.admin.AdminPanel;
+import org.apache.openmeetings.web.admin.PagedEntityListPanel;
+import org.apache.openmeetings.web.admin.SearchableDataView;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
-import org.apache.openmeetings.web.components.admin.AdminPanel;
-import org.apache.openmeetings.web.components.admin.SearchableDataView;
-import org.apache.openmeetings.web.components.admin.PagedEntityListPanel;
import org.apache.openmeetings.web.data.DataViewContainer;
import org.apache.openmeetings.web.data.SearchableDataProvider;
import org.apache.openmeetings.web.data.OrderByBorder;
