diff --git a/assembly.xml b/assembly.xml
index d668de7..a4bd771 100644
--- a/assembly.xml
+++ b/assembly.xml
@@ -13,7 +13,7 @@
             </includes>
 
             <sources>
-                <outputDirectory>${artifactId}/src</outputDirectory>
+                <outputDirectory>${artifactId}</outputDirectory>
                 <includes>
                     <directory>src</directory>
                     <include>README*</include>
@@ -26,12 +26,13 @@
                 <outputDirectory>bin</outputDirectory>
                 <includeDependencies>true</includeDependencies>
                 <unpack>false</unpack>
+                <scope>runtime</scope>
                 <includes>
                     <include>target/*.jar</include>
                 </includes>
                 <excludes>
-                    <exclude>*uportal*.jar</exclude>
-                    <exclude>*spring-mock*.jar</exclude>
+                    <exclude>**/uportal*.jar</exclude>
+                    <exclude>**/spring-mock*.jar</exclude>
                 </excludes>
             </binaries>
         </moduleSet>
diff --git a/cas-client-uportal/pom.xml b/cas-client-uportal/pom.xml
index a395853..e49f4a0 100644
--- a/cas-client-uportal/pom.xml
+++ b/cas-client-uportal/pom.xml
@@ -58,16 +58,11 @@
     </build>
 
     <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>3.8.1</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>jasig</groupId>
             <artifactId>uportal</artifactId>
             <version>2.5.3-rc1</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.jasig.cas</groupId>
diff --git a/cas-client.iws b/cas-client.iws
index 29c3953..91d752c 100644
--- a/cas-client.iws
+++ b/cas-client.iws
@@ -10,8 +10,8 @@
     <option name="USE_DATE_AFTER_FILTER" value="false" />
     <option name="USE_CHANGE_BEFORE_FILTER" value="false" />
     <option name="USE_CHANGE_AFTER_FILTER" value="false" />
-    <option name="DATE_BEFORE" value="" />
-    <option name="DATE_AFTER" value="" />
+    <option name="DATE_BEFORE" />
+    <option name="DATE_AFTER" />
     <option name="CHANGE_BEFORE" value="" />
     <option name="CHANGE_AFTER" value="" />
     <option name="USE_USER_FILTER" value="false" />
