[exo-jcr-commits] exo-jcr SVN: r233 - in kernel/trunk/container/src: test/java/org/exoplatform/container and 1 other directory.

[do-not-reply at jboss.org]

Author: nfilotto
Date: 2009-10-06 10:11:58 -0400 (Tue, 06 Oct 2009)
New Revision: 233

Modified:
   kernel/trunk/container/src/main/java/org/exoplatform/container/PortalContainerContext.java
   kernel/trunk/container/src/test/java/org/exoplatform/container/TestPortalContainerInitTaskContextComparator.java
   kernel/trunk/container/src/test/java/org/exoplatform/container/TestWebAppInitContextComparator.java
Log:
EXOJCR-166: Support separated ear delivery
Upgrade to servlet api 2.5

Modified: kernel/trunk/container/src/main/java/org/exoplatform/container/PortalContainerContext.java
===================================================================
--- kernel/trunk/container/src/main/java/org/exoplatform/container/PortalContainerContext.java	2009-10-05 15:26:29 UTC (rev 232)
+++ kernel/trunk/container/src/main/java/org/exoplatform/container/PortalContainerContext.java	2009-10-06 14:11:58 UTC (rev 233)
@@ -363,4 +363,15 @@
    {
       getPortalContext().setAttribute(name, object);
    }
+
+   /**
+    * {@inheritDoc}
+    */
+   public String getContextPath()
+   {
+      StringBuilder result = new StringBuilder();
+      result.append('/');
+      result.append(container.getName());
+      return result.toString();
+   }
 }

Modified: kernel/trunk/container/src/test/java/org/exoplatform/container/TestPortalContainerInitTaskContextComparator.java
===================================================================
--- kernel/trunk/container/src/test/java/org/exoplatform/container/TestPortalContainerInitTaskContextComparator.java	2009-10-05 15:26:29 UTC (rev 232)
+++ kernel/trunk/container/src/test/java/org/exoplatform/container/TestPortalContainerInitTaskContextComparator.java	2009-10-06 14:11:58 UTC (rev 233)
@@ -210,5 +210,10 @@
 
       }
 
+      public String getContextPath()
+      {
+         return null;
+      }
+
    }   
 }

Modified: kernel/trunk/container/src/test/java/org/exoplatform/container/TestWebAppInitContextComparator.java
===================================================================
--- kernel/trunk/container/src/test/java/org/exoplatform/container/TestWebAppInitContextComparator.java	2009-10-05 15:26:29 UTC (rev 232)
+++ kernel/trunk/container/src/test/java/org/exoplatform/container/TestWebAppInitContextComparator.java	2009-10-06 14:11:58 UTC (rev 233)
@@ -208,5 +208,10 @@
 
       }
 
+      public String getContextPath()
+      {
+         return null;
+      }
+
    }
 }