You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by dd...@apache.org on 2007/03/06 03:16:54 UTC
svn commit: r514957 - in /portals/pluto/branches/pluto-1.1.x: ./ assembly/
maven-pluto-plugin/ pluto-ant-tasks/ pluto-container/
pluto-container/src/main/java/org/apache/pluto/core/
pluto-container/src/main/java/org/apache/pluto/spi/optional/ pluto-des...
Author: ddewolf
Date: Mon Mar 5 18:16:53 2007
New Revision: 514957
URL: http://svn.apache.org/viewvc?view=rev&rev=514957
Log:
Upgrading pom to appropriate snapshot version after tag; PLUTO-334 User Info Service
Modified:
portals/pluto/branches/pluto-1.1.x/assembly/pom.xml
portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/pom.xml
portals/pluto/branches/pluto-1.1.x/pluto-ant-tasks/pom.xml
portals/pluto/branches/pluto-1.1.x/pluto-container/pom.xml
portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/core/DefaultUserInfoService.java
portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/spi/optional/UserInfoService.java
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/pom.xml
portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/pom.xml
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/pom.xml
portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/pom.xml
portals/pluto/branches/pluto-1.1.x/pluto-portal/pom.xml
portals/pluto/branches/pluto-1.1.x/pluto-site/pom.xml
portals/pluto/branches/pluto-1.1.x/pluto-taglib/pom.xml
portals/pluto/branches/pluto-1.1.x/pluto-testsuite/pom.xml
portals/pluto/branches/pluto-1.1.x/pluto-util/pom.xml
portals/pluto/branches/pluto-1.1.x/pom.xml
Modified: portals/pluto/branches/pluto-1.1.x/assembly/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/assembly/pom.xml?view=diff&rev=514957&r1=514956&r2=514957
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/assembly/pom.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/assembly/pom.xml Mon Mar 5 18:16:53 2007
@@ -3,7 +3,7 @@
<parent>
<artifactId>pluto</artifactId>
<groupId>org.apache.pluto</groupId>
- <version>1.1.1</version>
+ <version>1.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/pom.xml?view=diff&rev=514957&r1=514956&r2=514957
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/pom.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/pom.xml Mon Mar 5 18:16:53 2007
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>1.1.1</version>
+ <version>1.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-pluto-plugin</artifactId>
Modified: portals/pluto/branches/pluto-1.1.x/pluto-ant-tasks/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-ant-tasks/pom.xml?view=diff&rev=514957&r1=514956&r2=514957
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-ant-tasks/pom.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-ant-tasks/pom.xml Mon Mar 5 18:16:53 2007
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>1.1.1</version>
+ <version>1.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pluto-ant-tasks</artifactId>
Modified: portals/pluto/branches/pluto-1.1.x/pluto-container/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-container/pom.xml?view=diff&rev=514957&r1=514956&r2=514957
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-container/pom.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-container/pom.xml Mon Mar 5 18:16:53 2007
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>1.1.1</version>
+ <version>1.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/core/DefaultUserInfoService.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/core/DefaultUserInfoService.java?view=diff&rev=514957&r1=514956&r2=514957
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/core/DefaultUserInfoService.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/core/DefaultUserInfoService.java Mon Mar 5 18:16:53 2007
@@ -18,6 +18,7 @@
import org.apache.pluto.spi.optional.UserInfoService;
import org.apache.pluto.PortletContainerException;
+import org.apache.pluto.PortletWindow;
import javax.portlet.PortletRequest;
import java.util.Map;
@@ -31,11 +32,17 @@
private Map userInfoMap = new HashMap();
- public Map getUserInfo(PortletRequest request) throws PortletContainerException {
+ public Map getUserInfo(PortletRequest request)
+ throws PortletContainerException {
if ( request.getRemoteUser() != null ) {
return (Map)userInfoMap.get(request.getRemoteUser());
}
return new HashMap();
+ }
+
+ public Map getUserInfo(PortletRequest request, PortletWindow window)
+ throws PortletContainerException {
+ return getUserInfo(request);
}
public void setUserInfo(String userName, Map userInfoMap) {
Modified: portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/spi/optional/UserInfoService.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/spi/optional/UserInfoService.java?view=diff&rev=514957&r1=514956&r2=514957
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/spi/optional/UserInfoService.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-container/src/main/java/org/apache/pluto/spi/optional/UserInfoService.java Mon Mar 5 18:16:53 2007
@@ -18,6 +18,7 @@
import org.apache.pluto.spi.ContainerService;
import org.apache.pluto.PortletContainerException;
+import org.apache.pluto.PortletWindow;
import javax.portlet.PortletRequest;
import java.util.Map;
@@ -31,6 +32,7 @@
* @author <a href="ddewolf@apache.org">David DeWolf</a>
*/
public interface UserInfoService extends ContainerService {
+
/**
* To access user information attributes as defined in PLT.17
* of JSR-168.
@@ -38,6 +40,13 @@
* @param request Used to extract the authenticated user name.
* @return A map of names and values of user information attributes
* for a particular authenticated user.
+ * @deprecated use {@link #getUserInfo(PortletRequest, PortletWindow)}
*/
Map getUserInfo(PortletRequest request) throws PortletContainerException;
+
+ /**
+ * Retrieve the user attribues associated with the given
+ * request and window.
+ */
+ Map getUserInfo(PortletRequest request, PortletWindow window) throws PortletContainerException;
}
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/pom.xml?view=diff&rev=514957&r1=514956&r2=514957
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/pom.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/pom.xml Mon Mar 5 18:16:53 2007
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>1.1.1</version>
+ <version>1.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/pom.xml?view=diff&rev=514957&r1=514956&r2=514957
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/pom.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/pom.xml Mon Mar 5 18:16:53 2007
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>1.1.1</version>
+ <version>1.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/pom.xml?view=diff&rev=514957&r1=514956&r2=514957
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/pom.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/pom.xml Mon Mar 5 18:16:53 2007
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>1.1.1</version>
+ <version>1.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pluto-portal-driver-impl</artifactId>
Modified: portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/pom.xml?view=diff&rev=514957&r1=514956&r2=514957
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/pom.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/pom.xml Mon Mar 5 18:16:53 2007
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>1.1.1</version>
+ <version>1.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pluto-portal-driver</artifactId>
Modified: portals/pluto/branches/pluto-1.1.x/pluto-portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal/pom.xml?view=diff&rev=514957&r1=514956&r2=514957
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-portal/pom.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-portal/pom.xml Mon Mar 5 18:16:53 2007
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>1.1.1</version>
+ <version>1.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portals/pluto/branches/pluto-1.1.x/pluto-site/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-site/pom.xml?view=diff&rev=514957&r1=514956&r2=514957
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-site/pom.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-site/pom.xml Mon Mar 5 18:16:53 2007
@@ -3,7 +3,7 @@
<parent>
<artifactId>pluto</artifactId>
<groupId>org.apache.pluto</groupId>
- <version>1.1.1</version>
+ <version>1.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: portals/pluto/branches/pluto-1.1.x/pluto-taglib/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-taglib/pom.xml?view=diff&rev=514957&r1=514956&r2=514957
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-taglib/pom.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-taglib/pom.xml Mon Mar 5 18:16:53 2007
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>1.1.1</version>
+ <version>1.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pluto-taglib</artifactId>
Modified: portals/pluto/branches/pluto-1.1.x/pluto-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-testsuite/pom.xml?view=diff&rev=514957&r1=514956&r2=514957
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-testsuite/pom.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-testsuite/pom.xml Mon Mar 5 18:16:53 2007
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.pluto</groupId>
<artifactId>pluto</artifactId>
- <version>1.1.1</version>
+ <version>1.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pluto-testsuite</artifactId>
Modified: portals/pluto/branches/pluto-1.1.x/pluto-util/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-util/pom.xml?view=diff&rev=514957&r1=514956&r2=514957
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-util/pom.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-util/pom.xml Mon Mar 5 18:16:53 2007
@@ -3,7 +3,7 @@
<parent>
<artifactId>pluto</artifactId>
<groupId>org.apache.pluto</groupId>
- <version>1.1.1</version>
+ <version>1.1.2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pluto-util</artifactId>
Modified: portals/pluto/branches/pluto-1.1.x/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pom.xml?view=diff&rev=514957&r1=514956&r2=514957
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pom.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pom.xml Mon Mar 5 18:16:53 2007
@@ -18,7 +18,7 @@
* The pluto-portal-driver-config.xml in the pluto-portal module (src/main/webapp/WEB-INF),
* The pluto.container.version.major and pluto.container.version.minor properties (in this file)
-->
- <version>1.1.1</version>
+ <version>1.1.2-SNAPSHOT</version>
<!-- Due to a bug in maven 2.0, the description must not contain any line breaks or tabs. -->
<description>Pluto is the Reference Implementation of the Java Portlet Specfication.</description>
<url>http://portals.apache.org/pluto</url>