You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by it...@apache.org on 2010/08/11 09:10:11 UTC

svn commit: r984310 - in /incubator/clerezza/trunk/org.apache.clerezza.parent: ./ org.apache.clerezza.platform.dashboard.webinterface/ org.apache.clerezza.platform.dashboard.webinterface/src/ org.apache.clerezza.platform.dashboard.webinterface/src/main...

Author: ito
Date: Wed Aug 11 07:10:10 2010
New Revision: 984310

URL: http://svn.apache.org/viewvc?rev=984310&view=rev
Log:
CLEREZZA-256 moved dashboard webinterface to a new project

Added:
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard.webinterface/   (with props)
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard.webinterface/NOTICE.txt
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard.webinterface/pom.xml
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard.webinterface/src/
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard.webinterface/src/main/
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard.webinterface/src/main/java/
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard.webinterface/src/main/java/org/
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard.webinterface/src/main/java/org/apache/
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard.webinterface/src/main/java/org/apache/clerezza/
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard.webinterface/src/main/java/org/apache/clerezza/platform/
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard.webinterface/src/main/java/org/apache/clerezza/platform/dashboard/
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard.webinterface/src/main/java/org/apache/clerezza/platform/dashboard/webinterface/
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard.webinterface/src/main/java/org/apache/clerezza/platform/dashboard/webinterface/DashBoard.java
      - copied, changed from r983660, 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/DashBoard.java
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard.webinterface/src/main/resources/
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard.webinterface/src/main/resources/org/
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard.webinterface/src/main/resources/org/apache/
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard.webinterface/src/main/resources/org/apache/clerezza/
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard.webinterface/src/main/resources/org/apache/clerezza/platform/
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard.webinterface/src/main/resources/org/apache/clerezza/platform/dashboard/
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard.webinterface/src/main/resources/org/apache/clerezza/platform/dashboard/webinterface/
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard.webinterface/src/main/resources/org/apache/clerezza/platform/dashboard/webinterface/dashboard-template.xhtml
      - copied unchanged from r983660, incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard/org.apache.clerezza.platform.dashboard.core/src/main/resources/org/apache/clerezza/platform/dashboard/dashboard-template.xhtml
Removed:
    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/DashBoard.java
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard/org.apache.clerezza.platform.dashboard.core/src/main/resources/org/apache/clerezza/platform/dashboard/dashboard-template.xhtml
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard/org.apache.clerezza.platform.dashboard.core/src/main/resources/org/apache/clerezza/platform/dashboard/ontology/dashboard.rdf
Modified:
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard/pom.xml
    incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/pom.xml
    incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml

Propchange: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard.webinterface/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Aug 11 07:10:10 2010
@@ -0,0 +1 @@
+target

Added: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard.webinterface/NOTICE.txt
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard.webinterface/NOTICE.txt?rev=984310&view=auto
==============================================================================
    (empty)

Added: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard.webinterface/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard.webinterface/pom.xml?rev=984310&view=auto
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard.webinterface/pom.xml (added)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard.webinterface/pom.xml Wed Aug 11 07:10:10 2010
@@ -0,0 +1,65 @@
+<?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>
+		<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.dashboard.webinterface</artifactId>
+	<packaging>bundle</packaging>
+	<version>0.1-incubating-SNAPSHOT</version>
+	<name>Clerezza - Platform Dashboard Webinterface</name>
+	<description>Provides a dashboard</description>
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.wymiwyg</groupId>
+			<artifactId>wrhapi</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>javax.ws.rs</groupId>
+			<artifactId>jsr311-api</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.utils</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.platform.typerendering.scalaserverpages</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.clerezza</groupId>
+			<artifactId>org.apache.clerezza.jaxrs.utils</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.clerezza</groupId>
+			<artifactId>org.apache.clerezza.jaxrs.extensions</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.clerezza</groupId>
+			<artifactId>org.apache.clerezza.platform.dashboard.ontologies</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.felix</groupId>
+			<artifactId>org.apache.felix.scr.annotations</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.clerezza</groupId>
+			<artifactId>org.apache.clerezza.platform.dashboard.core</artifactId>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file

