Author: chamikara
Date: Sat Sep 23 08:17:27 2006
New Revision: 449258

URL: http://svn.apache.org/viewvc?view=rev&rev=449258
Log:
Moved the policy assertion builder to the config directory.


Added:
    webservices/sandesha/trunk/java/config/rmpolicy/
    webservices/sandesha/trunk/java/config/rmpolicy/META-INF/
    webservices/sandesha/trunk/java/config/rmpolicy/META-INF/services/
    
webservices/sandesha/trunk/java/config/rmpolicy/META-INF/services/org.apache.neethi.builders.AssertionBuilder
Modified:
    webservices/sandesha/trunk/java/config/client_axis2.xml
    webservices/sandesha/trunk/java/config/module.xml
    webservices/sandesha/trunk/java/config/server_axis2.xml

Modified: webservices/sandesha/trunk/java/config/client_axis2.xml
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/config/client_axis2.xml?view=diff&rev=449258&r1=449257&r2=449258
==============================================================================
--- webservices/sandesha/trunk/java/config/client_axis2.xml (original)
+++ webservices/sandesha/trunk/java/config/client_axis2.xml Sat Sep 23 08:17:27 
2006
@@ -16,17 +16,29 @@
     <!--is set then, Axis2 tries to get the first exception and set its 
message as the faultreason/Reason.-->

     <parameter name="DrillDownToRootCauseForFaultReason" 
locked="false">false</parameter>

 

-    <!-- Uncomment this to enable REST support -->

-    <!--    <parameter name="enableREST" locked="false">true</parameter>-->

-

     <!--This is the user name and password of admin console-->

     <parameter name="userName" locked="false">admin</parameter>

     <parameter name="password" locked="false">axis2</parameter>

-    

-    

-    <parameter name="Sandesha2StorageManager" 
locked="false">inmemory</parameter>

-    

-    

+

+    <!--<parameter name="contextRoot" locked="false">axis2</parameter>-->

+    <!--<parameter name="servicePath" locked="false">services</parameter>-->

+    <!--Set the flag to true if you want to enable transport level session 
mangment-->

+    <parameter name="manageTransportSession" locked="false">false</parameter>

+

+    <!--Following two parameters will be used to handle REST in Axis2. The 
default settings will make Axis2 to have two-->

+    <!--different endpoints, one for REST (AxisRESTServlet) one for SOAP 
message handling (AxisServlet). But following-->

+    <!--parameters help to tweak the message handling of two main servlets. -->

+

+    <!-- If the enableRESTInAxis2MainServlet is true, then Axis2MainServlet 
will handle both SOAP and REST messages -->

+    <parameter name="enableRESTInAxis2MainServlet" 
locked="true">true</parameter>

+

+    <!-- Following parameter will completely disable REST handling in both the 
servlets-->

+    <parameter name="disableREST" locked="true">false</parameter>

+

+    <!-- This will disable the separate servlet we have for REST handling. -->

+    <parameter name="disableSeparateEndpointForREST" 
locked="true">false</parameter>

+

+

 

     <!-- ================================================= -->

     <!-- Message Receivers -->

@@ -41,6 +53,18 @@
         <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out";

                          
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>

     </messageReceivers>

+    

+    <!-- ================================================= -->

+    <!-- Target Resolvers -->

+    <!-- ================================================= -->

+    <!-- Uncomment the following and specify the class name for your 
TargetResolver to add -->

+    <!-- a TargetResolver. TargetResolvers are used to process the To EPR for 
example to -->

+    <!-- choose a server in a cluster -->

+    <!--<targetResolvers>-->

+    <!--<targetResolver class="" />-->

+    <!--</targetResolvers>-->

+    

+    

     <!-- ================================================= -->

     <!-- Transport Ins -->

     <!-- ================================================= -->

@@ -68,8 +92,6 @@
                      
class="org.apache.axis2.transport.tcp.TCPTransportSender"/>

     <transportSender name="local"

                      
class="org.apache.axis2.transport.local.LocalTransportSender"/>

-    <transportSender name="jms"

-                     class="org.apache.axis2.transport.jms.JMSSender"/>

     <transportSender name="http"

                      
class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">

         <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>

@@ -81,9 +103,9 @@
         <parameter name="Transfer-Encoding" locked="false">chunked</parameter>

     </transportSender>

 

-    <module ref="addressing" />

-    <module ref="sandesha2" />

-

+       <module ref="addressing" />

+       <module ref="sandesha2" />

+       

     <!-- ================================================= -->

     <!-- Phases  -->

     <!-- ================================================= -->

@@ -92,11 +114,11 @@
          <phase name="Transport">

             <handler name="RequestURIBasedDispatcher"

                      class="org.apache.axis2.engine.RequestURIBasedDispatcher">

-                <order phase="Dispatch"/>

