geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r1057104 - /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Date Mon, 10 Jan 2011 07:55:57 GMT
Author: genspring
Date: Mon Jan 10 07:55:56 2011
New Revision: 1057104

URL: http://svn.apache.org/viewvc?rev=1057104&view=rev
Log:
m2 has been branched, re-enable web service in tomcat builder of trunk.

Modified:
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?rev=1057104&r1=1057103&r2=1057104&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7-builder/src/main/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Mon Jan 10 07:55:56 2011
@@ -52,6 +52,7 @@ import org.apache.geronimo.gbean.Abstrac
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
+import org.apache.geronimo.gbean.ReferencePatterns;
 import org.apache.geronimo.gbean.annotation.GBean;
 import org.apache.geronimo.gbean.annotation.ParamAttribute;
 import org.apache.geronimo.gbean.annotation.ParamReference;
@@ -590,43 +591,43 @@ public class TomcatModuleBuilder extends
             } catch (ClassNotFoundException e) {
                 throw new DeploymentException("Could not load javax.servlet.Servlet in bundle
" + bundle, e);
             }
-//            for (org.apache.openejb.jee.Servlet servletType : servletTypes) {
-//
-//                if (servletType.getServletClass() != null) {
-//                    String servletName = servletType.getServletName().trim();
-//                    String servletClassName = servletType.getServletClass().trim();
-//                    Class servletClass;
-//                    try {
-//                        servletClass = webBundle.loadClass(servletClassName);
-//                    } catch (ClassNotFoundException e) {
-//                        throw new DeploymentException("Could not load servlet class " +
servletClassName + " from bundle " + bundle, e);
-//                    }
-//                    if (!baseServletClass.isAssignableFrom(servletClass)) {
-//                        //fake servletData
-//                        AbstractName servletAbstractName = moduleContext.getNaming().createChildName(moduleName,
servletName, NameFactory.SERVLET);
-//                        GBeanData servletData = new GBeanData();
-//                        servletData.setAbstractName(servletAbstractName);
-//                        //let the web service builder deal with configuring the gbean with
the web service stack
-//                        //Here we just extract the factory reference
-//                        boolean configured = false;
-//                        for (WebServiceBuilder serviceBuilder : webServiceBuilder) {
-//                            if (serviceBuilder.configurePOJO(servletData, servletName,
module, servletClassName, moduleContext)) {
-//                                configured = true;
-//                                break;
-//                            }
-//                        }
-//                        if (!configured) {
-//                            throw new DeploymentException("POJO web service: " + servletName
+ " not configured by any web service builder");
-//                        }
-//                        ReferencePatterns patterns = servletData.getReferencePatterns("WebServiceContainerFactory");
-//                        AbstractName wsContainerFactoryName = patterns.getAbstractName();
-//                        webServices.put(servletName, wsContainerFactoryName);
-//                        //force all the factories to start before the web app that needs
them.
-//                        webModuleData.addDependency(wsContainerFactoryName);
-//                    }
-//
-//                }
-//            }
+            for (org.apache.openejb.jee.Servlet servletType : servletTypes) {
+
+                if (servletType.getServletClass() != null) {
+                    String servletName = servletType.getServletName().trim();
+                    String servletClassName = servletType.getServletClass().trim();
+                    Class servletClass;
+                    try {
+                        servletClass = webBundle.loadClass(servletClassName);
+                    } catch (ClassNotFoundException e) {
+                        throw new DeploymentException("Could not load servlet class " + servletClassName
+ " from bundle " + bundle, e);
+                    }
+                    if (!baseServletClass.isAssignableFrom(servletClass)) {
+                        //fake servletData
+                        AbstractName servletAbstractName = moduleContext.getNaming().createChildName(moduleName,
servletName, NameFactory.SERVLET);
+                        GBeanData servletData = new GBeanData();
+                        servletData.setAbstractName(servletAbstractName);
+                        //let the web service builder deal with configuring the gbean with
the web service stack
+                        //Here we just extract the factory reference
+                        boolean configured = false;
+                        for (WebServiceBuilder serviceBuilder : webServiceBuilder) {
+                            if (serviceBuilder.configurePOJO(servletData, servletName, module,
servletClassName, moduleContext)) {
+                                configured = true;
+                                break;
+                            }
+                        }
+                        if (!configured) {
+                            throw new DeploymentException("POJO web service: " + servletName
+ " not configured by any web service builder");
+                        }
+                        ReferencePatterns patterns = servletData.getReferencePatterns("WebServiceContainerFactory");
+                        AbstractName wsContainerFactoryName = patterns.getAbstractName();
+                        webServices.put(servletName, wsContainerFactoryName);
+                        //force all the factories to start before the web app that needs
them.
+                        webModuleData.addDependency(wsContainerFactoryName);
+                    }
+
+                }
+            }
 
 
             webModuleData.setAttribute("webServices", webServices);



Mime
View raw message