Author: indika
Date: Tue Jan 20 01:10:45 2009
New Revision: 29029
URL: http://wso2.org/svn/browse/wso2?view=rev&revision=29029

Log:
update throttle policy

Modified:
   
trunk/esb/java/modules/samples/src/main/conf/synapse/resources/policy/throttle_policy.xml
   trunk/esb/java/modules/samples/src/main/conf/synapse/synapse_sample_370.xml
   trunk/esb/java/modules/samples/src/main/conf/synapse/synapse_sample_371.xml

Modified: 
trunk/esb/java/modules/samples/src/main/conf/synapse/resources/policy/throttle_policy.xml
URL: 
http://wso2.org/svn/browse/wso2/trunk/esb/java/modules/samples/src/main/conf/synapse/resources/policy/throttle_policy.xml?rev=29029&r1=29028&r2=29029&view=diff
==============================================================================
--- 
trunk/esb/java/modules/samples/src/main/conf/synapse/resources/policy/throttle_policy.xml
   (original)
+++ 
trunk/esb/java/modules/samples/src/main/conf/synapse/resources/policy/throttle_policy.xml
   Tue Jan 20 01:10:45 2009
@@ -19,51 +19,32 @@
 
 <wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";
             xmlns:throttle="http://www.wso2.org/products/wso2commons/throttle";>
-    <throttle:ThrottleAssertion>
+
+    <throttle:MediatorThrottleAssertion>
         <throttle:MaximumConcurrentAccess>10</throttle:MaximumConcurrentAccess>
-        <wsp:All>
+        <wsp:Policy>
             <throttle:ID throttle:type="IP">other</throttle:ID>
-            <wsp:ExactlyOne>
-                <wsp:All>
-                    <throttle:MaximumCount>4</throttle:MaximumCount>
-                    <throttle:UnitTime>800000</throttle:UnitTime>
-                    <throttle:ProhibitTimePeriod 
wsp:Optional="true">1000</throttle:ProhibitTimePeriod>
-                </wsp:All>
-                <throttle:IsAllow>true</throttle:IsAllow>
-            </wsp:ExactlyOne>
-        </wsp:All>
-        <wsp:All>
-            <throttle:ID 
throttle:type="IP">10.100.1.150-10.100.1.152</throttle:ID>
-            <wsp:ExactlyOne>
-                <wsp:All>
-                    <throttle:MaximumCount>5</throttle:MaximumCount>
-                    <throttle:UnitTime>800000</throttle:UnitTime>
-                    <throttle:ProhibitTimePeriod 
wsp:Optional="true">100000</throttle:ProhibitTimePeriod>
-                </wsp:All>
-                <throttle:IsAllow>true</throttle:IsAllow>
-            </wsp:ExactlyOne>
-        </wsp:All>
-        <wsp:All>
-            <throttle:ID throttle:type="IP">192.168.8.201</throttle:ID>
-            <wsp:ExactlyOne>
-                <wsp:All>
-                    <throttle:MaximumCount>200</throttle:MaximumCount>
-                    <throttle:UnitTime>600000</throttle:UnitTime>
-                    <throttle:ProhibitTimePeriod 
wsp:Optional="true"></throttle:ProhibitTimePeriod>
-                </wsp:All>
-                <throttle:IsAllow>true</throttle:IsAllow>
-            </wsp:ExactlyOne>
-        </wsp:All>
-        <wsp:All>
-            <throttle:ID throttle:type="IP">192.168.8.198</throttle:ID>
-            <wsp:ExactlyOne>
-                <wsp:All>
-                    <throttle:MaximumCount>50</throttle:MaximumCount>
-                    <throttle:UnitTime>500000</throttle:UnitTime>
-                    <throttle:ProhibitTimePeriod 
wsp:Optional="true"></throttle:ProhibitTimePeriod>
-                </wsp:All>
-                <throttle:IsAllow>true</throttle:IsAllow>
-            </wsp:ExactlyOne>
-        </wsp:All>
-    </throttle:ThrottleAssertion>
+            <wsp:Policy>
+                <throttle:Control>
+                    <wsp:Policy>
+                        <throttle:MaximumCount>4</throttle:MaximumCount>
+                        <throttle:UnitTime>800000</throttle:UnitTime>
+                        <throttle:ProhibitTimePeriod 
wsp:Optional="true">1000</throttle:ProhibitTimePeriod>
+                    </wsp:Policy>
+                </throttle:Control>
+            </wsp:Policy>
+        </wsp:Policy>
+        <wsp:Policy>
+            <throttle:ID throttle:type="IP">10.100.1.160 - 
10.100.1.165</throttle:ID>
+            <wsp:Policy>
+                <throttle:Control>
+                    <wsp:Policy>
+                        <throttle:MaximumCount>5</throttle:MaximumCount>
+                        <throttle:UnitTime>800000</throttle:UnitTime>
+                        <throttle:ProhibitTimePeriod 
wsp:Optional="true">100000</throttle:ProhibitTimePeriod>
+                    </wsp:Policy>
+                </throttle:Control>
+            </wsp:Policy>
+        </wsp:Policy>
+    </throttle:MediatorThrottleAssertion>
 </wsp:Policy>
