svn commit: r945510 - in /synapse/trunk/java: modules/commons/src/main/java/org/apache/synapse/commons/executors/ modules/core/src/main/java/org/apache/synapse/config/xml/ repository/conf/sample/ repository/conf/sample/resources/priority/ src/site/xdoc/

[ruwan]

Author: ruwan
Date: Tue May 18 06:10:07 2010
New Revision: 945510

URL: http://svn.apache.org/viewvc?rev=945510&view=rev
Log:
Changing the Configuration of the priority-executor to priorityExecutor for 
consistency

Modified:
    
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/executors/ExecutorConstants.java
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MultiXMLConfigurationBuilder.java
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java
    
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigConstants.java
    
synapse/trunk/java/repository/conf/sample/resources/priority/priority-configuration.xml
    synapse/trunk/java/repository/conf/sample/synapse_sample_650.xml
    synapse/trunk/java/src/site/xdoc/Synapse_Samples.xml

Modified: 
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/executors/ExecutorConstants.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/executors/ExecutorConstants.java?rev=945510&r1=945509&r2=945510&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/executors/ExecutorConstants.java
 (original)
+++ 
synapse/trunk/java/modules/commons/src/main/java/org/apache/synapse/commons/executors/ExecutorConstants.java
 Tue May 18 06:10:07 2010
@@ -34,7 +34,7 @@ public abstract class ExecutorConstants 
     public static final String QUEUES = "queues";
     public static final String QUEUE = "queue";
 
-    public static final String PRIORITY_EXECUTOR = "priority-executor";
+    public static final String PRIORITY_EXECUTOR = "priorityExecutor";
     public static final String THREADS = "threads";
     public static final String MAX = "max";
     public static final String CORE = "core";

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MultiXMLConfigurationBuilder.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MultiXMLConfigurationBuilder.java?rev=945510&r1=945509&r2=945510&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MultiXMLConfigurationBuilder.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MultiXMLConfigurationBuilder.java
 Tue May 18 06:10:07 2010
@@ -73,7 +73,7 @@ public class MultiXMLConfigurationBuilde
     public static final String LOCAL_ENTRY_DIR     = "local-entries";
     public static final String TASKS_DIR           = "tasks";
     public static final String EVENTS_DIR          = "event-sources";
-    public static final String EXECUTORS_DIR       = "priority-executors";
+    public static final String EXECUTORS_DIR       = "priorityExecutors";
 
     public static final String REGISTRY_FILE       = "registry.xml";
 

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java?rev=945510&r1=945509&r2=945510&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/SynapseXMLConfigurationFactory.java
 Tue May 18 06:10:07 2010
