You are viewing a plain text version of this content. The canonical link for it is here.
Posted to sandesha-dev@ws.apache.org by ch...@apache.org on 2006/04/04 10:59:14 UTC

svn commit: r391253 - in /webservices/sandesha/trunk: config/axis2.xml config/module.xml maven.xml project.properties project.xml

Author: chamikara
Date: Tue Apr  4 01:59:12 2006
New Revision: 391253

URL: http://svn.apache.org/viewcvs?rev=391253&view=rev
Log:
Updated config and maven files

Modified:
    webservices/sandesha/trunk/config/axis2.xml
    webservices/sandesha/trunk/config/module.xml
    webservices/sandesha/trunk/maven.xml
    webservices/sandesha/trunk/project.properties
    webservices/sandesha/trunk/project.xml

Modified: webservices/sandesha/trunk/config/axis2.xml
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/config/axis2.xml?rev=391253&r1=391252&r2=391253&view=diff
==============================================================================
--- webservices/sandesha/trunk/config/axis2.xml (original)
+++ webservices/sandesha/trunk/config/axis2.xml Tue Apr  4 01:59:12 2006
@@ -12,24 +12,6 @@
     <parameter name="userName" locked="false">admin</parameter>
     <parameter name="password" locked="false">axis2</parameter>
 
-    <parameter name="seralizeLocation" locked="false">.</parameter>
-    <hostConfiguration>
-        <ip>127.0.0.1</ip>
-        <port>5555</port>
-    </hostConfiguration>
-
-
-    <!--if you want to extract the service archive file and work with that please uncomment this-->
-    <!--else , it wont extract archive file or does not take into consideration if someone drop-->
-    <!--exploded directory into /service directory-->
-    <!--<parameter name="extractServiceArchive" locked="false">true</parameter>-->
-
-
-    <!--    The way of adding listener to the system-->
-    <!--    <listener class="org.apache.axis2.ObserverIMPL">-->
-    <!--        <parameter name="RSS_URL" locked="false">http://127.0.0.1/rss</parameter>-->
-    <!--    </listener>-->
-
     <!-- ================================================= -->
     <!-- Message Receivers -->
     <!-- ================================================= -->
@@ -46,42 +28,36 @@
     <!-- ================================================= -->
     <!-- Transport Ins -->
     <!-- ================================================= -->
-    <transportReceiver name="http" class="org.apache.axis2.transport.http.SimpleHTTPServer">
+    <transportReceiver name="http"
+                       class="org.apache.axis2.transport.http.SimpleHTTPServer">
         <parameter name="port" locked="false">6060</parameter>
+        <!--If you want to give your own host address for EPR generation-->
+        <!--uncommet following paramter , and set as you required.-->
+        <!--<parameter name="hostname" locked="false">http://myApp.com/ws</parameter>-->
     </transportReceiver>
 
-    <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
-    <transportReceiver name="mail" class="org.apache.axis2.transport.mail.SimpleMailListener">
-          <parameter name="transport.mail.pop3.host" locked="false">127.0.0.1</parameter>
-          <parameter name="transport.mail.pop3.user" locked="false">axis2</parameter>
-          <parameter name="transport.mail.pop3.password" locked="false">axis2</parameter>
-          <parameter name="transport.mail.pop3.port" locked="false">110</parameter>
-          <parameter name="transport.mail.replyToAddress" locked="false">axis2@127.0.0.1</parameter>
-      </transportReceiver> -->
-
-<!--
-    <transportReceiver name="tcp" class="org.apache.axis2.transport.tcp.TCPServer">
+    <transportReceiver name="tcp"
+                       class="org.apache.axis2.transport.tcp.TCPServer">
         <parameter name="port" locked="false">6061</parameter>
+        <!--If you want to give your own host address for EPR generation-->
+        <!--uncommet following paramter , and set as you required.-->
+        <!--<parameter name="hostname" locked="false">tcp://myApp.com/ws</parameter>-->
     </transportReceiver>
--->
 
-<!--
-    <transportReceiver name="jms" class="org.apache.axis2.transport.jms.SimpleJMSListener">
-        <parameter name="transport.jms.Destination" locked="false">dynamicQueues/FOO</parameter>
-        <parameter name="java.naming.factory.initial" locked="false">
-            org.activemq.jndi.ActiveMQInitialContextFactory</parameter>
-        <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter>
-    </transportReceiver>
--->
+    <module ref="addressing" />
 
     <!-- ================================================= -->
     <!-- Transport Outs -->
     <!-- ================================================= -->
 
-    <transportSender name="tcp" 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">
+    <transportSender name="tcp"
+                     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>
         <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
     </transportSender>
@@ -91,27 +67,6 @@
         <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
     </transportSender>
 