\ No newline at end of file

Modified: 
trunk/esb/java/modules/samples/src/main/conf/synapse/synapse_sample_370.xml
URL: 
http://wso2.org/svn/browse/wso2/trunk/esb/java/modules/samples/src/main/conf/synapse/synapse_sample_370.xml?rev=29029&r1=29028&r2=29029&view=diff
==============================================================================
--- trunk/esb/java/modules/samples/src/main/conf/synapse/synapse_sample_370.xml 
(original)
+++ trunk/esb/java/modules/samples/src/main/conf/synapse/synapse_sample_370.xml 
Tue Jan 20 01:10:45 2009
@@ -26,9 +26,10 @@
                     <!-- define throttle policy -->
                     <wsp:Policy 
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";
                                 
xmlns:throttle="http://www.wso2.org/products/wso2commons/throttle";>
-                        <throttle:ThrottleAssertion>
+
+                        <throttle:MediatorThrottleAssertion>
                             
<throttle:MaximumConcurrentAccess>10</throttle:MaximumConcurrentAccess>
-                        </throttle:ThrottleAssertion>
+                        </throttle:MediatorThrottleAssertion>
                     </wsp:Policy>
                 </policy>
                 <onAccept>

Modified: 
trunk/esb/java/modules/samples/src/main/conf/synapse/synapse_sample_371.xml
URL: 
http://wso2.org/svn/browse/wso2/trunk/esb/java/modules/samples/src/main/conf/synapse/synapse_sample_371.xml?rev=29029&r1=29028&r2=29029&view=diff
==============================================================================
--- trunk/esb/java/modules/samples/src/main/conf/synapse/synapse_sample_371.xml 
(original)
+++ trunk/esb/java/modules/samples/src/main/conf/synapse/synapse_sample_371.xml 
Tue Jan 20 01:10:45 2009
@@ -26,53 +26,35 @@
                     <!-- define throttle policy -->
                     <wsp:Policy 
xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";
                                 
xmlns:throttle="http://www.wso2.org/products/wso2commons/throttle";>
-                        <throttle:ThrottleAssertion>
-                            
<throttle:MaximumConcurrentAccess>10</throttle:MaximumConcurrentAccess>
-                            <wsp:All>
+
+                        <throttle:MediatorThrottleAssertion>
+                            <wsp:Policy>
                                 <throttle:ID 
