Author: asankha
Date: Mon Nov 13 04:53:25 2006
New Revision: 474291

URL: http://svn.apache.org/viewvc?view=rev&rev=474291
Log:
clean up svn - take 1

Added:
    
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/mediators/json/
      - copied from r474289, 
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/json/
    
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/mediators/spring/
      - copied from r474289, 
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/spring/
    incubator/synapse/trunk/java/repository/conf/sample/resources/
Removed:
    
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/json/
    
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/spring/
    incubator/synapse/trunk/java/modules/niohttp/
Modified:
    incubator/synapse/trunk/java/README.txt
    
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/mediators/json/JsonMediatorTest.java
    
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/mediators/spring/SpringMediatorTest.java
    
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/mediators/spring/SpringTestBean.java
    
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/mediators/spring/TestMediateHandlerImpl.java
    incubator/synapse/trunk/java/project.properties
    incubator/synapse/trunk/java/repository/conf/axis2.xml
    incubator/synapse/trunk/java/repository/conf/sample/springsample.xml
    incubator/synapse/trunk/java/repository/conf/sample/synapse_sample_0.xml
    incubator/synapse/trunk/java/repository/conf/synapse.xml

Modified: incubator/synapse/trunk/java/README.txt
URL: 
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/README.txt?view=diff&rev=474291&r1=474290&r2=474291
==============================================================================
--- incubator/synapse/trunk/java/README.txt (original)
+++ incubator/synapse/trunk/java/README.txt Mon Nov 13 04:53:25 2006
@@ -1,5 +1,5 @@
 ======================================================
-Apache Synapse M2 build  (May, 2006)
+Apache Synapse 0.90 build  (November, 2006)
 
 http://incubator.apache.org/synapse/
 ------------------------------------------------------

Modified: 
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/mediators/json/JsonMediatorTest.java
URL: 
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/mediators/json/JsonMediatorTest.java?view=diff&rev=474291&r1=474289&r2=474291
==============================================================================
--- 
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/mediators/json/JsonMediatorTest.java
 (original)
+++ 
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/mediators/json/JsonMediatorTest.java
 Mon Nov 13 04:53:25 2006
@@ -1,4 +1,4 @@
-package org.apache.synapse.json;
+package org.apache.synapse.mediators.json;
 
 import junit.framework.TestCase;
 import org.apache.synapse.MessageContext;

Modified: 
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/mediators/spring/SpringMediatorTest.java
URL: 
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/mediators/spring/SpringMediatorTest.java?view=diff&rev=474291&r1=474289&r2=474291
==============================================================================
--- 
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/mediators/spring/SpringMediatorTest.java
 (original)
+++ 
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/mediators/spring/SpringMediatorTest.java
 Mon Nov 13 04:53:25 2006
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.synapse.spring;
+package org.apache.synapse.mediators.spring;
 
 import junit.framework.TestCase;
 import org.apache.synapse.MessageContext;

Modified: 
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/mediators/spring/SpringTestBean.java
URL: 
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/mediators/spring/SpringTestBean.java?view=diff&rev=474291&r1=474289&r2=474291
==============================================================================
--- 
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/mediators/spring/SpringTestBean.java
 (original)
+++ 
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/mediators/spring/SpringTestBean.java
 Mon Nov 13 04:53:25 2006
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.synapse.spring;
+package org.apache.synapse.mediators.spring;
 
 import org.apache.synapse.MessageContext;
 import org.apache.synapse.TestMediateHandler;

Modified: 
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/mediators/spring/TestMediateHandlerImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/mediators/spring/TestMediateHandlerImpl.java?view=diff&rev=474291&r1=474289&r2=474291
==============================================================================
--- 
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/mediators/spring/TestMediateHandlerImpl.java
 (original)
+++ 
incubator/synapse/trunk/java/modules/extensions/test/org/apache/synapse/mediators/spring/TestMediateHandlerImpl.java
 Mon Nov 13 04:53:25 2006
@@ -13,7 +13,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.apache.synapse.spring;
+package org.apache.synapse.mediators.spring;
 
 import org.apache.synapse.MessageContext;
 import org.apache.synapse.TestMediateHandler;

Modified: incubator/synapse/trunk/java/project.properties
URL: 
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/project.properties?view=diff&rev=474291&r1=474290&r2=474291
==============================================================================
--- incubator/synapse/trunk/java/project.properties (original)
+++ incubator/synapse/trunk/java/project.properties Mon Nov 13 04:53:25 2006
@@ -144,4 +144,4 @@
 #                Synapse Version
 # -------------------------------------------------------------------
 
-synapse.version=SNAPSHOT
+synapse.version=0.90-RC1

Modified: incubator/synapse/trunk/java/repository/conf/axis2.xml
URL: 
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/repository/conf/axis2.xml?view=diff&rev=474291&r1=474290&r2=474291
==============================================================================
--- incubator/synapse/trunk/java/repository/conf/axis2.xml (original)
+++ incubator/synapse/trunk/java/repository/conf/axis2.xml Mon Nov 13 04:53:25 
2006
@@ -83,10 +83,10 @@
     <!-- ================================================= -->
     <!-- Transport Ins -->
     <!-- ================================================= -->
