Author: bblfish
Date: Wed Nov 10 21:45:42 2010
New Revision: 1033735
URL: http://svn.apache.org/viewvc?rev=1033735&view=rev
Log:
not sure anymore exactly why I made these changes....
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.security.auth.cookie/pom.xml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/java/org/apache/clerezza/platform/security/auth/cookie/CookieLogout.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdGraphsService.scala
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/header.css
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.security.auth.cookie/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.security.auth.cookie/pom.xml?rev=1033735&r1=1033734&r2=1033735&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.security.auth.cookie/pom.xml
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.security.auth.cookie/pom.xml
Wed Nov 10 21:45:42 2010
@@ -43,5 +43,11 @@
<groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.web.fileserver</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <type>jar</type>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/java/org/apache/clerezza/platform/security/auth/cookie/CookieLogout.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/java/org/apache/clerezza/platform/security/auth/cookie/CookieLogout.java?rev=1033735&r1=1033734&r2=1033735&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/java/org/apache/clerezza/platform/security/auth/cookie/CookieLogout.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.security.auth.cookie/src/main/java/org/apache/clerezza/platform/security/auth/cookie/CookieLogout.java
Wed Nov 10 21:45:42 2010
@@ -19,7 +19,9 @@
package org.apache.clerezza.platform.security.auth.cookie;
import java.net.URI;
-import java.net.URL;
+import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
import javax.ws.rs.GET;
import javax.ws.rs.HeaderParam;
import javax.ws.rs.Path;
@@ -58,56 +60,71 @@ import org.wymiwyg.wrhapi.util.Cookie;
@Path("/logout")
public class CookieLogout {
- private final Logger logger =
LoggerFactory.getLogger(CookieLogout.class);
-
- @Reference
- private RenderletManager renderletManager;
-
- /**
- * The activate method is called when SCR activates the component
configuration.
- *
- * @param componentContext
- */
- protected void activate(ComponentContext componentContext) {
-
- logger.info("Cookie Logout activated.");
- }
-
- @GET
- public Response logout(@Context UriInfo uriInfo,
- @HeaderParam("Referer") URI referer) {
- TrailingSlash.enforceNotPresent(uriInfo);
- ResponseBuilder responseBuilder;
- if (referer != null) {
- responseBuilder = Response.seeOther(referer);
- } else {
- responseBuilder = Response.fromResponse(
-
RedirectUtil.createSeeOtherResponse("logout/success", uriInfo));
- }
- responseBuilder.header(HttpHeaders.SET_COOKIE,
getLogoutCookie());
- return responseBuilder.build();
- }
-
- @GET
- @Path("success")
- public GraphNode logoutSuccessPage(@Context UriInfo uriInfo) {
- TrailingSlash.enforcePresent(uriInfo);
- GraphNode result = new GraphNode(new BNode(), new
SimpleMGraph());
- PlainLiteral message = new PlainLiteralImpl(
- "You successfully logged out.");
- result.addProperty(LOGIN.message, message);
- result.addProperty(RDF.type, LOGIN.LoginPage);
-
- String baseUri = uriInfo.getBaseUri().getScheme() + "://" +
- uriInfo.getBaseUri().getAuthority();
-
- result.addProperty(LOGIN.refererUri, new UriRef(baseUri +
"/dashboard/overview"));
- return result;
+ private final Logger logger = LoggerFactory.getLogger(CookieLogout.class);
+ @Reference
+ private RenderletManager renderletManager;
+
+ /**
+ * The activate method is called when SCR activates the component
configuration.
+ *
+ * @param componentContext
+ */
+ protected void activate(ComponentContext componentContext) {
+
+ logger.info("Cookie Logout activated.");
+ }
+
+ @GET
+ public Response logout(@Context UriInfo uriInfo,
+ @HeaderParam("Referer") URI referer,
+ @Context ServletRequest req) {
+ TrailingSlash.enforceNotPresent(uriInfo);
+ ResponseBuilder responseBuilder;
+
+ if (referer != null) {
+ responseBuilder = Response.seeOther(referer);
+ } else {
+ responseBuilder = Response.fromResponse(
+ RedirectUtil.createSeeOtherResponse("logout/success",
uriInfo));
}
-
- public static Cookie getLogoutCookie() {
- Cookie cookie = new Cookie(CookieLogin.AUTH_COOKIE_NAME, null);
- cookie.setMaxAge(0);
- return cookie;
+ responseBuilder.header("Connection", "close"); //will
+ logger.info("logout! Closing connection");
+ //we need to get the ssl session.
+ //With tomcat this works with javax.servlet.request.ssl_session_mgr
attribute as
+ //explained here http://tomcat.apache.org/tomcat-7.0-doc/ssl-howto.html
+ if (req != null) {
+ HttpSession session = ((HttpServletRequest) req).getSession();
+ if (session != null) {
+ session.invalidate();
+ logger.info("logout! invalidating session");
+ }
+ } else {
+ logger.info("request is null!");
}
+ responseBuilder.header(HttpHeaders.SET_COOKIE, getLogoutCookie());
+ return responseBuilder.build();
+ }
+
+ @GET
+ @Path("success")
+ public GraphNode logoutSuccessPage(@Context UriInfo uriInfo) {
+ TrailingSlash.enforcePresent(uriInfo);
+ GraphNode result = new GraphNode(new BNode(), new SimpleMGraph());
+ PlainLiteral message = new PlainLiteralImpl(
+ "You successfully logged out.");
+ result.addProperty(LOGIN.message, message);
+ result.addProperty(RDF.type, LOGIN.LoginPage);
+
+ String baseUri = uriInfo.getBaseUri().getScheme() + "://"
+ + uriInfo.getBaseUri().getAuthority();
+
+ result.addProperty(LOGIN.refererUri, new UriRef(baseUri +
"/dashboard/overview"));
+ return result;
+ }
+
+ public static Cookie getLogoutCookie() {
+ Cookie cookie = new Cookie(CookieLogin.AUTH_COOKIE_NAME, null);
+ cookie.setMaxAge(0);
+ return cookie;
+ }
}
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdGraphsService.scala
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdGraphsService.scala?rev=1033735&r1=1033734&r2=1033735&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdGraphsService.scala
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.users/core/src/main/scala/org/apache/clerezza/platform/users/WebIdGraphsService.scala
Wed Nov 10 21:45:42 2010
@@ -93,7 +93,7 @@ class WebIdGraphsService() {
}
}
f+"; q="+qualityOfFormat+","
- }).mkString +" *; q=.1" //with grddl should add */*
+ }).mkString +" *; q=.1" //is that for GRDDL?
}
def getWebIdGraphs(webId: UriRef): WebIdGraphs = {
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/header.css
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/header.css?rev=1033735&r1=1033734&r2=1033735&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/header.css
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/resources/CLEREZZA-INF/web-resources/style/header.css
Wed Nov 10 21:45:42 2010
@@ -50,7 +50,7 @@
}
#tx-login {
- width: 16em;
+ width: 50em;
color: #ffffff;
float: right;
padding: 0.2em 0.8em 0 0;
