You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/07/21 01:44:27 UTC
svn commit: r424127 - in
/geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/src: ./
test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
Author: jdillon
Date: Thu Jul 20 16:44:27 2006
New Revision: 424127
URL: http://svn.apache.org/viewvc?rev=424127&view=rev
Log:
r493@Bliss (orig r424119): jdillon | 2006-07-20 16:40:58 -0700
r473@Bliss (orig r424015): sppatel | 2006-07-20 11:23:38 -0700
GERONIMO-1492
Modified:
geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/src/ (props changed)
geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
Propchange: geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Thu Jul 20 16:44:27 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/tomcat-builder/src:424119
Modified: geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java?rev=424127&r1=424126&r2=424127&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java Thu Jul 20 16:44:27 2006
@@ -158,7 +158,7 @@
PermissionCollection uncheckedPermissions= new Permissions();
ComponentPermissions componentPermissions = new ComponentPermissions(excludedPermissions, uncheckedPermissions, new HashMap());
Map contextIDToPermissionsMap = new HashMap();
- contextIDToPermissionsMap.put("test_J2EEApplication=null_J2EEServer=bar_j2eeType=WebModule_name=org/apache/geronimo/test", componentPermissions);
+ contextIDToPermissionsMap.put("test_J2EEApplication=null_J2EEServer=bar_j2eeType=WebModule_name=geronimo/test/1.0/war", componentPermissions);
jaccBeanData.setAttribute("contextIdToPermissionsMap", contextIDToPermissionsMap);
// jaccBeanData.setAttribute("principalRoleMap", new HashMap());
jaccBeanData.setAttribute("roleDesignates", new HashMap());