geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r231154 [2/2] - in /geronimo/trunk/modules: assembly/src/plan/ client-builder/src/java/org/apache/geronimo/client/builder/ connector-builder/src/test/org/apache/geronimo/connector/deployment/ j2ee-builder/src/java/org/apache/geronimo/j2ee/d...
Date Wed, 10 Aug 2005 02:19:32 GMT
Modified: geronimo/trunk/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?rev=231154&r1=231153&r2=231154&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
(original)
+++ geronimo/trunk/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Tue Aug  9 19:19:20 2005
@@ -469,10 +469,10 @@
                     }
                 }
             }
-            
+
             // JACC v1.0 secion B.19
             addUnmappedJSPPermissions(securityRoles, rolePermissions);
-            
+
             webModuleData.setAttribute("webServices", webServices);
 
             if (tomcatWebApp.isSetSecurityRealmName()) {
@@ -825,6 +825,7 @@
 
     private Map buildComponentContext(EARContext earContext, Module webModule, WebAppType
webApp, GerWebAppType tomcatWebApp, UserTransaction userTransaction, ClassLoader cl) throws
DeploymentException {
         return ENCConfigBuilder.buildComponentContext(earContext,
+                earContext, 
                 webModule,
                 userTransaction,
                 webApp.getEnvEntryArray(),

Modified: geronimo/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java?rev=231154&r1=231153&r2=231154&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
(original)
+++ geronimo/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
Tue Aug  9 19:19:20 2005
@@ -56,6 +56,7 @@
 import org.apache.geronimo.j2ee.deployment.ResourceReferenceBuilder;
 import org.apache.geronimo.j2ee.deployment.ServiceReferenceBuilder;
 import org.apache.geronimo.j2ee.deployment.WebServiceBuilder;
+import org.apache.geronimo.j2ee.deployment.NamingContext;
 import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
 import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
@@ -222,14 +223,13 @@
                 null, null, new RefContext(new EJBReferenceBuilder() {
 
                     public Reference createEJBLocalReference(String objectName,
-                            boolean isSession, String localHome, String local)
+                                                             GBeanData gbeanData, boolean
isSession, String localHome, String local)
                             throws DeploymentException {
                         return null;
                     }
 
-                    public Reference createEJBRemoteReference(
-                            String objectName, boolean isSession, String home,
-                            String remote) throws DeploymentException {
+                    public Reference createEJBRemoteReference(String objectName, GBeanData
gbeanData, boolean isSession, String home,
+                                                              String remote) throws DeploymentException
{
                         return null;
                     }
 
@@ -240,6 +240,14 @@
                     }
 
                     public Object createHandleDelegateReference() {
+                        return null;
+                    }
+
+                    public Reference getImplicitEJBRemoteRef(URI module, String refName,
boolean isSession, String home, String remote, NamingContext context) throws DeploymentException
{
+                        return null;
+                    }
+
+                    public Reference getImplicitEJBLocalRef(URI module, String refName, boolean
isSession, String localHome, String local, NamingContext context) throws DeploymentException
{
                         return null;
                     }
                 }, new ResourceReferenceBuilder() {



Mime
View raw message