Author: asankha
Date: Tue Jul  3 04:47:34 2007
New Revision: 552792

URL: http://svn.apache.org/viewvc?view=rev&rev=552792
Log:
merge from 1.0 release branch to trunk and commit final updates to the web site

Added:
    webservices/synapse/trunk/java/src/site/resources/download/1.0/
      - copied from r546768, 
webservices/synapse/branches/1.0/src/site/resources/download/1.0/
    webservices/synapse/trunk/java/src/site/resources/download/1.0/download.cgi
      - copied unchanged from r546768, 
webservices/synapse/branches/1.0/src/site/resources/download/1.0/download.cgi
    webservices/synapse/trunk/java/src/site/resources/download/1.0/download.html
      - copied unchanged from r546768, 
webservices/synapse/branches/1.0/src/site/resources/download/1.0/download.html
Modified:
    webservices/synapse/trunk/java/modules/core/pom.xml
    
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java
    
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RMSequenceMediator.java
    
webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/Axis2HttpRequest.java
    
webservices/synapse/trunk/java/modules/samples/src/main/java/samples/userguide/StockQuoteClient.java
    
webservices/synapse/trunk/java/src/site/resources/Synapse_Configuration_Language.html
    webservices/synapse/trunk/java/src/site/resources/Synapse_Samples.html
    webservices/synapse/trunk/java/src/site/resources/download.html
    
webservices/synapse/trunk/java/src/site/resources/download/0.90/download.html
    
webservices/synapse/trunk/java/src/site/resources/download/0.91/download.html
    webservices/synapse/trunk/java/src/site/site.xml
    webservices/synapse/trunk/java/src/site/xdoc/index.xml

Modified: webservices/synapse/trunk/java/modules/core/pom.xml
URL: 
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/pom.xml?view=diff&rev=552792&r1=552791&r2=552792
==============================================================================
--- webservices/synapse/trunk/java/modules/core/pom.xml (original)
+++ webservices/synapse/trunk/java/modules/core/pom.xml Tue Jul  3 04:47:34 2007
@@ -42,7 +42,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.0-alpha-1-SNAPSHOT</version>
+                <version>2.0-alpha-1</version>
                 <executions>
                     <execution>
                         <id>copy</id>

Modified: 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java
URL: 
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java?view=diff&rev=552792&r1=552791&r2=552792
==============================================================================
--- 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java
 (original)
+++ 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/Axis2FlexibleMEPClient.java
 Tue Jul  3 04:47:34 2007
@@ -56,6 +56,7 @@
 import org.apache.synapse.statistics.impl.EndPointStatisticsStack;
 import org.apache.synapse.endpoints.utils.EndpointDefinition;
 import org.apache.rampart.handler.WSSHandlerConstants;
