From: Sanjay Dalal <sanjay.dalal@berkeley.edu>
Date: Thu, 8 Apr 2010 01:33:34 +0000 (+0000)
Subject: CSPACE-1304 create permission
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=0f78232c4b42df6fc10e485077f08ffbd4b6b4ce;p=tmp%2Fjakarta-migration.git

CSPACE-1304 create permission
fix for r1766 uses include instead of import
test: why does it matter?

M    services/authorization/jaxb/src/main/resources/permissions_list.xsd
M    services/authorization/jaxb/src/main/resources/roles_list.xsd
---

diff --git a/services/authorization/jaxb/src/main/resources/permissions_list.xsd b/services/authorization/jaxb/src/main/resources/permissions_list.xsd
index 2a3e51584..03c7e2f28 100644
--- a/services/authorization/jaxb/src/main/resources/permissions_list.xsd
+++ b/services/authorization/jaxb/src/main/resources/permissions_list.xsd
@@ -27,8 +27,7 @@
     See http://weblogs.java.net/blog/kohsuke/archive/2006/03/why_does_jaxb_p.html
 -->
 
-    <xs:import namespace="http://collectionspace.org/services/authorization"
-            schemaLocation="permissions.xsd"/>
+    <xs:include schemaLocation="permissions.xsd"/>
     <xs:element name="permissions_list">
         <xs:complexType>
             <xs:annotation>
diff --git a/services/authorization/jaxb/src/main/resources/roles_list.xsd b/services/authorization/jaxb/src/main/resources/roles_list.xsd
index dac098062..5392895be 100644
--- a/services/authorization/jaxb/src/main/resources/roles_list.xsd
+++ b/services/authorization/jaxb/src/main/resources/roles_list.xsd
@@ -33,8 +33,7 @@
     hbm2ddl makes column length >= 256 as long text, such as column cannot be used
     in defining a key (pk, fk or constraint)
     -->
-    <xs:import namespace="http://collectionspace.org/services/authorization"
-            schemaLocation="roles.xsd"/>
+    <xs:include schemaLocation="roles.xsd"/>
 
     <xs:element name="roles_list">
         <xs:complexType>