@@ -191,7 +191,7 @@ public class SynapseXMLConfigurationFact
             executor = PriorityExecutorFactory.createExecutor(
                 XMLConfigConstants.SYNAPSE_NAMESPACE, elem, true);
         } catch (AxisFault axisFault) {
-            handleException("Failed to create the priority-executor 
configuration");
+            handleException("Failed to create the priorityExecutor 
configuration");
         }
         config.addPriorityExecutor(executor.getName(), executor);
         return executor;

Modified: 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigConstants.java
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigConstants.java?rev=945510&r1=945509&r2=945510&view=diff
==============================================================================
--- 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigConstants.java
 (original)
+++ 
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/XMLConfigConstants.java
 Tue May 18 06:10:07 2010
@@ -65,7 +65,7 @@ public class XMLConfigConstants {
     public static final String NULL_NAMESPACE = "";
     public static final Object QUARTZ_QNAME   =
         new QName("http://www.opensymphony.com/quartz/JobSchedulingData";, 
"quartz");
-    public static final QName EXECUTOR_ELT = new QName(SYNAPSE_NAMESPACE, 
"priority-executor");
+    public static final QName EXECUTOR_ELT = new QName(SYNAPSE_NAMESPACE, 
"priorityExecutor");
 
        /** The Trace attribute name, for proxy services, sequences */
        public static final String TRACE_ATTRIB_NAME = "trace";

Modified: 
synapse/trunk/java/repository/conf/sample/resources/priority/priority-configuration.xml
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/repository/conf/sample/resources/priority/priority-configuration.xml?rev=945510&r1=945509&r2=945510&view=diff
==============================================================================
--- 
synapse/trunk/java/repository/conf/sample/resources/priority/priority-configuration.xml
 (original)
+++ 
synapse/trunk/java/repository/conf/sample/resources/priority/priority-configuration.xml
 Tue May 18 06:10:07 2010
@@ -18,7 +18,7 @@
   -->
         
 <priorityConfiguration>
-    <priority-executor>
+    <priorityExecutor>
         <!-- two priorities specified with priority 10 and 1. Both priority 
messages has a queue depth of 100 -->
         <queues isFixedCapacity="true" 
nextQueue="org.apache.synapse.commons.executors.PRRNextQueueAlgorithm">
             <queue size="100" priority="10"/>
@@ -26,7 +26,7 @@
         </queues>
         <!-- these are the default values, values are put here to show their 
availability -->
         <threads core="20" max="100" keep-alive="5"/>
-    </priority-executor>
+    </priorityExecutor>
 
     <!-- if a message comes that we cannot determine priority, we set a 
default priority of 1 -->
     <conditions defaultPriority="1">

Modified: synapse/trunk/java/repository/conf/sample/synapse_sample_650.xml
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/repository/conf/sample/synapse_sample_650.xml?rev=945510&r1=945509&r2=945510&view=diff
==============================================================================
--- synapse/trunk/java/repository/conf/sample/synapse_sample_650.xml (original)
+++ synapse/trunk/java/repository/conf/sample/synapse_sample_650.xml Tue May 18 
06:10:07 2010
@@ -19,12 +19,12 @@
 
 <!-- Introduction to priority based mediation -->
 <definitions xmlns="http://synapse.apache.org/ns/2010/04/configuration";>
-    <priority-executor name="exec">
+    <priorityExecutor name="exec">
         <queues>
             <queue size="100" priority="1"/>
             <queue size="100" priority="10"/>
         </queues>
-    </priority-executor>
+    </priorityExecutor>
     <proxy name="StockQuoteProxy">
         <target>
             <inSequence>

Modified: synapse/trunk/java/src/site/xdoc/Synapse_Samples.xml
URL: 
http://svn.apache.org/viewvc/synapse/trunk/java/src/site/xdoc/Synapse_Samples.xml?rev=945510&r1=945509&r2=945510&view=diff
==============================================================================
--- synapse/trunk/java/src/site/xdoc/Synapse_Samples.xml (original)
+++ synapse/trunk/java/src/site/xdoc/Synapse_Samples.xml Tue May 18 06:10:07 
2010
@@ -4660,12 +4660,12 @@ Discounted price: 138.77458254967408</pr
          &#xa0;
        </p>
    <pre xml:space="preserve">&lt;definitions 
xmlns=&quot;http://synapse.apache.org/ns/2010/04/configuraiton&quot;&gt;
-    &lt;priority-executor name=&quot;exec&quot;&gt;
+    &lt;priorityExecutor name=&quot;exec&quot;&gt;
         &lt;queues&gt;
             &lt;queue size=&quot;100&quot; priority=&quot;1&quot;/&gt;
             &lt;queue size=&quot;100&quot; priority=&quot;10&quot;/&gt;
         &lt;/queues&gt;
-    &lt;/priority-executor&gt;
+    &lt;/priorityExecutor&gt;
     &lt;proxy name=&quot;StockQuoteProxy&quot;&gt;
         &lt;target&gt;
             &lt;inSequence&gt;
@@ -4763,7 +4763,7 @@ Discounted price: 138.77458254967408</pr
         Here is the priority configuration file used by the NHTTP transport to 
determine the priority based on HTTP level properties.
     </p>
    <pre xml:space="preserve">&lt;priorityConfiguration&gt;
-    &lt;priority-executor&gt;
+    &lt;priorityExecutor&gt;
         &lt;!-- two priorities specified with priority 10 and 1. Both priority 
messages has a queue depth of 100 --&gt;
         &lt;queues isFixedCapacity=&quot;true&quot; 
nextQueue=&quot;org.apache.synapse.commons.executors.PRRNextQueueAlgorithm&quot;&gt;
             &lt;queue size=&quot;100&quot; priority=&quot;10&quot;/&gt;
@@ -4771,7 +4771,7 @@ Discounted price: 138.77458254967408</pr
         &lt;/queues&gt;
         &lt;!-- these are the default values, values are put here to show 
their availability --&gt;
         &lt;threads core=&quot;20&quot; max=&quot;100&quot; 
keep-alive=&quot;5&quot;/&gt;
-    &lt;/priority-executor&gt;
+    &lt;/priorityExecutor&gt;
 
     &lt;!-- if a message comes that we cannot determine priority, we set a 
default priority of 1 --&gt;
     &lt;conditions defaultPriority=&quot;1&quot;&gt;