diff -Naur rel-3-0-1-GA.pre_patch/uportal-ear/pom.xml rel-3-0-1-GA/uportal-ear/pom.xml
--- rel-3-0-1-GA.pre_patch/uportal-ear/pom.xml	2008-07-30 17:18:37.000000000 -0700
+++ rel-3-0-1-GA/uportal-ear/pom.xml	2008-07-30 17:29:33.000000000 -0700
@@ -67,6 +67,69 @@
         </dependency>
 
         <dependency>
+            <groupId>net.unicon.toro.portlets-overlay</groupId>
+            <artifactId>toro-briefcase-portlet</artifactId>
+            <version>${toro.version}</version>
+            <type>war</type>
+        </dependency>
+
+        <dependency>
+            <groupId>net.unicon.toro.portlets-overlay</groupId>
+            <artifactId>toro-gateway-portlet</artifactId>
+            <version>${toro.version}</version>
+            <type>war</type>
+        </dependency>
+
+        <dependency>
+            <groupId>net.unicon.toro.portlets-overlay</groupId>
+            <artifactId>toro-messaging-portlet</artifactId>
+            <version>${toro.version}</version>
+            <type>war</type>
+        </dependency>
+
+        <dependency>
+            <groupId>net.unicon.toro.portlets-overlay</groupId>
+            <artifactId>toro-permissions-portlet</artifactId>
+            <version>${toro.version}</version>
+            <type>war</type>
+        </dependency>
+
+        <dependency>
+            <groupId>net.unicon.toro.portlets-overlay</groupId>
+            <artifactId>toro-web-content-portlet</artifactId>
+            <version>${toro.version}</version>
+            <type>war</type>
+        </dependency>
+
+        <dependency>
+            <groupId>net.unicon.toro</groupId>
+            <artifactId>portlets-common-webapp</artifactId>
+            <version>${toro.version}</version>
+            <type>war</type>
+        </dependency>
+
+        <dependency>
+            <groupId>net.unicon.toro</groupId>
+            <artifactId>blojsom</artifactId>
+            <version>${toro.version}</version>
+            <type>war</type>
+        </dependency>
+
+        <dependency>
+            <groupId>net.unicon.toro</groupId>
+            <artifactId>sso-authentication-cache</artifactId>
+            <version>${toro.version}</version>
+            <type>jar</type>
+        </dependency>
+
+        <dependency>
+            <groupId>net.unicon.toro</groupId>
+            <artifactId>academus-api</artifactId>
+            <version>${toro.version}</version>
+            <type>jar</type>
+        </dependency>
+
+        <dependency>
             <groupId>javax.portlet</groupId>
             <artifactId>portlet-api</artifactId>
             <version>${portlet-api.version}</version>
@@ -184,6 +247,48 @@
                             <bundleFileName>FunctionalTestsPortlet.war</bundleFileName>
                             <contextRoot>/FunctionalTestsPortlet</contextRoot>
                         </webModule>
+                        <webModule>
+                            <groupId>net.unicon.toro.portlets-overlay</groupId>
+                            <artifactId>toro-briefcase-portlet</artifactId>
+                            <bundleFileName>toro-briefcase-portlet.war</bundleFileName>
+                            <contextRoot>/toro-briefcase-portlet</contextRoot>
+                        </webModule>
+                        <webModule>
+                            <groupId>net.unicon.toro.portlets-overlay</groupId>
+                            <artifactId>toro-gateway-portlet</artifactId>
+                            <bundleFileName>toro-gateway-portlet.war</bundleFileName>
+                            <contextRoot>/toro-gateway-portlet</contextRoot>
+                        </webModule>
+                        <webModule>
+                            <groupId>net.unicon.toro.portlets-overlay</groupId>
+                            <artifactId>toro-messaging-portlet</artifactId>
+                            <bundleFileName>toro-messaging-portlet.war</bundleFileName>
+                            <contextRoot>/toro-messaging-portlet</contextRoot>
+                        </webModule>
+                        <webModule>
+                            <groupId>net.unicon.toro.portlets-overlay</groupId>
+                            <artifactId>toro-permissions-portlet</artifactId>
+                            <bundleFileName>toro-permissions-portlet.war</bundleFileName>
+                            <contextRoot>/toro-permissions-portlet</contextRoot>
+                        </webModule>
+                        <webModule>
+                            <groupId>net.unicon.toro.portlets-overlay</groupId>
+                            <artifactId>toro-web-content-portlet</artifactId>
+                            <bundleFileName>toro-web-content-portlet.war</bundleFileName>
+                            <contextRoot>/toro-web-content-portlet</contextRoot>
+                        </webModule>
+                        <webModule>
+                            <groupId>net.unicon.toro</groupId>
+                            <artifactId>blojsom</artifactId>
+                            <bundleFileName>toro-blojsom.war</bundleFileName>
+                            <contextRoot>/toro-blojsom</contextRoot>
+                        </webModule>
+                        <webModule>
+                            <groupId>net.unicon.toro</groupId>
+                            <artifactId>portlets-common-webapp</artifactId>
+                            <bundleFileName>toro-portlets-common.war</bundleFileName>
+                            <contextRoot>/toro-portlets-common</contextRoot>
+                        </webModule>
                     </modules>
                 </configuration>
             </plugin>
