Revision: 18661
Author: [email protected]
Date: Mon May 30 02:54:00 2011
Log: Fixes Issue 2601
http://code.google.com/p/mobicents/source/detail?r=18661
Modified:
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/sip-servlets-weld/.classpath
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/sip-servlets-weld/.project
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/sip-servlets-weld/.settings/org.eclipse.jdt.core.prefs
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/sip-servlets-weld/src/main/java/org/mobicents/servlet/sip/weld/environment/servlet/SipServletsWeldListener.java
=======================================
---
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/sip-servlets-weld/.classpath
Sat May 7 12:09:33 2011
+++
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/sip-servlets-weld/.classpath
Mon May 30 02:54:00 2011
@@ -2,13 +2,14 @@
<classpathentry kind="src" path="src/main/java" including="**/*.java"/>
<classpathentry kind="src" path="src/main/resources"
excluding="**/*.java"/>
<classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="var"
path="M2_REPO/javax/servlet/jsp/jsp-api/2.1/jsp-api-2.1.jar"
sourcepath="M2_REPO/javax/servlet/jsp/jsp-api/2.1/jsp-api-2.1-sources.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/javax/servlet/jsp/jsp-api/2.1/jsp-api-2.1.jar"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/annotations-api/6.0.29/annotations-api-6.0.29.jar"/>
<classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/catalina/6.0.29/catalina-6.0.29.jar"/>
<classpathentry kind="var"
path="M2_REPO/geronimo-spec/geronimo-spec-j2ee-jacc/1.0-rc4/geronimo-spec-j2ee-jacc-1.0-rc4.jar"/>
<classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/juli/6.0.29/juli-6.0.29.jar"/>
- <classpathentry kind="var"
path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"
sourcepath="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/mobicents/framework/mtf-sip-servlets/1.0.0-SNAPSHOT/mtf-sip-servlets-1.0.0-SNAPSHOT.jar"
sourcepath="M2_REPO/org/mobicents/framework/mtf-sip-servlets/1.0.0-SNAPSHOT/mtf-sip-servlets-1.0.0-SNAPSHOT-sources.jar"/>
<classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/servlet-api/6.0.29/servlet-api-6.0.29.jar"/>
<classpathentry kind="var"
path="M2_REPO/org/mobicents/servlet/sip/sip-servlets-annotations/2.0.0.ALPHA2/sip-servlets-annotations-2.0.0.ALPHA2.jar"/>
<classpathentry kind="var"
path="M2_REPO/org/mobicents/servlet/sip/sip-servlets-client/2.0.0.ALPHA2/sip-servlets-client-2.0.0.ALPHA2.jar"/>
@@ -16,12 +17,12 @@
<classpathentry kind="var"
path="M2_REPO/org/mobicents/servlet/sip/sip-servlets-jruby/2.0.0.ALPHA2/sip-servlets-jruby-2.0.0.ALPHA2.jar"/>
<classpathentry kind="var"
path="M2_REPO/org/mobicents/servlet/sip/sip-servlets-spec/2.0.0.ALPHA2/sip-servlets-spec-2.0.0.ALPHA2.jar"/>
<classpathentry kind="var"
path="M2_REPO/org/mobicents/servlet/sip/sip-servlets-tomcat-7/2.0.0.ALPHA2/sip-servlets-tomcat-7-2.0.0.ALPHA2.jar"/>
- <classpathentry kind="src" path="/sip-servlets-weld-extension"/>
- <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/tomcat-annotations-api/7.0.8/tomcat-annotations-api-7.0.8.jar"
sourcepath="M2_REPO/org/apache/tomcat/tomcat-annotations-api/7.0.8/tomcat-annotations-api-7.0.8-sources.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/tomcat-api/7.0.8/tomcat-api-7.0.8.jar"
sourcepath="M2_REPO/org/apache/tomcat/tomcat-api/7.0.8/tomcat-api-7.0.8-sources.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/tomcat-catalina/7.0.8/tomcat-catalina-7.0.8.jar"
sourcepath="M2_REPO/org/apache/tomcat/tomcat-catalina/7.0.8/tomcat-catalina-7.0.8-sources.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/tomcat-juli/7.0.8/tomcat-juli-7.0.8.jar"
sourcepath="M2_REPO/org/apache/tomcat/tomcat-juli/7.0.8/tomcat-juli-7.0.8-sources.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/tomcat-servlet-api/7.0.8/tomcat-servlet-api-7.0.8.jar"
sourcepath="M2_REPO/org/apache/tomcat/tomcat-servlet-api/7.0.8/tomcat-servlet-api-7.0.8-sources.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/tomcat-util/7.0.8/tomcat-util-7.0.8.jar"
sourcepath="M2_REPO/org/apache/tomcat/tomcat-util/7.0.8/tomcat-util-7.0.8-sources.jar"/>
- <classpathentry kind="var"
path="M2_REPO/org/jboss/weld/servlet/weld-servlet/1.1.0.Final/weld-servlet-1.1.0.Final.jar"
sourcepath="M2_REPO/org/jboss/weld/servlet/weld-servlet/1.1.0.Final/weld-servlet-1.1.0.Final-sources.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/mobicents/servlet/sip/weld/sip-servlets-weld-extension/1.0.0-SNAPSHOT/sip-servlets-weld-extension-1.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/tomcat-annotations-api/7.0.8/tomcat-annotations-api-7.0.8.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/tomcat-api/7.0.8/tomcat-api-7.0.8.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/tomcat-catalina/7.0.8/tomcat-catalina-7.0.8.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/tomcat-juli/7.0.8/tomcat-juli-7.0.8.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/tomcat-servlet-api/7.0.8/tomcat-servlet-api-7.0.8.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/apache/tomcat/tomcat-util/7.0.8/tomcat-util-7.0.8.jar"/>
+ <classpathentry kind="var"
path="M2_REPO/org/jboss/weld/servlet/weld-servlet/1.1.0.Final/weld-servlet-1.1.0.Final.jar"/>
</classpath>
=======================================
---
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/sip-servlets-weld/.project
Sat May 7 12:09:33 2011
+++
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/sip-servlets-weld/.project
Mon May 30 02:54:00 2011
@@ -1,9 +1,7 @@
<projectDescription>
<name>sip-servlets-weld</name>
<comment>Mobicents :: Parent pom for 2.x releases. NO_M2ECLIPSE_SUPPORT:
Project files created with the maven-eclipse-plugin are not supported in
M2Eclipse.</comment>
- <projects>
- <project>sip-servlets-weld-extension</project>
- </projects>
+ <projects/>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
=======================================
---
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/sip-servlets-weld/.settings/org.eclipse.jdt.core.prefs
Sat May 7 12:09:33 2011
+++
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/sip-servlets-weld/.settings/org.eclipse.jdt.core.prefs
Mon May 30 02:54:00 2011
@@ -1,4 +1,4 @@
-#Fri May 06 10:44:14 EEST 2011
+#Thu May 26 14:51:23 EEST 2011
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.source=1.6
=======================================
---
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/sip-servlets-weld/src/main/java/org/mobicents/servlet/sip/weld/environment/servlet/SipServletsWeldListener.java
Mon Apr 18 01:47:15 2011
+++
/trunk/frameworks/sip-servlets/cdi-telco-framework/core/sip-servlets-weld/src/main/java/org/mobicents/servlet/sip/weld/environment/servlet/SipServletsWeldListener.java
Mon May 30 02:54:00 2011
@@ -29,6 +29,7 @@
import org.jboss.weld.bootstrap.api.Bootstrap;
import org.jboss.weld.bootstrap.api.Environments;
import org.jboss.weld.environment.jetty.JettyWeldInjector;
+import org.jboss.weld.environment.servlet.Listener;
import org.jboss.weld.environment.servlet.deployment.ServletDeployment;
import org.jboss.weld.environment.servlet.deployment.URLScanner;
import org.jboss.weld.environment.servlet.deployment.VFSURLScanner;
@@ -69,7 +70,9 @@
private static final String EXPRESSION_FACTORY_NAME
= "org.jboss.weld.el.ExpressionFactory";
private static final String JETTY_REQUIRED_CLASS_NAME
= "org.mortbay.jetty.servlet.ServletHandler";
public static final String INJECTOR_ATTRIBUTE_NAME
= "org.jboss.weld.environment.jetty.JettyWeldInjector";
- public static final String BEAN_MANAGER_ATTRIBUTE_NAME =
SipServletsWeldListener.class.getPackage().getName() + "." +
BeanManager.class.getName();
+ // CTF Issue http://code.google.com/p/mobicents/issues/detail?id=2601
+ // CTF beans cannot be resolved in JSF because the BeanManager name was
wrong
+ public static final String BEAN_MANAGER_ATTRIBUTE_NAME =
Listener.class.getPackage().getName() + "." + BeanManager.class.getName();
private final transient Bootstrap bootstrap;
private final transient ServletListener weldListener;