-    <transportReceiver name="http" 
class="org.apache.axis2.transport.nhttp.AsyncHTTPListener"/>
-    <!--<transportReceiver name="http"
+    <!--<transportReceiver name="http" 
class="org.apache.axis2.transport.nhttp.AsyncHTTPListener"/>-->
+    <transportReceiver name="http"
                        
class="org.apache.axis2.transport.http.SimpleHTTPServer">
-        <parameter name="port" locked="false">6060</parameter>-->
+        <parameter name="port" locked="false">8080</parameter>
     <!-- Here is the complete list of supported parameters (see example 
settings further below):
         port: the port to listen on (default 6060)
         hostname:  if non-null, url prefix used in reply-to endpoint 
references                                 (default null)
@@ -109,7 +109,7 @@
         <!-- <parameter name="RequestMaxThreadPoolSize"  
locked="false">100</parameter>                     -->
         <!-- <parameter name="threadKeepAliveTime"       
locked="false">240000</parameter>                  -->
         <!-- <parameter name="threadKeepAliveTimeUnit"   
locked="false">MILLISECONDS</parameter>            -->
-    <!--</transportReceiver>-->
+    </transportReceiver>
     
     <!--Uncomment this and configure as appropriate for JMS transport support, 
after setting up your JMS environment (e.g. ActiveMQ)
     <transportReceiver name="jms" 
class="org.apache.axis2.transport.jms.JMSListener">
@@ -141,34 +141,13 @@
     <!--<parameter name="transport.mail.replyToAddress" locked="false">[EMAIL 
PROTECTED]</parameter>-->
     <!--</transportReceiver>-->
 
-    <transportReceiver name="tcp"
-                       class="org.apache.axis2.transport.tcp.TCPServer">
-        <parameter name="port" locked="false">6060</parameter>
+    <!--<transportReceiver name="tcp"-->
+                       <!--class="org.apache.axis2.transport.tcp.TCPServer">-->
+        <!--<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">tcp://myApp.com/ws</parameter>-->
-    </transportReceiver>
-    
-    <!--Uncomment this for JMS after setting up your JMS environment (e.g. 
ActiveMQ)
-    <transportReceiver name="jms" 
class="org.apache.axis2.transport.jms.JMSListener">
-        <parameter name="myTopicConnectionFactory" locked="false">             
                
-               <parameter name="java.naming.factory.initial" 
locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
-               <parameter name="java.naming.provider.url" 
locked="false">tcp://localhost:61616</parameter>             
-               <parameter name="transport.jms.ConnectionFactoryJNDIName" 
locked="false">TopicConnectionFactory</parameter>
-        </parameter>
-
-        <parameter name="myQueueConnectionFactory" locked="false">             
                
-               <parameter name="java.naming.factory.initial" 
locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
-               <parameter name="java.naming.provider.url" 
locked="false">tcp://localhost:61616</parameter>             
-               <parameter name="transport.jms.ConnectionFactoryJNDIName" 
locked="false">QueueConnectionFactory</parameter>
-        </parameter>
-
-        <parameter name="default" locked="false">                              
-               <parameter name="java.naming.factory.initial" 
locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter>
-               <parameter name="java.naming.provider.url" 
locked="false">tcp://localhost:61616</parameter>             
-               <parameter name="transport.jms.ConnectionFactoryJNDIName" 
locked="false">QueueConnectionFactory</parameter>
-        </parameter>
-    </transportReceiver>-->
+    <!--</transportReceiver>-->
 
     <!-- ================================================= -->
     <!-- Transport Outs -->
@@ -178,13 +157,13 @@
                      
class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
     <transportSender name="local"
                      
class="org.apache.axis2.transport.local.LocalTransportSender"/>
-    <!--<transportSender name="http"
-                     
class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">-->
     <transportSender name="http"
+                     
class="org.apache.axis2.transport.http.CommonsHTTPTransportSender"/>
+    <!--<transportSender name="http"
                      class="org.apache.axis2.transport.nhttp.AsyncHTTPSender">
         <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
-        <!--<parameter name="Transfer-Encoding" 
locked="false">chunked</parameter>-->
-    </transportSender>
+        <parameter name="Transfer-Encoding" locked="false">chunked</parameter>
+    </transportSender>-->
     <transportSender name="https"
                      
class="org.apache.axis2.transport.http.CommonsHTTPTransportSender">
         <parameter name="PROTOCOL" locked="false">HTTP/1.1</parameter>
@@ -207,7 +186,7 @@
     <!-- ================================================= -->
     <!-- Comment this to disable Addressing -->
     <module ref="addressing"/>
-    <module ref="synapse"/>
+    <module ref="synapse-0.90-RC1"/>
 
     <!--Configuring module , providing parameters for modules whether they 
refer or not-->
     <!--<moduleConfig name="addressing">-->

Modified: incubator/synapse/trunk/java/repository/conf/sample/springsample.xml
URL: 
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/repository/conf/sample/springsample.xml?view=diff&rev=474291&r1=474290&r2=474291
==============================================================================
--- incubator/synapse/trunk/java/repository/conf/sample/springsample.xml 
(original)
+++ incubator/synapse/trunk/java/repository/conf/sample/springsample.xml Mon 
Nov 13 04:53:25 2006
@@ -4,11 +4,11 @@
 
 <beans>
 