Copied: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard.webinterface/src/main/java/org/apache/clerezza/platform/dashboard/webinterface/DashBoard.java (from r983660, 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/DashBoard.java)
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard.webinterface/src/main/java/org/apache/clerezza/platform/dashboard/webinterface/DashBoard.java?p2=incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard.webinterface/src/main/java/org/apache/clerezza/platform/dashboard/webinterface/DashBoard.java&p1=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/DashBoard.java&r1=983660&r2=984310&rev=984310&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/DashBoard.java (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard.webinterface/src/main/java/org/apache/clerezza/platform/dashboard/webinterface/DashBoard.java Wed Aug 11 07:10:10 2010
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.clerezza.platform.dashboard;
+package org.apache.clerezza.platform.dashboard.webinterface;
 
 import java.net.URL;
 
@@ -38,6 +38,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.clerezza.jaxrs.utils.RedirectUtil;
 import org.apache.clerezza.jaxrs.utils.TrailingSlash;
+import org.apache.clerezza.platform.dashboard.GlobalMenuItem;
+import org.apache.clerezza.platform.dashboard.GlobalMenuItemsProvider;
 import org.apache.clerezza.platform.dashboard.ontologies.DASHBOARD;
 import org.apache.clerezza.platform.typerendering.RenderletManager;
 import org.apache.clerezza.platform.typerendering.scalaserverpages.ScalaServerPagesRenderlet;

Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard/pom.xml?rev=984310&r1=984309&r2=984310&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard/pom.xml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.dashboard/pom.xml Wed Aug 11 07:10:10 2010
@@ -10,7 +10,7 @@
 	<packaging>pom</packaging>
 	<version>0.4-incubating-SNAPSHOT</version>
 	<name>Clerezza - Platform Dashboard</name>
-	<description>Provides a dashboard and a global contextual menu.</description>
+	<description>Provides a global contextual menu.</description>
 	
 	<modules>
 		<module>org.apache.clerezza.platform.dashboard.ontologies</module>

Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/pom.xml?rev=984310&r1=984309&r2=984310&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/pom.xml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.platform.launcher.storageless.parent/pom.xml Wed Aug 11 07:10:10 2010
@@ -262,6 +262,11 @@
 		</dependency>
 		<dependency>
 			<groupId>org.apache.clerezza</groupId>
+			<artifactId>org.apache.clerezza.platform.dashboard.webinterface</artifactId>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.clerezza</groupId>
 			<artifactId>org.apache.clerezza.web.fileserver</artifactId>
 			<scope>runtime</scope>
 		</dependency>

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=984310&r1=984309&r2=984310&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml Wed Aug 11 07:10:10 2010
@@ -47,6 +47,7 @@
 		<module>org.apache.clerezza.platform.content</module>
 		<module>org.apache.clerezza.platform.content.representations</module>
 		<module>org.apache.clerezza.platform.dashboard</module>
+		<module>org.apache.clerezza.platform.dashboard.webinterface</module>
 		<module>org.apache.clerezza.platform.documentation</module>
 		<module>org.apache.clerezza.platform.documentation.viewer</module>
 		<module>org.apache.clerezza.platform.enrichment</module>
@@ -664,6 +665,11 @@
 			</dependency>
 			<dependency>
 				<groupId>org.apache.clerezza</groupId>
+				<artifactId>org.apache.clerezza.platform.dashboard.webinterface</artifactId>
+				<version>0.1-incubating-SNAPSHOT</version>
+			</dependency>
+			<dependency>
+				<groupId>org.apache.clerezza</groupId>
 				<artifactId>org.apache.clerezza.platform.enrichment</artifactId>
 				<version>0.1-incubating-SNAPSHOT</version>
 			</dependency>