UP-4179: (Interim step) move remaining items out of uportal-war/src/t…

…est/java/org/jasig/... into .../apereo/...

uPortal-utils/src/main/java/org/apereo/portal/utils/PortalApplicationContextLocator.java

@@ -196,7 +196,7 @@ private static class PortalApplicationContextCreator extends
         @Override
         protected ConfigurableApplicationContext createSingleton(Object... args) {
 
-            if (Boolean.getBoolean("org.jasig.portal.test")) {
+            if (Boolean.getBoolean("org.apereo.portal.test")) {
                 throw new IllegalStateException(PortalApplicationContextLocator.class.getName() + " MUST NOT be used in unit tests");
             }
 

uportal-war/pom.xml

@@ -911,7 +911,7 @@
                 <configuration>
                     <argLine>-Xmx512m -XX:MaxPermSize=512m -Duser.timezone=UTC</argLine>
                     <systemPropertyVariables>
-                        <org.jasig.portal.test>true</org.jasig.portal.test>
+                        <org.apereo.portal.test>true</org.apereo.portal.test>
                     </systemPropertyVariables>
                     <includes>
                         <include>**/Test*.java</include>

uportal-war/src/test/groovy/org/apereo/portal/io/xml/portlet/PortletDefinitionImporterExporterTest.groovy

@@ -25,7 +25,7 @@ import org.apereo.portal.groups.ICompositeGroupServiceFactory
 import org.apereo.portal.groups.IEntity
 import org.apereo.portal.groups.IEntityGroup
 import org.apereo.portal.io.xml.portlettype.ExternalPermissionDefinition
-import org.jasig.portal.mock.portlet.om.MockPortletDefinitionId;
+import org.apereo.portal.mock.portlet.om.MockPortletDefinitionId;
 import org.apereo.portal.portlet.dao.IPortletDefinitionDao
 import org.apereo.portal.portlet.dao.jpa.PortletDefinitionImpl
 import org.apereo.portal.portlet.dao.jpa.PortletTypeImpl

uportal-war/src/test/java/org/jasig/portal/aop/AspectJExpressionTest.java → uportal-war/src/test/java/org/apereo/portal/aop/AspectJExpressionTest.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jasig.portal.aop;
+package org.apereo.portal.aop;
 
 import static org.junit.Assert.assertEquals;
 
@@ -40,7 +40,6 @@
 
 /**
  * @author Eric Dalquist
- * @version $Revision$
  */
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = "classpath:aopTestContext.xml")

uportal-war/src/test/java/org/jasig/portal/aop/CountingMethodInterceptor.java → uportal-war/src/test/java/org/apereo/portal/aop/CountingMethodInterceptor.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jasig.portal.aop;
+package org.apereo.portal.aop;
 
 import org.aspectj.lang.ProceedingJoinPoint;
 

uportal-war/src/test/java/org/jasig/portal/aop/RepositoryPointcutInterface.java → uportal-war/src/test/java/org/apereo/portal/aop/RepositoryPointcutInterface.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jasig.portal.aop;
+package org.apereo.portal.aop;
 
 /**
  * @author Eric Dalquist

uportal-war/src/test/java/org/jasig/portal/aop/RepositoryPointcutInterfaceImpl.java → uportal-war/src/test/java/org/apereo/portal/aop/RepositoryPointcutInterfaceImpl.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jasig.portal.aop;
+package org.apereo.portal.aop;
 
 import org.springframework.stereotype.Repository;
 

uportal-war/src/test/java/org/jasig/portal/aop/TestAspect.java → uportal-war/src/test/java/org/apereo/portal/aop/TestAspect.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jasig.portal.aop;
+package org.apereo.portal.aop;
 
 import java.util.concurrent.atomic.AtomicInteger;
 

uportal-war/src/test/java/org/apereo/portal/concurrency/locking/ClusterLockServiceImplDbBackedTest.java

@@ -30,8 +30,8 @@
 
 import org.apereo.portal.IPortalInfoProvider;
 import org.apereo.portal.concurrency.locking.IClusterLockService.TryLockFunctionResult;
-import org.jasig.portal.test.BasePortalJpaDaoTest;
-import org.jasig.portal.test.ThreadGroupRunner;
+import org.apereo.portal.test.BasePortalJpaDaoTest;
+import org.apereo.portal.test.ThreadGroupRunner;
 import org.apereo.portal.utils.threading.ThrowingRunnable;
 import org.junit.Ignore;
 import org.springframework.beans.factory.annotation.Autowired;

uportal-war/src/test/java/org/apereo/portal/concurrency/locking/JpaClusterLockDaoTest.java

@@ -36,8 +36,8 @@
 
 import org.apereo.portal.IPortalInfoProvider;
 import org.apereo.portal.concurrency.CallableWithoutResult;
-import org.jasig.portal.test.BasePortalJpaDaoTest;
-import org.jasig.portal.test.ThreadGroupRunner;
+import org.apereo.portal.test.BasePortalJpaDaoTest;
+import org.apereo.portal.test.ThreadGroupRunner;
 import org.apereo.portal.utils.threading.ThrowingRunnable;
 import org.junit.Ignore;
 import org.junit.Test;

uportal-war/src/test/java/org/apereo/portal/events/AnalyticsIncorporationComponentEventSerializationTest.java

@@ -28,7 +28,7 @@
 import javax.portlet.WindowState;
 import javax.servlet.http.HttpServletRequest;
 
-import org.jasig.portal.mock.portlet.om.MockPortletWindowId;
+import org.apereo.portal.mock.portlet.om.MockPortletWindowId;
 import org.apereo.portal.rendering.AnalyticsIncorporationComponent;
 import org.apereo.portal.security.SystemPerson;
 import org.junit.Before;

uportal-war/src/test/java/org/apereo/portal/events/JacksonPortalEventTest.java

@@ -32,7 +32,7 @@
 import javax.portlet.WindowState;
 import javax.xml.namespace.QName;
 
-import org.jasig.portal.mock.portlet.om.MockPortletWindowId;
+import org.apereo.portal.mock.portlet.om.MockPortletWindowId;
 import org.apereo.portal.portlet.rendering.worker.IPortletExecutionWorker;
 import org.apereo.portal.security.SystemPerson;
 import org.apereo.portal.spring.beans.factory.ObjectMapperFactoryBean;

uportal-war/src/test/java/org/apereo/portal/events/JpaPortalEventStoreTest.java

@@ -38,9 +38,9 @@
 import org.apereo.portal.concurrency.CallableWithoutResult;
 import org.apereo.portal.concurrency.FunctionWithoutResult;
 import org.apereo.portal.events.handlers.db.IPortalEventDao;
-import org.jasig.portal.mock.portlet.om.MockPortletWindowId;
+import org.apereo.portal.mock.portlet.om.MockPortletWindowId;
 import org.apereo.portal.security.SystemPerson;
-import org.jasig.portal.test.BaseRawEventsJpaDaoTest;
+import org.apereo.portal.test.BaseRawEventsJpaDaoTest;
 import org.joda.time.DateTime;
 import org.junit.Test;
 import org.junit.runner.RunWith;

uportal-war/src/test/java/org/apereo/portal/events/aggr/JpaBaseAggregationDaoTest.java

@@ -47,7 +47,7 @@
 import org.apereo.portal.events.aggr.groups.AggregatedGroupMapping;
 import org.apereo.portal.groups.ICompositeGroupService;
 import org.apereo.portal.groups.IEntityGroup;
-import org.jasig.portal.test.BaseAggrEventsJpaDaoTest;
+import org.apereo.portal.test.BaseAggrEventsJpaDaoTest;
 import org.apereo.portal.utils.Tuple;
 import org.joda.time.DateMidnight;
 import org.joda.time.DateTime;

uportal-war/src/test/java/org/apereo/portal/events/aggr/JpaStatisticalSummaryTest.java

@@ -29,7 +29,7 @@
 import org.apache.commons.math3.stat.descriptive.summary.Sum;
 import org.apache.commons.math3.stat.descriptive.summary.SumOfLogs;
 import org.apache.commons.math3.stat.descriptive.summary.SumOfSquares;
-import org.jasig.portal.test.BaseAggrEventsJpaDaoTest;
+import org.apereo.portal.test.BaseAggrEventsJpaDaoTest;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;

uportal-war/src/test/java/org/apereo/portal/events/aggr/dao/jpa/JpaDateTimeDimensionDaoTest.java

@@ -29,7 +29,7 @@
 import org.apereo.portal.events.aggr.DateDimension;
 import org.apereo.portal.events.aggr.dao.DateDimensionDao;
 import org.apereo.portal.events.aggr.dao.TimeDimensionDao;
-import org.jasig.portal.test.BaseAggrEventsJpaDaoTest;
+import org.apereo.portal.test.BaseAggrEventsJpaDaoTest;
 import org.joda.time.DateMidnight;
 import org.junit.Test;
 import org.junit.runner.RunWith;

uportal-war/src/test/java/org/apereo/portal/events/aggr/dao/jpa/JpaEventAggregationManagementDaoTest.java

@@ -44,7 +44,7 @@
 import org.apereo.portal.events.aggr.login.LoginPortalEventAggregator;
 import org.apereo.portal.groups.ICompositeGroupService;
 import org.apereo.portal.groups.IEntityGroup;
-import org.jasig.portal.test.BaseAggrEventsJpaDaoTest;
+import org.apereo.portal.test.BaseAggrEventsJpaDaoTest;
 import org.joda.time.DateMidnight;
 import org.joda.time.MonthDay;
 import org.junit.Test;

uportal-war/src/test/java/org/apereo/portal/events/aggr/groups/JpaAggregatedGroupLookupDaoTest.java

@@ -28,7 +28,7 @@
 import org.apereo.portal.concurrency.CallableWithoutResult;
 import org.apereo.portal.groups.ICompositeGroupService;
 import org.apereo.portal.groups.IEntityGroup;
-import org.jasig.portal.test.BaseAggrEventsJpaDaoTest;
+import org.apereo.portal.test.BaseAggrEventsJpaDaoTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;

uportal-war/src/test/java/org/apereo/portal/events/aggr/portlets/JpaAggregatedPortletLookupDaoTest.java

@@ -21,7 +21,7 @@
 import org.apereo.portal.concurrency.CallableWithoutResult;
 import org.apereo.portal.portlet.dao.IPortletDefinitionDao;
 import org.apereo.portal.portlet.om.IPortletDefinition;
-import org.jasig.portal.test.BaseAggrEventsJpaDaoTest;
+import org.apereo.portal.test.BaseAggrEventsJpaDaoTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;

uportal-war/src/test/java/org/apereo/portal/events/aggr/session/JpaEventSessionDaoTest.java

@@ -26,7 +26,7 @@
 import org.apereo.portal.groups.ICompositeGroupService;
 import org.apereo.portal.groups.IEntityGroup;
 import org.apereo.portal.security.IPerson;
-import org.jasig.portal.test.BaseAggrEventsJpaDaoTest;
+import org.apereo.portal.test.BaseAggrEventsJpaDaoTest;
 import org.joda.time.DateTime;
 import org.junit.Test;
 import org.junit.runner.RunWith;

uportal-war/src/test/java/org/apereo/portal/events/aggr/tabs/JpaAggregatedTabLookupDaoTest.java

@@ -26,7 +26,7 @@
 
 import org.apereo.portal.concurrency.CallableWithoutResult;
 import org.apereo.portal.jpa.BasePortalJpaDao;
-import org.jasig.portal.test.BaseAggrEventsJpaDaoTest;
+import org.apereo.portal.test.BaseAggrEventsJpaDaoTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;

uportal-war/src/test/java/org/apereo/portal/i18n/JpaMultilingualMessageDaoTest.java

@@ -26,7 +26,7 @@
 import java.util.concurrent.Callable;
 
 import org.apereo.portal.i18n.dao.IMessageDao;
-import org.jasig.portal.test.BasePortalJpaDaoTest;
+import org.apereo.portal.test.BasePortalJpaDaoTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;

uportal-war/src/test/java/org/apereo/portal/io/xml/AggrIdentityImportExportTest.java

@@ -19,7 +19,7 @@
 package org.apereo.portal.io.xml;
 
 import org.apereo.portal.io.xml.eventaggr.ExternalEventAggregationConfiguration;
-import org.jasig.portal.test.BaseAggrEventsJpaDaoTest;
+import org.apereo.portal.test.BaseAggrEventsJpaDaoTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.core.io.ClassPathResource;

uportal-war/src/test/java/org/apereo/portal/io/xml/IdentityImportExportAggrEventsTest.java

@@ -21,8 +21,8 @@
 import org.apereo.portal.events.aggr.groups.AggregatedGroupLookupDao;
 import org.apereo.portal.io.xml.eventaggr.ExternalEventAggregationConfiguration;
 import org.apereo.portal.spring.MockitoFactoryBean;
-import org.jasig.portal.test.BaseAggrEventsJpaDaoTest;
-import org.jasig.portal.test.TimeZoneTestUtils;
+import org.apereo.portal.test.BaseAggrEventsJpaDaoTest;
+import org.apereo.portal.test.TimeZoneTestUtils;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;

uportal-war/src/test/java/org/apereo/portal/io/xml/IdentityImportExportTest.java

@@ -27,8 +27,8 @@
 import org.apereo.portal.io.xml.ssd.ExternalStylesheetDescriptor;
 import org.apereo.portal.io.xml.subscribedfragment.ExternalSubscribedFragments;
 import org.apereo.portal.io.xml.user.UserType;
-import org.jasig.portal.test.BasePortalJpaDaoTest;
-import org.jasig.portal.test.TimeZoneTestUtils;
+import org.apereo.portal.test.BasePortalJpaDaoTest;
+import org.apereo.portal.test.TimeZoneTestUtils;
 import org.apereo.portal.ICounterStore;
 import org.apereo.portal.utils.Tuple;
 import org.junit.After;

uportal-war/src/test/java/org/apereo/portal/jgroups/auth/JdbcAuthDaoTest.java

@@ -24,7 +24,7 @@
 import java.util.concurrent.Callable;
 
 import org.apereo.portal.concurrency.CallableWithoutResult;
-import org.jasig.portal.test.BasePortalJpaDaoTest;
+import org.apereo.portal.test.BasePortalJpaDaoTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;

uportal-war/src/test/java/org/apereo/portal/jgroups/protocols/JdbcPingDaoTest.java

@@ -27,7 +27,7 @@
 import java.util.Map.Entry;
 
 import org.apereo.portal.concurrency.CallableWithoutResult;
-import org.jasig.portal.test.BasePortalJpaDaoTest;
+import org.apereo.portal.test.BasePortalJpaDaoTest;
 import org.jgroups.Address;
 import org.jgroups.PhysicalAddress;
 import org.jgroups.stack.IpAddress;

uportal-war/src/test/java/org/apereo/portal/layout/dao/jpa/JpaStylesheetDescriptorDaoTest.java

@@ -38,7 +38,7 @@
 import org.apereo.portal.layout.om.IStylesheetDescriptor;
 import org.apereo.portal.layout.om.IStylesheetUserPreferences;
 import org.apereo.portal.security.IPerson;
-import org.jasig.portal.test.BasePortalJpaDaoTest;
+import org.apereo.portal.test.BasePortalJpaDaoTest;
 import org.apereo.portal.utils.MapPopulator;
 import org.junit.Before;
 import org.junit.Test;

uportal-war/src/test/java/org/apereo/portal/layout/dlm/JpaFragmentDefinitionDaoTest.java

@@ -29,7 +29,7 @@
 import java.util.Set;
 import java.util.concurrent.Callable;
 
-import org.jasig.portal.test.BasePortalJpaDaoTest;
+import org.apereo.portal.test.BasePortalJpaDaoTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;

uportal-war/src/test/java/org/jasig/portal/mock/portlet/om/MockPortletDefinitionId.java → uportal-war/src/test/java/org/apereo/portal/mock/portlet/om/MockPortletDefinitionId.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jasig.portal.mock.portlet.om;
+package org.apereo.portal.mock.portlet.om;
 
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;

uportal-war/src/test/java/org/jasig/portal/mock/portlet/om/MockPortletEntityId.java → uportal-war/src/test/java/org/apereo/portal/mock/portlet/om/MockPortletEntityId.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jasig.portal.mock.portlet.om;
+package org.apereo.portal.mock.portlet.om;
 
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;

uportal-war/src/test/java/org/jasig/portal/mock/portlet/om/MockPortletWindowId.java → uportal-war/src/test/java/org/apereo/portal/mock/portlet/om/MockPortletWindowId.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jasig.portal.mock.portlet.om;
+package org.apereo.portal.mock.portlet.om;
 
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;

uportal-war/src/test/java/org/apereo/portal/persondir/dao/jpa/JpaLocalAccountDaoImplTest.java

@@ -29,7 +29,7 @@
 import org.apereo.portal.persondir.ILocalAccountDao;
 import org.apereo.portal.persondir.ILocalAccountPerson;
 import org.apereo.portal.persondir.LocalAccountQuery;
-import org.jasig.portal.test.BasePortalJpaDaoTest;
+import org.apereo.portal.test.BasePortalJpaDaoTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;

uportal-war/src/test/java/org/apereo/portal/portlet/container/cache/PortletCacheControlServiceImplTest.java

@@ -36,8 +36,8 @@
 import net.sf.ehcache.CacheManager;
 
 import org.apache.pluto.container.om.portlet.PortletDefinition;
-import org.jasig.portal.mock.portlet.om.MockPortletDefinitionId;
-import org.jasig.portal.mock.portlet.om.MockPortletWindowId;
+import org.apereo.portal.mock.portlet.om.MockPortletDefinitionId;
+import org.apereo.portal.mock.portlet.om.MockPortletWindowId;
 import org.apereo.portal.portlet.om.IPortletEntity;
 import org.apereo.portal.portlet.om.IPortletWindow;
 import org.apereo.portal.portlet.registry.IPortletDefinitionRegistry;

uportal-war/src/test/java/org/apereo/portal/portlet/dao/jpa/JpaMarketplaceRatingDaoTest.java

@@ -36,7 +36,7 @@
 import org.apereo.portal.portlet.om.IPortletDefinition;
 import org.apereo.portal.portlet.om.IPortletType;
 import org.apereo.portal.portlet.marketplace.IMarketplaceRating;
-import org.jasig.portal.test.BasePortalJpaDaoTest;
+import org.apereo.portal.test.BasePortalJpaDaoTest;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

uportal-war/src/test/java/org/apereo/portal/portlet/dao/jpa/JpaPortletCookieDaoImplTest.java

@@ -28,7 +28,7 @@
 
 import org.apereo.portal.portlet.dao.IPortletCookieDao;
 import org.apereo.portal.portlet.om.IPortalCookie;
-import org.jasig.portal.test.BasePortalJpaDaoTest;
+import org.apereo.portal.test.BasePortalJpaDaoTest;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;

uportal-war/src/test/java/org/apereo/portal/portlet/dao/jpa/JpaPortletDaoTest.java

@@ -40,7 +40,7 @@
 import org.apereo.portal.portlet.om.IPortletEntityId;
 import org.apereo.portal.portlet.om.IPortletPreference;
 import org.apereo.portal.portlet.om.IPortletType;
-import org.jasig.portal.test.BasePortalJpaDaoTest;
+import org.apereo.portal.test.BasePortalJpaDaoTest;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

uportal-war/src/test/java/org/apereo/portal/portlet/registry/PortletEntityRegistryImplTest.java

@@ -44,7 +44,7 @@
 import org.apereo.portal.portlet.om.IPortletPreference;
 import org.apereo.portal.portlet.om.IPortletType;
 import org.apereo.portal.security.IPerson;
-import org.jasig.portal.test.BasePortalJpaDaoTest;
+import org.apereo.portal.test.BasePortalJpaDaoTest;
 import org.apereo.portal.url.IPortalRequestUtils;
 import org.apereo.portal.user.IUserInstance;
 import org.apereo.portal.user.IUserInstanceManager;

uportal-war/src/test/java/org/apereo/portal/portlet/rendering/PortletEventCoordinatationServiceTest.java

@@ -38,7 +38,7 @@
 import org.apache.pluto.container.om.portlet.EventDefinitionReference;
 import org.apache.pluto.container.om.portlet.PortletApplicationDefinition;
 import org.apache.pluto.container.om.portlet.PortletDefinition;
-import org.jasig.portal.mock.portlet.om.MockPortletDefinitionId;
+import org.apereo.portal.mock.portlet.om.MockPortletDefinitionId;
 import org.apereo.portal.portlet.registry.IPortletDefinitionRegistry;
 import org.junit.Test;
 import org.junit.runner.RunWith;

uportal-war/src/test/java/org/apereo/portal/rendering/RenderingPipelineIntegrationTest.java

@@ -34,7 +34,7 @@
 import javax.xml.stream.events.XMLEvent;
 import javax.xml.transform.OutputKeys;
 
-import org.jasig.portal.mock.portlet.om.MockPortletWindowId;
+import org.apereo.portal.mock.portlet.om.MockPortletWindowId;
 import org.apereo.portal.portlet.om.IPortletWindow;
 import org.apereo.portal.portlet.om.IPortletWindowId;
 import org.apereo.portal.portlet.registry.IPortletEntityRegistry;

uportal-war/src/test/java/org/jasig/portal/test/BaseAggrEventsJpaDaoTest.java → uportal-war/src/test/java/org/apereo/portal/test/BaseAggrEventsJpaDaoTest.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jasig.portal.test;
+package org.apereo.portal.test;
 
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;

uportal-war/src/test/java/org/jasig/portal/test/BaseJpaDaoTest.java → uportal-war/src/test/java/org/apereo/portal/test/BaseJpaDaoTest.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.jasig.portal.test;
+package org.apereo.portal.test;
 
 import java.lang.reflect.AccessibleObject;
 import java.lang.reflect.Method;