@@ -19,82 +19,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/util/FilterToBeanProxy.java" afterPath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/util/FilterToBeanProxy.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas10TicketValidatorTests.java" afterPath="$PROJECT_DIR$/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas10TicketValidatorTests.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-uportal/src/test/resources/properties/uPortalConfigContext.xml" afterPath="$PROJECT_DIR$/cas-client-uportal/src/test/resources/properties/uPortalConfigContext.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/test/java/org/jasig/cas/client/authorization/DefaultCasAuthorizedDeciderImplTests.java" afterPath="$PROJECT_DIR$/cas-client-core/src/test/java/org/jasig/cas/client/authorization/DefaultCasAuthorizedDeciderImplTests.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/test/java/org/jasig/cas/client/web/filter/CasAuthorizationFilterTests.java" afterPath="$PROJECT_DIR$/cas-client-core/src/test/java/org/jasig/cas/client/web/filter/CasAuthorizationFilterTests.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/web/filter/HttpServletRequestWrapperFilter.java" afterPath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/web/filter/HttpServletRequestWrapperFilter.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/proxy/Cas20ProxyRetriever.java" afterPath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/proxy/Cas20ProxyRetriever.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-uportal/src/test/java/org/jasig/cas/client/integration/uportal/ThreadLocalAwareCasSecurityContextFactoryTests.java" afterPath="$PROJECT_DIR$/cas-client-uportal/src/test/java/org/jasig/cas/client/integration/uportal/ThreadLocalAwareCasSecurityContextFactoryTests.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/authorization/DefaultCasAuthorizedDeciderImpl.java" afterPath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/authorization/DefaultCasAuthorizedDeciderImpl.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/main/resources/web-simple-example.xml" afterPath="$PROJECT_DIR$/cas-client-core/src/main/resources/web-simple-example.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-uportal/src/test/java/org/jasig/cas/client/integration/uportal/CasSecurityContextFactoryTests.java" afterPath="$PROJECT_DIR$/cas-client-uportal/src/test/java/org/jasig/cas/client/integration/uportal/CasSecurityContextFactoryTests.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/test/java/org/jasig/cas/client/proxy/ProxyGrantingTicketStorageImplTests.java" afterPath="$PROJECT_DIR$/cas-client-core/src/test/java/org/jasig/cas/client/proxy/ProxyGrantingTicketStorageImplTests.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/web/filter/CasAuthorizationFilter.java" afterPath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/web/filter/CasAuthorizationFilter.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/test/resources/oneProxyGrantingTicketStorageConfig.xml" afterPath="$PROJECT_DIR$/cas-client-core/src/test/resources/oneProxyGrantingTicketStorageConfig.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/test/java/org/jasig/cas/client/validation/AssertionImplTests.java" afterPath="$PROJECT_DIR$/cas-client-core/src/test/java/org/jasig/cas/client/validation/AssertionImplTests.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/validation/InvalidProxyChainValidationException.java" afterPath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/validation/InvalidProxyChainValidationException.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/validation/TicketValidator.java" afterPath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/validation/TicketValidator.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-uportal/src/main/java/org/jasig/cas/client/integration/uportal/CasSecurityContext.java" afterPath="$PROJECT_DIR$/cas-client-uportal/src/main/java/org/jasig/cas/client/integration/uportal/CasSecurityContext.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/util/XmlUtils.java" afterPath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/util/XmlUtils.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/authorization/package.html" afterPath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/authorization/package.html" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/test/java/org/jasig/cas/client/PublicTestHttpServer.java" afterPath="$PROJECT_DIR$/cas-client-core/src/test/java/org/jasig/cas/client/PublicTestHttpServer.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/proxy/SpringConfiguredProxyReceptorServlet.java" afterPath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/proxy/SpringConfiguredProxyReceptorServlet.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-uportal/src/main/java/org/jasig/cas/client/integration/uportal/AbstractCasSecurityContextFactory.java" afterPath="$PROJECT_DIR$/cas-client-uportal/src/main/java/org/jasig/cas/client/integration/uportal/AbstractCasSecurityContextFactory.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/test/java/org/jasig/cas/client/util/DelegatingFilterTests.java" afterPath="$PROJECT_DIR$/cas-client-core/src/test/java/org/jasig/cas/client/util/DelegatingFilterTests.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/pom.xml" afterPath="$PROJECT_DIR$/pom.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/assembly.xml" afterPath="$PROJECT_DIR$/assembly.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client.iws" afterPath="$PROJECT_DIR$/cas-client.iws" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-uportal/src/main/java/org/jasig/cas/client/integration/uportal/ThreadLocalAwareCasServiceFilter.java" afterPath="$PROJECT_DIR$/cas-client-uportal/src/main/java/org/jasig/cas/client/integration/uportal/ThreadLocalAwareCasServiceFilter.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/web/filter/CasAuthenticationFilter.java" afterPath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/web/filter/CasAuthenticationFilter.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas10TicketValidator.java" afterPath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas10TicketValidator.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-uportal/src/test/java/org/jasig/cas/client/integration/uportal/CasSecurityContextTests.java" afterPath="$PROJECT_DIR$/cas-client-uportal/src/test/java/org/jasig/cas/client/integration/uportal/CasSecurityContextTests.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/test/resources/proxyGrantingTicketStorageConfig.xml" afterPath="$PROJECT_DIR$/cas-client-core/src/test/resources/proxyGrantingTicketStorageConfig.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/proxy/ProxyRetriever.java" afterPath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/proxy/ProxyRetriever.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/authorization/AuthorizationException.java" afterPath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/authorization/AuthorizationException.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-uportal/src/main/java/org/jasig/cas/client/integration/uportal/CasSecurityContextFactory.java" afterPath="$PROJECT_DIR$/cas-client-uportal/src/main/java/org/jasig/cas/client/integration/uportal/CasSecurityContextFactory.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-uportal/src/main/java/org/jasig/cas/client/integration/uportal/ICasSecurityContext.java" afterPath="$PROJECT_DIR$/cas-client-uportal/src/main/java/org/jasig/cas/client/integration/uportal/ICasSecurityContext.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-uportal/src/main/java/org/jasig/cas/client/integration/uportal/ThreadLocalAwareCasSecurityContext.java" afterPath="$PROJECT_DIR$/cas-client-uportal/src/main/java/org/jasig/cas/client/integration/uportal/ThreadLocalAwareCasSecurityContext.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/test/java/org/jasig/cas/client/web/filter/CasAuthenticationFilterTests.java" afterPath="$PROJECT_DIR$/cas-client-core/src/test/java/org/jasig/cas/client/web/filter/CasAuthenticationFilterTests.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/settings.xml" afterPath="$PROJECT_DIR$/cas-client-core/settings.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/test/java/org/jasig/cas/client/web/filter/CasValidationFilterTests.java" afterPath="$PROJECT_DIR$/cas-client-core/src/test/java/org/jasig/cas/client/web/filter/CasValidationFilterTests.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/test/java/org/jasig/cas/client/authorization/AuthorizationExceptionTests.java" afterPath="$PROJECT_DIR$/cas-client-core/src/test/java/org/jasig/cas/client/authorization/AuthorizationExceptionTests.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/authorization/CasAuthorizedDecider.java" afterPath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/authorization/CasAuthorizedDecider.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas20ProxyTicketValidator.java" afterPath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas20ProxyTicketValidator.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-uportal/src/main/java/org/jasig/cas/client/integration/uportal/CasConnectionContext.java" afterPath="$PROJECT_DIR$/cas-client-uportal/src/main/java/org/jasig/cas/client/integration/uportal/CasConnectionContext.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/test/resources/twoProxyGrantingTicketStorageConfig.xml" afterPath="$PROJECT_DIR$/cas-client-core/src/test/resources/twoProxyGrantingTicketStorageConfig.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-uportal/src/test/java/org/jasig/cas/client/integration/uportal/UPortalConfiguredProxyReceptorServletTests.java" afterPath="$PROJECT_DIR$/cas-client-uportal/src/test/java/org/jasig/cas/client/integration/uportal/UPortalConfiguredProxyReceptorServletTests.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/main/resources/simpleFilterExample.xml" afterPath="$PROJECT_DIR$/cas-client-core/src/main/resources/simpleFilterExample.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-uportal/src/test/java/org/jasig/cas/client/integration/uportal/ServiceHolderTests.java" afterPath="$PROJECT_DIR$/cas-client-uportal/src/test/java/org/jasig/cas/client/integration/uportal/ServiceHolderTests.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/util/CommonUtils.java" afterPath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/util/CommonUtils.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/proxy/ProxyGrantingTicketStorageImpl.java" afterPath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/proxy/ProxyGrantingTicketStorageImpl.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas20ProxyTicketValidatorTests.java" afterPath="$PROJECT_DIR$/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas20ProxyTicketValidatorTests.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/proxy/ProxyGrantingTicketStorage.java" afterPath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/proxy/ProxyGrantingTicketStorage.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-uportal/src/main/java/org/jasig/cas/client/integration/uportal/ThreadLocalAwareCasSecurityContextFactory.java" afterPath="$PROJECT_DIR$/cas-client-uportal/src/main/java/org/jasig/cas/client/integration/uportal/ThreadLocalAwareCasSecurityContextFactory.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/web/filter/CasValidationFilter.java" afterPath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/web/filter/CasValidationFilter.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/test/java/org/jasig/cas/client/validation/AbstractTicketValidatorTests.java" afterPath="$PROJECT_DIR$/cas-client-core/src/test/java/org/jasig/cas/client/validation/AbstractTicketValidatorTests.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/proxy/package.html" afterPath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/proxy/package.html" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/validation/Assertion.java" afterPath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/validation/Assertion.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/web/filter/package.html" afterPath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/web/filter/package.html" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/web/filter/AbstractCasFilter.java" afterPath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/web/filter/AbstractCasFilter.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/test/java/org/jasig/cas/client/util/CommonUtilsTests.java" afterPath="$PROJECT_DIR$/cas-client-core/src/test/java/org/jasig/cas/client/util/CommonUtilsTests.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas20ServiceTicketValidatorTests.java" afterPath="$PROJECT_DIR$/cas-client-core/src/test/java/org/jasig/cas/client/validation/Cas20ServiceTicketValidatorTests.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/proxy/AbstractProxyReceptorServlet.java" afterPath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/proxy/AbstractProxyReceptorServlet.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-uportal/src/main/java/org/jasig/cas/client/integration/uportal/UPortalConfiguredProxyReceptorServlet.java" afterPath="$PROJECT_DIR$/cas-client-uportal/src/main/java/org/jasig/cas/client/integration/uportal/UPortalConfiguredProxyReceptorServlet.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-uportal/src/main/resources/uportalCasConfigurationContext.xml" afterPath="$PROJECT_DIR$/cas-client-uportal/src/main/resources/uportalCasConfigurationContext.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-uportal/cas-client-uportal.iml" afterPath="$PROJECT_DIR$/cas-client-uportal/cas-client-uportal.iml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-uportal/pom.xml" afterPath="$PROJECT_DIR$/cas-client-uportal/pom.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/test/java/org/jasig/cas/client/proxy/AbstractProxyGrantingTicketStorageTests.java" afterPath="$PROJECT_DIR$/cas-client-core/src/test/java/org/jasig/cas/client/proxy/AbstractProxyGrantingTicketStorageTests.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/validation/AbstractUrlBasedTicketValidator.java" afterPath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/validation/AbstractUrlBasedTicketValidator.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/test/java/org/jasig/cas/client/authorization/AbstractCasAuthorizedDeciderTests.java" afterPath="$PROJECT_DIR$/cas-client-core/src/test/java/org/jasig/cas/client/authorization/AbstractCasAuthorizedDeciderTests.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas20ServiceTicketValidator.java" afterPath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas20ServiceTicketValidator.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/validation/AssertionImpl.java" afterPath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/validation/AssertionImpl.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/test/java/org/jasig/cas/client/proxy/SpringConfiguredProxyReceptorServletTests.java" afterPath="$PROJECT_DIR$/cas-client-core/src/test/java/org/jasig/cas/client/proxy/SpringConfiguredProxyReceptorServletTests.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/test/java/org/jasig/cas/client/web/filter/HttpServletRequestWrapperFilterTests.java" afterPath="$PROJECT_DIR$/cas-client-core/src/test/java/org/jasig/cas/client/web/filter/HttpServletRequestWrapperFilterTests.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/cas-client-core.iml" afterPath="$PROJECT_DIR$/cas-client-core/cas-client-core.iml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/util/DelegatingFilter.java" afterPath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/util/DelegatingFilter.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/validation/ValidationException.java" afterPath="$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/validation/ValidationException.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-uportal/src/test/java/org/jasig/cas/client/integration/uportal/ThreadLocalAwareCasServiceFilterTests.java" afterPath="$PROJECT_DIR$/cas-client-uportal/src/test/java/org/jasig/cas/client/integration/uportal/ThreadLocalAwareCasServiceFilterTests.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/cas-client-uportal/src/test/java/org/jasig/cas/client/integration/uportal/ThreadLocalAwareCasSecurityContextTests.java" afterPath="$PROJECT_DIR$/cas-client-uportal/src/test/java/org/jasig/cas/client/integration/uportal/ThreadLocalAwareCasSecurityContextTests.java" />
     </list>
   </component>
   <component name="ChangeListSynchronizer" />
