Revision: f8b1404f11fb
Author:   Jean Deruelle <[email protected]>
Date:     Thu Jul 26 07:35:52 2012
Log:      Update Issue 119

Backport to HEAD

Fixes perf scripts
(cherry picked from commit 3dfc81fd71c5041ac25609883667ed7296bebdb9)

http://code.google.com/p/sipservlets/source/detail?r=f8b1404f11fb

Modified:
 /sip-servlets-test-suite/sipp-scenarios/performance/jboss-5-setup/log4j.xml
/sip-servlets-test-suite/sipp-scenarios/performance/jboss-5-setup/mss-sip-stack-jboss.properties /sip-servlets-test-suite/sipp-scenarios/performance/jboss-5-setup/war-deployers-jboss-beans.xml
 /sip-servlets-test-suite/sipp-scenarios/performance/performance-test.sh
/sip-servlets-test-suite/sipp-scenarios/performance/prepare-jboss-5-server-for-perf.sh

=======================================
--- /sip-servlets-test-suite/sipp-scenarios/performance/jboss-5-setup/log4j.xml Thu Mar 11 01:58:51 2010 +++ /sip-servlets-test-suite/sipp-scenarios/performance/jboss-5-setup/log4j.xml Thu Jul 26 07:35:52 2012
@@ -161,15 +161,19 @@

    <!-- Limit the org.apache category to INFO as its DEBUG is verbose -->
    <category name="org.mobicents">
-      <priority value="ERROR"/>
+      <priority value="WARN"/>
    </category>

+   <category name="gov.nist">
+      <priority value="WARN"/>
+   </category>
+
    <category name="org.jboss.web.tomcat.service.session">
-      <priority value="ERROR"/>
+      <priority value="WARN"/>
    </category>

    <category name="org.jboss">
-      <priority value="ERROR"/>
+      <priority value="WARN"/>
    </category>

    <category name="javax.enterprise">
@@ -330,7 +334,7 @@
    <!-- ======================= -->

    <root>
-         <priority value ="ERROR" />
+         <priority value ="WARN" />
       <appender-ref ref="CONSOLE"/>
       <appender-ref ref="FILE"/>
    </root>
=======================================
--- /sip-servlets-test-suite/sipp-scenarios/performance/jboss-5-setup/mss-sip-stack-jboss.properties Wed Aug 10 02:19:02 2011 +++ /sip-servlets-test-suite/sipp-scenarios/performance/jboss-5-setup/mss-sip-stack-jboss.properties Thu Jul 26 07:35:52 2012
@@ -1,5 +1,6 @@
 gov.nist.javax.sip.LOG_MESSAGE_CONTENT=false
-gov.nist.javax.sip.TRACE_LEVEL=0
+gov.nist.javax.sip.LOG4J_LOGGER_NAME=gov.nist
+gov.nist.javax.sip.TRACE_LEVEL=LOG4J
 gov.nist.javax.sip.DEBUG_LOG=log/mss-jsip-debuglog.txt
 gov.nist.javax.sip.SERVER_LOG=log/mss-jsip-messages.xml
 javax.sip.STACK_NAME=Mobicents-SIP-Servlets
=======================================
--- /sip-servlets-test-suite/sipp-scenarios/performance/jboss-5-setup/war-deployers-jboss-beans.xml Mon Oct 10 09:50:32 2011 +++ /sip-servlets-test-suite/sipp-scenarios/performance/jboss-5-setup/war-deployers-jboss-beans.xml Thu Jul 26 07:35:52 2012
@@ -23,13 +23,13 @@
       <property name="relativeOrder">1999</property>
    </bean>
    <!-- sip.xml parsing deployer -->
- <bean name="SipAppParsingDeployer" class="org.jboss.deployment.SipAppParsingDeployer"> + <bean name="SipAppParsingDeployer" class="org.jboss.deployment.sip.SipAppParsingDeployer">
       <property name="relativeOrder">2000</property>
    </bean>
<!--bean name="JBossWebAppParsingDeployer" class="org.jboss.deployment.JBossWebAppParsingDeployer">
       <property name="relativeOrder">2001</property>
    </bean-->
- <bean name="JBossConvergedSipAppParsingDeployer" class="org.jboss.deployment.JBossConvergedSipAppParsingDeployer"> + <bean name="JBossConvergedSipAppParsingDeployer" class="org.jboss.deployment.sip.JBossConvergedSipAppParsingDeployer">
       <property name="relativeOrder">2001</property>
    </bean>

@@ -48,7 +48,7 @@
         and conf/standardjboss.xml as the source for defaults.
    -->
    <bean name="WebAppClusteringDefaultsDeployer"
- class="org.jboss.web.tomcat.service.deployers.ConvergedSipClusteringDefaultsDeployer"> + class="org.jboss.web.tomcat.service.deployers.sip.ConvergedSipClusteringDefaultsDeployer">

       <!-- Default session cache config used by distributable webapps -->
       <property name="cacheName">standard-session-cache</property>
@@ -229,7 +229,7 @@
Class of the session manager (used if context is marked as 'distributable' and being a sip application. Currently allowed values:
           - org.jboss.web.tomcat.service.session.JBossCacheSipManager
       -->
- <property name="sipManagerClass">org.jboss.web.tomcat.service.session.JBossCacheSipManager</property> + <property name="sipManagerClass">org.jboss.web.tomcat.service.session.sip.JBossCacheSipManager</property>

<!-- The name of the request property under with the authenticated JAAS
       Subject is stored on successful authentication. If null or empty then
=======================================
--- /sip-servlets-test-suite/sipp-scenarios/performance/performance-test.sh Thu Jan 28 02:42:00 2010 +++ /sip-servlets-test-suite/sipp-scenarios/performance/performance-test.sh Thu Jul 26 07:35:52 2012
@@ -10,7 +10,7 @@
                        rm ./proxy/*.log
                        echo "Distributed example used is proxy";
./sipp $TEST_IP:5055 -sf proxy-scenario/performance-proxy-uas.xml -trace_err -i $TEST_IP -p 5090 -bg -nd - ./sipp $TEST_IP:5090 -sf proxy-scenario/performance-proxy-uac.xml -trace_err -i $TEST_IP -p 5055 -rsa $TEST_IP:5080 -r 100 -m 250000 -nd + ./sipp $TEST_IP:5090 -sf proxy-scenario/performance-proxy-uac.xml -trace_err -i $TEST_IP -p 5055 -rsa $TEST_IP:5080 -r 50 -m 250000 -nd
                                sleep 10
                    ;;
            b2bua)
=======================================
--- /sip-servlets-test-suite/sipp-scenarios/performance/prepare-jboss-5-server-for-perf.sh Fri Jan 15 08:46:48 2010 +++ /sip-servlets-test-suite/sipp-scenarios/performance/prepare-jboss-5-server-for-perf.sh Thu Jul 26 07:35:52 2012
@@ -1,4 +1,4 @@
-mvn clean install -f ../../../pom.xml -P jboss-5 -U
+mvn clean install -f ../../../pom.xml -P jboss-5

cp jboss-5-setup/mss-sip-stack-jboss.properties $JBOSS_HOME/server/default/conf/mss-sip-stack.properties cp jboss-5-setup/context-jboss-5.xml $JBOSS_HOME/server/default/deploy/jbossweb.sar/context.xml

Reply via email to