You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@synapse.apache.org by as...@apache.org on 2007/03/27 14:02:58 UTC

svn commit: r522879 - in /webservices/synapse/trunk/java: ./ modules/core/src/main/java/org/apache/synapse/ modules/core/src/main/java/org/apache/synapse/config/xml/ modules/core/src/main/java/org/apache/synapse/core/axis2/ modules/core/src/test/java/o...

Author: asankha
Date: Tue Mar 27 05:02:55 2007
New Revision: 522879

URL: http://svn.apache.org/viewvc?view=rev&rev=522879
Log:
update to Axis2 1.2 RC1 level (M2 - Snapshot) and Axiom 1.2.3 RC1

Modified:
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Constants.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseServer.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorPropertyFactory.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RegistryFactory.java
    webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/AnonymousServiceFactory.java
    webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/LogMediatorSerializationTest.java
    webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/n2n/SynapseCommodityServiceTest.java
    webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/ServerWorker.java
    webservices/synapse/trunk/java/modules/samples/src/main/java/samples/common/Util.java
    webservices/synapse/trunk/java/modules/samples/src/main/java/samples/userguide/DumbStockQuoteClient.java
    webservices/synapse/trunk/java/modules/samples/src/main/java/samples/userguide/LoadbalanceFailoverClient.java
    webservices/synapse/trunk/java/modules/samples/src/main/java/samples/userguide/StockQuoteClient.java
    webservices/synapse/trunk/java/modules/samples/src/main/java/samples/util/SampleAxis2Server.java
    webservices/synapse/trunk/java/modules/samples/src/main/scripts/axis2server.sh
    webservices/synapse/trunk/java/pom.xml
    webservices/synapse/trunk/java/src/main/assembly/bin.xml

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Constants.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Constants.java?view=diff&rev=522879&r1=522878&r2=522879
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Constants.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/Constants.java Tue Mar 27 05:02:55 2007
@@ -99,14 +99,14 @@
     String ERROR_DETAIL = "ERROR_DETAIL";
 
     // -- names of modules to be engaged at runtime --
-    /** The QName of the WS-RM Sandesha module */
-    QName SANDESHA2_MODULE_NAME = new QName("sandesha2");
+    /** The Name of the WS-RM Sandesha module */
+    String SANDESHA2_MODULE_NAME = "sandesha2";
 
-    /** The QName of the WS-A Addressing module */
-    QName ADDRESSING_MODULE_NAME = new QName("addressing");
+    /** The Name of the WS-A Addressing module */
+    String ADDRESSING_MODULE_NAME = "addressing";
 