@@ -277,7 +205,26 @@
     </subPane>
   </component>
   <component name="FileEditorManager">
-    <leaf />
+    <leaf>
+      <file leaf-file-name="assembly.xml" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/assembly.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="28" column="30" selection-start="1030" selection-end="1030" vertical-scroll-proportion="0.46804327">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/pom.xml">
+          <provider selected="true" editor-type-id="text-editor">
+            <state line="63" column="41" selection-start="2697" selection-end="2697" vertical-scroll-proportion="0.08357915">
+              <folding />
+            </state>
+          </provider>
+        </entry>
+      </file>
+    </leaf>
   </component>
   <component name="FindManager">
     <FindUsagesManager>
@@ -429,6 +376,76 @@
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
         </PATH_ELEMENT>
       </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="cas-client.ipr" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="cas-client-uportal" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:C:\idea-workspace\java-client\cas-client-uportal" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:C:\idea-workspace\java-client\cas-client-uportal\src" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="cas-client.ipr" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="cas-client-uportal" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:C:\idea-workspace\java-client\cas-client-uportal" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:C:\idea-workspace\java-client\cas-client-uportal\src" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:C:\idea-workspace\java-client\cas-client-uportal\src\main" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="cas-client.ipr" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="cas-client-uportal" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:C:\idea-workspace\java-client\cas-client-uportal" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:C:\idea-workspace\java-client\cas-client-uportal\src" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:C:\idea-workspace\java-client\cas-client-uportal\src\main" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:C:\idea-workspace\java-client\cas-client-uportal\src\main\java" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:C:\idea-workspace\java-client\cas-client-uportal\src\main\java\org\jasig\cas\client\integration\uportal" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+      </PATH>
       <PATH>
         <PATH_ELEMENT>
           <option name="myItemId" value="cas-client.ipr" />
