geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r882078 - in /geronimo/server/trunk/plugins: jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/POJOWebServiceHolderWrapper.java jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/ServletHolderWrapper.java pom.xml
Date Thu, 19 Nov 2009 08:41:46 GMT
Author: djencks
Date: Thu Nov 19 08:41:29 2009
New Revision: 882078

URL: http://svn.apache.org/viewvc?rev=882078&view=rev
Log:
jetty now builds

Modified:
    geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/POJOWebServiceHolderWrapper.java
    geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/ServletHolderWrapper.java
    geronimo/server/trunk/plugins/pom.xml

Modified: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/POJOWebServiceHolderWrapper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/POJOWebServiceHolderWrapper.java?rev=882078&r1=882077&r2=882078&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/POJOWebServiceHolderWrapper.java
(original)
+++ geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/POJOWebServiceHolderWrapper.java
Thu Nov 19 08:41:29 2009
@@ -75,7 +75,7 @@
         if (context != null) {
             servletHolder.setName(servletName);
             servletHolder.setClassName(POJOWebServiceServlet.class.getName());
-            servletHolder.setRunAsRole(runAsRole);
+            servletHolder.getRegistration().setRunAsRole(runAsRole);
             servletHolder.setInitParameters(initParams);
             if (loadOnStartup != null) {
                 servletHolder.setInitOrder(loadOnStartup);

Modified: geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/ServletHolderWrapper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/ServletHolderWrapper.java?rev=882078&r1=882077&r2=882078&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/ServletHolderWrapper.java
(original)
+++ geronimo/server/trunk/plugins/jetty7/geronimo-jetty7/src/main/java/org/apache/geronimo/jetty7/ServletHolderWrapper.java
Thu Nov 19 08:41:29 2009
@@ -68,7 +68,7 @@
         servletHolder = new GeronimoServletHolder(context == null ? null : context.getIntegrationContext(),
servletRegistration);
         servletHolder.setName(servletName);
         servletHolder.setClassName(servletClassName);
-        servletHolder.setRunAsRole(runAsRole);
+        servletHolder.getRegistration().setRunAsRole(runAsRole);
         //context will be null only for use as "default servlet info holder" in deployer.
 
         if (context != null) {

Modified: geronimo/server/trunk/plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pom.xml?rev=882078&r1=882077&r2=882078&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pom.xml (original)
+++ geronimo/server/trunk/plugins/pom.xml Thu Nov 19 08:41:29 2009
@@ -129,7 +129,7 @@
         <!--<module>welcome</module>-->
         <!--<module>concurrent</module>-->
         <!--<module>procrun</module>-->
-        <!--<module>jetty7</module>-->
+        <module>jetty7</module>
         <module>tomcat</module>
     </modules>
 



Mime
View raw message