Author: reto
Date: Tue Jan 5 10:35:03 2010
New Revision: 895976
URL: http://svn.apache.org/viewvc?rev=895976&view=rev
Log:
CLEREZZA-53: no longer deleting the context of a script when updating
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.scripting.scriptmanager/src/main/java/org/apache/clerezza/platform/scripting/scriptmanager/ScriptManager.java
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.scripting.scriptmanager/src/main/java/org/apache/clerezza/platform/scripting/scriptmanager/ScriptManager.java
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.scripting.scriptmanager/src/main/java/org/apache/clerezza/platform/scripting/scriptmanager/ScriptManager.java?rev=895976&r1=895975&r2=895976&view=diff
==============================================================================
---
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.scripting.scriptmanager/src/main/java/org/apache/clerezza/platform/scripting/scriptmanager/ScriptManager.java
(original)
+++
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.scripting.scriptmanager/src/main/java/org/apache/clerezza/platform/scripting/scriptmanager/ScriptManager.java
Tue Jan 5 10:35:03 2010
@@ -483,8 +483,7 @@
byte[] scriptFileBytes = formFile.getContent();
- // delete all existing informations
- deleteScript(scriptUri);
+
if (scriptFileBytes == null || (scriptFileBytes.length == 0)) {
scriptFileBytes = scriptCode.getBytes();
@@ -517,8 +516,7 @@
public Response deleteScript(@FormParam("script") String script) {
UriRef scriptUri = new UriRef(script);
- //remove Script
- deleteScript(scriptUri);
+
//remove execution URIs
Set<NonLiteral> scriptGeneratedResources =
@@ -527,6 +525,9 @@
deleteExecutionUri(scriptGenratedResource, scriptUri);
}
+ //remove Script
+ deleteScript(scriptUri);
+
logger.info("script {} deleted", scriptUri);
return Response.status(Status.CREATED).build();
@@ -542,9 +543,15 @@
MGraph contentGraph = cgProvider.getContentGraph();
+
+
contentHandler.put(scriptUri, mediaType,
scriptFileBytes);
GraphNode scriptNode = new GraphNode(scriptUri,
contentGraph);
+ scriptNode.deleteProperties(DCTERMS.title);
+ scriptNode.deleteProperties(SCRIPT.scriptLanguage);
+
scriptNode.deleteProperties(SCRIPT.scriptLanguageVersion);
+ scriptNode.deleteProperties(SCRIPT.producedType);
scriptNode.addProperty(RDF.type, SCRIPT.Script);
scriptNode.addProperty(DCTERMS.title,
LiteralFactory.getInstance().
