From 52bae1e6b344f9d27a595e30440f87061c0d6449 Mon Sep 17 00:00:00 2001 From: Matthew Buckett Date: Wed, 1 Mar 2017 05:30:38 +0000 Subject: [PATCH] SAK-32234 Remove the rights projects (#3967) These are unused in the codebase and haven't been touched for a very long time (apart from library updates). --- master/pom.xml | 6 - pom.xml | 2 - rights/pom.xml | 22 - rights/rights-api/api/pom.xml | 38 -- .../sakaiproject/rights/api/Copyright.java | 64 -- .../rights/api/CreativeCommonsLicense.java | 372 ------------ .../rights/api/RightsAssignment.java | 49 -- .../sakaiproject/rights/api/RightsHelper.java | 32 - .../sakaiproject/rights/api/RightsPolicy.java | 27 - .../rights/api/RightsService.java | 82 --- .../rights/api/SiteRightsPolicy.java | 27 - .../rights/api/UserRightsPolicy.java | 27 - .../rights/cover/RightsService.java | 124 ---- .../rights/util/RightsException.java | 29 - rights/rights-impl/impl/pom.xml | 39 -- .../rights/impl/BaseRightsService.java | 562 ------------------ .../rights/impl/BasicRightsService.java | 215 ------- .../impl/src/webapp/WEB-INF/components.xml | 20 - rights/rights-tool/tool/pom.xml | 83 --- .../rights/tool/RightsHelperAction.java | 31 - .../src/webapp/WEB-INF/tools/sakai.rights.xml | 8 - .../tool/src/webapp/WEB-INF/web.xml | 5 - .../tool/src/webapp/velocity.properties | 104 ---- 23 files changed, 1968 deletions(-) delete mode 100644 rights/pom.xml delete mode 100644 rights/rights-api/api/pom.xml delete mode 100644 rights/rights-api/api/src/java/org/sakaiproject/rights/api/Copyright.java delete mode 100644 rights/rights-api/api/src/java/org/sakaiproject/rights/api/CreativeCommonsLicense.java delete mode 100644 rights/rights-api/api/src/java/org/sakaiproject/rights/api/RightsAssignment.java delete mode 100644 rights/rights-api/api/src/java/org/sakaiproject/rights/api/RightsHelper.java delete mode 100644 rights/rights-api/api/src/java/org/sakaiproject/rights/api/RightsPolicy.java delete mode 100644 rights/rights-api/api/src/java/org/sakaiproject/rights/api/RightsService.java delete mode 100644 rights/rights-api/api/src/java/org/sakaiproject/rights/api/SiteRightsPolicy.java delete mode 100644 rights/rights-api/api/src/java/org/sakaiproject/rights/api/UserRightsPolicy.java delete mode 100644 rights/rights-api/api/src/java/org/sakaiproject/rights/cover/RightsService.java delete mode 100644 rights/rights-api/api/src/java/org/sakaiproject/rights/util/RightsException.java delete mode 100644 rights/rights-impl/impl/pom.xml delete mode 100644 rights/rights-impl/impl/src/java/org/sakaiproject/rights/impl/BaseRightsService.java delete mode 100644 rights/rights-impl/impl/src/java/org/sakaiproject/rights/impl/BasicRightsService.java delete mode 100644 rights/rights-impl/impl/src/webapp/WEB-INF/components.xml delete mode 100644 rights/rights-tool/tool/pom.xml delete mode 100644 rights/rights-tool/tool/src/java/org/sakaiproject/rights/tool/RightsHelperAction.java delete mode 100644 rights/rights-tool/tool/src/webapp/WEB-INF/tools/sakai.rights.xml delete mode 100644 rights/rights-tool/tool/src/webapp/WEB-INF/web.xml delete mode 100644 rights/rights-tool/tool/src/webapp/velocity.properties diff --git a/master/pom.xml b/master/pom.xml index 9867e7369f6b..d203ff06b108 100644 --- a/master/pom.xml +++ b/master/pom.xml @@ -1421,12 +1421,6 @@ ${sakai.version} provided - - org.sakaiproject - sakai-rights-api - ${sakai.version} - provided - org.sakaiproject sakai-rwiki-api diff --git a/pom.xml b/pom.xml index 698b15767f39..a55749b5b3f7 100644 --- a/pom.xml +++ b/pom.xml @@ -95,7 +95,6 @@ providers reference reset-pass - rights roster2 rsf rwiki @@ -179,7 +178,6 @@ reference reports reset-pass - rights roster2 rss rwiki diff --git a/rights/pom.xml b/rights/pom.xml deleted file mode 100644 index a0b6d4773442..000000000000 --- a/rights/pom.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - 4.0.0 - - org.sakaiproject - master - 12-SNAPSHOT - ../master/pom.xml - - Sakai Rights Project - org.sakaiproject - rights-base - pom - - - rights-api/api - rights-impl/impl - rights-tool/tool - - - - diff --git a/rights/rights-api/api/pom.xml b/rights/rights-api/api/pom.xml deleted file mode 100644 index d047bf1fa30d..000000000000 --- a/rights/rights-api/api/pom.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - 4.0.0 - - rights-base - org.sakaiproject - 12-SNAPSHOT - ../../pom.xml - - sakai-rights-api - org.sakaiproject - sakai-rights-api - - The Sakai Foundation - http://sakaiproject.org/ - - 2003 - jar - - shared - - - - org.sakaiproject.kernel - sakai-kernel-api - - - org.sakaiproject.kernel - sakai-component-manager - - - - - - - - - diff --git a/rights/rights-api/api/src/java/org/sakaiproject/rights/api/Copyright.java b/rights/rights-api/api/src/java/org/sakaiproject/rights/api/Copyright.java deleted file mode 100644 index d04ca091eb65..000000000000 --- a/rights/rights-api/api/src/java/org/sakaiproject/rights/api/Copyright.java +++ /dev/null @@ -1,64 +0,0 @@ -/********************************************************************************** - * $URL$ - * $Id$ - *********************************************************************************** - * - * Copyright (c) 2003, 2004, 2005, 2006, 2008, 2009 The Sakai Foundation - * - * Licensed under the Educational Community 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.opensource.org/licenses/ECL-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.sakaiproject.rights.api; - -import java.util.Stack; - -import org.w3c.dom.Document; -import org.w3c.dom.Element; - -/** - * - * - */ -public interface Copyright -{ - public String getCopyrightId(); - - /** - * @return - */ - public String getYear(); - - /** - * @return - */ - public String getOwner(); - - /** - * @param year - */ - public void setYear(String year); - - /** - * @param owner - */ - public void setOwner(String owner); - - /** - * @param doc - * @param stack - * @return - */ - public Element toXml(Document doc, Stack stack); - -} // interface Copyright diff --git a/rights/rights-api/api/src/java/org/sakaiproject/rights/api/CreativeCommonsLicense.java b/rights/rights-api/api/src/java/org/sakaiproject/rights/api/CreativeCommonsLicense.java deleted file mode 100644 index cef59bd72874..000000000000 --- a/rights/rights-api/api/src/java/org/sakaiproject/rights/api/CreativeCommonsLicense.java +++ /dev/null @@ -1,372 +0,0 @@ -/********************************************************************************** - * $URL$ - * $Id$ - *********************************************************************************** - * - * Copyright (c) 2003, 2004, 2005, 2006, 2008, 2009 The Sakai Foundation - * - * Licensed under the Educational Community 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.opensource.org/licenses/ECL-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.sakaiproject.rights.api; - -import java.util.Collection; -import java.util.Stack; - -import org.sakaiproject.rights.util.RightsException; -import org.w3c.dom.Document; -import org.w3c.dom.Element; - -/** - * Creative Commons Licenses are described by their characteristics, which come in three types: - * - * Permissions (rights granted by the license) - * Prohibitions (things prohibited by the license) - * Requirements (restrictions imposed by the license) - * - */ -public interface CreativeCommonsLicense -{ - public String getIdentifier(); - - public String getUri(); - - /***************************************************** - * Permissions - *****************************************************/ - - /** - * @return - */ - public boolean hasPermissions(); - - /** - * @return - */ - public Collection getPermissions(); - - /** - * @param permission - * @throws RightsException - */ - public void addPermission(String permission) throws RightsException; - - /** - * @param permission - */ - public void addPermission(Permission permission); - - /** - * @param permission - */ - public void removePermission(String permission); - - /** - * @param permissions - */ - public void setPermissions(Collection permissions); - - /***************************************************** - * Prohibitions - *****************************************************/ - - /** - * @return - */ - public boolean hasProhibitions(); - - /** - * @return - */ - public Collection getProhibitions(); - - /** - * @param prohibition - */ - public void addProhibition(String prohibition) throws RightsException; - - /** - * @param prohibition - */ - public void addProhibition(Prohibition prohibition); - - /** - * @param prohibitions - */ - public void removeProhibitions(Collection prohibitions); - - /** - * @param prohibitions - */ - public void setProhibitions(Collection prohibitions); - - /***************************************************** - * Prohibitions - *****************************************************/ - - /** - * @return - */ - public boolean hasRequirements(); - - /** - * @return - */ - public Collection getRequirements(); - - /** - * @param requirement - */ - public void addRequirement(String requirement) throws RightsException; - - /** - * @param requirement - */ - public void addRequirement(Requirement requirement); - - /** - * @param requirements - */ - public void removeRequirements(Collection requirements); - - /** - * @param requirements - */ - public void setRequirements(Collection requirements); - - /** - * Permissions describe rights granted by the license. Three kinds of permissions may be granted: - * - * Reproduction - * the work may be reproduced - * Distribution - * the work (and, if authorized, derivative works) may be distributed, publicly displayed, and publicly performed - * DerivativeWorks - * derivative works may be created and reproduced - */ - public class Permission - { - protected final String m_id; - - /** - * @param id - */ - private Permission(String id) - { - m_id = id; - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - public String toString() - { - return m_id; - } - - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ - public boolean equals(Object obj) - { - boolean rv = false; - - if(obj instanceof Permission) - { - rv = ((Permission) obj).toString().equals(this.toString()); - } - - return rv; - } - - /* (non-Javadoc) - * @see java.lang.Object#hashCode() - */ - public int hashCode() { - return this.toString().hashCode(); - } - - /** - * @param permitted - * @return - */ - public static Permission fromString(String permitted) - { - if (REPRODUCTION.m_id.equals(permitted)) return REPRODUCTION; - if (DISTRIBUTION.m_id.equals(permitted)) return DISTRIBUTION; - if (DERIVATIVE_WORKS.m_id.equals(permitted)) return DERIVATIVE_WORKS; - return null; - } - - /** the work may be reproduced */ - public static final Permission REPRODUCTION = new Permission("Reproduction"); - - /** the work (and, if authorized, derivative works) may be distributed, publicly displayed, and publicly performed */ - public static final Permission DISTRIBUTION = new Permission("Distribution"); - - /** derivative works may be created and reproduced */ - public static final Permission DERIVATIVE_WORKS = new Permission("DerivativeWorks"); - } - - /** - * Prohibitions describe things prohibited by the license: - * - * CommercialUse - * rights may be exercised for commercial purposes unless CommercialUse is prohibited - */ - public class Prohibition - { - protected final String m_id; - - /** - * @param id - */ - private Prohibition(String id) - { - m_id = id; - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - public String toString() - { - return m_id; - } - - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ - public boolean equals(Object obj) - { - boolean rv = false; - - if(obj instanceof Prohibition) - { - rv = ((Prohibition) obj).toString().equals(this.toString()); - } - - return rv; - } - - /* (non-Javadoc) - * @see java.lang.Object#hashCode() - */ - public int hashCode() { - return this.toString().hashCode(); - } - - /** - * @param prohibited - * @return - */ - public static Prohibition fromString(String prohibited) - { - if (COMMERCIAL_USE.m_id.equals(prohibited)) return COMMERCIAL_USE; - return null; - } - - /** rights may be exercised for commercial purposes unless CommercialUse is prohibited */ - public static final Prohibition COMMERCIAL_USE = new Prohibition("CommercialUse"); - - } - - /** - * Requirements describe restrictions imposed by the license: - * - * Notice - * copyright and license notices must be kept intact - * Attribution - * credit must be given to copyright holder and/or author - * ShareAlike - * derivative works must be licensed under the same terms as the original work - * SourceCode - * source code (the preferred form for making modifications) must be provided for all derivative works - */ - public class Requirement - { - protected final String m_id; - - /** - * @param id - */ - private Requirement(String id) - { - m_id = id; - } - - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - public String toString() - { - return m_id; - } - - /* (non-Javadoc) - * @see java.lang.Object#equals(java.lang.Object) - */ - public boolean equals(Object obj) - { - boolean rv = false; - - if(obj instanceof Requirement) - { - rv = ((Requirement) obj).toString().equals(this.toString()); - } - - return rv; - } - - /* (non-Javadoc) - * @see java.lang.Object#hashCode() - */ - public int hashCode() { - return this.toString().hashCode(); - } - - /** - * @param required - * @return - */ - public static Requirement fromString(String required) - { - if (NOTICE.m_id.equals(required)) return NOTICE; - if (ATTRIBUTION.m_id.equals(required)) return ATTRIBUTION; - if (SHARE_ALIKE.m_id.equals(required)) return SHARE_ALIKE; - if (SOURCE_CODE.m_id.equals(required)) return SOURCE_CODE; - return null; - } - - /** copyright and license notices must be kept intact */ - public static final Requirement NOTICE = new Requirement("Notice"); - - /** credit must be given to copyright holder and/or author */ - public static final Requirement ATTRIBUTION = new Requirement("Attribution"); - - /** derivative works must be licensed under the same terms as the original work */ - public static final Requirement SHARE_ALIKE = new Requirement("ShareAlike"); - - /** source code (the preferred form for making modifications) must be provided for all derivative works */ - public static final Requirement SOURCE_CODE = new Requirement("SourceCode"); - } - - /** - * @param doc - * @param stack - * @return - */ - public Element toXml(Document doc, Stack stack); - -} // interface CreativeCommonsLicense diff --git a/rights/rights-api/api/src/java/org/sakaiproject/rights/api/RightsAssignment.java b/rights/rights-api/api/src/java/org/sakaiproject/rights/api/RightsAssignment.java deleted file mode 100644 index 5ff1a7daf78a..000000000000 --- a/rights/rights-api/api/src/java/org/sakaiproject/rights/api/RightsAssignment.java +++ /dev/null @@ -1,49 +0,0 @@ -/********************************************************************************** - * $URL$ - * $Id$ - *********************************************************************************** - * - * Copyright (c) 2003, 2004, 2005, 2006, 2008, 2009 The Sakai Foundation - * - * Licensed under the Educational Community 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.opensource.org/licenses/ECL-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.sakaiproject.rights.api; - -import java.util.Collection; - -import org.sakaiproject.rights.api.Copyright; -import org.sakaiproject.rights.api.CreativeCommonsLicense; - -public interface RightsAssignment -{ - public String getRightsId(); - public String getEntityRef(); - - public boolean hasCopyright(); - public Copyright getCopyright(); - - public boolean hasCopyrightAlert(); - - public boolean hasLicense(); - public int countLicenses(); - public Collection getLicenses(); - - public void setCopyright(Copyright copyright); - - public void addLicense(CreativeCommonsLicense license); - public void setLicenses(Collection licenses); - -} // interface RightsAssignment - diff --git a/rights/rights-api/api/src/java/org/sakaiproject/rights/api/RightsHelper.java b/rights/rights-api/api/src/java/org/sakaiproject/rights/api/RightsHelper.java deleted file mode 100644 index 7bf0ae7c2248..000000000000 --- a/rights/rights-api/api/src/java/org/sakaiproject/rights/api/RightsHelper.java +++ /dev/null @@ -1,32 +0,0 @@ -/********************************************************************************** - * $URL$ - * $Id$ - *********************************************************************************** - * - * Copyright (c) 2003, 2004, 2005, 2006, 2008 The Sakai Foundation - * - * Licensed under the Educational Community 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.opensource.org/licenses/ECL-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.sakaiproject.rights.api; - -public interface RightsHelper -{ - public static final String HELPER_ID = "sakai.rights.helper"; - - public static final String PANEL_ID = "Rights"; - - - -} diff --git a/rights/rights-api/api/src/java/org/sakaiproject/rights/api/RightsPolicy.java b/rights/rights-api/api/src/java/org/sakaiproject/rights/api/RightsPolicy.java deleted file mode 100644 index f4b2326567a2..000000000000 --- a/rights/rights-api/api/src/java/org/sakaiproject/rights/api/RightsPolicy.java +++ /dev/null @@ -1,27 +0,0 @@ -/********************************************************************************** - * $URL$ - * $Id$ - *********************************************************************************** - * - * Copyright (c) 2003, 2004, 2005, 2006, 2008 The Sakai Foundation - * - * Licensed under the Educational Community 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.opensource.org/licenses/ECL-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.sakaiproject.rights.api; - -public interface RightsPolicy -{ - -} diff --git a/rights/rights-api/api/src/java/org/sakaiproject/rights/api/RightsService.java b/rights/rights-api/api/src/java/org/sakaiproject/rights/api/RightsService.java deleted file mode 100644 index b4998a7ae3d0..000000000000 --- a/rights/rights-api/api/src/java/org/sakaiproject/rights/api/RightsService.java +++ /dev/null @@ -1,82 +0,0 @@ -/********************************************************************************** - * $URL$ - * $Id$ - *********************************************************************************** - * - * Copyright (c) 2003, 2004, 2005, 2006, 2008 The Sakai Foundation - * - * Licensed under the Educational Community 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.opensource.org/licenses/ECL-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.sakaiproject.rights.api; - -import org.sakaiproject.exception.IdUnusedException; - -public interface RightsService -{ - /** - * @param entityRef - * @return - */ - public RightsAssignment addRightsAssignment(String entityRef); - - /** - * @param context - * @return - */ - public SiteRightsPolicy addSiteRightsPolicy(String context); - - /** - * @param context - * @param userId - * @return - */ - public UserRightsPolicy addUserRightsPolicy(String context, String userId); - - /** - * @param entityRef - * @return - */ - public RightsAssignment getRightsAssignment(String entityRef) throws IdUnusedException; - - /** - * @param context - * @return - */ - public SiteRightsPolicy getSiteRightsPolicy(String context); - - /** - * @param context - * @param userId - * @return - */ - public UserRightsPolicy getUserRightsPolicy(String context, String userId); - - /** - * @param rights - */ - public void save(RightsAssignment rights); - - /** - * @param policy - */ - public void save(RightsPolicy policy); - - /** - * @param entityRef - * @param rights - */ - public void setRightsAssignment(String entityRef, RightsAssignment rights); - -} // interface CopyrightService diff --git a/rights/rights-api/api/src/java/org/sakaiproject/rights/api/SiteRightsPolicy.java b/rights/rights-api/api/src/java/org/sakaiproject/rights/api/SiteRightsPolicy.java deleted file mode 100644 index efbef83c4c33..000000000000 --- a/rights/rights-api/api/src/java/org/sakaiproject/rights/api/SiteRightsPolicy.java +++ /dev/null @@ -1,27 +0,0 @@ -/********************************************************************************** - * $URL$ - * $Id$ - *********************************************************************************** - * - * Copyright (c) 2003, 2004, 2005, 2006, 2008 The Sakai Foundation - * - * Licensed under the Educational Community 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.opensource.org/licenses/ECL-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.sakaiproject.rights.api; - -public interface SiteRightsPolicy extends RightsPolicy -{ - -} diff --git a/rights/rights-api/api/src/java/org/sakaiproject/rights/api/UserRightsPolicy.java b/rights/rights-api/api/src/java/org/sakaiproject/rights/api/UserRightsPolicy.java deleted file mode 100644 index 02d686855934..000000000000 --- a/rights/rights-api/api/src/java/org/sakaiproject/rights/api/UserRightsPolicy.java +++ /dev/null @@ -1,27 +0,0 @@ -/********************************************************************************** - * $URL$ - * $Id$ - *********************************************************************************** - * - * Copyright (c) 2003, 2004, 2005, 2006, 2008 The Sakai Foundation - * - * Licensed under the Educational Community 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.opensource.org/licenses/ECL-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.sakaiproject.rights.api; - -public interface UserRightsPolicy extends RightsPolicy -{ - -} diff --git a/rights/rights-api/api/src/java/org/sakaiproject/rights/cover/RightsService.java b/rights/rights-api/api/src/java/org/sakaiproject/rights/cover/RightsService.java deleted file mode 100644 index 39c5e92dba2f..000000000000 --- a/rights/rights-api/api/src/java/org/sakaiproject/rights/cover/RightsService.java +++ /dev/null @@ -1,124 +0,0 @@ -/********************************************************************************** - * $URL$ - * $Id$ - *********************************************************************************** - * - * Copyright (c) 2003, 2004, 2005, 2006, 2008, 2009 The Sakai Foundation - * - * Licensed under the Educational Community 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.opensource.org/licenses/ECL-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.sakaiproject.rights.cover; - -import org.sakaiproject.component.cover.ComponentManager; - -public class RightsService implements org.sakaiproject.rights.api.RightsService -{ - static org.sakaiproject.rights.api.RightsService m_instance = null; - - /** - * Access the component instance: special cover only method. - * - * @return the component instance. - */ - public static org.sakaiproject.rights.api.RightsService getInstance() - { - if (ComponentManager.CACHE_COMPONENTS) - { - if (m_instance == null) - m_instance = (org.sakaiproject.rights.api.RightsService) ComponentManager - .get(org.sakaiproject.rights.api.RightsService.class); - return m_instance; - } - else - { - return (org.sakaiproject.rights.api.RightsService) ComponentManager - .get(org.sakaiproject.rights.api.RightsService.class); - } - } - - - public org.sakaiproject.rights.api.RightsAssignment addRightsAssignment(String entityRef) - { - org.sakaiproject.rights.api.RightsService service = getInstance(); - if (service == null) return null; - - return service.addRightsAssignment(entityRef); - } - - public org.sakaiproject.rights.api.SiteRightsPolicy addSiteRightsPolicy(String context) - { - org.sakaiproject.rights.api.RightsService service = getInstance(); - if (service == null) return null; - - return service.addSiteRightsPolicy(context); - } - - public org.sakaiproject.rights.api.UserRightsPolicy addUserRightsPolicy(String context, String userId) - { - org.sakaiproject.rights.api.RightsService service = getInstance(); - if (service == null) return null; - - return service.addUserRightsPolicy(context, userId); - } - - public org.sakaiproject.rights.api.RightsAssignment getRightsAssignment(String entityRef) throws org.sakaiproject.exception.IdUnusedException - { - org.sakaiproject.rights.api.RightsService service = getInstance(); - if (service == null) return null; - - return service.getRightsAssignment(entityRef); - } - - public org.sakaiproject.rights.api.SiteRightsPolicy getSiteRightsPolicy(String context) - { - org.sakaiproject.rights.api.RightsService service = getInstance(); - if (service == null) return null; - - return service.getSiteRightsPolicy(context); - } - - public org.sakaiproject.rights.api.UserRightsPolicy getUserRightsPolicy(String context, String userId) - { - org.sakaiproject.rights.api.RightsService service = getInstance(); - if (service == null) return null; - - return service.getUserRightsPolicy(context, userId); - } - - public void save(org.sakaiproject.rights.api.RightsAssignment rights) - { - org.sakaiproject.rights.api.RightsService service = getInstance(); - if (service == null) return; - - service.save(rights); - } - - public void save(org.sakaiproject.rights.api.RightsPolicy policy) - { - org.sakaiproject.rights.api.RightsService service = getInstance(); - if (service == null) return; - - service.save(policy); - } - - public void setRightsAssignment(String entityRef, org.sakaiproject.rights.api.RightsAssignment rights) - { - org.sakaiproject.rights.api.RightsService service = getInstance(); - if (service == null) return; - - service.setRightsAssignment(entityRef, rights); - } - -} diff --git a/rights/rights-api/api/src/java/org/sakaiproject/rights/util/RightsException.java b/rights/rights-api/api/src/java/org/sakaiproject/rights/util/RightsException.java deleted file mode 100644 index faffd03fda91..000000000000 --- a/rights/rights-api/api/src/java/org/sakaiproject/rights/util/RightsException.java +++ /dev/null @@ -1,29 +0,0 @@ -/********************************************************************************** - * $URL$ - * $Id$ - *********************************************************************************** - * - * Copyright (c) 2003, 2004, 2005, 2006, 2008, 2009 The Sakai Foundation - * - * Licensed under the Educational Community 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.opensource.org/licenses/ECL-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.sakaiproject.rights.util; - -public class RightsException extends Exception -{ - - private static final long serialVersionUID = 1L; - -} diff --git a/rights/rights-impl/impl/pom.xml b/rights/rights-impl/impl/pom.xml deleted file mode 100644 index 6667f1c4364a..000000000000 --- a/rights/rights-impl/impl/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - 4.0.0 - - rights-base - org.sakaiproject - 12-SNAPSHOT - ../../pom.xml - - sakai-rights-impl - org.sakaiproject - sakai-rights-impl - - The Sakai Foundation - http://sakaiproject.org/ - - 2003 - sakai-component - - components - - - - org.sakaiproject.kernel - sakai-kernel-api - - - org.sakaiproject.kernel - sakai-component-manager - - - org.sakaiproject - sakai-rights-api - - - - - - diff --git a/rights/rights-impl/impl/src/java/org/sakaiproject/rights/impl/BaseRightsService.java b/rights/rights-impl/impl/src/java/org/sakaiproject/rights/impl/BaseRightsService.java deleted file mode 100644 index a0a20074bfcf..000000000000 --- a/rights/rights-impl/impl/src/java/org/sakaiproject/rights/impl/BaseRightsService.java +++ /dev/null @@ -1,562 +0,0 @@ -/********************************************************************************** - * $URL$ - * $Id$ - *********************************************************************************** - * - * Copyright (c) 2003, 2004, 2005, 2006, 2008, 2009 The Sakai Foundation - * - * Licensed under the Educational Community 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.opensource.org/licenses/ECL-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.sakaiproject.rights.impl; - -import java.util.Collection; -import java.util.Hashtable; -import java.util.Map; -import java.util.Set; -import java.util.Stack; -import java.util.TreeSet; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.sakaiproject.exception.IdUnusedException; -import org.sakaiproject.id.cover.IdManager; -import org.sakaiproject.rights.api.Copyright; -import org.sakaiproject.rights.api.RightsPolicy; -import org.sakaiproject.rights.api.RightsService; -import org.sakaiproject.rights.api.CreativeCommonsLicense; -import org.sakaiproject.rights.api.RightsAssignment; -import org.sakaiproject.rights.api.SiteRightsPolicy; -import org.sakaiproject.rights.api.UserRightsPolicy; -import org.sakaiproject.rights.util.RightsException; - -import org.w3c.dom.Document; -import org.w3c.dom.Element; - - -public abstract class BaseRightsService implements RightsService -{ - public static class BasicCopyright implements Copyright - { - - protected String m_id; - protected String m_entityRef; - protected String m_year; - protected String m_owner; - - public BasicCopyright(String entityRef) - { - m_entityRef = entityRef; - } - - public BasicCopyright(String entityRef, String year, String owner) - { - m_entityRef = entityRef; - m_year = year; - m_owner = owner; - } - - public String getCopyrightId() - { - return m_id; - } - - public String getEntityRef() - { - return m_entityRef; - } - - public String getOwner() - { - return m_owner; - } - - public String getYear() - { - return m_year; - } - - public void setOwner(String owner) - { - m_owner = owner; - } - - public void setYear(String year) - { - m_year = year; - } - - public Element toXml(Document doc, Stack stack) - { - // TODO Auto-generated method stub - return null; - } - - } // class BasicCopyright - - public static class BasicCreativeCommonsLicense implements CreativeCommonsLicense - { - protected String m_id; - protected Set m_permissions = new TreeSet(); - protected Set m_prohibitions = new TreeSet(); - protected Set m_requirements = new TreeSet(); - - public void addPermission(Permission permission) - { - if(m_permissions == null) - { - m_permissions = new TreeSet(); - } - m_permissions.add(permission); - } - - public void addPermission(String permission) throws RightsException - { - Permission p = Permission.fromString(permission); - if(p == null) - { - throw new RightsException(); - } - addPermission(p); - } - - public void addProhibition(Prohibition prohibition) - { - if(m_prohibitions == null) - { - m_prohibitions = new TreeSet(); - } - m_prohibitions.add(prohibition); - } - - public void addProhibition(String prohibition) throws RightsException - { - Prohibition p = Prohibition.fromString(prohibition); - if(p == null) - { - throw new RightsException(); - } - addProhibition(p); - } - - public void addRequirement(Requirement requirement) - { - if(m_requirements == null) - { - m_requirements = new TreeSet(); - } - m_requirements.add(requirement); - } - - public void addRequirement(String requirement) throws RightsException - { - Requirement r = Requirement.fromString(requirement); - if(r == null) - { - throw new RightsException(); - } - addRequirement(r); - } - - public String getIdentifier() - { - // TODO Auto-generated method stub - return null; - } - - public Collection getPermissions() - { - return m_permissions; - } - - public Collection getProhibitions() - { - return m_prohibitions; - } - - public Collection getRequirements() - { - return m_requirements; - } - - public String getUri() - { - // TODO Auto-generated method stub - return null; - } - - public boolean hasPermissions() - { - return m_permissions != null && ! m_permissions.isEmpty(); - } - - public boolean hasProhibitions() - { - return m_prohibitions != null && ! m_prohibitions.isEmpty(); - } - - public boolean hasRequirements() - { - return m_requirements != null && ! m_requirements.isEmpty(); - } - - public void removePermission(String permission) - { - Permission p = Permission.fromString(permission); - if(p != null) - { - this.m_permissions.remove(p); - } - } - - public void removeProhibitions(Collection prohibitions) - { - if(prohibitions != null) - { - for (Object obj : prohibitions) - { - Prohibition p = null; - if(obj instanceof Prohibition) - { - p = (Prohibition) obj; - } - else if(obj instanceof String) - { - p = Prohibition.fromString((String) obj); - } - if(p != null) - { - this.m_prohibitions.remove(p); - } - } - } - } - - public void removeRequirements(Collection requirements) - { - if(this.m_requirements == null) - { - this.m_requirements = new TreeSet(); - } - this.m_requirements.clear(); - - if(requirements != null) - { - for (Object obj : requirements) - { - Requirement r = null; - if(obj instanceof Requirement) - { - r = (Requirement) obj; - } - else if(obj instanceof String) - { - r = Requirement.fromString((String) obj); - } - if(r != null) - { - this.m_requirements.remove(r); - } - } - } - } - - public void setPermissions(Collection permissions) - { - if(this.m_permissions == null) - { - this.m_permissions = new TreeSet(); - } - this.m_permissions.clear(); - - if(permissions != null) - { - for (Object obj : permissions) - { - Permission p = null; - if(obj instanceof Permission) - { - p = (Permission) obj; - } - else if(obj instanceof String) - { - p = Permission.fromString((String) obj); - } - if(p != null) - { - this.m_permissions.add(p); - } - } - } - } - - public void setProhibitions(Collection prohibitions) - { - if(this.m_prohibitions == null) - { - this.m_prohibitions = new TreeSet(); - } - this.m_prohibitions.clear(); - - if(prohibitions != null) - { - for (Object obj : prohibitions) - { - Prohibition p = null; - if(obj instanceof Prohibition) - { - p = (Prohibition) obj; - } - else if(obj instanceof String) - { - p = Prohibition.fromString((String) obj); - } - if(p != null) - { - this.m_prohibitions.add(p); - } - } - } - } - - public void setRequirements(Collection requirements) - { - // TODO Auto-generated method stub - - } - - public Element toXml(Document doc, Stack stack) - { - // TODO Auto-generated method stub - return null; - } - - } // class BasicCreativeCommonsLicense - - /********************************************************************************************************************************************************************************************************************************************************** - * Init and Destroy - *********************************************************************************************************************************************************************************************************************************************************/ - - public static class BasicRightsAssignment implements RightsAssignment - { - protected Map m_licenses = new Hashtable(); - protected Copyright m_copyright; - protected String m_entityRef = null; - protected String m_id; - protected boolean m_copyrightAlert = false; - - public BasicRightsAssignment(String entityRef) - { - m_id = IdManager.createUuid(); - m_entityRef = entityRef; - - } - - public void addLicense(CreativeCommonsLicense license) - { - if(m_licenses == null) - { - m_licenses = new Hashtable(); - } - m_licenses.put(license.getIdentifier(), license); - } - - public int countLicenses() - { - return m_licenses.size(); - } - - public Copyright getCopyright() - { - return m_copyright; - } - - public String getEntityRef() - { - return m_entityRef; - } - - public Collection getLicenses() - { - return m_licenses.values(); - } - - public String getRightsId() - { - return m_id; - } - - public boolean hasCopyright() - { - return m_copyright != null; - } - - public boolean hasCopyrightAlert() - { - return m_copyrightAlert; - } - - public boolean hasLicense() - { - return m_licenses != null && ! m_licenses.isEmpty(); - } - - public void setCopyright(Copyright copyright) - { - m_copyright = copyright; - } - - public void setLicenses(Collection licenses) - { - - } - - public Element toXml(Document doc, Stack stack) - { - // TODO Auto-generated method stub - return null; - } - - } - - public interface Storage - { - public void close(); - public Copyright getCopyright(String copyrightId) throws IdUnusedException; - - public CreativeCommonsLicense getLicense(String licenseId) throws IdUnusedException; - public RightsAssignment getRightsAssignment(String entityRef) throws IdUnusedException; - public RightsPolicy getRightsPolicy(String context, String userId) throws IdUnusedException; - public Copyright newCopyright(String rightsId); - - public CreativeCommonsLicense newLicense(String rightsId); - public RightsAssignment newRightsAssignment(String entityRef); - public RightsPolicy newRightsPolicy(String context, String userId); - public void open(); - - public void remove(Copyright copyright); - public void remove(CreativeCommonsLicense license); - public void remove(RightsAssignment rights); - public void remove(RightsPolicy policy); - - public String save(Copyright copyright); - public String save(CreativeCommonsLicense license); - public String save(RightsAssignment rights); - public String save(RightsPolicy policy); - - } - - - /** Our logger. */ - private static Logger M_log = LoggerFactory.getLogger(BaseRightsService.class); - - protected Storage m_storage = null; - - /** - * @param entityRef - * @return - */ - public RightsAssignment addRightsAssignment(String entityRef) - { - return m_storage.newRightsAssignment(entityRef); - } - - public SiteRightsPolicy addSiteRightsPolicy(String context) - { - // TODO Auto-generated method stub - return null; - } - - public UserRightsPolicy addUserRightsPolicy(String context, String userId) - { - // TODO Auto-generated method stub - return null; - } - - - - /** - * Returns to uninitialized state. - */ - public void destroy() - { - m_storage.close(); - m_storage = null; - - M_log.info("destroy()"); - - } - - public RightsAssignment getRightsAssignment(String entityRef) throws IdUnusedException - { - return m_storage.getRightsAssignment(entityRef); - } - - public SiteRightsPolicy getSiteRightsPolicy(String context) - { - // TODO Auto-generated method stub - return null; - } - - public UserRightsPolicy getUserRightsPolicy(String context, String userId) - { - // TODO Auto-generated method stub - return null; - } - - /** - * Final initialization, once all dependencies are set. - */ - public void init() - { - try - { - // construct a storage helper and read - m_storage = newStorage(); - m_storage.open(); - - M_log.info("init()"); - } - catch (Throwable t) - { - M_log.warn("init(): ", t); - } - - } // init - - /** - * Construct a Storage object. - * - * @return The new storage object. - */ - protected abstract Storage newStorage(); - - /** - * @param rights - */ - public void save(RightsAssignment rights) - { - m_storage.save(rights); - } - - public void save(RightsPolicy policy) - { - m_storage.save(policy); - } - - public void setRightsAssignment(String entityRef, RightsAssignment rights) - { - // m_storage - } - -} // class BaseCopyrightService diff --git a/rights/rights-impl/impl/src/java/org/sakaiproject/rights/impl/BasicRightsService.java b/rights/rights-impl/impl/src/java/org/sakaiproject/rights/impl/BasicRightsService.java deleted file mode 100644 index ad53368b1803..000000000000 --- a/rights/rights-impl/impl/src/java/org/sakaiproject/rights/impl/BasicRightsService.java +++ /dev/null @@ -1,215 +0,0 @@ -/********************************************************************************** - * $URL$ - * $Id$ - *********************************************************************************** - * - * Copyright (c) 2003, 2004, 2005, 2006, 2008, 2009 The Sakai Foundation - * - * Licensed under the Educational Community 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.opensource.org/licenses/ECL-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.sakaiproject.rights.impl; - -import java.util.Hashtable; -import java.util.Map; - -import org.sakaiproject.exception.IdUnusedException; -import org.sakaiproject.rights.impl.BaseRightsService; -import org.sakaiproject.rights.api.Copyright; -import org.sakaiproject.rights.api.CreativeCommonsLicense; -import org.sakaiproject.rights.api.RightsAssignment; -import org.sakaiproject.rights.api.RightsPolicy; - -public class BasicRightsService extends BaseRightsService -{ - /********************************************************************************************************************************************************************************************************************************************************** - * Storage implementation - *********************************************************************************************************************************************************************************************************************************************************/ - - protected static class BasicStorage implements Storage - { - protected Map m_copyrights; - protected Map m_licenses; - protected Map m_rightsAssignments; - - public BasicStorage() - { - m_copyrights = new Hashtable(); - m_licenses = new Hashtable(); - m_rightsAssignments = new Hashtable(); - } - - public void close() - { - if(m_copyrights != null) - { - m_copyrights.clear(); - m_copyrights = null; - } - - if(m_licenses != null) - { - m_licenses.clear(); - m_licenses = null; - } - - if(m_rightsAssignments != null) - { - m_rightsAssignments.clear(); - m_rightsAssignments = null; - } - } - - public Copyright getCopyright(String copyrightId) throws IdUnusedException - { - Copyright copyright = m_copyrights.get(copyrightId); - if(copyright == null) - { - throw new IdUnusedException(copyrightId); - } - return copyright; - } - - public CreativeCommonsLicense getLicense(String licenseId) throws IdUnusedException - { - CreativeCommonsLicense license = m_licenses.get(licenseId); - if(license == null) - { - throw new IdUnusedException(licenseId); - } - return license; - } - - public RightsAssignment getRightsAssignment(String entityRef) throws IdUnusedException - { - RightsAssignment rights = m_rightsAssignments.get(entityRef); - if(rights == null) - { - throw new IdUnusedException(entityRef); - } - return rights; - } - - public RightsPolicy getRightsPolicy(String context, String userId) throws IdUnusedException - { - // TODO Auto-generated method stub - return null; - } - - public Copyright newCopyright(String rightsId) - { - return new BasicCopyright(rightsId); - } - - public CreativeCommonsLicense newLicense(String rightsId) - { - // TODO Auto-generated method stub - return null; - } - - public RightsAssignment newRightsAssignment(String entityRef) - { - return new BasicRightsAssignment(entityRef); - } - - public RightsPolicy newRightsPolicy(String context, String userId) - { - // TODO Auto-generated method stub - return null; - } - - public void open() - { - } - - public void remove(Copyright copyright) - { - // TODO Auto-generated method stub - - } - - public void remove(CreativeCommonsLicense license) - { - // TODO Auto-generated method stub - - } - - public void remove(RightsAssignment rights) - { - // TODO Auto-generated method stub - - } - - public void remove(RightsPolicy policy) - { - // TODO Auto-generated method stub - - } - - public String save(Copyright copyright) - { - // TODO Auto-generated method stub - return null; - } - - public String save(CreativeCommonsLicense license) - { - // TODO Auto-generated method stub - return null; - } - - public String save(RightsAssignment rights) - { - // TODO Auto-generated method stub - return null; - } - - public String save(RightsPolicy policy) - { - // TODO Auto-generated method stub - return null; - } - } - - /********************************************************************************************************************************************************************************************************************************************************** - * BaseRightsService extensions - *********************************************************************************************************************************************************************************************************************************************************/ - - /** - * Shutdown cleanly - */ - public void destroy() - { - - } - - /** - * Final initialization, once all dependencies are set. - */ - public void init() - { - } - - /** - * Construct a Storage object. - * - * @return The new storage object. - */ - protected Storage newStorage() - { - return new BasicStorage(); - - } // newStorage - -} diff --git a/rights/rights-impl/impl/src/webapp/WEB-INF/components.xml b/rights/rights-impl/impl/src/webapp/WEB-INF/components.xml deleted file mode 100644 index e6e0fa77af6c..000000000000 --- a/rights/rights-impl/impl/src/webapp/WEB-INF/components.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - diff --git a/rights/rights-tool/tool/pom.xml b/rights/rights-tool/tool/pom.xml deleted file mode 100644 index 655d6bcb9231..000000000000 --- a/rights/rights-tool/tool/pom.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - 4.0.0 - - rights-base - org.sakaiproject - 12-SNAPSHOT - ../../pom.xml - - sakai-rights-tool - org.sakaiproject - sakai-rights-tool - - The Sakai Foundation - http://sakaiproject.org/ - - 2003 - war - - - org.sakaiproject.kernel - sakai-kernel-util - - - javax.servlet - servlet-api - - - org.sakaiproject.kernel - sakai-kernel-api - - - org.sakaiproject.kernel - sakai-component-manager - - - org.sakaiproject - sakai-rights-api - - - org.sakaiproject.courier - sakai-courier-api - - - org.sakaiproject.message - sakai-message-api - - - org.sakaiproject.presence - sakai-presence-api - - - org.sakaiproject.presence - sakai-presence-util - - - org.sakaiproject.courier - sakai-courier-util - - - org.sakaiproject.site - sakai-mergedlist-util - - - org.sakaiproject.velocity - sakai-velocity-tool-api - - - org.sakaiproject.velocity - sakai-velocity-tool - - - - - - ${basedir}/src/bundle - - **/*.properties - - - - - diff --git a/rights/rights-tool/tool/src/java/org/sakaiproject/rights/tool/RightsHelperAction.java b/rights/rights-tool/tool/src/java/org/sakaiproject/rights/tool/RightsHelperAction.java deleted file mode 100644 index 664e5348ab6d..000000000000 --- a/rights/rights-tool/tool/src/java/org/sakaiproject/rights/tool/RightsHelperAction.java +++ /dev/null @@ -1,31 +0,0 @@ -/********************************************************************************** - * $URL$ - * $Id$ - *********************************************************************************** - * - * Copyright (c) 2003, 2004, 2005, 2006, 2008, 2009 The Sakai Foundation - * - * Licensed under the Educational Community 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.opensource.org/licenses/ECL-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.sakaiproject.rights.tool; - -import org.sakaiproject.cheftool.VelocityPortletPaneledAction; - -public class RightsHelperAction extends VelocityPortletPaneledAction -{ - - private static final long serialVersionUID = 1L; - -} diff --git a/rights/rights-tool/tool/src/webapp/WEB-INF/tools/sakai.rights.xml b/rights/rights-tool/tool/src/webapp/WEB-INF/tools/sakai.rights.xml deleted file mode 100644 index 9d92cdc690da..000000000000 --- a/rights/rights-tool/tool/src/webapp/WEB-INF/tools/sakai.rights.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - diff --git a/rights/rights-tool/tool/src/webapp/WEB-INF/web.xml b/rights/rights-tool/tool/src/webapp/WEB-INF/web.xml deleted file mode 100644 index b9c64e7f404d..000000000000 --- a/rights/rights-tool/tool/src/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - sakai-rights-tool - sakai-rights-tool - diff --git a/rights/rights-tool/tool/src/webapp/velocity.properties b/rights/rights-tool/tool/src/webapp/velocity.properties deleted file mode 100644 index 0018fd74d4a9..000000000000 --- a/rights/rights-tool/tool/src/webapp/velocity.properties +++ /dev/null @@ -1,104 +0,0 @@ -#---------------------------------------------------------------------------- -# These are the override settiongs over the default properties for the -# Velocity Runtime. -#---------------------------------------------------------------------------- - -#---------------------------------------------------------------------------- -# R U N T I M E L O G -#---------------------------------------------------------------------------- - -# log to our existing slf4j -runtime.log.logsystem.class = org.sakaiproject.velocity.util.SLF4JLogChute - -# default logger can be overridden -# runtime.log.logsystem.slf4j.logger = velocity.sakai.rights.tool - -# use this for no logging -#runtime.log.logsystem.class = org.apache.velocity.runtime.log.NullLogSystem - -#---------------------------------------------------------------------------- -# T E M P L A T E E N C O D I N G -#---------------------------------------------------------------------------- - -# This encoding is needed to properly pass through international Unicode characters -input.encoding=UTF-8 -output.encoding=UTF-8 - -#---------------------------------------------------------------------------- -# F O R E A C H P R O P E R T I E S -#---------------------------------------------------------------------------- -# These properties control how the counter is accessed in the #foreach -# directive. By default the reference $velocityCount will be available -# in the body of the #foreach directive. The default starting value -# for this reference is 1. -#---------------------------------------------------------------------------- - -###directive.foreach.counter.name = velocityCount -###directive.foreach.counter.initial.value = 1 - -#---------------------------------------------------------------------------- -# I N C L U D E P R O P E R T I E S -#---------------------------------------------------------------------------- -# These are the properties that governed the way #include'd content -# is governed. -#---------------------------------------------------------------------------- - -###directive.include.output.errormsg.start = - -#---------------------------------------------------------------------------- -# P A R S E P R O P E R T I E S -#---------------------------------------------------------------------------- - -directive.parse.max.depth = 10 - -#---------------------------------------------------------------------------- -# T E M P L A T E L O A D E R S -#---------------------------------------------------------------------------- -# -# -#---------------------------------------------------------------------------- - -resource.loader = webapp, classpath - -webapp.resource.loader.description = Velocity Webapp Resource Loader -webapp.resource.loader.class = org.apache.velocity.tools.view.servlet.WebappLoader -webapp.resource.loader.modificationCheckInterval = 0 -webapp.resource.loader.cachingOn = true - -classpath.resource.loader.description = Velocity Classpath Resource Loader -classpath.resource.loader.class = org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader - -#---------------------------------------------------------------------------- -# VELOCIMACRO PROPERTIES -#---------------------------------------------------------------------------- -# global : name of default global library. It is expected to be in the regular -# template path. You may remove it (either the file or this property) if -# you wish with no harm. -#---------------------------------------------------------------------------- -velocimacro.library = VM_chef_library.vm - -###velocimacro.permissions.allow.inline = true -###velocimacro.permissions.allow.inline.to.replace.global = false -###velocimacro.permissions.allow.inline.local.scope = false - -###velocimacro.context.localscope = false - -#---------------------------------------------------------------------------- -# INTERPOLATION -#---------------------------------------------------------------------------- -# turn off and on interpolation of references and directives in string -# literals. ON by default :) -#---------------------------------------------------------------------------- -###runtime.interpolate.string.literals = true - - -#---------------------------------------------------------------------------- -# RESOURCE MANAGEMENT -#---------------------------------------------------------------------------- -# Allows alternative ResourceManager and ResourceCache implementations -# to be plugged in. -#---------------------------------------------------------------------------- -resource.manager.class = org.apache.velocity.runtime.resource.ResourceManagerImpl -resource.manager.cache.class = org.apache.velocity.runtime.resource.ResourceCacheImpl -