diff --git a/NOTICE b/NOTICE
index 7309e9558ee..a8d4ac1c2d9 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,6 +1,6 @@
-Copyright 2010, JA-SIG, Inc.
-This project includes software developed by Jasig.
-http://www.jasig.org/
+Copyright 2010-2014, Apereo Foundation
+This project includes software developed by the Apereo Foundation.
+http://www.apereo.org/
 
 Licensed under the Apache License, Version 2.0 (the
 "License"); you may not use this file except in compliance
@@ -35,6 +35,10 @@ This project includes:
   AOP alliance under Public Domain
   Apache Ant Core under The Apache Software License, Version 2.0
   Apache Ant Launcher under The Apache Software License, Version 2.0
+  Apache Commons Codec under The Apache Software License, Version 2.0
+  Apache Commons Compress under The Apache Software License, Version 2.0
+  Apache Commons FileUpload under The Apache Software License, Version 2.0
+  Apache HttpCore under Apache License, Version 2.0
   Apache Pluto Container API under The Apache Software License, Version 2.0
   Apache Pluto Container Driver API under The Apache Software License, Version 2.0
   Apache Pluto Portal Driver under The Apache Software License, Version 2.0
@@ -49,15 +53,13 @@ This project includes:
   ASM Util under BSD
   AspectJ runtime under Eclipse Public License - v 1.0
   AspectJ weaver under Eclipse Public License - v 1.0
+  c3p0:JDBC DataSources/Resource Pools under GNU LESSER GENERAL PUBLIC LICENSE
   CC/PP API under Sun Microsystems, Inc. Binary Code License Agreement
   Cernunnos - Core under Apache 2
   Code Generation Library under ASF 2.0
   Commons CLI under The Apache Software License, Version 2.0
-  Commons Codec under The Apache Software License, Version 2.0
   Commons Collections under The Apache Software License, Version 2.0
-  Commons Compress under The Apache Software License, Version 2.0
   Commons DBCP under The Apache Software License, Version 2.0
-  Commons FileUpload under The Apache Software License, Version 2.0
   Commons IO under The Apache Software License, Version 2.0
   Commons JEXL under The Apache Software License, Version 2.0
   Commons Lang under The Apache Software License, Version 2.0
@@ -79,20 +81,21 @@ This project includes:
   Hibernate Commons Annotations under GNU LESSER GENERAL PUBLIC LICENSE
   Hibernate JPA 2 Metamodel Generator under Apache License, Version 2.0
   HttpClient under Apache License
-  HttpCore under Apache License
   HyperSQL Database under HSQLDB License, a BSD open source license
   ICU4J under ICU License
   Jackson-annotations under The Apache Software License, Version 2.0 or GNU Lesser General Public License, Version 2.1
   Jackson-core under The Apache Software License, Version 2.0 or GNU Lesser General Public License, Version 2.1
   jackson-databind under The Apache Software License, Version 2.0 or GNU Lesser General Public License, Version 2.1
   Jackson-module-JAXB-annotations under The Apache Software License, Version 2.0 or GNU Lesser General Public License, Version 2.1
+  Jadira Usertype Core (for Joda Time, Joda Money, Libphonenum and JDK Types with Hibernate) under Apache 2
+  Jadira Usertype SPI Classes for Hibernate under Apache 2
   jansi under The Apache Software License, Version 2.0
   Jasig CAS ClearPass Extension under Apache 2
   Jasig CAS Client for Java - Core under Apache License Version 2.0
+  Jasig CAS Client for Java - Distributed Proxy Storage Support: EhCache under Apache License Version 2.0
   JASYPT: Java Simplified Encryption under The Apache Software License, Version 2.0
   Java Portlet Specification V2.0 under Commons Development and Distribution License, Version 1.0
   Java Servlet API under CDDL + GPLv2 with classpath exception
-  Java Transaction API under Commons Development and Distribution License, Version 1.0
   JavaBeans(TM) Activation Framework under COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
   JavaMail API (compat) under CDDL or GPLv2+CE
   JavaServer Pages(TM) API under CDDL + GPLv2 with classpath exception
@@ -104,12 +107,14 @@ This project includes:
   jdom under Apache style license
   JGroups under GNU Lesser General Public License 2.1
   JGroups Replication under The Apache Software License, Version 2.0
-  JLine under BSD
-  Joda money under Apache 2
-  Joda time under Apache 2
+  JLine under The BSD License
+  Joda-Time under Apache 2
+  Joda-Time JSP tags support under Apache 2
   JPA 2.0 API under Sun Binary Code License