@@ -444,6 +461,38 @@
           <option name="myItemId" value="cas-client.ipr" />
           <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
         </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="cas-client-core" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:C:\idea-workspace\java-client\cas-client-core" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="cas-client.ipr" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="cas-client" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+      </PATH>
+      <PATH>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="cas-client.ipr" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="cas-client" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+        </PATH_ELEMENT>
+        <PATH_ELEMENT>
+          <option name="myItemId" value="PsiDirectory:C:\idea-workspace\java-client" />
+          <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+        </PATH_ELEMENT>
       </PATH>
     </subPane>
   </component>
@@ -458,7 +507,7 @@
       <showLibraryContents />
       <hideEmptyPackages ProjectPane="true" />
       <abbreviatePackageNames ProjectPane="false" />
-      <showStructure Favorites="false" Scope="false" PackagesPane="false" ProjectPane="false" />
+      <showStructure ProjectPane="false" Scope="false" PackagesPane="false" Favorites="false" />
       <autoscrollToSource />
       <autoscrollFromSource />
       <sortByType />
@@ -507,6 +556,13 @@
         <option name="Make" value="true" />
       </method>
     </tempConfiguration>
+    <configuration default="true" type="Remote" factoryName="Remote">
+      <option name="USE_SOCKET_TRANSPORT" value="true" />
+      <option name="SERVER_MODE" value="false" />
+      <option name="SHMEM_ADDRESS" value="javadebug" />
+      <option name="HOST" value="localhost" />
+      <option name="PORT" value="5005" />
+    </configuration>
     <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
       <option name="MAIN_CLASS_NAME" />
       <option name="VM_PARAMETERS" />
