You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by co...@apache.org on 2016/07/07 16:15:28 UTC
[1/2] syncope git commit: Get rid of the whitespace in the user
creation camel route in the UI
Repository: syncope
Updated Branches:
refs/heads/master f8212ae2b -> f97d4fd39
Get rid of the whitespace in the user creation camel route in the UI
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/54e873fe
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/54e873fe
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/54e873fe
Branch: refs/heads/master
Commit: 54e873fe2835c8311b909f791965129b7a2d85d9
Parents: f8212ae
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Jul 7 16:23:46 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Jul 7 16:23:46 2016 +0100
----------------------------------------------------------------------
ext/camel/provisioning-camel/src/main/resources/userRoutes.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/54e873fe/ext/camel/provisioning-camel/src/main/resources/userRoutes.xml
----------------------------------------------------------------------
diff --git a/ext/camel/provisioning-camel/src/main/resources/userRoutes.xml b/ext/camel/provisioning-camel/src/main/resources/userRoutes.xml
index e218b68..d0d7c77 100644
--- a/ext/camel/provisioning-camel/src/main/resources/userRoutes.xml
+++ b/ext/camel/provisioning-camel/src/main/resources/userRoutes.xml
@@ -25,8 +25,8 @@ under the License.
<simple>${body}</simple>
</setProperty>
<doTry>
- <bean ref="uwfAdapter" method="create(${body},${property.disablePwdPolicyCheck},
- ${property.enabled},${property.storePassword})"/>
+ <bean method="create(${body},${property.disablePwdPolicyCheck},${property.enabled},${property.storePassword})"
+ ref="uwfAdapter" />
<process ref="userCreateProcessor"/>
<to uri="direct:createPort"/>
<doCatch>
[2/2] syncope git commit: Grammatical fix
Posted by co...@apache.org.
Grammatical fix
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/f97d4fd3
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/f97d4fd3
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/f97d4fd3
Branch: refs/heads/master
Commit: f97d4fd39b7c0e8f18cd02f5bd2cf14b8b71e242
Parents: 54e873f
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Jul 7 17:14:25 2016 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Jul 7 17:14:25 2016 +0100
----------------------------------------------------------------------
.../persistence-jpa/src/main/resources/domains/MasterContent.xml | 4 ++--
.../persistence-jpa/src/test/resources/domains/MasterContent.xml | 4 ++--
core/persistence-jpa/src/test/resources/domains/TwoContent.xml | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/f97d4fd3/core/persistence-jpa/src/main/resources/domains/MasterContent.xml
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/main/resources/domains/MasterContent.xml b/core/persistence-jpa/src/main/resources/domains/MasterContent.xml
index 675a30c..c534a44 100644
--- a/core/persistence-jpa/src/main/resources/domains/MasterContent.xml
+++ b/core/persistence-jpa/src/main/resources/domains/MasterContent.xml
@@ -166,13 +166,13 @@ a password reset was request for ${user.getUsername()}.</p>
</html>"/>
<MailTemplate id="confirmPasswordReset"
textTemplate="Hi,
-we are happy to inform you that the password request was execute successfully for your account.
+we are happy to inform you that the password request was successfully executed for your account.
Best regards."
htmlTemplate="<html>
<body>
<p>Hi,</br>
-we are happy to inform you that the password request was execute successfully for your account.</p>
+we are happy to inform you that the password request was successfully executed for your account.</p>
<p>Best regards.</p>
</body>
http://git-wip-us.apache.org/repos/asf/syncope/blob/f97d4fd3/core/persistence-jpa/src/test/resources/domains/MasterContent.xml
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/test/resources/domains/MasterContent.xml b/core/persistence-jpa/src/test/resources/domains/MasterContent.xml
index ed9edad..ff84934 100644
--- a/core/persistence-jpa/src/test/resources/domains/MasterContent.xml
+++ b/core/persistence-jpa/src/test/resources/domains/MasterContent.xml
@@ -1178,13 +1178,13 @@ a password reset was request for ${user.getUsername()}.</p>
</html>"/>
<MailTemplate id="confirmPasswordReset"
textTemplate="Hi,
-we are happy to inform you that the password request was execute successfully for your account.
+we are happy to inform you that the password request was successfully executed for your account.
Best regards."
htmlTemplate="<html>
<body>
<p>Hi,<br/>
-we are happy to inform you that the password request was execute successfully for your account.</p>
+we are happy to inform you that the password request was successfully executed for your account.</p>
<p>Best regards.</p>
</body>
http://git-wip-us.apache.org/repos/asf/syncope/blob/f97d4fd3/core/persistence-jpa/src/test/resources/domains/TwoContent.xml
----------------------------------------------------------------------
diff --git a/core/persistence-jpa/src/test/resources/domains/TwoContent.xml b/core/persistence-jpa/src/test/resources/domains/TwoContent.xml
index ba726c6..437debc 100644
--- a/core/persistence-jpa/src/test/resources/domains/TwoContent.xml
+++ b/core/persistence-jpa/src/test/resources/domains/TwoContent.xml
@@ -143,13 +143,13 @@ a password reset was request for ${user.getUsername()}.</p>
</html>"/>
<MailTemplate id="confirmPasswordReset"
textTemplate="Hi,
-we are happy to inform you that the password request was execute successfully for your account.
+we are happy to inform you that the password request was successfully executed for your account.
Best regards."
htmlTemplate="<html>
<body>
<p>Hi,</br>
-we are happy to inform you that the password request was execute successfully for your account.</p>
+we are happy to inform you that the password request was successfully executed for your account.</p>
<p>Best regards.</p>
</body>