+  JSON (JavaScript Object Notation) under provided without support or warranty
   json-lib under Apache License, Version 2.0
   Json-lib4Spring under The Apache Software License, Version 2.0
+  JSONassert under The Apache Software License, Version 2.0
   jstl under Commons Development and Distribution License, Version 1.0
   JUL to SLF4J bridge under MIT License
   JUnit under Common Public License Version 1.0
@@ -127,7 +132,7 @@ This project includes:
   Person Directory API under Apache License Version 2.0
   Person Directory Implementations under Apache License Version 2.0
   Portlet JDBC Utilities under Apache License Version 2.0
-  Quartz Enterprise Job Scheduler under Apache 2.0
+  quartz under The Apache Software License, Version 2.0
   Resource Server API under Apache License Version 2.0
   Resource Server Core under Apache License Version 2.0
   Resource Server Utilities under Apache License Version 2.0
@@ -169,8 +174,6 @@ This project includes:
   uPortal Platform API under Apache License Version 2.0
   uPortal Search API under Apache License Version 2.0
   uPortal WAR under Apache License Version 2.0
-  Usertype Core (supporting Joda Time and Joda Money with Hibernate) under Apache 2
-  Usertype SPI Classes for Hibernate under Apache 2
   Woodstox under The Apache Software License, Version 2.0
   XML Pull Parsing API under Public Domain
   XMLUnit for Java under BSD License
@@ -178,7 +181,7 @@ This project includes:
   XZ for Java under Public Domain
 
  
-This project also includes code under copyright of the following institutions:
+This project also includes code under copywrite of the following institutions:
  University of Chicago
  University of Wisconsin
  Yale University 
diff --git a/uportal-portlets-overlay/cas/src/main/webapp/WEB-INF/cas.properties b/uportal-portlets-overlay/cas/src/main/webapp/WEB-INF/cas.properties
index b78ebc32cf7..4601cf083d0 100644
--- a/uportal-portlets-overlay/cas/src/main/webapp/WEB-INF/cas.properties
+++ b/uportal-portlets-overlay/cas/src/main/webapp/WEB-INF/cas.properties
@@ -4,15 +4,15 @@
 # for additional information regarding copyright ownership.
 # Jasig 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:
+# except in compliance with the License. You may obtain a
+# copy of the License at:
 #
-#   http://www.apache.org/licenses/LICENSE-2.0
+# 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
+# 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.
 #
diff --git a/uportal-war/src/main/data/default_entities/group_membership/Featured.group-membership.xml b/uportal-war/src/main/data/default_entities/group_membership/Featured.group-membership.xml
index ba9a3d599ca..9a26f539ad1 100644
--- a/uportal-war/src/main/data/default_entities/group_membership/Featured.group-membership.xml
+++ b/uportal-war/src/main/data/default_entities/group_membership/Featured.group-membership.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to Jasig under one or more contributor license
+    agreements. See the NOTICE file distributed with this work
+    for additional information regarding copyright ownership.
+    Jasig 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:
+
+    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.
+
+-->
 <group script="classpath://org/jasig/portal/io/import-group_membership_v3-2.crn">
   <name>Featured</name>
   <entity-type>org.jasig.portal.portlet.om.IPortletDefinition</entity-type>
diff --git a/uportal-war/src/main/data/default_entities/portlet-definition/tenant-manager.portlet-definition.xml b/uportal-war/src/main/data/default_entities/portlet-definition/tenant-manager.portlet-definition.xml
index 969a557a43b..3208038f605 100644
--- a/uportal-war/src/main/data/default_entities/portlet-definition/tenant-manager.portlet-definition.xml
+++ b/uportal-war/src/main/data/default_entities/portlet-definition/tenant-manager.portlet-definition.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+
+    Licensed to Jasig under one or more contributor license
+    agreements. See the NOTICE file distributed with this work
+    for additional information regarding copyright ownership.
+    Jasig 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:
+
+    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.
+
+-->
 <portlet-definition xmlns="https://source.jasig.org/schemas/uportal/io/portlet-definition" xmlns:ns2="https://source.jasig.org/schemas/uportal" xmlns:ns3="https://source.jasig.org/schemas/uportal/io/stylesheet-descriptor" xmlns:ns4="https://source.jasig.org/schemas/uportal/io/subscribed-fragment" xmlns:ns5="https://source.jasig.org/schemas/uportal/io/permission-owner" xmlns:ns6="https://source.jasig.org/schemas/uportal/io/user" xmlns:ns7="https://source.jasig.org/schemas/uportal/io/portlet-type" xmlns:ns8="https://source.jasig.org/schemas/uportal/io/event-aggregation" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="4.0" xsi:schemaLocation="https://source.jasig.org/schemas/uportal/io/portlet-definition https://source.jasig.org/schemas/uportal/io/portlet-definition/portlet-definition-4.0.xsd">
     <title>Tenant Manager</title>
     <name>Tenant Manager</name>
