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 2013/04/29 16:34:25 UTC
svn commit: r1477105 - in /syncope/trunk: ./
console/src/main/resources/org/apache/syncope/console/pages/
console/src/main/resources/org/apache/syncope/console/pages/panels/
console/src/test/java/org/apache/syncope/console/
Author: ilgrosso
Date: Mon Apr 29 14:34:24 2013
New Revision: 1477105
URL: http://svn.apache.org/r1477105
Log:
[SYNCOPE-367] Merge from 1_1_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/PoliciesPanel.html
syncope/trunk/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_1_X:r1476964-1477104
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration.html?rev=1477105&r1=1477104&r2=1477105&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration.html Mon Apr 29 14:34:24 2013
@@ -16,164 +16,166 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<wicket:head>
- <link rel="stylesheet" type="text/css" href="css/codemirror.css" />
- <link rel="stylesheet" type="text/css" href="css/codemirror_default_theme.css" />
-
- <script type="text/javascript" src="scripts/codemirror.js"></script>
- <script type="text/javascript" src="scripts/xmlpure.js"></script>
- <script type="text/javascript">
- function updateTextArea(editor) {
- document.getElementById("workflowDefArea").value = editor.getValue();
- }
- </script>
-
- <style>
- td#level {
- width: 100px;
- text-align: center;
- }
- </style>
-</wicket:head>
-
-<wicket:extend>
-
- <div id="tabs">
- <ul>
- <li class="tabs-selected">
- <a href="#tabs-1"><span><wicket:message key="tab1"/></span></a>
- </li>
- <li><a href="#tabs-2"><span><wicket:message key="tab2"/></span></a></li>
- <li><a href="#tabs-3"><span><wicket:message key="tab3"/></span></a></li>
- <li><a href="#tabs-4"><span><wicket:message key="tab4"/></span></a></li>
- <li><a href="#tabs-5"><span><wicket:message key="tab5"/></span></a></li>
- <li><a href="#tabs-6"><span><wicket:message key="tab6"/></span></a></li>
- <li><a href="#tabs-7"><span><wicket:message key="tab7"/></span></a></li>
- <li><a href="#tabs-8"><span><wicket:message key="tab8"/></span></a></li>
- </ul>
- <div id="tabs-1">
-
- <div id="users-contain" class="ui-widget" style="width:inherit">
- <span wicket:id="confContainer">
- <table class="ui-widget ui-widget-content table-hover"
- wicket:id="syncopeconf"/>
- </span>
-
- <span style="float:right">
- <form wicket:id="confPaginatorForm" style="display:inline">
- <label><wicket:message key="displayRows"/></label>
- <select class="text ui-widget-content ui-corner-all"
- wicket:id="rowsChooser"/>
- </form>
- </span>
- </div>
-
- <div wicket:id="createConfigurationWin">[Show modal window for creating configuration]</div>
- <div wicket:id="editConfigurationWin">[Show modal window for editing configuration]</div>
-
- <a class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
- wicket:id="createConfigurationLink">
- <wicket:message key="create_configuration"/>
- </a>
- </div>
- <div id="tabs-2">
- <span wicket:id="passwordPoliciesPanel">[password policies]</span>
- </div>
- <div id="tabs-3">
- <span wicket:id="accountPoliciesPanel">[account policies]</span>
- </div>
- <div id="tabs-4">
- <span wicket:id="syncPoliciesPanel">[sync policies]</span>
- </div>
- <div id="tabs-5">
- <div id="users-contain" class="ui-widget" style="width:inherit">
- <span wicket:id="notificationContainer">
- <table class="ui-widget ui-widget-content table-hover"
- wicket:id="notificationTable"/>
- </span>
-
- <span style="float:right">
- <form wicket:id="notificationPaginatorForm" style="display:inline">
- <label><wicket:message key="displayRows"/></label>
- <select class="text ui-widget-content ui-corner-all"
- wicket:id="rowsChooser"/>
- </form>
- </span>
- </div>
-
- <div wicket:id="createNotificationWin">[Show modal window for creating notification]</div>
- <div wicket:id="editNotificationWin">[Show modal window for editing notification]</div>
-
- <a class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
- wicket:id="createNotificationLink">
- <wicket:message key="create_notification"/>
- </a>
- </div>
- <div id="tabs-6">
- <div id="users-contain" class="ui-widget" style="width:inherit">
- <span wicket:id="workflowDefContainer">
- <form wicket:id="workflowDefForm">
- <textarea wicket:id="workflowDefArea" id="workflowDefArea" style="width:100%;height:350px;">
- </textarea>
- <div style="margin: 10px 0px 0">
- <input type="submit"
- class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
- wicket:id="apply"/>
- </div>
- </form>
- <script>
- var editor = CodeMirror.fromTextArea(document.getElementById("workflowDefArea"),
- {mode: {name: "xmlpure"}, lineNumbers: true, onChange: updateTextArea});
- </script>
- </span>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+ <wicket:head>
+ <link rel="stylesheet" type="text/css" href="css/codemirror.css" />
+ <link rel="stylesheet" type="text/css" href="css/codemirror_default_theme.css" />
+
+ <script type="text/javascript" src="scripts/codemirror.js"></script>
+ <script type="text/javascript" src="scripts/xmlpure.js"></script>
+ <script type="text/javascript">
+ function updateTextArea(editor) {
+ document.getElementById("workflowDefArea").value = editor.getValue();
+ }
+ </script>
+
+ <style>
+ td#level {
+ width: 100px;
+ text-align: center;
+ }
+ </style>
+ </wicket:head>
+
+ <wicket:extend>
+
+ <div id="tabs">
+ <ul>
+ <li class="tabs-selected">
+ <a href="#tabs-1"><span><wicket:message key="tab1"/></span></a>
+ </li>
+ <li><a href="#tabs-2"><span><wicket:message key="tab2"/></span></a></li>
+ <li><a href="#tabs-3"><span><wicket:message key="tab3"/></span></a></li>
+ <li><a href="#tabs-4"><span><wicket:message key="tab4"/></span></a></li>
+ <li><a href="#tabs-5"><span><wicket:message key="tab5"/></span></a></li>
+ <li><a href="#tabs-6"><span><wicket:message key="tab6"/></span></a></li>
+ <li><a href="#tabs-7"><span><wicket:message key="tab7"/></span></a></li>
+ <li><a href="#tabs-8"><span><wicket:message key="tab8"/></span></a></li>
+ </ul>
+ <div id="tabs-1">
+
+ <div id="users-contain" class="ui-widget" style="width:inherit">
+ <span wicket:id="confContainer">
+ <table class="ui-widget ui-widget-content table-hover"
+ wicket:id="syncopeconf"/>
+ </span>
+
+ <span style="float:right">
+ <form wicket:id="confPaginatorForm" style="display:inline">
+ <label><wicket:message key="displayRows"/></label>
+ <select class="text ui-widget-content ui-corner-all"
+ wicket:id="rowsChooser"/>
+ </form>
+ </span>
+ </div>
+
+ <div wicket:id="createConfigurationWin">[Show modal window for creating configuration]</div>
+ <div wicket:id="editConfigurationWin">[Show modal window for editing configuration]</div>
+
+ <a class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
+ wicket:id="createConfigurationLink">
+ <wicket:message key="create_configuration"/>
+ </a>
</div>
- </div>
- <div id="tabs-7">
- <div id="users-contain" class="ui-widget" style="width:inherit">
- <span wicket:id="coreLoggerContainer">
- <table class="ui-widget ui-widget-content table-hover">
- <thead class="ui-widget-header">
- <tr class="heaaders">
- <th><wicket:message key="logger"/></th>
- <th><wicket:message key="level"/></th>
- </tr>
- </thead>
- <tbody>
- <tr wicket:id="corelogger">
- <td><span wicket:id="name"/></td>
- <td id="level"><select wicket:id="level"/></td>
- </tr>
- </tbody>
- </table>
- </span>
+ <div id="tabs-2">
+ <span wicket:id="passwordPoliciesPanel">[password policies]</span>
</div>
- </div>
- <div id="tabs-8">
- <div id="users-contain" class="ui-widget" style="width:inherit">
- <span wicket:id="consoleLoggerContainer">
- <table class="ui-widget ui-widget-content table-hover">
- <thead class="ui-widget-header">
- <tr class="heaaders">
- <th><wicket:message key="logger"/></th>
- <th><wicket:message key="level"/></th>
- </tr>
- </thead>
- <tbody>
- <tr wicket:id="consolelogger">
- <td><span wicket:id="name"/></td>
- <td id="level"><select wicket:id="level"/></td>
- </tr>
- </tbody>
- </table>
- </span>
+ <div id="tabs-3">
+ <span wicket:id="accountPoliciesPanel">[account policies]</span>
</div>
- </div>
- <div>
- <a style="position: absolute; top: 2px; right:20px;" wicket:id="dbExportLink">
- <img src="img/db_export.png"width="30" height="30"
- alt="DB export" title="title" wicket:message="title:db_export"/>
- </a>
- </div>
+ <div id="tabs-4">
+ <span wicket:id="syncPoliciesPanel">[sync policies]</span>
+ </div>
+ <div id="tabs-5">
+ <div id="users-contain" class="ui-widget" style="width:inherit">
+ <span wicket:id="notificationContainer">
+ <table class="ui-widget ui-widget-content table-hover"
+ wicket:id="notificationTable"/>
+ </span>
+
+ <span style="float:right">
+ <form wicket:id="notificationPaginatorForm" style="display:inline">
+ <label><wicket:message key="displayRows"/></label>
+ <select class="text ui-widget-content ui-corner-all"
+ wicket:id="rowsChooser"/>
+ </form>
+ </span>
+ </div>
+
+ <div wicket:id="createNotificationWin">[Show modal window for creating notification]</div>
+ <div wicket:id="editNotificationWin">[Show modal window for editing notification]</div>
+
+ <a class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
+ wicket:id="createNotificationLink">
+ <wicket:message key="create_notification"/>
+ </a>
+ </div>
+ <div id="tabs-6">
+ <div id="users-contain" class="ui-widget" style="width:inherit">
+ <span wicket:id="workflowDefContainer">
+ <form wicket:id="workflowDefForm">
+ <textarea wicket:id="workflowDefArea" id="workflowDefArea" style="width:100%;height:350px;">
+ </textarea>
+ <div style="margin: 10px 0px 0">
+ <input type="submit"
+ class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
+ wicket:id="apply"/>
+ </div>
+ </form>
+ <script>
+ var editor = CodeMirror.fromTextArea(document.getElementById("workflowDefArea"),
+ {mode: {name: "xmlpure"}, lineNumbers: true, onChange: updateTextArea});
+ </script>
+ </span>
+ </div>
+ </div>
+ <div id="tabs-7">
+ <div id="users-contain" class="ui-widget" style="width:inherit">
+ <span wicket:id="coreLoggerContainer">
+ <table class="ui-widget ui-widget-content table-hover">
+ <thead class="ui-widget-header">
+ <tr class="heaaders">
+ <th><wicket:message key="logger"/></th>
+ <th><wicket:message key="level"/></th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr wicket:id="corelogger">
+ <td><span wicket:id="name"/></td>
+ <td id="level"><select wicket:id="level"/></td>
+ </tr>
+ </tbody>
+ </table>
+ </span>
+ </div>
+ </div>
+ <div id="tabs-8">
+ <div id="users-contain" class="ui-widget" style="width:inherit">
+ <span wicket:id="consoleLoggerContainer">
+ <table class="ui-widget ui-widget-content table-hover">
+ <thead class="ui-widget-header">
+ <tr class="heaaders">
+ <th><wicket:message key="logger"/></th>
+ <th><wicket:message key="level"/></th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr wicket:id="consolelogger">
+ <td><span wicket:id="name"/></td>
+ <td id="level"><select wicket:id="level"/></td>
+ </tr>
+ </tbody>
+ </table>
+ </span>
+ </div>
+ </div>
+ <div>
+ <a style="position: absolute; top: 2px; right:20px;" wicket:id="dbExportLink">
+ <img src="img/db_export.png"width="30" height="30"
+ alt="DB export" title="title" wicket:message="title:db_export"/>
+ </a>
+ </div>
- </div>
-</wicket:extend>
\ No newline at end of file
+ </div>
+ </wicket:extend>
+</html>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/PoliciesPanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/PoliciesPanel.html?rev=1477105&r1=1477104&r2=1477105&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/PoliciesPanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/PoliciesPanel.html Mon Apr 29 14:34:24 2013
@@ -16,27 +16,27 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<wicket:panel>
-
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+ <wicket:panel>
<div>
- <div id="users-contain" class="ui-widget">
- <span wicket:id="container">
- <table class="ui-widget ui-widget-content table-hover" wicket:id="datatable"/>
- </span>
+ <div id="users-contain" class="ui-widget">
+ <span wicket:id="container">
+ <table class="ui-widget ui-widget-content table-hover" wicket:id="datatable"/>
+ </span>
- <span style="float:right">
- <form wicket:id="PaginatorForm" style="display:inline">
- <label><wicket:message key="displayRows"/></label>
- <select class="text ui-widget-content ui-corner-all" wicket:id="rowsChooser"/>
- </form>
- </span>
- </div>
+ <span style="float:right">
+ <form wicket:id="PaginatorForm" style="display:inline">
+ <label><wicket:message key="displayRows"/></label>
+ <select class="text ui-widget-content ui-corner-all" wicket:id="rowsChooser"/>
+ </form>
+ </span>
+ </div>
- <div wicket:id="editModalWin">[Show modal window for creating/editing password policy]</div>
+ <div wicket:id="editModalWin">[Show modal window for creating/editing password policy]</div>
- <a class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only" wicket:id="createLink">
- <wicket:message key="create"/>
- </a>
+ <a class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only" wicket:id="createLink">
+ <wicket:message key="create"/>
+ </a>
</div>
-
-</wicket:panel>
+ </wicket:panel>
+</html>
Modified: syncope/trunk/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java?rev=1477105&r1=1477104&r2=1477105&view=diff
==============================================================================
--- syncope/trunk/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java (original)
+++ syncope/trunk/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java Mon Apr 29 14:34:24 2013
@@ -18,6 +18,7 @@
*/
package org.apache.syncope.console;
+import org.junit.Ignore;
import org.junit.Test;
public class ConfigurationTestITCase extends AbstractTest {
@@ -83,7 +84,7 @@ public class ConfigurationTestITCase ext
selenium.waitForCondition("selenium.isElementPresent(\"//input[@name='id:textField']\");", "30000");
selenium.type("name=description:textField", "new description");
- selenium.click("//html/body/div[2]/form/div[3]/input[@type='submit']");
+ selenium.click("//div[2]/form/div[3]/input[@type='submit']");
selenium.waitForCondition("selenium.isTextPresent(\"new description\");", "30000");
}