瀏覽代碼

changes due to nested xml comments

Ian Wright 8 年之前
父節點
當前提交
38bfe7b60a
共有 2 個文件被更改,包括 13 次插入44 次删除
  1. 8 37
      pom.xml
  2. 5 7
      src/main/webapp/WEB-INF/web.xml

+ 8 - 37
pom.xml

@@ -173,49 +173,20 @@
 									<token><![CDATA[ End CAS Config -->]]></token>
 									<value><![CDATA[<!--    End CAS Config -->]]></value>
 								</replacement>
+                                <replacement>
+                                    <token><![CDATA[<!- cas-config-web.xml start ->]]></token>
+                                    <value><![CDATA[<!-- cas-config-web.xml start -->]]></value>
+                                </replacement>
+                                <replacement>
+                                    <token><![CDATA[<!- cas-config-web.xml end ->]]></token>
+                                    <value><![CDATA[<!-- cas-config-web.xml end -->]]></value>
+                                </replacement>
 							</replacements>
 						</configuration>
 					</plugin>
 				</plugins>
 			</build>
 		</profile>
-		<profile>
-			<id>cas-fileconfig</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>com.google.code.maven-replacer-plugin</groupId>
-						<artifactId>maven-replacer-plugin</artifactId>
-						<version>1.3.5</version>
-						<executions>
-							<execution>
-								<id>replace-webxml-config</id>
-								<phase>prepare-package</phase>
-								<goals>
-									<goal>replace</goal>
-								</goals>
-								<configuration>
-									<includes>
-										<include>src/main/webapp/WEB-INF/web.xml</include>
-									</includes>
-									<replacements>
-										<replacement>
-                                            <token><![CDATA[<!-- cas-config-web.xml start -->]]></token>
-											<value><![CDATA[<!-- cas-config-web.xml start ]]></value>
-										</replacement>
-										<replacement>
-                                            <token><![CDATA[<!-- cas-config-web.xml end -->]]></token>
-											<value><![CDATA[ cas-config-web.xml end -->]]></value>
-										</replacement>
-
-									</replacements>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
     </profiles>
 
     <build>

+ 5 - 7
src/main/webapp/WEB-INF/web.xml

@@ -70,8 +70,8 @@
     <!-- uncomment and set parameters for CAS integration
     <filter>
         <filter-name>CAS Validation Filter</filter-name>
-        <filter-class>org.jasig.cas.client.validation.Cas30ProxyReceivingTicketValidationFilter</filter-class>
-        <!-- cas-config-web.xml start -->
+        <filter-class>org.jasig.cas.client.validation.Cas20ProxyReceivingTicketValidationFilter</filter-class>
+        <!- cas-config-web.xml start ->
         <init-param>
             <param-name>casServerUrlPrefix</param-name>
             <param-value>${cas.server}</param-value>
@@ -88,12 +88,12 @@
             <param-name>proxyReceptorUrl</param-name>
             <param-value>/proxyCallback</param-value>
         </init-param>
-        <!-- cas-config-web.xml end -->
+        <!- cas-config-web.xml end ->
     </filter>
     <filter>
         <filter-name>CAS Authentication Filter</filter-name>
         <filter-class>org.jasig.cas.client.authentication.AuthenticationFilter</filter-class>
-        <!-- cas-config-web.xml start -->
+        <!- cas-config-web.xml start ->
         <init-param>
             <param-name>casServerLoginUrl</param-name>
             <param-value>${cas.server}login</param-value>
@@ -106,17 +106,15 @@
             <param-name>gateway</param-name>
             <param-value>false</param-value>
         </init-param>
-        <!-- cas-config-web.xml end -->
+        <!- cas-config-web.xml end ->
     </filter>
     <filter>
         <filter-name>CAS Single Sign Out Filter</filter-name>
         <filter-class>org.jasig.cas.client.session.SingleSignOutFilter</filter-class>
-        <!-- cas-config-web.xml start -->
         <init-param>
 			<param-name>casServerUrlPrefix</param-name>
 			<param-value>${cas.server}</param-value>
 		</init-param>
-        <!-- cas-config-web.xml end -->
     </filter>
     <filter-mapping>
         <filter-name>CAS Single Sign Out Filter</filter-name>