diff --git a/uportal-war/src/main/data/quickstart_entities/fragment-layout/_favorite-lo.fragment-layout.xml b/uportal-war/src/main/data/quickstart_entities/fragment-layout/_favorite-lo.fragment-layout.xml
index 031da56cb6d..aadb9885fc5 100644
--- a/uportal-war/src/main/data/quickstart_entities/fragment-layout/_favorite-lo.fragment-layout.xml
+++ b/uportal-war/src/main/data/quickstart_entities/fragment-layout/_favorite-lo.fragment-layout.xml
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to Jasig under one or more contributor license
+    agreements. See the NOTICE file distributed with this work
+    for additional information regarding copyright ownership.
+    Jasig 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:
+
+    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.
+
+-->
 <layout xmlns:dlm="http://www.uportal.org/layout/dlm" script="classpath://org/jasig/portal/io/import-layout_v3-2.crn" 
   username="favorite-lo">
   <folder ID="s1" hidden="false" immutable="false" name="Root folder" type="root" unremovable="true">
diff --git a/uportal-war/src/main/java/org/jasig/portal/portlet/marketplace/IMarketplaceService.java b/uportal-war/src/main/java/org/jasig/portal/portlet/marketplace/IMarketplaceService.java
index d49da7a6137..1f037112cf2 100644
--- a/uportal-war/src/main/java/org/jasig/portal/portlet/marketplace/IMarketplaceService.java
+++ b/uportal-war/src/main/java/org/jasig/portal/portlet/marketplace/IMarketplaceService.java
@@ -1,4 +1,4 @@
-/*
+/**
  * Licensed to Jasig under one or more contributor license
  * agreements. See the NOTICE file distributed with this work
  * for additional information regarding copyright ownership.
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.jasig.portal.portlet.marketplace;
 
 import org.jasig.portal.portlet.om.IPortletDefinition;
diff --git a/uportal-war/src/main/java/org/jasig/portal/portlet/marketplace/MarketplaceService.java b/uportal-war/src/main/java/org/jasig/portal/portlet/marketplace/MarketplaceService.java
index 2209419630b..69b8b99a3e2 100644
--- a/uportal-war/src/main/java/org/jasig/portal/portlet/marketplace/MarketplaceService.java
+++ b/uportal-war/src/main/java/org/jasig/portal/portlet/marketplace/MarketplaceService.java
@@ -1,4 +1,4 @@
-/*
+/**
  * Licensed to Jasig under one or more contributor license
  * agreements. See the NOTICE file distributed with this work
  * for additional information regarding copyright ownership.
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.jasig.portal.portlet.marketplace;
 
 import org.apache.commons.lang3.Validate;
diff --git a/uportal-war/src/main/java/org/jasig/portal/portlets/favorites/AbstractFavoritesController.java b/uportal-war/src/main/java/org/jasig/portal/portlets/favorites/AbstractFavoritesController.java
index cc09075d4c5..a6882a6009d 100644
--- a/uportal-war/src/main/java/org/jasig/portal/portlets/favorites/AbstractFavoritesController.java
+++ b/uportal-war/src/main/java/org/jasig/portal/portlets/favorites/AbstractFavoritesController.java
@@ -1,5 +1,5 @@
-/*
- * Licensed to Apereo under one or more contributor license
+/**
+ * Licensed to Jasig under one or more contributor license
  * agreements. See the NOTICE file distributed with this work
  * for additional information regarding copyright ownership.
  * Jasig licenses this file to you under the Apache License,
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.jasig.portal.portlets.favorites;
 
 import org.jasig.portal.url.IPortalRequestUtils;
diff --git a/uportal-war/src/main/java/org/jasig/portal/portlets/favorites/FavoritesController.java b/uportal-war/src/main/java/org/jasig/portal/portlets/favorites/FavoritesController.java
index 87a26433c21..f67547cd15a 100644
--- a/uportal-war/src/main/java/org/jasig/portal/portlets/favorites/FavoritesController.java
+++ b/uportal-war/src/main/java/org/jasig/portal/portlets/favorites/FavoritesController.java
@@ -1,5 +1,5 @@
-/*
- * Licensed to Apereo under one or more contributor license
+/**
+ * Licensed to Jasig under one or more contributor license
  * agreements. See the NOTICE file distributed with this work
  * for additional information regarding copyright ownership.
  * Jasig licenses this file to you under the Apache License,
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.jasig.portal.portlets.favorites;
 
 
diff --git a/uportal-war/src/main/java/org/jasig/portal/portlets/favorites/FavoritesEditController.java b/uportal-war/src/main/java/org/jasig/portal/portlets/favorites/FavoritesEditController.java
index 05dc4a621a4..06bf9ed13b3 100644
--- a/uportal-war/src/main/java/org/jasig/portal/portlets/favorites/FavoritesEditController.java
+++ b/uportal-war/src/main/java/org/jasig/portal/portlets/favorites/FavoritesEditController.java
@@ -1,5 +1,5 @@
-/*
- * Licensed to Apereo under one or more contributor license
+/**
+ * Licensed to Jasig under one or more contributor license
  * agreements. See the NOTICE file distributed with this work
  * for additional information regarding copyright ownership.
  * Jasig licenses this file to you under the Apache License,
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.jasig.portal.portlets.favorites;
 
 import org.jasig.portal.IUserPreferencesManager;
diff --git a/uportal-war/src/main/java/org/jasig/portal/portlets/favorites/FavoritesUtils.java b/uportal-war/src/main/java/org/jasig/portal/portlets/favorites/FavoritesUtils.java
index abe3288364a..196ca0d21f9 100644
--- a/uportal-war/src/main/java/org/jasig/portal/portlets/favorites/FavoritesUtils.java
+++ b/uportal-war/src/main/java/org/jasig/portal/portlets/favorites/FavoritesUtils.java
@@ -1,5 +1,5 @@
-/*
- * Licensed to Apereo under one or more contributor license
+/**
+ * Licensed to Jasig under one or more contributor license
  * agreements. See the NOTICE file distributed with this work
  * for additional information regarding copyright ownership.
  * Jasig licenses this file to you under the Apache License,
@@ -17,7 +17,6 @@
  * under the License.
  */
 
