update to spring 2.0 and hide un-needed dependencies

This commit is contained in:
Scott Battaglia 2006-10-05 18:03:58 +00:00
parent e5310dd927
commit 0b996ed4d6
8 changed files with 299 additions and 752 deletions

View File

@ -14,6 +14,24 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/Documents and Settings/Scott/.m2/repository/aopalliance/aopalliance/1.0/aopalliance-1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/Documents and Settings/Scott/.m2/repository/org/springframework/spring-core/2.0/spring-core-2.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
@ -41,15 +59,6 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/Documents and Settings/Scott/.m2/repository/org/springframework/spring-core/2.0-rc2/spring-core-2.0-rc2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
@ -62,7 +71,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/Documents and Settings/Scott/.m2/repository/org/springframework/spring-beans/2.0-rc2/spring-beans-2.0-rc2.jar!/" />
<root url="jar://C:/Documents and Settings/Scott/.m2/repository/org/springframework/spring-aop/2.0/spring-aop-2.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@ -71,7 +80,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/Documents and Settings/Scott/.m2/repository/org/springframework/spring-web/2.0-rc2/spring-web-2.0-rc2.jar!/" />
<root url="jar://C:/Documents and Settings/Scott/.m2/repository/org/springframework/spring-context/2.0/spring-context-2.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@ -89,7 +98,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/Documents and Settings/Scott/.m2/repository/org/springframework/spring-mock/2.0-rc2/spring-mock-2.0-rc2.jar!/" />
<root url="jar://C:/Documents and Settings/Scott/.m2/repository/org/springframework/spring-beans/2.0/spring-beans-2.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@ -98,7 +107,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/Documents and Settings/Scott/.m2/repository/org/springframework/spring-context/2.0-rc2/spring-context-2.0-rc2.jar!/" />
<root url="jar://C:/Documents and Settings/Scott/.m2/repository/org/springframework/spring-mock/2.0/spring-mock-2.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@ -113,6 +122,15 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/Documents and Settings/Scott/.m2/repository/org/springframework/spring-web/2.0/spring-web-2.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
@ -124,9 +142,5 @@
</orderEntry>
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
<option name="ACTIVE_VCS_NAME" value="CVS" />
<option name="USE_PROJECT_VCS" value="false" />
</component>
</module>

View File

@ -75,22 +75,51 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>2.0-rc2</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>2.0-rc2</version>
<version>2.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-mock</artifactId>
<version>2.0-rc2</version>
<version>2.0</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-dao</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-jdbc</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-jpa</artifactId>
</exclusion>
<exclusion>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
<reporting>

View File