-    <!-- Uncomment this one with the appropriate papameters to enable the SMTP transport Receiver
-   <transportSender name="mailto" class="org.apache.axis2.transport.mail.MailTransportSender">
-       <parameter name="transport.mail.smtp.host" locked="false">127.0.0.1</parameter>
-       <parameter name="transport.mail.smtp.user" locked="false">axis2</parameter>
-       <parameter name="transport.mail.smtp.password" locked="false">axis2</parameter>
-       <parameter name="transport.mail.smtp.port" locked="false">25</parameter>
-   </transportSender>
-   -->
-
-    <!-- ================================================= -->
-    <!-- Global Modules  -->
-    <!-- ================================================= -->
-    <!-- Comment this to disable Addressing -->
-    <module ref="addressing" />
-
-
-    <!--Configuring module , providing parameters for modules whether they refer or not-->
-    <!--<moduleConfig name="addressing">-->
-    <!--<parameter name="addressingPara" locked="false">N/A</parameter>-->
-    <!--</moduleConfig>-->
-
     <!-- ================================================= -->
     <!-- Phases  -->
     <!-- ================================================= -->
@@ -124,22 +79,21 @@
                      class="org.apache.axis2.engine.RequestURIBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
-            
+
             <handler name="SOAPActionBasedDispatcher"
                      class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
-            
+
             <handler name="AddressingBasedDispatcher"
                      class="org.apache.axis2.engine.AddressingBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
-            
+
             <handler name="SOAPMessageBodyBasedDispatcher"
                      class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
                 <order phase="Dispatch"/>
             </handler>
-            
             <handler name="InstanceDispatcher"
                      class="org.apache.axis2.engine.InstanceDispatcher">
                 <order phase="PostDispatch"/>
@@ -147,27 +101,53 @@
         </phase>
         <!--  System pre defined phases       -->
         <!--   After Postdispatch phase module author or or service author can add any phase he want      -->
-        <phase name="userphase1"/>
+        <phase name="OperationInPhase"/>
 	  <phase name="RMPhase" />
     </phaseOrder>
     <phaseOrder type="outflow">
         <!--      user can add his own phases to this area  -->
-        <phase name="RMPhase" />
-        <phase name="userphase1"/>
+	  <phase name="RMPhase" />
+        <phase name="OperationOutPhase"/>
         <!--system predefined phase-->
         <!--these phase will run irrespective of the service-->
         <phase name="PolicyDetermination"/>
         <phase name="MessageOut"/>
     </phaseOrder>
     <phaseOrder type="INfaultflow">
+        <phase name="PreDispatch"/>
+        <phase name="Dispatch" class="org.apache.axis2.engine.DispatchPhase">
+            <handler name="RequestURIBasedDispatcher"
+                     class="org.apache.axis2.engine.RequestURIBasedDispatcher">
+                <order phase="Dispatch"/>
+            </handler>
+
+            <handler name="SOAPActionBasedDispatcher"
+                     class="org.apache.axis2.engine.SOAPActionBasedDispatcher">
+                <order phase="Dispatch"/>
+            </handler>
+
+            <handler name="AddressingBasedDispatcher"
+                     class="org.apache.axis2.engine.AddressingBasedDispatcher">
+                <order phase="Dispatch"/>
+            </handler>
+
+            <handler name="SOAPMessageBodyBasedDispatcher"
+                     class="org.apache.axis2.engine.SOAPMessageBodyBasedDispatcher">
+                <order phase="Dispatch"/>
+            </handler>
+            <handler name="InstanceDispatcher"
+                     class="org.apache.axis2.engine.InstanceDispatcher">
+                <order phase="PostDispatch"/>
+            </handler>
+        </phase>
         <!--      user can add his own phases to this area  -->
-        <phase name="userphase1"/>
-        <phase name="RMPhase" />
+        <phase name="OperationInFaultPhase"/>
+	  <phase name="RMPhase" />
     </phaseOrder>
     <phaseOrder type="Outfaultflow">
         <!--      user can add his own phases to this area  -->
-        <phase name="RMPhase" />
-        <phase name="userphase1"/>
+	  <phase name="RMPhase" />
+        <phase name="OperationOutFaultPhase"/>
         <phase name="PolicyDetermination"/>
         <phase name="MessageOut"/>
     </phaseOrder>

Modified: webservices/sandesha/trunk/config/module.xml
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/config/module.xml?rev=391253&r1=391252&r2=391253&view=diff
==============================================================================
--- webservices/sandesha/trunk/config/module.xml (original)
+++ webservices/sandesha/trunk/config/module.xml Tue Apr  4 01:59:12 2006
@@ -19,6 +19,22 @@
             <order phase="RMPhase"/>
         </handler>   
     </outflow>