throttle:type="IP">other</throttle:ID>
-                                <wsp:ExactlyOne>
-                                    <wsp:All>
-                                        
<throttle:MaximumCount>4</throttle:MaximumCount>
-                                        
<throttle:UnitTime>800000</throttle:UnitTime>
-                                        <throttle:ProhibitTimePeriod 
wsp:Optional="true">10000</throttle:ProhibitTimePeriod>
-                                    </wsp:All>
-                                    <throttle:IsAllow>true</throttle:IsAllow>
-                                </wsp:ExactlyOne>
-                            </wsp:All>
-                            <wsp:All>
-                                <throttle:ID 
throttle:type="IP">192.168.8.200-192.168.8.222</throttle:ID>
-                                <wsp:ExactlyOne>
-                                    <wsp:All>
-                                        
<throttle:MaximumCount>8</throttle:MaximumCount>
-                                        
<throttle:UnitTime>800000</throttle:UnitTime>
-                                        <throttle:ProhibitTimePeriod 
wsp:Optional="true">10</throttle:ProhibitTimePeriod>
-                                    </wsp:All>
-                                    <throttle:IsAllow>true</throttle:IsAllow>
-                                </wsp:ExactlyOne>
-                            </wsp:All>
-                            <wsp:All>
-                                <throttle:ID 
throttle:type="IP">192.168.8.201</throttle:ID>
-                                <wsp:ExactlyOne>
-                                    <wsp:All>
-                                        
<throttle:MaximumCount>200</throttle:MaximumCount>
-                                        
<throttle:UnitTime>600000</throttle:UnitTime>
-                                        <throttle:ProhibitTimePeriod 
wsp:Optional="true"></throttle:ProhibitTimePeriod>
-                                    </wsp:All>
-                                    <throttle:IsAllow>true</throttle:IsAllow>
-                                </wsp:ExactlyOne>
-                            </wsp:All>
-                            <wsp:All>
-                                <throttle:ID 
throttle:type="IP">192.168.8.198</throttle:ID>
-                                <wsp:ExactlyOne>
-                                    <wsp:All>
-                                        
<throttle:MaximumCount>50</throttle:MaximumCount>
-                                        
<throttle:UnitTime>500000</throttle:UnitTime>
-                                        <throttle:ProhibitTimePeriod 
wsp:Optional="true"></throttle:ProhibitTimePeriod>
-                                    </wsp:All>
-                                    <throttle:IsAllow>true</throttle:IsAllow>
-                                </wsp:ExactlyOne>
-                            </wsp:All>
-                        </throttle:ThrottleAssertion>
+                                <wsp:Policy>
+                                    <throttle:Control>
+                                        <wsp:Policy>
+                                            
<throttle:MaximumCount>4</throttle:MaximumCount>
+                                            
<throttle:UnitTime>800000</throttle:UnitTime>
+                                            <throttle:ProhibitTimePeriod 
wsp:Optional="true">1000
+                                            </throttle:ProhibitTimePeriod>
+                                        </wsp:Policy>
+                                    </throttle:Control>
+                                </wsp:Policy>
+                            </wsp:Policy>
+                            <wsp:Policy>
+                                <throttle:ID throttle:type="IP">10.100.1.160 - 
10.100.1.165</throttle:ID>
+                                <wsp:Policy>
+                                    <throttle:Control>
+                                        <wsp:Policy>
+                                            
<throttle:MaximumCount>5</throttle:MaximumCount>
+                                            
<throttle:UnitTime>800000</throttle:UnitTime>
+                                            <throttle:ProhibitTimePeriod 
wsp:Optional="true">100000
+                                            </throttle:ProhibitTimePeriod>
+                                        </wsp:Policy>
+                                    </throttle:Control>
+                                </wsp:Policy>
+                            </wsp:Policy>
+                        </throttle:MediatorThrottleAssertion>
                     </wsp:Policy>
                 </policy>
                 <onAccept>

_______________________________________________
Esb-java-dev mailing list
[email protected]
https://wso2.org/cgi-bin/mailman/listinfo/esb-java-dev

Reply via email to