Return-Path: X-Original-To: apmail-syncope-commits-archive@www.apache.org Delivered-To: apmail-syncope-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 88A1AE693 for ; Mon, 21 Jan 2013 09:11:02 +0000 (UTC) Received: (qmail 9859 invoked by uid 500); 21 Jan 2013 09:11:02 -0000 Delivered-To: apmail-syncope-commits-archive@syncope.apache.org Received: (qmail 9814 invoked by uid 500); 21 Jan 2013 09:11:01 -0000 Mailing-List: contact commits-help@syncope.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@syncope.apache.org Delivered-To: mailing list commits@syncope.apache.org Received: (qmail 9700 invoked by uid 99); 21 Jan 2013 09:11:01 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Jan 2013 09:11:01 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Jan 2013 09:10:22 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9FE142388B75; Mon, 21 Jan 2013 09:09:36 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1436230 [7/14] - in /syncope/trunk: ./ client/ client/src/main/java/org/apache/syncope/annotation/ client/src/main/java/org/apache/syncope/client/ client/src/main/java/org/apache/syncope/client/mod/ client/src/main/java/org/apache/syncope/... Date: Mon, 21 Jan 2013 09:09:04 -0000 To: commits@syncope.apache.org From: jbernhardt@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130121090936.9FE142388B75@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java Mon Jan 21 09:08:54 2013 @@ -24,7 +24,22 @@ import java.util.Collections; import java.util.EnumSet; import java.util.HashSet; import java.util.List; + import org.apache.commons.lang.StringUtils; +import org.apache.syncope.common.to.ConnBundleTO; +import org.apache.syncope.common.to.ConnInstanceTO; +import org.apache.syncope.common.types.ConnConfPropSchema; +import org.apache.syncope.common.types.ConnConfProperty; +import org.apache.syncope.common.types.ConnectorCapability; +import org.apache.syncope.common.validation.SyncopeClientCompositeErrorException; +import org.apache.syncope.console.rest.ConnectorRestClient; +import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel; +import org.apache.syncope.console.wicket.markup.html.form.AjaxDropDownChoicePanel; +import org.apache.syncope.console.wicket.markup.html.form.AjaxNumberFieldPanel; +import org.apache.syncope.console.wicket.markup.html.form.AjaxPasswordFieldPanel; +import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel; +import org.apache.syncope.console.wicket.markup.html.form.FieldPanel; +import org.apache.syncope.console.wicket.markup.html.form.MultiValueSelectorPanel; import org.apache.wicket.PageReference; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior; @@ -51,21 +66,6 @@ import org.apache.wicket.model.PropertyM import org.apache.wicket.model.ResourceModel; import org.apache.wicket.spring.injection.annot.SpringBean; import org.springframework.util.ClassUtils; -import org.apache.syncope.client.to.ConnBundleTO; -import org.apache.syncope.client.to.ConnInstanceTO; -import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException; -import org.apache.syncope.console.rest.ConnectorRestClient; -import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel; -import org.apache.syncope.console.wicket.markup.html.form.AjaxDropDownChoicePanel; -import org.apache.syncope.console.wicket.markup.html.form.AjaxNumberFieldPanel; -import org.apache.syncope.console.wicket.markup.html.form.AjaxPasswordFieldPanel; -import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel; -import org.apache.syncope.console.wicket.markup.html.form.FieldPanel; -import org.apache.syncope.console.wicket.markup.html.form.MultiValueSelectorPanel; -import org.apache.syncope.types.ConnConfPropSchema; -import org.apache.syncope.types.ConnConfProperty; -import org.apache.syncope.types.ConnectorCapability; -import org.apache.wicket.PageReference; /** * Modal window with Connector form. Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DerivedSchemaModalPage.java Mon Jan 21 09:08:54 2013 @@ -18,11 +18,11 @@ */ package org.apache.syncope.console.pages; -import org.apache.syncope.client.AbstractBaseBean; -import org.apache.syncope.client.to.DerivedSchemaTO; -import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException; +import org.apache.syncope.common.AbstractBaseBean; +import org.apache.syncope.common.to.DerivedSchemaTO; +import org.apache.syncope.common.types.AttributableType; +import org.apache.syncope.common.validation.SyncopeClientCompositeErrorException; import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel; -import org.apache.syncope.types.AttributableType; import org.apache.wicket.PageReference; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy; Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DisplayAttributesModalPage.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DisplayAttributesModalPage.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DisplayAttributesModalPage.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/DisplayAttributesModalPage.java Mon Jan 21 09:08:54 2013 @@ -24,12 +24,13 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; + import org.apache.commons.lang.ArrayUtils; -import org.apache.syncope.client.to.UserTO; +import org.apache.syncope.common.to.UserTO; +import org.apache.syncope.common.types.AttributableType; import org.apache.syncope.console.commons.Constants; import org.apache.syncope.console.commons.PreferenceManager; import org.apache.syncope.console.rest.SchemaRestClient; -import org.apache.syncope.types.AttributableType; import org.apache.wicket.PageReference; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxButton; Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/EditUserModalPage.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/EditUserModalPage.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/EditUserModalPage.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/EditUserModalPage.java Mon Jan 21 09:08:54 2013 @@ -20,9 +20,10 @@ package org.apache.syncope.console.pages import java.util.ArrayList; import java.util.List; -import org.apache.syncope.client.mod.UserMod; -import org.apache.syncope.client.to.UserTO; -import org.apache.syncope.client.util.AttributableOperations; + +import org.apache.syncope.common.mod.UserMod; +import org.apache.syncope.common.to.UserTO; +import org.apache.syncope.common.util.AttributableOperations; import org.apache.syncope.console.commons.StatusBean; import org.apache.syncope.console.pages.panels.AccountInformationPanel; import org.apache.syncope.console.pages.panels.StatusPanel; Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Login.java Mon Jan 21 09:08:54 2013 @@ -29,13 +29,13 @@ import org.apache.http.client.methods.Ht import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.util.EntityUtils; import org.apache.syncope.client.http.PreemptiveAuthHttpRequestFactory; -import org.apache.syncope.client.to.EntitlementTO; -import org.apache.syncope.client.to.UserTO; -import org.apache.syncope.client.util.CollectionWrapper; +import org.apache.syncope.common.services.EntitlementService; +import org.apache.syncope.common.services.UserRequestService; +import org.apache.syncope.common.to.EntitlementTO; +import org.apache.syncope.common.to.UserTO; +import org.apache.syncope.common.util.CollectionWrapper; import org.apache.syncope.console.SyncopeSession; import org.apache.syncope.console.wicket.markup.html.form.LinkPanel; -import org.apache.syncope.services.EntitlementService; -import org.apache.syncope.services.UserRequestService; import org.apache.wicket.Page; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.AjaxLink; Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Logout.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Logout.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Logout.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Logout.java Mon Jan 21 09:08:54 2013 @@ -20,8 +20,8 @@ package org.apache.syncope.console.pages import org.apache.http.impl.client.DefaultHttpClient; import org.apache.syncope.client.http.PreemptiveAuthHttpRequestFactory; -import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.syncope.console.SyncopeSession; +import org.apache.wicket.request.mapper.parameter.PageParameters; /** * Syncope Logout. Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/MembershipModalPage.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/MembershipModalPage.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/MembershipModalPage.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/MembershipModalPage.java Mon Jan 21 09:08:54 2013 @@ -18,8 +18,8 @@ */ package org.apache.syncope.console.pages; -import org.apache.syncope.client.to.MembershipTO; -import org.apache.syncope.client.to.UserTO; +import org.apache.syncope.common.to.MembershipTO; +import org.apache.syncope.common.to.UserTO; import org.apache.syncope.console.pages.panels.AttributesPanel; import org.apache.syncope.console.pages.panels.DerivedAttributesPanel; import org.apache.syncope.console.pages.panels.VirtualAttributesPanel; Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java Mon Jan 21 09:08:54 2013 @@ -24,8 +24,12 @@ import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.syncope.client.to.NotificationTO; -import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException; + +import org.apache.syncope.common.to.NotificationTO; +import org.apache.syncope.common.types.AttributableType; +import org.apache.syncope.common.types.IntMappingType; +import org.apache.syncope.common.types.TraceLevel; +import org.apache.syncope.common.validation.SyncopeClientCompositeErrorException; import org.apache.syncope.console.pages.panels.UserSearchPanel; import org.apache.syncope.console.rest.NotificationRestClient; import org.apache.syncope.console.rest.SchemaRestClient; @@ -33,9 +37,6 @@ import org.apache.syncope.console.wicket import org.apache.syncope.console.wicket.markup.html.form.AjaxDropDownChoicePanel; import org.apache.syncope.console.wicket.markup.html.form.AjaxPalettePanel; import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel; -import org.apache.syncope.types.AttributableType; -import org.apache.syncope.types.IntMappingType; -import org.apache.syncope.types.TraceLevel; import org.apache.wicket.PageReference; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior; Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationTaskModalPage.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationTaskModalPage.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationTaskModalPage.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationTaskModalPage.java Mon Jan 21 09:08:54 2013 @@ -19,12 +19,13 @@ package org.apache.syncope.console.pages; import java.util.ArrayList; + +import org.apache.syncope.common.to.NotificationTaskTO; +import org.apache.syncope.common.to.TaskTO; +import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel; import org.apache.wicket.markup.html.form.ListMultipleChoice; import org.apache.wicket.markup.html.form.TextArea; import org.apache.wicket.model.PropertyModel; -import org.apache.syncope.client.to.NotificationTaskTO; -import org.apache.syncope.client.to.TaskTO; -import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel; public class NotificationTaskModalPage extends TaskModalPage { Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PolicyModalPage.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PolicyModalPage.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PolicyModalPage.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PolicyModalPage.java Mon Jan 21 09:08:54 2013 @@ -19,6 +19,20 @@ package org.apache.syncope.console.pages; import java.util.Arrays; + +import org.apache.syncope.common.to.AccountPolicyTO; +import org.apache.syncope.common.to.PasswordPolicyTO; +import org.apache.syncope.common.to.PolicyTO; +import org.apache.syncope.common.to.SyncPolicyTO; +import org.apache.syncope.common.types.AbstractPolicySpec; +import org.apache.syncope.common.types.AccountPolicySpec; +import org.apache.syncope.common.types.PasswordPolicySpec; +import org.apache.syncope.common.types.PolicyType; +import org.apache.syncope.common.types.SyncPolicySpec; +import org.apache.syncope.console.pages.panels.PolicyBeanPanel; +import org.apache.syncope.console.rest.PolicyRestClient; +import org.apache.syncope.console.wicket.markup.html.form.AjaxDropDownChoicePanel; +import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxButton; import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow; @@ -27,19 +41,6 @@ import org.apache.wicket.markup.html.for import org.apache.wicket.model.PropertyModel; import org.apache.wicket.model.ResourceModel; import org.apache.wicket.spring.injection.annot.SpringBean; -import org.apache.syncope.client.to.AccountPolicyTO; -import org.apache.syncope.client.to.PasswordPolicyTO; -import org.apache.syncope.client.to.PolicyTO; -import org.apache.syncope.client.to.SyncPolicyTO; -import org.apache.syncope.console.pages.panels.PolicyBeanPanel; -import org.apache.syncope.console.rest.PolicyRestClient; -import org.apache.syncope.console.wicket.markup.html.form.AjaxDropDownChoicePanel; -import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel; -import org.apache.syncope.types.AbstractPolicySpec; -import org.apache.syncope.types.AccountPolicySpec; -import org.apache.syncope.types.PasswordPolicySpec; -import org.apache.syncope.types.PolicyType; -import org.apache.syncope.types.SyncPolicySpec; /** * Modal window with Resource form. Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PropagationTaskModalPage.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PropagationTaskModalPage.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PropagationTaskModalPage.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/PropagationTaskModalPage.java Mon Jan 21 09:08:54 2013 @@ -18,9 +18,9 @@ */ package org.apache.syncope.console.pages; -import org.apache.wicket.model.PropertyModel; -import org.apache.syncope.client.to.TaskTO; +import org.apache.syncope.common.to.TaskTO; import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel; +import org.apache.wicket.model.PropertyModel; /** * Modal window with Task form (to stop and start execution). Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportExecResultDownloadModalPage.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportExecResultDownloadModalPage.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportExecResultDownloadModalPage.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportExecResultDownloadModalPage.java Mon Jan 21 09:08:54 2013 @@ -19,14 +19,15 @@ package org.apache.syncope.console.pages; import java.util.Arrays; + +import org.apache.syncope.common.types.ReportExecExportFormat; +import org.apache.syncope.console.wicket.markup.html.form.AjaxDropDownChoicePanel; import org.apache.wicket.PageReference; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior; import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow; import org.apache.wicket.markup.html.form.IChoiceRenderer; import org.apache.wicket.model.Model; -import org.apache.syncope.console.wicket.markup.html.form.AjaxDropDownChoicePanel; -import org.apache.syncope.types.ReportExecExportFormat; public class ReportExecResultDownloadModalPage extends BaseModalPage { Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportModalPage.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportModalPage.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportModalPage.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportModalPage.java Mon Jan 21 09:08:54 2013 @@ -22,10 +22,12 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.List; -import org.apache.syncope.client.report.ReportletConf; -import org.apache.syncope.client.to.ReportExecTO; -import org.apache.syncope.client.to.ReportTO; -import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException; + +import org.apache.syncope.common.report.ReportletConf; +import org.apache.syncope.common.to.ReportExecTO; +import org.apache.syncope.common.to.ReportTO; +import org.apache.syncope.common.types.ReportExecStatus; +import org.apache.syncope.common.validation.SyncopeClientCompositeErrorException; import org.apache.syncope.console.commons.DateFormatROModel; import org.apache.syncope.console.commons.HttpResourceStream; import org.apache.syncope.console.commons.SortableDataProviderComparator; @@ -36,7 +38,6 @@ import org.apache.syncope.console.wicket import org.apache.syncope.console.wicket.markup.html.form.ActionLink; import org.apache.syncope.console.wicket.markup.html.form.ActionLinksPanel; import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel; -import org.apache.syncope.types.ReportExecStatus; import org.apache.wicket.Component; import org.apache.wicket.Page; import org.apache.wicket.PageReference; Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportletConfModalPage.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportletConfModalPage.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportletConfModalPage.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ReportletConfModalPage.java Mon Jan 21 09:08:54 2013 @@ -26,11 +26,13 @@ import java.util.Collections; import java.util.Date; import java.util.Iterator; import java.util.List; + import org.apache.commons.lang.ArrayUtils; -import org.apache.syncope.annotation.FormAttributeField; -import org.apache.syncope.client.SyncopeConstants; -import org.apache.syncope.client.report.ReportletConf; -import org.apache.syncope.client.search.NodeCond; +import org.apache.syncope.common.SyncopeConstants; +import org.apache.syncope.common.annotation.FormAttributeField; +import org.apache.syncope.common.report.ReportletConf; +import org.apache.syncope.common.search.NodeCond; +import org.apache.syncope.common.types.AttributableType; import org.apache.syncope.console.pages.panels.UserSearchPanel; import org.apache.syncope.console.rest.ReportRestClient; import org.apache.syncope.console.rest.SchemaRestClient; @@ -43,12 +45,12 @@ import org.apache.syncope.console.wicket import org.apache.syncope.console.wicket.markup.html.form.DateTimeFieldPanel; import org.apache.syncope.console.wicket.markup.html.form.FieldPanel; import org.apache.syncope.console.wicket.markup.html.form.MultiValueSelectorPanel; -import org.apache.syncope.types.AttributableType; import org.apache.wicket.Component; import org.apache.wicket.PageReference; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior; import org.apache.wicket.ajax.markup.html.form.AjaxButton; +import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxButton; import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; @@ -67,7 +69,6 @@ import org.apache.wicket.spring.injectio import org.springframework.beans.BeanWrapper; import org.springframework.beans.PropertyAccessorFactory; import org.springframework.util.ClassUtils; -import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxButton; public class ReportletConfModalPage extends BaseModalPage { Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Reports.java Mon Jan 21 09:08:54 2013 @@ -24,8 +24,12 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.syncope.client.to.ReportTO; -import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException; + +import org.apache.syncope.common.to.ReportTO; +import org.apache.syncope.common.types.AuditElements.Category; +import org.apache.syncope.common.types.AuditElements.Result; +import org.apache.syncope.common.types.AuditLoggerName; +import org.apache.syncope.common.validation.SyncopeClientCompositeErrorException; import org.apache.syncope.console.commons.Constants; import org.apache.syncope.console.commons.PreferenceManager; import org.apache.syncope.console.commons.SortableDataProviderComparator; @@ -35,9 +39,6 @@ import org.apache.syncope.console.rest.R import org.apache.syncope.console.wicket.extensions.markup.html.repeater.data.table.DatePropertyColumn; import org.apache.syncope.console.wicket.markup.html.form.ActionLink; import org.apache.syncope.console.wicket.markup.html.form.ActionLinksPanel; -import org.apache.syncope.types.AuditElements.Category; -import org.apache.syncope.types.AuditElements.Result; -import org.apache.syncope.types.AuditLoggerName; import org.apache.wicket.Component; import org.apache.wicket.Page; import org.apache.wicket.ajax.AjaxRequestTarget; Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java Mon Jan 21 09:08:54 2013 @@ -18,14 +18,14 @@ */ package org.apache.syncope.console.pages; -import org.apache.syncope.client.to.MappingItemTO; -import org.apache.syncope.client.to.ResourceTO; +import org.apache.syncope.common.to.MappingItemTO; +import org.apache.syncope.common.to.ResourceTO; +import org.apache.syncope.common.types.AttributableType; import org.apache.syncope.console.pages.panels.ResourceConnConfPanel; import org.apache.syncope.console.pages.panels.ResourceDetailsPanel; import org.apache.syncope.console.pages.panels.ResourceMappingPanel; import org.apache.syncope.console.pages.panels.ResourceSecurityPanel; import org.apache.syncope.console.rest.ResourceRestClient; -import org.apache.syncope.types.AttributableType; import org.apache.wicket.PageReference; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.form.AjaxButton; Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java Mon Jan 21 09:08:54 2013 @@ -22,6 +22,18 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.List; + +import org.apache.syncope.common.to.ConnInstanceTO; +import org.apache.syncope.common.to.ResourceTO; +import org.apache.syncope.common.validation.SyncopeClientCompositeErrorException; +import org.apache.syncope.console.commons.Constants; +import org.apache.syncope.console.commons.PreferenceManager; +import org.apache.syncope.console.commons.SortableDataProviderComparator; +import org.apache.syncope.console.rest.ConnectorRestClient; +import org.apache.syncope.console.rest.ResourceRestClient; +import org.apache.syncope.console.wicket.markup.html.form.ActionLink; +import org.apache.syncope.console.wicket.markup.html.form.ActionLinksPanel; +import org.apache.syncope.console.wicket.markup.html.form.LinkPanel; import org.apache.wicket.Page; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior; @@ -37,6 +49,7 @@ import org.apache.wicket.extensions.mark import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn; import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider; import org.apache.wicket.markup.html.WebMarkupContainer; +import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.DropDownChoice; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.repeater.Item; @@ -46,18 +59,6 @@ import org.apache.wicket.model.PropertyM import org.apache.wicket.model.ResourceModel; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.spring.injection.annot.SpringBean; -import org.apache.syncope.client.to.ConnInstanceTO; -import org.apache.syncope.client.to.ResourceTO; -import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException; -import org.apache.syncope.console.commons.Constants; -import org.apache.syncope.console.commons.PreferenceManager; -import org.apache.syncope.console.commons.SortableDataProviderComparator; -import org.apache.syncope.console.rest.ConnectorRestClient; -import org.apache.syncope.console.rest.ResourceRestClient; -import org.apache.syncope.console.wicket.markup.html.form.ActionLink; -import org.apache.syncope.console.wicket.markup.html.form.ActionLinksPanel; -import org.apache.syncope.console.wicket.markup.html.form.LinkPanel; -import org.apache.wicket.markup.html.basic.Label; /** * Resources WebPage. Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResultStatusModalPage.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResultStatusModalPage.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResultStatusModalPage.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResultStatusModalPage.java Mon Jan 21 09:08:54 2013 @@ -24,16 +24,17 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.syncope.client.to.AbstractAttributableTO; -import org.apache.syncope.client.to.AttributeTO; -import org.apache.syncope.client.to.ConnObjectTO; -import org.apache.syncope.client.to.PropagationTO; -import org.apache.syncope.client.to.RoleTO; -import org.apache.syncope.client.to.UserTO; + +import org.apache.syncope.common.to.AbstractAttributableTO; +import org.apache.syncope.common.to.AttributeTO; +import org.apache.syncope.common.to.ConnObjectTO; +import org.apache.syncope.common.to.PropagationTO; +import org.apache.syncope.common.to.RoleTO; +import org.apache.syncope.common.to.UserTO; +import org.apache.syncope.common.types.PropagationTaskExecStatus; import org.apache.syncope.console.commons.StatusUtils; import org.apache.syncope.console.rest.ResourceRestClient; import org.apache.syncope.console.rest.UserRestClient; -import org.apache.syncope.types.PropagationTaskExecStatus; import org.apache.wicket.Component; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.AjaxLink; Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java Mon Jan 21 09:08:54 2013 @@ -20,9 +20,10 @@ package org.apache.syncope.console.pages import java.util.ArrayList; import java.util.List; -import org.apache.syncope.client.mod.RoleMod; -import org.apache.syncope.client.to.RoleTO; -import org.apache.syncope.client.util.AttributableOperations; + +import org.apache.syncope.common.mod.RoleMod; +import org.apache.syncope.common.to.RoleTO; +import org.apache.syncope.common.util.AttributableOperations; import org.apache.syncope.console.pages.panels.RolePanel; import org.apache.syncope.console.rest.RoleRestClient; import org.apache.wicket.PageReference; Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleSelectModalPage.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleSelectModalPage.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleSelectModalPage.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleSelectModalPage.java Mon Jan 21 09:08:54 2013 @@ -19,8 +19,10 @@ package org.apache.syncope.console.pages; import java.lang.reflect.Constructor; + import javax.swing.tree.DefaultMutableTreeNode; -import org.apache.syncope.client.to.RoleTO; + +import org.apache.syncope.common.to.RoleTO; import org.apache.syncope.console.commons.RoleTreeBuilder; import org.apache.syncope.console.wicket.markup.html.tree.DefaultMutableTreeNodeExpansion; import org.apache.syncope.console.wicket.markup.html.tree.DefaultMutableTreeNodeExpansionModel; Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleTemplateModalPage.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleTemplateModalPage.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleTemplateModalPage.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleTemplateModalPage.java Mon Jan 21 09:08:54 2013 @@ -18,8 +18,8 @@ */ package org.apache.syncope.console.pages; -import org.apache.syncope.client.to.RoleTO; -import org.apache.syncope.client.to.SyncTaskTO; +import org.apache.syncope.common.to.RoleTO; +import org.apache.syncope.common.to.SyncTaskTO; import org.apache.syncope.console.rest.TaskRestClient; import org.apache.wicket.PageReference; import org.apache.wicket.ajax.AjaxRequestTarget; Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Roles.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Roles.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Roles.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Roles.java Mon Jan 21 09:08:54 2013 @@ -18,7 +18,7 @@ */ package org.apache.syncope.console.pages; -import org.apache.syncope.client.search.NodeCond; +import org.apache.syncope.common.search.NodeCond; import org.apache.syncope.console.pages.panels.AbstractSearchResultPanel; import org.apache.syncope.console.pages.panels.RoleSearchPanel; import org.apache.syncope.console.pages.panels.RoleSearchResultPanel; Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchedTaskModalPage.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchedTaskModalPage.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchedTaskModalPage.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchedTaskModalPage.java Mon Jan 21 09:08:54 2013 @@ -19,7 +19,8 @@ package org.apache.syncope.console.pages; import java.util.List; -import org.apache.syncope.client.to.SchedTaskTO; + +import org.apache.syncope.common.to.SchedTaskTO; import org.apache.syncope.console.wicket.markup.html.form.AjaxDropDownChoicePanel; import org.apache.wicket.PageReference; import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow; Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Schema.java Mon Jan 21 09:08:54 2013 @@ -22,11 +22,21 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.List; -import org.apache.syncope.client.AbstractBaseBean; -import org.apache.syncope.client.to.DerivedSchemaTO; -import org.apache.syncope.client.to.SchemaTO; -import org.apache.syncope.client.to.VirtualSchemaTO; -import org.apache.syncope.types.AttributableType; + +import org.apache.syncope.common.AbstractBaseBean; +import org.apache.syncope.common.to.DerivedSchemaTO; +import org.apache.syncope.common.to.SchemaTO; +import org.apache.syncope.common.to.VirtualSchemaTO; +import org.apache.syncope.common.types.AttributableType; +import org.apache.syncope.console.commons.Constants; +import org.apache.syncope.console.commons.PreferenceManager; +import org.apache.syncope.console.commons.SchemaModalPageFactory; +import org.apache.syncope.console.commons.SelectChoiceRenderer; +import org.apache.syncope.console.commons.SortableDataProviderComparator; +import org.apache.syncope.console.rest.SchemaRestClient; +import org.apache.syncope.console.wicket.markup.html.form.ActionLink; +import org.apache.syncope.console.wicket.markup.html.form.ActionLink.ActionType; +import org.apache.syncope.console.wicket.markup.html.form.ActionLinksPanel; import org.apache.wicket.Page; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior; @@ -51,15 +61,6 @@ import org.apache.wicket.model.PropertyM import org.apache.wicket.model.ResourceModel; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.spring.injection.annot.SpringBean; -import org.apache.syncope.console.commons.Constants; -import org.apache.syncope.console.commons.PreferenceManager; -import org.apache.syncope.console.commons.SchemaModalPageFactory; -import org.apache.syncope.console.commons.SelectChoiceRenderer; -import org.apache.syncope.console.commons.SortableDataProviderComparator; -import org.apache.syncope.console.rest.SchemaRestClient; -import org.apache.syncope.console.wicket.markup.html.form.ActionLink; -import org.apache.syncope.console.wicket.markup.html.form.ActionLink.ActionType; -import org.apache.syncope.console.wicket.markup.html.form.ActionLinksPanel; /** * Schema WebPage. Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SchemaModalPage.java Mon Jan 21 09:08:54 2013 @@ -24,16 +24,17 @@ import java.util.Arrays; import java.util.Collections; import java.util.Iterator; import java.util.List; + import org.apache.commons.lang.StringUtils; -import org.apache.syncope.client.AbstractBaseBean; -import org.apache.syncope.client.to.SchemaTO; -import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException; +import org.apache.syncope.common.AbstractBaseBean; +import org.apache.syncope.common.to.SchemaTO; +import org.apache.syncope.common.types.AttributableType; +import org.apache.syncope.common.types.SchemaType; +import org.apache.syncope.common.validation.SyncopeClientCompositeErrorException; import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel; import org.apache.syncope.console.wicket.markup.html.form.AjaxDropDownChoicePanel; import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel; import org.apache.syncope.console.wicket.markup.html.form.MultiValueSelectorPanel; -import org.apache.syncope.types.AttributableType; -import org.apache.syncope.types.SchemaType; import org.apache.wicket.PageReference; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior; Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/StatusModalPage.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/StatusModalPage.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/StatusModalPage.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/StatusModalPage.java Mon Jan 21 09:08:54 2013 @@ -20,8 +20,9 @@ package org.apache.syncope.console.pages import java.util.ArrayList; import java.util.List; -import org.apache.syncope.client.to.AbstractAttributableTO; -import org.apache.syncope.client.to.UserTO; + +import org.apache.syncope.common.to.AbstractAttributableTO; +import org.apache.syncope.common.to.UserTO; import org.apache.syncope.console.commons.StatusBean; import org.apache.syncope.console.pages.panels.StatusPanel; import org.apache.syncope.console.rest.UserRestClient; Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SyncTaskModalPage.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SyncTaskModalPage.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SyncTaskModalPage.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/SyncTaskModalPage.java Mon Jan 21 09:08:54 2013 @@ -20,8 +20,9 @@ package org.apache.syncope.console.pages import java.util.ArrayList; import java.util.List; -import org.apache.syncope.client.to.ResourceTO; -import org.apache.syncope.client.to.SyncTaskTO; + +import org.apache.syncope.common.to.ResourceTO; +import org.apache.syncope.common.to.SyncTaskTO; import org.apache.syncope.console.commons.SelectChoiceRenderer; import org.apache.syncope.console.rest.ResourceRestClient; import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel; Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/TaskModalPage.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/TaskModalPage.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/TaskModalPage.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/TaskModalPage.java Mon Jan 21 09:08:54 2013 @@ -22,13 +22,14 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.List; -import org.apache.syncope.client.to.NotificationTaskTO; -import org.apache.syncope.client.to.PropagationTaskTO; -import org.apache.syncope.client.to.SchedTaskTO; -import org.apache.syncope.client.to.SyncTaskTO; -import org.apache.syncope.client.to.TaskExecTO; -import org.apache.syncope.client.to.TaskTO; -import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException; + +import org.apache.syncope.common.to.NotificationTaskTO; +import org.apache.syncope.common.to.PropagationTaskTO; +import org.apache.syncope.common.to.SchedTaskTO; +import org.apache.syncope.common.to.SyncTaskTO; +import org.apache.syncope.common.to.TaskExecTO; +import org.apache.syncope.common.to.TaskTO; +import org.apache.syncope.common.validation.SyncopeClientCompositeErrorException; import org.apache.syncope.console.commons.SortableDataProviderComparator; import org.apache.syncope.console.rest.TaskRestClient; import org.apache.syncope.console.wicket.extensions.markup.html.repeater.data.table.DatePropertyColumn; Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Tasks.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Tasks.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Tasks.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Tasks.java Mon Jan 21 09:08:54 2013 @@ -23,9 +23,10 @@ import java.util.Collections; import java.util.Comparator; import java.util.Iterator; import java.util.List; -import org.apache.syncope.client.to.SchedTaskTO; -import org.apache.syncope.client.to.TaskExecTO; -import org.apache.syncope.client.to.TaskTO; + +import org.apache.syncope.common.to.SchedTaskTO; +import org.apache.syncope.common.to.TaskExecTO; +import org.apache.syncope.common.to.TaskTO; import org.apache.syncope.console.commons.SortableDataProviderComparator; import org.apache.syncope.console.pages.panels.NotificationTasks; import org.apache.syncope.console.pages.panels.PropagationTasks; Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Todo.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Todo.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Todo.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Todo.java Mon Jan 21 09:08:54 2013 @@ -22,6 +22,21 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.List; + +import org.apache.syncope.common.to.UserRequestTO; +import org.apache.syncope.common.to.WorkflowFormTO; +import org.apache.syncope.common.types.UserRequestType; +import org.apache.syncope.common.validation.SyncopeClientCompositeErrorException; +import org.apache.syncope.console.SyncopeSession; +import org.apache.syncope.console.commons.Constants; +import org.apache.syncope.console.commons.PreferenceManager; +import org.apache.syncope.console.commons.SortableDataProviderComparator; +import org.apache.syncope.console.rest.ApprovalRestClient; +import org.apache.syncope.console.rest.UserRequestRestClient; +import org.apache.syncope.console.rest.UserRestClient; +import org.apache.syncope.console.wicket.extensions.markup.html.repeater.data.table.DatePropertyColumn; +import org.apache.syncope.console.wicket.markup.html.form.ActionLink; +import org.apache.syncope.console.wicket.markup.html.form.ActionLinksPanel; import org.apache.wicket.Page; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior; @@ -45,20 +60,6 @@ import org.apache.wicket.model.PropertyM import org.apache.wicket.model.ResourceModel; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.spring.injection.annot.SpringBean; -import org.apache.syncope.client.to.UserRequestTO; -import org.apache.syncope.client.to.WorkflowFormTO; -import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException; -import org.apache.syncope.console.SyncopeSession; -import org.apache.syncope.console.commons.Constants; -import org.apache.syncope.console.commons.PreferenceManager; -import org.apache.syncope.console.commons.SortableDataProviderComparator; -import org.apache.syncope.console.rest.ApprovalRestClient; -import org.apache.syncope.console.rest.UserRequestRestClient; -import org.apache.syncope.console.rest.UserRestClient; -import org.apache.syncope.console.wicket.extensions.markup.html.repeater.data.table.DatePropertyColumn; -import org.apache.syncope.console.wicket.markup.html.form.ActionLink; -import org.apache.syncope.console.wicket.markup.html.form.ActionLinksPanel; -import org.apache.syncope.types.UserRequestType; public class Todo extends BasePage { Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java Mon Jan 21 09:08:54 2013 @@ -18,8 +18,7 @@ */ package org.apache.syncope.console.pages; -import org.apache.syncope.client.to.UserTO; -import org.apache.syncope.console.commons.CloseOnESCBehavior; +import org.apache.syncope.common.to.UserTO; import org.apache.syncope.console.pages.panels.AttributesPanel; import org.apache.syncope.console.pages.panels.DerivedAttributesPanel; import org.apache.syncope.console.pages.panels.MembershipsPanel; Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserOwnerSelectModalPage.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserOwnerSelectModalPage.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserOwnerSelectModalPage.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserOwnerSelectModalPage.java Mon Jan 21 09:08:54 2013 @@ -18,7 +18,7 @@ */ package org.apache.syncope.console.pages; -import org.apache.syncope.client.search.NodeCond; +import org.apache.syncope.common.search.NodeCond; import org.apache.syncope.console.pages.panels.AbstractSearchResultPanel; import org.apache.syncope.console.pages.panels.SelectOnlyUserSearchResultPanel; import org.apache.syncope.console.pages.panels.UserSearchPanel; Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserRequestModalPage.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserRequestModalPage.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserRequestModalPage.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserRequestModalPage.java Mon Jan 21 09:08:54 2013 @@ -18,10 +18,10 @@ */ package org.apache.syncope.console.pages; -import org.apache.syncope.client.mod.UserMod; -import org.apache.syncope.client.to.UserRequestTO; -import org.apache.syncope.client.to.UserTO; -import org.apache.syncope.client.util.AttributableOperations; +import org.apache.syncope.common.mod.UserMod; +import org.apache.syncope.common.to.UserRequestTO; +import org.apache.syncope.common.to.UserTO; +import org.apache.syncope.common.util.AttributableOperations; import org.apache.syncope.console.rest.UserRequestRestClient; import org.apache.syncope.console.rest.UserRestClient; import org.apache.wicket.PageReference; Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserTemplateModalPage.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserTemplateModalPage.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserTemplateModalPage.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserTemplateModalPage.java Mon Jan 21 09:08:54 2013 @@ -18,14 +18,14 @@ */ package org.apache.syncope.console.pages; +import org.apache.syncope.common.to.SyncTaskTO; +import org.apache.syncope.common.to.UserTO; +import org.apache.syncope.console.rest.TaskRestClient; import org.apache.wicket.PageReference; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.spring.injection.annot.SpringBean; -import org.apache.syncope.client.to.SyncTaskTO; -import org.apache.syncope.client.to.UserTO; -import org.apache.syncope.console.rest.TaskRestClient; /** * Modal window with User form. Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Users.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Users.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Users.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Users.java Mon Jan 21 09:08:54 2013 @@ -18,8 +18,8 @@ */ package org.apache.syncope.console.pages; -import org.apache.syncope.client.search.NodeCond; -import org.apache.syncope.client.to.UserTO; +import org.apache.syncope.common.search.NodeCond; +import org.apache.syncope.common.to.UserTO; import org.apache.syncope.console.pages.panels.AbstractSearchResultPanel; import org.apache.syncope.console.pages.panels.AbstractSearchResultPanel.EventDataWrapper; import org.apache.syncope.console.pages.panels.UserSearchPanel; Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/VirtualSchemaModalPage.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/VirtualSchemaModalPage.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/VirtualSchemaModalPage.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/VirtualSchemaModalPage.java Mon Jan 21 09:08:54 2013 @@ -18,10 +18,11 @@ */ package org.apache.syncope.console.pages; -import org.apache.syncope.client.AbstractBaseBean; -import org.apache.syncope.client.to.VirtualSchemaTO; -import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException; -import org.apache.syncope.types.AttributableType; +import org.apache.syncope.common.AbstractBaseBean; +import org.apache.syncope.common.to.VirtualSchemaTO; +import org.apache.syncope.common.types.AttributableType; +import org.apache.syncope.common.validation.SyncopeClientCompositeErrorException; +import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel; import org.apache.wicket.PageReference; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy; @@ -31,7 +32,6 @@ import org.apache.wicket.markup.html.for import org.apache.wicket.model.CompoundPropertyModel; import org.apache.wicket.model.PropertyModel; import org.apache.wicket.model.ResourceModel; -import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel; /** * Modal window with Schema form. Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/WelcomePage.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/WelcomePage.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/WelcomePage.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/WelcomePage.java Mon Jan 21 09:08:54 2013 @@ -18,11 +18,11 @@ */ package org.apache.syncope.console.pages; +import org.apache.syncope.console.SyncopeApplication; +import org.apache.syncope.console.commons.XMLRolesReader; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.spring.injection.annot.SpringBean; -import org.apache.syncope.console.SyncopeApplication; -import org.apache.syncope.console.commons.XMLRolesReader; /** * Welcome page to display after successful login. Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractSearchPanel.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractSearchPanel.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractSearchPanel.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractSearchPanel.java Mon Jan 21 09:08:54 2013 @@ -23,22 +23,23 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; + import org.apache.commons.lang.ArrayUtils; -import org.apache.syncope.client.search.AttributableCond; -import org.apache.syncope.client.search.AttributeCond; -import org.apache.syncope.client.search.EntitlementCond; -import org.apache.syncope.client.search.MembershipCond; -import org.apache.syncope.client.search.NodeCond; -import org.apache.syncope.client.search.ResourceCond; -import org.apache.syncope.client.to.ResourceTO; -import org.apache.syncope.client.to.RoleTO; -import org.apache.syncope.client.to.UserTO; +import org.apache.syncope.common.search.AttributableCond; +import org.apache.syncope.common.search.AttributeCond; +import org.apache.syncope.common.search.EntitlementCond; +import org.apache.syncope.common.search.MembershipCond; +import org.apache.syncope.common.search.NodeCond; +import org.apache.syncope.common.search.ResourceCond; +import org.apache.syncope.common.to.ResourceTO; +import org.apache.syncope.common.to.RoleTO; +import org.apache.syncope.common.to.UserTO; +import org.apache.syncope.common.types.AttributableType; import org.apache.syncope.console.commons.SearchCondWrapper; import org.apache.syncope.console.commons.SearchCondWrapper.OperationType; import org.apache.syncope.console.rest.AuthRestClient; import org.apache.syncope.console.rest.ResourceRestClient; import org.apache.syncope.console.rest.SchemaRestClient; -import org.apache.syncope.types.AttributableType; import org.apache.wicket.feedback.FeedbackMessage; import org.apache.wicket.feedback.IFeedbackMessageFilter; import org.apache.wicket.markup.html.WebMarkupContainer; Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractSearchResultPanel.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractSearchResultPanel.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractSearchResultPanel.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AbstractSearchResultPanel.java Mon Jan 21 09:08:54 2013 @@ -19,8 +19,9 @@ package org.apache.syncope.console.pages.panels; import java.util.List; -import org.apache.syncope.client.search.NodeCond; -import org.apache.syncope.client.to.AbstractAttributableTO; + +import org.apache.syncope.common.search.NodeCond; +import org.apache.syncope.common.to.AbstractAttributableTO; import org.apache.syncope.console.commons.AttributableDataProvider; import org.apache.syncope.console.commons.Constants; import org.apache.syncope.console.commons.PreferenceManager; Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AccountInformationPanel.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AccountInformationPanel.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AccountInformationPanel.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AccountInformationPanel.java Mon Jan 21 09:08:54 2013 @@ -18,12 +18,12 @@ */ package org.apache.syncope.console.pages.panels; +import org.apache.syncope.common.to.AbstractAttributableTO; +import org.apache.syncope.common.to.UserTO; +import org.apache.syncope.console.SyncopeSession; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.Model; -import org.apache.syncope.client.to.AbstractAttributableTO; -import org.apache.syncope.client.to.UserTO; -import org.apache.syncope.console.SyncopeSession; public class AccountInformationPanel extends Panel { Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/AttributesPanel.java Mon Jan 21 09:08:54 2013 @@ -25,12 +25,14 @@ import java.util.List; import java.util.Map; import org.apache.commons.lang.StringUtils; -import org.apache.syncope.client.SyncopeConstants; -import org.apache.syncope.client.to.AbstractAttributableTO; -import org.apache.syncope.client.to.AttributeTO; -import org.apache.syncope.client.to.RoleTO; -import org.apache.syncope.client.to.SchemaTO; -import org.apache.syncope.client.to.UserTO; +import org.apache.syncope.common.SyncopeConstants; +import org.apache.syncope.common.to.AbstractAttributableTO; +import org.apache.syncope.common.to.AttributeTO; +import org.apache.syncope.common.to.RoleTO; +import org.apache.syncope.common.to.SchemaTO; +import org.apache.syncope.common.to.UserTO; +import org.apache.syncope.common.types.AttributableType; +import org.apache.syncope.common.types.SchemaType; import org.apache.syncope.console.pages.Schema; import org.apache.syncope.console.rest.SchemaRestClient; import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel; @@ -40,8 +42,6 @@ import org.apache.syncope.console.wicket import org.apache.syncope.console.wicket.markup.html.form.DateTimeFieldPanel; import org.apache.syncope.console.wicket.markup.html.form.FieldPanel; import org.apache.syncope.console.wicket.markup.html.form.MultiValueSelectorPanel; -import org.apache.syncope.types.AttributableType; -import org.apache.syncope.types.SchemaType; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.markup.html.form.IChoiceRenderer; Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/DerivedAttributesPanel.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/DerivedAttributesPanel.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/DerivedAttributesPanel.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/DerivedAttributesPanel.java Mon Jan 21 09:08:54 2013 @@ -19,13 +19,14 @@ package org.apache.syncope.console.pages.panels; import java.util.List; -import org.apache.syncope.client.to.AbstractAttributableTO; -import org.apache.syncope.client.to.AttributeTO; -import org.apache.syncope.client.to.RoleTO; -import org.apache.syncope.client.to.UserTO; + +import org.apache.syncope.common.to.AbstractAttributableTO; +import org.apache.syncope.common.to.AttributeTO; +import org.apache.syncope.common.to.RoleTO; +import org.apache.syncope.common.to.UserTO; +import org.apache.syncope.common.types.AttributableType; import org.apache.syncope.console.rest.SchemaRestClient; import org.apache.syncope.console.wicket.markup.html.form.AjaxDecoratedCheckbox; -import org.apache.syncope.types.AttributableType; import org.apache.wicket.Component; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.attributes.AjaxCallListener; Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/JQueryTabbedPanel.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/JQueryTabbedPanel.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/JQueryTabbedPanel.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/JQueryTabbedPanel.java Mon Jan 21 09:08:54 2013 @@ -19,6 +19,7 @@ package org.apache.syncope.console.pages.panels; import java.util.List; + import org.apache.wicket.extensions.ajax.markup.html.tabs.AjaxTabbedPanel; import org.apache.wicket.extensions.markup.html.tabs.ITab; Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/MembershipsPanel.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/MembershipsPanel.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/MembershipsPanel.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/MembershipsPanel.java Mon Jan 21 09:08:54 2013 @@ -19,10 +19,12 @@ package org.apache.syncope.console.pages.panels; import java.util.List; + import javax.swing.tree.DefaultMutableTreeNode; -import org.apache.syncope.client.to.MembershipTO; -import org.apache.syncope.client.to.RoleTO; -import org.apache.syncope.client.to.UserTO; + +import org.apache.syncope.common.to.MembershipTO; +import org.apache.syncope.common.to.RoleTO; +import org.apache.syncope.common.to.UserTO; import org.apache.syncope.console.commons.RoleTreeBuilder; import org.apache.syncope.console.pages.MembershipModalPage; import org.apache.syncope.console.pages.UserModalPage; Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationTasks.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationTasks.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationTasks.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/NotificationTasks.java Mon Jan 21 09:08:54 2013 @@ -20,9 +20,10 @@ package org.apache.syncope.console.pages import java.util.ArrayList; import java.util.List; -import org.apache.syncope.client.to.NotificationTaskTO; -import org.apache.syncope.client.to.TaskTO; -import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException; + +import org.apache.syncope.common.to.NotificationTaskTO; +import org.apache.syncope.common.to.TaskTO; +import org.apache.syncope.common.validation.SyncopeClientCompositeErrorException; import org.apache.syncope.console.commons.Constants; import org.apache.syncope.console.commons.PreferenceManager; import org.apache.syncope.console.commons.XMLRolesReader; Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PoliciesPanel.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PoliciesPanel.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PoliciesPanel.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PoliciesPanel.java Mon Jan 21 09:08:54 2013 @@ -22,6 +22,21 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.List; + +import org.apache.syncope.common.to.AccountPolicyTO; +import org.apache.syncope.common.to.PasswordPolicyTO; +import org.apache.syncope.common.to.PolicyTO; +import org.apache.syncope.common.to.SyncPolicyTO; +import org.apache.syncope.common.types.PolicyType; +import org.apache.syncope.common.validation.SyncopeClientCompositeErrorException; +import org.apache.syncope.console.commons.Constants; +import org.apache.syncope.console.commons.PreferenceManager; +import org.apache.syncope.console.commons.SortableDataProviderComparator; +import org.apache.syncope.console.commons.XMLRolesReader; +import org.apache.syncope.console.pages.PolicyModalPage; +import org.apache.syncope.console.rest.PolicyRestClient; +import org.apache.syncope.console.wicket.markup.html.form.ActionLink; +import org.apache.syncope.console.wicket.markup.html.form.ActionLinksPanel; import org.apache.wicket.Page; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior; @@ -49,20 +64,6 @@ import org.apache.wicket.request.http.We import org.apache.wicket.spring.injection.annot.SpringBean; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.syncope.client.to.AccountPolicyTO; -import org.apache.syncope.client.to.PasswordPolicyTO; -import org.apache.syncope.client.to.PolicyTO; -import org.apache.syncope.client.to.SyncPolicyTO; -import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException; -import org.apache.syncope.console.commons.Constants; -import org.apache.syncope.console.commons.PreferenceManager; -import org.apache.syncope.console.commons.SortableDataProviderComparator; -import org.apache.syncope.console.commons.XMLRolesReader; -import org.apache.syncope.console.pages.PolicyModalPage; -import org.apache.syncope.console.rest.PolicyRestClient; -import org.apache.syncope.console.wicket.markup.html.form.ActionLink; -import org.apache.syncope.console.wicket.markup.html.form.ActionLinksPanel; -import org.apache.syncope.types.PolicyType; public class PoliciesPanel extends Panel { Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PolicyBeanPanel.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PolicyBeanPanel.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PolicyBeanPanel.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PolicyBeanPanel.java Mon Jan 21 09:08:54 2013 @@ -25,7 +25,11 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.List; -import org.apache.syncope.annotation.SchemaList; + +import org.apache.syncope.common.annotation.SchemaList; +import org.apache.syncope.common.types.AbstractPolicySpec; +import org.apache.syncope.common.types.AttributableType; +import org.apache.syncope.common.types.ConflictResolutionAction; import org.apache.syncope.console.rest.SchemaRestClient; import org.apache.syncope.console.wicket.markup.html.form.AbstractFieldPanel; import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel; @@ -34,9 +38,6 @@ import org.apache.syncope.console.wicket import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel; import org.apache.syncope.console.wicket.markup.html.form.FieldPanel; import org.apache.syncope.console.wicket.markup.html.form.MultiValueSelectorPanel; -import org.apache.syncope.types.AbstractPolicySpec; -import org.apache.syncope.types.AttributableType; -import org.apache.syncope.types.ConflictResolutionAction; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior; import org.apache.wicket.markup.html.basic.Label; Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PropagationTasks.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PropagationTasks.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PropagationTasks.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/PropagationTasks.java Mon Jan 21 09:08:54 2013 @@ -20,9 +20,10 @@ package org.apache.syncope.console.pages import java.util.ArrayList; import java.util.List; -import org.apache.syncope.client.to.PropagationTaskTO; -import org.apache.syncope.client.to.TaskTO; -import org.apache.syncope.client.validation.SyncopeClientCompositeErrorException; + +import org.apache.syncope.common.to.PropagationTaskTO; +import org.apache.syncope.common.to.TaskTO; +import org.apache.syncope.common.validation.SyncopeClientCompositeErrorException; import org.apache.syncope.console.commons.Constants; import org.apache.syncope.console.commons.PreferenceManager; import org.apache.syncope.console.commons.XMLRolesReader; Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceConnConfPanel.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceConnConfPanel.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceConnConfPanel.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceConnConfPanel.java Mon Jan 21 09:08:54 2013 @@ -22,6 +22,20 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; + +import org.apache.syncope.common.to.ResourceTO; +import org.apache.syncope.common.types.ConnConfProperty; +import org.apache.syncope.console.pages.BaseModalPage; +import org.apache.syncope.console.pages.ResourceModalPage.ResourceEvent; +import org.apache.syncope.console.pages.panels.ResourceDetailsPanel.DetailsModEvent; +import org.apache.syncope.console.rest.ConnectorRestClient; +import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel; +import org.apache.syncope.console.wicket.markup.html.form.AjaxNumberFieldPanel; +import org.apache.syncope.console.wicket.markup.html.form.AjaxPasswordFieldPanel; +import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel; +import org.apache.syncope.console.wicket.markup.html.form.FieldPanel; +import org.apache.syncope.console.wicket.markup.html.form.MultiValueSelectorPanel; +import org.apache.syncope.console.wicket.markup.html.form.MultiValueSelectorPanel.MultiValueSelectorEvent; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior; import org.apache.wicket.ajax.markup.html.AjaxLink; @@ -41,19 +55,6 @@ import org.apache.wicket.spring.injectio import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.util.ClassUtils; -import org.apache.syncope.client.to.ResourceTO; -import org.apache.syncope.console.pages.BaseModalPage; -import org.apache.syncope.console.pages.ResourceModalPage.ResourceEvent; -import org.apache.syncope.console.pages.panels.ResourceDetailsPanel.DetailsModEvent; -import org.apache.syncope.console.rest.ConnectorRestClient; -import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel; -import org.apache.syncope.console.wicket.markup.html.form.AjaxNumberFieldPanel; -import org.apache.syncope.console.wicket.markup.html.form.AjaxPasswordFieldPanel; -import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel; -import org.apache.syncope.console.wicket.markup.html.form.FieldPanel; -import org.apache.syncope.console.wicket.markup.html.form.MultiValueSelectorPanel; -import org.apache.syncope.console.wicket.markup.html.form.MultiValueSelectorPanel.MultiValueSelectorEvent; -import org.apache.syncope.types.ConnConfProperty; public class ResourceConnConfPanel extends Panel { Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceDetailsPanel.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceDetailsPanel.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceDetailsPanel.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceDetailsPanel.java Mon Jan 21 09:08:54 2013 @@ -20,16 +20,17 @@ package org.apache.syncope.console.pages import java.util.Arrays; import java.util.List; -import org.apache.syncope.client.to.ConnInstanceTO; -import org.apache.syncope.client.to.ResourceTO; + +import org.apache.syncope.common.to.ConnInstanceTO; +import org.apache.syncope.common.to.ResourceTO; +import org.apache.syncope.common.types.PropagationMode; +import org.apache.syncope.common.types.TraceLevel; import org.apache.syncope.console.pages.ResourceModalPage.ResourceEvent; import org.apache.syncope.console.rest.ConnectorRestClient; import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel; import org.apache.syncope.console.wicket.markup.html.form.AjaxDropDownChoicePanel; import org.apache.syncope.console.wicket.markup.html.form.AjaxNumberFieldPanel; import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel; -import org.apache.syncope.types.PropagationMode; -import org.apache.syncope.types.TraceLevel; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior; import org.apache.wicket.event.Broadcast; Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceMappingPanel.java Mon Jan 21 09:08:54 2013 @@ -24,10 +24,14 @@ import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.syncope.client.to.ConnInstanceTO; -import org.apache.syncope.client.to.MappingItemTO; -import org.apache.syncope.client.to.MappingTO; -import org.apache.syncope.client.to.ResourceTO; + +import org.apache.syncope.common.to.ConnInstanceTO; +import org.apache.syncope.common.to.MappingItemTO; +import org.apache.syncope.common.to.MappingTO; +import org.apache.syncope.common.to.ResourceTO; +import org.apache.syncope.common.types.AttributableType; +import org.apache.syncope.common.types.ConnConfProperty; +import org.apache.syncope.common.types.IntMappingType; import org.apache.syncope.console.pages.panels.ResourceConnConfPanel.ConnConfModEvent; import org.apache.syncope.console.rest.ConnectorRestClient; import org.apache.syncope.console.rest.SchemaRestClient; @@ -36,9 +40,6 @@ import org.apache.syncope.console.wicket import org.apache.syncope.console.wicket.markup.html.form.AjaxDropDownChoicePanel; import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel; import org.apache.syncope.console.wicket.markup.html.form.FieldPanel; -import org.apache.syncope.types.AttributableType; -import org.apache.syncope.types.ConnConfProperty; -import org.apache.syncope.types.IntMappingType; import org.apache.wicket.Component; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.attributes.AjaxCallListener; Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceSecurityPanel.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceSecurityPanel.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceSecurityPanel.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceSecurityPanel.java Mon Jan 21 09:08:54 2013 @@ -21,11 +21,12 @@ package org.apache.syncope.console.pages import java.util.ArrayList; import java.util.HashMap; import java.util.Map; -import org.apache.syncope.client.to.PolicyTO; -import org.apache.syncope.client.to.ResourceTO; + +import org.apache.syncope.common.to.PolicyTO; +import org.apache.syncope.common.to.ResourceTO; +import org.apache.syncope.common.types.PolicyType; import org.apache.syncope.console.rest.PolicyRestClient; import org.apache.syncope.console.wicket.markup.html.form.AjaxDropDownChoicePanel; -import org.apache.syncope.types.PolicyType; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.form.ChoiceRenderer; import org.apache.wicket.markup.html.form.DropDownChoice; Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourcesPanel.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourcesPanel.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourcesPanel.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourcesPanel.java Mon Jan 21 09:08:54 2013 @@ -20,16 +20,17 @@ package org.apache.syncope.console.pages import java.util.ArrayList; import java.util.List; + +import org.apache.syncope.common.to.AbstractAttributableTO; +import org.apache.syncope.common.to.ResourceTO; +import org.apache.syncope.console.rest.ResourceRestClient; +import org.apache.syncope.console.wicket.markup.html.form.AjaxPalettePanel; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.IModel; import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.PropertyModel; import org.apache.wicket.model.util.ListModel; import org.apache.wicket.spring.injection.annot.SpringBean; -import org.apache.syncope.client.to.AbstractAttributableTO; -import org.apache.syncope.client.to.ResourceTO; -import org.apache.syncope.console.rest.ResourceRestClient; -import org.apache.syncope.console.wicket.markup.html.form.AjaxPalettePanel; public class ResourcesPanel extends Panel { Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleDetailsPanel.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleDetailsPanel.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleDetailsPanel.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleDetailsPanel.java Mon Jan 21 09:08:54 2013 @@ -18,15 +18,15 @@ */ package org.apache.syncope.console.pages.panels; -import org.apache.syncope.client.to.RoleTO; -import org.apache.syncope.client.to.UserTO; +import org.apache.syncope.common.to.RoleTO; +import org.apache.syncope.common.to.UserTO; +import org.apache.syncope.common.types.AttributableType; import org.apache.syncope.console.pages.RoleSelectModalPage; import org.apache.syncope.console.pages.UserOwnerSelectModalPage; import org.apache.syncope.console.rest.RoleRestClient; import org.apache.syncope.console.rest.UserRestClient; import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel; import org.apache.syncope.console.wicket.markup.html.form.AjaxTextFieldPanel; -import org.apache.syncope.types.AttributableType; import org.apache.wicket.Page; import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.event.IEvent; Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RolePanel.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RolePanel.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RolePanel.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RolePanel.java Mon Jan 21 09:08:54 2013 @@ -18,7 +18,7 @@ */ package org.apache.syncope.console.pages.panels; -import org.apache.syncope.client.to.RoleTO; +import org.apache.syncope.common.to.RoleTO; import org.apache.syncope.console.commons.SelectChoiceRenderer; import org.apache.syncope.console.pages.RoleModalPage; import org.apache.syncope.console.rest.AuthRestClient; Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleSearchPanel.java URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleSearchPanel.java?rev=1436230&r1=1436229&r2=1436230&view=diff ============================================================================== --- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleSearchPanel.java (original) +++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/RoleSearchPanel.java Mon Jan 21 09:08:54 2013 @@ -21,9 +21,10 @@ package org.apache.syncope.console.pages import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.apache.syncope.client.search.NodeCond; + +import org.apache.syncope.common.search.NodeCond; +import org.apache.syncope.common.types.AttributableType; import org.apache.syncope.console.commons.SearchCondWrapper; -import org.apache.syncope.types.AttributableType; import org.apache.wicket.model.LoadableDetachableModel; public class RoleSearchPanel extends AbstractSearchPanel {