@ -57,95 +57,5 @@ public final class HttpServletRequestWrapperFilterTests extends TestCase {
this.filter.doFilter(request, new MockHttpServletResponse(),
filterChain);
assertEquals("test", this.mockRequest.getRemoteUser());
assertEquals(request.getAttributeNames(), this.mockRequest
.getAttributeNames());
assertEquals(request.getAuthType(), this.mockRequest.getAuthType());
this.mockRequest.setCharacterEncoding("test");
assertEquals(request.getCharacterEncoding(), this.mockRequest
.getCharacterEncoding());
assertNotSame(request.getClass(), this.mockRequest.getClass());
assertEquals(request.getContentLength(), this.mockRequest
.getContentLength());
assertEquals(request.getContentType(), this.mockRequest
.getContentType());
assertEquals(request.getContextPath(), this.mockRequest
.getContextPath());
assertEquals(request.getCookies(), this.mockRequest.getCookies());
assertEquals(request.getHeaderNames(), this.mockRequest
.getHeaderNames());
assertEquals(request.getInputStream(), this.mockRequest
.getInputStream());
assertEquals(request.getLocalAddr(), this.mockRequest.getLocalAddr());
assertEquals(request.getLocale(), this.mockRequest.getLocale());
assertEquals(request.getLocales().hasMoreElements(), this.mockRequest
.getLocales().hasMoreElements());
assertEquals(request.getLocalName(), this.mockRequest.getLocalName());
assertEquals(request.getLocalPort(), this.mockRequest.getLocalPort());
assertEquals(request.getMethod(), this.mockRequest.getMethod());
assertEquals(request.getParameterMap(), this.mockRequest
.getParameterMap());
assertEquals(request.getParameterNames().hasMoreElements(),
this.mockRequest.getParameterNames().hasMoreElements());
assertEquals(request.getPathInfo(), this.mockRequest.getPathInfo());
assertEquals(request.getPathTranslated(), this.mockRequest
.getPathTranslated());
assertEquals(request.getProtocol(), this.mockRequest.getProtocol());
assertEquals(request.getQueryString(), this.mockRequest
.getQueryString());
assertEquals(request.getReader(), this.mockRequest.getReader());
assertEquals(request.getRemoteAddr(), this.mockRequest.getRemoteAddr());
assertEquals(request.getRemoteHost(), this.mockRequest.getRemoteHost());
assertEquals(request.getRemotePort(), this.mockRequest.getRemotePort());
assertEquals(request.getRequestedSessionId(), this.mockRequest
.getRequestedSessionId());
assertEquals(request.getRequestURI(), this.mockRequest.getRequestURI());
assertEquals(request.getRequestURL().toString(), this.mockRequest
.getRequestURL().toString());
assertEquals(request.getScheme(), this.mockRequest.getScheme());
assertEquals(request.getServerName(), this.mockRequest.getServerName());
assertEquals(request.getServerPort(), this.mockRequest.getServerPort());
assertEquals(request.getServletPath(), this.mockRequest
.getServletPath());
assertEquals(request.getSession(), this.mockRequest.getSession());
assertEquals(request.getSession(false), this.mockRequest
.getSession(false));
assertEquals(request.getUserPrincipal(), this.mockRequest
.getUserPrincipal());
assertEquals(request.isRequestedSessionIdFromCookie(), this.mockRequest
.isRequestedSessionIdFromCookie());
assertEquals(request.isRequestedSessionIdFromURL(), this.mockRequest
.isRequestedSessionIdFromURL());
assertEquals(request.isRequestedSessionIdValid(), this.mockRequest
.isRequestedSessionIdValid());
assertEquals(request.isSecure(), this.mockRequest.isSecure());
assertEquals(request.isUserInRole("test"), this.mockRequest
.isUserInRole("test"));
assertEquals(request.getDateHeader("test"), this.mockRequest
.getDateHeader("test"));
assertEquals(request.getHeader("test"), this.mockRequest
.getHeader("test"));
assertEquals(request.getHeaders("test").hasMoreElements(),
this.mockRequest.getHeaders("test").hasMoreElements());
assertEquals(request.getIntHeader("test"), this.mockRequest
.getIntHeader("test"));
this.mockRequest.setAttribute("test", "test");
assertEquals(request.getAttribute("test"), this.mockRequest
.getAttribute("test"));
this.mockRequest.removeAttribute("test");
assertEquals(request.getAttribute("test"), this.mockRequest
.getAttribute("test"));
assertEquals(request.getParameter("test"), this.mockRequest
.getParameter("test"));
assertEquals(request.getParameterValues("test"), this.mockRequest
.getParameterValues("test"));
assertEquals(request.getRequestDispatcher("test").getClass(),
this.mockRequest.getRequestDispatcher("test").getClass());
}
}

View File

@ -14,6 +14,15 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/Documents and Settings/Scott/.m2/repository/org/springframework/spring-core/2.0/spring-core-2.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
@ -32,15 +41,6 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/Documents and Settings/Scott/.m2/repository/org/springframework/spring-core/2.0-rc2/spring-core-2.0-rc2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
@ -68,24 +68,7 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/Documents and Settings/Scott/.m2/repository/org/springframework/spring-beans/2.0-rc2/spring-beans-2.0-rc2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/Documents and Settings/Scott/.m2/repository/org/springframework/spring-web/2.0-rc2/spring-web-2.0-rc2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module" module-name="cas-client-core" />
<orderEntry type="module-library">
<library>
<CLASSES>
@ -98,7 +81,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/Documents and Settings/Scott/.m2/repository/org/springframework/spring-context/2.0-rc2/spring-context-2.0-rc2.jar!/" />
<root url="jar://C:/Documents and Settings/Scott/.m2/repository/org/springframework/spring-beans/2.0/spring-beans-2.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@ -107,7 +90,16 @@
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/Documents and Settings/Scott/.m2/repository/org/springframework/spring-mock/2.0-rc2/spring-mock-2.0-rc2.jar!/" />
<root url="jar://C:/Documents and Settings/Scott/.m2/repository/org/springframework/spring-mock/2.0/spring-mock-2.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/Documents and Settings/Scott/.m2/repository/org/springframework/spring-web/2.0/spring-web-2.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@ -131,12 +123,7 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module" module-name="cas-client-core" />
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
<option name="ACTIVE_VCS_NAME" value="CVS" />
<option name="USE_PROJECT_VCS" value="false" />
</component>
</module>

