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 2014/01/04 20:17:17 UTC
[4/4] git commit: CLEREZZA-858: api for globalmenu moved to own
project
CLEREZZA-858: api for globalmenu moved to own project
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/dcc9067a
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/dcc9067a
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/dcc9067a
Branch: refs/heads/master
Commit: dcc9067aabbb43d0d801696fc69589acabe2f44e
Parents: 9e34266
Author: retobg <re...@apache.org>
Authored: Sat Jan 4 20:16:25 2014 +0100
Committer: retobg <re...@apache.org>
Committed: Sat Jan 4 20:16:25 2014 +0100
----------------------------------------------------------------------
jaxrs.stanbol.fragments/pom.xml | 2 +-
.../platform.accountcontrolpanel.core/pom.xml | 2 +-
.../platform.concepts.core/pom.xml | 2 +-
platform.config.gui/pom.xml | 2 +-
platform.dashboard.webinterface/pom.xml | 2 +-
.../platform.dashboard.core/pom.xml | 5 +
.../platform/globalmenu/GlobalMenuItem.java | 187 -----------------
.../globalmenu/GlobalMenuItemsProvider.java | 39 ----
.../platform.dashboard.tests/pom.xml | 2 +-
platform.globalmenu.api/LICENSE | 201 +++++++++++++++++++
platform.globalmenu.api/pom.xml | 49 +++++
.../platform/globalmenu/GlobalMenuItem.java | 187 +++++++++++++++++
.../globalmenu/GlobalMenuItemsProvider.java | 39 ++++
platform.launcher.storageless.parent/pom.xml | 6 +
platform.logging/core/pom.xml | 2 +-
platform.scripting.scriptmanager/pom.xml | 2 +-
platform.testing/pom.xml | 2 +-
.../osgi/FelixClerezzaPlatformTest.java | 2 +-
platform.typerendering.gui/pom.xml | 2 +-
platform.usermanager.webinterface/pom.xml | 2 +-
pom.xml | 1 +
provisioning/rdf.web/pom.xml | 2 +-
rdf.locking/pom.xml | 2 +-
rdf.web/rdf.web.core/pom.xml | 2 +-
24 files changed, 503 insertions(+), 241 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/dcc9067a/jaxrs.stanbol.fragments/pom.xml
----------------------------------------------------------------------
diff --git a/jaxrs.stanbol.fragments/pom.xml b/jaxrs.stanbol.fragments/pom.xml
index e90c6b4..0526aca 100644
--- a/jaxrs.stanbol.fragments/pom.xml
+++ b/jaxrs.stanbol.fragments/pom.xml
@@ -58,7 +58,7 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
- <artifactId>platform.dashboard.core</artifactId>
+ <artifactId>platform.globalmenu.api</artifactId>
<version>0.3-SNAPSHOT</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/dcc9067a/platform.accountcontrolpanel/platform.accountcontrolpanel.core/pom.xml
----------------------------------------------------------------------
diff --git a/platform.accountcontrolpanel/platform.accountcontrolpanel.core/pom.xml b/platform.accountcontrolpanel/platform.accountcontrolpanel.core/pom.xml
index b5203a6..80de585 100644
--- a/platform.accountcontrolpanel/platform.accountcontrolpanel.core/pom.xml
+++ b/platform.accountcontrolpanel/platform.accountcontrolpanel.core/pom.xml
@@ -151,7 +151,7 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
- <artifactId>platform.dashboard.core</artifactId>
+ <artifactId>platform.globalmenu.api</artifactId>
<version>0.3-SNAPSHOT</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/dcc9067a/platform.concepts/platform.concepts.core/pom.xml
----------------------------------------------------------------------
diff --git a/platform.concepts/platform.concepts.core/pom.xml b/platform.concepts/platform.concepts.core/pom.xml
index fff7dfd..5978488 100644
--- a/platform.concepts/platform.concepts.core/pom.xml
+++ b/platform.concepts/platform.concepts.core/pom.xml
@@ -87,7 +87,7 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
- <artifactId>platform.dashboard.core</artifactId>
+ <artifactId>platform.globalmenu.api</artifactId>
<version>0.3-SNAPSHOT</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/dcc9067a/platform.config.gui/pom.xml
----------------------------------------------------------------------
diff --git a/platform.config.gui/pom.xml b/platform.config.gui/pom.xml
index 1ef5e61..c8bdf6a 100644
--- a/platform.config.gui/pom.xml
+++ b/platform.config.gui/pom.xml
@@ -65,7 +65,7 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
- <artifactId>platform.dashboard.core</artifactId>
+ <artifactId>platform.globalmenu.api</artifactId>
<version>0.3-SNAPSHOT</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/dcc9067a/platform.dashboard.webinterface/pom.xml
----------------------------------------------------------------------
diff --git a/platform.dashboard.webinterface/pom.xml b/platform.dashboard.webinterface/pom.xml
index 0985177..c70263f 100644
--- a/platform.dashboard.webinterface/pom.xml
+++ b/platform.dashboard.webinterface/pom.xml
@@ -84,7 +84,7 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
- <artifactId>platform.dashboard.core</artifactId>
+ <artifactId>platform.globalmenu.api</artifactId>
<version>0.3-SNAPSHOT</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/dcc9067a/platform.dashboard/platform.dashboard.core/pom.xml
----------------------------------------------------------------------
diff --git a/platform.dashboard/platform.dashboard.core/pom.xml b/platform.dashboard/platform.dashboard.core/pom.xml
index f5bfcfb..6e1f65b 100644
--- a/platform.dashboard/platform.dashboard.core/pom.xml
+++ b/platform.dashboard/platform.dashboard.core/pom.xml
@@ -84,6 +84,11 @@
<artifactId>platform.typerendering.core</artifactId>
<version>0.3-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>platform.globalmenu.api</artifactId>
+ <version>0.3-SNAPSHOT</version>
+ </dependency>
</dependencies>
<build>
<plugins>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/dcc9067a/platform.dashboard/platform.dashboard.core/src/main/java/org/apache/clerezza/platform/globalmenu/GlobalMenuItem.java
----------------------------------------------------------------------
diff --git a/platform.dashboard/platform.dashboard.core/src/main/java/org/apache/clerezza/platform/globalmenu/GlobalMenuItem.java b/platform.dashboard/platform.dashboard.core/src/main/java/org/apache/clerezza/platform/globalmenu/GlobalMenuItem.java
deleted file mode 100644
index e552bad..0000000
--- a/platform.dashboard/platform.dashboard.core/src/main/java/org/apache/clerezza/platform/globalmenu/GlobalMenuItem.java
+++ /dev/null
@@ -1,187 +0,0 @@
-/*
- * 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.
- */
-package org.apache.clerezza.platform.globalmenu;
-
-/**
- * This class keeps information about an item for the global menu.
- *
- * @author mir
- */
-public class GlobalMenuItem implements Comparable<GlobalMenuItem> {
-
- private String path;
- private String label;
- private String description;
- private String identifier;
- private int priority;
- private String groupIdentifier;
-
- /**
- * Creates a new <code>GlobalMenuItem</code>.
- *
- * @param relativeUri of the resource to be shown in the menu.
- * @param identifier The identifier of the menu item.
- * @param label Specifies the label of the menu entry.
- * @param priority the priority, higher numbers appear first in the menu
- * @param groupIdentifier Specifies the the identifier of the group of which
- * the menu item is part.
- */
- public GlobalMenuItem(String path, String identifier, String label,
- int priority, String groupIdentifier) {
- if (label == null) {
- throw new IllegalArgumentException("label may not be null");
- }
- this.path = path;
- this.label = label;
- this.identifier = identifier;
- this.priority = priority;
- this.groupIdentifier = groupIdentifier;
- }
-
- /**
- * Creates a new <code>GlobalMenuItem</code>.
- *
- * @param relativeUri of the resource to be shown in the menu.
- * @param identifier The identifier of the menu item.
- * @param label Specifies the label of the menu entry.
- * @param description The description of the menu item.
- * @param priority the priority, higher numbers appear first in the menu
- * @param groupIdentifier Specifies the the identifier of the group of which
- * the menu item is part.
- */
- public GlobalMenuItem(String path, String identifier, String label, String description,
- int priority, String groupIdentifier) {
- if (label == null) {
- throw new IllegalArgumentException("label may not be null");
- }
- this.path = path;
- this.label = label;
- this.description = description;
- this.identifier = identifier;
- this.priority = priority;
- this.groupIdentifier = groupIdentifier;
- }
-
- /**
- * Returns the path of the resource to be shown in the menu. The
- * path is additional to the bundle prefix and if existing to the
- * <code>javax.ws.rs.Path</code> annotation of the
- * <code>GlobalMenuItemsProvider</code> that returned this
- * <code>GlobalMenuItem</code>.
- * @return the path
- */
- public String getPath() {
- return path;
- }
-
- /**
- * Returns the label of the menu entry
- * @return the label
- */
- public String getLabel() {
- return label;
- }
-
- /**
- * Returns the description of the menu entry.
- * @return the groupIdentifier
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * Return the identifier of the menu entry.
- *
- * @return
- */
- public String getIdentifier() {
- return identifier;
- }
-
- /**
- * Returns the the priority within the group, which is used for sorting
- * the menu Items, higher numbers appear first in the menu
- * @return the priority
- */
- public int getPriority() {
- return priority;
- }
-
- /**
- * Returns the the identifier of the group of which this menu item is part,
- * null if this is a top-level item.
- * @return the groupIdentifier
- */
- public String getGroupIdentifier() {
- return groupIdentifier;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- final GlobalMenuItem other = (GlobalMenuItem) obj;
- if ((this.path == null) ? (other.path != null) : !this.path.equals(other.path)) {
- return false;
- }
- if (!this.label.equals(other.label)) {
- return false;
- }
- if ((this.description == null) ? (other.description != null) : !this.description.equals(other.description)) {
- return false;
- }
- if (this.priority != other.priority) {
- return false;
- }
- if ((this.groupIdentifier == null) ? (other.groupIdentifier != null) : !this.groupIdentifier.equals(other.groupIdentifier)) {
- return false;
- }
- return true;
- }
-
- @Override
- public int hashCode() {
- int hash = 5;
- hash = 53 * hash + (this.path != null ? this.path.hashCode() : 0);
- hash = 53 * hash + this.label.hashCode();
- hash = 53 * hash + (this.description != null ? this.description.hashCode() : 0);
- hash = 53 * hash + this.priority;
- hash = 53 * hash + (this.groupIdentifier != null ? this.groupIdentifier.hashCode() : 0);
- return hash;
- }
-
-
-
- @Override
- public int compareTo(GlobalMenuItem o) {
- if (getPriority() == o.getPriority()) {
- if (this.equals(o)) {
- return 0;
- } else {
- return getLabel().compareTo(o.getLabel());
- }
- }
- return o.getPriority() - getPriority();
- }
-}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/dcc9067a/platform.dashboard/platform.dashboard.core/src/main/java/org/apache/clerezza/platform/globalmenu/GlobalMenuItemsProvider.java
----------------------------------------------------------------------
diff --git a/platform.dashboard/platform.dashboard.core/src/main/java/org/apache/clerezza/platform/globalmenu/GlobalMenuItemsProvider.java b/platform.dashboard/platform.dashboard.core/src/main/java/org/apache/clerezza/platform/globalmenu/GlobalMenuItemsProvider.java
deleted file mode 100644
index f4ff7ce..0000000
--- a/platform.dashboard/platform.dashboard.core/src/main/java/org/apache/clerezza/platform/globalmenu/GlobalMenuItemsProvider.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.
- */
-package org.apache.clerezza.platform.globalmenu;
-
-import java.util.Set;
-
-/**
- * An implementation of this interface provides a set of
- * <code>GlobalMenuItem</code>S. A <code>GlobalMenuItem</code> represents an
- * item in the global menu of the Clerezza Platform.
- *
- * @author mir
- */
-public interface GlobalMenuItemsProvider {
-
- /**
- * Returns a <code>Set</code> of <code>GlobalMenuItem</code>S. If there is
- * no <code>GlobalMenuItem</code> available (e.g. the current user has not
- * the needed permissions) then the returned set is empty.
- * @return
- */
- public Set<GlobalMenuItem> getMenuItems();
-}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/dcc9067a/platform.dashboard/platform.dashboard.tests/pom.xml
----------------------------------------------------------------------
diff --git a/platform.dashboard/platform.dashboard.tests/pom.xml b/platform.dashboard/platform.dashboard.tests/pom.xml
index b3b2f2a..6e2a418 100644
--- a/platform.dashboard/platform.dashboard.tests/pom.xml
+++ b/platform.dashboard/platform.dashboard.tests/pom.xml
@@ -105,7 +105,7 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
- <artifactId>platform.dashboard.core</artifactId>
+ <artifactId>platform.globalmenu.api</artifactId>
<scope>provided</scope>
<version>0.3-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/dcc9067a/platform.globalmenu.api/LICENSE
----------------------------------------------------------------------
diff --git a/platform.globalmenu.api/LICENSE b/platform.globalmenu.api/LICENSE
new file mode 100644
index 0000000..261eeb9
--- /dev/null
+++ b/platform.globalmenu.api/LICENSE
@@ -0,0 +1,201 @@
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
http://git-wip-us.apache.org/repos/asf/clerezza/blob/dcc9067a/platform.globalmenu.api/pom.xml
----------------------------------------------------------------------
diff --git a/platform.globalmenu.api/pom.xml b/platform.globalmenu.api/pom.xml
new file mode 100644
index 0000000..a4e5b28
--- /dev/null
+++ b/platform.globalmenu.api/pom.xml
@@ -0,0 +1,49 @@
+<?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" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<!--
+
+ 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.
+
+-->
+
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>clerezza</artifactId>
+ <version>0.5-SNAPSHOT</version>
+ <relativePath>../parent</relativePath>
+ </parent>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>platform.globalmenu.api</artifactId>
+ <packaging>bundle</packaging>
+ <version>0.3-SNAPSHOT</version>
+ <name>Clerezza - Platform GlobalMenu API</name>
+ <description>
+ The API for providing entries to the global clerezza menu
+ </description>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/clerezza/blob/dcc9067a/platform.globalmenu.api/src/main/java/org/apache/clerezza/platform/globalmenu/GlobalMenuItem.java
----------------------------------------------------------------------
diff --git a/platform.globalmenu.api/src/main/java/org/apache/clerezza/platform/globalmenu/GlobalMenuItem.java b/platform.globalmenu.api/src/main/java/org/apache/clerezza/platform/globalmenu/GlobalMenuItem.java
new file mode 100644
index 0000000..e552bad
--- /dev/null
+++ b/platform.globalmenu.api/src/main/java/org/apache/clerezza/platform/globalmenu/GlobalMenuItem.java
@@ -0,0 +1,187 @@
+/*
+ * 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.
+ */
+package org.apache.clerezza.platform.globalmenu;
+
+/**
+ * This class keeps information about an item for the global menu.
+ *
+ * @author mir
+ */
+public class GlobalMenuItem implements Comparable<GlobalMenuItem> {
+
+ private String path;
+ private String label;
+ private String description;
+ private String identifier;
+ private int priority;
+ private String groupIdentifier;
+
+ /**
+ * Creates a new <code>GlobalMenuItem</code>.
+ *
+ * @param relativeUri of the resource to be shown in the menu.
+ * @param identifier The identifier of the menu item.
+ * @param label Specifies the label of the menu entry.
+ * @param priority the priority, higher numbers appear first in the menu
+ * @param groupIdentifier Specifies the the identifier of the group of which
+ * the menu item is part.
+ */
+ public GlobalMenuItem(String path, String identifier, String label,
+ int priority, String groupIdentifier) {
+ if (label == null) {
+ throw new IllegalArgumentException("label may not be null");
+ }
+ this.path = path;
+ this.label = label;
+ this.identifier = identifier;
+ this.priority = priority;
+ this.groupIdentifier = groupIdentifier;
+ }
+
+ /**
+ * Creates a new <code>GlobalMenuItem</code>.
+ *
+ * @param relativeUri of the resource to be shown in the menu.
+ * @param identifier The identifier of the menu item.
+ * @param label Specifies the label of the menu entry.
+ * @param description The description of the menu item.
+ * @param priority the priority, higher numbers appear first in the menu
+ * @param groupIdentifier Specifies the the identifier of the group of which
+ * the menu item is part.
+ */
+ public GlobalMenuItem(String path, String identifier, String label, String description,
+ int priority, String groupIdentifier) {
+ if (label == null) {
+ throw new IllegalArgumentException("label may not be null");
+ }
+ this.path = path;
+ this.label = label;
+ this.description = description;
+ this.identifier = identifier;
+ this.priority = priority;
+ this.groupIdentifier = groupIdentifier;
+ }
+
+ /**
+ * Returns the path of the resource to be shown in the menu. The
+ * path is additional to the bundle prefix and if existing to the
+ * <code>javax.ws.rs.Path</code> annotation of the
+ * <code>GlobalMenuItemsProvider</code> that returned this
+ * <code>GlobalMenuItem</code>.
+ * @return the path
+ */
+ public String getPath() {
+ return path;
+ }
+
+ /**
+ * Returns the label of the menu entry
+ * @return the label
+ */
+ public String getLabel() {
+ return label;
+ }
+
+ /**
+ * Returns the description of the menu entry.
+ * @return the groupIdentifier
+ */
+ public String getDescription() {
+ return description;
+ }
+
+ /**
+ * Return the identifier of the menu entry.
+ *
+ * @return
+ */
+ public String getIdentifier() {
+ return identifier;
+ }
+
+ /**
+ * Returns the the priority within the group, which is used for sorting
+ * the menu Items, higher numbers appear first in the menu
+ * @return the priority
+ */
+ public int getPriority() {
+ return priority;
+ }
+
+ /**
+ * Returns the the identifier of the group of which this menu item is part,
+ * null if this is a top-level item.
+ * @return the groupIdentifier
+ */
+ public String getGroupIdentifier() {
+ return groupIdentifier;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (obj == null) {
+ return false;
+ }
+ if (getClass() != obj.getClass()) {
+ return false;
+ }
+ final GlobalMenuItem other = (GlobalMenuItem) obj;
+ if ((this.path == null) ? (other.path != null) : !this.path.equals(other.path)) {
+ return false;
+ }
+ if (!this.label.equals(other.label)) {
+ return false;
+ }
+ if ((this.description == null) ? (other.description != null) : !this.description.equals(other.description)) {
+ return false;
+ }
+ if (this.priority != other.priority) {
+ return false;
+ }
+ if ((this.groupIdentifier == null) ? (other.groupIdentifier != null) : !this.groupIdentifier.equals(other.groupIdentifier)) {
+ return false;
+ }
+ return true;
+ }
+
+ @Override
+ public int hashCode() {
+ int hash = 5;
+ hash = 53 * hash + (this.path != null ? this.path.hashCode() : 0);
+ hash = 53 * hash + this.label.hashCode();
+ hash = 53 * hash + (this.description != null ? this.description.hashCode() : 0);
+ hash = 53 * hash + this.priority;
+ hash = 53 * hash + (this.groupIdentifier != null ? this.groupIdentifier.hashCode() : 0);
+ return hash;
+ }
+
+
+
+ @Override
+ public int compareTo(GlobalMenuItem o) {
+ if (getPriority() == o.getPriority()) {
+ if (this.equals(o)) {
+ return 0;
+ } else {
+ return getLabel().compareTo(o.getLabel());
+ }
+ }
+ return o.getPriority() - getPriority();
+ }
+}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/dcc9067a/platform.globalmenu.api/src/main/java/org/apache/clerezza/platform/globalmenu/GlobalMenuItemsProvider.java
----------------------------------------------------------------------
diff --git a/platform.globalmenu.api/src/main/java/org/apache/clerezza/platform/globalmenu/GlobalMenuItemsProvider.java b/platform.globalmenu.api/src/main/java/org/apache/clerezza/platform/globalmenu/GlobalMenuItemsProvider.java
new file mode 100644
index 0000000..f4ff7ce
--- /dev/null
+++ b/platform.globalmenu.api/src/main/java/org/apache/clerezza/platform/globalmenu/GlobalMenuItemsProvider.java
@@ -0,0 +1,39 @@
+/*
+ * 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.
+ */
+package org.apache.clerezza.platform.globalmenu;
+
+import java.util.Set;
+
+/**
+ * An implementation of this interface provides a set of
+ * <code>GlobalMenuItem</code>S. A <code>GlobalMenuItem</code> represents an
+ * item in the global menu of the Clerezza Platform.
+ *
+ * @author mir
+ */
+public interface GlobalMenuItemsProvider {
+
+ /**
+ * Returns a <code>Set</code> of <code>GlobalMenuItem</code>S. If there is
+ * no <code>GlobalMenuItem</code> available (e.g. the current user has not
+ * the needed permissions) then the returned set is empty.
+ * @return
+ */
+ public Set<GlobalMenuItem> getMenuItems();
+}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/dcc9067a/platform.launcher.storageless.parent/pom.xml
----------------------------------------------------------------------
diff --git a/platform.launcher.storageless.parent/pom.xml b/platform.launcher.storageless.parent/pom.xml
index c8aee07..f6ad8f7 100644
--- a/platform.launcher.storageless.parent/pom.xml
+++ b/platform.launcher.storageless.parent/pom.xml
@@ -366,6 +366,12 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
+ <artifactId>platform.globalmenu.api</artifactId>
+ <scope>runtime</scope>
+ <version>0.3-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
<artifactId>platform.dashboard.webinterface</artifactId>
<scope>runtime</scope>
<version>0.2-SNAPSHOT</version>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/dcc9067a/platform.logging/core/pom.xml
----------------------------------------------------------------------
diff --git a/platform.logging/core/pom.xml b/platform.logging/core/pom.xml
index 4cf9a60..919fa8a 100644
--- a/platform.logging/core/pom.xml
+++ b/platform.logging/core/pom.xml
@@ -58,7 +58,7 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
- <artifactId>platform.dashboard.core</artifactId>
+ <artifactId>platform.globalmenu.api</artifactId>
<version>0.3-SNAPSHOT</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/dcc9067a/platform.scripting.scriptmanager/pom.xml
----------------------------------------------------------------------
diff --git a/platform.scripting.scriptmanager/pom.xml b/platform.scripting.scriptmanager/pom.xml
index b338604..25995e3 100644
--- a/platform.scripting.scriptmanager/pom.xml
+++ b/platform.scripting.scriptmanager/pom.xml
@@ -82,7 +82,7 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
- <artifactId>platform.dashboard.core</artifactId>
+ <artifactId>platform.globalmenu.api</artifactId>
<version>0.3-SNAPSHOT</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/dcc9067a/platform.testing/pom.xml
----------------------------------------------------------------------
diff --git a/platform.testing/pom.xml b/platform.testing/pom.xml
index 3d76b36..742584d 100644
--- a/platform.testing/pom.xml
+++ b/platform.testing/pom.xml
@@ -212,7 +212,7 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
- <artifactId>platform.dashboard.core</artifactId>
+ <artifactId>platform.globalmenu.api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/dcc9067a/platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/FelixClerezzaPlatformTest.java
----------------------------------------------------------------------
diff --git a/platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/FelixClerezzaPlatformTest.java b/platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/FelixClerezzaPlatformTest.java
index cf53190..4d40749 100644
--- a/platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/FelixClerezzaPlatformTest.java
+++ b/platform.testing/src/test/java/org/apache/clerezza/platform/testing/blackbox/osgi/FelixClerezzaPlatformTest.java
@@ -158,7 +158,7 @@ public class FelixClerezzaPlatformTest {
mavenBundle().groupId("org.apache.clerezza").artifactId(
"org.apache.clerezza.utils.customproperty").versionAsInProject(),
mavenBundle().groupId("org.apache.clerezza").artifactId(
- "org.apache.clerezza.platform.dashboard.core").versionAsInProject(),
+ "org.apache.clerezza.platform.globalmenu.api").versionAsInProject(),
mavenBundle().groupId("org.apache.clerezza").artifactId(
"org.apache.clerezza.platform.dashboard.ontologies").versionAsInProject(),
mavenBundle().groupId("org.apache.clerezza").artifactId(
http://git-wip-us.apache.org/repos/asf/clerezza/blob/dcc9067a/platform.typerendering.gui/pom.xml
----------------------------------------------------------------------
diff --git a/platform.typerendering.gui/pom.xml b/platform.typerendering.gui/pom.xml
index 346bb30..09eb9be 100644
--- a/platform.typerendering.gui/pom.xml
+++ b/platform.typerendering.gui/pom.xml
@@ -52,7 +52,7 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
- <artifactId>platform.dashboard.core</artifactId>
+ <artifactId>platform.globalmenu.api</artifactId>
<version>0.3-SNAPSHOT</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/dcc9067a/platform.usermanager.webinterface/pom.xml
----------------------------------------------------------------------
diff --git a/platform.usermanager.webinterface/pom.xml b/platform.usermanager.webinterface/pom.xml
index 94cbcb5..9b8a24e 100644
--- a/platform.usermanager.webinterface/pom.xml
+++ b/platform.usermanager.webinterface/pom.xml
@@ -98,7 +98,7 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
- <artifactId>platform.dashboard.core</artifactId>
+ <artifactId>platform.globalmenu.api</artifactId>
<version>0.3-SNAPSHOT</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/dcc9067a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 125f3f9..dd211ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,6 +86,7 @@
<module>platform.documentation</module>
<module>platform.documentation.viewer</module>
<module>platform.enrichment</module>
+ <module>platform.globalmenu.api</module>
<module>platform.graphnodeprovider</module>
<module>platform.graphprovider.content</module>
<module>platform.language</module>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/dcc9067a/provisioning/rdf.web/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/rdf.web/pom.xml b/provisioning/rdf.web/pom.xml
index 819ca2b..718cc65 100644
--- a/provisioning/rdf.web/pom.xml
+++ b/provisioning/rdf.web/pom.xml
@@ -68,7 +68,7 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
- <artifactId>platform.dashboard.core</artifactId>
+ <artifactId>platform.globalmenu.api</artifactId>
<version>0.3-SNAPSHOT</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/dcc9067a/rdf.locking/pom.xml
----------------------------------------------------------------------
diff --git a/rdf.locking/pom.xml b/rdf.locking/pom.xml
index 75c55ee..c723a5c 100644
--- a/rdf.locking/pom.xml
+++ b/rdf.locking/pom.xml
@@ -44,7 +44,7 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
- <artifactId>platform.dashboard.core</artifactId>
+ <artifactId>platform.globalmenu.api</artifactId>
<version>0.3-SNAPSHOT</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/dcc9067a/rdf.web/rdf.web.core/pom.xml
----------------------------------------------------------------------
diff --git a/rdf.web/rdf.web.core/pom.xml b/rdf.web/rdf.web.core/pom.xml
index 19ff335..00a4c65 100644
--- a/rdf.web/rdf.web.core/pom.xml
+++ b/rdf.web/rdf.web.core/pom.xml
@@ -91,7 +91,7 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
- <artifactId>platform.dashboard.core</artifactId>
+ <artifactId>platform.globalmenu.api</artifactId>
<version>0.3-SNAPSHOT</version>
</dependency>
<dependency>