You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by mi...@apache.org on 2010/04/19 11:49:54 UTC
svn commit: r935500 - in
/incubator/clerezza/trunk/org.apache.clerezza.parent:
org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/
org.apache.clerezza.platform.conce...
Author: mir
Date: Mon Apr 19 09:49:54 2010
New Revision: 935500
URL: http://svn.apache.org/viewvc?rev=935500&view=rev
Log:
CLEREZZA-191: adjusted renderlet registration and ssps in platform.concepts to work again
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ResourceTagger.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/concept-existing-subjects.ssp
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/concept-tagging.ssp
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/generic-resource-page.ssp
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesRenderlet.java
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ResourceTagger.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ResourceTagger.java?rev=935500&r1=935499&r2=935500&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ResourceTagger.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/java/org/apache/clerezza/platform/concepts/core/ResourceTagger.java Mon Apr 19 09:49:54 2010
@@ -68,25 +68,25 @@ public class ResourceTagger {
URL template = getClass().getResource("concept-existing-subjects.ssp");
renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
new UriRef(template.toURI().toString()),
- RDFS.Resource, "concept-existing-subjects",
+ RDFS.Resource, "concept-existing-subjects-naked",
MediaType.APPLICATION_XHTML_XML_TYPE, true);
template = getClass().getResource("concept-tagging.ssp");
renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
new UriRef(template.toURI().toString()),
- RDFS.Resource, "concept-tagging",
+ RDFS.Resource, "concept-tagging-naked",
MediaType.APPLICATION_XHTML_XML_TYPE, true);
template = getClass().getResource("concept-find-create.ssp");
renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
new UriRef(template.toURI().toString()),
- RDFS.Resource, "concept-find-create",
+ RDFS.Resource, "concept-find-create-naked",
MediaType.APPLICATION_XHTML_XML_TYPE, true);
template = getClass().getResource("selected-concepts.ssp");
renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
new UriRef(template.toURI().toString()),
- RDFS.Resource, "selectedconcepts",
+ RDFS.Resource, "selectedconcepts-naked",
MediaType.APPLICATION_XHTML_XML_TYPE, true);
}
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/concept-existing-subjects.ssp
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/concept-existing-subjects.ssp?rev=935500&r1=935499&r2=935500&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/concept-existing-subjects.ssp (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/concept-existing-subjects.ssp Mon Apr 19 09:49:54 2010
@@ -4,5 +4,5 @@ def cpt(s: Any) = new UriRef("http://cle
<form method="post" action="/concepts/tagger/set" id="selected-concepts-form">
<input type="hidden" name="uri" value={res/cpt("resource")*}></input>
- {render(res/cpt("resource"), "selectedconcepts")}
+ {render(res/cpt("resource"), "selectedconcepts-naked")}
</form>
\ No newline at end of file
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/concept-tagging.ssp
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/concept-tagging.ssp?rev=935500&r1=935499&r2=935500&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/concept-tagging.ssp (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/concept-tagging.ssp Mon Apr 19 09:49:54 2010
@@ -1,2 +1,2 @@
-<div class="concept-tagging">{render(res,"concept-existing-subjects")}
-{render(res,"concept-find-create")}</div>
\ No newline at end of file
+<div class="concept-tagging">{render(res,"concept-existing-subjects-naked")}
+{render(res,"concept-find-create-naked")}</div>
\ No newline at end of file
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/generic-resource-page.ssp
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/generic-resource-page.ssp?rev=935500&r1=935499&r2=935500&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/generic-resource-page.ssp (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.concepts/org.apache.clerezza.platform.concepts.core/src/main/resources/org/apache/clerezza/platform/concepts/core/generic-resource-page.ssp Mon Apr 19 09:49:54 2010
@@ -18,5 +18,5 @@ resultDocModifier.addNodes2Elem("tx-cont
<h4>About: {res/cpt("resource")*}</h4>
<div><object width="80%" data={res/cpt("resource")*}></object></div>
<br/>
- {render(res,"concept-tagging")}
+ {render(res,"concept-tagging-naked")}
</div>
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesRenderlet.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesRenderlet.java?rev=935500&r1=935499&r2=935500&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesRenderlet.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesRenderlet.java Mon Apr 19 09:49:54 2010
@@ -30,7 +30,8 @@ import java.net.URI;
import java.util.Map;
import java.lang.reflect.Type;
import java.security.AccessController;
-import java.security.PrivilegedAction;
+import java.security.PrivilegedActionException;
+import java.security.PrivilegedExceptionAction;
import java.util.HashMap;
import javax.script.ScriptException;
import javax.ws.rs.WebApplicationException;
@@ -136,13 +137,25 @@ public class ScalaServerPagesRenderlet i
values.put("renderer", callbackRenderer);
values.put("mode", mode);
//The priviledged block is needed because of FELIX-2273
- Object execResult = AccessController.doPrivileged(new PrivilegedAction<Object>() {
+ Object execResult = null;
+ try {
+ execResult = AccessController.doPrivileged(new PrivilegedExceptionAction<Object>() {
- @Override
- public Object run() {
- return cs.execute(values);
+ @Override
+ public Object run() {
+ return cs.execute(values);
+ }
+ });
+ } catch (PrivilegedActionException ex) {
+ Exception cause = (Exception) ex.getCause();
+ if (cause instanceof ScriptException) {
+ throw (ScriptException) cause;
+ }
+ if (cause instanceof RuntimeException) {
+ throw (RuntimeException) cause;
}
- });
+ throw new RuntimeException(cause);
+ }
os.write(toString(execResult).getBytes("UTF-8"));
logger.debug("executed");
os.flush();