You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2012/02/22 10:10:11 UTC
svn commit: r1292203 [5/13] - in /incubator/syncope/trunk: archetype/
archetype/src/main/resources/archetype-resources/
archetype/src/main/resources/archetype-resources/console/
archetype/src/main/resources/archetype-resources/core/ archetype/src/main/...
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/UserModalPage.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/UserModalPage.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/UserModalPage.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/UserModalPage.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.pages;
@@ -35,7 +36,7 @@ import org.syncope.console.pages.panels.
import org.syncope.console.pages.panels.ResourcesPanel;
import org.syncope.console.pages.panels.RolesPanel;
import org.syncope.console.pages.panels.UserDetailsPanel;
-import org.syncope.console.pages.panels.UserModalPageResult;
+import org.syncope.console.pages.panels.UserManagementResultPanel;
import org.syncope.console.pages.panels.VirtualAttributesPanel;
/**
@@ -101,7 +102,7 @@ public abstract class UserModalPage exte
fragment.setOutputMarkupId(true);
add(fragment);
- final UserModalPageResult result = new UserModalPageResult(
+ final UserManagementResultPanel result = new UserManagementResultPanel(
"userModalPageResult", window, mode, userTO);
result.setOutputMarkupId(true);
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/UserRequestModalPage.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/UserRequestModalPage.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/UserRequestModalPage.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/UserRequestModalPage.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.pages;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/UserTemplateModalPage.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/UserTemplateModalPage.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/UserTemplateModalPage.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/UserTemplateModalPage.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.pages;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/Users.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/Users.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/Users.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/Users.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.pages;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/VirtualSchemaModalPage.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/VirtualSchemaModalPage.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/VirtualSchemaModalPage.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/VirtualSchemaModalPage.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.pages;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/WelcomePage.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/WelcomePage.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/WelcomePage.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/WelcomePage.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.pages;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/AccountInformationPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/AccountInformationPanel.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/AccountInformationPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/AccountInformationPanel.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.pages.panels;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/AttributesPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/AttributesPanel.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/AttributesPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/AttributesPanel.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.pages.panels;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/DerivedAttributesPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/DerivedAttributesPanel.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/DerivedAttributesPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/DerivedAttributesPanel.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.pages.panels;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/NotificationTasks.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/NotificationTasks.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/NotificationTasks.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/NotificationTasks.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.pages.panels;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/PoliciesPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/PoliciesPanel.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/PoliciesPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/PoliciesPanel.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.pages.panels;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/PolicyBeanPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/PolicyBeanPanel.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/PolicyBeanPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/PolicyBeanPanel.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.pages.panels;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/PropagationTasks.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/PropagationTasks.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/PropagationTasks.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/PropagationTasks.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.pages.panels;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResourceConnConfPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResourceConnConfPanel.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResourceConnConfPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResourceConnConfPanel.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.pages.panels;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResourceDetailsPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResourceDetailsPanel.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResourceDetailsPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResourceDetailsPanel.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.pages.panels;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResourceMappingPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResourceMappingPanel.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResourceMappingPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResourceMappingPanel.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.pages.panels;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResourceSecurityPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResourceSecurityPanel.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResourceSecurityPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResourceSecurityPanel.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.pages.panels;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResourcesPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResourcesPanel.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResourcesPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResourcesPanel.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.pages.panels;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResultSetPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResultSetPanel.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResultSetPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/ResultSetPanel.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.pages.panels;
@@ -491,17 +492,29 @@ public class ResultSetPanel extends Pane
@Override
public void onClick(final AjaxRequestTarget target) {
try {
- userRestClient.delete(model.getObject().getId());
- info(getString("operation_succeded"));
+ final UserTO userTO = userRestClient.delete(
+ model.getObject().getId());
+
+ page.setModalResult(true);
+
+ editmodal.setPageCreator(
+ new ModalWindow.PageCreator() {
+
+ private static final long serialVersionUID =
+ -7834632442532690940L;
+
+ @Override
+ public Page createPage() {
+ return new EditUserModalPage(
+ editmodal, userTO);
+ }
+ });
+
+ editmodal.show(target);
+
} catch (SyncopeClientCompositeErrorException scce) {
error(scce.getMessage());
}
- target.add(feedbackPanel);
-
- final EventDataWrapper data = new EventDataWrapper();
- data.setTarget(target);
-
- send(getPage(), Broadcast.BREADTH, data);
}
}, ActionLink.ActionType.DELETE, "Users", "delete");
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/RoleAttributesPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/RoleAttributesPanel.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/RoleAttributesPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/RoleAttributesPanel.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.pages.panels;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/RoleSecurityPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/RoleSecurityPanel.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/RoleSecurityPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/RoleSecurityPanel.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.pages.panels;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/RoleSummaryPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/RoleSummaryPanel.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/RoleSummaryPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/RoleSummaryPanel.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.pages.panels;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/RoleTabPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/RoleTabPanel.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/RoleTabPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/RoleTabPanel.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.pages.panels;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/RolesPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/RolesPanel.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/RolesPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/RolesPanel.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.pages.panels;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/SchedTasks.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/SchedTasks.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/SchedTasks.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/SchedTasks.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.pages.panels;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/StatusPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/StatusPanel.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/StatusPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/StatusPanel.java Wed Feb 22 09:09:31 2012
@@ -7,21 +7,19 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.pages.panels;
-import java.io.Serializable;
-import java.util.AbstractMap;
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.apache.wicket.Component;
import org.apache.wicket.behavior.Behavior;
@@ -40,14 +38,10 @@ import org.apache.wicket.spring.injectio
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.syncope.client.to.AbstractAttributableTO;
-import org.syncope.client.to.AttributeTO;
-import org.syncope.client.to.ConnObjectTO;
-import org.syncope.client.to.ResourceTO;
-import org.syncope.client.to.SchemaMappingTO;
import org.syncope.client.to.UserTO;
-import org.syncope.console.rest.ResourceRestClient;
-import org.syncope.console.rest.UserRestClient;
-import org.syncope.types.IntMappingType;
+import org.syncope.console.commons.StatusBean;
+import org.syncope.console.commons.StatusUtils;
+import org.syncope.console.commons.StatusUtils.Status;
public class StatusPanel extends Panel {
@@ -58,22 +52,7 @@ public class StatusPanel extends Panel {
LoggerFactory.getLogger(StatusPanel.class);
@SpringBean
- private UserRestClient userRestClient;
-
- @SpringBean
- private ResourceRestClient resourceRestClient;
-
- public enum Status {
-
- ACTIVE,
- SUSPENDED,
- UNDEFINED,
- USER_NOT_FOUND;
-
- public boolean isActive() {
- return this == ACTIVE;
- }
- }
+ private StatusUtils statusUtils;
public <T extends AbstractAttributableTO> StatusPanel(
final String id,
@@ -100,7 +79,7 @@ public class StatusPanel extends Panel {
: Status.UNDEFINED);
statuses.add(syncope);
- statuses.addAll(getRemoteStatuses(userTO));
+ statuses.addAll(statusUtils.getRemoteStatuses(userTO));
final CheckGroup group = new CheckGroup("group", selectedResources);
add(group);
@@ -221,159 +200,4 @@ public class StatusPanel extends Panel {
group.add(resources);
}
-
- private List<StatusBean> getRemoteStatuses(final UserTO userTO) {
- final List<StatusBean> statuses = new ArrayList<StatusBean>();
-
- for (String res : userTO.getResources()) {
- final StatusBean statusBean = new StatusBean();
- statuses.add(statusBean);
-
- statusBean.setResourceName(res);
-
- final ResourceTO resourceTO = resourceRestClient.read(res);
-
- final Map.Entry<IntMappingType, String> accountId =
- getAccountId(resourceTO);
-
- String objectId = null;
-
- switch (accountId != null
- ? accountId.getKey() : IntMappingType.SyncopeUserId) {
-
- case SyncopeUserId:
- objectId = String.valueOf(userTO.getId());
- break;
- case Username:
- objectId = userTO.getUsername();
- break;
- case UserSchema:
- AttributeTO attributeTO = null;
- attributeTO =
- userTO.getAttributeMap().get(accountId.getValue());
- objectId =
- attributeTO != null
- && attributeTO.getValues() != null
- && !attributeTO.getValues().isEmpty()
- ? attributeTO.getValues().get(0) : null;
- break;
- case UserDerivedSchema:
- attributeTO = userTO.getDerivedAttributeMap().
- get(accountId.getValue());
- objectId =
- attributeTO != null
- && attributeTO.getValues() != null
- && !attributeTO.getValues().isEmpty()
- ? attributeTO.getValues().get(0) : null;
- break;
- case UserVirtualSchema:
- attributeTO = userTO.getVirtualAttributeMap().
- get(accountId.getValue());
- objectId =
- attributeTO != null
- && attributeTO.getValues() != null
- && !attributeTO.getValues().isEmpty()
- ? attributeTO.getValues().get(0) : null;
- break;
- default:
- }
-
-
- try {
- Status status;
- String accountLink;
-
- final ConnObjectTO objectTO =
- userRestClient.getRemoteObject(res, objectId);
-
- final Boolean enabled = isEnabled(objectTO);
-
- status = enabled == null
- ? Status.UNDEFINED
- : enabled ? Status.ACTIVE : Status.SUSPENDED;
-
- accountLink = getAccountLink(objectTO);
-
- statusBean.setStatus(status);
- statusBean.setAccountLink(accountLink);
-
- } catch (Exception e) {
- LOG.warn("User '{}' not found on resource '{}'", objectId, res);
- }
- }
-
- return statuses;
- }
-
- private Boolean isEnabled(final ConnObjectTO objectTO) {
- final String STATUSATTR = "__ENABLE__";
-
- final Map<String, AttributeTO> attributeTOs =
- objectTO.getAttributeMap();
-
- final AttributeTO status = attributeTOs.get(STATUSATTR);
-
- return status != null && status.getValues() != null
- && !status.getValues().isEmpty()
- ? Boolean.parseBoolean(status.getValues().get(0)) : null;
- }
-
- private String getAccountLink(final ConnObjectTO objectTO) {
- final String NAME = "__NAME__";
-
- final Map<String, AttributeTO> attributeTOs = objectTO.getAttributeMap();
- final AttributeTO name = attributeTOs.get(NAME);
-
- return name != null && name.getValues() != null
- && !name.getValues().isEmpty()
- ? (String) name.getValues().get(0) : null;
- }
-
- private Map.Entry<IntMappingType, String> getAccountId(
- final ResourceTO resourceTO) {
- Map.Entry<IntMappingType, String> accountId = null;
-
- for (SchemaMappingTO mapping : resourceTO.getMappings()) {
- if (mapping.isAccountid()) {
- accountId = new AbstractMap.SimpleEntry<IntMappingType, String>(
- mapping.getIntMappingType(),
- mapping.getIntAttrName());
- }
- }
-
- return accountId;
- }
-
- public class StatusBean implements Serializable {
-
- private String resourceName = null;
-
- private String accountLink = null;
-
- private Status status = Status.USER_NOT_FOUND;
-
- public String getAccountLink() {
- return accountLink;
- }
-
- public void setAccountLink(final String accountLink) {
- this.accountLink = accountLink;
- }
-
- public String getResourceName() {
- return resourceName;
- }
-
- public void setResourceName(final String resourceName) {
- this.resourceName = resourceName;
- }
-
- public Status getStatus() {
- return status;
- }
-
- public void setStatus(final Status status) {
- this.status = status;
- }
- }
}
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/SyncTasks.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/SyncTasks.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/SyncTasks.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/SyncTasks.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.pages.panels;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/UserDetailsPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/UserDetailsPanel.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/UserDetailsPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/UserDetailsPanel.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.pages.panels;
Added: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/UserManagementResultPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/UserManagementResultPanel.java?rev=1292203&view=auto
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/UserManagementResultPanel.java (added)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/UserManagementResultPanel.java Wed Feb 22 09:09:31 2012
@@ -0,0 +1,388 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.syncope.console.pages.panels;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.behavior.Behavior;
+import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxLink;
+import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.image.Image;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.ResourceModel;
+import org.apache.wicket.spring.injection.annot.SpringBean;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.syncope.client.to.AttributeTO;
+import org.syncope.client.to.ConnObjectTO;
+import org.syncope.client.to.PropagationTO;
+import org.syncope.client.to.UserTO;
+import org.syncope.console.commons.StatusUtils;
+import org.syncope.console.pages.UserModalPage;
+import org.syncope.types.PropagationTaskExecStatus;
+
+/**
+ * User management result panel.
+ */
+public class UserManagementResultPanel extends Panel {
+
+ /**
+ * Serial version id.
+ */
+ private static final long serialVersionUID = 2646115294319713723L;
+
+ /**
+ * Logger.
+ */
+ private static final Logger LOG =
+ LoggerFactory.getLogger(UserManagementResultPanel.class);
+
+ /**
+ * Status management utilities.
+ */
+ @SpringBean
+ private StatusUtils statusUtils;
+
+ /**
+ * Panel constructor.
+ *
+ * @param id panel id.
+ * @param window guest modal window.
+ * @param mode operation mode.
+ * @param userTO User TO.
+ */
+ public UserManagementResultPanel(
+ final String id,
+ final ModalWindow window,
+ final UserModalPage.Mode mode,
+ final UserTO userTO) {
+
+ super(id);
+
+ // shortcut to retrieve fragments inside inner classes
+ final Panel panel = this;
+
+ final WebMarkupContainer container =
+ new WebMarkupContainer("container");
+ container.setOutputMarkupId(true);
+ add(container);
+
+ final Fragment fragment = new Fragment("userModalResultFrag",
+ mode == UserModalPage.Mode.SELF
+ ? "userModalSelfResultFrag" : "userModalPropagationResultFrag",
+ this);
+
+ fragment.setOutputMarkupId(true);
+ container.add(fragment);
+
+ if (mode == UserModalPage.Mode.ADMIN) {
+
+ // add Syncope propagation status
+ PropagationTO syncope = new PropagationTO();
+ syncope.setResourceName("Syncope");
+ syncope.setStatus(PropagationTaskExecStatus.SUCCESS);
+
+ List<PropagationTO> propagations = new ArrayList<PropagationTO>();
+ propagations.add(syncope);
+ propagations.addAll(userTO.getPropagationTOs());
+
+ fragment.add(new Label("userInfo", userTO.getUsername() != null
+ ? userTO.getUsername() : String.valueOf(userTO.getId())));
+
+ final ListView<PropagationTO> propRes = new ListView<PropagationTO>(
+ "resources", propagations) {
+
+ private static final long serialVersionUID =
+ -1020475259727720708L;
+
+ @Override
+ protected void populateItem(final ListItem item) {
+ final PropagationTO propTO =
+ (PropagationTO) item.getDefaultModelObject();
+
+ final ListView attributes = getConnObjectView(propTO);
+
+ final Fragment attrhead;
+
+ if (attributes.getModelObject() != null
+ && !attributes.getModelObject().isEmpty()) {
+ attrhead = new Fragment(
+ "attrhead", "attrHeadFrag", panel);
+ } else {
+ attrhead = new Fragment(
+ "attrhead", "emptyAttrHeadFrag", panel);
+ }
+
+ item.add(attrhead);
+ item.add(attributes);
+
+ attrhead.add(new Label("resource", propTO.getResourceName()));
+
+ attrhead.add(new Label("propagation",
+ propTO.getStatus() != null
+ ? propTO.getStatus().toString() : "UNDEFINED"));
+
+ final Image image;
+ final String alt, title;
+
+ switch (propTO.getStatus()) {
+ case SUCCESS:
+ case SUBMITTED:
+ case CREATED:
+ image = new Image("icon", "statuses/active.png");
+ alt = "success icon";
+ title = "success";
+ break;
+ default:
+ image = new Image("icon", "statuses/inactive.png");
+ alt = "failure icon";
+ title = "failure";
+ }
+
+ image.add(new Behavior() {
+
+ private static final long serialVersionUID =
+ 1469628524240283489L;
+
+ @Override
+ public void onComponentTag(
+ final Component component,
+ final ComponentTag tag) {
+ tag.put("alt", alt);
+ tag.put("title", title);
+ }
+ });
+
+ attrhead.add(image);
+ }
+ };
+ fragment.add(propRes);
+ }
+
+ final AjaxLink close = new IndicatingAjaxLink("close") {
+
+ private static final long serialVersionUID =
+ -7978723352517770644L;
+
+ @Override
+ public void onClick(final AjaxRequestTarget target) {
+ window.close(target);
+ }
+ };
+ container.add(close);
+ }
+
+ /**
+ * Get remote attributes list view.
+ *
+ * @param propTO propagation TO.
+ * @return list view.
+ */
+ private ListView getConnObjectView(final PropagationTO propTO) {
+ final ConnObjectTO before = propTO.getBefore();
+ final ConnObjectTO after = propTO.getAfter();
+
+ // sorted in reversed presentation order
+ final List<String> head = Arrays.asList(new String[]{
+ "__PASSWORD__", "__ENABLE__", "__UID__", "__NAME__"});
+
+ final Map<String, AttributeTO> beforeAttrMap;
+
+ final Map<String, AttributeTO> afterAttrMap;
+
+ final Set<String> attributes = new HashSet<String>();
+
+ if (before != null) {
+ beforeAttrMap = before.getAttributeMap();
+ attributes.addAll(beforeAttrMap.keySet());
+ } else {
+ beforeAttrMap = Collections.EMPTY_MAP;
+ }
+
+ if (after != null) {
+ afterAttrMap = after.getAttributeMap();
+ attributes.addAll(afterAttrMap.keySet());
+ } else {
+ afterAttrMap = Collections.EMPTY_MAP;
+ }
+
+ final List<String> profile = new ArrayList<String>();
+ profile.addAll(attributes);
+ profile.removeAll(head);
+ Collections.sort(profile);
+
+ for (String attr : head) {
+ if (attributes.contains(attr)) {
+ profile.add(0, attr);
+ }
+ }
+
+ return new ListView("attributes", profile) {
+
+ private static final long serialVersionUID = 4949588177564901031L;
+
+ @Override
+ protected void populateItem(final ListItem item) {
+ String name = item.getModelObject().toString();
+
+ final Fragment beforeValue;
+ final Fragment afterValue;
+
+ if ("__ENABLE__".equals(name)) {
+ beforeValue = getStatusIcon("beforeValue", before);
+ afterValue = getStatusIcon("afterValue", after);
+ } else {
+ beforeValue = getLabelValue(
+ "beforeValue", name, beforeAttrMap);
+
+ afterValue = getLabelValue(
+ "afterValue", name, afterAttrMap);
+ }
+
+ item.add(new Label("attrName", new ResourceModel(name, name)));
+
+ item.add(beforeValue);
+ item.add(afterValue);
+ }
+ };
+ }
+
+ /**
+ * Get fragment for attribute value (not remote status).
+ *
+ * @param id component id to be replaced with the fragment content.
+ * @param attrName remote attribute name
+ * @param attrMap remote attributes map.
+ * @return fragment.
+ */
+ private Fragment getLabelValue(
+ final String id,
+ final String attrName,
+ final Map<String, AttributeTO> attrMap) {
+ final String value;
+
+ final AttributeTO attr = attrMap.get(attrName);
+
+ if (attr != null
+ && attr.getValues() != null
+ && !attr.getValues().isEmpty()) {
+
+ if ("__PASSWORD__".equals(attrName)) {
+ value = "********";
+ } else {
+ value = attr.getValues().size() > 1
+ ? attr.getValues().toString() : attr.getValues().get(0);
+ }
+
+ } else {
+ value = "";
+ }
+
+ Component label = new Label("value", value).add(
+ new Behavior() {
+
+ private static final long serialVersionUID =
+ 1469628524240283489L;
+
+ @Override
+ public void onComponentTag(
+ final Component component,
+ final ComponentTag tag) {
+ tag.put("title", value);
+ }
+ });
+
+ final Fragment frag = new Fragment(id, "attrValueFrag", this);
+ frag.add(label);
+
+ return frag;
+ }
+
+ /**
+ * Get fragment for user status icon.
+ *
+ * @param id component id to be replaced with the fragment content.
+ * @param objectTO connector object TO.
+ * @return fragment.
+ */
+ private Fragment getStatusIcon(
+ final String id,
+ final ConnObjectTO objectTO) {
+ final Image image;
+ final String alt, title;
+
+ switch (statusUtils.getRemoteStatus(objectTO).getStatus()) {
+ case ACTIVE:
+ image = new Image("status", "statuses/active.png");
+ alt = "active icon";
+ title = "Enabled";
+ break;
+ case SUSPENDED:
+ image = new Image("status", "statuses/inactive.png");
+ alt = "inactive icon";
+ title = "Disabled";
+ break;
+ default:
+ image = null;
+ alt = null;
+ title = null;
+ }
+
+ final Fragment frag;
+
+ if (image != null) {
+ image.add(new Behavior() {
+
+ private static final long serialVersionUID =
+ 1469628524240283489L;
+
+ @Override
+ public void onComponentTag(
+ final Component component,
+ final ComponentTag tag) {
+ tag.put("alt", alt);
+ tag.put("title", title);
+ tag.put("width", "12px");
+ tag.put("height", "12px");
+ }
+ });
+
+ frag = new Fragment(id, "remoteStatusFrag", this);
+ frag.add(image);
+ } else {
+ frag = new Fragment(id, "emptyFrag", this);
+ }
+
+ return frag;
+ }
+}
Propchange: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/UserManagementResultPanel.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/UserManagementResultPanel.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/UserManagementResultPanel.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/UserSearchPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/UserSearchPanel.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/UserSearchPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/UserSearchPanel.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.pages.panels;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/VirtualAttributesPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/VirtualAttributesPanel.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/VirtualAttributesPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/VirtualAttributesPanel.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.pages.panels;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/AbstractBaseRestClient.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/AbstractBaseRestClient.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/AbstractBaseRestClient.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/AbstractBaseRestClient.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.rest;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/ApprovalRestClient.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/ApprovalRestClient.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/ApprovalRestClient.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/ApprovalRestClient.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.rest;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/ConfigurationRestClient.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/ConfigurationRestClient.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/ConfigurationRestClient.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/ConfigurationRestClient.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.rest;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/ConnectorRestClient.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/ConnectorRestClient.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/ConnectorRestClient.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/ConnectorRestClient.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.rest;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/EntitlementRestClient.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/EntitlementRestClient.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/EntitlementRestClient.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/EntitlementRestClient.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.rest;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/InvalidPolicyType.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/InvalidPolicyType.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/InvalidPolicyType.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/InvalidPolicyType.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.rest;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/NotificationRestClient.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/NotificationRestClient.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/NotificationRestClient.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/NotificationRestClient.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.rest;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/PolicyRestClient.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/PolicyRestClient.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/PolicyRestClient.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/PolicyRestClient.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.rest;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/ResourceRestClient.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/ResourceRestClient.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/ResourceRestClient.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/ResourceRestClient.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.rest;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/RoleRestClient.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/RoleRestClient.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/RoleRestClient.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/RoleRestClient.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.rest;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/SchemaRestClient.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/SchemaRestClient.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/SchemaRestClient.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/SchemaRestClient.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.rest;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/TaskRestClient.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/TaskRestClient.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/TaskRestClient.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/TaskRestClient.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.rest;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/UserRequestRestClient.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/UserRequestRestClient.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/UserRequestRestClient.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/UserRequestRestClient.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.rest;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/UserRestClient.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/UserRestClient.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/UserRestClient.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/UserRestClient.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.rest;
@@ -25,7 +26,7 @@ import org.syncope.client.search.NodeCon
import org.syncope.client.to.ConnObjectTO;
import org.syncope.client.to.UserTO;
import org.syncope.client.validation.SyncopeClientCompositeErrorException;
-import org.syncope.console.pages.panels.StatusPanel.StatusBean;
+import org.syncope.console.commons.StatusBean;
/**
* Console client for invoking rest users services.
@@ -79,7 +80,7 @@ public class UserRestClient extends Abst
public UserTO delete(Long id)
throws SyncopeClientCompositeErrorException {
-
+
return restTemplate.getForObject(
baseURL + "user/delete/{userId}", UserTO.class, id);
}
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/WorkflowRestClient.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/WorkflowRestClient.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/WorkflowRestClient.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/WorkflowRestClient.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.rest;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/ajax/markup/html/IndicatingDeleteOnConfirmAjaxLink.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/ajax/markup/html/IndicatingDeleteOnConfirmAjaxLink.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/ajax/markup/html/IndicatingDeleteOnConfirmAjaxLink.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/ajax/markup/html/IndicatingDeleteOnConfirmAjaxLink.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.wicket.ajax.markup.html;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/extensions/markup/html/repeater/data/table/DatePropertyColumn.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/extensions/markup/html/repeater/data/table/DatePropertyColumn.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/extensions/markup/html/repeater/data/table/DatePropertyColumn.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/extensions/markup/html/repeater/data/table/DatePropertyColumn.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.wicket.extensions.markup.html.repeater.data.table;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/extensions/markup/html/repeater/data/table/TokenColumn.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/extensions/markup/html/repeater/data/table/TokenColumn.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/extensions/markup/html/repeater/data/table/TokenColumn.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/extensions/markup/html/repeater/data/table/TokenColumn.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.wicket.extensions.markup.html.repeater.data.table;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/extensions/markup/html/repeater/data/table/UserAttrColumn.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/extensions/markup/html/repeater/data/table/UserAttrColumn.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/extensions/markup/html/repeater/data/table/UserAttrColumn.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/extensions/markup/html/repeater/data/table/UserAttrColumn.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.wicket.extensions.markup.html.repeater.data.table;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AbstractFieldPanel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AbstractFieldPanel.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AbstractFieldPanel.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AbstractFieldPanel.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.wicket.markup.html.form;
Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/ActionLink.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/ActionLink.java?rev=1292203&r1=1292202&r2=1292203&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/ActionLink.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/ActionLink.java Wed Feb 22 09:09:31 2012
@@ -7,13 +7,14 @@
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
- * http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
+ * under the License.
*/
package org.syncope.console.wicket.markup.html.form;