UP-4179: Revert unwanted changes to uportal-war/src/test/resources/or…

…g/apereo/portal/io/ that were made auto-magically by the IDE in repackaging from 'org.jasig.portal' to 'org.apereo.portal'
uPortal-Project · Sep 16, 2016 · 75787b8 · 75787b8
1 parent 85de7eb
commit 75787b8
Show file tree

Hide file tree

Showing 6 changed files with 116 additions and 5 deletions.
diff --git a/uportal-war/src/test/java/org/apereo/portal/io/xml/AggrIdentityImportExportTest.java b/uportal-war/src/test/java/org/apereo/portal/io/xml/AggrIdentityImportExportTest.java
@@ -43,7 +43,7 @@ public class AggrIdentityImportExportTest extends BaseAggrEventsJpaDaoTest {
 
     @Test
     public void testEventAggregationConfiguration40ImportExport() throws Exception {
-        final ClassPathResource stylesheetDescriptorResource = new ClassPathResource("/org/apereo/portal/io/xml/eventaggr/test_4-0.event-aggregation.xml");
+        final ClassPathResource stylesheetDescriptorResource = new ClassPathResource("/org/apereo/portal/io/xml/eventaggr/test_5-0.event-aggregation.xml");
 
         IdentityImportExportTestUtilities.testIdentityImportExport(this.transactionOperations,
                 this.eventAggregationConfigurationImporter, this.eventAggregationConfigurationExporter,

diff --git a/uportal-war/src/test/java/org/apereo/portal/io/xml/IdentityImportExportTest.java b/uportal-war/src/test/java/org/apereo/portal/io/xml/IdentityImportExportTest.java
@@ -207,7 +207,7 @@ public String apply(UserType input) {
 
     @Test
     public void testFragmentDefinition31ImportExport() throws Exception {
-        final ClassPathResource dataResource = new ClassPathResource("/org/apereo/portal/io/xml/fragment-definition/academic-tab_3-1.fragment-definition.xml");
+        final ClassPathResource dataResource = new ClassPathResource("/org/apereo/portal/io/xml/fragment-definition/academic-tab_5-0.fragment-definition.xml");
 
         IdentityImportExportTestUtilities.<Tuple<String, Element>>testIdentityImportExport(this.transactionOperations,
                 this.fragmentDefinitionImporter, this.fragmentDefinitionExporter,

diff --git a/...-war/src/test/resources/org/apereo/portal/io/xml/eventaggr/test_4-0.event-aggregation.xml b/...-war/src/test/resources/org/apereo/portal/io/xml/eventaggr/test_4-0.event-aggregation.xml
@@ -19,6 +19,15 @@
     under the License.
 
 -->
+<!--
+ | NOTE:  This file currently isn't used by anything.  It contains the pre-5.0
+ | vales for aggregator-type (i.e. 'org.jasig.portal').  The 5-0 version of this
+ | file is used in an 'identity' test -- meaning that you should get exactly the
+ | same file if you import then re-export.  That's not what we would want from
+ | this file.  The import process should detect and correct the package names.
+ | Re-exporting should contain the new package names.  In the future, we could
+ | write a test for that using this file.
+ +-->
 <event-aggregation
     xmlns="https://source.jasig.org/schemas/uportal/io/event-aggregation"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -27,15 +36,15 @@
     version="4.0">
 
     <aggregated-group-config>
-        <aggregator-type>org.apereo.portal.events.aggr.login.LoginPortalEventAggregator</aggregator-type>
+        <aggregator-type>org.jasig.portal.events.aggr.login.LoginPortalEventAggregator</aggregator-type>
         <exclude>
             <groupService>local</groupService>
             <groupName>Guest</groupName>
         </exclude>
     </aggregated-group-config>
 
     <aggregated-interval-config>
-        <aggregator-type>org.apereo.portal.events.aggr.IPortalEventAggregator</aggregator-type>
+        <aggregator-type>org.jasig.portal.events.aggr.IPortalEventAggregator</aggregator-type>
         <exclude>MINUTE</exclude>
     </aggregated-interval-config>
 

diff --git a/...-war/src/test/resources/org/apereo/portal/io/xml/eventaggr/test_5-0.event-aggregation.xml b/...-war/src/test/resources/org/apereo/portal/io/xml/eventaggr/test_5-0.event-aggregation.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+
+    Licensed to Apereo under one or more contributor license
+    agreements. See the NOTICE file distributed with this work
+    for additional information regarding copyright ownership.
+    Apereo licenses this file to you under the Apache License,
+    Version 2.0 (the "License"); you may not use this file
+    except in compliance with the License.  You may obtain a
+    copy of the License at the following location:
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<event-aggregation
+    xmlns="https://source.jasig.org/schemas/uportal/io/event-aggregation"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="
+        https://source.jasig.org/schemas/uportal/io/event-aggregation https://source.jasig.org/schemas/uportal/io/event-aggregation/event-aggregation-4.0.xsd"
+    version="4.0">
+
+    <aggregated-group-config>
+        <aggregator-type>org.apereo.portal.events.aggr.login.LoginPortalEventAggregator</aggregator-type>
+        <exclude>
+            <groupService>local</groupService>
+            <groupName>Guest</groupName>
+        </exclude>
+    </aggregated-group-config>
+
+    <aggregated-interval-config>
+        <aggregator-type>org.apereo.portal.events.aggr.IPortalEventAggregator</aggregator-type>
+        <exclude>MINUTE</exclude>
+    </aggregated-interval-config>
+
+    <quarter-details>
+        <id>0</id>
+        <start>--01-01</start>
+        <end>--04-01</end>
+    </quarter-details>
+    <quarter-details>
+        <id>1</id>
+        <start>--04-01</start>
+        <end>--07-01</end>
+    </quarter-details>
+    <quarter-details>
+        <id>2</id>
+        <start>--07-01</start>
+        <end>--10-01</end>
+    </quarter-details>
+    <quarter-details>
+        <id>3</id>
+        <start>--10-01</start>
+        <end>--01-01</end>
+    </quarter-details>
+</event-aggregation>
diff --git a/...ces/org/apereo/portal/io/xml/fragment-definition/academic-tab_3-1.fragment-definition.xml b/...ces/org/apereo/portal/io/xml/fragment-definition/academic-tab_3-1.fragment-definition.xml
@@ -19,9 +19,18 @@
     under the License.
 
 -->
+<!--
+ | NOTE:  This file currently isn't used by anything.  It contains the pre-5.0
+ | vales for audience (i.e. 'org.jasig.portal').  The 5-0 version of this
+ | file is used in an 'identity' test -- meaning that you should get exactly the
+ | same file if you import then re-export.  That's not what we would want from
+ | this file.  The import process should detect and correct the package names.
+ | Re-exporting should contain the new package names.  In the future, we could
+ | write a test for that using this file.
+ +-->
 <fragment-definition xmlns:dlm="http://org.jasig.portal.layout.dlm.config" script="classpath://org/jasig/portal/io/import-fragment-definition_v3-1.crn">
   <dlm:fragment name="Academics Tab" ownerID="sakai-tab" precedence="95.0">
-    <dlm:audience evaluatorFactory="org.apereo.portal.layout.dlm.providers.PersonEvaluatorFactory">
+    <dlm:audience evaluatorFactory="org.jasig.portal.layout.dlm.providers.PersonEvaluatorFactory">
       <paren mode="OR">
         <attribute name="contentGroup" mode="equals" value="student"/>
         <attribute name="contentGroup" mode="equals" value="faculty"/>

diff --git a/...ces/org/apereo/portal/io/xml/fragment-definition/academic-tab_5-0.fragment-definition.xml b/...ces/org/apereo/portal/io/xml/fragment-definition/academic-tab_5-0.fragment-definition.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+
+    Licensed to Apereo under one or more contributor license
+    agreements. See the NOTICE file distributed with this work
+    for additional information regarding copyright ownership.
+    Apereo licenses this file to you under the Apache License,
+    Version 2.0 (the "License"); you may not use this file
+    except in compliance with the License.  You may obtain a
+    copy of the License at the following location:
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+
+-->
+<fragment-definition xmlns:dlm="http://org.jasig.portal.layout.dlm.config" script="classpath://org/jasig/portal/io/import-fragment-definition_v3-1.crn">
+  <dlm:fragment name="Academics Tab" ownerID="sakai-tab" precedence="95.0">
+    <dlm:audience evaluatorFactory="org.apereo.portal.layout.dlm.providers.PersonEvaluatorFactory">
+      <paren mode="OR">
+        <attribute name="contentGroup" mode="equals" value="student"/>
+        <attribute name="contentGroup" mode="equals" value="faculty"/>
+      </paren>
+    </dlm:audience>
+  </dlm:fragment>
+</fragment-definition>