You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mp...@apache.org on 2012/03/09 21:22:50 UTC
svn commit: r1299023 - in /incubator/rave/sandbox/science-gateways: ./
rave-gateway-extensions/src/main/java/org/apache/rave/portal/service/impl/
Author: mpierce
Date: Fri Mar 9 20:22:49 2012
New Revision: 1299023
URL: http://svn.apache.org/viewvc?rev=1299023&view=rev
Log:
(RAVE-508) Updating gateway extensions to Rave 0.9, Spring 3.1, and Shindig 3.0.0 beta4
Removed:
incubator/rave/sandbox/science-gateways/rave-gateway-extensions/src/main/java/org/apache/rave/portal/service/impl/GsiUserService.java
Modified:
incubator/rave/sandbox/science-gateways/pom.xml
incubator/rave/sandbox/science-gateways/rave-gateway-extensions/src/main/java/org/apache/rave/portal/service/impl/CommunityUserService.java
Modified: incubator/rave/sandbox/science-gateways/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rave/sandbox/science-gateways/pom.xml?rev=1299023&r1=1299022&r2=1299023&view=diff
==============================================================================
--- incubator/rave/sandbox/science-gateways/pom.xml (original)
+++ incubator/rave/sandbox/science-gateways/pom.xml Fri Mar 9 20:22:49 2012
@@ -38,7 +38,7 @@
<properties>
<!--These are vanilla properties -->
- <apache.rave.version>0.4-incubating-SNAPSHOT</apache.rave.version>
+ <apache.rave.version>0.9-incubating</apache.rave.version>
<com.h2database.version>1.3.154</com.h2database.version>
<javax.servlet.version>2.5</javax.servlet.version>
<jsp-api.version>2.1</jsp-api.version>
@@ -58,8 +58,8 @@
<maven.filesync.override>false</maven.filesync.override>
<!-- These are extension properties for this project -->
- <apache.shindig.version>3.0.0-beta2</apache.shindig.version>
- <org.springframework.version>3.0.5.RELEASE</org.springframework.version>
+ <apache.shindig.version>3.0.0-beta4</apache.shindig.version>
+ <org.springframework.version>3.1.0.RELEASE</org.springframework.version>
<jstl.version>1.2</jstl.version>
<org.slf4j.version>1.6.1</org.slf4j.version>
<log4j.version>1.2.16</log4j.version>
Modified: incubator/rave/sandbox/science-gateways/rave-gateway-extensions/src/main/java/org/apache/rave/portal/service/impl/CommunityUserService.java
URL: http://svn.apache.org/viewvc/incubator/rave/sandbox/science-gateways/rave-gateway-extensions/src/main/java/org/apache/rave/portal/service/impl/CommunityUserService.java?rev=1299023&r1=1299022&r2=1299023&view=diff
==============================================================================
--- incubator/rave/sandbox/science-gateways/rave-gateway-extensions/src/main/java/org/apache/rave/portal/service/impl/CommunityUserService.java (original)
+++ incubator/rave/sandbox/science-gateways/rave-gateway-extensions/src/main/java/org/apache/rave/portal/service/impl/CommunityUserService.java Fri Mar 9 20:22:49 2012
@@ -22,11 +22,13 @@ package org.apache.rave.portal.service.i
import java.util.Date;
import org.apache.rave.portal.model.User;
-import org.apache.rave.portal.repository.UserRepository;
+import org.apache.rave.portal.repository.*;
import org.apache.rave.portal.service.UserService;
+import org.apache.rave.portal.service.EmailService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.dao.DataAccessException;
import org.springframework.security.authentication.AbstractAuthenticationToken;
import org.springframework.security.core.Authentication;
@@ -74,13 +76,19 @@ import xportlets.proxymanager.ProxyStora
@Service(value = "communityUserService")
public class CommunityUserService extends DefaultUserService {
// private static final String COMMUNITY_CREDENTIAL_LOCATION="community.credential.location";
+ private final UserRepository userRepository;
+ private final PageRepository pageRepository;
+ private final PageTemplateRepository pageTemplateRepository;
+ private final WidgetRatingRepository widgetRatingRepository;
+ private final WidgetCommentRepository widgetCommentRepository;
+ private final WidgetRepository widgetRepository;
+
private static final String COMMUNITY_CREDENTIAL_LOCATION="/tmp/x509up_u501";
private static int defaultPort = 7512;
private static int defaultLifeTime = 60*24*100;
private static String defaultServer="myproxy.teragrid.org";
protected static final Logger logger = LoggerFactory.getLogger(CommunityUserService.class);
- protected UserRepository userRepository;
// public static String trustedCertsFile = "trustedCAs";
private String trustedCertsFile;
@@ -93,10 +101,40 @@ public class CommunityUserService extend
protected int myproxyLifeTime ;
private String communityCredFile=null;
+
+ @Autowired
+ private EmailService emailService;
+
+ @Value("${portal.mail.passwordservice.subject}")
+ private String passwordReminderSubject;
+
+ @Value("${portal.mail.passwordservice.template}")
+ private String passwordReminderTemplate;
+
+ @Value("${portal.mail.username.subject}")
+ private String userNameReminderSubject;
+
+ @Value("${portal.mail.username.template}")
+ private String userNameReminderTemplate;
+
+ @Value("${portal.mail.service.baseurl}")
+ private String baseUrl;
+
@Autowired
- public CommunityUserService(UserRepository userRepository) {
- super(userRepository);
+ public CommunityUserService(PageRepository pageRepository,
+ UserRepository userRepository,
+ WidgetRatingRepository widgetRatingRepository,
+ WidgetCommentRepository widgetCommentRepository,
+ WidgetRepository widgetRepository,
+ PageTemplateRepository pageTemplateRepository) {
+ super(pageRepository,userRepository,widgetRatingRepository,widgetCommentRepository,widgetRepository, pageTemplateRepository);
this.userRepository = userRepository;
+ this.pageRepository = pageRepository;
+ this.widgetRatingRepository = widgetRatingRepository;
+ this.widgetCommentRepository = widgetCommentRepository;
+ this.widgetRepository = widgetRepository;
+ this.pageTemplateRepository = pageTemplateRepository;
+
myproxyHostname=defaultServer;
myproxyLifeTime=defaultLifeTime;
myproxyPortNumber=defaultPort;