@@ -517,13 +573,6 @@
       <option name="ENABLE_SWING_INSPECTOR" value="false" />
       <module name="" />
     </configuration>
-    <configuration default="true" type="Remote" factoryName="Remote">
-      <option name="USE_SOCKET_TRANSPORT" value="true" />
-      <option name="SERVER_MODE" value="false" />
-      <option name="SHMEM_ADDRESS" value="javadebug" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="5005" />
-    </configuration>
     <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
       <module name="" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -658,12 +707,12 @@
   </component>
   <component name="ToolWindowManager">
     <frame x="-4" y="-4" width="1928" height="1178" extended-state="6" />
-    <editor active="false" />
+    <editor active="true" />
     <layout>
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
-      <window_info id="CVS" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32857144" order="13" />
-      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3295129" order="7" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25200215" order="0" />
+      <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32857144" order="13" />
+      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32857144" order="7" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32995194" order="0" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3295238" order="1" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24986653" order="1" />
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32857144" order="10" />
@@ -673,7 +722,7 @@
       <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24986653" order="1" />
       <window_info id="IDE talk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.13988253" order="4" />
-      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3295129" order="12" />
+      <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32857144" order="12" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32857144" order="2" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" />
       <window_info id="IDEtalk History" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24164279" order="8" />
@@ -697,14 +746,14 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" value="true" />
-    <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" />
+    <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="PUT_FOCUS_INTO_COMMENT" value="false" />
     <option name="FORCE_NON_EMPTY_COMMENT" value="false" />
-    <option name="LAST_COMMIT_MESSAGE" value="" />
+    <option name="LAST_COMMIT_MESSAGE" value="added interface for ISecurityContextFactory" />
     <option name="SAVE_LAST_COMMIT_MESSAGE" value="true" />
     <option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" />
-    <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
-    <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
+    <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="true" />
+    <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="true" />
     <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" />
     <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" />
     <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" />
@@ -713,6 +762,7 @@
     <option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
     <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
     <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
+    <MESSAGE value="added interface for ISecurityContextFactory" />
   </component>
   <component name="VssConfiguration">
     <option name="CLIENT_PATH" value="" />
