Author: oleg.kulikoff
Date: Thu Mar 19 06:02:36 2009
New Revision: 5131
Added:
trunk/servers/media/core/server-standalone/src/main/config/run.bat
Removed:
trunk/servers/media/core/server-standalone/src/main/config/aop-beans.xml
Modified:
trunk/servers/media/core/server-standalone/pom.xml
trunk/servers/media/core/server-standalone/src/main/assembly/common.xml
trunk/servers/media/core/server-standalone/src/main/assembly/pojo.xml
trunk/servers/media/core/server-standalone/src/main/config/ann-beans.xml
trunk/servers/media/core/server-standalone/src/main/config/bootstrap-beans.xml
trunk/servers/media/core/server-standalone/src/main/resources/log4j.properties
Log:
Reworking deployer
Modified: trunk/servers/media/core/server-standalone/pom.xml
==============================================================================
--- trunk/servers/media/core/server-standalone/pom.xml (original)
+++ trunk/servers/media/core/server-standalone/pom.xml Thu Mar 19 06:02:36
2009
@@ -1,206 +1,110 @@
+
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.mobicents.servers.media</groupId>
- <artifactId>mms-core</artifactId>
- <version>2.0.0.BETA1-SNAPSHOT</version>
- </parent>
-
- <artifactId>mms-standalone</artifactId>
-
- <name>Mobicents Media Server [Standalone]</name>
- <dependencies>
- <dependency>
- <artifactId>mms-spi</artifactId>
- <groupId>org.mobicents.servers.media</groupId>
- <version>2.0.0.BETA1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <artifactId>mms-impl</artifactId>
- <groupId>org.mobicents.servers.media</groupId>
- <version>2.0.0.BETA1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.mobicents.external.jspeex</groupId>
- <artifactId>jspeex</artifactId>
- <version>0.9.7</version>
- </dependency>
- <dependency>
- <groupId>net.java.stun4j</groupId>
- <artifactId>stun4j</artifactId>
- <version>1.0.MOBICENTS</version>
- </dependency>
- <dependency>
- <groupId>org.mobicents.external.tritonus</groupId>
- <artifactId>tritonus_share</artifactId>
- <version>0.3.6</version>
- </dependency>
- <dependency>
- <groupId>org.mobicents.external.tritonus</groupId>
- <artifactId>tritonus_gsm</artifactId>
- <version>0.3.6</version>
- </dependency>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.mobicents.servers.media</groupId>
+ <artifactId>mms-core</artifactId>
+ <version>2.0.0.BETA1-SNAPSHOT</version>
+ </parent>
+ <artifactId>mms-standalone</artifactId>
+ <name>Mobicents Media Server [Standalone]</name>
+ <dependencies>
+ <dependency>
+ <artifactId>mms-spi</artifactId>
+ <groupId>org.mobicents.servers.media</groupId>
+ <version>2.0.0.BETA1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <artifactId>mms-impl</artifactId>
+ <groupId>org.mobicents.servers.media</groupId>
+ <version>2.0.0.BETA1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mobicents.external.jspeex</groupId>
+ <artifactId>jspeex</artifactId>
+ <version>0.9.7</version>
+ </dependency>
+ <dependency>
+ <groupId>net.java.stun4j</groupId>
+ <artifactId>stun4j</artifactId>
+ <version>1.0.MOBICENTS</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mobicents.external.tritonus</groupId>
+ <artifactId>tritonus_share</artifactId>
+ <version>0.3.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mobicents.external.tritonus</groupId>
+ <artifactId>tritonus_gsm</artifactId>
+ <version>0.3.6</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
<!-- Compile (global dependencies) -->
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs-spi</artifactId>
- <exclusions>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>apache-xerces</groupId>
- <artifactId>xml-apis</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-common-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-structure-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ </dependency>
<!-- Comment this if you want plain POJO bootstrap -->
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-aop-mc-int</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop-asintegration-mc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop-asintegration-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop-asintegration-jmx</artifactId>
- </dependency>
- <dependency>
- <groupId>org.jboss.jbossas</groupId>
- <artifactId>jboss-as-system-jmx</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <finalName>mms-standalone-${pom.version}</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
-
<addMavenDescriptor>false</addMavenDescriptor>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>
-
src/main/assembly/pojo.xml
- </descriptor>
- </descriptors>
- <finalName>${pom.artifactId}</finalName>
- </configuration>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
-
<goal>directory-inline</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <!-- plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy</id>
- <phase>install</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <condition
property="jboss.dir"
-
value="${jboss.home}" else="${env.JBOSS_HOME}">
- <isset
property="jboss.home" />
- </condition>
- <copy
-
todir="target/mms-standalone-pojo.dir/deploy/mgcp-controller-service.sar">
- <fileset
-
dir="../controllers/mgcp/target/mgcp-controller-service.dir/mgcp-controller-service">
-
</fileset>
- </copy>
- </tasks>
- </configuration>
- </execution>
- <execution>
- <id>undeploy</id>
- <phase>clean</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <delete
-
dir="target/mms-standalone-pojo.dir/deploy/mgcp-controller-service.sar" />
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin -->
-
- </plugins>
- </build>
-
+ <!-- dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-aop-mc-int</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-asintegration-mc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-asintegration-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop-asintegration-jmx</artifactId>
+ </dependency -->
+ </dependencies>
+ <build>
+ <finalName>run</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>
+ src/main/assembly/pojo.xml
+ </descriptor>
+ </descriptors>
+ <finalName>${pom.artifactId}</finalName>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>directory-inline</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified:
trunk/servers/media/core/server-standalone/src/main/assembly/common.xml
==============================================================================
--- trunk/servers/media/core/server-standalone/src/main/assembly/common.xml
(original)
+++ trunk/servers/media/core/server-standalone/src/main/assembly/common.xml
Thu Mar 19 06:02:36 2009
@@ -1,5 +1,5 @@
<component>
- <fileSets>
+ <!-- fileSets>
<fileSet>
<directory>target</directory>
<outputDirectory />
@@ -7,20 +7,32 @@
<include>*.jar</include>
</includes>
</fileSet>
- </fileSets>
+ </fileSets -->
<files>
<file>
<source>src/main/config/run.sh</source>
<fileMode>0744</fileMode>
<filtered>true</filtered>
+ <destName>bin/run.sh</destName>
+ </file>
+ <file>
+ <source>src/main/config/run.bat</source>
+ <fileMode>0744</fileMode>
+ <filtered>true</filtered>
+ <destName>bin/run.bat</destName>
+ </file>
+ <file>
+ <source>target/run.jar</source>
+ <fileMode>0744</fileMode>
+ <filtered>true</filtered>
+ <destName>bin/run.jar</destName>
</file>
</files>
<dependencySets>
<dependencySet>
<outputDirectory>/lib</outputDirectory>
<unpack>false</unpack>
- <scope>runtime</scope>
-
+ <scope>runtime</scope>
</dependencySet>
</dependencySets>
</component>
Modified:
trunk/servers/media/core/server-standalone/src/main/assembly/pojo.xml
==============================================================================
--- trunk/servers/media/core/server-standalone/src/main/assembly/pojo.xml
(original)
+++ trunk/servers/media/core/server-standalone/src/main/assembly/pojo.xml
Thu Mar 19 06:02:36 2009
@@ -7,30 +7,20 @@
<files>
<file>
<source>src/main/config/bootstrap-beans.xml</source>
- <destName>bootstrap/bootstrap-beans.xml</destName>
+ <destName>conf/bootstrap-beans.xml</destName>
</file>
- <file>
+ <!-- file>
<source>src/main/config/aop-beans.xml</source>
- <destName>bootstrap/aop-beans.xml</destName>
- </file>
-
- <file>
- <source>src/main/config/system-jmx-beans.xml</source>
- <destName>bootstrap/system-jmx-beans.xml</destName>
- </file>
-
- <file>
- <source>src/main/config/mms-boot-beans.xml</source>
- <destName>deploy/mms-boot-beans.xml</destName>
- </file>
+ <destName>conf/aop-beans.xml</destName>
+ </file -->
<file>
<source>src/main/config/ann-beans.xml</source>
<destName>deploy/ann-beans.xml</destName>
</file>
- <file>
+ <!-- file>
<source>src/main/config/ivr-beans.xml</source>
<destName>deploy/ivr-beans.xml</destName>
</file>
@@ -48,7 +38,7 @@
<file>
<source>src/main/config/loop-beans.xml</source>
<destName>deploy/loop-beans.xml</destName>
- </file>
+ </file -->
</files>
<dependencySets>
Modified:
trunk/servers/media/core/server-standalone/src/main/config/ann-beans.xml
==============================================================================
---
trunk/servers/media/core/server-standalone/src/main/config/ann-beans.xml
(original)
+++
trunk/servers/media/core/server-standalone/src/main/config/ann-beans.xml
Thu Mar 19 06:02:36 2009
@@ -7,16 +7,8 @@
<!-- ANNOUNCEMENT -->
- <bean name="Mobicents.MMS.AnnTrunkManagementService"
-
class="org.mobicents.media.server.impl.jmx.enp.ann.AnnTrunkManagement">
-
<annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="media.mobicents:endpoint=announcement",exposedInterface=org.mobicents.media.server.impl.jmx.enp.ann.AnnTrunkManagementMBean.class,registerDirectly=true)</annotation>
- <property name="trunkName">media/trunk/Announcement</property>
- <property name="rtpFactory">
- <inject bean="RtpFactory" />
- </property>
- <property name="channels">24</property>
-
- <demand>RtpFactory</demand>
+ <bean name="Announcement"
+
class="org.mobicents.media.server.impl.enp.ann.AnnouncementEndpointImpl">
</bean>
</deployment>
Modified:
trunk/servers/media/core/server-standalone/src/main/config/bootstrap-beans.xml
==============================================================================
---
trunk/servers/media/core/server-standalone/src/main/config/bootstrap-beans.xml
(original)
+++
trunk/servers/media/core/server-standalone/src/main/config/bootstrap-beans.xml
Thu Mar 19 06:02:36 2009
@@ -1,166 +1,9 @@
<deployment xmlns="urn:jboss:bean-deployer:2.0">
- <!-- VFS -->
-
- <bean name="VFSCache">
- <constructor
factoryClass="org.jboss.virtual.spi.cache.VFSCacheFactory"
factoryMethod="getInstance">
- <!-- Use the CombinedVFSCache implementation -->
-
<parameter>org.jboss.virtual.plugins.cache.CombinedVFSCache</parameter>
- </constructor>
- <start ignored="true"/>
- <property name="permanentRoots">
- <map keyClass="java.net.URL"
valueClass="org.jboss.virtual.spi.ExceptionHandler">
- <entry>
- <key>${mms.home.dir}/deploy</key>
- <value><null/></value>
- </entry>
- </map>
- </property>
- <property name="realCache">
- <bean
class="org.jboss.virtual.plugins.cache.IterableTimedVFSCache"/>
- </property>
- </bean>
-
<!-- The MainDeployer -->
- <bean name="MainDeployer"
class="org.jboss.deployers.plugins.main.MainDeployerImpl">
- <property name="structuralDeployers"><inject
bean="StructuralDeployers"/></property>
- <property name="deployers"><inject bean="Deployers"/></property>
- <property name="mgtDeploymentCreator"><inject
bean="ManagedDeploymentCreator"/></property>
- </bean>
-
- <!-- The ManagedDeploymentCreator implementation -->
- <bean name="ManagedDeploymentCreator"
class="org.jboss.deployers.plugins.managed.DefaultManagedDeploymentCreator"
/>
-
- <!-- ModificationType structure processor -->
- <bean name="ModificationTypeStructureProcessor"
class="org.jboss.deployers.vfs.plugins.structure.modify.ModificationTypeStructureProcessor">
- <incallback method="addMatcher"/>
- <uncallback method="removeMatcher"/>
- </bean>
-
- <!-- The holder for deployers that determine structure -->
- <bean name="StructuralDeployers"
class="org.jboss.deployers.vfs.plugins.structure.VFSStructuralDeployersImpl">
- <property name="structureBuilder">
- <!-- The consolidator of the structure information -->
- <bean name="StructureBuilder"
class="org.jboss.deployers.vfs.plugins.structure.VFSStructureBuilder">
- <property name="structureProcessor"><inject
bean="ModificationTypeStructureProcessor"/></property>
- </bean>
- </property>
- <!-- Accept any implementor of structure deployer -->
- <incallback method="addDeployer"/>
- <uncallback method="removeDeployer"/>
- </bean>
-
- <!-- The holder for deployers that do real deployment -->
- <bean name="Deployers"
class="org.jboss.deployers.plugins.deployers.DeployersImpl">
- <constructor><parameter><inject
bean="jboss.kernel:service=KernelController"/></parameter></constructor>
- <!-- Accept any implementor of deployer -->
- <incallback method="addDeployer"/>
- <uncallback method="removeDeployer"/>
- </bean>
-
- <!-- A declared structure descriptor deployer -->
- <bean name="DeclaredStructure"
class="org.jboss.deployers.vfs.plugins.structure.explicit.DeclaredStructure"/>
-
- <!-- JAR Structure -->
- <bean name="JARStructure"
class="org.jboss.deployers.vfs.plugins.structure.jar.JARStructure">
- <property name="candidateStructureVisitorFactory">
- <!-- Any file that is not an ordinary directory is a candidate
-->
- <bean name="JARStructureCandidates"
class="org.jboss.deployers.vfs.spi.structure.helpers.DefaultCandidateStructureVisitorFactory">
- <!-- A filter to exclude some obvious non-subdeployments -->
- <property name="filter">
- <bean name="JARFilter"
class="org.jboss.virtual.plugins.vfs.helpers.SuffixesExcludeFilter">
- <constructor><parameter>
- <list elementClass="java.lang.String">
- <!-- Exclude class files as subdeployments -->
- <value>.class</value>
- </list>
- </parameter></constructor>
- </bean>
- </property>
- </bean>
- </property>
- </bean>
-
- <!-- File Structure -->
- <bean name="FileStructure"
class="org.jboss.deployers.vfs.plugins.structure.file.FileStructure">
- <!-- Unless specified the default list of suffixes is -service.xml,
-beans.xml, -aop.xml -->
- <constructor>
- <parameter>
- <set elementClass="java.lang.String">
- <value>-service.xml</value>
- <value>-beans.xml</value>
- <value>-aop.xml</value>
- </set>
- </parameter>
- </constructor>
- </bean>
-
- <!-- POJO Deployment -->
- <bean name="BeanDeployer"
class="org.jboss.deployers.vfs.deployer.kernel.BeanDeployer"/>
- <bean name="KernelDeploymentDeployer"
class="org.jboss.deployers.vfs.deployer.kernel.KernelDeploymentDeployer"/>
- <bean name="BeanMetaDataDeployer"
class="org.jboss.deployers.vfs.deployer.kernel.BeanMetaDataDeployer">
- <constructor><parameter class="org.jboss.kernel.Kernel"><inject
bean="jboss.kernel:service=Kernel"/></parameter></constructor>
- </bean>
-
- <!-- VFS ClassLoader -->
- <bean name="ClassLoaderSystem"
class="org.jboss.classloader.spi.ClassLoaderSystem">
- <constructor
factoryClass="org.jboss.classloader.spi.ClassLoaderSystem"
factoryMethod="getInstance"/>
- </bean>
- <bean name="ClassLoading"
class="org.jboss.classloading.spi.dependency.ClassLoading">
- <incallback method="addModule" state="Configured"/>
- <uncallback method="removeModule" state="Configured"/>
- </bean>
- <bean name="ClassLoadingMetaDataParser"
class="org.jboss.deployers.vfs.spi.deployer.SchemaResolverDeployer">
- <constructor>
-
<parameter>org.jboss.classloading.spi.metadata.ClassLoadingMetaData</parameter>
- </constructor>
- <property name="name">jboss-classloading.xml</property>
- <property name="buildManagedObject">true</property>
- </bean>
- <bean name="ClassLoadingDefaultDeployer"
class="org.jboss.deployers.plugins.classloading.ClassLoadingDefaultDeployer">
- <property name="defaultMetaData">
- <classloading xmlns="urn:jboss:classloading:1.0"
export-all="NON_EMPTY" import-all="true"/>
- </property>
- </bean>
- <bean name="ClassLoaderClassPathDeployer"
class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderClassPathDeployer"/>
- <bean name="ClassLoaderDescribeDeployer"
class="org.jboss.deployers.vfs.plugins.classloader.VFSClassLoaderDescribeDeployer">
- <property name="classLoading"><inject
bean="ClassLoading"/></property>
- </bean>
- <bean name="ClassLoaderDeployer"
class="org.jboss.deployers.plugins.classloading.AbstractLevelClassLoaderSystemDeployer">
- <property name="classLoading"><inject
bean="ClassLoading"/></property>
- <property name="system"><inject bean="ClassLoaderSystem"/></property>
+ <bean name="MainDeployer"
class="org.mobicents.media.server.bootstrap.MainDeployer">
+ <property name="path">${mms.home.dir}/deploy</property>
+ <property name="scanPeriod">1000</property>
</bean>
-
- <!-- The structure modification cache and checker -->
-
- <bean name="StructureModCache"
class="org.jboss.deployers.vfs.spi.structure.modified.TreeStructureCache">
- <destroy method="flush"/>
- </bean>
-
- <bean name="StructureModificationChecker"
class="org.jboss.deployers.vfs.spi.structure.modified.MetaDataStructureModificationChecker">
- <constructor>
- <parameter><inject bean="MainDeployer" /></parameter>
- </constructor>
- <property name="cache"><inject bean="StructureModCache" /></property>
- <property name="filter"><bean
class="org.jboss.system.server.profile.basic.XmlIncludeVirtualFileFilter"
/></property>
- </bean>
-
- <!-- HD scanner -->
-
- <bean name="MainDeployerHelper"
class="org.mobicents.media.server.bootstrap.MainDeployerHelper">
- <constructor>
- <parameter><inject bean="MainDeployer"/></parameter>
- </constructor>
- <property name="checker"><inject
bean="StructureModificationChecker"/></property>
- </bean>
-
- <bean name="HDScanner"
class="org.mobicents.media.server.bootstrap.HDScanner">
- <constructor>
- <parameter><inject bean="MainDeployerHelper"/></parameter>
- <parameter>${mms.home.dir}/deploy</parameter>
- </constructor>
- <property name="scanPeriod">10000</property>
- <property name="scanThreadName">HDScanner</property>
- </bean>
-
+
</deployment>
Added: trunk/servers/media/core/server-standalone/src/main/config/run.bat
==============================================================================
--- (empty file)
+++ trunk/servers/media/core/server-standalone/src/main/config/run.bat Thu
Mar 19 06:02:36 2009
@@ -0,0 +1,141 @@
+...@echo off
+rem
-------------------------------------------------------------------------
+rem Mobicents Media Server Bootstrap Script for Win32
+rem
-------------------------------------------------------------------------
+
+rem $Id: run.bat,v 1.5 2007/08/07 10:15:40 baranowb Exp $
+
+...@if not "%ECHO%" == "" echo %ECHO%
+...@if "%OS%" == "Windows_NT" setlocal
+
+set DIRNAME=.\
+if "%OS%" == "Windows_NT" set DIRNAME=%~dp0%
+set PROGNAME=run.bat
+if "%OS%" == "Windows_NT" set PROGNAME=%~nx0%
+
+pushd %DIRNAME%..
+set MMS_HOME=%CD%
+echo ========
+echo %MMS_HOME%
+
+popd
+
+REM Add bin/native to the PATH if present
+if exist "%MMS_HOME%\native" set PATH=%MMS_HOME%\native;%PATH%
+if exist "%MMS_HOME%\native" set JAVA_OPTS=%JAVA_OPTS%
-Djava.library.path="%PATH%"
+
+REM Run section - here we define node and default ip
+set IP=127.0.0.1
+
+rem Read all command line arguments
+
+REM
+REM The %ARGS% env variable commented out in favor of using %* to include
+REM all args in java command line. See bug #840239. [jpl]
+REM
+REM set ARGS=
+REM :loop
+REM if [%1] == [] goto endloop
+REM set ARGS=%ARGS% %1
+REM shift
+REM goto loop
+REM :endloop
+
+
+set ARGS=""
+
+
+:loop
+ if [%1] == [] goto endloop
+ set ARGS=%ARGS% %1
+ shift
+ goto loop
+ :endloop
+
+
+rem Find run.jar, or we can't continue
+
+set RUNJAR=%MMS_HOME%\bin\run.jar
+if exist "%RUNJAR%" goto FOUND_RUN_JAR
+echo Could not locate %RUNJAR%. Please check that you are in the
+echo bin directory when running this script.
+goto END
+
+:FOUND_RUN_JAR
+
+if not "%JAVA_HOME%" == "" goto ADD_TOOLS
+
+set JAVA=java
+
+echo JAVA_HOME is not set. Unexpected results may occur.
+echo Set JAVA_HOME to the directory of your local JDK to avoid this
message.
+goto SKIP_TOOLS
+
+:ADD_TOOLS
+
+set JAVA=%JAVA_HOME%\bin\java
+
+rem A full JDK with toos.jar is not required anymore since jboss web
packages
+rem the eclipse jdt compiler and javassist has its own internal compiler.
+if not exist "%JAVA_HOME%\lib\tools.jar" goto SKIP_TOOLS
+
+rem If exists, point to the JDK javac compiler in case the user wants to
+rem later override the eclipse jdt compiler for compiling JSP pages.
+set JAVAC_JAR=%JAVA_HOME%\lib\tools.jar
+
+:SKIP_TOOLS
+
+rem If JBOSS_CLASSPATH or JAVAC_JAR is empty, don't include it, as this
will
+rem result in including the local directory in the classpath, which makes
+rem error tracking harder.
+if not "%JAVAC_JAR%" == "" set RUNJAR=%JAVAC_JAR%;%RUNJAR%
+if "%MMS_CLASSPATH%" == "" set RUN_CLASSPATH=%RUNJAR%
+if "%RUN_CLASSPATH%" == "" set RUN_CLASSPATH=%MMS_CLASSPATH%;%RUNJAR%
+
+set MMS_CLASSPATH=%RUN_CLASSPATH%
+
+rem Setup JBoss specific properties
+set JAVA_OPTS=%JAVA_OPTS% -Dprogram.name=%PROGNAME%
+
+rem Add -server to the JVM options, if supported
+"%JAVA%" -version 2>&1 | findstr /I hotspot > nul
+if not errorlevel == 1 (set JAVA_OPTS=%JAVA_OPTS% -server)
+
+rem JVM memory allocation pool parameters. Modify as appropriate.
+set JAVA_OPTS=%JAVA_OPTS% -Xms128m -Xmx512m
+
+rem With Sun JVMs reduce the RMI GCs to once per hour
+set JAVA_OPTS=%JAVA_OPTS% -Dsun.rmi.dgc.client.gcInterval=3600000
-Dsun.rmi.dgc.server.gcInterval=3600000
+
+rem JPDA options. Uncomment and modify as appropriate to enable remote
debugging.
+rem set JAVA_OPTS=-Xdebug
-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y %JAVA_OPTS%
+
+rem Setup the java endorsed dirs
+set MMS_ENDORSED_DIRS=%MMS_HOME%\lib
+
+
+echo
===============================================================================
+echo.
+echo MMS Bootstrap Environment
+echo.
+echo MMS_HOME: %MMS_HOME%
+echo.
+echo JAVA: %JAVA%
+echo.
+echo JAVA_OPTS: %JAVA_OPTS%
+echo.
+echo CLASSPATH: %MMS_CLASSPATH%
+echo
+echo MMS_ENDORSED_DIRS: %MMS_ENDORSED_DIRS%
+echo.
+echo
===============================================================================
+echo.
+
+:RESTART
+"%JAVA%" %JAVA_OPTS% -Djava.ext.dirs="%MMS_ENDORSED_DIRS%"
-classpath "%MMS_CLASSPATH%" org.mobicents.media.server.bootstrap.Main
+rem if ERRORLEVEL 10 goto RESTART
+
+:END
+if "%NOPAUSE%" == "" pause
+
+:END_NO_PAUSE
Modified:
trunk/servers/media/core/server-standalone/src/main/resources/log4j.properties
==============================================================================
---
trunk/servers/media/core/server-standalone/src/main/resources/log4j.properties
(original)
+++
trunk/servers/media/core/server-standalone/src/main/resources/log4j.properties
Thu Mar 19 06:02:36 2009
@@ -1,7 +1,7 @@
log4j.rootLogger=INFO, stdout
-
+
log4j.appender.stdout=org.apache.log4j.ConsoleAppender
log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
# Pattern to output the caller's file name and line number.
-log4j.appender.stdout.layout.ConversionPattern=Client %5p [%d{dd-MM-yyyy
HH:mm:ss}] %c{1} - %m%n
+log4j.appender.stdout.layout.ConversionPattern=%5p [%d{dd-MM-yyyy
HH:mm:ss}] %c{1} - %m%n