View File

@ -6,10 +6,20 @@
<exclude-output />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/target" />
<excludeFolder url="file://$MODULE_DIR$/target/classes" />
<excludeFolder url="file://$MODULE_DIR$/target/test-classes" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/Documents and Settings/Scott/.m2/repository/org/springframework/spring-core/2.0/spring-core-2.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
@ -28,15 +38,6 @@
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/Documents and Settings/Scott/.m2/repository/org/springframework/spring-core/2.0-rc2/spring-core-2.0-rc2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
@ -49,7 +50,7 @@
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://C:/Documents and Settings/Scott/.m2/repository/org/springframework/spring-beans/2.0-rc2/spring-beans-2.0-rc2.jar!/" />
<root url="jar://C:/Documents and Settings/Scott/.m2/repository/org/springframework/spring-beans/2.0/spring-beans-2.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />

View File

@ -13,8 +13,6 @@
<component name="CodeStyleProjectProfileManger">
<option name="PROJECT_PROFILE" />
<option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
<scopes />
<profiles />
</component>
<component name="CodeStyleSettingsManager">
<option name="PER_PROJECT_SETTINGS" />
@ -57,7 +55,7 @@
<option name="OUTPUT_DIRECTORY" />
</component>
<component name="GUI Designer component loader factory" />
<component name="IdProvider" IDEtalkID="9146F905C79E0B6785C558E32D048C9C" />
<component name="IdProvider" IDEtalkID="A88B919D1EB5C876310AA75F12222006" />
<component name="ImportConfiguration">
<option name="VENDOR" />
<option name="RELEASE_TAG" />
@ -69,7 +67,7 @@
<option name="USE_PROJECT_LEVEL_SETTINGS" value="false" />
<scopes />
<profiles>
<profile version="1.0">
<profile version="1.0" is_locked="false">
<option name="myName" value="Project Default" />
<option name="myLocal" value="false" />
<used_levels>
@ -90,6 +88,129 @@
<option name="myVal" value="100" />
</server>
</used_levels>
<inspection_tool class="SamePackageImport" level="WARNING" enabled="true" />
<inspection_tool class="JavaLangImport" level="WARNING" enabled="true" />
<inspection_tool class="RedundantImport" level="WARNING" enabled="true" />
<inspection_tool class="UnusedImport" level="WARNING" enabled="true" />
<inspection_tool class="AbstractMethodCallInConstructor" level="WARNING" enabled="true" />
<inspection_tool class="InstanceVariableInitialization" level="WARNING" enabled="true">
<option name="m_ignorePrimitives" value="false" />
</inspection_tool>
<inspection_tool class="InstanceVariableUninitializedUse" level="WARNING" enabled="true">
<option name="m_ignorePrimitives" value="false" />
</inspection_tool>
<inspection_tool class="NonFinalStaticVariableUsedInClassInitialization" level="WARNING" enabled="true" />
<inspection_tool class="OverridableMethodCallInConstructor" level="WARNING" enabled="true" />
<inspection_tool class="OverriddenMethodCallInConstructor" level="WARNING" enabled="true" />
<inspection_tool class="StaticVariableInitialization" level="WARNING" enabled="true">
<option name="m_ignorePrimitives" value="false" />
</inspection_tool>
<inspection_tool class="StaticVariableUninitializedUse" level="WARNING" enabled="true">
<option name="m_ignorePrimitives" value="false" />
</inspection_tool>
<inspection_tool class="ThisEscapedInConstructor" level="WARNING" enabled="true" />
<inspection_tool class="NonThreadSafeLazyInitialization" level="WARNING" enabled="true" />
<inspection_tool class="ForCanBeForeach" level="WARNING" enabled="false" />
<inspection_tool class="UnnecessaryBoxing" level="WARNING" enabled="false" />
<inspection_tool class="UnnecessaryUnboxing" level="WARNING" enabled="false" />
<inspection_tool class="WhileCanBeForeach" level="WARNING" enabled="false" />
<inspection_tool class="ClassWithMultipleLoggers" level="WARNING" enabled="true">
<option name="loggerClassName" value="java.util.logging.Logger" />
</inspection_tool>
<inspection_tool class="ClassWithoutLogger" level="WARNING" enabled="true">
<option name="loggerClassName" value="org.apache.commons.logging.Log" />
<option name="ignoreSuperLoggers" value="true" />
</inspection_tool>
<inspection_tool class="SystemGC" level="WARNING" enabled="true" />
<inspection_tool class="Weblogic" level="ERROR" enabled="false" />
<inspection_tool class="ClassEscapesItsScope" level="WARNING" enabled="true" />
<inspection_tool class="FieldHidesSuperclassField" level="WARNING" enabled="true">
<option name="m_ignoreInvisibleFields" value="true" />
</inspection_tool>
<inspection_tool class="InnerClassVariableHidesOuterClassVariable" level="WARNING" enabled="true">
<option name="m_ignoreInvisibleFields" value="true" />
</inspection_tool>
<inspection_tool class="LocalVariableHidingMemberVariable" level="WARNING" enabled="true">
<option name="m_ignoreInvisibleFields" value="true" />
<option name="m_ignoreStaticMethods" value="true" />
</inspection_tool>
<inspection_tool class="MethodOverloadsParentMethod" level="WARNING" enabled="true" />
<inspection_tool class="MethodOverridesPackageLocalMethod" level="WARNING" enabled="true" />
<inspection_tool class="MethodOverridesPrivateMethod" level="WARNING" enabled="true" />
<inspection_tool class="MethodOverridesStaticMethod" level="WARNING" enabled="true" />
<inspection_tool class="TypeParameterHidesVisibleType" level="WARNING" enabled="true" />
<inspection_tool class="BoundFieldAssignment" level="WARNING" enabled="false" />
<inspection_tool class="OneButtonGroup" level="WARNING" enabled="false" />
<inspection_tool class="DuplicateMnemonic" level="WARNING" enabled="false" />
<inspection_tool class="MissingMnemonic" level="WARNING" enabled="false" />
<inspection_tool class="NoLabelFor" level="WARNING" enabled="false" />
<inspection_tool class="NoButtonGroup" level="WARNING" enabled="false" />
<inspection_tool class="NoScrollPane" level="WARNING" enabled="false" />
<inspection_tool class="StrutsInspection" level="ERROR" enabled="false" />
<inspection_tool class="StrutsTilesInspection" level="ERROR" enabled="false" />
<inspection_tool class="StrutsValidatorInspection" level="ERROR" enabled="false" />
<inspection_tool class="ReplaceAllDot" level="WARNING" enabled="true" />
<inspection_tool class="ComponentRegistrationProblems" level="ERROR" enabled="false">
<option name="CHECK_PLUGIN_XML" value="true" />
<option name="CHECK_JAVA_CODE" value="true" />
<option name="CHECK_ACTIONS" value="true" />
</inspection_tool>
<inspection_tool class="ComponentNotRegistered" level="WARNING" enabled="false">
<option name="CHECK_ACTIONS" value="true" />
<option name="IGNORE_NON_PUBLIC" value="true" />
</inspection_tool>
<inspection_tool class="CallToSimpleGetterInClass" level="WARNING" enabled="true">
<option name="ignoreGetterCallsOnOtherObjects" value="false" />
</inspection_tool>
<inspection_tool class="CallToSimpleSetterInClass" level="WARNING" enabled="true">
<option name="ignoreSetterCallsOnOtherObjects" value="false" />
</inspection_tool>
<inspection_tool class="ConstantStringIntern" level="WARNING" enabled="true" />
<inspection_tool class="CollectionsMustHaveInitialCapacity" level="WARNING" enabled="true" />
<inspection_tool class="TrivialStringConcatenation" level="WARNING" enabled="true" />
<inspection_tool class="StringBufferReplaceableByString" level="WARNING" enabled="true" />
<inspection_tool class="FieldMayBeStatic" level="WARNING" enabled="true" />
<inspection_tool class="StringReplaceableByStringBuffer" level="WARNING" enabled="true" />
<inspection_tool class="SizeReplaceableByIsEmpty" level="WARNING" enabled="true" />
<inspection_tool class="LengthOneStringInIndexOf" level="WARNING" enabled="true" />
<inspection_tool class="NonJREEmulationClassesInClientCode" level="ERROR" enabled="false" />
<inspection_tool class="GwtServiceNotRegistered" level="ERROR" enabled="false" />
<inspection_tool class="GWTRemoteServiceAsyncCheck" level="ERROR" enabled="false" />
<inspection_tool class="NonSerializableServiceParameters" level="ERROR" enabled="false" />
<inspection_tool class="GWTStyleCheck" level="ERROR" enabled="false" />
<inspection_tool class="GwtToHtmlReferences" level="ERROR" enabled="false" />
<inspection_tool class="FacesModelInspection" level="ERROR" enabled="false" />
<inspection_tool class="CastToConcreteClass" level="WARNING" enabled="true" />
<inspection_tool class="InstanceofChain" level="WARNING" enabled="true" />
<inspection_tool class="ClassReferencesSubclass" level="WARNING" enabled="true" />
<inspection_tool class="DeclareCollectionAsInterface" level="WARNING" enabled="true">
<option name="ignoreLocalVariables" value="false" />
<option name="ignorePrivateMethodsAndFields" value="false" />
</inspection_tool>
<inspection_tool class="FeatureEnvy" level="WARNING" enabled="true" />
<inspection_tool class="InstanceVariableOfConcreteClass" level="WARNING" enabled="true" />
<inspection_tool class="InstanceofInterfaces" level="WARNING" enabled="true" />
<inspection_tool class="InstanceofThis" level="WARNING" enabled="true" />
<inspection_tool class="LocalVariableOfConcreteClass" level="WARNING" enabled="true" />
<inspection_tool class="MagicNumber" level="WARNING" enabled="true">
<option name="m_ignoreInHashCode" value="true" />
</inspection_tool>
<inspection_tool class="ParameterOfConcreteClass" level="WARNING" enabled="true" />
<inspection_tool class="OverlyStrongTypeCast" level="WARNING" enabled="true" />
<inspection_tool class="MethodOnlyUsedFromInnerClass" level="WARNING" enabled="true">
<option name="ignoreMethodsAccessedFromAnonymousClass" value="false" />
</inspection_tool>
<inspection_tool class="PublicMethodNotExposedInInterface" level="WARNING" enabled="true" />
<inspection_tool class="StaticMethodOnlyUsedInOneClass" level="WARNING" enabled="true" />
<inspection_tool class="StaticVariableOfConcreteClass" level="WARNING" enabled="true" />
<inspection_tool class="ParameterHidingMemberVariable" level="WARNING" enabled="true">
<option name="m_ignoreInvisibleFields" value="true" />
<option name="m_ignoreStaticMethodParametersHidingInstanceFields" value="false" />
<option name="m_ignoreForConstructors" value="true" />
<option name="m_ignoreForPropertySetters" value="true" />
<option name="m_ignoreForAbstractMethods" value="false" />
</inspection_tool>
<inspection_tool class="MethodReturnOfConcreteClass" level="WARNING" enabled="true" />
</profile>
</profiles>
</component>
@ -273,6 +394,13 @@
</component>
<component name="StarteamVcsAdapter" />
<component name="VssVcs" />
<component name="com.intellij.jsf.UserDefinedFacesConfigs">
<option name="USER_DEFINED_CONFIGS">
<value>
<list size="0" />
</value>
</option>
</component>
<component name="libraryTable" />
<component name="uidesigner-configuration">
<option name="INSTRUMENT_CLASSES" value="true" />

