master moved from 7361763b9da3 to 7f0683b243c2
3 new revisions:
Revision: 6d9a51582898
Author: josemrecio <[email protected]>
Date: Tue Mar 26 11:33:42 2013 UTC
Log: Update Issue 203...
http://code.google.com/p/sipservlets/source/detail?r=6d9a51582898
Revision: b672e1fc7e33
Author: josemrecio <[email protected]>
Date: Mon Apr 8 08:44:13 2013 UTC
Log: Update Issue 203...
http://code.google.com/p/sipservlets/source/detail?r=b672e1fc7e33
Revision: 7f0683b243c2
Author: Jean Deruelle <[email protected]>
Date: Tue Jan 28 11:34:15 2014 UTC
Log: Update Issue 203...
http://code.google.com/p/sipservlets/source/detail?r=7f0683b243c2
==============================================================================
Revision: 6d9a51582898
Author: josemrecio <[email protected]>
Date: Tue Mar 26 11:33:42 2013 UTC
Log: Update Issue 203
Merging from issue-203 branch
Initial commit for Issue 203: Upgrade to jboss-as-7.2.0.Final
Tested with sample applications and examples.
Notes:
- when patches required (web, ee, standalone.sip) are different, a new file
has been created: patch.7.2.0.Final.jboss-as-ee.module.xml,
patch.7.2.0.Final.domain.sip.dropin.xml,
patch.7.2.0.Final.jboss-as-web.module.xml)
- patch for domain not generated
- folder org (in
containers/sip-servlets-as7-drop-in/build-mobicents-modules/src/main/resources/modules)
is no longer used, 7.2.0.Final uses instead
containers/sip-servlets-as7-drop-in/build-mobicents-modules/src/main/resources/modules/system
- added support for identity-assertion in sip.xml (to be committed to trunk
under separate issue)
(cherry picked from commit 567e84390c3ca531ca0565fa374dfa0984b7a9d4)
Conflicts:
containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/metadata/sip/parser/IdentityAssertionParser.java
http://code.google.com/p/sipservlets/source/detail?r=6d9a51582898
Added:
/containers/sip-servlets-as7-drop-in/build-mobicents-modules/src/main/resources/modules/system/layers/base/org/mobicents/as7/main/module.xml
/containers/sip-servlets-as7-drop-in/build-mobicents-modules/src/main/resources/modules/system/layers/base/org/mobicents/dar/main/module.xml
/containers/sip-servlets-as7-drop-in/build-mobicents-modules/src/main/resources/modules/system/layers/base/org/mobicents/javax/servlet/sip/main/module.xml
/containers/sip-servlets-as7-drop-in/build-mobicents-modules/src/main/resources/modules/system/layers/base/org/mobicents/libs/main/module.xml
/containers/sip-servlets-as7-drop-in/patches/patch.7.2.0.Final.domain.sip.dropin.xml
/containers/sip-servlets-as7-drop-in/patches/patch.7.2.0.Final.jboss-as-ee.module.xml
/containers/sip-servlets-as7-drop-in/patches/patch.7.2.0.Final.jboss-as-web.module.xml
/containers/sip-servlets-as7-drop-in/patches/patch.7.2.0.Final.standalone.sip.dropin.xml
Modified:
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/metadata/sip/parser/IdentityAssertionParser.java
=======================================
--- /dev/null
+++
/containers/sip-servlets-as7-drop-in/build-mobicents-modules/src/main/resources/modules/system/layers/base/org/mobicents/as7/main/module.xml
Tue Mar 26 11:33:42 2013 UTC
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2010, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<module xmlns="urn:jboss:module:1.1" name="org.mobicents.as7">
+ <properties>
+ <property name="jboss.api" value="private"/>
+ </properties>
+
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+
+ <dependencies>
+ <module name="org.jboss.as.controller"/>
+ <module name="org.jboss.staxmapper"/>
+ <module name="org.jboss.logging"/>
+ <module name="org.jboss.msc"/>
+ <module name="org.mobicents.libs"/>
+ <module name="javax.servlet.api"/>
+ <module name="org.mobicents.javax.servlet.sip"/>
+ <module name="org.mobicents.dar" services="import"/>
+ <module name="org.jboss.as.server"/>
+ <module name="org.jboss.as.web"/>
+ <module name="javax.api"/>
+ <module name="org.jboss.as.network"/>
+ <module name="org.jboss.metadata"/>
+ <module name="org.jboss.jandex"/>
+ <module name="org.jboss.as.ee"/>
+ <module name="org.jboss.vfs"/>
+ <module name="org.apache.log4j"/>
+ <module name="javax.annotation.api"/>
+ <module name="org.jboss.modules"/>
+ <module name="org.jboss.as.naming"/>
+ <!-- mock clustering -->
+ <module name="org.jboss.as.clustering.web.spi" optional="true"/>
+ <module name="org.jboss.as.clustering.registry" optional="true"/>
+ </dependencies>
+</module>
=======================================
--- /dev/null
+++
/containers/sip-servlets-as7-drop-in/build-mobicents-modules/src/main/resources/modules/system/layers/base/org/mobicents/dar/main/module.xml
Tue Mar 26 11:33:42 2013 UTC
@@ -0,0 +1,34 @@
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2010, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<module xmlns="urn:jboss:module:1.1" name="org.mobicents.dar">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+
+ <dependencies>
+ <module name="org.mobicents.javax.servlet.sip"/>
+ <module name="org.mobicents.libs"/>
+ <module name="org.apache.log4j"/>
+ </dependencies>
+
+</module>
=======================================
--- /dev/null
+++
/containers/sip-servlets-as7-drop-in/build-mobicents-modules/src/main/resources/modules/system/layers/base/org/mobicents/javax/servlet/sip/main/module.xml
Tue Mar 26 11:33:42 2013 UTC
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2010, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<module xmlns="urn:jboss:module:1.1"
name="org.mobicents.javax.servlet.sip">
+ <dependencies>
+ <module name="javax.servlet.api" export="true"/>
+ <module name="org.apache.log4j"/>
+ </dependencies>
+
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+</module>
=======================================
--- /dev/null
+++
/containers/sip-servlets-as7-drop-in/build-mobicents-modules/src/main/resources/modules/system/layers/base/org/mobicents/libs/main/module.xml
Tue Mar 26 11:33:42 2013 UTC
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ JBoss, Home of Professional Open Source.
+ ~ Copyright 2010, Red Hat, Inc., and individual contributors
+ ~ as indicated by the @author tags. See the copyright.txt file in the
+ ~ distribution for a full listing of individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ -->
+
+<module xmlns="urn:jboss:module:1.1" name="org.mobicents.libs">
+ <resources>
+ <!-- Insert resources here -->
+ </resources>
+
+ <dependencies>
+ <module name="org.apache.log4j"/>
+ <module name="javax.api"/>
+ <module name="javax.servlet.api"/>
+ <module name="org.mobicents.javax.servlet.sip"/>
+ <module name="org.jboss.logging"/>
+ <module name="javax.mail.api"/>
+ <module name="javax.activation.api"/>
+ <module name="org.jboss.as.web"/>
+ <!-- handling security -->
+ <module name="javax.security.auth.message.api"/>
+ <module name="org.jboss.as.security"/>
+ <module name="org.picketbox"/>
+ <module name="javax.security.jacc.api"/>
+ </dependencies>
+
+</module>
=======================================
--- /dev/null
+++
/containers/sip-servlets-as7-drop-in/patches/patch.7.2.0.Final.domain.sip.dropin.xml
Tue Mar 26 11:33:42 2013 UTC
@@ -0,0 +1,1 @@
+TODO !!!!
=======================================
--- /dev/null
+++
/containers/sip-servlets-as7-drop-in/patches/patch.7.2.0.Final.jboss-as-ee.module.xml
Tue Mar 26 11:33:42 2013 UTC
@@ -0,0 +1,12 @@
+--- modules/system/layers/base/org/jboss/as/ee/main/module.xml.original
2012-03-04 13:38:25.270750472 +0100
++++ modules/system/layers/base/org/jboss/as/ee/main/module.xml 2012-03-04
17:54:24.129663467 +0100
+@@ -50,6 +50,9 @@
+ <module name="org.jboss.logging"/>
+ <module name="org.jboss.metadata"/>
+ <module name="org.jboss.vfs"/>
++ <!-- MSS -->
++ <module name="org.mobicents.javax.servlet.sip" export="true"/>
++ <module name="org.mobicents.libs"/>
+
+ </dependencies>
+ </module>
=======================================
--- /dev/null
+++
/containers/sip-servlets-as7-drop-in/patches/patch.7.2.0.Final.jboss-as-web.module.xml
Tue Mar 26 11:33:42 2013 UTC
@@ -0,0 +1,12 @@
+--- modules/system/layers/base/org/jboss/as/web/main/module.xml.original
2013-03-14 11:56:51.000000000 +0100
++++ modules/system/layers/base/org/jboss/as/web/main/module.xml 2013-03-14
17:47:55.441113046 +0100
+@@ -64,5 +64,9 @@
+ <module name="org.jboss.common-core"/>
+ <module name="org.picketbox"/>
+ <module name="javax.security.jacc.api"/>
++ <!-- MSS -->
++ <module name="org.mobicents.javax.servlet.sip" export="true"/>
++ <module name="org.mobicents.dar" export="true"/>
++ <module name="org.mobicents.libs"/>
+ </dependencies>
+ </module>
=======================================
--- /dev/null
+++
/containers/sip-servlets-as7-drop-in/patches/patch.7.2.0.Final.standalone.sip.dropin.xml
Tue Mar 26 11:33:42 2013 UTC
@@ -0,0 +1,55 @@
+--- standalone/configuration/standalone-sip.xml 2013-03-14
11:56:48.000000000 +0100
++++ standalone/configuration/standalone-sip.xml 2013-03-14
13:10:14.017295558 +0100
+@@ -24,6 +24,7 @@
+ <extension module="org.jboss.as.web"/>
+ <extension module="org.jboss.as.webservices"/>
+ <extension module="org.jboss.as.weld"/>
++ <extension module="org.mobicents.as7"/>
+ </extensions>
+ <management>
+ <security-realms>
+@@ -242,6 +243,20 @@
+ <policy-module code="Delegating" flag="required"/>
+ </authorization>
+ </security-domain>
++ <security-domain name="sip-servlets">
++ <authentication>
++ <login-module code="UsersRoles" flag="required">
++ <module-option name="usersProperties"
value="${jboss.server.config.dir}/sip-servlets-users.properties"/>
++ <module-option name="rolesProperties"
value="${jboss.server.config.dir}/sip-servlets-roles.properties"/>
++ <module-option name="hashAlgorithm"
value="MD5"/>
++ <module-option name="hashEncoding"
value="RFC2617"/>
++ <module-option name="hashUserPassword"
value="false"/>
++ <module-option name="hashStorePassword"
value="true"/>
++ <module-option name="passwordIsA1Hash"
value="true"/>
++ <module-option name="storeDigestCallback"
value="org.jboss.security.auth.callback.RFC2617Digest"/>
++ </login-module>
++ </authentication>
++ </security-domain>
+ </security-domains>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:threads:1.1"/>
+@@ -273,6 +288,12 @@
+ <client-config name="Standard-Client-Config"/>
+ </subsystem>
+ <subsystem xmlns="urn:jboss:domain:weld:1.0"/>
++ <subsystem xmlns="urn:org.mobicents:sip-servlets-as7:1.0"
application-router="configuration/dars/mobicents-dar.properties"
stack-properties="configuration/mss-sip-stack.properties"
path-name="org.mobicents.ext"
app-dispatcher-class="org.mobicents.servlet.sip.core.SipApplicationDispatcherImpl"
concurrency-control-mode="SipApplicationSession"
congestion-control-interval="-1">
++ <connector name="sip-udp" protocol="SIP/2.0" scheme="sip"
socket-binding="sip-udp"/>
++ <connector name="sip-tcp" protocol="SIP/2.0" scheme="sip"
socket-binding="sip-tcp"/>
++ <connector name="sip-tls" protocol="SIP/2.0" scheme="sip"
socket-binding="sip-tls"/>
++ <connector name="sip-ws" protocol="SIP/2.0" scheme="sip"
socket-binding="sip-ws"/>
++ </subsystem>
+ </profile>
+ <interfaces>
+ <interface name="management">
+@@ -297,6 +318,10 @@
+ <socket-binding name="ajp" port="8009"/>
+ <socket-binding name="http" port="8080"/>
+ <socket-binding name="https" port="8443"/>
++ <socket-binding name="sip-udp" port="5080"/>
++ <socket-binding name="sip-tcp" port="5080"/>
++ <socket-binding name="sip-tls" port="5081"/>
++ <socket-binding name="sip-ws" port="5082"/>
+ <socket-binding name="remoting" port="4447"/>
+ <socket-binding name="txn-recovery-environment" port="4712"/>
+ <socket-binding name="txn-status-manager" port="4713"/>
=======================================
---
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/metadata/sip/parser/IdentityAssertionParser.java
Mon Apr 8 10:05:58 2013 UTC
+++
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/metadata/sip/parser/IdentityAssertionParser.java
Tue Mar 26 11:33:42 2013 UTC
@@ -35,7 +35,11 @@
public class IdentityAssertionParser extends MetaDataElementParser {
public static IdentityAssertionMetaData parse(XMLStreamReader reader)
throws XMLStreamException {
+<<<<<<< HEAD
IdentityAssertionMetaData idAssertionConfig = new
IdentityAssertionMetaData();
+=======
+ IdentityAssertionMetaData idAssertionConfig = new
IdentityAssertionMetaData();
+>>>>>>> 567e843... Initial commit for Issue 203: Upgrade to
jboss-as-7.2.0.Final
// Handle attributes
final int count = reader.getAttributeCount();
@@ -47,7 +51,11 @@
final Attribute attribute =
Attribute.forName(reader.getAttributeLocalName(i));
switch (attribute) {
case ID: {
+<<<<<<< HEAD
idAssertionConfig.setId(value);
+=======
+ idAssertionConfig.setId(value);
+>>>>>>> 567e843... Initial commit for Issue 203: Upgrade to
jboss-as-7.2.0.Final
break;
}
default:
@@ -60,11 +68,19 @@
final Element element = Element.forName(reader.getLocalName());
switch (element) {
case IDENTITY_ASSERTION_SCHEME:
+<<<<<<< HEAD
idAssertionConfig.setIdentityAssertionScheme(getElementText(reader));
break;
case IDENTITY_ASSERTION_SUPPORT:
idAssertionConfig.setIdentityAssertionSupport(getElementText(reader));
break;
+=======
+
idAssertionConfig.setIdentityAssertionScheme(getElementText(reader));
+ break;
+ case IDENTITY_ASSERTION_SUPPORT:
+
idAssertionConfig.setIdentityAssertionSupport(getElementText(reader));
+ break;
+>>>>>>> 567e843... Initial commit for Issue 203: Upgrade to
jboss-as-7.2.0.Final
default:
throw unexpectedElement(reader);
}
==============================================================================
Revision: b672e1fc7e33
Author: josemrecio <[email protected]>
Date: Mon Apr 8 08:44:13 2013 UTC
Log: Update Issue 203
backport from issue-203
Initial commit was incomplete. This completes all changes.
(cherry picked from commit 99a569e730f2ecbddc9554da04cc524cbc70242f)
Conflicts:
containers/sip-servlets-as7-drop-in/build-mobicents-modules/pom.xml
containers/sip-servlets-as7-drop-in/jboss-as-mobicents/pom.xml
containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/metadata/sip/parser/SipLoginConfigMetaDataParser.java
containers/sip-servlets-as7/pom.xml
http://code.google.com/p/sipservlets/source/detail?r=b672e1fc7e33
Modified:
/containers/sip-servlets-as7-drop-in/build-mobicents-modules/lib.xml
/containers/sip-servlets-as7-drop-in/build-mobicents-modules/pom.xml
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/pom.xml
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/clustering/sip/MockDistributedCacheManager.java
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/deployment/SIPWebContext.java
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/metadata/sip/parser/SipLoginConfigMetaDataParser.java
/containers/sip-servlets-as7/pom.xml
/containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/catalina/SARDirContext.java
/containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/catalina/security/authentication/AuthenticatorBase.java
/containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java
/containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContextValve.java
/pom.xml
=======================================
--- /containers/sip-servlets-as7-drop-in/build-mobicents-modules/lib.xml
Tue Mar 27 15:02:55 2012 UTC
+++ /containers/sip-servlets-as7-drop-in/build-mobicents-modules/lib.xml
Mon Apr 8 08:44:13 2013 UTC
@@ -23,12 +23,12 @@
<project name="module-repository-lib"
xmlns:artifact="antlib:org.apache.maven.artifact.ant">
<property name="src.dir" value="src"/>
- <property name="module.repo.src.dir"
value="${src.dir}/main/resources/modules"/>
+ <property name="module.repo.src.dir"
value="${src.dir}/main/resources/modules/system/layers/base"/>
<property name="output.dir"
value="target/jboss-as-${jboss.as.release.version}"/>
- <property name="module.repo.output.dir" value="${output.dir}/modules"/>
+ <property name="module.repo.output.dir"
value="${output.dir}/modules/system/layers/base"/>
<property name="module.xml" value="module.xml"/>
- <property name="bundle.repo.output.dir" value="${output.dir}/bundles"/>
+ <property name="bundle.repo.output.dir"
value="${output.dir}/bundles/system/layers/base"/>
<taskdef name="jandex" classname="org.jboss.jandex.JandexAntTask" />
@@ -99,7 +99,7 @@
</copy>
</sequential>
</macrodef>
-
+
<scriptdef name="define-module-dir" language="javascript">
<attribute name="name"/>
<attribute name="slot"/>
@@ -119,7 +119,7 @@
project.setProperty("current.bundle.path", name + "/" +
attributes.get("slot"));
]]>
</scriptdef>
-
+
<macrodef name="maven-resource" >
<attribute name="group"/>
<attribute name="artifact"/>
=======================================
--- /containers/sip-servlets-as7-drop-in/build-mobicents-modules/pom.xml
Fri Jul 19 13:52:13 2013 UTC
+++ /containers/sip-servlets-as7-drop-in/build-mobicents-modules/pom.xml
Mon Apr 8 08:44:13 2013 UTC
@@ -38,7 +38,6 @@
<name>JBoss Application Server: Build Mobicents Add-on Modules</name>
<description>>JBoss Application Server: Build Mobicents Add-on
Modules</description>
<packaging>pom</packaging>
-
<properties>
<!-- generated configs root dirs -->
<generated.configs>${basedir}/target/generated-configs</generated.configs>
@@ -47,7 +46,7 @@
<generated.configs.examples>${generated.configs}/docs/examples/configs</generated.configs.examples>
<generated.configs.src.dir>${basedir}/src/main/resources</generated.configs.src.dir>
<!-- MSS -->
- <jboss.as.release.version>7.1.3.Final</jboss.as.release.version>
+ <jboss.as.release.version>7.2.0.Final</jboss.as.release.version>
<junit.version>4.10</junit.version>
<version.org.jboss.jandex>1.0.3.Final</version.org.jboss.jandex>
<version.rhino.js>1.7R2</version.rhino.js>
=======================================
--- /containers/sip-servlets-as7-drop-in/jboss-as-mobicents/pom.xml Fri Jul
19 13:52:13 2013 UTC
+++ /containers/sip-servlets-as7-drop-in/jboss-as-mobicents/pom.xml Mon
Apr 8 08:44:13 2013 UTC
@@ -83,7 +83,7 @@
<dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-web</artifactId>
- <version>7.1.3.Final</version>
+ <version>7.2.0.Final</version>
</dependency>
<dependency>
@@ -96,7 +96,7 @@
<dependency>
<groupId>org.jboss.web</groupId>
<artifactId>jbossweb</artifactId>
- <version>7.0.17.Final</version>
+ <version>7.2.0.Final</version>
</dependency>
<dependency>
@@ -205,7 +205,7 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
- <version>1.4.4</version>
+ <version>1.4.6</version>
<scope>provided</scope>
</dependency>
@@ -213,7 +213,7 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <scope>provided</scope>
+ <scope>provided</scope>
</dependency>
</dependencies>
=======================================
---
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/clustering/sip/MockDistributedCacheManager.java
Fri Aug 10 16:37:28 2012 UTC
+++
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/clustering/sip/MockDistributedCacheManager.java
Mon Apr 8 08:44:13 2013 UTC
@@ -180,5 +180,11 @@
}
}
+
+ @Override
+ public boolean isPersistenceEnabled() {
+ // TODO Auto-generated method stub
+ return false;
+ }
}
=======================================
---
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/deployment/SIPWebContext.java
Fri Sep 28 21:18:29 2012 UTC
+++
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/deployment/SIPWebContext.java
Mon Apr 8 08:44:13 2013 UTC
@@ -107,8 +107,8 @@
@Override
public void start() throws LifecycleException {
- if(log.isDebugEnabled()) {
- log.debugf("Starting sip web context for deployment %s",
deploymentUnit.getName());
+ if(logger.isDebugEnabled()) {
+ logger.debugf("Starting sip web context for deployment %s",
deploymentUnit.getName());
}
SipMetaData sipMetaData =
deploymentUnit.getAttachment(SipMetaData.ATTACHMENT_KEY);
SipAnnotationMetaData sipAnnotationMetaData =
deploymentUnit.getAttachment(SipAnnotationMetaData.ATTACHMENT_KEY);
@@ -116,17 +116,17 @@
JBossWebMetaData mergedMetaData = null;
mergedMetaData = new JBossConvergedSipMetaData();
final WarMetaData warMetaData =
deploymentUnit.getAttachment(WarMetaData.ATTACHMENT_KEY);
- final JBossWebMetaData override =
warMetaData.getJbossWebMetaData();
+ final JBossWebMetaData override =
warMetaData.getJBossWebMetaData();
final WebMetaData original = null;
JBossWebMetaDataMerger.merge(mergedMetaData, override, original);
- if(log.isDebugEnabled()) {
- log.debugf("security domain " + mergedMetaData.getSecurityDomain()
+ " for deployment %s", deploymentUnit.getName());
+ if(logger.isDebugEnabled()) {
+ logger.debugf("security domain " +
mergedMetaData.getSecurityDomain() + " for deployment %s",
deploymentUnit.getName());
}
if(sipMetaData == null && sipAnnotationMetaData != null &&
sipAnnotationMetaData.isSipApplicationAnnotationPresent()) {
// http://code.google.com/p/sipservlets/issues/detail?id=168
// When no sip.xml but annotations only, Application is not
recognized as SIP App by AS7
- log.debugf("sip meta data is null, creating a new one");
+ logger.debugf("sip meta data is null, creating a new one");
sipMetaData = new Sip11MetaData();
}
augmentAnnotations(mergedMetaData, sipMetaData,
sipAnnotationMetaData);
=======================================
---
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/metadata/sip/parser/SipLoginConfigMetaDataParser.java
Mon Apr 8 10:07:28 2013 UTC
+++
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/metadata/sip/parser/SipLoginConfigMetaDataParser.java
Mon Apr 8 08:44:13 2013 UTC
@@ -1,23 +1,20 @@
/*
- * TeleStax, Open Source Cloud Communications Copyright 2012.
- * and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * TeleStax, Open Source Cloud Communications
+ * Copyright 2011-2013, Telestax Inc and individual contributors
+ * by the @authors tag.
*
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
+ * This program is free software: you can redistribute it and/or modify
+ * under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation; either version 3 of
* the License, or (at your option) any later version.
*
- * This software is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
*
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
*/
package org.mobicents.metadata.sip.parser;
=======================================
--- /containers/sip-servlets-as7/pom.xml Fri Jul 19 13:52:13 2013 UTC
+++ /containers/sip-servlets-as7/pom.xml Mon Apr 8 08:44:13 2013 UTC
@@ -21,13 +21,13 @@
<dependency>
<groupId>org.jboss.web</groupId>
<artifactId>jbossweb</artifactId>
- <version>7.0.17.Final</version>
+ <version>7.2.0.Final</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-web</artifactId>
- <version>7.1.3.Final</version>
+ <version>7.2.0.Final</version>
<scope>provided</scope>
</dependency>
<!--dependency>
=======================================
---
/containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/catalina/SARDirContext.java
Tue Mar 27 15:02:55 2012 UTC
+++
/containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/catalina/SARDirContext.java
Mon Apr 8 08:44:13 2013 UTC
@@ -22,6 +22,8 @@
package org.mobicents.servlet.sip.catalina;
+import static org.jboss.web.NamingMessages.MESSAGES;
+
import java.io.File;
import java.util.Hashtable;
import java.util.zip.ZipFile;
@@ -31,6 +33,7 @@
* SAR Directory Context implementation.
* It extends the Tomcat WARDirContext since it can contains converged apps
* @author Jean Deruelle
+ * @author [email protected]
*/
public class SARDirContext extends WARDirContext {
@@ -60,23 +63,20 @@
public void setDocBase(String docBase) {
// Validate the format of the proposed document root
if (docBase == null)
- throw new
IllegalArgumentException(sm.getString("resources.null"));
+ throw MESSAGES.invalidNullDocumentBase();
if (!(docBase.endsWith(".sar")))
- throw new IllegalArgumentException(sm
- .getString("warResources.notWar"));
+ throw MESSAGES.docBaseNotWar(docBase);
// Calculate a File object referencing this document base
directory
File base = new File(docBase);
// Validate that the document base is an existing directory
if (!base.exists() || !base.canRead() || base.isDirectory())
- throw new IllegalArgumentException(sm.getString(
- "warResources.invalidWar", docBase));
+ throw MESSAGES.docBaseNotWar(docBase);
try {
this.base = new ZipFile(base);
} catch (Exception e) {
- throw new IllegalArgumentException(sm.getString(
- "warResources.invalidWar",
e.getMessage()));
+ throw MESSAGES.failedOpeningWar(e.getMessage());
}
// Change the document root property
this.docBase = docBase;
=======================================
---
/containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/catalina/security/authentication/AuthenticatorBase.java
Fri Sep 7 08:52:23 2012 UTC
+++
/containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/catalina/security/authentication/AuthenticatorBase.java
Mon Apr 8 08:44:13 2013 UTC
@@ -29,9 +29,7 @@
import org.apache.catalina.Authenticator;
import org.apache.catalina.Context;
-import org.apache.catalina.authenticator.Constants;
import org.apache.log4j.Logger;
-import org.apache.naming.StringManager;
import org.mobicents.servlet.sip.core.message.MobicentsSipServletRequest;
import org.mobicents.servlet.sip.core.message.MobicentsSipServletResponse;
import org.mobicents.servlet.sip.core.security.MobicentsSipLoginConfig;
@@ -117,10 +115,10 @@
/**
- * The string manager for this package.
+ * The string manager for this package (not supported in AS-7.2.0)
*/
- protected static final StringManager STRING_MANAGER =
- StringManager.getManager(Constants.Package);
+// protected static final StringManager STRING_MANAGER =
+// StringManager.getManager(Constants.Package);
=======================================
---
/containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java
Tue Sep 18 20:04:50 2012 UTC
+++
/containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContext.java
Mon Apr 8 08:44:13 2013 UTC
@@ -22,6 +22,8 @@
package org.mobicents.servlet.sip.startup;
+import static org.jboss.web.CatalinaMessages.MESSAGES;
+
import java.io.File;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -431,9 +433,11 @@
fireContainerEvent("afterContextInitialized",
servletContextListener);
} catch (Throwable t) {
fireContainerEvent("afterContextInitialized",
servletContextListener);
+// getLogger().error
+// (sm.getString("standardContext.listenerStart",
+// servletContextListener.getClass().getName()),
t);
getLogger().error
- (sm.getString("standardContext.listenerStart",
-
servletContextListener.getClass().getName()), t);
+
(MESSAGES.errorSendingContextInitializedEvent(servletContextListener.getClass().getName()),
t);
ok = false;
}
@@ -478,9 +482,11 @@
fireContainerEvent("afterContextDestroyed",
servletContextListener);
} catch (Throwable t) {
fireContainerEvent("afterContextDestroyed",
servletContextListener);
+// getLogger().error
+// (sm.getString("standardContext.listenerStop",
+// servletContextListener.getClass().getName()),
t);
getLogger().error
- (sm.getString("standardContext.listenerStop",
-
servletContextListener.getClass().getName()), t);
+
(MESSAGES.errorSendingContextDestroyedEvent(servletContextListener.getClass().getName()),
t);
ok = false;
}
=======================================
---
/containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContextValve.java
Tue Mar 27 15:02:55 2012 UTC
+++
/containers/sip-servlets-as7/src/main/java/org/mobicents/servlet/sip/startup/SipStandardContextValve.java
Mon Apr 8 08:44:13 2013 UTC
@@ -22,6 +22,8 @@
package org.mobicents.servlet.sip.startup;
+import static org.jboss.web.CatalinaMessages.MESSAGES;
+
import java.io.IOException;
import java.text.ParseException;
@@ -40,7 +42,7 @@
import org.apache.catalina.connector.Response;
import org.apache.catalina.core.Constants;
import org.apache.catalina.core.StandardContext;
-import org.apache.catalina.util.StringManager;
+//import org.apache.catalina.util.StringManager;
import org.apache.log4j.Logger;
import org.apache.tomcat.util.buf.MessageBytes;
import org.jboss.servlet.http.HttpEvent;
@@ -78,10 +80,10 @@
/**
- * The string manager for this package.
+ * The string manager for this package (not supported in AS-7.2.0)
*/
- private static final StringManager sm =
- StringManager.getManager(Constants.Package);
+// private static final StringManager sm =
+// StringManager.getManager(Constants.Package);
private static transient final Logger logger =
Logger.getLogger(SipStandardContextValve.class);
@@ -197,8 +199,7 @@
try {
listener.requestInitialized(event);
} catch (Throwable t) {
-
container.getLogger().error(sm.getString("standardContext.requestListener.requestInit",
- instances[i].getClass().getName()),
t);
+
container.getLogger().error(MESSAGES.requestListenerInitException(instances[i].getClass().getName()),
t);
ServletRequest sreq = request.getRequest();
sreq.setAttribute(RequestDispatcher.ERROR_EXCEPTION,t);
return;
@@ -273,8 +274,7 @@
try {
listener.requestDestroyed(event);
} catch (Throwable t) {
-
container.getLogger().error(sm.getString("standardContext.requestListener.requestDestroy",
- instances[i].getClass().getName()),
t);
+
container.getLogger().error(MESSAGES.requestListenerDestroyException(instances[i].getClass().getName()),
t);
ServletRequest sreq = request.getRequest();
sreq.setAttribute(RequestDispatcher.ERROR_EXCEPTION,t);
}
=======================================
--- /pom.xml Fri Nov 8 13:52:28 2013 UTC
+++ /pom.xml Mon Apr 8 08:44:13 2013 UTC
@@ -341,6 +341,7 @@
</modules>
<properties>
<version.org.jboss.spec.javax.servlet.jboss-servlet-api_3.0_spec>1.0.0.Final</version.org.jboss.spec.javax.servlet.jboss-servlet-api_3.0_spec>
+ <log4j.version>1.2.16</log4j.version>
</properties>
<dependencies>
<!-- j2ee dependencies -->
==============================================================================
Revision: 7f0683b243c2
Author: Jean Deruelle <[email protected]>
Date: Tue Jan 28 11:34:15 2014 UTC
Log: Update Issue 203
Fix bad merge
http://code.google.com/p/sipservlets/source/detail?r=7f0683b243c2
Modified:
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/metadata/sip/parser/IdentityAssertionParser.java
=======================================
---
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/metadata/sip/parser/IdentityAssertionParser.java
Tue Mar 26 11:33:42 2013 UTC
+++
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/metadata/sip/parser/IdentityAssertionParser.java
Tue Jan 28 11:34:15 2014 UTC
@@ -1,23 +1,20 @@
/*
- * TeleStax, Open Source Cloud Communications Copyright 2012.
- * and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
+ * TeleStax, Open Source Cloud Communications
+ * Copyright 2011-2013, Telestax Inc and individual contributors
+ * by the @authors tag.
*
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
+ * This program is free software: you can redistribute it and/or modify
+ * under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation; either version 3 of
* the License, or (at your option) any later version.
*
- * This software is distributed in the hope that it will be useful,
+ * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
*
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
*/
package org.mobicents.metadata.sip.parser;
@@ -35,11 +32,7 @@
public class IdentityAssertionParser extends MetaDataElementParser {
public static IdentityAssertionMetaData parse(XMLStreamReader reader)
throws XMLStreamException {
-<<<<<<< HEAD
IdentityAssertionMetaData idAssertionConfig = new
IdentityAssertionMetaData();
-=======
- IdentityAssertionMetaData idAssertionConfig = new
IdentityAssertionMetaData();
->>>>>>> 567e843... Initial commit for Issue 203: Upgrade to
jboss-as-7.2.0.Final
// Handle attributes
final int count = reader.getAttributeCount();
@@ -51,11 +44,7 @@
final Attribute attribute =
Attribute.forName(reader.getAttributeLocalName(i));
switch (attribute) {
case ID: {
-<<<<<<< HEAD
idAssertionConfig.setId(value);
-=======
- idAssertionConfig.setId(value);
->>>>>>> 567e843... Initial commit for Issue 203: Upgrade to
jboss-as-7.2.0.Final
break;
}
default:
@@ -68,19 +57,11 @@
final Element element = Element.forName(reader.getLocalName());
switch (element) {
case IDENTITY_ASSERTION_SCHEME:
-<<<<<<< HEAD
idAssertionConfig.setIdentityAssertionScheme(getElementText(reader));
break;
case IDENTITY_ASSERTION_SUPPORT:
idAssertionConfig.setIdentityAssertionSupport(getElementText(reader));
break;
-=======
-
idAssertionConfig.setIdentityAssertionScheme(getElementText(reader));
- break;
- case IDENTITY_ASSERTION_SUPPORT:
-
idAssertionConfig.setIdentityAssertionSupport(getElementText(reader));
- break;
->>>>>>> 567e843... Initial commit for Issue 203: Upgrade to
jboss-as-7.2.0.Final
default:
throw unexpectedElement(reader);
}
--
---
You received this message because you are subscribed to the Google Groups "mobicents-commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.