You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2010/04/03 19:40:00 UTC
svn commit: r930548 - in
/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config:
./ src/main/java/org/apache/clerezza/platform/config/
src/main/resources/org/ src/main/resources/org/apache/
src/main/resources/org/apach...
Author: reto
Date: Sat Apr 3 17:39:59 2010
New Revision: 930548
URL: http://svn.apache.org/viewvc?rev=930548&view=rev
Log:
CLEREZZA-139: configuration gui
Added:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/src/main/resources/org/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/src/main/resources/org/apache/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/src/main/resources/org/apache/clerezza/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/src/main/resources/org/apache/clerezza/platform/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/src/main/resources/org/apache/clerezza/platform/config/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/src/main/resources/org/apache/clerezza/platform/config/config.ssp
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/src/main/resources/org/apache/clerezza/platform/config/staticweb/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/src/main/resources/org/apache/clerezza/platform/config/staticweb/js/
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/src/main/resources/org/apache/clerezza/platform/config/staticweb/js/platformconfig.js
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/pom.xml
incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/pom.xml?rev=930548&r1=930547&r2=930548&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/pom.xml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/pom.xml Sat Apr 3 17:39:59 2010
@@ -1,42 +1,56 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>org.apache.clerezza.parent</artifactId>
- <groupId>org.apache.clerezza</groupId>
- <version>0.2-incubating-SNAPSHOT</version>
- </parent>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>org.apache.clerezza.platform.config</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
- <packaging>bundle</packaging>
- <name>Clerezza - Platform Configuration</name>
- <description>This bundles initializes the system graph with default values.
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.parent</artifactId>
+ <version>0.2-incubating-SNAPSHOT</version>
+ </parent>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.platform.config</artifactId>
+ <version>0.3-incubating-SNAPSHOT</version>
+ <packaging>bundle</packaging>
+ <name>Clerezza - Platform Configuration</name>
+ <description>This bundles initializes the system graph with default values,
+ provides a service to access configuration default values, and a GUI to
+ edit such values.
</description>
- <dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>org.apache.clerezza.rdf.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>org.apache.clerezza.rdf.ontologies</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>org.apache.clerezza.rdf.utils</artifactId>
- </dependency>
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.rdf.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.rdf.ontologies</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.rdf.utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.platform.dashboard.core</artifactId>
+ </dependency>
<dependency>
- <groupId>org.apache.clerezza</groupId>
+ <groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.platform.graphprovider.content</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- </dependency>
- </dependencies>
-</project>
\ No newline at end of file
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.web.fileserver</artifactId>
+ </dependency>
+ </dependencies>
+</project>
+
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java?rev=930548&r1=930547&r2=930548&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/src/main/java/org/apache/clerezza/platform/config/PlatformConfig.java Sat Apr 3 17:39:59 2010
@@ -32,6 +32,7 @@ import org.apache.clerezza.rdf.core.NonL
import org.apache.clerezza.rdf.core.Resource;
import org.apache.clerezza.rdf.core.Triple;
import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.rdf.core.access.LockableMGraph;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.rdf.core.impl.TripleImpl;
@@ -50,7 +51,7 @@ import org.apache.clerezza.rdf.utils.Gra
public class PlatformConfig {
@Reference(target = SystemConfig.SYSTEM_GRAPH_FILTER)
- private MGraph systemGraph;
+ private LockableMGraph systemGraph;
private BundleContext context;
private static String DEFAULT_PORT = "8080";
private static final String CONFIG_GRAPH_STRING =
@@ -77,7 +78,7 @@ public class PlatformConfig {
* @return the base URI of the Clerezza platform
*/
public UriRef getDefaultBaseUri() {
- Iterator<Resource> triples = new GraphNode(getPlatformInstance(), systemGraph).
+ Iterator<Resource> triples = getPlatformInstance().
getObjects(PLATFORM.defaultBaseUri);
if (triples.hasNext()) {
return (UriRef) triples.next();
@@ -93,7 +94,18 @@ public class PlatformConfig {
}
}
- private NonLiteral getPlatformInstance() throws RuntimeException {
+ /**
+ * Returns the platforminstance as <code>GraphNode</code> of the system
+ * graph (a LockableMGraph). Access controls applies to the system graph
+ * instance underlying the <code>GraphNode</code>.
+ *
+ * @return
+ */
+ public GraphNode getPlatformInstance() {
+ return new GraphNode(getPlatformInstanceResource(), systemGraph);
+ }
+
+ private NonLiteral getPlatformInstanceResource() {
Iterator<Triple> instances = systemGraph.filter(null, RDF.type, PLATFORM.Instance);
if (!instances.hasNext()) {
throw new RuntimeException("No Platform:Instance in system graph.");
@@ -107,7 +119,7 @@ public class PlatformConfig {
* @return the base URI of the Clerezza platform
*/
public Set<UriRef> getBaseUris() {
- Iterator<Resource> baseUrisIter = new GraphNode(getPlatformInstance(), systemGraph).
+ Iterator<Resource> baseUrisIter = getPlatformInstance().
getObjects(PLATFORM.baseUri);
Set<UriRef> baseUris = new HashSet<UriRef>();
while (baseUrisIter.hasNext()) {
@@ -124,7 +136,7 @@ public class PlatformConfig {
* @param baseUri The base URI which will be added to the platform instance
*/
public void addBaseUri(UriRef baseUri) {
- systemGraph.add(new TripleImpl(getPlatformInstance(), PLATFORM.baseUri, baseUri));
+ systemGraph.add(new TripleImpl(getPlatformInstanceResource(), PLATFORM.baseUri, baseUri));
}
/**
@@ -133,7 +145,7 @@ public class PlatformConfig {
* @param baseUri The base URI which will be removed from the platform instance
*/
public void removeBaseUri(UriRef baseUri) {
- systemGraph.remove(new TripleImpl(getPlatformInstance(), PLATFORM.baseUri, baseUri));
+ systemGraph.remove(new TripleImpl(getPlatformInstanceResource(), PLATFORM.baseUri, baseUri));
}
protected void activate(ComponentContext componentContext) {
Added: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/src/main/resources/org/apache/clerezza/platform/config/config.ssp
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/src/main/resources/org/apache/clerezza/platform/config/config.ssp?rev=930548&view=auto
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/src/main/resources/org/apache/clerezza/platform/config/config.ssp (added)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/src/main/resources/org/apache/clerezza/platform/config/config.ssp Sat Apr 3 17:39:59 2010
@@ -0,0 +1,28 @@
+def platform(s: Any) = new UriRef("http://clerezza.org/2009/08/platform#"+s)
+resultDocModifier.addStyleSheet("style/form.css");
+resultDocModifier.addScriptReference("/jquery/jquery-1.3.2.min.js");
+resultDocModifier.addScriptReference("/admin/configuration/js/platformconfig.js");
+resultDocModifier.addStyleSheet("/yui/2/container/assets/container-core.css");
+resultDocModifier.addScriptReference("/yui/2/yahoo-dom-event/yahoo-dom-event.js");
+resultDocModifier.addScriptReference("/yui/2/element/element-min.js");
+resultDocModifier.addScriptReference("/yui/2/container/container-min.js");
+resultDocModifier.addScriptReference("/scripts/alert-message.js");
+resultDocModifier.addScriptReference("/scripts/ajax-options.js");
+resultDocModifier.addScriptReference("/scripts/modification-status.js");
+resultDocModifier.addScripts("ModificationStatus.watchElements(\"input\");");
+
+resultDocModifier.setTitle("Apache Clerezza Configuration");
+resultDocModifier.addNodes2Elem("tx-module", <h1>Apache Clerezza Configuration</h1>);
+resultDocModifier.addNodes2Elem("tx-contextual-buttons-ol", <li><a class="tx-button tx-button-create " id="saveButton" href="#">Save</a></li>);
+<div id="tx-content">
+ <fieldset>
+ <legend></legend>
+ <ol>
+ <li class="tx-line">
+ <label for="defaultBaseUri">Default Base URI</label>
+ <input id="defaultBaseUri" name="defaultBaseUri" value={res/platform("defaultBaseUri")*}/>
+
+ </li>
+ </ol>
+ </fieldset>
+</div>
Added: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/src/main/resources/org/apache/clerezza/platform/config/staticweb/js/platformconfig.js
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/src/main/resources/org/apache/clerezza/platform/config/staticweb/js/platformconfig.js?rev=930548&view=auto
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/src/main/resources/org/apache/clerezza/platform/config/staticweb/js/platformconfig.js (added)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.config/src/main/resources/org/apache/clerezza/platform/config/staticweb/js/platformconfig.js Sat Apr 3 17:39:59 2010
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+$(document).ready(function() {
+ $('#saveButton').click(function(){
+
+ if(isUrl($('#defaultBaseUri').val())){
+ var q = "Are you sure you want to change the URI to "+$('#defaultBaseUri').val();
+ AlertMessage.show(function(){
+
+ var data = "defaultBaseUri=" + encodeURIComponent($("#defaultBaseUri").val());
+ var options = new AjaxOptions("platform-config", "Save Config", function() {
+ ModificationStatus.isModified = false;
+ });
+ options.type = "POST";
+ options.url = "/admin/configuration/";
+ options.data = data;
+ $.ajax(options);
+ }, q , "Change Config?");
+
+ }else {
+ AlertMessage.show(function(){}, " No valid URL ", "Error", "OK");
+ }
+
+
+
+
+ })
+})
+
+
+
+function isUrl(s) {
+ var regexp = /(http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?/
+ return regexp.test(s);
+}
+