[exo-jcr-commits] exo-jcr SVN: r4759 - kernel/branches/2.2.x/patch/2.2.10-GA/KER-175.

Author: tolusha Date: 2011-08-16 11:41:35 -0400 (Tue, 16 Aug 2011) New Revision: 4759 Modified: kernel/branches/2.2.x/patch/2.2.10-GA/KER-175/KER-175.patch Log: KER-175: patch fixed Modified: kernel/branches/2.2.x/patch/2.2.10-GA/KER-175/KER-175.patch =================================================================== --- kernel/branches/2.2.x/patch/2.2.10-GA/KER-175/KER-175.patch 2011-08-16 15:15:46 UTC (rev 4758) +++ kernel/branches/2.2.x/patch/2.2.10-GA/KER-175/KER-175.patch 2011-08-16 15:41:35 UTC (rev 4759) @@ -1,50 +1,3 @@ -Index: patch/2.2.10-GA/KER-175/KER-175.patch -=================================================================== ---- patch/2.2.10-GA/KER-175/KER-175.patch (revision 4757) -+++ patch/2.2.10-GA/KER-175/KER-175.patch (working copy) -@@ -1,6 +1,6 @@ - Index: exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/ExoCacheFactoryImpl.java - =================================================================== ----- exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/ExoCacheFactoryImpl.java (revision 4445) -+--- exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/ExoCacheFactoryImpl.java (revision 4757) - +++ exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/ExoCacheFactoryImpl.java (working copy) - @@ -18,6 +18,8 @@ - */ -@@ -130,31 +130,19 @@ - } - Index: exo.kernel.container/src/test/java/org/exoplatform/container/TestPortalContainer.java - =================================================================== ----- exo.kernel.container/src/test/java/org/exoplatform/container/TestPortalContainer.java (revision 4445) -+--- exo.kernel.container/src/test/java/org/exoplatform/container/TestPortalContainer.java (revision 4757) - +++ exo.kernel.container/src/test/java/org/exoplatform/container/TestPortalContainer.java (working copy) --@@ -31,6 +31,19 @@ -+@@ -31,6 +31,7 @@ - */ - public class TestPortalContainer extends AbstractTestContainer - { --+ --+ public void testHasScopingObjectName() --+ { --+ URL rootURL = getClass().getResource("empty-config.xml"); --+ URL portalURL = getClass().getResource("empty-config.xml"); --+ assertNotNull(rootURL); --+ assertNotNull(portalURL); --+ // --+ new ContainerBuilder().withRoot(rootURL).withPortal(portalURL).build(); --+ assertNull(RootContainer.getInstance().getScopingObjectName()); --+ assertNotNull(PortalContainer.getInstance().getScopingObjectName()); --+ } - + - public void testInitValues() - { - createRootContainer("portal-container-config-with-settings.xml"); - Index: exo.kernel.container/src/main/java/org/exoplatform/container/management/ManageableContainer.java - =================================================================== ----- exo.kernel.container/src/main/java/org/exoplatform/container/management/ManageableContainer.java (revision 4445) -+--- exo.kernel.container/src/main/java/org/exoplatform/container/management/ManageableContainer.java (revision 4757) - +++ exo.kernel.container/src/main/java/org/exoplatform/container/management/ManageableContainer.java (working copy) - @@ -25,8 +25,12 @@ - import org.exoplatform.management.annotations.Managed; Index: exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/ExoCacheFactoryImpl.java =================================================================== --- exo.kernel.component.ext.cache.impl.jboss.v3/src/main/java/org/exoplatform/services/cache/impl/jboss/ExoCacheFactoryImpl.java (revision 4757)