-    /** The QName of the WS-Security Rampart module */
-    QName RAMPART_MODULE_NAME = new QName("rampart");
+    /** The Name of the WS-Security Rampart module */
+    String RAMPART_MODULE_NAME = "rampart";
 
     /** Refers the To header */
     String HEADER_TO = "To";

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseServer.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseServer.java?view=diff&rev=522879&r1=522878&r2=522879
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseServer.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/SynapseServer.java Tue Mar 27 05:02:55 2007
@@ -72,7 +72,7 @@
             Iterator iter = configctx.getAxisConfiguration().
                 getTransportsIn().keySet().iterator();
             while (iter.hasNext()) {
-                QName trp = (QName) iter.next();
+                String trp = (String) iter.next();
                 TransportInDescription trsIn = (TransportInDescription)
                     configctx.getAxisConfiguration().getTransportsIn().get(trp);
                 listenerManager.addListener(trsIn, false);
@@ -93,7 +93,7 @@
     private static void selectPort(ConfigurationContext configCtx) {
         // check if configured port is available
         TransportInDescription trsIn = (TransportInDescription)
-            configCtx.getAxisConfiguration().getTransportsIn().get(new QName("http"));
+            configCtx.getAxisConfiguration().getTransportsIn().get("http");
 
         if (trsIn != null) {
 

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorPropertyFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorPropertyFactory.java?view=diff&rev=522879&r1=522878&r2=522879
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorPropertyFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/MediatorPropertyFactory.java Tue Mar 27 05:02:55 2007
@@ -51,7 +51,7 @@
 
         List propertyList = new ArrayList();
 
-        Iterator iter = elem.getChildrenWithName(new QName(Constants.NULL_NAMESPACE, "property"));
+        Iterator iter = elem.getChildrenWithName(new QName(Constants.SYNAPSE_NAMESPACE, "property"));
         while (iter.hasNext()) {
 
             OMElement propEle = (OMElement) iter.next();

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RegistryFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RegistryFactory.java?view=diff&rev=522879&r1=522878&r2=522879
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RegistryFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/config/xml/RegistryFactory.java Tue Mar 27 05:02:55 2007
@@ -41,7 +41,7 @@
     private static final Log log = LogFactory.getLog(RegistryFactory.class);
 
     public static final QName PROVIDER_Q = new QName(Constants.NULL_NAMESPACE, "provider");
-    public static final QName PARAMETER_Q = new QName(Constants.NULL_NAMESPACE, "parameter");
+    public static final QName PARAMETER_Q = new QName(Constants.SYNAPSE_NAMESPACE, "parameter");
     public static final QName NAME_Q     = new QName(Constants.NULL_NAMESPACE, "name");
 
     public static Registry createRegistry(OMElement elem) {

Modified: webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/AnonymousServiceFactory.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/AnonymousServiceFactory.java?view=diff&rev=522879&r1=522878&r2=522879
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/AnonymousServiceFactory.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/core/axis2/AnonymousServiceFactory.java Tue Mar 27 05:02:55 2007
@@ -132,8 +132,10 @@
             dynamicOperation.setMessageReceiver(synapseCallback);
             AxisMessage inMsg = new AxisMessage();
             inMsg.setName("in-message");
+            inMsg.setParent(dynamicOperation);
             AxisMessage outMsg = new AxisMessage();
             outMsg.setName("out-message");
+            outMsg.setParent(dynamicOperation);
             dynamicOperation.addMessage(inMsg, WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
             dynamicOperation.addMessage(outMsg, WSDLConstants.MESSAGE_LABEL_IN_VALUE);
             AxisService axisAnonymousService  = new AxisService(serviceKey);

Modified: webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/LogMediatorSerializationTest.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/LogMediatorSerializationTest.java?view=diff&rev=522879&r1=522878&r2=522879
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/LogMediatorSerializationTest.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/config/xml/LogMediatorSerializationTest.java Tue Mar 27 05:02:55 2007
@@ -41,40 +41,40 @@
 
     public void testLogMediatorSerializationSenarioOne() throws Exception {
 
-        //    assertTrue(serialization(getXmlOfMediatorSenarioOne(SIMPLE), logMediatorFactory, logMediatorSerializer));
-        assertTrue(serialization(getXmlOfMediatorSenarioOne(HEADERS), logMediatorFactory, logMediatorSerializer));
-        assertTrue(serialization(getXmlOfMediatorSenarioOne(FULL), logMediatorFactory, logMediatorSerializer));
-        assertTrue(serialization(getXmlOfMediatorSenarioOne(CUSTOM), logMediatorFactory, logMediatorSerializer));
-
-//        assertTrue(serialization(getXmlOfMediatorSenarioOne(SIMPLE), logMediatorSerializer));
-        assertTrue(serialization(getXmlOfMediatorSenarioOne(HEADERS), logMediatorSerializer));
-        assertTrue(serialization(getXmlOfMediatorSenarioOne(FULL), logMediatorSerializer));
-        assertTrue(serialization(getXmlOfMediatorSenarioOne(CUSTOM), logMediatorSerializer));
+        //    assertTrue(serialization(getXmlOfMediatorScenarioOne(SIMPLE), logMediatorFactory, logMediatorSerializer));
+        assertTrue(serialization(getXmlOfMediatorScenarioOne(HEADERS), logMediatorFactory, logMediatorSerializer));
+        assertTrue(serialization(getXmlOfMediatorScenarioOne(FULL), logMediatorFactory, logMediatorSerializer));
+        assertTrue(serialization(getXmlOfMediatorScenarioOne(CUSTOM), logMediatorFactory, logMediatorSerializer));
+
+//        assertTrue(serialization(getXmlOfMediatorScenarioOne(SIMPLE), logMediatorSerializer));
+        assertTrue(serialization(getXmlOfMediatorScenarioOne(HEADERS), logMediatorSerializer));
+        assertTrue(serialization(getXmlOfMediatorScenarioOne(FULL), logMediatorSerializer));
+        assertTrue(serialization(getXmlOfMediatorScenarioOne(CUSTOM), logMediatorSerializer));
 
 
     }
 
-    public void testLogMediatorSerializationSenarioTwo() throws Exception {
+    public void testLogMediatorSerializationScenarioTwo() throws Exception {
 
-//        assertTrue(serialization(getXmlOfMediatorSenarioTwo(SIMPLE, ":"), logMediatorFactory, logMediatorSerializer));
-        assertTrue(serialization(getXmlOfMediatorSenarioTwo(HEADERS, ":"), logMediatorFactory, logMediatorSerializer));
-        assertTrue(serialization(getXmlOfMediatorSenarioTwo(FULL, ";"), logMediatorFactory, logMediatorSerializer));
-        assertTrue(serialization(getXmlOfMediatorSenarioTwo(CUSTOM, ":"), logMediatorFactory, logMediatorSerializer));
-
-        //       assertTrue(serialization(getXmlOfMediatorSenarioTwo(SIMPLE, ":"), logMediatorSerializer));
-        assertTrue(serialization(getXmlOfMediatorSenarioTwo(HEADERS, ":"), logMediatorSerializer));
-        assertTrue(serialization(getXmlOfMediatorSenarioTwo(FULL, ";"), logMediatorSerializer));
-        assertTrue(serialization(getXmlOfMediatorSenarioTwo(CUSTOM, ":"), logMediatorSerializer));
+//        assertTrue(serialization(getXmlOfMediatorScenarioTwo(SIMPLE, ":"), logMediatorFactory, logMediatorSerializer));
+        assertTrue(serialization(getXmlOfMediatorScenarioTwo(HEADERS, ":"), logMediatorFactory, logMediatorSerializer));
+        assertTrue(serialization(getXmlOfMediatorScenarioTwo(FULL, ";"), logMediatorFactory, logMediatorSerializer));
+        assertTrue(serialization(getXmlOfMediatorScenarioTwo(CUSTOM, ":"), logMediatorFactory, logMediatorSerializer));
+
+        //       assertTrue(serialization(getXmlOfMediatorScenarioTwo(SIMPLE, ":"), logMediatorSerializer));
+        assertTrue(serialization(getXmlOfMediatorScenarioTwo(HEADERS, ":"), logMediatorSerializer));
+        assertTrue(serialization(getXmlOfMediatorScenarioTwo(FULL, ";"), logMediatorSerializer));
+        assertTrue(serialization(getXmlOfMediatorScenarioTwo(CUSTOM, ":"), logMediatorSerializer));
 
 
     }
 
-    private String getXmlOfMediatorSenarioOne(String level) {
+    private String getXmlOfMediatorScenarioOne(String level) {
         return "<log xmlns=\"http://ws.apache.org/ns/synapse\" level=\"" + level + "\"><property name=\"Text\" value=\"Sending quote request\"/></log>";
 
     }
 
-    private String getXmlOfMediatorSenarioTwo(String level, String seperator) {
+    private String getXmlOfMediatorScenarioTwo(String level, String seperator) {
         return "<log xmlns=\"http://ws.apache.org/ns/synapse\" level=\"" + level + "\" separator=\"" + seperator + "\"><property name=\"Text\" value=\"Sending quote request\"/></log>";
 
     }

Modified: webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/n2n/SynapseCommodityServiceTest.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/n2n/SynapseCommodityServiceTest.java?view=diff&rev=522879&r1=522878&r2=522879
==============================================================================
--- webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/n2n/SynapseCommodityServiceTest.java (original)
+++ webservices/synapse/trunk/java/modules/core/src/test/java/org/apache/synapse/n2n/SynapseCommodityServiceTest.java Tue Mar 27 05:02:55 2007
@@ -73,18 +73,18 @@
         businessConfigCtx.getAxisConfiguration().addService(businessService);
 
         TransportInDescription synTrsIn = (TransportInDescription)
-            synapseConfigCtx.getAxisConfiguration().getTransportsIn().get(new QName("http"));
+            synapseConfigCtx.getAxisConfiguration().getTransportsIn().get("http");
         synTrsIn.getParameter("port").setValue("10100");
         synTrsIn = (TransportInDescription)
-            synapseConfigCtx.getAxisConfiguration().getTransportsIn().get(new QName("https"));
+            synapseConfigCtx.getAxisConfiguration().getTransportsIn().get("https");
         synTrsIn.getParameter("port").setValue("12100");
         startServer(synapseConfigCtx);
 
         TransportInDescription busTrsIn = (TransportInDescription)
-            businessConfigCtx.getAxisConfiguration().getTransportsIn().get(new QName("http"));
+            businessConfigCtx.getAxisConfiguration().getTransportsIn().get("http");
         busTrsIn.getParameter("port").setValue("10101");
         busTrsIn = (TransportInDescription)
-            businessConfigCtx.getAxisConfiguration().getTransportsIn().get(new QName("https"));
+            businessConfigCtx.getAxisConfiguration().getTransportsIn().get("https");
         busTrsIn.getParameter("port").setValue("12101");
         startServer(businessConfigCtx);
         System.out.println("");
@@ -105,7 +105,7 @@
         Iterator iter = configctx.getAxisConfiguration().
             getTransportsIn().keySet().iterator();
         while (iter.hasNext()) {
-            QName trp = (QName) iter.next();
+            String trp = (String) iter.next();
             TransportInDescription trsIn = (TransportInDescription)
                 configctx.getAxisConfiguration().getTransportsIn().get(trp);
             listenerManager.addListener(trsIn, false);

Modified: webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/ServerWorker.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/ServerWorker.java?view=diff&rev=522879&r1=522878&r2=522879
==============================================================================
--- webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/ServerWorker.java (original)
+++ webservices/synapse/trunk/java/modules/nhttp/src/org/apache/axis2/transport/nhttp/ServerWorker.java Tue Mar 27 05:02:55 2007
@@ -137,9 +137,9 @@
         }
 
         msgContext.setTransportOut(cfgCtx.getAxisConfiguration()
-            .getTransportOut(new QName(Constants.TRANSPORT_HTTP)));
+            .getTransportOut(Constants.TRANSPORT_HTTP));
         msgContext.setTransportIn(cfgCtx.getAxisConfiguration()
-            .getTransportIn(new QName(Constants.TRANSPORT_HTTP)));
+            .getTransportIn(Constants.TRANSPORT_HTTP));
 
         return msgContext;
     }

Modified: webservices/synapse/trunk/java/modules/samples/src/main/java/samples/common/Util.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/samples/src/main/java/samples/common/Util.java?view=diff&rev=522879&r1=522878&r2=522879
==============================================================================
--- webservices/synapse/trunk/java/modules/samples/src/main/java/samples/common/Util.java (original)
+++ webservices/synapse/trunk/java/modules/samples/src/main/java/samples/common/Util.java Tue Mar 27 05:02:55 2007
@@ -54,7 +54,7 @@
             } else {
                 serviceClient = new ServiceClient();
             }
-            serviceClient.engageModule(new QName("addressing"));
+            serviceClient.engageModule("addressing");
             serviceClient.setOptions(options);
 
             OMElement result = serviceClient.sendReceive(getQuote).getFirstElement();
@@ -88,7 +88,7 @@
             } else {
                 serviceClient = new ServiceClient();
             }
-            serviceClient.engageModule(new QName("addressing"));
+            serviceClient.engageModule("addressing");
             serviceClient.setOptions(options);
 
             OMElement result = serviceClient.sendReceive(getQuote);
@@ -121,7 +121,7 @@
             } else {
                 serviceClient = new ServiceClient();
             }
-            serviceClient.engageModule(new QName("addressing"));
+            serviceClient.engageModule("addressing");
             serviceClient.setOptions(options);
 
             OMElement result = serviceClient.sendReceive(getQuote);
@@ -154,7 +154,7 @@
             } else {
                 serviceClient = new ServiceClient();
             }
-            serviceClient.engageModule(new QName("addressing"));
+            serviceClient.engageModule("addressing");
             serviceClient.setOptions(options);
 
             OMElement result = serviceClient.sendReceive(getQuote);

Modified: webservices/synapse/trunk/java/modules/samples/src/main/java/samples/userguide/DumbStockQuoteClient.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/samples/src/main/java/samples/userguide/DumbStockQuoteClient.java?view=diff&rev=522879&r1=522878&r2=522879
==============================================================================
--- webservices/synapse/trunk/java/modules/samples/src/main/java/samples/userguide/DumbStockQuoteClient.java (original)
+++ webservices/synapse/trunk/java/modules/samples/src/main/java/samples/userguide/DumbStockQuoteClient.java Tue Mar 27 05:02:55 2007
@@ -77,7 +77,7 @@
             }
             
             if (secpol != null && secpol.length() > 0) {
-                serviceClient.engageModule(new QName("rampart"));
+                serviceClient.engageModule("rampart");
             }
             serviceClient.setOptions(options);
 

Modified: webservices/synapse/trunk/java/modules/samples/src/main/java/samples/userguide/LoadbalanceFailoverClient.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/samples/src/main/java/samples/userguide/LoadbalanceFailoverClient.java?view=diff&rev=522879&r1=522878&r2=522879
==============================================================================
--- webservices/synapse/trunk/java/modules/samples/src/main/java/samples/userguide/LoadbalanceFailoverClient.java (original)
+++ webservices/synapse/trunk/java/modules/samples/src/main/java/samples/userguide/LoadbalanceFailoverClient.java Tue Mar 27 05:02:55 2007
@@ -106,7 +106,7 @@
             options.setTimeOutInMilliSeconds(10000000);
 
             client.setOptions(options);
-            client.engageModule(new QName("addressing"));
+            client.engageModule("addressing");
 
             long i = 0;
             while(i < iterations || infinite) {
@@ -173,7 +173,7 @@
             ConfigurationContext configContext = ConfigurationContextFactory.createConfigurationContextFromFileSystem("client_repo", null);
             ServiceClient client = new ServiceClient(configContext, null);
             client.setOptions(options);
-            client.engageModule(new QName("addressing"));
+            client.engageModule("addressing");
 
             int i = 0;
             int sessionNumber = 0;

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=522879&r1=522878&r2=522879
==============================================================================
--- 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 Mar 27 05:02:55 2007
@@ -79,9 +79,9 @@
             } else {
                 serviceClient = new ServiceClient();
             }
-            serviceClient.engageModule(new QName("addressing"));
+            serviceClient.engageModule("addressing");
             if (secpol != null && secpol.length() > 0) {
-                serviceClient.engageModule(new QName("rampart"));
+                serviceClient.engageModule("rampart");
             }
 
             serviceClient.setOptions(options);

Modified: webservices/synapse/trunk/java/modules/samples/src/main/java/samples/util/SampleAxis2Server.java
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/samples/src/main/java/samples/util/SampleAxis2Server.java?view=diff&rev=522879&r1=522878&r2=522879
==============================================================================
--- webservices/synapse/trunk/java/modules/samples/src/main/java/samples/util/SampleAxis2Server.java (original)
+++ webservices/synapse/trunk/java/modules/samples/src/main/java/samples/util/SampleAxis2Server.java Tue Mar 27 05:02:55 2007
@@ -107,7 +107,7 @@
     private static void configurePort(ConfigurationContext configCtx) {
 
         TransportInDescription trsIn = (TransportInDescription)
-            configCtx.getAxisConfiguration().getTransportsIn().get(new QName("http"));
+            configCtx.getAxisConfiguration().getTransportsIn().get("http");
 
         if(trsIn != null) {
             String port = System.getProperty("http_port");
@@ -125,7 +125,7 @@
         }
 
         TransportInDescription httpsTrsIn = (TransportInDescription)
-            configCtx.getAxisConfiguration().getTransportsIn().get(new QName("https"));
+            configCtx.getAxisConfiguration().getTransportsIn().get("https");
 
         if(httpsTrsIn != null) {
             String port = System.getProperty("https_port");

Modified: webservices/synapse/trunk/java/modules/samples/src/main/scripts/axis2server.sh
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/modules/samples/src/main/scripts/axis2server.sh?view=diff&rev=522879&r1=522878&r2=522879
==============================================================================
--- webservices/synapse/trunk/java/modules/samples/src/main/scripts/axis2server.sh (original)
+++ webservices/synapse/trunk/java/modules/samples/src/main/scripts/axis2server.sh Tue Mar 27 05:02:55 2007
@@ -129,7 +129,7 @@
 done
 
 if [ "$HTTP_PORT_SET" = "FALSE" ]; then
-	PROGRAM_PARAMS="$PROGRAM_PARAMS""-Dhttp_port=9001 "
+	PROGRAM_PARAMS="$PROGRAM_PARAMS""-Dhttp_port=9000 "
 fi
 
 if [ "$HTTPS_PORT_SET" = "FALSE" ]; then

Modified: webservices/synapse/trunk/java/pom.xml
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/pom.xml?view=diff&rev=522879&r1=522878&r2=522879
==============================================================================
--- webservices/synapse/trunk/java/pom.xml (original)
+++ webservices/synapse/trunk/java/pom.xml Tue Mar 27 05:02:55 2007
@@ -549,7 +549,6 @@
                 <enabled>false</enabled>
             </snapshots>
         </repository>
-<!--
         <repository>
             <id>apache-m2-snapshot</id>
             <name>Apache Maven 2 Snapshot Repository</name>
@@ -561,7 +560,6 @@
                 <updatePolicy>interval:1440</updatePolicy>
             </snapshots>
         </repository>
--->
         <repository>
             <id>wso2-m2</id>
             <name>WSO2 Maven 2 Repository</name>
@@ -592,7 +590,7 @@
       <!-- Axis2 1.1.1 and its dependencies -->
         <axis2.version>SNAPSHOT</axis2.version>
         <rampart.version>SNAPSHOT</rampart.version>
-        <axiom.version>SNAPSHOT</axiom.version>
+        <axiom.version>1.2.3-RC1</axiom.version>
         <xml_schema.version>SNAPSHOT</xml_schema.version>
 
         <stax.impl.groupid>org.codehaus.woodstox</stax.impl.groupid>

Modified: webservices/synapse/trunk/java/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/webservices/synapse/trunk/java/src/main/assembly/bin.xml?view=diff&rev=522879&r1=522878&r2=522879
==============================================================================
--- webservices/synapse/trunk/java/src/main/assembly/bin.xml (original)
+++ webservices/synapse/trunk/java/src/main/assembly/bin.xml Tue Mar 27 05:02:55 2007
@@ -218,6 +218,7 @@
                 <include>org.apache.rampart:rampart:mar</include>
                 <include>org.apache.sandesha2:sandesha2:mar</include>
             </includes>
+            <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
         </dependencySet>
         <dependencySet>
             <outputDirectory>synapse-${synapse.version}/samples/axis2Client/client_repo/modules</outputDirectory>
@@ -226,6 +227,7 @@
                 <include>org.apache.rampart:rampart:mar</include>
                 <!--<include>org.apache.sandesha2:sandesha2:mar</include>-->
             </includes>
+            <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
         </dependencySet>
         <dependencySet>
             <outputDirectory>synapse-${synapse.version}/samples/axis2Server/repository/modules</outputDirectory>
@@ -234,6 +236,7 @@
                 <include>org.apache.rampart:rampart:mar</include>
                 <!--<include>org.apache.sandesha2:sandesha2:mar</include>-->
             </includes>
+            <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
         </dependencySet>
 
     </dependencySets>



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