+import org.apache.sandesha2.client.SandeshaClientConstants;
 
 /**
  * This is a simple client that handles both in only and in out
@@ -297,6 +298,10 @@
         if(oriOptions.getProperty(Constants.SANDESHA_SEQUENCE_KEY) != null) {
             targetOptions.setProperty(Constants.SANDESHA_SEQUENCE_KEY, 
                     oriOptions.getProperty(Constants.SANDESHA_SEQUENCE_KEY));
+        }
+        if(oriOptions.getProperty(SandeshaClientConstants.OFFERED_SEQUENCE_ID) 
!= null) {
+            
targetOptions.setProperty(SandeshaClientConstants.OFFERED_SEQUENCE_ID,
+                    
oriOptions.getProperty(SandeshaClientConstants.OFFERED_SEQUENCE_ID));
         }
     }
     

Modified: 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RMSequenceMediator.java
URL: 
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RMSequenceMediator.java?view=diff&rev=552792&r1=552791&r2=552792
==============================================================================
--- 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RMSequenceMediator.java
 (original)
+++ 
webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/builtin/RMSequenceMediator.java
 Tue Jul  3 04:47:34 2007
@@ -35,6 +35,7 @@
 import org.apache.synapse.config.Entry;
 import org.apache.synapse.core.axis2.Axis2MessageContext;
 import org.apache.synapse.mediators.AbstractMediator;
+import org.apache.sandesha2.client.SandeshaClientConstants;
 import org.jaxen.JaxenException;
 
 public class RMSequenceMediator extends AbstractMediator {
@@ -85,6 +86,8 @@
             orgMessageCtx.getOptions().setProperty(
                 Constants.SANDESHA_SEQUENCE_KEY, sequenceID);
             orgMessageCtx.getOptions().setProperty(
+                SandeshaClientConstants.OFFERED_SEQUENCE_ID, 
UUIDGenerator.getUUID());
+            orgMessageCtx.getOptions().setProperty(
                 Constants.SANDESHA_LAST_MESSAGE, "true");
             return true;
         }
@@ -97,6 +100,11 @@
         boolean lastMessage = isLastMessage(smc);
         if (log.isDebugEnabled()) {
             log.debug("Is this message the last message in sequence: " + 
lastMessage);
+        }
+
+        if (!sequenceMap.containsKey(correlationValue)) {
+            orgMessageCtx.getOptions().setProperty(
+                SandeshaClientConstants.OFFERED_SEQUENCE_ID, 
UUIDGenerator.getUUID());       
         }
 
         String sequenceID = retrieveSequenceID(correlationValue);

Modified: 
webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/Axis2HttpRequest.java
URL: 
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/Axis2HttpRequest.java?view=diff&rev=552792&r1=552791&r2=552792
==============================================================================
--- 
webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/Axis2HttpRequest.java
 (original)
+++ 
webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/Axis2HttpRequest.java
 Tue Jul  3 04:47:34 2007
@@ -164,7 +164,7 @@
         log.debug("start streaming outgoing http request");
         OutputStream out = Channels.newOutputStream(pipe.sink());
 
-        messageFormatter.writeTo(msgContext, format, out, false);
+        messageFormatter.writeTo(msgContext, format, out, true);
             try {
             out.flush();
             out.close();

Modified: 
webservices/synapse/trunk/java/modules/samples/src/main/java/samples/userguide/StockQuoteClient.java
URL: 
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/samples/src/main/java/samples/userguide/StockQuoteClient.java?view=diff&rev=552792&r1=552791&r2=552792
==============================================================================
--- 
webservices/synapse/trunk/java/modules/samples/src/main/java/samples/userguide/StockQuoteClient.java
 (original)
+++ 
webservices/synapse/trunk/java/modules/samples/src/main/java/samples/userguide/StockQuoteClient.java
 Tue Jul  3 04:47:34 2007
@@ -178,6 +178,10 @@
                 }
             }
 
+            try {
+                configContext.terminate();
+            } catch (Exception ignore) {}
+
         } catch (Exception e) {
             e.printStackTrace();
         }

Modified: 
webservices/synapse/trunk/java/src/site/resources/Synapse_Configuration_Language.html
URL: 
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/src/site/resources/Synapse_Configuration_Language.html?view=diff&rev=552792&r1=552791&r2=552792
==============================================================================
--- 
webservices/synapse/trunk/java/src/site/resources/Synapse_Configuration_Language.html
 (original)
+++ 
webservices/synapse/trunk/java/src/site/resources/Synapse_Configuration_Language.html
 Tue Jul  3 04:47:34 2007
@@ -691,8 +691,7 @@
 be:</p>
 <pre> &lt;script language="js"&gt;mc.getPayloadXML()..symbol != 
"IBM";&lt;script/&gt;</pre>
 
-<p>Synapse uses the Apache </p>
-<a href="http://jakarta.apache.org/bsf/";>Bean Scripting Framework</a> for the
+<p>Synapse uses the Apache <a href="http://jakarta.apache.org/bsf/";>Bean 
Scripting Framework</a> for the
 scripting language support, any script language supported by BSF may be used
 to implement a Synapse Mediator. 
 

Modified: webservices/synapse/trunk/java/src/site/resources/Synapse_Samples.html
URL: 
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/src/site/resources/Synapse_Samples.html?view=diff&rev=552792&r1=552791&r2=552792
==============================================================================
--- webservices/synapse/trunk/java/src/site/resources/Synapse_Samples.html 
(original)
+++ webservices/synapse/trunk/java/src/site/resources/Synapse_Samples.html Tue 
Jul  3 04:47:34 2007
@@ -2032,7 +2032,7 @@
 <p></p>
 
 <p>Accessing this over https (ant stockquote
--Dtrpurl=https://localhost:9002/soap/StockQuoteProxy) causes the proxy
+-Dtrpurl=https://localhost:8443/soap/StockQuoteProxy) causes the proxy
 service to access the SimpleStockQuoteService on the sample Axis2 server
 using REST/POX. This could be seen if the message exchange was captured using
 TCPMon as follows. The REST/POX response is now transformed back into a SOAP

Modified: webservices/synapse/trunk/java/src/site/resources/download.html
URL: 
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/src/site/resources/download.html?view=diff&rev=552792&r1=552791&r2=552792
==============================================================================
--- webservices/synapse/trunk/java/src/site/resources/download.html (original)
+++ webservices/synapse/trunk/java/src/site/resources/download.html Tue Jul  3 
04:47:34 2007
@@ -25,7 +25,7 @@
 <div id="breadcrumbs">
 
 <div class="xleft">
-Last Published: 07 Dec 2006</div>
+Last Published: 08 Jun 2007</div>
 
 <div class="xright">
 <a href="http://www.apache.org/";>Apache</a> | <a
@@ -53,7 +53,7 @@
       <li class="none"><a
         href="Synapse_Configuration_Language.html">Configuration
       Language</a></li>
-      <li class="none"><a href="Synapse_Userguide.html">User guide</a></li>
+      <li class="none"><a href="Synapse_QuickStart.html">Quick Start 
Guide</a></li>
       <li class="none"><a href="Synapse_Samples.html">Samples</a></li>
       <li class="none"><a href="Synapse_Extending.html">Extending
       Synapse</a></li>
@@ -85,9 +85,8 @@
 <div class="section">
 <h2>Releases</h2>
 
-<p>Synapse is still under active development as the team prepares for its 1.0
-release soon. The 0.91 release of Synapse is the first release after
-graduation from the Apache Incubator on the 2nd of January 2007.</p>
+<p>The Apache Synapse team is proud to announce the aviailability of the 1.0 
release on the 8th of
+June 2007. Apache Synapse graduated out of the Apache Incubator on the 2nd of 
January 2007.</p>
 
 <table class="bodyTable">
   <tbody>
@@ -98,9 +97,15 @@
     </tr>
     <tr class="b">
       <td><a
+        
href="http://ws.apache.org/synapse/download/0.1/download.cgi";>0.91</a></td>
+      <td>08-Jun-2007</td>
+      <td>1.0 Release (Mirrored)</td>
+    </tr>
+    <tr class="b">
+      <td><a
         
href="http://ws.apache.org/synapse/download/0.91/download.cgi";>0.91</a></td>
       <td>08-Jan-2007</td>
-      <td>0.91 Release (Mirrored)</td>
+      <td>0.91 Release (Archived)</td>
     </tr>
     <tr class="b">
       <td><a
@@ -135,7 +140,7 @@
 <div id="footer">
 
 <div class="xright">
-© 2005-2006 Apache Software Foundation</div>
+&copy; 2005-2006 Apache Software Foundation</div>
 
 <div class="clear">
 <hr>

Modified: 
webservices/synapse/trunk/java/src/site/resources/download/0.90/download.html
URL: 
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/src/site/resources/download/0.90/download.html?view=diff&rev=552792&r1=552791&r2=552792
==============================================================================
--- 
webservices/synapse/trunk/java/src/site/resources/download/0.90/download.html 
(original)
+++ 
webservices/synapse/trunk/java/src/site/resources/download/0.90/download.html 
Tue Jul  3 04:47:34 2007
@@ -55,8 +55,7 @@
       <li class="none"><a
         href="./../../Synapse_Configuration_Language.html">Configuration
       Language</a></li>
-      <li class="none"><a href="./../../Synapse_Userguide.html">User
-      guide</a></li>
+      <li class="none"><a href="./../../Synapse_QuickStart.html">Quick Start 
Guide</a></li>
       <li class="none"><a href="./../../Synapse_Samples.html">Samples</a></li>
       <li class="none"><a href="./../../Synapse_Extending.html">Extending
         Synapse</a></li>
@@ -203,7 +202,7 @@
 <div id="footer">
 
 <div class="xright">
-© 2005-2006 Apache Software Foundation</div>
+� 2005-2006 Apache Software Foundation</div>
 
 <div class="clear">
 <hr>

Modified: 
webservices/synapse/trunk/java/src/site/resources/download/0.91/download.html
URL: 
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/src/site/resources/download/0.91/download.html?view=diff&rev=552792&r1=552791&r2=552792
==============================================================================
--- 
webservices/synapse/trunk/java/src/site/resources/download/0.91/download.html 
(original)
+++ 
webservices/synapse/trunk/java/src/site/resources/download/0.91/download.html 
Tue Jul  3 04:47:34 2007
@@ -55,8 +55,7 @@
       <li class="none"><a
         href="./../../Synapse_Configuration_Language.html">Configuration
       Language</a></li>
-      <li class="none"><a href="./../../Synapse_Userguide.html">User
-      guide</a></li>
+      <li class="none"><a href="./../../Synapse_QuickStart.html">Quick Start 
Guide</a></li>
       <li class="none"><a href="./../../Synapse_Samples.html">Samples</a></li>
       <li class="none"><a href="./../../Synapse_Extending.html">Extending
         Synapse</a></li>
@@ -203,7 +202,7 @@
 <div id="footer">
 
 <div class="xright">
-© 2005-2006 Apache Software Foundation</div>
+� 2005-2006 Apache Software Foundation</div>
 
 <div class="clear">
 <hr>

Modified: webservices/synapse/trunk/java/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/src/site/site.xml?view=diff&rev=552792&r1=552791&r2=552792
==============================================================================
--- webservices/synapse/trunk/java/src/site/site.xml (original)
+++ webservices/synapse/trunk/java/src/site/site.xml Tue Jul  3 04:47:34 2007
@@ -47,7 +47,7 @@
             </item>
             <item name="Documentation">
                 <item name="Configuration Language" 
href="Synapse_Configuration_Language.html"/>
-                <item name="User guide" href="Synapse_Userguide.html"/>
+                <item name="Quick Start Guide" href="Synapse_QuickStart.html"/>
                 <item name="Samples" href="Synapse_Samples.html"/>
                 <item name="Extending Synapse" href="Synapse_Extending.html"/>
                 <item name="Javadocs" href="apidocs/index.html"/>

Modified: webservices/synapse/trunk/java/src/site/xdoc/index.xml
URL: 
http://svn.apache.org/viewvc/webservices/synapse/trunk/java/src/site/xdoc/index.xml?view=diff&rev=552792&r1=552791&r2=552792
==============================================================================
--- webservices/synapse/trunk/java/src/site/xdoc/index.xml (original)
+++ webservices/synapse/trunk/java/src/site/xdoc/index.xml Tue Jul  3 04:47:34 
2007
@@ -27,54 +27,57 @@
 <body>
   
 <section name="Apache Synapse">
-       <p>
-  The Synapse project is a robust, lightweight
-  implementation of a highly scalable and distributed service mediation
-  framework based on Web services and XML specifications.
-       </p>
+  <p>
+  Apache Synapse is a easy-to-use and lightweight XML and Web Services 
management and integration
+  broker that can form the basis of a Service Oriented Architecture (SOA) and 
Enterprise Service Bus (ESB)
+  </p>
+  <p>For more information, see:</p>
 
-       <p>For more information, see:</p>
   <ul>
   <li><a href="Synapse_Configuration_Language.html">The Synapse Configuration 
Language</a></li>
+  <li><a href="Synapse_QuickStart.html">Quick Start Guide</a></li>
   <li><a href="Synapse_Samples.html">A Quick start with Synapse 
Samples</a></li>
-  <li><a href="Synapse_Extending.html">Extending Synapse</a></li>
-  <li><a href="Synapse_Userguide.html">The Synapse User Guide</a><a 
href="">(In Progress)</a></li>
-  
-  <li>The WS Wiki <a 
href="http://wiki.apache.org/ws/Synapse";>http://wiki.apache.org/ws/Synapse</a></li>
-  <!--li>The Incubator Wiki <a 
href="http://wiki.apache.org/incubator/Synapse";>http://wiki.apache.org/incubator/Synapse</a></li-->
-  <!--li>The Original proposal: <a 
href="http://wiki.apache.org/incubator/SynapseProposal";>http://wiki.apache.org/incubator/SynapseProposal</a></li-->
+  <li><a href="Synapse_Extending.html">Extending Synapse</a></li>  
   <li>The Developer mailing list:  <a href="mailto:[EMAIL 
PROTECTED]">Subscribe</a></li>
   <li>The User mailing list:  <a href="mailto:[EMAIL 
PROTECTED]">Subscribe</a></li>
+  <li>The WS Wiki <a 
href="http://wiki.apache.org/ws/Synapse";>http://wiki.apache.org/ws/Synapse</a></li>
   </ul>
 </section>
 
 <section name="Introduction">
-       <p>Synapse is a mediation framework for Web Services. Synapse allows 
messages flowing through, into, or out of an organization to be mediated.</p>
-
-       <p>Synapse, incidentally, is pronounced "sine-apse", and not 
"sin-apse".  </p>
+<p>
+Apache Synapse is a easy-to-use and lightweight XML and Web Services 
management and integration
+broker that can form the basis of a Service Oriented Architecture (SOA) and 
Enterprise Service Bus (ESB)
+</p>
+<p>
+Apache Synapse offers a wide range of mediation capabilities, including 
support for a number of
+open standards, including XML, XSLT, XPath, SOAP, HTTP, JMS, Web Services 
Security, Web Services
+Reliable Messaging (WS-RM), SMTP and Web Services Addressing. Synapse supports 
a number of useful
+functions out-of-the-box without programming, but it also can be extended 
using popular programming
+languages such as Java, JavaScript, Ruby, and Groovy.
+</p>
 </section>
        
 <section name="Status">
-       <p>Synapse has graduated from the incubator! Synapse was officially 
accepted as a sub-project of the Apache WS project on the 2nd January 2007.</p>
+       <p>Synapse graduated from the Apache Incubator on the 2nd of January 
2007, and has been
+    officially accepted as a sub-project of the Apache Web Services project</p>
        
-       <p>The latest release of Synapse is <a 
href="http://ws.apache.org/synapse/download/0.91/download.cgi";>0.91</a>. Its 
key features are </p>
+       <p>The latest release of Synapse is <a 
href="http://ws.apache.org/synapse/download/1.0/download.cgi";>1.0</a>. Its key 
features are </p>
 
        <ul>
-       <li><p> A streamlined configuration model and a new XML syntax</p></li>
-       <li><p> Proxy Services (service mediation) and Message 
mediation</p></li>
-       <li><p> Concept of Endpoints </p></li>
-       <li><p> Integration of a Registry and dynamic refresh of resources as 
well as rules used to mediate </p></li>
-       <li><p> Support for http and JMS transports</p></li>
-       <li><p> Support for WS-Reliable Messaging and WS-Security through 
WS-Policies</p></li>
-       <li><p> Script mediator supporting all BSF scripting languages </p></li>
-       <li><p> Support for error handling and recovery </p></li>
-  <li><p> Support for WS-RM sequences </p></li>
-  <li><p> Many built in mediators </p></li>
-       <li><p> Maven 2 based build process</p></li>
-       <li><p> Many samples and a built-in Axis2 server to try out and 
experiment with samples (Samples includes WS-Security, JMS POX/Text messages, 
Script mediation and many more samples which can be run out of the box) 
</p></li>
-       <li><p> Enhanced documentation </p></li>
+        <li><p>Proxy services - facilitating transport, interface 
(WSDL/Schema/Policy), message format (SOAP/POX), QoS (WS-Security/RM) and 
optimization switching (MTOM/SwA)</p></li>
+        <li><p>Non-blocking http/s transports based on Apache <a 
target="_blank" 
href="http://jakarta.apache.org/httpcomponents/httpcore/";>HttpCore</a> for 
ultrafast execution and support for thousands of connections</p></li>
+        <li><p>Built in Registry/Repository, facilitating dynamic updating and 
reloading of the configuration and associated resources (e.g. XSLTs, XSD, JS, 
..)</p></li>
+        <li><p>Easily extended via custom Java class/Spring mediators, or BSF 
Scripting languages (Javascript, Ruby etc)</p></li>
+        <li><p>Load-balancing/Fail-over and Throttling support</p></li>
+        <li><p>WS-Security, WS-Reliable Messaging &amp; Throttling 
configurable via WS-Policies</p></li>
+        <li><p>JMS message support for binary, plain text and XML and SOAP 
payloads</p></li>
+        <li><p>Lightweight, XML and Web services centric messaging 
model</p></li>
+        <li><p>Configurations serialized into a file system for 
versioning/backup and restoration</p></li>
+        <li><p>Support for Error handling and timeouts, and recovery</p></li>
+       <li><p> Many samples and a built-in Axis2 server to try out and 
experiment with samples (Samples includes WS-Security, JMS POX/Text messages, 
Script mediation and many more samples which can be run out of the box) 
</p></li>
+           <li><p> Enhanced documentation</p></li>
        </ul>
 </section>
-
 </body>
 </document>



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

Reply via email to