Author: reto
Date: Mon Apr 12 11:10:38 2010
New Revision: 933191
URL: http://svn.apache.org/viewvc?rev=933191&view=rev
Log:
CLEREZZA-83: updated all felix bundles to latest release (except where newer
snapshot needed)
Removed:
incubator/clerezza/trunk/org.apache.felix.framework.security/
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard/org.apache.clerezza.platform.dashboard.core/src/main/java/org/apache/clerezza/platform/dashboard/ContextualMenuGenerator.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/org.apache.clerezza.platform.launcher.storageless/pom.xml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering.scalaserverpages/src/main/java/org/apache/clerezza/platform/typerendering/scalaserverpages/ScalaServerPagesRenderlet.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderingException.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletRendererFactoryImpl.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/TypeRenderingException.java
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/java/org/apache/clerezza/web/resources/style/Style.java
incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard/org.apache.clerezza.platform.dashboard.core/src/main/java/org/apache/clerezza/platform/dashboard/ContextualMenuGenerator.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard/org.apache.clerezza.platform.dashboard.core/src/main/java/org/apache/clerezza/platform/dashboard/ContextualMenuGenerator.java?rev=933191&r1=933190&r2=933191&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard/org.apache.clerezza.platform.dashboard.core/src/main/java/org/apache/clerezza/platform/dashboard/ContextualMenuGenerator.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard/org.apache.clerezza.platform.dashboard.core/src/main/java/org/apache/clerezza/platform/dashboard/ContextualMenuGenerator.java
Mon Apr 12 11:10:38 2010
@@ -53,7 +53,7 @@ import org.apache.clerezza.rdf.utils.Rdf
@Service(UserContextProvider.class)
@Reference(name="globalMenuItemsProvider",
cardinality=ReferenceCardinality.OPTIONAL_MULTIPLE,
- policy=ReferencePolicy.STATIC,
+ policy=ReferencePolicy.DYNAMIC,
referenceInterface=GlobalMenuItemsProvider.class)
public class ContextualMenuGenerator implements UserContextProvider {
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/org.apache.clerezza.platform.launcher.storageless/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/org.apache.clerezza.platform.launcher.storageless/pom.xml?rev=933191&r1=933190&r2=933191&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/org.apache.clerezza.platform.launcher.storageless/pom.xml
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/org.apache.clerezza.platform.launcher.storageless/pom.xml
Mon Apr 12 11:10:38 2010
@@ -204,7 +204,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.main</artifactId>
<scope>provided</scope>
- <version>1.4.1</version>
+ <version>2.0.4</version>
</dependency>
<!-- framework bundles -->
@@ -212,19 +212,19 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
- <version>1.2.0</version>
+ <version>1.4.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.webconsole</artifactId>
<scope>provided</scope>
- <version>2.0.6</version>
+ <version>3.0.0</version>
</dependency>
<dependency>
<groupId>org.ops4j.pax.web</groupId>
<artifactId>pax-web-jetty-bundle</artifactId>
<scope>provided</scope>
- <version>0.7.0</version>
+ <version>0.7.2</version>
</dependency>
<!-- Apache Felix framework bundles -->
@@ -232,19 +232,19 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.bundlerepository</artifactId>
<scope>provided</scope>
- <version>1.2.1</version>
+ <version>1.6.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.eventadmin</artifactId>
<scope>provided</scope>
- <version>1.0.0</version>
+ <version>1.2.2</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr</artifactId>
<scope>provided</scope>
- <version>1.0.6</version>
+ <version>1.4.0</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -262,19 +262,19 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.shell.tui</artifactId>
<scope>provided</scope>
- <version>1.0.1</version>
+ <version>1.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.shell</artifactId>
<scope>provided</scope>
- <version>1.0.1</version>
+ <version>1.4.2</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework.security</artifactId>
<scope>provided</scope>
- <version>0.9.0-CLEREZZA</version>
+ <version>1.0.0</version>
</dependency>
<!-- support for parameterhandling, etc -->
<dependency>
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=933191&r1=933190&r2=933191&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 12 11:10:38 2010
@@ -29,6 +29,8 @@ import java.net.MalformedURLException;
import java.net.URI;
import java.util.Map;
import java.lang.reflect.Type;
+import java.security.AccessController;
+import java.security.PrivilegedAction;
import java.util.HashMap;
import javax.script.ScriptException;
import javax.ws.rs.WebApplicationException;
@@ -125,7 +127,7 @@ public class ScalaServerPagesRenderlet i
map.put("mode", String.class);
String scriptName =
extractFileName(renderingSpecification);
logger.debug("compiling script: " + scriptName);
- CompiledScript cs = scalaService.interpretScalaScript(
+ final CompiledScript cs =
scalaService.interpretScalaScript(
new String(baos.toByteArray(),
"UTF-8"), map, scriptName, getByteHeaderLines());
logger.debug("compiled");
final Map<String, Object> values = new HashMap<String,
Object>();
@@ -133,7 +135,15 @@ public class ScalaServerPagesRenderlet i
values.put("context", context);
values.put("renderer", callbackRenderer);
values.put("mode", mode);
-
os.write(toString(cs.execute(values)).getBytes("UTF-8"));
+ //The priviledged block is needed because of FELIX-2273
+ Object execResult = AccessController.doPrivileged(new
PrivilegedAction<Object>() {
+
+ @Override
+ public Object run() {
+ return cs.execute(values);
+ }
+ });
+ os.write(toString(execResult).getBytes("UTF-8"));
logger.debug("executed");
os.flush();
logger.debug("flushed");
@@ -169,7 +179,7 @@ public class ScalaServerPagesRenderlet i
return byteHeaderLines;
}
- private String toString(Object object) {
+ private static String toString(Object object) {
if (object instanceof Seq) {
return ((Seq)object).mkString();
} else {
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderingException.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderingException.java?rev=933191&r1=933190&r2=933191&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderingException.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderingException.java
Mon Apr 12 11:10:38 2010
@@ -44,7 +44,7 @@ public class RenderingException extends
public RenderingException(Exception cause, URI renderingSpecification,
GraphNode renderNode, GraphNode context) {
super(cause.getClass().getName() + ": " + cause.getMessage(),
renderingSpecification,
- renderNode, context);
+ renderNode, context, cause);
this.cause = cause;
this.renderingSpecification = renderingSpecification;
}
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletRendererFactoryImpl.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletRendererFactoryImpl.java?rev=933191&r1=933190&r2=933191&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletRendererFactoryImpl.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/RenderletRendererFactoryImpl.java
Mon Apr 12 11:10:38 2010
@@ -288,11 +288,13 @@ public class RenderletRendererFactoryImp
TYPERENDERING.renderingMode,
LiteralFactory.getInstance().createTypedLiteral(mode)));
}
- if (!rdfTypePrioList.contains(rdfType)) {
- if (rdfType.equals(RDFS.Resource)) {
- rdfTypePrioList.add(RDFS.Resource);
- } else {
- rdfTypePrioList.add(0, rdfType);
+ synchronized(this) {
+ if (!rdfTypePrioList.contains(rdfType)) {
+ if (rdfType.equals(RDFS.Resource)) {
+ rdfTypePrioList.add(RDFS.Resource);
+ } else {
+ rdfTypePrioList.add(0, rdfType);
+ }
}
}
}
@@ -446,7 +448,9 @@ public class RenderletRendererFactoryImp
@Override
public void graphChanged(List<GraphEvent> events) {
- rdfTypePrioList = Collections.synchronizedList(
- new RdfList(new UriRef(RDF_TYPE_PRIO_LIST_URI),
configGraph));
+ synchronized(this) {
+ rdfTypePrioList = Collections.synchronizedList(
+ new RdfList(new
UriRef(RDF_TYPE_PRIO_LIST_URI), configGraph));
+ }
}
}
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/TypeRenderingException.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/TypeRenderingException.java?rev=933191&r1=933190&r2=933191&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/TypeRenderingException.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.typerendering/org.apache.clerezza.platform.typerendering.core/src/main/java/org/apache/clerezza/platform/typerendering/TypeRenderingException.java
Mon Apr 12 11:10:38 2010
@@ -40,6 +40,14 @@ public abstract class TypeRenderingExcep
this.context = context;
}
+ public TypeRenderingException(String message, URI
renderingSpecification,
+ GraphNode renderNode, GraphNode context, Throwable
cause) {
+ super(message, cause);
+ this.node = renderNode;
+ this.renderingSpecification = renderingSpecification;
+ this.context = context;
+ }
+
/**
* Returns the <code>GraphNode</code> that should have been rendered
with
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/java/org/apache/clerezza/web/resources/style/Style.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/java/org/apache/clerezza/web/resources/style/Style.java?rev=933191&r1=933190&r2=933191&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/java/org/apache/clerezza/web/resources/style/Style.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.web.resources.style/src/main/java/org/apache/clerezza/web/resources/style/Style.java
Mon Apr 12 11:10:38 2010
@@ -79,6 +79,7 @@ public class Style {
resourceDir.getFile());
fileServer = new FileServer(pathNode);
URL templateURL =
getClass().getResource("globalmenu-naked.ssp");
+
renderletManager.registerRenderlet(ScalaServerPagesRenderlet.class.getName(),
new UriRef(templateURL.toString()),
RDFS.Resource,
"menu", MediaType.APPLICATION_XHTML_XML_TYPE,
true);
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml?rev=933191&r1=933190&r2=933191&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml Mon Apr 12
11:10:38 2010
@@ -359,6 +359,12 @@
<name>Scala-Tools Maven2 Repository</name>
<url>http://scala-tools.org/repo-releases</url>
</repository>
+ <!-- for wrhapi snapshot -->
+ <repository>
+ <id>sonatype.snapshots</id>
+ <name>Sonatype snapshots</name>
+
<url>http://oss.sonatype.org/content/repositories/snapshots/</url>
+ </repository>
</repositories>
<pluginRepositories>
<!-- for a version that fixes PAXEXAM-159 and 160 -->
@@ -780,7 +786,7 @@
<dependency>
<groupId>org.wymiwyg</groupId>
<artifactId>wrhapi</artifactId>
- <version>0.8.1</version>
+ <version>0.8.2-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.wymiwyg</groupId>
