Revision: d4b713373c10
Author: josemrecio <[email protected]>
Date: Tue Aug 14 19:06:48 2012
Log: @SipApplicationKey annotated method reflection lookup must be
referred to the class loader of the deployed module, so we must wait until
context start to resolve it.
This commit includes also preliminary fix for issue-149 (support for
@ConcurrencyControl)
http://code.google.com/p/sipservlets/source/detail?r=d4b713373c10
Added:
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/metadata/sip/spec/SipApplicationKeyMethodInfo.java
Modified:
/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/as7/deployment/SipAnnotationDeploymentProcessor.java
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/metadata/sip/jboss/JBossConvergedSipMetaData.java
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/metadata/sip/merge/JBossSipMetaDataMerger.java
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/metadata/sip/spec/SipAnnotationMergedView.java
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/metadata/sip/spec/SipMetaData.java
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/servlet/sip/startup/jboss/SipJBossContextConfig.java
=======================================
--- /dev/null
+++
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/metadata/sip/spec/SipApplicationKeyMethodInfo.java
Tue Aug 14 19:06:48 2012
@@ -0,0 +1,57 @@
+/*
+ * 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.
+ *
+ * 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.
+ */
+package org.mobicents.metadata.sip.spec;
+
+/**
+ * Data to fetch the SipApplicationKey method in the proper class loader
context.
+ * No need to store the args and return type, they are always the same
(String, SipServletRequest)
+ *
+ * @author [email protected]
+ */
+public class SipApplicationKeyMethodInfo {
+
+ final String className;
+ final String methodName;
+
+ public SipApplicationKeyMethodInfo(String className, String methodName)
{
+ this.className = className;
+ this.methodName = methodName;
+ }
+
+ /**
+ * @return the className
+ */
+ public String getClassName() {
+ return className;
+ }
+
+ /**
+ * @return the methodName
+ */
+ public String getMethodName() {
+ return methodName;
+ }
+
+ public String toString() {
+ return new
StringBuilder(className).append("-").append(methodName).toString();
+ }
+}
=======================================
---
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/deployment/SIPWebContext.java
Fri Aug 10 09:37:28 2012
+++
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/deployment/SIPWebContext.java
Tue Aug 14 19:06:48 2012
@@ -116,7 +116,11 @@
JBossWebMetaDataMerger.merge(mergedMetaData, override, original);
augmentAnnotations(mergedMetaData, sipMetaData,
sipAnnotationMetaData);
- processMetaData(mergedMetaData, sipMetaData);
+ try {
+ processMetaData(mergedMetaData, sipMetaData);
+ } catch (Exception e) {
+ throw new LifecycleException(e);
+ }
super.start();
}
@@ -241,7 +245,14 @@
}
}
}
-
+ if
(annotatedMetaData.getSipApplicationKeyMethodInfo() != null) {
+
sipMetaData.setSipApplicationKeyMethodInfo(annotatedMetaData.getSipApplicationKeyMethodInfo());
+ }
+ if (annotatedMetaData.getConcurrencyControlMode() !=
null) {
+ if (sipMetaData.getConcurrencyControlMode() == null) {
+
sipMetaData.setConcurrencyControlMode(annotatedMetaData.getConcurrencyControlMode());
+ }
+ }
}
}
if (logger.isDebugEnabled()) {
@@ -265,7 +276,7 @@
}
}
- private void processMetaData(JBossWebMetaData mergedMetaData,
SipMetaData sipMetaData) {
+ private void processMetaData(JBossWebMetaData mergedMetaData,
SipMetaData sipMetaData) throws Exception {
//processJBossWebMetaData(sharedJBossWebMetaData);
//processWebMetaData(sharedJBossWebMetaData);
JBossSipMetaDataMerger.merge((JBossConvergedSipMetaData)mergedMetaData,
null, sipMetaData);
=======================================
---
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/deployment/SipAnnotationDeploymentProcessor.java
Fri Aug 10 09:37:28 2012
+++
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/as7/deployment/SipAnnotationDeploymentProcessor.java
Tue Aug 14 19:06:48 2012
@@ -21,14 +21,19 @@
*/
package org.mobicents.as7.deployment;
+import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import javax.servlet.sip.SipServletRequest;
import javax.servlet.sip.annotation.SipApplication;
+import javax.servlet.sip.annotation.SipApplicationKey;
import javax.servlet.sip.annotation.SipListener;
import javax.servlet.sip.annotation.SipServlet;
+import org.mobicents.servlet.sip.annotation.ConcurrencyControl;
+import org.mobicents.servlet.sip.annotation.ConcurrencyControlMode;
import org.jboss.annotation.javaee.Descriptions;
import org.jboss.annotation.javaee.DisplayNames;
@@ -48,6 +53,8 @@
import org.jboss.jandex.ClassInfo;
import org.jboss.jandex.DotName;
import org.jboss.jandex.Index;
+import org.jboss.jandex.MethodInfo;
+import org.jboss.jandex.Type;
import org.jboss.logging.Logger;
import org.jboss.metadata.javaee.spec.DescriptionGroupMetaData;
import org.jboss.metadata.javaee.spec.DescriptionImpl;
@@ -63,6 +70,7 @@
import org.mobicents.metadata.sip.spec.ProxyConfigMetaData;
import org.mobicents.metadata.sip.spec.Sip11MetaData;
import org.mobicents.metadata.sip.spec.SipAnnotationMetaData;
+import org.mobicents.metadata.sip.spec.SipApplicationKeyMethodInfo;
import org.mobicents.metadata.sip.spec.SipMetaData;
import org.mobicents.metadata.sip.spec.SipServletSelectionMetaData;
import org.mobicents.metadata.sip.spec.SipServletsMetaData;
@@ -95,6 +103,8 @@
protected static final DotName sipListener =
DotName.createSimple(SipListener.class.getName());
protected static final DotName sipServlet =
DotName.createSimple(SipServlet.class.getName());
protected static final DotName sipApplication =
DotName.createSimple(SipApplication.class.getName());
+ protected static final DotName sipApplicationKey =
DotName.createSimple(SipApplicationKey.class.getName());
+ protected static final DotName concurrencyControl =
DotName.createSimple(ConcurrencyControl.class.getName());
// protected static final DotName webServlet =
DotName.createSimple(WebServlet.class.getName());
// protected static final DotName runAs =
DotName.createSimple(RunAs.class.getName());
// protected static final DotName declareRoles =
DotName.createSimple(DeclareRoles.class.getName());
@@ -246,6 +256,48 @@
sipAnnotationMetaData.setSipServlets(sipServlets);
}
+ //@SipApplicationKey
+ final List<AnnotationInstance> sipApplicationKeyAnnotations =
index.getAnnotations(sipApplicationKey);
+ if (sipApplicationKeyAnnotations != null &&
sipApplicationKeyAnnotations.size() > 0) {
+ for (final AnnotationInstance annotation :
sipApplicationKeyAnnotations) {
+ if (logger.isDebugEnabled())
logger.debug("processAnnotations(): @SipApplicationKey: " + annotation);
+ final AnnotationTarget target = annotation.target();
+ if (!(target instanceof MethodInfo)) {
+ throw new
DeploymentUnitProcessingException("@SipApplicationKey is only allowed at
method level " + target);
+ }
+ final MethodInfo methodInfo =
MethodInfo.class.cast(target);
+ if(!Modifier.isStatic(methodInfo.flags()) |
| !Modifier.isPublic(methodInfo.flags())) {
+ throw new DeploymentUnitProcessingException("A method
annotated with the @SipApplicationKey annotation MUST be public and
static");
+ }
+
if(!methodInfo.returnType().name().toString().equals(String.class.getName()))
{
+ throw new DeploymentUnitProcessingException("A method
annotated with the @SipApplicationKey annotation MUST return a String");
+ }
+ final Type[] types = methodInfo.args();
+ if(types.length != 1 |
| !types[0].name().toString().equals(SipServletRequest.class.getName())) {
+ throw new DeploymentUnitProcessingException("A method
annotated with the @SipApplicationKey annotation MUST have a single
argument of type SipServletRequest");
+ }
+
if(sipAnnotationMetaData.getSipApplicationKeyMethodInfo() != null) {
+ throw new DeploymentUnitProcessingException("More than
one SipApplicationKey annotated method is not allowed.");
+ }
+ final SipApplicationKeyMethodInfo
sipApplicationKeyMethodInfo = new
SipApplicationKeyMethodInfo(methodInfo.declaringClass().name().toString(),
methodInfo.name());
+
sipAnnotationMetaData.setSipApplicationKeyMethodInfo(sipApplicationKeyMethodInfo);
+ if (logger.isDebugEnabled())
logger.debug("processAnnotations(): added " + sipApplicationKeyMethodInfo
+ " as @SipApplicationKey method");
+ }
+ }
+ //@ConcurrencyControl
+ final List<AnnotationInstance> concurrencyControlAnnotations =
index.getAnnotations(concurrencyControl);
+ if (concurrencyControlAnnotations != null &&
concurrencyControlAnnotations.size() > 0) {
+ for (final AnnotationInstance annotation :
concurrencyControlAnnotations) {
+ if (logger.isDebugEnabled())
logger.debug("processAnnotations(): @ConcurrencyControl: " + annotation);
+ final AnnotationTarget target = annotation.target();
+ if (!(target instanceof ClassInfo)) {
+ throw new
DeploymentUnitProcessingException("@ConcurrencyControl is only allowed at
package level " + target);
+ }
+ ConcurrencyControlMode mode =
ConcurrencyControlMode.valueOf(annotation.value("mode").asString());
+ sipAnnotationMetaData.setConcurrencyControlMode(mode);
+ if (logger.isDebugEnabled())
logger.debug("processAnnotations(): ConcurrencyControl set to " + mode);
+ }
+ }
return sipAnnotationMetaData;
}
=======================================
---
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/metadata/sip/jboss/JBossConvergedSipMetaData.java
Fri Aug 10 09:37:28 2012
+++
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/metadata/sip/jboss/JBossConvergedSipMetaData.java
Tue Aug 14 19:06:48 2012
@@ -31,6 +31,7 @@
import org.jboss.metadata.web.spec.ListenerMetaData;
import org.jboss.metadata.web.spec.SessionConfigMetaData;
import org.mobicents.metadata.sip.spec.ProxyConfigMetaData;
+import org.mobicents.metadata.sip.spec.SipApplicationKeyMethodInfo;
import org.mobicents.metadata.sip.spec.SipLoginConfigMetaData;
import org.mobicents.metadata.sip.spec.SipSecurityConstraintMetaData;
import org.mobicents.metadata.sip.spec.SipServletSelectionMetaData;
@@ -56,7 +57,11 @@
private JBossSipServletsMetaData sipServlets;
private MessageDestinationsMetaData messageDestinations;
private SecurityRolesMetaData securityRoles;
- private Method sipApplicationKeyMethod;
+ // AS7 isolated class loading does not allow to fetch Method
+ // so processors fill SipApplicationKeyMethodInfo and Method is
fetched afterwards
+ // private Method sipApplicationKeyMethod;
+ private SipApplicationKeyMethodInfo sipApplicationKeyMethodInfo;
+
private ConcurrencyControlMode concurrencyControlMode;
/**
@@ -184,19 +189,33 @@
public SessionConfigMetaData getSipSessionConfig() {
return sipSessionConfig;
}
+
+// /**
+// * @param sipApplicationKeyMethod the sipApplicationKeyMethod to set
+// */
+// public void setSipApplicationKeyMethod(Method
sipApplicationKeyMethod) {
+// this.sipApplicationKeyMethod = sipApplicationKeyMethod;
+// }
+//
+// /**
+// * @return the sipApplicationKeyMethod
+// */
+// public Method getSipApplicationKeyMethod() {
+// return sipApplicationKeyMethod;
+// }
/**
- * @param sipApplicationKeyMethod the sipApplicationKeyMethod to set
+ * @param sipApplicationKeyMethodInfo the sipApplicationKeyMethodInfo
to set
*/
- public void setSipApplicationKeyMethod(Method sipApplicationKeyMethod)
{
- this.sipApplicationKeyMethod = sipApplicationKeyMethod;
+ public void setSipApplicationKeyMethodInfo(SipApplicationKeyMethodInfo
sipApplicationKeyMethodInfo) {
+ this.sipApplicationKeyMethodInfo = sipApplicationKeyMethodInfo;
}
/**
- * @return the sipApplicationKeyMethod
+ * @return the sipApplicationKeyMethodInfo
*/
- public Method getSipApplicationKeyMethod() {
- return sipApplicationKeyMethod;
+ public SipApplicationKeyMethodInfo getSipApplicationKeyMethodInfo() {
+ return this.sipApplicationKeyMethodInfo;
}
/**
=======================================
---
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/metadata/sip/merge/JBossSipMetaDataMerger.java
Fri Aug 10 09:37:28 2012
+++
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/metadata/sip/merge/JBossSipMetaDataMerger.java
Tue Aug 14 19:06:48 2012
@@ -38,7 +38,7 @@
* @author [email protected]
* @version $Revision: 84989 $
*
- * @author josemrecio
+ * @author [email protected]
*
*/
public class JBossSipMetaDataMerger extends NamedModuleImplMerger {
@@ -120,10 +120,10 @@
originalRoles = original.getSecurityRoles();
SecurityRolesMetaDataMerger.merge(dest.getSipSecurityRoles(),
overrideRoles, originalRoles);
- if (override != null && override.getSipApplicationKeyMethod() !=
null)
-
dest.setSipApplicationKeyMethod(override.getSipApplicationKeyMethod());
- else if (original != null &&
original.getSipApplicationKeyMethod() != null)
-
dest.setSipApplicationKeyMethod(original.getSipApplicationKeyMethod());
+ if (override != null &&
override.getSipApplicationKeyMethodInfo() != null)
+
dest.setSipApplicationKeyMethodInfo(override.getSipApplicationKeyMethodInfo());
+ else if (original != null &&
original.getSipApplicationKeyMethodInfo() != null)
+
dest.setSipApplicationKeyMethodInfo(original.getSipApplicationKeyMethodInfo());
if (override != null && override.getConcurrencyControlMode() !=
null)
dest.setConcurrencyControlMode(override.getConcurrencyControlMode());
=======================================
---
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/metadata/sip/spec/SipAnnotationMergedView.java
Fri Aug 10 09:37:28 2012
+++
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/metadata/sip/spec/SipAnnotationMergedView.java
Tue Aug 14 19:06:48 2012
@@ -159,8 +159,8 @@
if (xml.getServletSelection() != null)
merged.setServletSelection(xml.getServletSelection());
- if (xml.getSipApplicationKeyMethod() != null)
-
merged.setSipApplicationKeyMethod(xml.getSipApplicationKeyMethod());
+ if (xml.getSipApplicationKeyMethodInfo() != null)
+
merged.setSipApplicationKeyMethodInfo(xml.getSipApplicationKeyMethodInfo());
if (xml.getConcurrencyControlMode() != null)
merged.setConcurrencyControlMode(xml.getConcurrencyControlMode());
=======================================
---
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/metadata/sip/spec/SipMetaData.java
Fri Aug 10 09:37:28 2012
+++
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/metadata/sip/spec/SipMetaData.java
Tue Aug 14 19:06:48 2012
@@ -25,6 +25,7 @@
import java.util.List;
import org.jboss.as.server.deployment.AttachmentKey;
+import org.jboss.invocation.proxy.MethodIdentifier;
import org.jboss.metadata.javaee.spec.Environment;
import org.jboss.metadata.web.spec.WebMetaData;
import org.mobicents.servlet.sip.annotation.ConcurrencyControlMode;
@@ -62,7 +63,10 @@
// /** The message destinations */
// private MessageDestinationsMetaData messageDestinations;
- private Method sipApplicationKeyMethod;
+ // AS7 isolated class loading does not allow to fetch Method,
+ // so processors fill SipApplicationKeyMethodInfo and Method is
fetched afterwards
+ // private Method sipApplicationKeyMethod;
+ private SipApplicationKeyMethodInfo sipApplicationKeyMethodInfo;
private ConcurrencyControlMode concurrencyControlMode;
/**
@@ -373,19 +377,33 @@
public String getApplicationName() {
return applicationName;
}
+
+// /**
+// * @param sipApplicationKeyMethod the sipApplicationKeyMethod to set
+// */
+// public void setSipApplicationKeyMethod(Method
sipApplicationKeyMethod) {
+// this.sipApplicationKeyMethod = sipApplicationKeyMethod;
+// }
+//
+// /**
+// * @return the sipApplicationKeyMethod
+// */
+// public Method getSipApplicationKeyMethod() {
+// return sipApplicationKeyMethod;
+// }
/**
- * @param sipApplicationKeyMethod the sipApplicationKeyMethod to set
+ * @param sipApplicationKeyMethodInfo the sipApplicationKeyMethodInfo
to set
*/
- public void setSipApplicationKeyMethod(Method sipApplicationKeyMethod)
{
- this.sipApplicationKeyMethod = sipApplicationKeyMethod;
+ public void setSipApplicationKeyMethodInfo(SipApplicationKeyMethodInfo
sipApplicationKeyMethodInfo) {
+ this.sipApplicationKeyMethodInfo = sipApplicationKeyMethodInfo;
}
/**
- * @return the sipApplicationKeyMethod
+ * @return the sipApplicationKeyMethodInfo
*/
- public Method getSipApplicationKeyMethod() {
- return sipApplicationKeyMethod;
+ public SipApplicationKeyMethodInfo getSipApplicationKeyMethodInfo() {
+ return this.sipApplicationKeyMethodInfo;
}
public ConcurrencyControlMode getConcurrencyControlMode() {
=======================================
---
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/servlet/sip/startup/jboss/SipJBossContextConfig.java
Fri Aug 10 09:37:28 2012
+++
/containers/sip-servlets-as7-drop-in/jboss-as-mobicents/src/main/java/org/mobicents/servlet/sip/startup/jboss/SipJBossContextConfig.java
Tue Aug 14 19:06:48 2012
@@ -21,9 +21,14 @@
*/
package org.mobicents.servlet.sip.startup.jboss;
+import java.lang.reflect.Method;
import java.util.Iterator;
import java.util.List;
+import javax.servlet.sip.SipServletRequest;
+
+import org.apache.catalina.LifecycleException;
+import org.apache.catalina.Loader;
import org.apache.catalina.core.StandardWrapper;
import org.apache.catalina.startup.ContextConfig;
import org.jboss.as.server.deployment.DeploymentUnit;
@@ -51,6 +56,7 @@
import org.mobicents.metadata.sip.spec.NotMetaData;
import org.mobicents.metadata.sip.spec.OrMetaData;
import org.mobicents.metadata.sip.spec.PatternMetaData;
+import org.mobicents.metadata.sip.spec.SipApplicationKeyMethodInfo;
import org.mobicents.metadata.sip.spec.SipLoginConfigMetaData;
import org.mobicents.metadata.sip.spec.SipResourceCollectionMetaData;
import org.mobicents.metadata.sip.spec.SipResourceCollectionsMetaData;
@@ -128,8 +134,9 @@
/**
* @param convergedMetaData
+ * @throws Exception
*/
- public void processSipMetaData(JBossConvergedSipMetaData
convergedMetaData) {
+ public void processSipMetaData(JBossConvergedSipMetaData
convergedMetaData) throws Exception {
CatalinaSipContext convergedContext = (CatalinaSipContext) context;
convergedContext.setWrapperClass(SipServletImpl.class.getName());
/*
@@ -321,7 +328,17 @@
convergedContext.addChild((SipServletImpl) wrapper);
}
}
-
convergedContext.setSipApplicationKeyMethod(convergedMetaData.getSipApplicationKeyMethod());
+ final SipApplicationKeyMethodInfo sipApplicationKeyMethodInfo =
convergedMetaData.getSipApplicationKeyMethodInfo();
+ final String sipApplicationKeyClassName =
sipApplicationKeyMethodInfo.getClassName();
+ final String sipApplicationKeyMethodName =
sipApplicationKeyMethodInfo.getMethodName();
+ ClassLoader contextCLoader = context.getLoader().getClassLoader();
+ Method sipApplicationKeyMethod = null;
+ try {
+ sipApplicationKeyMethod =
Class.forName(sipApplicationKeyClassName, true,
contextCLoader).getMethod(sipApplicationKeyMethodName,
SipServletRequest.class);
+ } catch (Exception e) {
+ throw e;
+ }
+
convergedContext.setSipApplicationKeyMethod(sipApplicationKeyMethod);
convergedContext.setConcurrencyControlMode(convergedMetaData.getConcurrencyControlMode());
convergedContext.setWrapperClass(StandardWrapper.class.getName());
}