+                <order phase="Transport"/>

             </handler>

             <handler name="SOAPActionBasedDispatcher"

                      class="org.apache.axis2.engine.SOAPActionBasedDispatcher">

-                <order phase="Dispatch"/>

+                <order phase="Transport"/>

             </handler>

         </phase>

         <phase name="Security"/>

@@ -113,18 +135,18 @@
             </handler>

             <handler name="InstanceDispatcher"

                      class="org.apache.axis2.engine.InstanceDispatcher">

-                <order phase="PostDispatch"/>

+                <order phase="Dispatch"/>

             </handler>

         </phase>

         <!--  System pre defined phases       -->

         <!--   After Postdispatch phase module author or or service author can 
add any phase he want      -->

-        <phase name="RMPhase"/>

         <phase name="OperationInPhase"/>

+               <phase name="RMPhase" />

     </phaseOrder>

     <phaseOrder type="outflow">

         <!--      user can add his own phases to this area  -->

-        <phase name="OperationOutPhase"/>

-        <phase name="RMPhase"/>

+               <phase name="RMPhase" />

+           <phase name="OperationOutPhase"/>

         <!--system predefined phase-->

         <!--these phase will run irrespective of the service-->

         <phase name="PolicyDetermination"/>

@@ -154,17 +176,17 @@
             </handler>

             <handler name="InstanceDispatcher"

                      class="org.apache.axis2.engine.InstanceDispatcher">

-                <order phase="PostDispatch"/>

+                <order phase="Dispatch"/>

             </handler>

         </phase>

         <!--      user can add his own phases to this area  -->

-        <phase name="RMPhase"/>

         <phase name="OperationInFaultPhase"/>

+               <phase name="RMPhase" />

     </phaseOrder>

     <phaseOrder type="Outfaultflow">

         <!--      user can add his own phases to this area  -->

-        <phase name="OperationOutFaultPhase"/>

-        <phase name="RMPhase"/>

+        <phase name="RMPhase" />

+               <phase name="OperationOutFaultPhase"/>

         <phase name="PolicyDetermination"/>

         <phase name="MessageOut"/>

     </phaseOrder>


Modified: webservices/sandesha/trunk/java/config/module.xml
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/config/module.xml?view=diff&rev=449258&r1=449257&r2=449258
==============================================================================
--- webservices/sandesha/trunk/java/config/module.xml (original)
+++ webservices/sandesha/trunk/java/config/module.xml Sat Sep 23 08:17:27 2006
@@ -64,7 +64,7 @@
         
<actionMapping>http://docs.oasis-open.org/ws-rx/wsrm/200608/CloseSequence</actionMapping>

         
<actionMapping>http://docs.oasis-open.org/ws-rx/wsrm/200608/TerminateSequenceResponse</actionMapping>

         
<actionMapping>http://docs.oasis-open.org/ws-rx/wsrm/200608/CloseSequenceResponse</actionMapping>

-

+        
<actionMapping>http://docs.oasisopen.org/ws-rx/wsrm/200608/MakeConnection</actionMapping>

     </operation>

 

    <!-- Database connection parameters -->

@@ -77,46 +77,45 @@
 

    <supported-policy-namespaces 
namespaces="http://ws.apache.org/sandesha2/policy"; />

 

-<wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";

-               
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";

-               xmlns:wsrm="http://ws.apache.org/sandesha2/policy"; 
wsu:Id="RMPolicy">

-       <wsrm:RMAssertion>

-               <wsp:Policy>

-                       
<wsrm:AcknowledgementInterval>3000</wsrm:AcknowledgementInterval>

-

-                       
<wsrm:RetransmissionInterval>6000</wsrm:RetransmissionInterval>

-      

-      <!-- '-1' conveys that there is no limit to the max. number of 
retransmissions.-->

-                       
<wsrm:MaximumRetransmissionCount>10</wsrm:MaximumRetransmissionCount>

-

-                       <wsrm:ExponentialBackoff>false</wsrm:ExponentialBackoff>

-

-                       <wsrm:InactivityTimeout>60</wsrm:InactivityTimeout>

-

-                       
<wsrm:InactivityTimeoutMeasure>seconds</wsrm:InactivityTimeoutMeasure>

-

-                       <wsrm:InvokeInOrder>true</wsrm:InvokeInOrder>

-      

-      <!-- These will not be overriden by service level policies -->

-                       <wsrm:MessageTypesToDrop>none</wsrm:MessageTypesToDrop> 
 

-                              

-      <!-- This will not be overriden by service level policies -->

-                       <wsrm:StorageManagers>

-

-                               <wsrm:InMemoryStorageManager>

-              org.apache.sandesha2.storage.inmemory.InMemoryStorageManager

-          </wsrm:InMemoryStorageManager>

-