+    
+    <INfaultflow>        
+        <handler name="SandeshaGlobalInHandler" class="org.apache.sandesha2.handlers.SandeshaGlobalInHandler">
+            <order phase="PreDispatch" after="AddressingFinalInHandler" />
+            <!-- <order after="addressingSubmissionInHandler" phase="PreDispatch"/>  cant do this-->
+        </handler> 
+        <handler name="SandeshaInHandler" class="org.apache.sandesha2.handlers.SandeshaInHandler">
+            <order phase="RMPhase"/>
+        </handler>
+    </INfaultflow>
+    
+    <OUTfaultflow>        
+        <handler name="SandeshaOutHandler" class="org.apache.sandesha2.handlers.SandeshaOutHandler">
+            <order phase="RMPhase"/>
+        </handler>   
+    </OUTfaultflow>
 
     <operation name="RMInOnlyOperation" mep="http://www.w3.org/2004/08/wsdl/in-only">
         <messageReceiver class="org.apache.sandesha2.msgreceivers.RMMessageReceiver"/>

Modified: webservices/sandesha/trunk/maven.xml
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/maven.xml?rev=391253&r1=391252&r2=391253&view=diff
==============================================================================
--- webservices/sandesha/trunk/maven.xml (original)
+++ webservices/sandesha/trunk/maven.xml Tue Apr  4 01:59:12 2006
@@ -19,8 +19,8 @@
 	<ant:property name="apache.license.file" value="LICENSE.txt" />
 	<ant:property name="readme.file" value="README.txt" />
 	<ant:property name="release.notes.file" value="release-notes.html" />
-	<ant:property name="repo.addressing.mar.full.name" value="${repo.addressing.mar.name}-${addressing.version}.jar" />
-	<ant:property name="repo.addressing.mar.path" value="${maven.repo.local}/axis2/jars" />
+	<ant:property name="repo.addressing.mar.full.name" value="${repo.addressing.mar.name}-${addressing.version}.mar" />
+	<ant:property name="repo.addressing.mar.path" value="${maven.repo.local}/axis2/mars" />
 	<ant:property name="repo.addressing.mar" value="${repo.addressing.mar.path}/${repo.addressing.mar.full.name}" />
     <goal name="all" prereqs="jar,mar:create,samples:create,javadoc" />
     
@@ -52,7 +52,7 @@
 		<ant:copy file="${maven.build.dir}/${mar.name}" todir="${client.dist.path}/modules" />
 		
 		<!-- Copying addressing mar file--> 
-		<ant:copy file="${repo.addressing.mar}" toFile="${client.dist.path}/modules/${build.addressing.mar}" />    
+		<ant:copy file="${repo.addressing.mar}" toDir="${client.dist.path}/modules/" />    
 	</goal>
 
     <goal name="repo:create">
@@ -74,7 +74,7 @@
         </ant:copy>
         
         <!-- Copying addressing mar file-->
-        <ant:copy file="${repo.addressing.mar}" toFile="${server.dist.path}/modules/${build.addressing.mar}" /> 
+        <ant:copy file="${repo.addressing.mar}" toDir="${server.dist.path}/modules/" /> 
 	</goal>
 	
     <goal name="sample:compile">

Modified: webservices/sandesha/trunk/project.properties
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/project.properties?rev=391253&r1=391252&r2=391253&view=diff
==============================================================================
--- webservices/sandesha/trunk/project.properties (original)
+++ webservices/sandesha/trunk/project.properties Tue Apr  4 01:59:12 2006
@@ -21,8 +21,8 @@
 maven.html2xdoc.enabled=false
 maven.html2xdoc.dir=./xdocs
 axis2.version=SNAPSHOT
-addressing.version=0.95-SNAPSHOT
-repo.addressing.mar.name=axis2-addressing
+addressing.version=SNAPSHOT
+repo.addressing.mar.name=addressing
 axiom.version=SNAPSHOT
 XmlSchema.version=SNAPSHOT
 policy.version=SNAPSHOT

Modified: webservices/sandesha/trunk/project.xml
URL: http://svn.apache.org/viewcvs/webservices/sandesha/trunk/project.xml?rev=391253&r1=391252&r2=391253&view=diff
==============================================================================
--- webservices/sandesha/trunk/project.xml (original)
+++ webservices/sandesha/trunk/project.xml Tue Apr  4 01:59:12 2006
@@ -107,8 +107,9 @@
         </dependency>
         <dependency>
             <groupId>axis2</groupId>
-            <artifactId>axis2-addressing</artifactId>
+            <artifactId>addressing</artifactId>
             <version>${addressing.version}</version>
+            <type>mar</type>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>



---------------------------------------------------------------------
To unsubscribe, e-mail: sandesha-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: sandesha-dev-help@ws.apache.org