View File

@ -10,22 +10,18 @@
<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" />
<option name="DATE_AFTER" />
<option name="DATE_BEFORE" value="" />
<option name="DATE_AFTER" value="" />
<option name="CHANGE_BEFORE" value="" />
<option name="CHANGE_AFTER" value="" />
<option name="USE_USER_FILTER" value="false" />
<option name="USER" value="" />
</component>
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/assembly.xml" afterPath="$PROJECT_DIR$/assembly.xml" />
<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.iws" afterPath="$PROJECT_DIR$/cas-client.iws" />
</list>
<list default="true" name="Default" comment="" />
</component>
<component name="ChangeListSynchronizer" />
<component name="ChangesViewManager" flattened_view="false" />
<component name="ChangesViewManager" flattened_view="true" />
<component name="CheckinPanelState" />
<component name="Commander">
<leftPanel />
@ -33,7 +29,7 @@
<splitter proportion="0.5" />
</component>
<component name="CompilerWorkspaceConfiguration">
<option name="COMPILE_IN_BACKGROUND" value="true" />
<option name="COMPILE_IN_BACKGROUND" value="false" />
<option name="AUTO_SHOW_ERRORS_IN_EDITOR" value="true" />
<option name="CLOSE_MESSAGE_VIEW_IF_SUCCESS" value="true" />
<option name="COMPILE_DEPENDENT_FILES" value="false" />
@ -193,29 +189,8 @@
<component name="FavoritesManager">
<favorites_list name="cas-client" />
</component>
<component name="FavoritesProjectViewPane">
<subPane subId="cas-client">
<PATH>
<PATH_ELEMENT>
<option name="myItemId" />
<option name="myItemType" value="com.intellij.ide.favoritesTreeView.FavoritesTreeNodeDescriptor" />
</PATH_ELEMENT>
</PATH>
</subPane>
</component>
<component name="FileEditorManager">
<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="24" column="43" selection-start="644" selection-end="644" vertical-scroll-proportion="0.61445785">
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FavoritesProjectViewPane" />
<component name="FileEditorManager" />
<component name="FindManager">
<FindUsagesManager>
<setting name="OPEN_NEW_TAB" value="false" />
@ -231,10 +206,10 @@
<option name="SPLITTER_PROPORTION" value="0.5" />
<option name="GROUP_BY_SEVERITY" value="false" />
<option name="FILTER_RESOLVED_ITEMS" value="true" />
<option name="ANALYZE_TEST_SOURCES" value="false" />
<option name="ANALYZE_TEST_SOURCES" value="true" />
<option name="SHOW_DIFF_WITH_PREVIOUS_RUN" value="false" />
<option name="SCOPE_TYPE" value="1" />
<option name="CUSTOM_SCOPE_NAME" value="Project Files" />
<option name="CUSTOM_SCOPE_NAME" value="" />
<option name="SHOW_ONLY_DIFF" value="false" />
<option name="myCurrentProfileName" value="Default" />
</component>
@ -263,16 +238,6 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="cas-client.ipr" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="cas-client-core" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</component>
<component name="PerforceChangeBrowserSettings">
@ -347,94 +312,6 @@
<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>
<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>
<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>
@ -460,216 +337,6 @@
<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-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_ELEMENT>
<option name="myItemId" value="PsiDirectory:C:\idea-workspace\java-client\cas-client-core\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-core\src\test" />
<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-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_ELEMENT>
<option name="myItemId" value="PsiDirectory:C:\idea-workspace\java-client\cas-client-core\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-core\src\test" />
<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-core\src\test\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-core\src\test\java\org\jasig\cas\client\web\filter" />
<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-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_ELEMENT>
<option name="myItemId" value="PsiDirectory:C:\idea-workspace\java-client\cas-client-core\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-core\src\test" />
<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-core\src\test\java" />
<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-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_ELEMENT>
<option name="myItemId" value="PsiDirectory:C:\idea-workspace\java-client\cas-client-core\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-core\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-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_ELEMENT>
<option name="myItemId" value="PsiDirectory:C:\idea-workspace\java-client\cas-client-core\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-core\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-core\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-core\src\main\java\org\jasig\cas\client\web\filter" />
<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-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_ELEMENT>
<option name="myItemId" value="PsiDirectory:C:\idea-workspace\java-client\cas-client-core\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-core\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-core\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-core\src\main\java\org\jasig\cas\client\validation" />
<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-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_ELEMENT>
<option name="myItemId" value="PsiDirectory:C:\idea-workspace\java-client\cas-client-core\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-core\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-core\src\main\java" />
<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>
<component name="ProjectReloadState">
@ -677,13 +344,13 @@
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="0.16666667" version="1" splitterProportion="0.5">
<flattenPackages ProjectPane="true" />
<showMembers ProjectPane="true" />
<flattenPackages />
<showMembers />
<showModules />
<showLibraryContents />
<hideEmptyPackages ProjectPane="true" />
<abbreviatePackageNames ProjectPane="false" />
<showStructure Favorites="false" Scope="false" PackagesPane="false" ProjectPane="false" />
<hideEmptyPackages />
<abbreviatePackageNames />
<showStructure PackagesPane="false" ProjectPane="false" />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
@ -710,41 +377,7 @@
</component>
<component name="RecentsManager" />
<component name="RestoreUpdateTree" />
<component name="RunManager" selected="JUnit.CasValidationFilterTests">
<tempConfiguration default="false" name="CasValidationFilterTests" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
<pattern value="org.jasig.cas.client.web.filter.*" />
<module name="cas-client-core" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
<option name="PACKAGE_NAME" value="org.jasig.cas.client.web.filter" />
<option name="MAIN_CLASS_NAME" value="org.jasig.cas.client.web.filter.CasValidationFilterTests" />
<option name="METHOD_NAME" />
<option name="TEST_OBJECT" value="class" />
<option name="VM_PARAMETERS" />
<option name="PARAMETERS" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
<option name="ADDITIONAL_CLASS_PATH" />
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
<RunnerSettings RunnerId="Run" />
<ConfigurationWrapper RunnerId="Run" />
<method>
<option name="Make" value="true" />
</method>
</tempConfiguration>
<configuration default="true" type="Applet" factoryName="Applet">
<module name="" />
<option name="MAIN_CLASS_NAME" />
<option name="HTML_FILE_NAME" />
<option name="HTML_USED" value="false" />
<option name="WIDTH" value="400" />
<option name="HEIGHT" value="300" />
<option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
<option name="VM_PARAMETERS" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
</configuration>
<component name="RunManager">
<configuration default="true" type="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
@ -767,9 +400,6 @@
<option name="TEST_SEARCH_SCOPE">
<value defaultName="wholeProject" />
</option>
<method>
<option name="Make" value="true" />
</method>
</configuration>
<configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
<option name="MAIN_CLASS_NAME" />
@ -781,45 +411,20 @@
<option name="ENABLE_SWING_INSPECTOR" value="false" />
<module name="" />
</configuration>
<configuration default="true" type="Applet" factoryName="Applet">
<module name="" />
<option name="MAIN_CLASS_NAME" />
<option name="HTML_FILE_NAME" />
<option name="HTML_USED" value="false" />
<option name="WIDTH" value="400" />
<option name="HEIGHT" value="300" />
<option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
<option name="VM_PARAMETERS" />
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
</configuration>
</component>
<component name="ScopeViewComponent">
<subPane subId="Tests">
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT USER_OBJECT="cas-client-core">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
</PATH>
</subPane>
<subPane subId="Production">
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT USER_OBJECT="cas-client-core">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
</PATH>
</subPane>
</component>
<component name="ScopeViewComponent" />
<component name="SelectInManager" />
<component name="StarteamConfiguration">
<option name="SERVER" value="" />
@ -849,7 +454,7 @@
<option name="myStrutsValidationEnabled" value="true" />
<option name="myTilesValidationEnabled" value="true" />
<option name="myValidatorValidationEnabled" value="true" />
<option name="myReportAsWarnings" value="false" />
<option name="myReportErrorsAsWarnings" value="true" />
</component>
<component name="SvnChangesBrowserSettings">
<option name="USE_AUTHOR_FIELD" value="true" />
@ -866,26 +471,6 @@
<option name="UPDATE_RUN_STATUS" value="false" />
<option name="UPDATE_RECURSIVELY" value="true" />
<option name="MERGE_DRY_RUN" value="false" />
<configuration useDefault="true">C:\Documents and Settings\Scott\Application Data\Subversion</configuration>
</component>
<component name="Talios.JiraConfigurationComponent" enableIssueTracking="false" autoRefresh="false" useExternalBrowser="false" refreshTimeout="0" annotateissues="false">
<servers />
<columns>
<column id="created" position="0" width="-1" />
<column id="key" position="1" width="-1" />
<column id="component" position="2" width="-1" />
<column id="title" position="3" width="-1" />
<column id="type" position="4" width="-1" />
<column id="priority" position="5" width="-1" />
<column id="status" position="6" width="-1" />
<column id="resolution" position="7" width="-1" />
<column id="assignee" position="8" width="-1" />
<column id="reporter" position="9" width="-1" />
<column id="updated" position="10" width="-1" />
<column id="dueDate" position="11" width="-1" />
<column id="version" position="12" width="-1" />
<column id="fixVersion" position="13" width="-1" />
</columns>
</component>
<component name="TodoView" selected-index="0">
<todo-panel id="selected-file">
@ -903,32 +488,32 @@
</component>
<component name="ToolWindowManager">
<frame x="-4" y="-4" width="1928" height="1178" extended-state="6" />
<editor active="true" />
<editor active="false" />
<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="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" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3295238" order="6" />
<window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32995194" order="7" x="651" y="237" width="618" height="695" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32857144" order="11" />
<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="true" weight="0.3295238" 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="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" />
<window_info id="CVS" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3295238" order="8" />
<window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24986653" order="0" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="1" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" />
<window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" />
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" 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" />
<window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="6" />
<window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="4" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="0" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="9" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="0" />
<window_info id="Aspects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="5" />
<window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="0" />
<window_info id="Aspects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="3" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="5" />
</layout>
@ -942,26 +527,24 @@
</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="false" />
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="true" />
<option name="PERFORM_UPDATE_IN_BACKGROUND" value="false" />
<option name="PERFORM_COMMIT_IN_BACKGROUND" value="false" />
<option name="PUT_FOCUS_INTO_COMMENT" value="false" />
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
<option name="LAST_COMMIT_MESSAGE" value="CASC-7&#10;&#10;updated to put redirect within code that looks for ticket" />
<option name="LAST_COMMIT_MESSAGE" />
<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="true" />
<option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="true" />
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" />
<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" />
<option name="ERROR_OCCURED" value="false" />
<option name="ACTIVE_VCS_NAME" value="CVS" />
<option name="ACTIVE_VCS_NAME" value="cvs" />
<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" />
<MESSAGE value="updated poms and assembly" />
<MESSAGE value="updated project files" />
<MESSAGE value="CASC-7&#10;&#10;updated to put redirect within code that looks for ticket" />
</component>
<component name="VssConfiguration">
<option name="CLIENT_PATH" value="" />
@ -1005,122 +588,17 @@
<option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="com.intellij.ide.util.scopeChooser.ScopeChooserConfigurable">
<component name="com.intellij.ide.util.scopeChooser.ScopeChooserConfigurable" proportions="" version="1">
<option name="myLastEditedConfigurable" />
</component>
<component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable">
<option name="myLastEditedConfigurable" value="1.5" />
<component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.2774674,0.5" version="1">
<option name="myPlainMode" value="false" />
<option name="myLastEditedConfigurable" value="cas-client-core" />
</component>
<component name="com.intellij.profile.ui.ErrorOptionsConfigurable">
<component name="com.intellij.profile.ui.ErrorOptionsConfigurable" proportions="" version="1">
<option name="myLastEditedConfigurable" />
</component>
<component name="editorHistoryManager">
<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$/cas-client-core/src/main/java/org/jasig/cas/client/web/filter/HttpServletRequestWrapperFilter.java">
<provider selected="true" editor-type-id="text-editor">
<state line="20" column="65" selection-start="722" selection-end="722" vertical-scroll-proportion="0.2560241">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cas-client-core/src/test/java/org/jasig/cas/client/web/filter/CasValidationFilterTests.java">
<provider selected="true" editor-type-id="text-editor">
<state line="81" column="38" selection-start="3202" selection-end="3202" vertical-scroll-proportion="0.49246988">
<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="112" column="9" selection-start="4893" selection-end="4893" vertical-scroll-proportion="1.2927581">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cas-client-core/pom.xml">
<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$/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.02560241">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cas-client-core/src/main/java/org/jasig/cas/client/validation/Assertion.java">
<provider selected="true" editor-type-id="text-editor">
<state line="19" column="44" selection-start="552" selection-end="552" vertical-scroll-proportion="0.30722892">
<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="20" column="13" selection-start="539" selection-end="539" vertical-scroll-proportion="0.15963855">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/assembly.xml">
<provider selected="true" editor-type-id="text-editor">
<state line="24" column="43" selection-start="644" selection-end="644" vertical-scroll-proportion="0.61445785">
<folding />
</state>
</provider>
</entry>
</component>
<component name="editorHistoryManager" />
<component name="editorManager" />
</project>

View File

@ -121,13 +121,13 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>2.0-rc2</version>
<version>2.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>2.0-rc2</version>
<version>2.0</version>
<scope>compile</scope>
</dependency>
<dependency>