You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by ra...@apache.org on 2012/04/20 16:52:42 UTC
svn commit: r1328391 - in /rave/trunk:
rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/
rave-components/rave-core/src/test/resources/
rave-portal-resources/src/main/resources/
rave-portal-resources/src/main/webapp/WEB-INF/ma...
Author: raminder
Date: Fri Apr 20 14:52:42 2012
New Revision: 1328391
URL: http://svn.apache.org/viewvc?rev=1328391&view=rev
Log:
fixed the build error and typo's
Modified:
rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java
rave/trunk/rave-components/rave-core/src/test/resources/portal.properties
rave/trunk/rave-portal-resources/src/main/resources/portal.properties
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/mailtemplates/admin_approval.ftl
rave/trunk/rave-portal/src/test/resources/portal.properties
Modified: rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java?rev=1328391&r1=1328390&r2=1328391&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java (original)
+++ rave/trunk/rave-components/rave-core/src/main/java/org/apache/rave/portal/service/impl/DefaultUserService.java Fri Apr 20 14:52:42 2012
@@ -83,16 +83,16 @@ public class DefaultUserService implemen
@Value("${portal.mail.service.baseurl}")
private String baseUrl;
- @Value("${protal.user.account.admin.subject}")
+ @Value("${portal.user.account.admin.subject}")
private String userAccountApprovalSubject;
- @Value("${protal.user.account.admin.template}")
+ @Value("${portal.user.account.admin.template}")
private String userAccountApprovalTemplate;
- @Value("${protal.user.account.needapproval}")
+ @Value("${portal.user.account.needapproval}")
private boolean userAccountApproval;
- @Value("${protal.user.account.admin.email}")
+ @Value("${portal.user.account.admin.email}")
private String approvalAdminEmail;
@Value("${portal.mail.service.loginpage}")
Modified: rave/trunk/rave-components/rave-core/src/test/resources/portal.properties
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-core/src/test/resources/portal.properties?rev=1328391&r1=1328390&r2=1328391&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-core/src/test/resources/portal.properties (original)
+++ rave/trunk/rave-components/rave-core/src/test/resources/portal.properties Fri Apr 20 14:52:42 2012
@@ -59,3 +59,10 @@ portal.mail.passwordservice.subject=Rave
portal.mail.passwordservice.template=password_reminder.ftl
portal.mail.passwordservice.valid.minutes=30
portal.mail.service.baseurl=http://localhost:8080/portal/app/changepassword/
+
+# Account approval
+portal.user.account.needapproval=false
+portal.user.account.admin.email=
+portal.user.account.admin.subject=Rave User Approval
+portal.user.account.admin.template=admin_approval.ftl
+portal.mail.service.loginpage=http://localhost:8080/portal/
Modified: rave/trunk/rave-portal-resources/src/main/resources/portal.properties
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/resources/portal.properties?rev=1328391&r1=1328390&r2=1328391&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/resources/portal.properties (original)
+++ rave/trunk/rave-portal-resources/src/main/resources/portal.properties Fri Apr 20 14:52:42 2012
@@ -75,8 +75,8 @@ portal.mail.passwordservice.valid.minute
portal.mail.service.baseurl=http://localhost:8080/portal/app/changepassword/
# Account approval
-protal.user.account.needapproval=false
-protal.user.account.admin.email=
-protal.user.account.admin.subject=Rave User Approval
-protal.user.account.admin.template=admin_approval.ftl
+portal.user.account.needapproval=false
+portal.user.account.admin.email=
+portal.user.account.admin.subject=Rave User Approval
+portal.user.account.admin.template=admin_approval.ftl
portal.mail.service.loginpage=http://localhost:8080/portal/
\ No newline at end of file
Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/mailtemplates/admin_approval.ftl
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/mailtemplates/admin_approval.ftl?rev=1328391&r1=1328390&r2=1328391&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/mailtemplates/admin_approval.ftl (original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/mailtemplates/admin_approval.ftl Fri Apr 20 14:52:42 2012
@@ -17,7 +17,7 @@
* under the License.
-->
<#-- @ftlvariable name="user" type="org.apache.rave.portal.model.User" -->
-<#-- @ftlvariable name="reminderUrl" type="java.lang.String" -->
+<#-- @ftlvariable name="portalUrl" type="java.lang.String" -->
Dear Admin,
We've received a request to approve Rave account for ${user.getUsername()}.
Modified: rave/trunk/rave-portal/src/test/resources/portal.properties
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal/src/test/resources/portal.properties?rev=1328391&r1=1328390&r2=1328391&view=diff
==============================================================================
--- rave/trunk/rave-portal/src/test/resources/portal.properties (original)
+++ rave/trunk/rave-portal/src/test/resources/portal.properties Fri Apr 20 14:52:42 2012
@@ -18,7 +18,7 @@
#
#
-# These properties are used to construct the opensocial engine's URL. See
+# These properties are used to construct the opensocial engine's URL. See
# for example page.jsp. Changing them does not change the actual path configuration
# of shindig.
#
@@ -71,4 +71,11 @@ portal.mail.username.template=username_r
portal.mail.passwordservice.subject=Rave password reminder service
portal.mail.passwordservice.template=password_reminder.ftl
portal.mail.passwordservice.valid.minutes=30
-portal.mail.service.baseurl=http://localhost:8080/portal/app/changepassword/
\ No newline at end of file
+portal.mail.service.baseurl=http://localhost:8080/portal/app/changepassword/
+
+# Account approval
+portal.user.account.needapproval=false
+portal.user.account.admin.email=
+portal.user.account.admin.subject=Rave User Approval
+portal.user.account.admin.template=admin_approval.ftl
+portal.mail.service.loginpage=http://localhost:8080/portal/
\ No newline at end of file