Author: reto
Date: Mon Feb 14 15:20:46 2011
New Revision: 1070518
URL: http://svn.apache.org/viewvc?rev=1070518&view=rev
Log:
CLEREZZA-401: httpHedaer renamed to ResponseHeaders and an instance of
javax.ws.rs.core.HttpHeaders available as requestHeaders
Modified:
incubator/clerezza/trunk/parent/maven-pladoc-plugin/maven-pladoc-plugin.service/src/main/java/org/apache/clerezza/pladocplugin/service/GeneratorServiceImpl.java
incubator/clerezza/trunk/parent/platform.mail/src/main/java/org/apache/clerezza/platform/mail/GraphNodeDataHandler.java
incubator/clerezza/trunk/parent/platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala
incubator/clerezza/trunk/parent/platform.typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesRenderlet.java
incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRendererImpl.java
incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/GenericGraphNodeMBW.java
incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/Renderer.java
incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RendererImpl.java
incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/Renderlet.java
incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/test/java/org/apache/clerezza/platform/typerendering/RendereringTest.java
incubator/clerezza/trunk/parent/sourcebundle/src/main/scala/org/apache/clerezza/sourcebundle/BundleRoot.scala
Modified:
incubator/clerezza/trunk/parent/maven-pladoc-plugin/maven-pladoc-plugin.service/src/main/java/org/apache/clerezza/pladocplugin/service/GeneratorServiceImpl.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/maven-pladoc-plugin/maven-pladoc-plugin.service/src/main/java/org/apache/clerezza/pladocplugin/service/GeneratorServiceImpl.java?rev=1070518&r1=1070517&r2=1070518&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/maven-pladoc-plugin/maven-pladoc-plugin.service/src/main/java/org/apache/clerezza/pladocplugin/service/GeneratorServiceImpl.java
(original)
+++
incubator/clerezza/trunk/parent/maven-pladoc-plugin/maven-pladoc-plugin.service/src/main/java/org/apache/clerezza/pladocplugin/service/GeneratorServiceImpl.java
Mon Feb 14 15:20:46 2011
@@ -130,7 +130,7 @@ public class GeneratorServiceImpl implem
FileOutputStream out = new FileOutputStream(outFile);
try {
System.out.println("writing " + outFile);
- renderer.render(docRootNode, docRootNode, null,
null, new HashMap<String, Object>(), out);
+ renderer.render(docRootNode, docRootNode, null,
null, null, new HashMap<String, Object>(), out);
} finally {
out.close();
}
Modified:
incubator/clerezza/trunk/parent/platform.mail/src/main/java/org/apache/clerezza/platform/mail/GraphNodeDataHandler.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.mail/src/main/java/org/apache/clerezza/platform/mail/GraphNodeDataHandler.java?rev=1070518&r1=1070517&r2=1070518&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/platform.mail/src/main/java/org/apache/clerezza/platform/mail/GraphNodeDataHandler.java
(original)
+++
incubator/clerezza/trunk/parent/platform.mail/src/main/java/org/apache/clerezza/platform/mail/GraphNodeDataHandler.java
Mon Feb 14 15:20:46 2011
@@ -123,7 +123,7 @@ public class GraphNodeDataHandler extend
@Override
public void writeTo(OutputStream os) throws IOException {
- renderer.render(graphNode, null, null, null, new
HashMap<String, Object>(), os);
+ renderer.render(graphNode, null, null, null, null, new
HashMap<String, Object>(), os);
}
Modified:
incubator/clerezza/trunk/parent/platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala?rev=1070518&r1=1070517&r2=1070518&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala
(original)
+++
incubator/clerezza/trunk/parent/platform.typerendering.scala/src/main/scala/org/apache/clerezza/platform/typerendering/scala/RenderedPage.scala
Mon Feb 14 15:20:46 2011
@@ -38,7 +38,8 @@ abstract class RenderedPage(arguments: R
}
val uriInfo = requestProperties.getUriInfo
- val httpHeaders = requestProperties.getHttpHeaders
+ val requestHeaders = requestProperties.getRequestHeaders
+ val responseHeaders = requestProperties.getResponseHeaders
def render(resource : GraphNode) : Seq[Node] = {
modeOption match {
Modified:
incubator/clerezza/trunk/parent/platform.typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesRenderlet.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesRenderlet.java?rev=1070518&r1=1070517&r2=1070518&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/platform.typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesRenderlet.java
(original)
+++
incubator/clerezza/trunk/parent/platform.typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesRenderlet.java
Mon Feb 14 15:20:46 2011
@@ -74,7 +74,7 @@ public class ScalaServerPagesRenderlet i
{
try {
- multiStringObjectMapType =
RequestProperties.class.getMethod("getHttpHeaders", new
Class[0]).getReturnType();
+ multiStringObjectMapType =
RequestProperties.class.getMethod("getResponseHeaders", new
Class[0]).getReturnType();
} catch (NoSuchMethodException ex) {
throw new RuntimeException(ex);
}
Modified:
incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRendererImpl.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRendererImpl.java?rev=1070518&r1=1070517&r2=1070518&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRendererImpl.java
(original)
+++
incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/CallbackRendererImpl.java
Mon Feb 14 15:20:46 2011
@@ -23,6 +23,7 @@ import java.io.OutputStream;
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.UriInfo;
@@ -36,13 +37,15 @@ public class CallbackRendererImpl implem
private List<MediaType> mediaTypeList;
RenderletRendererFactoryImpl manager;
private final UriInfo uriInfo;
- private final MultivaluedMap<String, Object> httpHeaders;
+ private final HttpHeaders requestHeaders;
+ private final MultivaluedMap<String, Object> responseHeaders;
private final Map<String, Object> sharedRenderingValue;
CallbackRendererImpl(RenderletRendererFactoryImpl manager, UriInfo
uriInfo,
- MultivaluedMap<String, Object> httpHeaders, MediaType
mediaType, Map<String, Object> sharedRenderingValue) {
+ HttpHeaders requestHeaders, MultivaluedMap<String,
Object> responseHeaders, MediaType mediaType, Map<String, Object>
sharedRenderingValue) {
this.uriInfo = uriInfo;
- this.httpHeaders = httpHeaders;
+ this.requestHeaders = requestHeaders;
+ this.responseHeaders = responseHeaders;
this.mediaTypeList = Collections.singletonList(mediaType);
this.manager = manager;
this.sharedRenderingValue = sharedRenderingValue;
@@ -56,7 +59,7 @@ public class CallbackRendererImpl implem
throw new RuntimeException("no renderer could be
created for "+
resource+" (in
"+resource.getNodeContext()+"), "+mode+","+mediaTypeList);
}
- renderer.render(resource, context, uriInfo, httpHeaders,
+ renderer.render(resource, context, uriInfo, requestHeaders,
responseHeaders,
sharedRenderingValue, os);
}
Modified:
incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/GenericGraphNodeMBW.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/GenericGraphNodeMBW.java?rev=1070518&r1=1070517&r2=1070518&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/GenericGraphNodeMBW.java
(original)
+++
incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/GenericGraphNodeMBW.java
Mon Feb 14 15:20:46 2011
@@ -149,14 +149,14 @@ public class GenericGraphNodeMBW impleme
Map<String, Object> sharedRenderingValues = new HashMap<String,
Object>();
if (!(rendererMediaType.getType().equals("application") &&
rendererMediaType.getSubtype().equals("xhtml+xml"))) {
httpHeaders.putSingle(HttpHeaders.CONTENT_TYPE,
rendererMediaType);
- renderer.render(node, getUserContext(), uriInfo,
httpHeaders, sharedRenderingValues, entityStream);
+ renderer.render(node, getUserContext(), uriInfo,
headers, httpHeaders, sharedRenderingValues, entityStream);
} else {
final MediaType mediaTypeWithCharset =
MediaType.valueOf(MediaType.APPLICATION_XHTML_XML+";charset=UTF-8");
httpHeaders.putSingle(HttpHeaders.CONTENT_TYPE,
mediaTypeWithCharset);
ResultDocModifier.init();
try {
ByteArrayOutputStream baos = new
ByteArrayOutputStream();
- renderer.render(node, getUserContext(),
uriInfo, httpHeaders, sharedRenderingValues, baos);
+ renderer.render(node, getUserContext(),
uriInfo, headers, httpHeaders, sharedRenderingValues, baos);
final byte[] bytes = baos.toByteArray();
if
(!ResultDocModifier.getInstance().isModified()) {
entityStream.write(bytes);
Modified:
incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/Renderer.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/Renderer.java?rev=1070518&r1=1070517&r2=1070518&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/Renderer.java
(original)
+++
incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/Renderer.java
Mon Feb 14 15:20:46 2011
@@ -22,6 +22,7 @@ import java.io.IOException;
import java.io.OutputStream;
import java.net.URI;
import java.util.Map;
+import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.UriInfo;
@@ -69,7 +70,8 @@ public interface Renderer {
* @param os where the output will be written to.
*/
public void render(GraphNode node, GraphNode userContext, UriInfo
uriInfo,
- MultivaluedMap<String, Object> httpHeaders,
+ HttpHeaders requestHeaders,
+ MultivaluedMap<String, Object> responseHeaders,
Map<String, Object> sharedRenderingValues, OutputStream
entityStream)
throws IOException;
}
Modified:
incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RendererImpl.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RendererImpl.java?rev=1070518&r1=1070517&r2=1070518&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RendererImpl.java
(original)
+++
incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RendererImpl.java
Mon Feb 14 15:20:46 2011
@@ -25,6 +25,7 @@ import java.net.URISyntaxException;
import java.util.HashMap;
import java.util.Map;
import javax.ws.rs.WebApplicationException;
+import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.UriInfo;
@@ -89,15 +90,18 @@ class RendererImpl implements Renderer,
@Override
public void render(GraphNode resource, GraphNode context, UriInfo
uriInfo,
- MultivaluedMap<String, Object> httpHeaders,
+
+ HttpHeaders requestHeaders,
+ MultivaluedMap<String, Object> responseHeaders,
Map<String, Object> sharedRenderingValues,
OutputStream entityStream) throws IOException {
CallbackRenderer callbackRenderer =
new
CallbackRendererImpl(renderletRendererFactoryImpl,
- uriInfo, httpHeaders, mediaType,
sharedRenderingValues);
+ uriInfo, requestHeaders, responseHeaders,
mediaType, sharedRenderingValues);
renderlet.render(resource, context, sharedRenderingValues,
callbackRenderer,
renderSpecUri, mode, mediaType,
- new Renderlet.RequestProperties(uriInfo, httpHeaders,
bundleContext),
+ new Renderlet.RequestProperties(uriInfo, requestHeaders,
+ responseHeaders, bundleContext),
entityStream);
}
Modified:
incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/Renderlet.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/Renderlet.java?rev=1070518&r1=1070517&r2=1070518&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/Renderlet.java
(original)
+++
incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/Renderlet.java
Mon Feb 14 15:20:46 2011
@@ -25,6 +25,7 @@ import java.net.URI;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Map;
+import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.UriInfo;
@@ -46,19 +47,26 @@ public interface Renderlet {
*/
static class RequestProperties {
private UriInfo uriInfo;
- private MultivaluedMap<String, Object> httpHeaders;
+ private MultivaluedMap<String, Object> responseHeaders;
+ private HttpHeaders requestHeaders;
private final BundleContext bundleContext;
public RequestProperties(UriInfo uriInfo,
- MultivaluedMap<String, Object> httpHeaders,
+ HttpHeaders requestHeaders,
+ MultivaluedMap<String, Object> responseHeaders,
BundleContext bundleContext) {
this.uriInfo = uriInfo;
- this.httpHeaders = httpHeaders;
+ this.requestHeaders = requestHeaders;
+ this.responseHeaders = responseHeaders;
this.bundleContext = bundleContext;
}
- public MultivaluedMap<String, Object> getHttpHeaders() {
- return httpHeaders;
+ public HttpHeaders getRequestHeaders() {
+ return requestHeaders;
+ }
+
+ public MultivaluedMap<String, Object> getResponseHeaders() {
+ return responseHeaders;
}
public UriInfo getUriInfo() {
Modified:
incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/test/java/org/apache/clerezza/platform/typerendering/RendereringTest.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/test/java/org/apache/clerezza/platform/typerendering/RendereringTest.java?rev=1070518&r1=1070517&r2=1070518&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/test/java/org/apache/clerezza/platform/typerendering/RendereringTest.java
(original)
+++
incubator/clerezza/trunk/parent/platform.typerendering/platform.typerendering.core/src/test/java/org/apache/clerezza/platform/typerendering/RendereringTest.java
Mon Feb 14 15:20:46 2011
@@ -323,7 +323,7 @@ public abstract class RendereringTest {
if (renderer == null) {
throw new WebApplicationException();
}
- renderer.render(resource, null, null, null, null, baos);
+ renderer.render(resource, null, null, null, null, null, baos);
return baos.toString();
}
Modified:
incubator/clerezza/trunk/parent/sourcebundle/src/main/scala/org/apache/clerezza/sourcebundle/BundleRoot.scala
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/parent/sourcebundle/src/main/scala/org/apache/clerezza/sourcebundle/BundleRoot.scala?rev=1070518&r1=1070517&r2=1070518&view=diff
==============================================================================
---
incubator/clerezza/trunk/parent/sourcebundle/src/main/scala/org/apache/clerezza/sourcebundle/BundleRoot.scala
(original)
+++
incubator/clerezza/trunk/parent/sourcebundle/src/main/scala/org/apache/clerezza/sourcebundle/BundleRoot.scala
Mon Feb 14 15:20:46 2011
@@ -199,10 +199,15 @@ class BundleRoot {
def act() {
while (!stopped) {
+ logger.debug("wathcing "+dir)
val (triggered, newWatchState) =
SourceModificationWatch.watch(sourcePath**(-HiddenFileFilter), 1,
watchState)(stopped)
if (!stopped) {
- updateBundle()
+ try {
+ updateBundle()
+ } catch {
+ case e =>
logger.warn("Exception compiling", e)
+ }
watchState = newWatchState
}
}