-                               <wsrm:PermanentStorageManager>

-              org.apache.sandesha2.storage.inmemory.InMemoryStorageManager

-          </wsrm:PermanentStorageManager>

-

-                       </wsrm:StorageManagers>

-      

-      <!-- This will not be overriden by service level policies -->

-                       
<wsrm:SecurityManager>org.apache.sandesha2.security.dummy.DummySecurityManager</wsrm:SecurityManager>

-               </wsp:Policy>

-       </wsrm:RMAssertion>

-</wsp:Policy>>

-

+       <wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";

+                       
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";

+                       xmlns:wsrm="http://ws.apache.org/sandesha2/policy"; 
wsu:Id="RMPolicy">

+               <wsrm:RMAssertion>

+                       <wsp:Policy>

+                               
<wsrm:AcknowledgementInterval>3000</wsrm:AcknowledgementInterval>

+       

+                               
<wsrm:RetransmissionInterval>6000</wsrm:RetransmissionInterval>

+             

+             <!-- '-1' conveys that there is no limit to the max. number of 
retransmissions.-->

+                               
<wsrm:MaximumRetransmissionCount>10</wsrm:MaximumRetransmissionCount>

+       

+                               
<wsrm:ExponentialBackoff>false</wsrm:ExponentialBackoff>

+       

+                               
<wsrm:InactivityTimeout>60</wsrm:InactivityTimeout>

+       

+                               
<wsrm:InactivityTimeoutMeasure>seconds</wsrm:InactivityTimeoutMeasure>

+       

+                               <wsrm:InvokeInOrder>true</wsrm:InvokeInOrder>

+             

+             <!-- These will not be overriden by service level policies -->

+                               
<wsrm:MessageTypesToDrop>none</wsrm:MessageTypesToDrop>  

+                                     

+             <!-- This will not be overriden by service level policies -->

+                               <wsrm:StorageManagers>

+       

+                                       <wsrm:InMemoryStorageManager>

+                                         
org.apache.sandesha2.storage.inmemory.InMemoryStorageManager

+                                       </wsrm:InMemoryStorageManager>

+       

+                                       <wsrm:PermanentStorageManager>

+                                         
org.apache.sandesha2.storage.inmemory.InMemoryStorageManager

+                                       </wsrm:PermanentStorageManager>

+       

+                               </wsrm:StorageManagers>

+             

+             <!-- This will not be overriden by service level policies -->

+                               
<wsrm:SecurityManager>org.apache.sandesha2.security.dummy.DummySecurityManager</wsrm:SecurityManager>

+                       </wsp:Policy>

+               </wsrm:RMAssertion>

+       </wsp:Policy>

 </module>


Added: 
webservices/sandesha/trunk/java/config/rmpolicy/META-INF/services/org.apache.neethi.builders.AssertionBuilder
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/config/rmpolicy/META-INF/services/org.apache.neethi.builders.AssertionBuilder?view=auto&rev=449258
==============================================================================
--- 
webservices/sandesha/trunk/java/config/rmpolicy/META-INF/services/org.apache.neethi.builders.AssertionBuilder
 (added)
+++ 
webservices/sandesha/trunk/java/config/rmpolicy/META-INF/services/org.apache.neethi.builders.AssertionBuilder
 Sat Sep 23 08:17:27 2006
@@ -0,0 +1 @@
+org.apache.sandesha2.policy.builders.RMAssertionBuilder
\ No newline at end of file

Modified: webservices/sandesha/trunk/java/config/server_axis2.xml
URL: 
http://svn.apache.org/viewvc/webservices/sandesha/trunk/java/config/server_axis2.xml?view=diff&rev=449258&r1=449257&r2=449258
==============================================================================
--- webservices/sandesha/trunk/java/config/server_axis2.xml (original)
+++ webservices/sandesha/trunk/java/config/server_axis2.xml Sat Sep 23 08:17:27 
2006
@@ -16,16 +16,30 @@
     <!--is set then, Axis2 tries to get the first exception and set its 
message as the faultreason/Reason.-->

     <parameter name="DrillDownToRootCauseForFaultReason" 
locked="false">false</parameter>

 

-    <!-- Uncomment this to enable REST support -->

-    <!--    <parameter name="enableREST" locked="false">true</parameter>-->

-

     <!--This is the user name and password of admin console-->

     <parameter name="userName" locked="false">admin</parameter>

     <parameter name="password" locked="false">axis2</parameter>

-    

-    

-    <parameter name="Sandesha2StorageManager" 
locked="false">inmemory</parameter>

-    

+

+    <!--<parameter name="contextRoot" locked="false">axis2</parameter>-->

+    <!--<parameter name="servicePath" locked="false">services</parameter>-->

+    <!--Set the flag to true if you want to enable transport level session 
mangment-->

