[teiid-commits] teiid SVN: r2493 - in branches/7.1.x: build/kits/jboss-container/deploy/teiid and 1 other directories.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2010-08-26 12:01:31 -0400 (Thu, 26 Aug 2010)
New Revision: 2493

Modified:
   branches/7.1.x/build/kits/jboss-container/deploy/teiid/teiid-jboss-beans.xml
   branches/7.1.x/build/kits/jboss-container/teiid-releasenotes.html
   branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/Request.java
Log:
TEIID-1220 changing data role checking to be enabled by default, but to only check against vdbs with data roles

Modified: branches/7.1.x/build/kits/jboss-container/deploy/teiid/teiid-jboss-beans.xml
===================================================================
--- branches/7.1.x/build/kits/jboss-container/deploy/teiid/teiid-jboss-beans.xml	2010-08-26 15:29:47 UTC (rev 2492)
+++ branches/7.1.x/build/kits/jboss-container/deploy/teiid/teiid-jboss-beans.xml	2010-08-26 16:01:31 UTC (rev 2493)
@@ -91,14 +91,14 @@
         <property name="timeSliceInMilli">2000</property>
         <!-- Maximum allowed fetch size, set via JDBC. User requested value ignored above this value. (default 20480) -->
         <property name="maxRowsFetchSize">20480</property>
-        <!-- The max lob chunk size in KB transferred each time when processing blobs, clobs(100KB default) -->
+        <!-- The max lob chunk size in KB transferred each time when processing blobs, clobs (100KB default) -->
         <property name="lobChunkSizeInKB">100</property>
         <!-- The maximum number of query plans that are cached. 
              This includes both user plans and internal prepared plans.
              Note: this is a memory based cache. (default 512)  -->
         <property name="preparedPlanCacheMaxCount">512</property>
-        <!-- Turn on role checking on resources based on the roles defined in VDB -->
-        <property name="useDataRoles" class="java.lang.Boolean">false</property>
+        <!-- Turn on role checking of resources based on the roles defined in VDB (default true) -->
+        <property name="useDataRoles" class="java.lang.Boolean">true</property>
         <!-- Long running query threshold, after which a alert can be generated by tooling if configured-->
         <property name="queryThresholdInSecs">600</property>
 		<!-- Maximum rows allowed from a source query. -1 indicates no limit. (default -1)-->

Modified: branches/7.1.x/build/kits/jboss-container/teiid-releasenotes.html
===================================================================
--- branches/7.1.x/build/kits/jboss-container/teiid-releasenotes.html	2010-08-26 15:29:47 UTC (rev 2492)
+++ branches/7.1.x/build/kits/jboss-container/teiid-releasenotes.html	2010-08-26 16:01:31 UTC (rev 2493)
@@ -67,6 +67,7 @@
 
 <h4>from 7.1</h4>
 <ul>
+	<li>The default for data role checking is now "true".  However only VDBs with data roles will have roles enforced.
 	<li>The default prepared plan cache size was increased to 512, since it is targeted by internal plans as well.
 </ul>
 

Modified: branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/Request.java
===================================================================
--- branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/Request.java	2010-08-26 15:29:47 UTC (rev 2492)
+++ branches/7.1.x/engine/src/main/java/org/teiid/dqp/internal/process/Request.java	2010-08-26 16:01:31 UTC (rev 2493)
@@ -153,7 +153,7 @@
         this.workContext = workContext;
         this.requestId = workContext.getRequestID(this.requestMsg.getExecutionId());
         this.connectorManagerRepo = workContext.getVDB().getAttachment(ConnectorManagerRepository.class);
-        this.useEntitlements = useEntitlements;
+        this.useEntitlements = useEntitlements && !workContext.getVDB().getDataPolicies().isEmpty();
         this.planCache = planCache;
     }