You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2008/08/12 13:13:30 UTC
svn commit: r685120 -
/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTag.java
Author: antelder
Date: Tue Aug 12 04:13:29 2008
New Revision: 685120
URL: http://svn.apache.org/viewvc?rev=685120&view=rev
Log:
Change taglib to use a ComponentContext if its available
Modified:
tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTag.java
Modified: tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTag.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTag.java?rev=685120&r1=685119&r2=685120&view=diff
==============================================================================
--- tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTag.java (original)
+++ tuscany/java/sca/modules/host-webapp/src/main/java/org/apache/tuscany/sca/host/webapp/jsp/ReferenceTag.java Tue Aug 12 04:13:29 2008
@@ -27,6 +27,7 @@
import org.apache.tuscany.sca.host.embedded.SCADomain;
import org.apache.tuscany.sca.host.webapp.WebAppServletHost;
+import org.osoa.sca.ComponentContext;
/**
* Tag to handle SCA references
@@ -54,9 +55,13 @@
}
ServletContext servletContext = pageContext.getServletContext();
- SCADomain scaDomain = (SCADomain)servletContext.getAttribute(WebAppServletHost.SCA_DOMAIN_ATTRIBUTE);
- if (scaDomain == null) {
- throw new JspException("SCADomain is null. Check Tuscany configuration in web.xml");
+ ComponentContext componentContext = (ComponentContext)servletContext.getAttribute("org.osoa.sca.ComponentContext");
+ SCADomain scaDomain = null;
+ if (componentContext == null) {
+ scaDomain = (SCADomain)servletContext.getAttribute(WebAppServletHost.SCA_DOMAIN_ATTRIBUTE);
+ if (scaDomain == null) {
+ throw new JspException("SCADomain is null. Check Tuscany configuration in web.xml");
+ }
}
Class<?> typeClass;
@@ -68,7 +73,11 @@
Object o;
try {
- o = scaDomain.getService(typeClass, name);
+ if (componentContext != null) {
+ o = componentContext.getService(typeClass, name);
+ } else {
+ o = scaDomain.getService(typeClass, name);
+ }
} catch (Exception e) {
throw new JspException("Exception getting service for reference'" + name + "': " + e, e);
}