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 2014/07/03 11:29:41 UTC
svn commit: r1607571 - in /syncope/trunk: ./
console/src/main/java/org/apache/syncope/console/pages/
console/src/main/java/org/apache/syncope/console/pages/panels/
console/src/main/java/org/apache/syncope/console/wicket/extensions/markup/html/repeater/...
Author: ilgrosso
Date: Thu Jul 3 09:29:40 2014
New Revision: 1607571
URL: http://svn.apache.org/r1607571
Log:
[SYNCOPE-520] Merge from 1_1_X
Added:
syncope/trunk/console/src/main/webapp/img/actions/reset.png
- copied, changed from r1607404, syncope/branches/1_1_X/console/src/main/webapp/img/actions/reset.png
Modified:
syncope/trunk/ (props changed)
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceDetailsPanel.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/extensions/markup/html/repeater/data/table/ActionResultColumn.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLink.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.java
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage_it.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage_pt_BR.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/ResourceDetailsPanel.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.html
syncope/trunk/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java
syncope/trunk/console/src/test/java/org/apache/syncope/console/ConnInstanceTestITCase.java
syncope/trunk/console/src/test/java/org/apache/syncope/console/ReportTestITCase.java
syncope/trunk/console/src/test/java/org/apache/syncope/console/ResourceTestITCase.java
syncope/trunk/console/src/test/java/org/apache/syncope/console/RoleTestITCase.java
syncope/trunk/console/src/test/java/org/apache/syncope/console/SchemaTestITCase.java
syncope/trunk/console/src/test/java/org/apache/syncope/console/TaskTestITCase.java
syncope/trunk/console/src/test/java/org/apache/syncope/console/UserTestITCase.java
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_1_X:r1607046-1607404
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java?rev=1607571&r1=1607570&r2=1607571&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Resources.java Thu Jul 3 09:29:40 2014
@@ -294,7 +294,28 @@ public class Resources extends BasePage
@Override
public void onClick(final AjaxRequestTarget target) {
+ resourceTO.setUsyncToken(null);
+ resourceTO.setRsyncToken(null);
+ try {
+ resourceRestClient.update(resourceTO);
+ info(getString(Constants.OPERATION_SUCCEEDED));
+ } catch (SyncopeClientException e) {
+ error(getString(Constants.ERROR) + ":" + e.getMessage());
+
+ LOG.error("While resetting sync token from " + resourceTO.getName(), e);
+ }
+ feedbackPanel.refresh(target);
+ target.add(resourceContainer);
+ }
+ }, ActionLink.ActionType.RESET, "Resources");
+
+ panel.add(new ActionLink() {
+
+ private static final long serialVersionUID = -3722207913631435501L;
+
+ @Override
+ public void onClick(final AjaxRequestTarget target) {
editResourceWin.setPageCreator(new ModalWindow.PageCreator() {
private static final long serialVersionUID = -7834632442532690940L;
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceDetailsPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceDetailsPanel.java?rev=1607571&r1=1607570&r2=1607571&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceDetailsPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceDetailsPanel.java Thu Jul 3 09:29:40 2014
@@ -206,23 +206,6 @@ public class ResourceDetailsPanel extend
syncTraceLevel.setChoices(Arrays.asList(TraceLevel.values()));
add(syncTraceLevel);
- final AjaxCheckBoxPanel resetToken = new AjaxCheckBoxPanel("resetToken", new ResourceModel("resetToken",
- "resetToken").getObject(), new Model<Boolean>(null));
-
- resetToken.getField().add(new AjaxFormComponentUpdatingBehavior(Constants.ON_CHANGE) {
-
- private static final long serialVersionUID = -1107858522700306810L;
-
- @Override
- protected void onUpdate(final AjaxRequestTarget art) {
- if (resetToken.getModelObject()) {
- resourceTO.setUsyncToken(null);
- resourceTO.setRsyncToken(null);
- }
- }
- });
- add(resetToken);
-
final IModel<List<ConnInstanceTO>> connectors = new LoadableDetachableModel<List<ConnInstanceTO>>() {
private static final long serialVersionUID = 5275935387613157437L;
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/extensions/markup/html/repeater/data/table/ActionResultColumn.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/extensions/markup/html/repeater/data/table/ActionResultColumn.java?rev=1607571&r1=1607570&r2=1607571&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/extensions/markup/html/repeater/data/table/ActionResultColumn.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/extensions/markup/html/repeater/data/table/ActionResultColumn.java Thu Jul 3 09:29:40 2014
@@ -40,7 +40,7 @@ public class ActionResultColumn<T, S> ex
/**
* Logger.
*/
- protected static final Logger LOG = LoggerFactory.getLogger(ActionResultColumn.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ActionResultColumn.class);
private final BulkActionResult results;
@@ -63,7 +63,7 @@ public class ActionResultColumn<T, S> ex
}
@Override
- public void populateItem(Item<ICellPopulator<T>> item, String componentId, IModel<T> rowModel) {
+ public void populateItem(final Item<ICellPopulator<T>> item, final String componentId, final IModel<T> rowModel) {
try {
final PropertyDescriptor propDesc =
BeanUtils.getPropertyDescriptor(rowModel.getObject().getClass(), idFieldName);
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLink.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLink.java?rev=1607571&r1=1607570&r2=1607571&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLink.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLink.java Thu Jul 3 09:29:40 2014
@@ -33,6 +33,7 @@ public abstract class ActionLink impleme
EDIT("read"),
USER_TEMPLATE("read"),
ROLE_TEMPLATE("read"),
+ RESET("update"),
ENABLE("update"),
SEARCH("read"),
DELETE("delete"),
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.java?rev=1607571&r1=1607570&r2=1607571&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.java Thu Jul 3 09:29:40 2014
@@ -54,6 +54,7 @@ public class ActionLinksPanel extends Pa
super.add(new Fragment("panelManageRoles", "emptyFragment", this));
super.add(new Fragment("panelCreate", "emptyFragment", this));
super.add(new Fragment("panelEdit", "emptyFragment", this));
+ super.add(new Fragment("panelReset", "emptyFragment", this));
super.add(new Fragment("panelUserTemplate", "emptyFragment", this));
super.add(new Fragment("panelRoleTemplate", "emptyFragment", this));
super.add(new Fragment("panelEnable", "emptyFragment", this));
@@ -176,6 +177,20 @@ public class ActionLinksPanel extends Pa
}.feedbackPanelAutomaticReload(link.feedbackPanelAutomaticReload()));
break;
+ case RESET:
+ fragment = new Fragment("panelReset", "fragmentReset", this);
+
+ fragment.addOrReplace(new ClearIndicatingAjaxLink<Void>("resetLink", pageRef) {
+
+ private static final long serialVersionUID = -6957616042924610290L;
+
+ @Override
+ protected void onClickInternal(final AjaxRequestTarget target) {
+ link.onClick(target);
+ }
+ });
+ break;
+
case EDIT:
fragment = new Fragment("panelEdit", "fragmentEdit", this);
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage.properties?rev=1607571&r1=1607570&r2=1607571&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage.properties Thu Jul 3 09:29:40 2014
@@ -50,7 +50,6 @@ deleteTraceLevel=Delete trace level
syncTraceLevel=Synchronization trace level
propagationPriority=Propagation priority
propagationPrimary=Propagation primary
-resetToken=Reset token
success_connection=Successful connection
error_connection=Connection failure
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage_it.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage_it.properties?rev=1607571&r1=1607570&r2=1607571&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage_it.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage_it.properties Thu Jul 3 09:29:40 2014
@@ -50,7 +50,6 @@ deleteTraceLevel=Livello di tracciamento
syncTraceLevel=Livello di tracciamento delle sincronizzazioni
propagationPriority=Priorit\u00e0 in propagazione
propagationPrimary=Primaria in propagazione
-resetToken=Reset token
success_connection=Connessione avvenuta con successo
error_connection=Connessione non riuscita
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage_pt_BR.properties
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage_pt_BR.properties?rev=1607571&r1=1607570&r2=1607571&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage_pt_BR.properties (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage_pt_BR.properties Thu Jul 3 09:29:40 2014
@@ -50,7 +50,6 @@ deleteTraceLevel=Excluir n\u00edvel de t
syncTraceLevel=N\u00edvel de trace de sincroniza\u00e7\u00e3o
propagationPriority=Prioridade de propaga\u00e7\u00e3o
propagationPrimary=Propaga\u00e7\u00e3o prim\u00e1ria
-resetToken=Resetar token
success_connection=Conex\u00e3o com sucesso
error_connection=Conex\u00e3o sem sucesso
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/ResourceDetailsPanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/ResourceDetailsPanel.html?rev=1607571&r1=1607570&r2=1607571&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/ResourceDetailsPanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/ResourceDetailsPanel.html Thu Jul 3 09:29:40 2014
@@ -132,15 +132,6 @@ under the License.
<span wicket:id="syncTraceLevel">[syncTraceLevel]</span>
</div>
</div>
-
- <div class="tablerow alt">
- <div class="tablecolumn_label medium_fixedsize">
- <label for="resetToken"><wicket:message key="resetToken"/></label>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="resetToken">[resetToken]</span>
- </div>
- </div>
</div>
</wicket:panel>
</html>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.html?rev=1607571&r1=1607570&r2=1607571&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/ActionLinksPanel.html Thu Jul 3 09:29:40 2014
@@ -37,6 +37,7 @@ under the License.
<span wicket:id="panelCreate">[plus]</span>
<span wicket:id="panelUserTemplate">[plus]</span>
<span wicket:id="panelRoleTemplate">[plus]</span>
+ <span wicket:id="panelReset">[plus]</span>
<span wicket:id="panelEdit">[plus]</span>
<span wicket:id="panelExport">[plus]</span>
<span wicket:id="panelDelete">[plus]</span>
@@ -69,23 +70,27 @@ under the License.
</wicket:fragment>
<wicket:fragment wicket:id="fragmentCreate">
- <a href="#" wicket:id="createLink"><img id="action" src="img/actions/create.png" alt="create icon" title="Create"/></a>
+ <a href="#" wicket:id="createLink"><img id="action" src="img/actions/create.png" alt="create icon" title="Create"/></a>
</wicket:fragment>
<wicket:fragment wicket:id="fragmentSearch">
- <a href="#" wicket:id="searchLink"><img id="action" src="img/actions/search.png" alt="search icon" title="Search and modify"/></a>
+ <a href="#" wicket:id="searchLink"><img id="action" src="img/actions/search.png" alt="search icon" title="Search and modify"/></a>
</wicket:fragment>
<wicket:fragment wicket:id="fragmentEnable">
- <a href="#" wicket:id="enableLink"><img id="action" src="img/actions/enable.png" alt="enable icon" title="Enable / Disable"/></a>
+ <a href="#" wicket:id="enableLink"><img id="action" src="img/actions/enable.png" alt="enable icon" title="Enable / Disable"/></a>
</wicket:fragment>
<wicket:fragment wicket:id="fragmentEdit">
- <a href="#" wicket:id="editLink"><img id="action" src="img/actions/edit.png" alt="edit icon" title="Edit"/></a>
+ <a href="#" wicket:id="editLink"><img id="action" src="img/actions/edit.png" alt="edit icon" title="Edit"/></a>
+ </wicket:fragment>
+
+ <wicket:fragment wicket:id="fragmentReset">
+ <a href="#" wicket:id="resetLink"><img id="action" src="img/actions/reset.png" alt="reset icon" title="Reset sync token"/></a>
</wicket:fragment>
<wicket:fragment wicket:id="fragmentUserTemplate">
- <a href="#" wicket:id="userTemplateLink"><img id="action" src="img/actions/user_template.png" alt="user template icon" title="Specify user template"/></a>
+ <a href="#" wicket:id="userTemplateLink"><img id="action" src="img/actions/user_template.png" alt="user template icon" title="Specify user template"/></a>
</wicket:fragment>
<wicket:fragment wicket:id="fragmentRoleTemplate">
@@ -93,39 +98,39 @@ under the License.
</wicket:fragment>
<wicket:fragment wicket:id="fragmentDelete">
- <a href="#" wicket:id="deleteLink"><img id="action" src="img/actions/delete.png" alt="delete icon" title="Delete"/></a>
+ <a href="#" wicket:id="deleteLink"><img id="action" src="img/actions/delete.png" alt="delete icon" title="Delete"/></a>
</wicket:fragment>
<wicket:fragment wicket:id="fragmentDryRun">
- <a href="#" wicket:id="dryRunLink"><img id="action" src="img/actions/dryrun.png" alt="dryrun icon" title="DryRun"/></a>
+ <a href="#" wicket:id="dryRunLink"><img id="action" src="img/actions/dryrun.png" alt="dryrun icon" title="DryRun"/></a>
</wicket:fragment>
<wicket:fragment wicket:id="fragmentExecute">
- <a href="#" wicket:id="executeLink"><img id="action" src="img/actions/execute.png" alt="execute icon" title="Execute"/></a>
+ <a href="#" wicket:id="executeLink"><img id="action" src="img/actions/execute.png" alt="execute icon" title="Execute"/></a>
</wicket:fragment>
<wicket:fragment wicket:id="fragmentSelect">
- <a href="#" wicket:id="selectLink"><img id="action" src="img/actions/select.png" alt="select icon" title="Select"/></a>
+ <a href="#" wicket:id="selectLink"><img id="action" src="img/actions/select.png" alt="select icon" title="Select"/></a>
</wicket:fragment>
<wicket:fragment wicket:id="fragmentExport">
- <a href="#" wicket:id="exportLink"><img id="action" src="img/actions/export.png" alt="export icon" title="Export"/></a>
+ <a href="#" wicket:id="exportLink"><img id="action" src="img/actions/export.png" alt="export icon" title="Export"/></a>
</wicket:fragment>
<wicket:fragment wicket:id="fragmentSuspend">
- <a href="#" wicket:id="suspendLink"><img id="action" src="img/actions/suspend.png" alt="suspend icon" title="Suspend"/></a>
+ <a href="#" wicket:id="suspendLink"><img id="action" src="img/actions/suspend.png" alt="suspend icon" title="Suspend"/></a>
</wicket:fragment>
<wicket:fragment wicket:id="fragmentReactivate">
- <a href="#" wicket:id="reactivateLink"><img id="action" src="img/actions/reactivate.png" alt="reactivate icon" title="Reactivate"/></a>
+ <a href="#" wicket:id="reactivateLink"><img id="action" src="img/actions/reactivate.png" alt="reactivate icon" title="Reactivate"/></a>
</wicket:fragment>
<wicket:fragment wicket:id="fragmentReload">
- <a href="#" wicket:id="reloadLink"><img id="action" src="img/actions/reload.png" alt="reload icon" title="Reload"/></a>
+ <a href="#" wicket:id="reloadLink"><img id="action" src="img/actions/reload.png" alt="reload icon" title="Reload"/></a>
</wicket:fragment>
<wicket:fragment wicket:id="fragmentChangeView">
- <a href="#" wicket:id="changeViewLink"><img id="action" src="img/actions/settings-icon.png" alt="Change view icon" title="Change view"/></a>
+ <a href="#" wicket:id="changeViewLink"><img id="action" src="img/actions/settings-icon.png" alt="Change view icon" title="Change view"/></a>
</wicket:fragment>
<wicket:fragment wicket:id="fragmentUnlink">
Copied: syncope/trunk/console/src/main/webapp/img/actions/reset.png (from r1607404, syncope/branches/1_1_X/console/src/main/webapp/img/actions/reset.png)
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/webapp/img/actions/reset.png?p2=syncope/trunk/console/src/main/webapp/img/actions/reset.png&p1=syncope/branches/1_1_X/console/src/main/webapp/img/actions/reset.png&r1=1607404&r2=1607571&rev=1607571&view=diff
==============================================================================
Binary files - no diff available.
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=1607571&r1=1607570&r2=1607571&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 Thu Jul 3 09:29:40 2014
@@ -41,6 +41,7 @@ public class ConfigurationTestITCase ext
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");", "30000");
selenium.click("//div[@id='tabs']/ul/li[2]/a");
+ selenium.click("//div[@id='policies']/ul/li[2]/a");
selenium.click("//div[@id='password']/span/div/a");
selenium.waitForCondition("selenium.isElementPresent(\"//input[@name='id:textField']\");", "30000");
Modified: syncope/trunk/console/src/test/java/org/apache/syncope/console/ConnInstanceTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/test/java/org/apache/syncope/console/ConnInstanceTestITCase.java?rev=1607571&r1=1607570&r2=1607571&view=diff
==============================================================================
--- syncope/trunk/console/src/test/java/org/apache/syncope/console/ConnInstanceTestITCase.java (original)
+++ syncope/trunk/console/src/test/java/org/apache/syncope/console/ConnInstanceTestITCase.java Thu Jul 3 09:29:40 2014
@@ -63,7 +63,7 @@ public class ConnInstanceTestITCase exte
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");", "30000");
selenium.click("//div[3]/ul/li[2]/a");
- selenium.click("//tr[4]/td[7]/div/span[12]/a");
+ selenium.click("//tr[4]/td[7]/div/span[13]/a");
selenium.waitForCondition(
"selenium.isElementPresent(\"//div[2]/form/div[2]/div/div/div[3]/div[2]/span/select\");", "30000");
@@ -90,7 +90,7 @@ public class ConnInstanceTestITCase exte
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");", "30000");
selenium.click("//div[3]/ul/li[2]/a");
- selenium.click("//tr[4]/td[7]/div/span[14]/a");
+ selenium.click("//tr[4]/td[7]/div/span[15]/a");
assertTrue(selenium.getConfirmation().equals("Do you really want to delete the selected item(s)?"));
@@ -104,7 +104,7 @@ public class ConnInstanceTestITCase exte
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");", "30000");
selenium.click("//div[3]/ul/li[2]/a");
- selenium.click("//tr[2]/td[7]/div/span[12]/a");
+ selenium.click("//tr[2]/td[7]/div/span[13]/a");
selenium.waitForCondition(
"selenium.isElementPresent(\"//select[@name='version:dropDownChoiceField']\");", "30000");
@@ -164,7 +164,7 @@ public class ConnInstanceTestITCase exte
selenium.waitForCondition(
"selenium.isElementPresent(\"//div[2]/form/div[2]/div/div/div[3]/div[2]/span/select\");", "30000");
- selenium.waitForCondition("selenium.isElementPresent(\"//input[@value='99']\");","3000");
+ selenium.waitForCondition("selenium.isElementPresent(\"//input[@value='99']\");", "3000");
selenium.click("//div[2]/form/div[2]/ul/li[2]/a/span");
Modified: syncope/trunk/console/src/test/java/org/apache/syncope/console/ReportTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/test/java/org/apache/syncope/console/ReportTestITCase.java?rev=1607571&r1=1607570&r2=1607571&view=diff
==============================================================================
--- syncope/trunk/console/src/test/java/org/apache/syncope/console/ReportTestITCase.java (original)
+++ syncope/trunk/console/src/test/java/org/apache/syncope/console/ReportTestITCase.java Thu Jul 3 09:29:40 2014
@@ -27,7 +27,7 @@ public class ReportTestITCase extends Ab
selenium.click("css=img[alt=\"Reports\"]");
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");", "30000");
- selenium.click("//table/tbody/tr/td[8]/div/span[12]/a");
+ selenium.click("//table/tbody/tr/td[8]/div/span[13]/a");
selenium.waitForCondition("selenium.isElementPresent(\"//iframe\");", "30000");
selenium.selectFrame("index=0");
Modified: syncope/trunk/console/src/test/java/org/apache/syncope/console/ResourceTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/test/java/org/apache/syncope/console/ResourceTestITCase.java?rev=1607571&r1=1607570&r2=1607571&view=diff
==============================================================================
--- syncope/trunk/console/src/test/java/org/apache/syncope/console/ResourceTestITCase.java (original)
+++ syncope/trunk/console/src/test/java/org/apache/syncope/console/ResourceTestITCase.java Thu Jul 3 09:29:40 2014
@@ -42,8 +42,8 @@ public class ResourceTestITCase extends
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");", "30000");
- selenium.click("//td[6]/div/span[12]/a");
-
+ selenium.click("//td[6]/div/span[13]/a");
+
selenium.waitForCondition("selenium.isElementPresent(" + "\"class=wicket_modal\");", "30000");
selenium.waitForFrameToLoad("class=wicket_modal", "30000");
selenium.selectFrame("index=0");
@@ -69,7 +69,7 @@ public class ResourceTestITCase extends
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");", "30000");
- selenium.click("//tr[3]/td[6]/div/span[14]/a");
+ selenium.click("//tr[3]/td[6]/div/span[15]/a");
assertTrue(selenium.getConfirmation().equals("Do you really want to delete the selected item(s)?"));
}
@@ -80,14 +80,14 @@ public class ResourceTestITCase extends
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");", "30000");
- selenium.click("//td[6]/div/span[12]/a");
+ selenium.click("//td[6]/div/span[13]/a");
selenium.waitForCondition("selenium.isElementPresent("
+ "\"//form/div[3]/div/span/div/div/div/label[text()='Name']\");", "30000");
selenium.waitForCondition("selenium.isElementPresent(\"//iframe\");", "30000");
selenium.selectFrame("index=0");
-
+
selenium.click("//li[4]/a");
assertTrue(selenium.isElementPresent("//label[@for='passwordPolicy']"));
@@ -107,14 +107,14 @@ public class ResourceTestITCase extends
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");", "30000");
- selenium.click("//*[@id=\"users-contain\"]//*[div=\"ws-target-resource-delete\"]/../td[6]/div/span[12]/a");
+ selenium.click("//*[@id=\"users-contain\"]//*[div=\"ws-target-resource-delete\"]/../td[6]/div/span[13]/a");
selenium.waitForCondition("selenium.isElementPresent("
+ "\"//form/div[3]/div/span/div/div/div/label[text()='Name']\");", "30000");
selenium.waitForCondition("selenium.isElementPresent(\"//iframe\");", "30000");
selenium.selectFrame("index=0");
-
+
selenium.click("//li[4]/a");
selenium.waitForCondition("selenium.isElementPresent(" + "\"//span[text()='endpoint']\");", "30000");
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=1607571&r1=1607570&r2=1607571&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 Jul 3 09:29:40 2014
@@ -132,9 +132,9 @@ public class RoleTestITCase extends Abst
selenium.click("//input[@name=\"userListContainer:search\"]");
- selenium.waitForCondition("selenium.isElementPresent(\"//table/tbody/tr/td[5]/div/span[12]/a\");", "30000");
+ selenium.waitForCondition("selenium.isElementPresent(\"//table/tbody/tr/td[5]/div/span[13]/a\");", "30000");
- selenium.click("//table/tbody/tr/td[5]/div/span[12]/a");
+ selenium.click("//table/tbody/tr/td[5]/div/span[13]/a");
selenium.waitForCondition("selenium.isElementPresent("
+ "\"//form/div[3]/div/span/div/div/div[contains(text(),'Username')]\");", "30000");
@@ -158,7 +158,7 @@ public class RoleTestITCase extends Abst
selenium.click("//input[@name=\"userListContainer:search\"]");
- selenium.waitForCondition("selenium.isElementPresent(\"//span[14]/a\");", "30000");
+ selenium.waitForCondition("selenium.isElementPresent(\"//span[15]/a\");", "30000");
}
@Test
Modified: syncope/trunk/console/src/test/java/org/apache/syncope/console/SchemaTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/test/java/org/apache/syncope/console/SchemaTestITCase.java?rev=1607571&r1=1607570&r2=1607571&view=diff
==============================================================================
--- syncope/trunk/console/src/test/java/org/apache/syncope/console/SchemaTestITCase.java (original)
+++ syncope/trunk/console/src/test/java/org/apache/syncope/console/SchemaTestITCase.java Thu Jul 3 09:29:40 2014
@@ -52,7 +52,7 @@ public class SchemaTestITCase extends Ab
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");", "30000");
- selenium.click("//div[3]/div/div/div/div/div/span/table/tbody/tr/td[7]/div/span[14]/a");
+ selenium.click("//div[3]/div/div/div/div/div/span/table/tbody/tr/td[7]/div/span[15]/a");
assertTrue(selenium.getConfirmation().equals("Do you really want to delete the selected item(s)?"));
}
Modified: syncope/trunk/console/src/test/java/org/apache/syncope/console/TaskTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/test/java/org/apache/syncope/console/TaskTestITCase.java?rev=1607571&r1=1607570&r2=1607571&view=diff
==============================================================================
--- syncope/trunk/console/src/test/java/org/apache/syncope/console/TaskTestITCase.java (original)
+++ syncope/trunk/console/src/test/java/org/apache/syncope/console/TaskTestITCase.java Thu Jul 3 09:29:40 2014
@@ -38,9 +38,9 @@ public class TaskTestITCase extends Abst
selenium.waitForCondition("selenium.isTextPresent(\"Operation executed successfully\");", "30000");
selenium.waitForCondition("selenium.isElementPresent("
- + "\"//tr[4]/td[10]/div/span[12]/a/img\");", "30000");
+ + "\"//tr[4]/td[10]/div/span[13]/a/img\");", "30000");
- selenium.click("//tr[4]/td[10]/div/span[12]/a/img");
+ selenium.click("//tr[4]/td[10]/div/span[13]/a/img");
selenium.waitForCondition("selenium.isElementPresent(\"//iframe\");", "30000");
selenium.selectFrame("index=0");
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=1607571&r1=1607570&r2=1607571&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 Jul 3 09:29:40 2014
@@ -56,7 +56,7 @@ public class UserTestITCase extends Abst
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");", "30000");
//Edit vivaldi
- selenium.click("//*[@id=\"users-contain\"]//*[div=3]/../td[5]/div/span[12]/a");
+ selenium.click("//*[@id=\"users-contain\"]//*[div=3]/../td[5]/div/span[13]/a");
selenium.waitForCondition("selenium.isElementPresent(\"//iframe\");", "30000");
selenium.selectFrame("index=0");
@@ -99,7 +99,7 @@ public class UserTestITCase extends Abst
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");", "30000");
- selenium.click("//*[@id=\"users-contain\"]//*[div=4]/../td[5]/div/span[14]/a");
+ selenium.click("//*[@id=\"users-contain\"]//*[div=4]/../td[5]/div/span[15]/a");
assertTrue(selenium.getConfirmation().equals("Do you really want to delete the selected item(s)?"));
@@ -133,7 +133,7 @@ public class UserTestITCase extends Abst
selenium.click("//div[@class='navigator']/div/span/a");
selenium.waitForCondition("selenium.isElementPresent(" + "\"//td[div='ws-target-resource-1']\");", "30000");
-
+
seleniumDriver.switchTo().defaultContent();
selenium.click("css=a.w_close");
@@ -141,12 +141,12 @@ public class UserTestITCase extends Abst
@Test
@SuppressWarnings("SleepWhileHoldingLock")
- public void issueSyncope495() {
+ public void issueSYNCOPE495() {
selenium.click("css=img[alt=\"Users\"]");
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");", "30000");
- selenium.click("//*[@id=\"users-contain\"]//*[div=3]/../td[5]/div/span[12]/a");
+ selenium.click("//*[@id=\"users-contain\"]//*[div=3]/../td[5]/div/span[13]/a");
selenium.waitForCondition("selenium.isElementPresent(\"//iframe\");", "30000");
selenium.selectFrame("index=0");