svn commit: r521130 - in /webservices/synapse/trunk/java: modules/core/src/main/java/org/apache/synapse/config/xml/ modules/core/src/main/java/org/apache/synapse/core/axis2/ src/site/resources/

[ru...@apache.org]

Author: ruwan
Date: Wed Mar 21 23:10:29 2007
New Revision: 521130

URL: http://svn.apache.org/viewvc?view=rev&rev=521130
Log:
enableSec and enableRM tags are added again to the proxy service to engage rampart and sandesha [recognizing the engagement from policy is not yet impl. on policy]

Modified:
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceFactory.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
    webservices/synapse/trunk/java/src/site/resources/Synapse_Configuration_Language.html

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceFactory.java?view=diff&rev=521130&r1=521129&r2=521130
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/ProxyServiceFactory.java Wed Mar 21 23:10:29 2007
@@ -41,7 +41,7 @@
  * <p/>
  * <proxy-service name="string" [transports="(http |https |jms )+|all"]>
  *    <description>..</description>?
- *    <target [inSequence="name"] [outSequence="name"] [faultSequence="name"] [endpoint="name"]> // todo: do we realy need this
+ *    <target [inSequence="name"] [outSequence="name"] [faultSequence="name"] [endpoint="name"]>
  *       <endpoint>...</endpoint>
  *       <inSequence>...</inSequence>
  *       <outSequence>...</outSequence>
@@ -51,7 +51,9 @@
  *       <wsdl:definition>...</wsdl:definition>?
  *       <wsdl20:description>...</wsdl20:description>?
  *    </publishWSDL>?
- *    <policy key="string">
+ *    <enableSec/>?
+ *    <enableRM/>?
+ *    <policy key="string">?
  *       // optional service parameters
  *    <parameter name="string">
  *       text | xml
@@ -256,15 +258,15 @@
             }
         }
 
-//        if (elem.getFirstChildWithName(
-//                new QName(Constants.SYNAPSE_NAMESPACE, "enableRM")) != null) {
-//            proxy.setWsRMEnabled(true);
-//        }
-//
-//        if (elem.getFirstChildWithName(
-//                new QName(Constants.SYNAPSE_NAMESPACE, "enableSec")) != null) {
-//            proxy.setWsSecEnabled(true);
-//        }
+        if (elem.getFirstChildWithName(
+                new QName(Constants.SYNAPSE_NAMESPACE, "enableRM")) != null) {
+            proxy.setWsRMEnabled(true);
+        }
+
+        if (elem.getFirstChildWithName(
+                new QName(Constants.SYNAPSE_NAMESPACE, "enableSec")) != null) {
+            proxy.setWsSecEnabled(true);
+        }
 
         return proxy;
     }

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java?view=diff&rev=521130&r1=521129&r2=521130
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/ProxyService.java Wed Mar 21 23:10:29 2007
@@ -52,15 +52,26 @@
 import java.net.URL;
 
 /**
- * <proxy name="string" [description="string"] [transports="(http|https|jms)+|all"]>
- * <target sequence="name" | endpoint="name"/>?   // default is main sequence
- * <wsdl key="string">?
- * <schema key="string">*
- * <policy key="string">*
- * <property name="string" value="string"/>*
- * <enableRM/>+
- * <enableSec/>+
- * </proxy>
+ * <proxy-service name="string" [transports="(http |https |jms )+|all"]>
+ *    <description>..</description>?
+ *    <target [inSequence="name"] [outSequence="name"] [faultSequence="name"] [endpoint="name"]>
+ *       <endpoint>...</endpoint>
+ *       <inSequence>...</inSequence>
+ *       <outSequence>...</outSequence>
+ *       <faultSequence>...</faultSequence>
+ *    </target>?
+ *    <publishWSDL uri=".." key="string">
+ *       <wsdl:definition>...</wsdl:definition>?
+ *       <wsdl20:description>...</wsdl20:description>?
+ *    </publishWSDL>?
+ *    <enableSec/>?
+ *    <enableRM/>?
+ *    <policy key="string">?
+ *       // optional service parameters
+ *    <parameter name="string">
+ *       text | xml
+ *    </parameter>?
+ * </proxy-service>
  */
 public class ProxyService {
 

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=521130&r1=521129&r2=521130
==============================================================================
--- webservices/synapse/trunk/java/src/site/resources/Synapse_Configuration_Language.html (original)
+++ webservices/synapse/trunk/java/src/site/resources/Synapse_Configuration_Language.html Wed Mar 21 23:10:29 2007
@@ -203,6 +203,8 @@
    &lt;publishWSDL key="string"&gt;
       &lt;endpoint&gt;...&lt;/endpoint&gt;?
    &lt;publishWSDL&gt;?
+   &lt;enableSec/&gt;?
+   &lt;enableRM/&gt;?
    &lt;policy key="string"&gt;...&lt;/policy&gt;?       // optional service level policies
                                             // (e.g. WS-Security and/or WS-RM policies)
    &lt;parameter name="string"&gt;                // optional service parameters



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