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/12/20 16:45:31 UTC
svn commit: r1424538 [6/6] - in /syncope/trunk:
console/src/main/java/org/apache/syncope/console/
console/src/main/java/org/apache/syncope/console/commons/
console/src/main/java/org/apache/syncope/console/pages/
console/src/main/java/org/apache/syncope...
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/AjaxNumberFieldPanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/AjaxNumberFieldPanel.html?rev=1424538&r1=1424537&r2=1424538&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/AjaxNumberFieldPanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/AjaxNumberFieldPanel.html Thu Dec 20 15:45:28 2012
@@ -1,21 +1,22 @@
<!--
- Licensed 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
+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
+ 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.
- under the License.
+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.
-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
<wicket:extend>
<input type="text" class="ui-widget-content ui-corner-all medium_dynamicsize"
wicket:id="numberField" />
-</wicket:extend>
\ No newline at end of file
+</wicket:extend>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/AjaxPalettePanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/AjaxPalettePanel.html?rev=1424538&r1=1424537&r2=1424538&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/AjaxPalettePanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/AjaxPalettePanel.html Thu Dec 20 15:45:28 2012
@@ -1,21 +1,23 @@
<!--
- Licensed 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
+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
+ 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.
- under the License.
+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.
-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<wicket:panel>
<span wicket:id="paletteField">[Palette]</span>
</wicket:panel>
-</html>
\ No newline at end of file
+</html>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/AjaxPasswordFieldPanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/AjaxPasswordFieldPanel.html?rev=1424538&r1=1424537&r2=1424538&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/AjaxPasswordFieldPanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/AjaxPasswordFieldPanel.html Thu Dec 20 15:45:28 2012
@@ -1,20 +1,21 @@
<!--
- Licensed 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
+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
+ 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.
- under the License.
+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.
-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
<wicket:extend>
<input type="password" class="ui-widget-content ui-corner-all long_dynamicsize"
wicket:id="passwordField" />
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/AjaxTextFieldPanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/AjaxTextFieldPanel.html?rev=1424538&r1=1424537&r2=1424538&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/AjaxTextFieldPanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/AjaxTextFieldPanel.html Thu Dec 20 15:45:28 2012
@@ -1,21 +1,22 @@
<!--
- Licensed 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
+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
+ 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.
- under the License.
+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.
-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
<wicket:extend>
<input type="text" class="ui-widget-content ui-corner-all long_dynamicsize"
wicket:id="textField" />
-</wicket:extend>
\ No newline at end of file
+</wicket:extend>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/CheckBoxMultipleChoiceFieldPanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/CheckBoxMultipleChoiceFieldPanel.html?rev=1424538&r1=1424537&r2=1424538&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/CheckBoxMultipleChoiceFieldPanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/CheckBoxMultipleChoiceFieldPanel.html Thu Dec 20 15:45:28 2012
@@ -1,16 +1,20 @@
<!--
- Licensed 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
+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
+ 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.
- under the License.
+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.
-->
<html>
<wicket:panel>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/DateTextFieldPanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/DateTextFieldPanel.html?rev=1424538&r1=1424537&r2=1424538&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/DateTextFieldPanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/DateTextFieldPanel.html Thu Dec 20 15:45:28 2012
@@ -1,20 +1,22 @@
<!--
- Licensed 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
+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
+ 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.
- under the License.
+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.
-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<wicket:extend>
<input type="text" class="text ui-widget-content ui-corner-all date_size"
wicket:id="field"/>
-</wicket:extend>
\ No newline at end of file
+</wicket:extend>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/DateTimeFieldPanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/DateTimeFieldPanel.html?rev=1424538&r1=1424537&r2=1424538&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/DateTimeFieldPanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/DateTimeFieldPanel.html Thu Dec 20 15:45:28 2012
@@ -1,19 +1,21 @@
<!--
- Licensed 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
+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
+ 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.
- under the License.
+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.
-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<wicket:extend>
<span wicket:id="field"/>
-</wicket:extend>
\ No newline at end of file
+</wicket:extend>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/FieldPanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/FieldPanel.html?rev=1424538&r1=1424537&r2=1424538&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/FieldPanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/FieldPanel.html Thu Dec 20 15:45:28 2012
@@ -1,18 +1,21 @@
<!--
- Licensed 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.
- under the License.
+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.
-->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<wicket:panel>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/LinkPanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/LinkPanel.html?rev=1424538&r1=1424537&r2=1424538&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/LinkPanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/LinkPanel.html Thu Dec 20 15:45:28 2012
@@ -1,19 +1,23 @@
<!--
- Licensed 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
+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
+ 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.
- under the License.
+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.
-->
<wicket:panel>
<a href="#" wicket:id="link">
<span wicket:id="linkTitle"/>
</a>
-</wicket:panel>
\ No newline at end of file
+</wicket:panel>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/MultiValueSelectorPanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/MultiValueSelectorPanel.html?rev=1424538&r1=1424537&r2=1424538&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/MultiValueSelectorPanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/MultiValueSelectorPanel.html Thu Dec 20 15:45:28 2012
@@ -1,18 +1,21 @@
<!--
- Licensed 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
+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
+ 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.
- under the License.
+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.
-->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<wicket:panel>
<span wicket:id="multiValueContainer">
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/tree/TreeActionLinkPanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/tree/TreeActionLinkPanel.html?rev=1424538&r1=1424537&r2=1424538&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/tree/TreeActionLinkPanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/tree/TreeActionLinkPanel.html Thu Dec 20 15:45:28 2012
@@ -1,16 +1,20 @@
<!--
- Licensed 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
+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
+ 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.
- under the License.
+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.
-->
<wicket:head>
<style type="text/css">
@@ -42,4 +46,4 @@
</a>
</wicket:fragment>
-</wicket:panel>
\ No newline at end of file
+</wicket:panel>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/tree/TreeRolePanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/tree/TreeRolePanel.html?rev=1424538&r1=1424537&r2=1424538&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/tree/TreeRolePanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/tree/TreeRolePanel.html Thu Dec 20 15:45:28 2012
@@ -1,20 +1,23 @@
<!--
- Licensed 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
+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
+ 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.
- under the License.
+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.
-->
<wicket:panel>
<div class="roleTable" wicket:id="treeContainer">
- <div wicket:id="treeTable"
- style="width: 30%;display:block;margin:10px;float:left;" class="role-tree"/>
+ <div wicket:id="treeTable" class="role-tree"/>
</div>
</wicket:panel>
Modified: syncope/trunk/console/src/main/webapp/css/style.css
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/webapp/css/style.css?rev=1424538&r1=1424537&r2=1424538&view=diff
==============================================================================
--- syncope/trunk/console/src/main/webapp/css/style.css (original)
+++ syncope/trunk/console/src/main/webapp/css/style.css Thu Dec 20 15:45:28 2012
@@ -1,20 +1,25 @@
body {
- margin: 0px;
- padding: 0px;
- font-family: Verdana, Tahoma, sans-serif;
- color: #333;
- font-size: 62.5%;
+ margin: 0px;
+ padding: 0px;
+ font-family: Verdana, Tahoma, sans-serif;
+ color: #333;
+ font-size: 62.5%;
}
/* id */
#tabs {
- background-color: #B9CFB3;
- margin: 0px 10px;
- margin-top: 20px;
+ background-color: #B9CFB3;
+ margin: 0px 10px;
+ margin-top: 10px;
+}
+#roletabs {
+ background-color: #B9CFB3;
+ margin: 0px 10px;
+ margin-top: 10px;
}
#tabs div {
- /*background-color: #FFF;*/
+ /*background-color: #FFF;*/
}
#logo {
@@ -23,157 +28,157 @@ body {
}
#splash {
- background: url(../img/sf_testa.png) top repeat-x #B9CFB3;
- width: 400px;
- margin-left: auto;
- margin-right: auto;
- margin-top: 100px;
- border: 1px solid #463;
+ background: url(../img/sf_testa.png) top repeat-x #B9CFB3;
+ width: 400px;
+ margin-left: auto;
+ margin-right: auto;
+ margin-top: 100px;
+ border: 1px solid #463;
}
#splash a {
- color: #463;
- text-decoration: none;
- font-size: 14px;
+ color: #463;
+ text-decoration: none;
+ font-size: 14px;
}
#splash a img {
- border: none;
+ border: none;
}
#splash h2 {
- color: #FFF;
- margin: 0px;
- margin-top: 8px;
- margin-bottom: 20px;
- font-size: 14px;
- text-align: center;
- font-weight: normal;
+ color: #FFF;
+ margin: 0px;
+ margin-top: 8px;
+ margin-bottom: 20px;
+ font-size: 14px;
+ text-align: center;
+ font-weight: normal;
}
#splash form {
- margin: 6px auto;
- width: 300px;
- text-align: center;
+ margin: 6px auto;
+ width: 300px;
+ text-align: center;
}
#splash form label {
- margin-right: 5px;
- display: block;
+ margin-right: 5px;
+ display: block;
}
#splash form label.password {
}
#splash form input {
- margin-bottom: 15px;
+ margin-bottom: 15px;
}
#splash p {
- margin: 6px 16px;
- border-top: 1px solid #463;
- text-align: center;
- padding-top: 8px;
+ margin: 6px 16px;
+ border-top: 1px solid #463;
+ text-align: center;
+ padding-top: 8px;
}
#splash ul {
- height: 320px;
- margin-left: 37px;
- padding-left: 28px;
+ height: 320px;
+ margin-left: 37px;
+ padding-left: 28px;
}
#splash ul li {
- float: left;
- width: 90px;
- text-align: center;
- list-style: none;
- margin: 0px;
+ float: left;
+ width: 90px;
+ text-align: center;
+ list-style: none;
+ margin: 0px;
}
input[disabled] {
- background-color: #ddd;
+ background-color: #ddd;
}
select[disabled] {
- background-color: #ddd;
+ background-color: #ddd;
}
#loginFeedbackDiv {
- width: 97%;
+ width: 97%;
}
#loginFeedbackDiv ul {
- list-style:none outside none;
- margin:0;
- text-align:center;
- width: 100%;
- height: 30px;
- margin-left: 0px;
- padding-left: 0px;
+ list-style:none outside none;
+ margin:0;
+ text-align:center;
+ width: 100%;
+ height: 30px;
+ margin-left: 0px;
+ padding-left: 0px;
}
#loginFeedbackDiv ul li{
- list-style:none outside none;
- margin:0;
- text-align:center;
- width: 100%;
+ list-style:none outside none;
+ margin:0;
+ text-align:center;
+ width: 100%;
}
#feedbackDiv {
- height: 20px;
- margin: 0px;
- padding: 0px;
+ height: 20px;
+ margin: 0px;
+ padding: 0px;
}
#feedbackDiv ul{
- height: 20px !important;
- margin: 0px;
- padding: 0px;
+ height: 20px !important;
+ margin: 0px;
+ padding: 0px;
}
#feedbackDiv li{
- list-style:none outside none;
- margin:0;
- text-align:center;
- width: 100%;
+ list-style:none outside none;
+ margin:0;
+ text-align:center;
+ width: 100%;
}
#feedbackDiv ul li{
- list-style:none outside none;
- margin:0;
- text-align:center;
- width: 100%;
- color: red;
+ list-style:none outside none;
+ margin:0;
+ text-align:center;
+ width: 100%;
+ color: red;
}
/* FEEDBACK PANEL'S INFO STYLE */
.feedbackPanel {
- padding-left:20pt;
- margin-right:20pt;
+ padding-left:20pt;
+ margin-right:20pt;
}
.feedbackPanelINFO {
- color: green;
- margin: 0px;
- list-style-type: none;
- background:url("images/ui-bg_highlight-soft_75_cccccc_1x100.png") repeat-x scroll 50% 50% #CCCCCC;
- -moz-border-radius: 3px;
- -webkit-border-radius: 3px;
- border: 1px solid gray;
- border-radius: 3px;
- padding: 5px;
+ color: green;
+ margin: 0px;
+ list-style-type: none;
+ background:url("images/ui-bg_highlight-soft_75_cccccc_1x100.png") repeat-x scroll 50% 50% #CCCCCC;
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ border: 1px solid gray;
+ border-radius: 3px;
+ padding: 5px;
}
.feedbackPanelERROR {
- color: red;
- /*font-weight: bold;
- margin: 0px;
- list-style-type: none;
- background:url("images/ui-bg_highlight-soft_75_cccccc_1x100_red.png") repeat-x scroll 50% 50% #CCCCCC;
- -moz-border-radius: 3px;
- -webkit-border-radius: 3px;
- border: 1px solid gray;
- border-radius: 3px;
- padding: 5px;*/
+ color: red;
+ /*font-weight: bold;
+ margin: 0px;
+ list-style-type: none;
+ background:url("images/ui-bg_highlight-soft_75_cccccc_1x100_red.png") repeat-x scroll 50% 50% #CCCCCC;
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ border: 1px solid gray;
+ border-radius: 3px;
+ padding: 5px;*/
}
/*
@@ -185,52 +190,52 @@ select[disabled] {
}*/
.feedbackPanelINFO span {
- background: url("../img/ok.png") no-repeat left;
- border:0 none;
- padding-left: 20px;
+ background: url("../img/ok.png") no-repeat left;
+ border:0 none;
+ padding-left: 20px;
}
#navigationPane {
- background: url(../img/sf_testa.png) top repeat-x #FFF;
+ background: url(../img/sf_testa.png) top repeat-x #FFF;
}
#navigationPane a img {
- border: none;
+ border: none;
}
#navigationPane {
- height: 103px;
+ height: 103px;
}
#navigationPane a {
- color: #FFF;
- text-decoration: none;
+ color: #FFF;
+ text-decoration: none;
}
#navigationPane a:hover {
- color: #CCC;
+ color: #CCC;
}
#navigationPane ul {
- clear: both;
- padding: 0px;
- margin: 0px;
- margin-left: 280px;
+ clear: both;
+ padding: 0px;
+ margin: 0px;
+ margin-left: 280px;
}
#navigationPane ul li {
- float: left;
- width: 90px;
- text-align: center;
- margin: 0px;
- color: #FFF;
- font-size: 13px;
- list-style: none;
- padding: 0px;
+ float: left;
+ width: 90px;
+ text-align: center;
+ margin: 0px;
+ color: #FFF;
+ font-size: 13px;
+ list-style: none;
+ padding: 0px;
}
#navigationPane span {
- font-size: 13px;
+ font-size: 13px;
}
/* MODAL-FORM */
@@ -251,157 +256,164 @@ div#executions table td, div#executions
/* classi */
#navigationPane .schema {
- color: #99C;
+ color: #99C;
}
#navigationPane a img:hover {
- opacity:0.5;
- -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(opacity=50)";
- filter:alpha(opacity=50)
+ opacity:0.5;
+ -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(opacity=50)";
+ filter:alpha(opacity=50)
}
#splash a img:hover {
- opacity:0.5;
- -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(opacity=50)";
- filter:alpha(opacity=50)
+ opacity:0.5;
+ -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(opacity=50)";
+ filter:alpha(opacity=50)
}
#navigationPane .users {
- color: #9C0;
+ color: #9C0;
}
#navigationPane .roles {
- color: #F90;
+ color: #F90;
}
#navigationPane .resources {
- color: #09F;
+ color: #09F;
}
#navigationPane .tasks {
- color: #FD0;
+ color: #FD0;
}
#navigationPane .todo {
- color: #F3C98E;
+ color: #F3C98E;
}
#navigationPane .connectors {
- color: #09F;
+ color: #09F;
}
#navigationPane .reports {
- color: #F66;
+ color: #F66;
}
#navigationPane .configuration {
- color: #CCC;
+ color: #CCC;
}
.onerowlabel {
- float: left;
+ float: left;
}
.onerowcheckbox {
- margin-left: 10em;
+ margin-left: 10em;
}
div#attributes-view label {
- display: block;
- clear: none;
- width: 300px;
- margin-left: 20px;
+ display: block;
+ clear: none;
+ width: 300px;
+ margin-left: 20px;
}
div#attributes-view input {
- display: block;
- float: left;
- clear: left;
- height: 12px;
- padding: 0;
- margin: 0;
+ display: block;
+ float: left;
+ clear: left;
+ height: 12px;
+ padding: 0;
+ margin: 0;
}
.feedbackPanelERROR {
- color: black;
- font-weight: bold;
- margin: 0px;
- list-style-type: none;
- background:url("images/ui-bg_highlight-soft_75_cccccc_1x100_red.png") repeat-x scroll 50% 50% #CCCCCC;
- -moz-border-radius: 3px;
- -webkit-border-radius: 3px;
- border: 1px solid gray;
- border-radius: 3px;
- padding: 5px;
+ color: black;
+ font-weight: bold;
+ margin: 0px;
+ list-style-type: none;
+ background:url("images/ui-bg_highlight-soft_75_cccccc_1x100_red.png") repeat-x scroll 50% 50% #CCCCCC;
+ -moz-border-radius: 3px;
+ -webkit-border-radius: 3px;
+ border: 1px solid gray;
+ border-radius: 3px;
+ padding: 5px;
}
.feedbackPanelERROR span {
- background: url("images/warning.png") no-repeat left;
- border:0 none;
- font-size:12px;
- padding-left: 24px;
+ background: url("images/warning.png") no-repeat left;
+ border:0 none;
+ font-size:12px;
+ padding-left: 24px;
}
.selectedRow {
- background-color: #eef1f1; /* alternative: LemonChiffon */
+ background-color: #eef1f1; /* alternative: LemonChiffon */
}
/* WICKET DATATABLE HEADERS */
.headers {
- border: 1px solid #aaaaaa;
- background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png)
- 50% 50% repeat-x;
+ border: 1px solid #aaaaaa;
+ background: #cccccc url(images/ui-bg_highlight-soft_75_cccccc_1x100.png)
+ 50% 50% repeat-x;
}
em {
- font-size: inherit;
- color: gray;
+ font-size: inherit;
+ color: gray;
}
em img {
- opacity:0.4;
- filter:alpha(opacity=40);
+ opacity:0.4;
+ filter:alpha(opacity=40);
}
th.action{
- width: 110px;
+ width: 110px;
}
td.action{
- text-align: center;
+ text-align: center;
}
.navigatorLabel {
- float: left;
+ float: left;
}
.navigator {
- text-align: right;
+ text-align: right;
+}
+
+.role-tree {
+ width: 30%;
+ display:block;
+ float:left;
}
+/* jquery-ui overrides */
.ui-widget-header {
- border: 1px solid #aaaaaa
+ border: 1px solid #aaaaaa
/*{borderColorHeader}*/;
- background: #cccccc
+ background: #cccccc
/*{bgColorHeader}*/
url(images/ui-bg_highlight-soft_75_cccccc_1x100.png)
/*{bgImgUrlHeader}*/
50%/*{bgHeaderXPos}*/
50%/*{bgHeaderYPos}*/
repeat-x/*{bgHeaderRepeat}*/;
- color: #222222/*{fcHeader}*/;
- font-weight: bold;
- padding: 7px 15px;
+ color: #222222/*{fcHeader}*/;
+ font-weight: bold;
+ padding: 7px 15px;
}
.ui-button {
- display: inline-block;
- position: relative;
- padding: 0;
- margin-right: .1em;
- cursor: pointer;
- text-align: center;
- zoom: 1;
- overflow: visible;
- padding: 7px 15px;
+ display: inline-block;
+ position: relative;
+ padding: 0;
+ margin-right: .1em;
+ cursor: pointer;
+ text-align: center;
+ zoom: 1;
+ overflow: visible;
+ padding: 7px 15px;
}
\ No newline at end of file
Modified: syncope/trunk/console/src/test/java/org/apache/syncope/console/RoleTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/test/java/org/apache/syncope/console/RoleTestITCase.java?rev=1424538&r1=1424537&r2=1424538&view=diff
==============================================================================
--- syncope/trunk/console/src/test/java/org/apache/syncope/console/RoleTestITCase.java (original)
+++ syncope/trunk/console/src/test/java/org/apache/syncope/console/RoleTestITCase.java Thu Dec 20 15:45:28 2012
@@ -28,11 +28,12 @@ public class RoleTestITCase extends Abst
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='navigationPane']\");", "30000");
- selenium.click("//div[3]/span/div/div/div/div/div/span/a");
+ selenium.click("//div[3]/div/div/span/div/div/div/div/div/span/a");
- selenium.waitForCondition("selenium.isElementPresent(\"//div[3]/span[2]/span/div/p/span/span/a\");", "30000");
+ selenium.waitForCondition(
+ "selenium.isElementPresent(\"//div[3]/div/div/span[2]/span/div/p/span/span/a\");", "30000");
- selenium.click("//div[3]/span[2]/span/div/p/span/span/a");
+ selenium.click("//div[3]/div/div/span[2]/span/div/p/span/span/a");
selenium.waitForCondition("selenium.isElementPresent(\"//span[contains(text(),'Attributes')]\");", "30000");
@@ -46,12 +47,12 @@ public class RoleTestITCase extends Abst
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='navigationPane']\");", "30000");
- selenium.click("//div[3]/span/div/div/div/div/div[2]/div/div/span/a");
+ selenium.click("//div[3]/div/div/span/div/div/div/div/div[2]/div/div/span/a");
selenium.waitForCondition("selenium.isElementPresent("
- + "\"//div[3]/span[2]/span/span/div/p/span[2]/span/a\");", "30000");
+ + "\"//div[3]/div/div/span[2]/span/span/div/p/span[2]/span/a\");", "30000");
- selenium.click("//div[3]/span[2]/span/span/div/p/span[2]/span/a");
+ selenium.click("//div[3]/div/div/span[2]/span/span/div/p/span[2]/span/a");
selenium.waitForCondition("selenium.isElementPresent(\"//iframe\");", "30000");
@@ -75,12 +76,12 @@ public class RoleTestITCase extends Abst
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='navigationPane']\");", "30000");
- selenium.click("//div[3]/span/div/div/div/div/div[2]/div/div/span/a");
+ selenium.click("//div[3]/div/div/span/div/div/div/div/div[2]/div/div/span/a");
selenium.waitForCondition("selenium.isElementPresent("
- + "\"//div[3]/span[2]/span/span/div/p/span[2]/span/a[2]\");", "30000");
+ + "\"//div[3]/div/div/span[2]/span/span/div/p/span[2]/span/a[2]\");", "30000");
- selenium.click("//div[3]/span[2]/span/span/div/p/span[2]/span/a[2]");
+ selenium.click("//div[3]/div/div/span[2]/span/span/div/p/span[2]/span/a[2]");
selenium.waitForCondition("selenium.isElementPresent(\"//iframe\");", "30000");
@@ -104,7 +105,7 @@ public class RoleTestITCase extends Abst
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='navigationPane']\");", "30000");
- selenium.click("//div[3]/span/div/div/div/div/div[2]/div/div/span/a");
+ selenium.click("//div[3]/div/div/span/div/div/div/div/div[2]/div/div/span/a");
selenium.waitForCondition("selenium.isElementPresent(\"//div/form/div[2]/ul/li[7]/a\");", "30000");
@@ -120,12 +121,12 @@ public class RoleTestITCase extends Abst
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='navigationPane']\");", "30000");
- selenium.click("//div[3]/span/div/div/div/div/div[2]/div/div/span/a");
+ selenium.click("//div[3]/div/div/span/div/div/div/div/div[2]/div/div/span/a");
selenium.waitForCondition("selenium.isElementPresent("
- + "\"//div[3]/span[2]/span/span/div/form/div[2]/ul/li[8]/a\");", "30000");
+ + "\"//div[3]/div/div/span[2]/span/span/div/form/div[2]/ul/li[8]/a\");", "30000");
- selenium.click("//div[3]/span[2]/span/span/div/form/div[2]/ul/li[8]/a");
+ selenium.click("//div[3]/div/div/span[2]/span/span/div/form/div[2]/ul/li[8]/a");
selenium.click("//input[@name=\"userListContainer:search\"]");
@@ -146,10 +147,10 @@ public class RoleTestITCase extends Abst
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='navigationPane']\");", "30000");
- selenium.click("//div[3]/span/div/div/div/div/div[2]/div/div/span/a");
+ selenium.click("//div[3]/div/div/span/div/div/div/div/div[2]/div/div/span/a");
selenium.waitForCondition("selenium.isElementPresent("
- + "\"//div[3]/span[2]/span/span/div/form/div[2]/ul/li[8]/a\");", "30000");
+ + "\"//div[3]/div/div/span[2]/span/span/div/form/div[2]/ul/li[8]/a\");", "30000");
selenium.click("//div/form/div[2]/ul/li[7]/a");
@@ -168,11 +169,12 @@ public class RoleTestITCase extends Abst
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='navigationPane']\");", "30000");
- selenium.click("//div[3]/span/div/div/div/div/div[2]/div[2]/div[2]/div/div[2]/div[3]/div/span[2]/a/span");
+ selenium.click(
+ "//div[3]/div/div/span/div/div/div/div/div[2]/div[2]/div[2]/div/div[2]/div[3]/div/span[2]/a/span");
selenium.waitForCondition("selenium.isElementPresent(\"//div/p/span[2]/span/a[3]\");", "30000");
- selenium.click("//div[3]/span[2]/span/span/div/p/span[2]/span/a[3]");
+ selenium.click("//div[3]/div/div/span[2]/span/span/div/p/span[2]/span/a[3]");
assertTrue(selenium.getConfirmation().matches("^Do you really want to delete the selected item[\\s\\S]$"));
}
Modified: syncope/trunk/console/src/test/java/org/apache/syncope/console/UserTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/test/java/org/apache/syncope/console/UserTestITCase.java?rev=1424538&r1=1424537&r2=1424538&view=diff
==============================================================================
--- syncope/trunk/console/src/test/java/org/apache/syncope/console/UserTestITCase.java (original)
+++ syncope/trunk/console/src/test/java/org/apache/syncope/console/UserTestITCase.java Thu Dec 20 15:45:28 2012
@@ -31,8 +31,8 @@ public class UserTestITCase extends Abst
selenium.click("//a[contains(text(),'Create new user')]");
- selenium
- .waitForCondition("selenium.isElementPresent(" + "\"//span[contains(text(),'Attributes')]\");", "30000");
+ selenium.waitForCondition("selenium.isElementPresent("
+ + "\"//span[contains(text(),'Attributes')]\");", "30000");
selenium.click("//div[@id='tabs']/ul/li[2]/a/span");
selenium.click("//div[@id='tabs']/ul/li[3]/a/span");
@@ -73,8 +73,8 @@ public class UserTestITCase extends Abst
selenium.click("link=Search");
selenium.select("//td[3]/select", "label=MEMBERSHIP");
- selenium
- .waitForCondition("selenium.isElementPresent(" + "\"//td[4]/select[option='3 citizen']\");", "30000");
+ selenium.waitForCondition("selenium.isElementPresent("
+ + "\"//td[4]/select[option='3 citizen']\");", "30000");
selenium.select("//td[4]/select", "label=3 citizen");
selenium.click("name=search");
@@ -95,11 +95,8 @@ public class UserTestITCase extends Abst
selenium.waitForCondition("selenium.isElementPresent(" + "\"//div[@id='propagation']/span\");", "30000");
- selenium.click("//span/span/div/a");
+ selenium.click("//div[6]/form/div/div[2]/div/div/div/div/a");
- // it depends on the execution order of tests: resources
- // 'ws-target-resource-delete' could have been deleted from
- // ResourceTestITCase#delete
selenium.waitForCondition("selenium.isTextPresent(" + "\"Operation executed successfully\");", "30000");
}
}
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java?rev=1424538&r1=1424537&r2=1424538&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/RoleController.java Thu Dec 20 15:45:28 2012
@@ -203,24 +203,7 @@ public class RoleController extends Abst
public List<RoleTO> search(@RequestBody final NodeCond searchCondition)
throws InvalidSearchConditionException {
- LOG.debug("Role search called with condition {}", searchCondition);
-
- if (!searchCondition.checkValidity()) {
- LOG.error("Invalid search condition: {}", searchCondition);
- throw new InvalidSearchConditionException();
- }
-
- List<SyncopeRole> matchingRoles = searchDAO.search(EntitlementUtil.getRoleIds(EntitlementUtil.
- getOwnedEntitlementNames()), searchCondition, AttributableUtil.getInstance(AttributableType.ROLE));
- List<RoleTO> result = new ArrayList<RoleTO>(matchingRoles.size());
- for (SyncopeRole role : matchingRoles) {
- result.add(dataBinder.getRoleTO(role));
- }
-
- auditManager.audit(Category.role, AuditElements.RoleSubCategory.read, Result.success,
- "Successfully searched for roles: " + result.size());
-
- return result;
+ return search(searchCondition, -1, -1);
}
@PreAuthorize("hasRole('ROLE_READ')")
@@ -237,8 +220,8 @@ public class RoleController extends Abst
throw new InvalidSearchConditionException();
}
- final List<SyncopeRole> matchingRoles = searchDAO.search(EntitlementUtil.getRoleIds(EntitlementUtil.
- getOwnedEntitlementNames()), searchCondition, page, size,
+ final List<SyncopeRole> matchingRoles = searchDAO.search(
+ EntitlementUtil.getRoleIds(EntitlementUtil.getOwnedEntitlementNames()), searchCondition, page, size,
AttributableUtil.getInstance(AttributableType.ROLE));
final List<RoleTO> result = new ArrayList<RoleTO>(matchingRoles.size());
Modified: syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java
URL: http://svn.apache.org/viewvc/syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java?rev=1424538&r1=1424537&r2=1424538&view=diff
==============================================================================
--- syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java (original)
+++ syncope/trunk/core/src/main/java/org/apache/syncope/core/rest/controller/UserController.java Thu Dec 20 15:45:28 2012
@@ -235,24 +235,7 @@ public class UserController {
public List<UserTO> search(@RequestBody final NodeCond searchCondition)
throws InvalidSearchConditionException {
- LOG.debug("User search called with condition {}", searchCondition);
-
- if (!searchCondition.checkValidity()) {
- LOG.error("Invalid search condition: {}", searchCondition);
- throw new InvalidSearchConditionException();
- }
-
- List<SyncopeUser> matchingUsers = searchDAO.search(EntitlementUtil.getRoleIds(EntitlementUtil.
- getOwnedEntitlementNames()), searchCondition, AttributableUtil.getInstance(AttributableType.USER));
- List<UserTO> result = new ArrayList<UserTO>(matchingUsers.size());
- for (SyncopeUser user : matchingUsers) {
- result.add(dataBinder.getUserTO(user));
- }
-
- auditManager.audit(Category.user, UserSubCategory.read, Result.success,
- "Successfully searched for users: " + result.size());
-
- return result;
+ return search(searchCondition, -1, -1);
}
@PreAuthorize("hasRole('USER_READ')")