You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2010/12/23 22:58:04 UTC
svn commit: r1052389 - in /ofbiz/trunk:
applications/securityext/servicedef/services.xml
framework/common/ofbiz-component.xml
framework/common/servicedef/services_security.xml
Author: adrianc
Date: Thu Dec 23 21:58:04 2010
New Revision: 1052389
URL: http://svn.apache.org/viewvc?rev=1052389&view=rev
Log:
Moved the security-related CRUD services to the common component.
Added:
ofbiz/trunk/framework/common/servicedef/services_security.xml (with props)
Modified:
ofbiz/trunk/applications/securityext/servicedef/services.xml
ofbiz/trunk/framework/common/ofbiz-component.xml
Modified: ofbiz/trunk/applications/securityext/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/securityext/servicedef/services.xml?rev=1052389&r1=1052388&r2=1052389&view=diff
==============================================================================
--- ofbiz/trunk/applications/securityext/servicedef/services.xml (original)
+++ ofbiz/trunk/applications/securityext/servicedef/services.xml Thu Dec 23 21:58:04 2010
@@ -24,99 +24,6 @@ under the License.
<vendor>OFBiz</vendor>
<version>1.0</version>
- <!-- SecurityGroup services -->
- <service name="createSecurityGroup" engine="entity-auto" invoke="create" default-entity-name="SecurityGroup" auth="true">
- <description>Create an SecurityGroup</description>
- <permission-service service-name="securityPermissionCheck" main-action="CREATE"/>
- <attribute name="groupId" type="String" mode="IN" optional="false"/>
- <attribute name="description" type="String" mode="IN" optional="true"/>
- </service>
- <service name="updateSecurityGroup" engine="entity-auto" invoke="update" default-entity-name="SecurityGroup" auth="true">
- <description>Update a SecurityGroup</description>
- <permission-service service-name="securityPermissionCheck" main-action="UPDATE"/>
- <attribute name="groupId" type="String" mode="IN" optional="false"/>
- <attribute name="description" type="String" mode="IN" optional="true"/>
- </service>
-
- <!-- SecurityPermission services -->
- <service name="createSecurityPermission" engine="entity-auto" invoke="create" default-entity-name="SecurityPermission" auth="true">
- <description>Create a SecurityPermission</description>
- <permission-service service-name="securityPermissionCheck" main-action="CREATE"/>
- <attribute name="permissionId" type="String" mode="IN" optional="false"/>
- <attribute name="description" type="String" mode="IN" optional="true"/>
- </service>
- <service name="updateSecurityPermission" engine="entity-auto" invoke="update" default-entity-name="SecurityPermission" auth="true">
- <description>Update a SecurityPermission</description>
- <permission-service service-name="securityPermissionCheck" main-action="UPDATE"/>
- <attribute name="permissionId" type="String" mode="IN" optional="false"/>
- <attribute name="description" type="String" mode="IN" optional="true"/>
- </service>
-
- <!-- SecurityPermission to SecurityGroup services -->
- <service name="addSecurityPermissionToSecurityGroup" engine="entity-auto" invoke="create" default-entity-name="SecurityGroupPermission" auth="true">
- <description>Add a SecurityPermission to a SecurityGroup</description>
- <permission-service service-name="securityPermissionCheck" main-action="CREATE"/>
- <attribute name="groupId" type="String" mode="IN" optional="false"/>
- <attribute name="permissionId" type="String" mode="IN" optional="false"/>
- </service>
- <service name="removeSecurityPermissionFromSecurityGroup" engine="entity-auto" invoke="delete" default-entity-name="SecurityGroupPermission" auth="true">
- <description>Remove a SecurityPermission from a SecurityGroup</description>
- <permission-service service-name="securityPermissionCheck" main-action="DELETE"/>
- <attribute name="groupId" type="String" mode="IN" optional="false"/>
- <attribute name="permissionId" type="String" mode="IN" optional="false"/>
- </service>
-
- <!-- UserLogin to SecurityGroup services -->
- <service name="addUserLoginToSecurityGroup" engine="entity-auto" invoke="create" default-entity-name="UserLoginSecurityGroup" auth="true">
- <description>Add a UserLogin to a SecurityGroup</description>
- <permission-service service-name="securityPermissionCheck" main-action="CREATE"/>
- <attribute name="userLoginId" type="String" mode="IN" optional="false"/>
- <attribute name="groupId" type="String" mode="IN" optional="false"/>
- <attribute name="fromDate" type="Timestamp" mode="IN" optional="true"/>
- <attribute name="thruDate" type="Timestamp" mode="IN" optional="true"/>
- </service>
- <service name="updateUserLoginToSecurityGroup" engine="entity-auto" invoke="update" default-entity-name="UserLoginSecurityGroup" auth="true">
- <description>Update a UserLogin to SecurityGroup Appl</description>
- <permission-service service-name="securityPermissionCheck" main-action="UPDATE"/>
- <attribute name="userLoginId" type="String" mode="IN" optional="false"/>
- <attribute name="groupId" type="String" mode="IN" optional="false"/>
- <attribute name="fromDate" type="Timestamp" mode="IN" optional="false"/>
- <attribute name="thruDate" type="Timestamp" mode="IN" optional="true"/>
- </service>
- <service name="removeUserLoginFromSecurityGroup" engine="entity-auto" invoke="delete" default-entity-name="UserLoginSecurityGroup" auth="true">
- <description>Remove a UserLogin from a SecurityGroup</description>
- <permission-service service-name="securityPermissionCheck" main-action="DELETE"/>
- <attribute name="userLoginId" type="String" mode="IN" optional="false"/>
- <attribute name="groupId" type="String" mode="IN" optional="false"/>
- <attribute name="fromDate" type="Timestamp" mode="IN" optional="false"/>
- </service>
-
- <!-- ProtectedView to SecurityGroup services -->
- <service name="addProtectedViewToSecurityGroup" engine="entity-auto" invoke="create" default-entity-name="ProtectedView" auth="true">
- <description>Add a Protected View to a SecurityGroup</description>
- <permission-service service-name="securityPermissionCheck" main-action="CREATE"/>
- <attribute name="viewNameId" type="String" mode="IN" optional="false"/>
- <attribute name="groupId" type="String" mode="IN" optional="false"/>
- <attribute name="maxHits" type="Integer" mode="IN" optional="false"/>
- <attribute name="maxHitsDuration" type="Long" mode="IN" optional="false"/>
- <attribute name="tarpitDuration" type="Long" mode="IN" optional="false"/>
- </service>
- <service name="updateProtectedViewToSecurityGroup" engine="entity-auto" invoke="update" default-entity-name="ProtectedView" auth="true">
- <description>Update a Protected View to SecurityGroup Assignment</description>
- <permission-service service-name="securityPermissionCheck" main-action="UPDATE"/>
- <attribute name="viewNameId" type="String" mode="IN" optional="false"/>
- <attribute name="groupId" type="String" mode="IN" optional="false"/>
- <attribute name="maxHits" type="Integer" mode="IN" optional="false"/>
- <attribute name="maxHitsDuration" type="Long" mode="IN" optional="false"/>
- <attribute name="tarpitDuration" type="Long" mode="IN" optional="false"/>
- </service>
- <service name="removeProtectedViewFromSecurityGroup" engine="entity-auto" invoke="delete" default-entity-name="ProtectedView" auth="true">
- <description>Remove a Protected View from a SecurityGroup</description>
- <permission-service service-name="securityPermissionCheck" main-action="DELETE"/>
- <attribute name="viewNameId" type="String" mode="IN" optional="false"/>
- <attribute name="groupId" type="String" mode="IN" optional="false"/>
- </service>
-
<!-- certificate services -->
<service name="importIssuerProvision" engine="java" auth="true"
location="org.ofbiz.securityext.cert.CertificateServices" invoke="importIssuerCertificate">
@@ -129,13 +36,6 @@ under the License.
<attribute name="alias" type="String" mode="IN" optional="false"/>
</service>
- <!-- permission check -->
- <service name="securityPermissionCheck" engine="simple"
- location="component://common/script/org/ofbiz/common/permission/CommonPermissionServices.xml" invoke="genericBasePermissionCheck">
- <implements service="permissionInterface"/>
- <attribute name="primaryPermission" type="String" mode="IN" optional="true" default-value="SECURITY"/>
- </service>
-
<!-- authorization dynamic access implementation API -->
<service name="dynamicAccessInterface" engine="interface">
<description>Service interface for implementing Dynamic Access as a service</description>
Modified: ofbiz/trunk/framework/common/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/ofbiz-component.xml?rev=1052389&r1=1052388&r2=1052389&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/ofbiz-component.xml (original)
+++ ofbiz/trunk/framework/common/ofbiz-component.xml Thu Dec 23 21:58:04 2010
@@ -59,6 +59,7 @@ under the License.
<service-resource type="model" loader="main" location="servicedef/services_cdyne.xml"/>
<service-resource type="model" loader="main" location="servicedef/services_email.xml"/>
<service-resource type="model" loader="main" location="servicedef/services_olap.xml"/>
+ <service-resource type="model" loader="main" location="servicedef/services_security.xml"/>
<service-resource type="model" loader="main" location="servicedef/services_test.xml"/>
<service-resource type="group" loader="main" location="servicedef/groups_test.xml"/>
<service-resource type="eca" loader="main" location="servicedef/secas_test.xml"/>
Added: ofbiz/trunk/framework/common/servicedef/services_security.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/servicedef/services_security.xml?rev=1052389&view=auto
==============================================================================
--- ofbiz/trunk/framework/common/servicedef/services_security.xml (added)
+++ ofbiz/trunk/framework/common/servicedef/services_security.xml Thu Dec 23 21:58:04 2010
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+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.
+-->
+
+<services xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/services.xsd">
+ <description>OFBiz Security Services</description>
+ <vendor>OFBiz</vendor>
+ <version>1.0</version>
+
+ <!-- SecurityGroup services -->
+ <service name="createSecurityGroup" engine="entity-auto" invoke="create" default-entity-name="SecurityGroup" auth="true">
+ <description>Create an SecurityGroup</description>
+ <permission-service service-name="securityPermissionCheck" main-action="CREATE"/>
+ <attribute name="groupId" type="String" mode="IN" optional="false"/>
+ <attribute name="description" type="String" mode="IN" optional="true"/>
+ </service>
+ <service name="updateSecurityGroup" engine="entity-auto" invoke="update" default-entity-name="SecurityGroup" auth="true">
+ <description>Update a SecurityGroup</description>
+ <permission-service service-name="securityPermissionCheck" main-action="UPDATE"/>
+ <attribute name="groupId" type="String" mode="IN" optional="false"/>
+ <attribute name="description" type="String" mode="IN" optional="true"/>
+ </service>
+
+ <!-- SecurityPermission services -->
+ <service name="createSecurityPermission" engine="entity-auto" invoke="create" default-entity-name="SecurityPermission" auth="true">
+ <description>Create a SecurityPermission</description>
+ <permission-service service-name="securityPermissionCheck" main-action="CREATE"/>
+ <attribute name="permissionId" type="String" mode="IN" optional="false"/>
+ <attribute name="description" type="String" mode="IN" optional="true"/>
+ </service>
+ <service name="updateSecurityPermission" engine="entity-auto" invoke="update" default-entity-name="SecurityPermission" auth="true">
+ <description>Update a SecurityPermission</description>
+ <permission-service service-name="securityPermissionCheck" main-action="UPDATE"/>
+ <attribute name="permissionId" type="String" mode="IN" optional="false"/>
+ <attribute name="description" type="String" mode="IN" optional="true"/>
+ </service>
+
+ <!-- SecurityPermission to SecurityGroup services -->
+ <service name="addSecurityPermissionToSecurityGroup" engine="entity-auto" invoke="create" default-entity-name="SecurityGroupPermission" auth="true">
+ <description>Add a SecurityPermission to a SecurityGroup</description>
+ <permission-service service-name="securityPermissionCheck" main-action="CREATE"/>
+ <attribute name="groupId" type="String" mode="IN" optional="false"/>
+ <attribute name="permissionId" type="String" mode="IN" optional="false"/>
+ </service>
+ <service name="removeSecurityPermissionFromSecurityGroup" engine="entity-auto" invoke="delete" default-entity-name="SecurityGroupPermission" auth="true">
+ <description>Remove a SecurityPermission from a SecurityGroup</description>
+ <permission-service service-name="securityPermissionCheck" main-action="DELETE"/>
+ <attribute name="groupId" type="String" mode="IN" optional="false"/>
+ <attribute name="permissionId" type="String" mode="IN" optional="false"/>
+ </service>
+
+ <!-- UserLogin to SecurityGroup services -->
+ <service name="addUserLoginToSecurityGroup" engine="entity-auto" invoke="create" default-entity-name="UserLoginSecurityGroup" auth="true">
+ <description>Add a UserLogin to a SecurityGroup</description>
+ <permission-service service-name="securityPermissionCheck" main-action="CREATE"/>
+ <attribute name="userLoginId" type="String" mode="IN" optional="false"/>
+ <attribute name="groupId" type="String" mode="IN" optional="false"/>
+ <attribute name="fromDate" type="Timestamp" mode="IN" optional="true"/>
+ <attribute name="thruDate" type="Timestamp" mode="IN" optional="true"/>
+ </service>
+ <service name="updateUserLoginToSecurityGroup" engine="entity-auto" invoke="update" default-entity-name="UserLoginSecurityGroup" auth="true">
+ <description>Update a UserLogin to SecurityGroup Appl</description>
+ <permission-service service-name="securityPermissionCheck" main-action="UPDATE"/>
+ <attribute name="userLoginId" type="String" mode="IN" optional="false"/>
+ <attribute name="groupId" type="String" mode="IN" optional="false"/>
+ <attribute name="fromDate" type="Timestamp" mode="IN" optional="false"/>
+ <attribute name="thruDate" type="Timestamp" mode="IN" optional="true"/>
+ </service>
+ <service name="removeUserLoginFromSecurityGroup" engine="entity-auto" invoke="delete" default-entity-name="UserLoginSecurityGroup" auth="true">
+ <description>Remove a UserLogin from a SecurityGroup</description>
+ <permission-service service-name="securityPermissionCheck" main-action="DELETE"/>
+ <attribute name="userLoginId" type="String" mode="IN" optional="false"/>
+ <attribute name="groupId" type="String" mode="IN" optional="false"/>
+ <attribute name="fromDate" type="Timestamp" mode="IN" optional="false"/>
+ </service>
+
+ <!-- ProtectedView to SecurityGroup services -->
+ <service name="addProtectedViewToSecurityGroup" engine="entity-auto" invoke="create" default-entity-name="ProtectedView" auth="true">
+ <description>Add a Protected View to a SecurityGroup</description>
+ <permission-service service-name="securityPermissionCheck" main-action="CREATE"/>
+ <attribute name="viewNameId" type="String" mode="IN" optional="false"/>
+ <attribute name="groupId" type="String" mode="IN" optional="false"/>
+ <attribute name="maxHits" type="Integer" mode="IN" optional="false"/>
+ <attribute name="maxHitsDuration" type="Long" mode="IN" optional="false"/>
+ <attribute name="tarpitDuration" type="Long" mode="IN" optional="false"/>
+ </service>
+ <service name="updateProtectedViewToSecurityGroup" engine="entity-auto" invoke="update" default-entity-name="ProtectedView" auth="true">
+ <description>Update a Protected View to SecurityGroup Assignment</description>
+ <permission-service service-name="securityPermissionCheck" main-action="UPDATE"/>
+ <attribute name="viewNameId" type="String" mode="IN" optional="false"/>
+ <attribute name="groupId" type="String" mode="IN" optional="false"/>
+ <attribute name="maxHits" type="Integer" mode="IN" optional="false"/>
+ <attribute name="maxHitsDuration" type="Long" mode="IN" optional="false"/>
+ <attribute name="tarpitDuration" type="Long" mode="IN" optional="false"/>
+ </service>
+ <service name="removeProtectedViewFromSecurityGroup" engine="entity-auto" invoke="delete" default-entity-name="ProtectedView" auth="true">
+ <description>Remove a Protected View from a SecurityGroup</description>
+ <permission-service service-name="securityPermissionCheck" main-action="DELETE"/>
+ <attribute name="viewNameId" type="String" mode="IN" optional="false"/>
+ <attribute name="groupId" type="String" mode="IN" optional="false"/>
+ </service>
+
+ <!-- permission check -->
+ <service name="securityPermissionCheck" engine="simple"
+ location="component://common/script/org/ofbiz/common/permission/CommonPermissionServices.xml" invoke="genericBasePermissionCheck">
+ <implements service="permissionInterface"/>
+ <attribute name="primaryPermission" type="String" mode="IN" optional="true" default-value="SECURITY"/>
+ </service>
+
+</services>
Propchange: ofbiz/trunk/framework/common/servicedef/services_security.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/framework/common/servicedef/services_security.xml
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/framework/common/servicedef/services_security.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml