Revision: 062b37a14394
Author: josemrecio <[email protected]>
Date: Sun Jul 8 04:04:59 2012
Log: Initial changes for issue 101: sip-servlets modules compile and
run under 7.1.2.Final
Pending for a complete migration:
- refactoring to follow 7.1.2.Final web subsystem ways and means
http://code.google.com/p/sipservlets/source/detail?r=062b37a14394
Modified:
/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/SipCommonMetaDataParser.java
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/metadata/sip/parser/SipSecurityConstraintMetaDataParser.java
/containers/sip-servlets-as7-drop-in/patches/patch.standalone.sip.dropin.xml
/containers/sip-servlets-as7/pom.xml
=======================================
--- /containers/sip-servlets-as7-drop-in/build-mobicents-modules/pom.xml
Sat Apr 14 08:54:05 2012
+++ /containers/sip-servlets-as7-drop-in/build-mobicents-modules/pom.xml
Sun Jul 8 04:04:59 2012
@@ -47,8 +47,8 @@
<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.1.Final</jboss.as.release.version>
- <junit.version>4.1</junit.version>
+ <jboss.as.release.version>7.1.2.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>
<version.org.apache.ant>1.8.2</version.org.apache.ant>
=======================================
--- /containers/sip-servlets-as7-drop-in/jboss-as-mobicents/pom.xml Fri Apr
20 03:02:24 2012
+++ /containers/sip-servlets-as7-drop-in/jboss-as-mobicents/pom.xml Sun
Jul 8 04:04:59 2012
@@ -83,7 +83,7 @@
<dependency>
<groupId>org.jboss.as</groupId>
<artifactId>jboss-as-web</artifactId>
- <version>7.1.1.Final</version>
+ <version>7.1.2.Final</version>
</dependency>
<dependency>
@@ -95,7 +95,7 @@
<dependency>
<groupId>org.jboss.web</groupId>
<artifactId>jbossweb</artifactId>
- <version>7.0.10.Final</version>
+ <version>7.0.16.Final</version>
</dependency>
<dependency>
@@ -204,7 +204,7 @@
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
- <version>1.4</version>
+ <version>1.4.4</version>
<scope>provided</scope>
</dependency>
=======================================
---
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/metadata/sip/parser/SipCommonMetaDataParser.java
Tue Mar 27 08:02:55 2012
+++
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/metadata/sip/parser/SipCommonMetaDataParser.java
Sun Jul 8 04:04:59 2012
@@ -39,6 +39,7 @@
import org.jboss.metadata.parser.servlet.ServletMetaDataParser;
import org.jboss.metadata.parser.servlet.SessionConfigMetaDataParser;
import org.jboss.metadata.parser.util.MetaDataElementParser;
+import org.jboss.metadata.property.PropertyReplacers;
import org.jboss.metadata.web.spec.ListenerMetaData;
import org.mobicents.metadata.sip.spec.Element;
import org.mobicents.metadata.sip.spec.SipMetaData;
@@ -84,7 +85,8 @@
listeners = new ArrayList<ListenerMetaData>();
smd.setListeners(listeners);
}
- listeners.add(ListenerMetaDataParser.parse(reader));
+ // FIXME: 7.1.2.Final - setup proper ProperlyReplacer
+ listeners.add(ListenerMetaDataParser.parse(reader,
PropertyReplacers.noop()));
break;
case SERVLET_SELECTION:
smd.setServletSelection(SipServletSelectionMetaDataParser.parse(reader));
@@ -95,7 +97,8 @@
servlets = new SipServletsMetaData();
smd.setSipServlets(servlets);
}
- servlets.add(ServletMetaDataParser.parse(reader));
+ // FIXME: 7.1.2.Final - setup proper ProperlyReplacer
+ servlets.add(ServletMetaDataParser.parse(reader,
PropertyReplacers.noop()));
break;
case PROXY_CONFIG:
smd.setProxyConfig(ProxyConfigMetaDataParser.parse(reader));
@@ -103,7 +106,8 @@
case SESSION_CONFIG:
if (smd.getSessionConfig() != null)
throw new XMLStreamException("Multiple session-config
elements detected", reader.getLocation());
-
smd.setSessionConfig(SessionConfigMetaDataParser.parse(reader));
+ // FIXME: 7.1.2.Final - setup proper ProperlyReplacer
+
smd.setSessionConfig(SessionConfigMetaDataParser.parse(reader,
PropertyReplacers.noop()));
break;
case SECURITY_CONSTRAINT:
List<SipSecurityConstraintMetaData> sipSecurityConstraints
= smd.getSipSecurityConstraints();
@@ -133,10 +137,12 @@
messageDestinations = new
MessageDestinationsMetaData();
smd.setMessageDestinations(messageDestinations);
}
-
messageDestinations.add(MessageDestinationMetaDataParser.parse(reader));
+ // FIXME: 7.1.2.Final - setup proper ProperlyReplacer
+
messageDestinations.add(MessageDestinationMetaDataParser.parse(reader,
PropertyReplacers.noop()));
break;
case LOCALE_ENCODING_MAPPING_LIST:
-
smd.setLocalEncodings(LocaleEncodingsMetaDataParser.parse(reader));
+ // FIXME: 7.1.2.Final - setup proper ProperlyReplacer
+
smd.setLocalEncodings(LocaleEncodingsMetaDataParser.parse(reader,
PropertyReplacers.noop()));
break;
default:
return false;
=======================================
---
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/metadata/sip/parser/SipSecurityConstraintMetaDataParser.java
Tue Mar 27 08:02:55 2012
+++
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/metadata/sip/parser/SipSecurityConstraintMetaDataParser.java
Sun Jul 8 04:04:59 2012
@@ -28,6 +28,7 @@
import org.jboss.metadata.parser.servlet.AuthConstraintMetaDataParser;
import org.jboss.metadata.parser.servlet.UserDataConstraintMetaDataParser;
import org.jboss.metadata.parser.util.MetaDataElementParser;
+import org.jboss.metadata.property.PropertyReplacers;
import org.mobicents.metadata.sip.spec.Attribute;
import org.mobicents.metadata.sip.spec.Element;
import org.mobicents.metadata.sip.spec.SipResourceCollectionsMetaData;
@@ -77,10 +78,12 @@
sipSecurityConstraint.setProxyAuthentication(EmptyMetaDataParser.parse(reader));
break;
case AUTH_CONSTRAINT:
-
sipSecurityConstraint.setAuthConstraint(AuthConstraintMetaDataParser.parse(reader));
+ // FIXME: 7.1.2.Final - setup proper ProperlyReplacer
+
sipSecurityConstraint.setAuthConstraint(AuthConstraintMetaDataParser.parse(reader,
PropertyReplacers.noop()));
break;
case USER_DATA_CONSTRAINT:
-
sipSecurityConstraint.setUserDataConstraint(UserDataConstraintMetaDataParser.parse(reader));
+ // FIXME: 7.1.2.Final - setup proper ProperlyReplacer
+
sipSecurityConstraint.setUserDataConstraint(UserDataConstraintMetaDataParser.parse(reader,
PropertyReplacers.noop()));
break;
default:
throw unexpectedElement(reader);
=======================================
---
/containers/sip-servlets-as7-drop-in/patches/patch.standalone.sip.dropin.xml
Mon Apr 16 09:56:56 2012
+++
/containers/sip-servlets-as7-drop-in/patches/patch.standalone.sip.dropin.xml
Sun Jul 8 04:04:59 2012
@@ -1,5 +1,5 @@
---- standalone/configuration/standalone-sip.xml 2012-03-10
00:14:06.000000000 +0100
-+++ standalone/configuration/standalone-sip.xml 2012-04-15
11:54:27.744442914 +0200
+--- standalone/configuration/standalone-sip.xml 2012-07-08
09:57:27.000000000 +0200
++++ standalone/configuration/standalone-sip.xml 2012-07-08
11:52:39.400097715 +0200
@@ -25,6 +25,7 @@
<extension module="org.jboss.as.web"/>
<extension module="org.jboss.as.webservices"/>
@@ -8,7 +8,7 @@
</extensions>
<management>
<security-realms>
-@@ -260,6 +261,11 @@
+@@ -267,6 +268,11 @@
<alias name="example.com"/>
</virtual-server>
</subsystem>
@@ -20,7 +20,7 @@
<subsystem xmlns="urn:jboss:domain:webservices:1.1">
<modify-wsdl-address>true</modify-wsdl-address>
<wsdl-host>${jboss.bind.address:127.0.0.1}</wsdl-host>
-@@ -295,6 +301,9 @@
+@@ -302,6 +308,9 @@
<socket-binding name="ajp" port="8009"/>
<socket-binding name="http" port="8080"/>
<socket-binding name="https" port="8443"/>
@@ -30,7 +30,7 @@
<socket-binding name="osgi-http" interface="management"
port="8090"/>
<socket-binding name="remoting" port="4447"/>
<socket-binding name="txn-recovery-environment" port="4712"/>
-@@ -303,4 +312,4 @@
+@@ -310,4 +319,4 @@
<remote-destination host="localhost" port="25"/>
</outbound-socket-binding>
</socket-binding-group>
=======================================
--- /containers/sip-servlets-as7/pom.xml Wed Apr 11 08:15:34 2012
+++ /containers/sip-servlets-as7/pom.xml Sun Jul 8 04:04:59 2012
@@ -21,13 +21,13 @@
<dependency>
<groupId>org.jboss.web</groupId>
<artifactId>jbossweb</artifactId>
- <version>7.0.10.Final</version>
+ <version>7.0.16.Final</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging</artifactId>
- <version>3.1.0.GA</version>
+ <version>3.1.1.GA</version>
<scope>provided</scope>
</dependency>