-
 package org.jasig.portal.portlets.favorites;
 
 import org.jasig.portal.layout.IUserLayout;
diff --git a/uportal-war/src/main/java/org/jasig/portal/security/AuthorizationPrincipalHelper.java b/uportal-war/src/main/java/org/jasig/portal/security/AuthorizationPrincipalHelper.java
index bb3a3e16ac5..206dae71e74 100644
--- a/uportal-war/src/main/java/org/jasig/portal/security/AuthorizationPrincipalHelper.java
+++ b/uportal-war/src/main/java/org/jasig/portal/security/AuthorizationPrincipalHelper.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to Jasig under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work
+ * for additional information regarding copyright ownership.
+ * Jasig 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:
+ *
+ * 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.
+ */
 package org.jasig.portal.security;
 
 import org.apache.commons.lang3.Validate;
diff --git a/uportal-war/src/main/java/org/jasig/portal/security/PermissionHelper.java b/uportal-war/src/main/java/org/jasig/portal/security/PermissionHelper.java
index 87b13f1a98c..6656b5950c1 100644
--- a/uportal-war/src/main/java/org/jasig/portal/security/PermissionHelper.java
+++ b/uportal-war/src/main/java/org/jasig/portal/security/PermissionHelper.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to Jasig under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work
+ * for additional information regarding copyright ownership.
+ * Jasig 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:
+ *
+ * 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.
+ */
 package org.jasig.portal.security;
 
 import org.apache.commons.lang3.Validate;
diff --git a/uportal-war/src/main/resources/org/jasig/portal/io/import-pags-group_v4-1.crn b/uportal-war/src/main/resources/org/jasig/portal/io/import-pags-group_v4-1.crn
index d36341c163d..802e0f239fe 100644
--- a/uportal-war/src/main/resources/org/jasig/portal/io/import-pags-group_v4-1.crn
+++ b/uportal-war/src/main/resources/org/jasig/portal/io/import-pags-group_v4-1.crn
@@ -1,24 +1,23 @@
 <!--
 
-Licensed to Jasig under one or more contributor license
-agreements. See the NOTICE file distributed with this work
-for additional information regarding copyright ownership.
-Jasig 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:
+    Licensed to Jasig under one or more contributor license
+    agreements. See the NOTICE file distributed with this work
+    for additional information regarding copyright ownership.
+    Jasig 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:
 
-http://www.apache.org/licenses/LICENSE-2.0
+    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.
+    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.
 
 -->