@@ -766,76 +816,6 @@
     <option name="myLastEditedConfigurable" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/web/filter/CasAuthenticationFilter.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="26" column="0" selection-start="838" selection-end="838" vertical-scroll-proportion="0.32228917">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/util/XmlUtils.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="57" column="86" selection-start="1785" selection-end="1785" vertical-scroll-proportion="0.32228917">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cas-client-uportal/src/main/java/org/jasig/cas/client/integration/uportal/CasConnectionContext.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="26" column="32" selection-start="887" selection-end="887" vertical-scroll-proportion="0.10559006">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cas-client-uportal/src/main/java/org/jasig/cas/client/integration/uportal/CasSecurityContext.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="50" column="22" selection-start="1588" selection-end="1588" vertical-scroll-proportion="0.3431677">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="jar://C:/Documents and Settings/Scott/.m2/repository/jasig/uportal/2.5.3-rc1/uportal-2.5.3-rc1.jar!/org/jasig/portal/security/InitialSecurityContextFactory.class">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="5" column="13" selection-start="163" selection-end="163" vertical-scroll-proportion="0.10810811">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/web/filter/CasValidationFilter.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="75" column="112" selection-start="3403" selection-end="3403" vertical-scroll-proportion="0.21464393">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/util/FilterToBeanProxy.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="68" column="5" selection-start="2292" selection-end="2292" vertical-scroll-proportion="0.8635908">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cas-client-uportal/src/main/java/org/jasig/cas/client/integration/uportal/AbstractCasSecurityContextFactory.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="25" column="12" selection-start="911" selection-end="911" vertical-scroll-proportion="0.25576732">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/proxy/AbstractProxyReceptorServlet.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="79" column="36" selection-start="2803" selection-end="2803" vertical-scroll-proportion="0.6760281">
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/validation/AssertionImpl.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state line="65" column="17" selection-start="1832" selection-end="1832" vertical-scroll-proportion="0.8328417">
-          <folding />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/validation/Cas20ProxyTicketValidator.java">
       <provider selected="true" editor-type-id="text-editor">
         <state line="85" column="24" selection-start="3761" selection-end="3761" vertical-scroll-proportion="0.37225547">
@@ -871,6 +851,69 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/cas-client.iws">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="28" column="44" selection-start="1318" selection-end="1337" vertical-scroll-proportion="0.4741036">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://C:/Documents and Settings/Scott/.m2/repository/jasig/uportal/2.5.3-rc1/uportal-2.5.3-rc1.jar!/org/jasig/portal/security/ISecurityContextFactory.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="5" column="17" selection-start="167" selection-end="167" vertical-scroll-proportion="0.06686332">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cas-client-uportal/cas-client-uportal.iml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cas-client-uportal/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="60" column="0" selection-start="2304" selection-end="2304" vertical-scroll-proportion="0.71583086">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cas-client-uportal/src/main/java/org/jasig/cas/client/integration/uportal/AbstractCasSecurityContextFactory.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="41" column="37" selection-start="1412" selection-end="1412" vertical-scroll-proportion="0.054080628">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cas-client-uportal/src/main/java/org/jasig/cas/client/integration/uportal/CasSecurityContext.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="77" column="35" selection-start="2729" selection-end="2729" vertical-scroll-proportion="0.33824974">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/cas-client-uportal/src/main/java/org/jasig/cas/client/integration/uportal/CasSecurityContextFactory.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="22" column="16" selection-start="799" selection-end="799" vertical-scroll-proportion="0.28416914">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="63" column="41" selection-start="2697" selection-end="2697" vertical-scroll-proportion="0.08357915">
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/assembly.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state line="28" column="30" selection-start="1030" selection-end="1030" vertical-scroll-proportion="0.46804327">
+          <folding />
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="editorManager" />
 </project>
diff --git a/pom.xml b/pom.xml
index 7095992..d89c2b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,6 +73,18 @@
         <url>http://www.ja-sig.org</url>
     </organization>
 
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.1</version>
+                <configuration>
+                    <descriptor>assembly.xml</descriptor>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
     <dependencies>
         <dependency>
             <groupId>junit</groupId>
@@ -85,6 +97,20 @@
             <artifactId>commons-logging</artifactId>
             <version>1.1</version>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>log4j</groupId>
+                    <artifactId>log4j</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>logkit</groupId>
+                    <artifactId>logkit</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>avalon-framework</groupId>
+                    <artifactId>avalon-framework</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>cas</groupId>
@@ -108,7 +134,7 @@
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
             <version>2.4</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
     </dependencies>