+    <parameter name="manageTransportSession" locked="false">false</parameter>

+

+    <!--Following two parameters will be used to handle REST in Axis2. The 
default settings will make Axis2 to have two-->

+    <!--different endpoints, one for REST (AxisRESTServlet) one for SOAP 
message handling (AxisServlet). But following-->

+    <!--parameters help to tweak the message handling of two main servlets. -->

+

+    <!-- If the enableRESTInAxis2MainServlet is true, then Axis2MainServlet 
will handle both SOAP and REST messages -->

+    <parameter name="enableRESTInAxis2MainServlet" 
locked="true">true</parameter>

+

+    <!-- Following parameter will completely disable REST handling in both the 
servlets-->

+    <parameter name="disableREST" locked="true">false</parameter>

+

+    <!-- This will disable the separate servlet we have for REST handling. -->

+    <parameter name="disableSeparateEndpointForREST" 
locked="true">false</parameter>

+

+

+               

 

     <!-- ================================================= -->

     <!-- Message Receivers -->

@@ -40,6 +54,18 @@
         <messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-out";

                          
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>

     </messageReceivers>

+    

+    <!-- ================================================= -->

+    <!-- Target Resolvers -->

+    <!-- ================================================= -->

+    <!-- Uncomment the following and specify the class name for your 
TargetResolver to add -->

+    <!-- a TargetResolver. TargetResolvers are used to process the To EPR for 
example to -->

+    <!-- choose a server in a cluster -->

+    <!--<targetResolvers>-->

+    <!--<targetResolver class="" />-->

+    <!--</targetResolvers>-->

+    

+    

     <!-- ================================================= -->

     <!-- Transport Ins -->

     <!-- ================================================= -->

@@ -67,8 +93,6 @@
                      
class="org.apache.axis2.transport.tcp.TCPTransportSender"/>

     <transportSender name="local"

                      
class="org.apache.axis2.transport.local.LocalTransportSender"/>

-    <transportSender name="jms"

-                     class="org.apache.axis2.transport.jms.JMSSender"/>

     <transportSender name="http"

                      
class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">

         <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>

@@ -80,8 +104,8 @@
         <parameter name="Transfer-Encoding" locked="false">chunked</parameter>

     </transportSender>

 

-    <module ref="addressing" />

-

+       <module ref="addressing" />

+       

     <!-- ================================================= -->

     <!-- Phases  -->

     <!-- ================================================= -->

@@ -90,11 +114,11 @@
          <phase name="Transport">

             <handler name="RequestURIBasedDispatcher"

                      class="org.apache.axis2.engine.RequestURIBasedDispatcher">

-                <order phase="Dispatch"/>

+                <order phase="Transport"/>

             </handler>

             <handler name="SOAPActionBasedDispatcher"

                      class="org.apache.axis2.engine.SOAPActionBasedDispatcher">

-                <order phase="Dispatch"/>

+                <order phase="Transport"/>

             </handler>

         </phase>

         <phase name="Security"/>

@@ -111,18 +135,18 @@
             </handler>

             <handler name="InstanceDispatcher"

                      class="org.apache.axis2.engine.InstanceDispatcher">

-                <order phase="PostDispatch"/>

+                <order phase="Dispatch"/>

             </handler>

         </phase>

         <!--  System pre defined phases       -->

         <!--   After Postdispatch phase module author or or service author can 
add any phase he want      -->

-        <phase name="RMPhase"/>

         <phase name="OperationInPhase"/>

+               <phase name="RMPhase" />

     </phaseOrder>

     <phaseOrder type="outflow">

         <!--      user can add his own phases to this area  -->

-        <phase name="OperationOutPhase"/>

-        <phase name="RMPhase"/>

+               <phase name="RMPhase" />

+           <phase name="OperationOutPhase"/>

         <!--system predefined phase-->

         <!--these phase will run irrespective of the service-->

         <phase name="PolicyDetermination"/>

@@ -152,17 +176,17 @@
             </handler>

             <handler name="InstanceDispatcher"

                      class="org.apache.axis2.engine.InstanceDispatcher">

-                <order phase="PostDispatch"/>

+                <order phase="Dispatch"/>

             </handler>

         </phase>

         <!--      user can add his own phases to this area  -->

-        <phase name="RMPhase"/>

         <phase name="OperationInFaultPhase"/>

+               <phase name="RMPhase" />

     </phaseOrder>

     <phaseOrder type="Outfaultflow">

         <!--      user can add his own phases to this area  -->

-        <phase name="OperationOutFaultPhase"/>

-        <phase name="RMPhase"/>

+        <phase name="RMPhase" />

+               <phase name="OperationOutFaultPhase"/>

         <phase name="PolicyDetermination"/>

         <phase name="MessageOut"/>

     </phaseOrder>




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to