diff -Naur rel-3-0-1-GA.pre_patch/uportal-impl/pom.xml rel-3-0-1-GA/uportal-impl/pom.xml
--- rel-3-0-1-GA.pre_patch/uportal-impl/pom.xml	2008-07-30 17:18:34.000000000 -0700
+++ rel-3-0-1-GA/uportal-impl/pom.xml	2008-07-30 17:23:02.000000000 -0700
@@ -507,6 +507,12 @@
 
         <!-- ===== Runtime Dependencies ================================== -->
 
+        <dependency>
+            <groupId>net.unicon.toro</groupId>
+            <artifactId>sso-callback-servlet</artifactId>
+            <version>${toro.version}</version>
+            <scope>runtime</scope>
+        </dependency>
 
         <!-- ===== Provided Dependencies ================================== -->
 
@@ -569,6 +575,20 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>net.unicon.toro</groupId>
+            <artifactId>academus-api</artifactId>
+            <version>${toro.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>net.unicon.toro</groupId>
+            <artifactId>uportal-academus-api</artifactId>
+            <version>${toro.version}</version>
+            <scope>runtime</scope>
+        </dependency>
+
         <!-- ===== Test Dependencies ====================================== -->
         
         <dependency>
diff -Naur rel-3-0-1-GA.pre_patch/uportal-impl/src/main/resources/properties/contexts/applicationContext.xml rel-3-0-1-GA/uportal-impl/src/main/resources/properties/contexts/applicationContext.xml
--- rel-3-0-1-GA.pre_patch/uportal-impl/src/main/resources/properties/contexts/applicationContext.xml	2008-07-30 17:18:35.000000000 -0700
+++ rel-3-0-1-GA/uportal-impl/src/main/resources/properties/contexts/applicationContext.xml	2008-07-30 17:20:06.000000000 -0700
@@ -51,4 +51,9 @@
     </bean>
 
     <bean class="org.springframework.beans.factory.annotation.RequiredAnnotationBeanPostProcessor" lazy-init="false" />
-</beans>
\ No newline at end of file
+
+    <bean id="uportal-academus-facade-invoking-bean" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+        <property name="staticMethod" value="net.unicon.academus.api.uportal.UPortalAcademusFacade.register"/>
+    </bean>
+
+</beans>
diff -Naur rel-3-0-1-GA.pre_patch/uportal-war/src/main/webapp/WEB-INF/web.xml rel-3-0-1-GA/uportal-war/src/main/webapp/WEB-INF/web.xml
--- rel-3-0-1-GA.pre_patch/uportal-war/src/main/webapp/WEB-INF/web.xml	2008-07-30 17:18:37.000000000 -0700
+++ rel-3-0-1-GA/uportal-war/src/main/webapp/WEB-INF/web.xml	2008-07-30 17:30:49.000000000 -0700
@@ -163,6 +163,17 @@
         <servlet-class>org.jasig.portal.layout.dlm.remoting.UpdatePreferencesServlet</servlet-class>
     </servlet>
 
+    <servlet>
+        <servlet-name>SsoCallback</servlet-name>
+        <servlet-class>net.unicon.academus.apps.sso.SsoCallbackServlet</servlet-class>
+        <load-on-startup>4</load-on-startup>
+        <init-param>
+            <!-- This path should map back to the Login servlet -->
+            <param-name>unauthenticatedRedirectUrl</param-name>
+            <param-value></param-value>
+        </init-param>
+    </servlet>
+
     <!-- [INSERT JSPC FRAGMENT HERE] -->
 
     <servlet-mapping>
@@ -215,6 +226,11 @@
         <url-pattern>/ajax/preferences</url-pattern>
     </servlet-mapping>
 
+    <servlet-mapping>
+        <servlet-name>SsoCallback</servlet-name>
+        <url-pattern>/ssoCallback</url-pattern>
+    </servlet-mapping>
+
     <mime-mapping>
         <extension>wbmp</extension>
         <mime-type>image/vnd.wap.wbmp</mime-type>