-
 <!--
 | NOTICE:  This file represents a contractual API that is leveraged by more
 | than one caller.  Please do not refactor this file in a way that changes
diff --git a/uportal-war/src/main/webapp/WEB-INF/jsp/Marketplace/portlet/entry.jsp b/uportal-war/src/main/webapp/WEB-INF/jsp/Marketplace/portlet/entry.jsp
index b301824d9a9..84c7230ebde 100644
--- a/uportal-war/src/main/webapp/WEB-INF/jsp/Marketplace/portlet/entry.jsp
+++ b/uportal-war/src/main/webapp/WEB-INF/jsp/Marketplace/portlet/entry.jsp
@@ -1,4 +1,5 @@
 <%--
+
     Licensed to Jasig under one or more contributor license
     agreements. See the NOTICE file distributed with this work
     for additional information regarding copyright ownership.
@@ -17,7 +18,6 @@
     under the License.
 
 --%>
-
 <%@ include file="/WEB-INF/jsp/include.jsp"%>
 <c:set var="n"><portlet:namespace/></c:set>
 <style>
diff --git a/uportal-war/src/main/webapp/media/skins/common/javascript/uportal/up-favorite.js b/uportal-war/src/main/webapp/media/skins/common/javascript/uportal/up-favorite.js
index bc6ac204d28..41e318c4c01 100644
--- a/uportal-war/src/main/webapp/media/skins/common/javascript/uportal/up-favorite.js
+++ b/uportal-war/src/main/webapp/media/skins/common/javascript/uportal/up-favorite.js
@@ -1,3 +1,21 @@
+/*
+ * Licensed to Jasig under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work
+ * for additional information regarding copyright ownership.
+ * Jasig 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:
+ *
+ * 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.
+ */
 var up = up || {};
 
 (function($) {
diff --git a/uportal-war/src/test/java/org/jasig/portal/layout/node/UserLayoutChannelDescriptionTest.java b/uportal-war/src/test/java/org/jasig/portal/layout/node/UserLayoutChannelDescriptionTest.java
index 69440433970..80c267c4247 100644
--- a/uportal-war/src/test/java/org/jasig/portal/layout/node/UserLayoutChannelDescriptionTest.java
+++ b/uportal-war/src/test/java/org/jasig/portal/layout/node/UserLayoutChannelDescriptionTest.java
@@ -1,5 +1,5 @@
-/*
- * Licensed to Apereo under one or more contributor license
+/**
+ * Licensed to Jasig under one or more contributor license
  * agreements. See the NOTICE file distributed with this work
  * for additional information regarding copyright ownership.
  * Jasig licenses this file to you under the Apache License,
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.jasig.portal.layout.node;
 
 import org.junit.Test;
diff --git a/uportal-war/src/test/java/org/jasig/portal/layout/node/UserLayoutNodeDescriptionTest.java b/uportal-war/src/test/java/org/jasig/portal/layout/node/UserLayoutNodeDescriptionTest.java
index 7e6e202e6c8..83bbc35ba36 100644
--- a/uportal-war/src/test/java/org/jasig/portal/layout/node/UserLayoutNodeDescriptionTest.java
+++ b/uportal-war/src/test/java/org/jasig/portal/layout/node/UserLayoutNodeDescriptionTest.java
@@ -1,5 +1,5 @@
-/*
- * Licensed to Apereo under one or more contributor license
+/**
+ * Licensed to Jasig under one or more contributor license
  * agreements. See the NOTICE file distributed with this work
  * for additional information regarding copyright ownership.
  * Jasig licenses this file to you under the Apache License,
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.jasig.portal.layout.node;
 
 import org.jgroups.util.Util;
diff --git a/uportal-war/src/test/java/org/jasig/portal/portlet/dao/jpa/JpaMarketplaceRatingDaoTest.java b/uportal-war/src/test/java/org/jasig/portal/portlet/dao/jpa/JpaMarketplaceRatingDaoTest.java
index 7dbafde60da..0d8507eeb61 100644
--- a/uportal-war/src/test/java/org/jasig/portal/portlet/dao/jpa/JpaMarketplaceRatingDaoTest.java
+++ b/uportal-war/src/test/java/org/jasig/portal/portlet/dao/jpa/JpaMarketplaceRatingDaoTest.java
@@ -1,4 +1,4 @@
-/*
+/**
  * Licensed to Jasig under one or more contributor license
  * agreements. See the NOTICE file distributed with this work
  * for additional information regarding copyright ownership.
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.jasig.portal.portlet.dao.jpa;