Revision: 15591
Author: brainslog
Date: Wed Dec  1 05:16:54 2010
Log: Diameter: More changes from port 1812 to 3868

Update Issue 2160
More changes in stack, mux, docs and testsuite


http://code.google.com/p/mobicents/source/detail?r=15591

Modified:
/trunk/servers/diameter/core/docs/sources/src/main/resources/en-US/Section-JDiameter-Configuration.xml /trunk/servers/diameter/core/jdiameter/impl/src/main/java/org/jdiameter/client/impl/helpers/Parameters.java /trunk/servers/diameter/core/mux/jar/src/main/java/org/mobicents/diameter/stack/management/DiameterConfiguration.java /trunk/servers/diameter/core/mux/sar-jboss-4/src/main/resources/config/jdiameter-config.xml /trunk/servers/diameter/testsuite/load/core/src/main/java/org/mobicents/tests/diameter/AbstractStackRunner.java /trunk/servers/diameter/testsuite/load/core/src/main/java/org/mobicents/tests/diameter/cca/CCR.java /trunk/servers/diameter/testsuite/load/core/src/main/resources/jdiameter-config.xml

=======================================
--- /trunk/servers/diameter/core/docs/sources/src/main/resources/en-US/Section-JDiameter-Configuration.xml Fri Jul 16 13:31:33 2010 +++ /trunk/servers/diameter/core/docs/sources/src/main/resources/en-US/Section-JDiameter-Configuration.xml Wed Dec 1 05:16:54 2010
@@ -19,7 +19,7 @@
 </Configuration>]]></programlisting>

        <programlisting role="XML"><![CDATA[<LocalPeer>
-       <URI value="aaa://localhost:1812"/>
+       <URI value="aaa://localhost:3868"/>
        <IPAddresses>
                <IPAddress value="127.0.0.1"/>
        </IPAddresses>
=======================================
--- /trunk/servers/diameter/core/jdiameter/impl/src/main/java/org/jdiameter/client/impl/helpers/Parameters.java Fri Nov 26 03:59:43 2010 +++ /trunk/servers/diameter/core/jdiameter/impl/src/main/java/org/jdiameter/client/impl/helpers/Parameters.java Wed Dec 1 05:16:54 2010
@@ -35,7 +35,7 @@
     /**
      * Local peer URI property
      */
- public static final Parameters OwnDiameterURI = new Parameters("OwnDiameterURI", String.class, "aaa://localhost:1812"); + public static final Parameters OwnDiameterURI = new Parameters("OwnDiameterURI", String.class, "aaa://localhost:3868");
     /**
      * Local peer ip address property
      */
=======================================
--- /trunk/servers/diameter/core/mux/jar/src/main/java/org/mobicents/diameter/stack/management/DiameterConfiguration.java Thu Feb 18 15:28:19 2010 +++ /trunk/servers/diameter/core/mux/jar/src/main/java/org/mobicents/diameter/stack/management/DiameterConfiguration.java Wed Dec 1 05:16:54 2010
@@ -108,7 +108,7 @@
     try {
       MutablePeerTable peerTable;
       peerTable = (MutablePeerTable) stack.unwrap(MutablePeerTable.class);
-      //Peer p = n.addPeer("aaa://127.0.0.1:21812", "mobicents.org", true);
+      //Peer p = n.addPeer("aaa://127.0.0.1:13868", "mobicents.org", true);
       for(Peer peer : peerTable.getPeerTable()) {
         PeerImpl p = (PeerImpl) peer;
NetworkPeerImpl nPeer = new NetworkPeerImpl(p.getUri().toString(), p.isAttemptConnection(), p.getRating(), null, null, null, null);
=======================================
--- /trunk/servers/diameter/core/mux/sar-jboss-4/src/main/resources/config/jdiameter-config.xml Thu Feb 18 20:32:46 2010 +++ /trunk/servers/diameter/core/mux/sar-jboss-4/src/main/resources/config/jdiameter-config.xml Wed Dec 1 05:16:54 2010
@@ -2,7 +2,7 @@
 <Configuration xmlns="http://www.jdiameter.org/jdiameter-server";>

   <LocalPeer>
-    <URI value="aaa://127.0.0.1:1812" />
+    <URI value="aaa://127.0.0.1:3868" />
     <!--URI value="aaa://uas.mobicents.org:3868" /-->
     <!--IPAddresses>
       <IPAddress value="127.0.0.1" />
=======================================
--- /trunk/servers/diameter/testsuite/load/core/src/main/java/org/mobicents/tests/diameter/AbstractStackRunner.java Wed Oct 27 06:50:47 2010 +++ /trunk/servers/diameter/testsuite/load/core/src/main/java/org/mobicents/tests/diameter/AbstractStackRunner.java Wed Dec 1 05:16:54 2010
@@ -44,12 +44,12 @@

        protected final Logger log = Logger.getLogger(getClass());
        //protected static String clientHost = "uac.mobicents.org";
-       //protected static String clientPort = "21812";
+       //protected static String clientPort = "13868";
//protected static String clientURI = "aaa://" + clientHost + ":" + clientPort;

        // protected static String serverHost = "127.0.0.1";
        protected static String serverHost = "uas.mobicents.org";
-       protected static String serverPort = "1812";
+       protected static String serverPort = "3868";
protected static String serverURI = "aaa://" + serverHost + ":" + serverPort;

        protected static String realmName = "mobicents.org";
=======================================
--- /trunk/servers/diameter/testsuite/load/core/src/main/java/org/mobicents/tests/diameter/cca/CCR.java Fri Jul 9 10:50:22 2010 +++ /trunk/servers/diameter/testsuite/load/core/src/main/java/org/mobicents/tests/diameter/cca/CCR.java Wed Dec 1 05:16:54 2010
@@ -113,7 +113,7 @@
                                // set.removeAvp(296);
                                // set.removeAvp(264);
                                // set.addAvp(296,"mobicents.org",true);
-                               // 
set.addAvp(264,"aaa://192.168.1.103:1812",true);
+                               // 
set.addAvp(264,"aaa://192.168.1.103:3868",true);
                                set.addAvp(reqSet.getAvp(416), 
reqSet.getAvp(415), reqSet.getAvp(258));

                                if (answer != null) {
@@ -151,7 +151,7 @@
                                // set.removeAvp(296);
                                // set.removeAvp(264);
                                // set.addAvp(296,"mobicents.org",true);
-                               // 
set.addAvp(264,"aaa://192.168.1.103:1812",true);
+                               // 
set.addAvp(264,"aaa://192.168.1.103:3868",true);
                                set.addAvp(reqSet.getAvp(416), 
reqSet.getAvp(415), reqSet.getAvp(258));

                                if (answer != null) {
@@ -187,7 +187,7 @@
                                // set.removeAvp(296);
                                // set.removeAvp(264);
                                // set.addAvp(296,"mobicents.org",true);
-                               // 
set.addAvp(264,"aaa://192.168.1.103:1812",true);
+                               // 
set.addAvp(264,"aaa://192.168.1.103:3868",true);
                                set.addAvp(reqSet.getAvp(416), 
reqSet.getAvp(415), reqSet.getAvp(258));

                                if (answer != null) {
@@ -223,7 +223,7 @@
                                // set.removeAvp(296);
                                // set.removeAvp(264);
                                // set.addAvp(296,"mobicents.org",true);
-                               // 
set.addAvp(264,"aaa://192.168.1.103:1812",true);
+                               // 
set.addAvp(264,"aaa://192.168.1.103:3868",true);
                                set.addAvp(reqSet.getAvp(416), 
reqSet.getAvp(415), reqSet.getAvp(258));

                                if (answer != null) {
=======================================
--- /trunk/servers/diameter/testsuite/load/core/src/main/resources/jdiameter-config.xml Fri Mar 19 04:32:44 2010 +++ /trunk/servers/diameter/testsuite/load/core/src/main/resources/jdiameter-config.xml Wed Dec 1 05:16:54 2010
@@ -49,7 +49,7 @@
   <Network>
     <Peers>
       <!-- Testsuite -->
- <Peer name="aaa://127.0.0.1:21812" attempt_connect="false" rating="1" /> + <Peer name="aaa://127.0.0.1:13868" attempt_connect="false" rating="1" />

       <!-- Ericsson SDK Client -->
<Peer name="aaa://uac.mobicents.org" attempt_connect="false" rating="1"/>

Reply via email to