svn commit: r1449759 - in /syncope/trunk: console/src/test/java/org/apache/syncope/console/ core/src/test/java/org/apache/syncope/core/rest/
Author: fmartelli
Date: Mon Feb 25 16:02:48 2013
New Revision: 1449759
URL: http://svn.apache.org/r1449759
Log:
SYNCOPE-265 fixes some selenium tests
Modified:
syncope/trunk/console/src/test/java/org/apache/syncope/console/EditProfileTestITCase.java
syncope/trunk/console/src/test/java/org/apache/syncope/console/UserTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
Modified:
syncope/trunk/console/src/test/java/org/apache/syncope/console/EditProfileTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/test/java/org/apache/syncope/console/EditProfileTestITCase.java?rev=1449759&r1=1449758&r2=1449759&view=diff
==
---
syncope/trunk/console/src/test/java/org/apache/syncope/console/EditProfileTestITCase.java
(original)
+++
syncope/trunk/console/src/test/java/org/apache/syncope/console/EditProfileTestITCase.java
Mon Feb 25 16:02:48 2013
@@ -40,7 +40,7 @@ public class EditProfileTestITCase exten
selenium.click("css=a.w_close");
// only to have some "Logout" availabe for @After
-selenium.type("name=userId", "user1");
+selenium.type("name=userId", "rossini");
selenium.type("name=password", "password");
selenium.click("name=:submit");
@@ -50,7 +50,7 @@ public class EditProfileTestITCase exten
@Test
public void editUserProfile() {
selenium.open("/syncope-console/");
-selenium.type("name=userId", "user1");
+selenium.type("name=userId", "rossini");
selenium.type("name=password", "password");
selenium.click("name=:submit");
selenium.waitForPageToLoad("3");
@@ -61,7 +61,7 @@ public class EditProfileTestITCase exten
selenium.click("//div/ul/li[10]/div/div/a/span");
selenium.waitForCondition("selenium.isElementPresent(\"//span[contains(text(),'Attributes')]\");",
"3");
-
selenium.waitForCondition("selenium.isElementPresent(\"//input[@value='user1']\");",
"3");
+
selenium.waitForCondition("selenium.isElementPresent(\"//input[@value='rossini']\");",
"3");
selenium.click("css=a.w_close");
}
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=1449759&r1=1449758&r2=1449759&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
Mon Feb 25 16:02:48 2013
@@ -49,12 +49,12 @@ public class UserTestITCase extends Abst
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");",
"3");
-//Edit user3
+//Edit vivaldi
selenium.click("//*[@id=\"users-contain\"]//*[div=3]/../td[4]/div/span[9]/a");
-selenium.waitForCondition("selenium.isElementPresent(" +
"\"//input[@value='testUsername']\");", "3");
+selenium.waitForCondition("selenium.isElementPresent(" +
"\"//input[@value='Antonio Vivaldi']\");", "3");
-selenium.waitForCondition("selenium.isElementPresent(" +
"\"//input[@value='Doe']\");", "3");
+selenium.waitForCondition("selenium.isElementPresent(" +
"\"//input[@value='Vivaldi']\");", "3");
selenium.click("//div[@id='tabs']/ul/li[2]/a/span");
selenium.click("//div[@id='tabs']/ul/li[3]/a/span");
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java?rev=1449759&r1=1449758&r2=1449759&view=diff
==
---
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java
(original)
+++
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java
Mon Feb 25 16:02:48 2013
@@ -296,7 +296,7 @@ public class RoleTestITCase extends Abst
roleMod.setId(roleTO.getId());
roleMod.setName("Managing Director");
-// 3. try to update as user3, not owner of role 7 - fail
+// 3. try to update as verdi, not owner of role 7 - fail
RoleService roleService2 = setupCredentials(roleService,
RoleService.class, "verdi", ADMIN_PWD);
try {
@@ -308,7 +308,7 @@ public class RoleTestITCase extends Abst
assertNotNull(e);
}
-// 4. update as user5, owner of role 7 because owner of role 6 with
+// 4. update as puccini, owner of role 7 because owner of role 6 with
svn commit: r1449752 - in /syncope/trunk/core/src/test: java/org/apache/syncope/core/persistence/dao/ java/org/apache/syncope/core/persistence/relationships/ java/org/apache/syncope/core/rest/ resourc
Author: fmartelli
Date: Mon Feb 25 15:37:34 2013
New Revision: 1449752
URL: http://svn.apache.org/r1449752
Log:
SYNCOPE-265 added more user info
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/AttrTest.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/AttributableSearchTest.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/DerAttrTest.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/UserTest.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/relationships/AttrTest.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/AuthenticationTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/RoleTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/SearchTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/TaskTestITCase.java
syncope/trunk/core/src/test/java/org/apache/syncope/core/rest/UserTestITCase.java
syncope/trunk/core/src/test/resources/content.xml
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/AttrTest.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/AttrTest.java?rev=1449752&r1=1449751&r2=1449752&view=diff
==
---
syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/AttrTest.java
(original)
+++
syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/AttrTest.java
Mon Feb 25 15:37:34 2013
@@ -54,14 +54,14 @@ public class AttrTest extends AbstractDA
@Test
public void findAll() {
List list = attrDAO.findAll(UAttr.class);
-assertEquals("did not get expected number of attributes ", 9,
list.size());
+assertEquals("did not get expected number of attributes ", 24,
list.size());
}
@Test
public void findById() {
UAttr attribute = attrDAO.find(100L, UAttr.class);
assertNotNull("did not find expected attribute schema", attribute);
-attribute = attrDAO.find(200L, UAttr.class);
+attribute = attrDAO.find(104L, UAttr.class);
assertNotNull("did not find expected attribute schema", attribute);
}
@@ -190,7 +190,7 @@ public class AttrTest extends AbstractDA
@Test
public void delete() {
-UAttr attribute = attrDAO.find(200L, UAttr.class);
+UAttr attribute = attrDAO.find(104L, UAttr.class);
String attrSchemaName = attribute.getSchema().getName();
attrDAO.delete(attribute.getId(), UAttr.class);
Modified:
syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/AttributableSearchTest.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/AttributableSearchTest.java?rev=1449752&r1=1449751&r2=1449752&view=diff
==
---
syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/AttributableSearchTest.java
(original)
+++
syncope/trunk/core/src/test/java/org/apache/syncope/core/persistence/dao/AttributableSearchTest.java
Mon Feb 25 15:37:34 2013
@@ -123,7 +123,7 @@ public class AttributableSearchTest {
public void searchWithNotCondition() {
final AttributeCond fullnameLeafCond = new
AttributeCond(AttributeCond.Type.EQ);
fullnameLeafCond.setSchema("fullname");
-fullnameLeafCond.setExpression("fabio.martelli");
+fullnameLeafCond.setExpression("Giuseppe Verdi");
final NodeCond cond = NodeCond.getNotLeafCond(fullnameLeafCond);
assertTrue(cond.isValid());
@@ -131,7 +131,7 @@ public class AttributableSearchTest {
final List users =
searchDAO.search(EntitlementUtil.getRoleIds(entitlementDAO.findAll()), cond,
AttributableUtil.getInstance(AttributableType.USER));
assertNotNull(users);
-assertEquals(2, users.size());
+assertEquals(4, users.size());
Set ids = new HashSet(2);
ids.add(users.get(0).getId());
@@ -256,7 +256,7 @@ public class AttributableSearchTest {
public void searchByUsernameAndId() {
final AttributableCond usernameLeafCond = new
AttributableCond(AttributableCond.Type.EQ);
usernameLeafCond.setSchema("username");
-usernameLeafCond.setExpression("user1");
+usernameLeafCond.setExpression("rossini");
final AttributableCond idRightCond = new
AttributableCond(AttributableCond.Type.LT);
idRightCond.setSchema("id");
@@ -270,7 +270,7 @@ public class AttributableSearchTest {
assertNotNull(matchingUsers);
assertEquals(1, matchingUsers.size());
-assertEquals("user1", matchingUsers.iterator().next().getUsername());
svn commit: r1449707 - in /syncope/trunk/console/src/test/java/org/apache/syncope/console: ConfigurationTestITCase.java ResourceTestITCase.java RoleTestITCase.java
Author: fmartelli
Date: Mon Feb 25 13:56:00 2013
New Revision: 1449707
URL: http://svn.apache.org/r1449707
Log:
SYNCOPE-309 fixes selenium tests
Modified:
syncope/trunk/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.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
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=1449707&r1=1449706&r2=1449707&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 Feb 25 13:56:00 2013
@@ -134,24 +134,24 @@ public class ConfigurationTestITCase ext
selenium.click("//a[contains(text(),'Create new notification')]");
selenium.waitForCondition("selenium.isElementPresent("
-+ "\"//div[2]/form/div[2]/div/div/div/div/label\");", "3");
++ "\"//div[2]/form/div[3]/div/div/div/div/label\");", "3");
selenium.type("name=sender:textField", "t...@syncope.it");
selenium.type("name=sender:textField", "t...@syncope.it");
-
selenium.select("//div[2]/form/div[2]/div/div/div[3]/div[2]/span/select",
"label=UserSchema");
+
selenium.select("//div[2]/form/div[3]/div/div/div[3]/div[2]/span/select",
"label=UserSchema");
selenium.waitForCondition("selenium.isElementPresent("
-+
"\"//div[2]/form/div[2]/div/div/div[4]/div[2]/span/select/option[2]\");",
"3");
++
"\"//div[2]/form/div[3]/div/div/div[4]/div[2]/span/select/option[2]\");",
"3");
-
selenium.select("//div[2]/form/div[2]/div/div/div[4]/div[2]/span/select",
"label=fullname");
+
selenium.select("//div[2]/form/div[3]/div/div/div[4]/div[2]/span/select",
"label=fullname");
-
selenium.select("//div[2]/form/div[2]/div/div/div[5]/div[2]/span/select",
"label=optin");
+
selenium.select("//div[2]/form/div[3]/div/div/div[5]/div[2]/span/select",
"label=optin");
-
selenium.select("//div[2]/form/div[2]/div/div/div[6]/div[2]/span/select",
"label=ALL");
+
selenium.select("//div[2]/form/div[3]/div/div/div[6]/div[2]/span/select",
"label=ALL");
-selenium.click("//div[2]/form/div[2]/ul/li[2]/a/span");
+selenium.click("//div[2]/form/div[3]/ul/li[2]/a/span");
selenium.select("//td[3]/select", "label=MEMBERSHIP");
@@ -159,18 +159,18 @@ public class ConfigurationTestITCase ext
selenium.select("//td[4]/select", "label=8 otherchild");
-selenium.click("//div[2]/form/div[2]/ul/li[3]/a/span");
+selenium.click("//div[2]/form/div[3]/ul/li[3]/a/span");
-
selenium.click("//div[2]/form/div[2]/div[3]/span/span/div/div[2]/div/select/option");
+
selenium.click("//div[2]/form/div[3]/div[3]/span/span/div/div[2]/div/select/option");
-
selenium.click("//div[2]/form/div[2]/div[3]/span/span/div/div[2]/div[2]/div/a");
+
selenium.click("//div[2]/form/div[3]/div[3]/span/span/div/div[2]/div[2]/div/a");
-selenium.click("//div[2]/form/div[2]/ul/li[4]/a/span");
+selenium.click("//div[2]/form/div[3]/ul/li[4]/a/span");
selenium.waitForCondition("selenium.isElementPresent("
-+ "\"//div[2]/form/div[2]/div[4]/div/div[2]/label\");",
"3");
++ "\"//div[2]/form/div[3]/div[4]/div/div[2]/label\");",
"3");
-selenium.click("//div[2]/form/div[3]/input");
+selenium.click("//div[2]/form/div[4]/input");
}
@Test
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=1449707&r1=1449706&r2=1449707&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
Mon Feb 25 13:56:00 2013
@@ -31,7 +31,7 @@ public class ResourceTestITCase extends
selenium.click("//div[3]/div/a");
selenium.waitForCondition("selenium.isElementPresent("
-+
"\"//form/div[2]/div/span/div/div/div/label[text()='Name']\");", "3");
++
"\"//form/div[3]/div/span/div/div/div/label[text()='Name']\");", "3");
selenium.click("css=a.w_close");
}
@@ -45,7 +45,7 @@ public class ResourceTestITCase exte
svn commit: r1449706 - in /syncope/branches/1_0_X/console/src/test/java/org/apache/syncope/console: ConfigurationTestITCase.java ResourceTestITCase.java RoleTestITCase.java
Author: fmartelli
Date: Mon Feb 25 13:55:53 2013
New Revision: 1449706
URL: http://svn.apache.org/r1449706
Log:
SYNCOPE-309 fixes selenium tests
Modified:
syncope/branches/1_0_X/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java
syncope/branches/1_0_X/console/src/test/java/org/apache/syncope/console/ResourceTestITCase.java
syncope/branches/1_0_X/console/src/test/java/org/apache/syncope/console/RoleTestITCase.java
Modified:
syncope/branches/1_0_X/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java?rev=1449706&r1=1449705&r2=1449706&view=diff
==
---
syncope/branches/1_0_X/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java
(original)
+++
syncope/branches/1_0_X/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java
Mon Feb 25 13:55:53 2013
@@ -134,24 +134,24 @@ public class ConfigurationTestITCase ext
selenium.click("//a[contains(text(),'Create new notification')]");
selenium.waitForCondition("selenium.isElementPresent("
-+ "\"//div[2]/form/div[2]/div/div/div/div/label\");", "3");
++ "\"//div[2]/form/div[3]/div/div/div/div/label\");", "3");
selenium.type("name=sender:textField", "t...@syncope.it");
selenium.type("name=sender:textField", "t...@syncope.it");
-
selenium.select("//div[2]/form/div[2]/div/div/div[3]/div[2]/span/select",
"label=UserSchema");
+
selenium.select("//div[2]/form/div[3]/div/div/div[3]/div[2]/span/select",
"label=UserSchema");
selenium.waitForCondition("selenium.isElementPresent("
-+
"\"//div[2]/form/div[2]/div/div/div[4]/div[2]/span/select/option[2]\");",
"3");
++
"\"//div[2]/form/div[3]/div/div/div[4]/div[2]/span/select/option[2]\");",
"3");
-
selenium.select("//div[2]/form/div[2]/div/div/div[4]/div[2]/span/select",
"label=fullname");
+
selenium.select("//div[2]/form/div[3]/div/div/div[4]/div[2]/span/select",
"label=fullname");
-
selenium.select("//div[2]/form/div[2]/div/div/div[5]/div[2]/span/select",
"label=optin");
+
selenium.select("//div[2]/form/div[3]/div/div/div[5]/div[2]/span/select",
"label=optin");
-
selenium.select("//div[2]/form/div[2]/div/div/div[6]/div[2]/span/select",
"label=ALL");
+
selenium.select("//div[2]/form/div[3]/div/div/div[6]/div[2]/span/select",
"label=ALL");
-selenium.click("//div[2]/form/div[2]/ul/li[2]/a/span");
+selenium.click("//div[2]/form/div[3]/ul/li[2]/a/span");
selenium.select("//td[3]/select", "label=MEMBERSHIP");
@@ -159,17 +159,17 @@ public class ConfigurationTestITCase ext
selenium.select("//td[4]/select", "label=8 otherchild");
-selenium.click("//div[2]/form/div[2]/ul/li[3]/a/span");
+selenium.click("//div[2]/form/div[3]/ul/li[3]/a/span");
-
selenium.click("//div[2]/form/div[2]/div[3]/span/span/div/div[2]/div/select/option");
+
selenium.click("//div[2]/form/div[3]/div[3]/span/span/div/div[2]/div/select/option");
-
selenium.click("//div[2]/form/div[2]/div[3]/span/span/div/div[2]/div[2]/div/a");
+
selenium.click("//div[2]/form/div[3]/div[3]/span/span/div/div[2]/div[2]/div/a");
-selenium.click("//div[2]/form/div[2]/ul/li[4]/a/span");
+selenium.click("//div[2]/form/div[3]/ul/li[4]/a/span");
selenium.waitForCondition("selenium.isElementPresent("
-+ "\"//div[2]/form/div[2]/div[4]/div/div[2]/label\");",
"3");
++ "\"//div[2]/form/div[3]/div[4]/div/div[2]/label\");",
"3");
-selenium.click("//div[2]/form/div[3]/input");
+selenium.click("//div[2]/form/div[4]/input");
}
}
Modified:
syncope/branches/1_0_X/console/src/test/java/org/apache/syncope/console/ResourceTestITCase.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/test/java/org/apache/syncope/console/ResourceTestITCase.java?rev=1449706&r1=1449705&r2=1449706&view=diff
==
---
syncope/branches/1_0_X/console/src/test/java/org/apache/syncope/console/ResourceTestITCase.java
(original)
+++
syncope/branches/1_0_X/console/src/test/java/org/apache/syncope/console/ResourceTestITCase.java
Mon Feb 25 13:55:53 2013
@@ -31,7 +31,7 @@ public class ResourceTestITCase extends
selenium.click("//div[3]/div/a");
selenium.waitForCondition("selenium.isElementPresent("
-+
"\"//form/div[2]/div/span/div/div/div/label[text()='Name']\");", "3");
++
"\"//form/div[3]/div/span/div/div/div/label[text()='Name']\");", "3");
selen
svn commit: r1449673 - in /syncope/trunk/console/src/main/java/org/apache/syncope/console/pages: NotificationModalPage.java ResourceModalPage.java RoleModalPage.java UserModalPage.java Users.java
Author: fmartelli
Date: Mon Feb 25 12:02:57 2013
New Revision: 1449673
URL: http://svn.apache.org/r1449673
Log:
SYNCOPE-309 merged from the branch 1_0_X
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Users.java
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java?rev=1449673&r1=1449672&r2=1449673&view=diff
==
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java
Mon Feb 25 12:02:57 2013
@@ -247,6 +247,8 @@ class NotificationModalPage extends Base
MetaDataRoleAuthorizationStrategy.authorize(submit, ENABLE,
allowedRoles);
form.add(submit);
+form.setDefaultButton(submit);
+
form.add(cancel);
add(form);
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java?rev=1449673&r1=1449672&r2=1449673&view=diff
==
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java
Mon Feb 25 12:02:57 2013
@@ -155,6 +155,7 @@ public class ResourceModalPage extends B
};
form.add(submit);
+form.setDefaultButton(submit);
final AjaxButton cancel = new IndicatingAjaxButton("cancel", new
ResourceModel("cancel")) {
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java?rev=1449673&r1=1449672&r2=1449673&view=diff
==
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java
Mon Feb 25 12:02:57 2013
@@ -139,6 +139,8 @@ public class RoleModalPage extends BaseM
: "update"));
form.add(submit);
+form.setDefaultButton(submit);
+
form.add(cancel);
add(form);
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java?rev=1449673&r1=1449672&r2=1449673&view=diff
==
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java
Mon Feb 25 12:02:57 2013
@@ -154,6 +154,7 @@ public abstract class UserModalPage exte
fragment.add(form);
form.add(submit);
+form.setDefaultButton(submit);
final AjaxButton cancel = new AjaxButton("cancel", new
ResourceModel("cancel")) {
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Users.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Users.java?rev=1449673&r1=1449672&r2=1449673&view=diff
==
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Users.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/Users.java
Mon Feb 25 12:02:57 2013
@@ -101,27 +101,31 @@ public class Users extends BasePage {
final UserSearchPanel searchPanel = new UserSearchPanel("searchPanel");
searchForm.add(searchPanel);
-searchForm.add(new ClearIndicatingAjaxButton("search", new
ResourceModel("search"), getPageReference()) {
+final ClearIndicatingAjaxButton searchButton =
+new ClearIndicatingAjaxButton("search", new
ResourceModel("search"), getPageReference()) {
-private static final long
svn commit: r1449668 - in /syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages: NotificationModalPage.java ResourceModalPage.java RoleModalPage.java UserModalPage.java Users.
Author: fmartelli
Date: Mon Feb 25 11:49:50 2013
New Revision: 1449668
URL: http://svn.apache.org/r1449668
Log:
SYNCOPE-309 Fixed on the branch
Modified:
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/Users.java
Modified:
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java?rev=1449668&r1=1449667&r2=1449668&view=diff
==
---
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java
(original)
+++
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/NotificationModalPage.java
Mon Feb 25 11:49:50 2013
@@ -236,6 +236,7 @@ class NotificationModalPage extends Base
MetaDataRoleAuthorizationStrategy.authorize(submit, ENABLE,
allowedRoles);
form.add(submit);
+form.setDefaultButton(submit);
add(form);
}
Modified:
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java?rev=1449668&r1=1449667&r2=1449668&view=diff
==
---
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java
(original)
+++
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/ResourceModalPage.java
Mon Feb 25 11:49:50 2013
@@ -136,6 +136,8 @@ public class ResourceModalPage extends B
};
form.add(submit);
+form.setDefaultButton(submit);
+
add(form);
MetaDataRoleAuthorizationStrategy.authorize(submit, ENABLE,
xmlRolesReader.getAllAllowedRoles("Resources",
Modified:
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java?rev=1449668&r1=1449667&r2=1449668&view=diff
==
---
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java
(original)
+++
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/RoleModalPage.java
Mon Feb 25 11:49:50 2013
@@ -113,6 +113,7 @@ public class RoleModalPage extends BaseM
: "update"));
form.add(submit);
+form.setDefaultButton(submit);
add(form);
}
Modified:
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java?rev=1449668&r1=1449667&r2=1449668&view=diff
==
---
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java
(original)
+++
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/UserModalPage.java
Mon Feb 25 11:49:50 2013
@@ -173,6 +173,7 @@ public abstract class UserModalPage exte
fragment.add(form);
form.add(submit);
+form.setDefaultButton(submit);
return form;
}
Modified:
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/Users.java
URL:
http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/Users.java?rev=1449668&r1=1449667&r2=1449668&view=diff
==
---
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/Users.java
(original)
+++
syncope/branches/1_0_X/console/src/main/java/org/apache/syncope/console/pages/Users.java
Mon Feb 25 11:49:50 2013
@@ -93,27 +93,31 @@ public class Users extends BasePage {
final UserSearchPanel searchPanel = new UserSearchPanel("searchPanel",
getPageReference());
searchForm.add(searchPanel);
-searchForm.add(new ClearIndicatingAjaxButton("search", new
ResourceModel("search"), getPageReference()) {
+final ClearIndicatingAjaxButton searchButto
[CONF] Apache Syncope > Run Syncope in real environments
Run Syncope in real environments
Page edited by Francesco Chicchiricco
Changes (1)
...
{code}
h3. Set console's {{jboss-deployment-structure.xml}} {note:title=Version warning} This paragraph only applies to Apache Syncope <= 1.0.5. {note} Download [this file|https://svn.apache.org/repos/asf/syncope/trunk/console/src/main/webapp/WEB-INF/jboss-deployment-structure.xml] and copy it under {code}console/src/main/webapp/WEB-INF{code}.
h3. Use DataSource
...
Full Content
Introduction
Deployment directory
Internal storage
PostgreSQL
MySQL
Oracle
Microsoft SQL Server
JEE container
Apache Tomcat 7
Set Environment
GNU / Linux - Mac OS X
Windows
context.xml
Glassfish 3.1
Update core glassfish-web.xml
JBoss AS 7.1
Use JBossPersistenceMappingFactory
Set console's jboss-deployment-structure.xml
Use DataSource
core web.xml
core jboss-deployment-structure
Oracle WebLogic 12
Update core web.xml
Update core weblogic.xml
Other setup tasks
Use datasource
Connect console to core
Disable console debug
Build and deploy
Test your installation
Introduction
Once you have created your project, you can start adapting it to your own needs and requirements.
Deployment directory
Currently, Syncope needs two base directories to be defined:
bundles - where ConnId bundles are stored (check what a connector bundle is);
log - where all system logs are written.
For example, you can create directories as follows:
$ mkdir /opt/syncope
$ mkdir /opt/syncope/bundles
$ mkdir /opt/syncope/log
Internal storage
Internal storage is a database where all information and configurations are stored.
You may want to setup some default content to be loaded on internal storage upon schema creation: for this you need to edit
core/src/main/resources/content.xml
.
Please note that Syncope core will populate internal storage with provided content only if the corresponding database is empty, i.e. does not contain any table or view.
Depending on your DBMS, you will need to change your project setup accordingly; modify the content of
core/src/main/resources/persistence.properties
as indicated in the following.
PostgreSQL
jpa.driverClassName=org.postgresql.Driver
jpa.url="" class="code-comment">//localhost:5432/syncope
jpa.username=syncope
jpa.password=syncope
jpa.dialect=org.apache.openjpa.jdbc.sql.PostgresDictionary
quartz.jobstore=org.quartz.impl.jdbcjobstore.PostgreSQLDelegate
quartz.sql=tables_postgres.sql
logback.sql=postgresql.sql
This assumes that you have a PostgreSQL instance running on localhost, listening on its default port 5432 with a database
syncope
fully accessible by user
syncope
with password
syncope
MySQL
jpa.driverClassName=com.mysql.jdbc.Driver
jpa.url="" class="code-comment">//localhost:3306/syncope?characterEncoding=UTF-8
jpa.username=syncope
jpa.password=syncope
jpa.dialect=org.apache.openjpa.jdbc.sql.MySQLDictionary
quartz.jobstore=org.quartz.impl.jdbcjobstore.StdJDBCDelegate
quartz.sql=tables_mysql_innodb.sql
logback.sql=mysql.sql
This assumes that you have a MySQL instance running on localhost, listening on its default port 3306 with a database
syncope
fully accessible by user
syncope
with password
syncope
It also assumes that the InnoDB engine is enabled in your MySQL instance - if this is not the case, then change the value for 'quartz.sql' to
quartz.sql=tables_mysql.sql
.
Oracle
jpa.driverClassName=oracle.jdbc.OracleDriver
jpa.url=""
jpa.username=syncope
jpa.password=syncope
jpa.dialect=org.apache.openjpa.jdbc.sql.OracleDictionary
quartz.jobstore=org.quartz.impl.jdbcjobstore.oracle.OracleDelegate
quartz.sql=tables_oracle.sql
logback.sql=oracle.sql
database.schema=SYNCOPE
This assumes that you have an Oracle instance running on localhost, listening on its default port 1521 with a database
syncope
under tablespace
SYNCOPE
fully accessible by user
syncope
with password
syncope
You will also need to
create directory
core/src/main/resources/META-INF
download Oracle mapping file for the version you are building (1.1.X, 1.0.X)
rename it to
orm.xml
and copy it under the directory created above
Microsoft SQL Server
jpa.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver
jpa.url="" class="code-comment">//localhost:1344;database=syncope;selectMethod=cursor;sendStringParametersAsUnicode=false
jpa.username=syncope
jpa.password=syncope
jpa.dialect=org.apache.openjpa.jdbc.sql.SQLServerDictionary
quartz.jobstore=org.quartz.impl.jdbcjobstore.MSSQLDelegate
quartz.sql=tables_sqlserver.sql
logback.sql=sqlserver.sql
This assumes that
[CONF] Apache Syncope > Run Syncope in real environments
Run Syncope in real environments
Page edited by Francesco Chicchiricco
Changes (1)
...
with {code}
value="org.apache.syncope.core.persistence.openjpa.JBossPersistenceMappingFactory(URLs=vfs:/content/${project.build.finalName}.war/WEB-INF/classes/, Resources=META-INF/orm.xml)"/>
{code}
...
Full Content
Introduction
Deployment directory
Internal storage
PostgreSQL
MySQL
Oracle
Microsoft SQL Server
JEE container
Apache Tomcat 7
Set Environment
GNU / Linux - Mac OS X
Windows
context.xml
Glassfish 3.1
Update core glassfish-web.xml
JBoss AS 7.1
Use JBossPersistenceMappingFactory
Use DataSource
core web.xml
core jboss-deployment-structure
Oracle WebLogic 12
Update core web.xml
Update core weblogic.xml
Other setup tasks
Use datasource
Connect console to core
Disable console debug
Build and deploy
Test your installation
Introduction
Once you have created your project, you can start adapting it to your own needs and requirements.
Deployment directory
Currently, Syncope needs two base directories to be defined:
bundles - where ConnId bundles are stored (check what a connector bundle is);
log - where all system logs are written.
For example, you can create directories as follows:
$ mkdir /opt/syncope
$ mkdir /opt/syncope/bundles
$ mkdir /opt/syncope/log
Internal storage
Internal storage is a database where all information and configurations are stored.
You may want to setup some default content to be loaded on internal storage upon schema creation: for this you need to edit
core/src/main/resources/content.xml
.
Please note that Syncope core will populate internal storage with provided content only if the corresponding database is empty, i.e. does not contain any table or view.
Depending on your DBMS, you will need to change your project setup accordingly; modify the content of
core/src/main/resources/persistence.properties
as indicated in the following.
PostgreSQL
jpa.driverClassName=org.postgresql.Driver
jpa.url="" class="code-comment">//localhost:5432/syncope
jpa.username=syncope
jpa.password=syncope
jpa.dialect=org.apache.openjpa.jdbc.sql.PostgresDictionary
quartz.jobstore=org.quartz.impl.jdbcjobstore.PostgreSQLDelegate
quartz.sql=tables_postgres.sql
logback.sql=postgresql.sql
This assumes that you have a PostgreSQL instance running on localhost, listening on its default port 5432 with a database
syncope
fully accessible by user
syncope
with password
syncope
MySQL
jpa.driverClassName=com.mysql.jdbc.Driver
jpa.url="" class="code-comment">//localhost:3306/syncope?characterEncoding=UTF-8
jpa.username=syncope
jpa.password=syncope
jpa.dialect=org.apache.openjpa.jdbc.sql.MySQLDictionary
quartz.jobstore=org.quartz.impl.jdbcjobstore.StdJDBCDelegate
quartz.sql=tables_mysql_innodb.sql
logback.sql=mysql.sql
This assumes that you have a MySQL instance running on localhost, listening on its default port 3306 with a database
syncope
fully accessible by user
syncope
with password
syncope
It also assumes that the InnoDB engine is enabled in your MySQL instance - if this is not the case, then change the value for 'quartz.sql' to
quartz.sql=tables_mysql.sql
.
Oracle
jpa.driverClassName=oracle.jdbc.OracleDriver
jpa.url=""
jpa.username=syncope
jpa.password=syncope
jpa.dialect=org.apache.openjpa.jdbc.sql.OracleDictionary
quartz.jobstore=org.quartz.impl.jdbcjobstore.oracle.OracleDelegate
quartz.sql=tables_oracle.sql
logback.sql=oracle.sql
database.schema=SYNCOPE
This assumes that you have an Oracle instance running on localhost, listening on its default port 1521 with a database
syncope
under tablespace
SYNCOPE
fully accessible by user
syncope
with password
syncope
You will also need to
create directory
core/src/main/resources/META-INF
download Oracle mapping file for the version you are building (1.1.X, 1.0.X)
rename it to
orm.xml
and copy it under the directory created above
Microsoft SQL Server
jpa.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver
jpa.url="" class="code-comment">//localhost:1344;database=syncope;selectMethod=cursor;sendStringParametersAsUnicode=false
jpa.username=syncope
jpa.password=syncope
jpa.dialect=org.apache.openjpa.jdbc.sql.SQLServerDictionary
quartz.jobstore=org.quartz.impl.jdbcjobstore.MSSQLDelegate
quartz.sql=tables_sqlserver.sql
logback.sql=sqlserver.sql
This assumes that you have an SQL Server instance running on localhost, listening on its default port 1344 with a database
syncope
fully accessible by user
syncope
with password
syncope
You will also need to
create director
svn commit: r1449640 - in /syncope/trunk: ./ console/src/main/webapp/WEB-INF/jboss-deployment-structure.xml console/src/main/webapp/WEB-INF/web.xml
Author: ilgrosso Date: Mon Feb 25 10:07:56 2013 New Revision: 1449640 URL: http://svn.apache.org/r1449640 Log: [SYNCOPE-325] Merge from 1_0_X Added: syncope/trunk/console/src/main/webapp/WEB-INF/jboss-deployment-structure.xml - copied unchanged from r1449639, syncope/branches/1_0_X/console/src/main/webapp/WEB-INF/jboss-deployment-structure.xml Modified: syncope/trunk/ (props changed) syncope/trunk/console/src/main/webapp/WEB-INF/web.xml Propchange: syncope/trunk/ -- Merged /syncope/branches/1_0_X:r1449128-1449639 Modified: syncope/trunk/console/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/webapp/WEB-INF/web.xml?rev=1449640&r1=1449639&r2=1449640&view=diff == --- syncope/trunk/console/src/main/webapp/WEB-INF/web.xml (original) +++ syncope/trunk/console/src/main/webapp/WEB-INF/web.xml Mon Feb 25 10:07:56 2013 @@ -16,7 +16,6 @@ software distributed under the License i KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - --> http://java.sun.com/xml/ns/javaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
svn commit: r1449639 - in /syncope/branches/1_0_X/console/src/main/webapp/WEB-INF: jboss-deployment-structure.xml web.xml
Author: ilgrosso Date: Mon Feb 25 10:06:57 2013 New Revision: 1449639 URL: http://svn.apache.org/r1449639 Log: [SYNCOPE-325] Missing directives for JBoss handling of SLF4J Added: syncope/branches/1_0_X/console/src/main/webapp/WEB-INF/jboss-deployment-structure.xml (with props) Modified: syncope/branches/1_0_X/console/src/main/webapp/WEB-INF/web.xml Added: syncope/branches/1_0_X/console/src/main/webapp/WEB-INF/jboss-deployment-structure.xml URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/webapp/WEB-INF/jboss-deployment-structure.xml?rev=1449639&view=auto == --- syncope/branches/1_0_X/console/src/main/webapp/WEB-INF/jboss-deployment-structure.xml (added) +++ syncope/branches/1_0_X/console/src/main/webapp/WEB-INF/jboss-deployment-structure.xml Mon Feb 25 10:06:57 2013 @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + \ No newline at end of file Propchange: syncope/branches/1_0_X/console/src/main/webapp/WEB-INF/jboss-deployment-structure.xml -- svn:eol-style = native Propchange: syncope/branches/1_0_X/console/src/main/webapp/WEB-INF/jboss-deployment-structure.xml -- svn:keywords = Date Revision Author HeadURL Id Propchange: syncope/branches/1_0_X/console/src/main/webapp/WEB-INF/jboss-deployment-structure.xml -- svn:mime-type = text/xml Modified: syncope/branches/1_0_X/console/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/syncope/branches/1_0_X/console/src/main/webapp/WEB-INF/web.xml?rev=1449639&r1=1449638&r2=1449639&view=diff == --- syncope/branches/1_0_X/console/src/main/webapp/WEB-INF/web.xml (original) +++ syncope/branches/1_0_X/console/src/main/webapp/WEB-INF/web.xml Mon Feb 25 10:06:57 2013 @@ -16,7 +16,6 @@ software distributed under the License i KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - --> http://java.sun.com/xml/ns/javaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
[CONF] Apache Syncope > Create a new Syncope project
Create a new Syncope project
Page edited by Francesco Chicchiricco
Changes (1)
...
Hence you need:
* Java SE Development Kit 6 (version 1.6.0-23 or higher) installed;
* [Apache Maven|http://maven.apache.org] (version 3.0.3 or higher) installed; * Some basic knowledge about Maven;
...
Full Content
Introduction
Prerequisites
Create new project
Stable releases
Snapshot (development) releases
Build new project
Where to go from here?
Introduction
This document describes how to create a new Syncope project.
A Syncope project includes (at least) two web applications: the core and the console. This page helps you get both web applications up and running with your own project as quickly as possible.
Prerequisites
The preferred way to create a Syncope project is to generate a Maven project starting from published archetype.
Hence you need:
Java SE Development Kit 6 (version 1.6.0-23 or higher) installed;
Apache Maven (version 3.0.3 or higher) installed;
Some basic knowledge about Maven;
Some basic knowledge about Maven WAR overlays;
Some basic knowledge about Maven archetypes.
Create new project
Maven archetypes are templates of projects. Maven can generate a new project from such a template. For a project using Syncope, you need the website archetype. In the folder in which the new project folder should be created, type the command shown below. On Windows, run the command on a single line and leave out the line continuation characters ('\').
mvn archetype:generate \
-DarchetypeGroupId=org.apache.syncope \
-DarchetypeArtifactId=syncope-archetype \
-DarchetypeRepository=http://repo1.maven.org/maven2 \
-DarchetypeVersion=1.0.5
The archetype is configured with default values for all properties required by the archetype. If you want to customize any of these property values, type 'n' when prompted for confirmation.
You will be asked for:
the groupId
something like 'com.mycompany'
the artifactId
something like 'myproject'
the version number
You can use the default; it is good practice to have 'SNAPSHOT' in the version number during development and the maven release plugin makes use of that string. But ensure to comply to the desired numbering scheme for your project.
the package name
The java package name. A folder structure according to this name will be generated automatically; by default, equal to the groupId
(for archetypeVersion >= 1.0.5), the secretKey
Provide any pseudo-random, 16 character length, string here that will be used in the generated project for AES ciphering.
Maven will create a project for you (in a newly created directory named after the value of the artifactId property you specified) containing two subprojects:
core - a pre-configured RESTful server, with JPA persistence
console - a web interface for dealing with the core
Stable releases
Take a look at available releases of the archetype project at central Maven repository, then change the archetypeVersion in the mvn command above accordingly.
Snapshot (development) releases
As development go on, snapshot releases are published at ASF repository.
If you want to test a snapshot release, be sure to:
change
http://repo1.maven.org/maven2
to
http://repository.apache.org/content/repositories/snapshots
in the mvn command above
add the following code right before in root pom.xml of the generated project:
ASF
https://repository.apache.org/content/repositories/snapshots/
true
Build new project
Now build your project using the following command in the root folder of your project:
mvn clean package
This will produce two WAR files:
core/target/syncope.war
console/target/syncope-console.war
Where to go from here?
Once you have create your project and verified that build went fine, you can now see how to run an embedded demo or deploy to a real environment.
Change Notification Preferences
View Online
|
View Changes
|
Add Comment