-   <bean id="springtest" class="org.apache.synapse.spring.SpringTestBean" 
singleton="false">
+   <bean id="springtest" 
class="org.apache.synapse.mediators.spring.SpringTestBean" singleton="false">
           <property name="testProperty"><value>100</value></property>
           <property name="handler"><ref bean="handler"/></property>
    </bean>
    
-   <bean id="handler" class="org.apache.synapse.spring.TestMediateHandlerImpl" 
singleton="true"/>
+   <bean id="handler" 
class="org.apache.synapse.mediators.spring.TestMediateHandlerImpl" 
singleton="true"/>
 
 </beans>

Modified: 
incubator/synapse/trunk/java/repository/conf/sample/synapse_sample_0.xml
URL: 
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/repository/conf/sample/synapse_sample_0.xml?view=diff&rev=474291&r1=474290&r2=474291
==============================================================================
--- incubator/synapse/trunk/java/repository/conf/sample/synapse_sample_0.xml 
(original)
+++ incubator/synapse/trunk/java/repository/conf/sample/synapse_sample_0.xml 
Mon Nov 13 04:53:25 2006
@@ -1,38 +1,11 @@
 <synapse xmlns="http://ws.apache.org/ns/synapse";>
   
-  <definitions>
-    
-    <sequence name="stockquote">
-       <!-- set the To address to the real endpoint -->
-       <header name="To" 
value="http://localhost:9000/axis2/services/SimpleStockQuoteService"/>
-    
-       <!-- check if the symbol is MSFT -->
-      <filter xpath="//*[wsx:symbol='MSFT']" 
xmlns:wsx="http://services.samples/xsd";>
-       <!-- if it is throw a fault -->
-       <makefault>
-               <code value="tns:Receiver" 
xmlns:tns="http://www.w3.org/2003/05/soap-envelope"/>
-               <reason value="Isn't there a Windows API for that?"/>
-       </makefault>
-      </filter>
-    </sequence>
-
-  </definitions>
-
+  <!-- The most simple Synapse configuration -->
   <rules>
-       <!-- now log the message using log4j -->
+       <!-- Log all messages passing through -->
        <log level="full"/>
        
-       <!-- Check if the URL matches the stockquote gateway/dumb case -->
-       <filter source="get-property('To')" regex=".*/StockQuote.*">
-               <sequence ref="stockquote"/>
-       </filter>
-       
-       <!-- check if the URL matches the virtual url - either the proxy or 
ws-add case -->
-               <filter source="get-property('To')" 
regex="http://.*stockquotes.*";>
-               <sequence ref="stockquote"/>
-       </filter>
-       
-       <!-- send the message on -->
+       <!-- Send the messages where they have been sent (i.e. implicit To EPR) 
-->
        <send/>
   </rules>
 

Modified: incubator/synapse/trunk/java/repository/conf/synapse.xml
URL: 
http://svn.apache.org/viewvc/incubator/synapse/trunk/java/repository/conf/synapse.xml?view=diff&rev=474291&r1=474290&r2=474291
==============================================================================
--- incubator/synapse/trunk/java/repository/conf/synapse.xml (original)
+++ incubator/synapse/trunk/java/repository/conf/synapse.xml Mon Nov 13 
04:53:25 2006
@@ -1,38 +1,11 @@
 <synapse xmlns="http://ws.apache.org/ns/synapse";>
   
-  <definitions>
-    
-    <sequence name="stockquote">
-       <!-- set the To address to the real endpoint -->
-       <header name="To" 
value="http://localhost:9000/axis2/services/SimpleStockQuoteService"/>
-    
-       <!-- check if the symbol is MSFT -->
-      <filter xpath="//*[wsx:symbol='MSFT']" 
xmlns:wsx="http://services.samples/xsd";>
-       <!-- if it is throw a fault -->
-       <makefault>
-               <code value="tns:Receiver" 
xmlns:tns="http://www.w3.org/2003/05/soap-envelope"/>
-               <reason value="Isn't there a Windows API for that?"/>
-       </makefault>
-      </filter>
-    </sequence>
-
-  </definitions>
-
+  <!-- The most simple Synapse configuration -->
   <rules>
-       <!-- now log the message using log4j -->
+       <!-- Log all messages passing through -->
        <log level="full"/>
        
-       <!-- Check if the URL matches the stockquote gateway/dumb case -->
-       <filter source="get-property('To')" regex=".*/StockQuote.*">
-               <sequence ref="stockquote"/>
-       </filter>
-       
-       <!-- check if the URL matches the virtual url - either the proxy or 
ws-add case -->
-               <filter source="get-property('To')" 
regex="http://.*stockquotes.*";>
-               <sequence ref="stockquote"/>
-       </filter>
-       
-       <!-- send the message on -->
+       <!-- Send the messages where they have been sent (i.e. implicit To EPR) 
-->
        <send/>
   </rules>
 



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

Reply via email to