Author: kkolinko Date: Mon Jul 8 04:12:14 2013 New Revision: 1500573 URL: http://svn.apache.org/r1500573 Log: svn:eol-style=native
Modified: tomcat/trunk/java/org/apache/catalina/storeconfig/CatalinaClusterSF.java (props changed) tomcat/trunk/java/org/apache/catalina/storeconfig/ChannelSF.java (props changed) tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorSF.java (props changed) tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java (props changed) tomcat/trunk/java/org/apache/catalina/storeconfig/Constants.java (props changed) tomcat/trunk/java/org/apache/catalina/storeconfig/GlobalNamingResourcesSF.java (props changed) tomcat/trunk/java/org/apache/catalina/storeconfig/IStoreConfig.java (props changed) tomcat/trunk/java/org/apache/catalina/storeconfig/IStoreFactory.java (props changed) tomcat/trunk/java/org/apache/catalina/storeconfig/InstanceListenerSF.java (props changed) tomcat/trunk/java/org/apache/catalina/storeconfig/InterceptorSF.java (props changed) tomcat/trunk/java/org/apache/catalina/storeconfig/LoaderSF.java (props changed) tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings.properties (props changed) tomcat/trunk/java/org/apache/catalina/storeconfig/ManagerSF.java (props changed) tomcat/trunk/java/org/apache/catalina/storeconfig/NamingResourcesSF.java (props changed) tomcat/trunk/java/org/apache/catalina/storeconfig/PersistentManagerSF.java (props changed) tomcat/trunk/java/org/apache/catalina/storeconfig/SenderSF.java (props changed) tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java (props changed) tomcat/trunk/java/org/apache/catalina/storeconfig/StandardEngineSF.java (props changed) tomcat/trunk/java/org/apache/catalina/storeconfig/StandardHostSF.java (props changed) tomcat/trunk/java/org/apache/catalina/storeconfig/StandardServerSF.java (props changed) tomcat/trunk/java/org/apache/catalina/storeconfig/StandardServiceSF.java (props changed) tomcat/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java (props changed) tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfig.java (props changed) tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java (props changed) tomcat/trunk/java/org/apache/catalina/storeconfig/StoreContextAppender.java (props changed) tomcat/trunk/java/org/apache/catalina/storeconfig/StoreDescription.java (props changed) tomcat/trunk/java/org/apache/catalina/storeconfig/StoreFactoryBase.java (props changed) tomcat/trunk/java/org/apache/catalina/storeconfig/StoreFactoryRule.java (props changed) tomcat/trunk/java/org/apache/catalina/storeconfig/StoreFileMover.java (props changed) tomcat/trunk/java/org/apache/catalina/storeconfig/StoreLoader.java (props changed) tomcat/trunk/java/org/apache/catalina/storeconfig/StoreRegistry.java (props changed) tomcat/trunk/java/org/apache/catalina/storeconfig/WatchedResourceSF.java (props changed) tomcat/trunk/java/org/apache/catalina/storeconfig/WebResourceRootSF.java (props changed) tomcat/trunk/java/org/apache/catalina/storeconfig/WrapperLifecycleSF.java (props changed) tomcat/trunk/java/org/apache/catalina/storeconfig/WrapperListenerSF.java (props changed) tomcat/trunk/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml (props changed) tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml (props changed) tomcat/trunk/java/org/apache/catalina/valves/rewrite/Resolver.java (props changed) tomcat/trunk/java/org/apache/catalina/valves/rewrite/ResolverImpl.java (props changed) tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteCond.java (props changed) tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteMap.java (props changed) tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteRule.java (props changed) tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java (props changed) tomcat/trunk/java/org/apache/catalina/valves/rewrite/Substitution.java (props changed) tomcat/trunk/java/org/apache/catalina/valves/rewrite/mbeans-descriptors.xml (props changed) tomcat/trunk/java/org/apache/tomcat/websocket/MessageHandlerResult.java (props changed) tomcat/trunk/java/org/apache/tomcat/websocket/MessageHandlerResultType.java (props changed) tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java (props changed) tomcat/trunk/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java (props changed) tomcat/trunk/res/META-INF/tomcat-websocket.jar/services/javax.websocket.ContainerProvider (props changed) tomcat/trunk/test/webapp/WEB-INF/tags/bug55198.tagx (contents, props changed) Propchange: tomcat/trunk/java/org/apache/catalina/storeconfig/CatalinaClusterSF.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/storeconfig/ChannelSF.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorSF.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/storeconfig/ConnectorStoreAppender.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/storeconfig/Constants.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/storeconfig/GlobalNamingResourcesSF.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/storeconfig/IStoreConfig.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/storeconfig/IStoreFactory.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/storeconfig/InstanceListenerSF.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/storeconfig/InterceptorSF.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/storeconfig/LoaderSF.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/storeconfig/LocalStrings.properties ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/storeconfig/ManagerSF.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/storeconfig/NamingResourcesSF.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/storeconfig/PersistentManagerSF.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/storeconfig/SenderSF.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/storeconfig/StandardContextSF.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/storeconfig/StandardEngineSF.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/storeconfig/StandardHostSF.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/storeconfig/StandardServerSF.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/storeconfig/StandardServiceSF.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/storeconfig/StoreAppender.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfig.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/storeconfig/StoreConfigLifecycleListener.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/storeconfig/StoreContextAppender.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/storeconfig/StoreDescription.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/storeconfig/StoreFactoryBase.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/storeconfig/StoreFactoryRule.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/storeconfig/StoreFileMover.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/storeconfig/StoreLoader.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/storeconfig/StoreRegistry.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/storeconfig/WatchedResourceSF.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/storeconfig/WebResourceRootSF.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/storeconfig/WrapperLifecycleSF.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/storeconfig/WrapperListenerSF.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/storeconfig/mbeans-descriptors.xml ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type Mon Jul 8 04:12:14 2013 @@ -1 +1 @@ -application/xml +text/xml Propchange: tomcat/trunk/java/org/apache/catalina/storeconfig/server-registry.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/valves/rewrite/Resolver.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/valves/rewrite/ResolverImpl.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteCond.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteMap.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteRule.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/valves/rewrite/RewriteValve.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/valves/rewrite/Substitution.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/valves/rewrite/mbeans-descriptors.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/catalina/valves/rewrite/mbeans-descriptors.xml ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type Mon Jul 8 04:12:14 2013 @@ -1 +1 @@ -application/xml +text/xml Propchange: tomcat/trunk/java/org/apache/tomcat/websocket/MessageHandlerResult.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/tomcat/websocket/MessageHandlerResultType.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/tomcat/websocket/WsRemoteEndpointBase.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/java/org/apache/tomcat/websocket/server/DefaultServerEndpointConfigurator.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: tomcat/trunk/res/META-INF/tomcat-websocket.jar/services/javax.websocket.ContainerProvider ------------------------------------------------------------------------------ svn:eol-style = native Modified: tomcat/trunk/test/webapp/WEB-INF/tags/bug55198.tagx URL: http://svn.apache.org/viewvc/tomcat/trunk/test/webapp/WEB-INF/tags/bug55198.tagx?rev=1500573&r1=1500572&r2=1500573&view=diff ============================================================================== --- tomcat/trunk/test/webapp/WEB-INF/tags/bug55198.tagx (original) +++ tomcat/trunk/test/webapp/WEB-INF/tags/bug55198.tagx Mon Jul 8 04:12:14 2013 @@ -1,25 +1,25 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"> -<jsp:directive.tag body-content="scriptless" /> -<jsp:text> - <a href="#" onclick="window.alert("${'foo'}")">foo</a> - <a href="#" onclick="window.alert("bar")">bar</a> -</jsp:text> -<jsp:doBody /> -</jsp:root> +<?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="2.0"> +<jsp:directive.tag body-content="scriptless" /> +<jsp:text> + <a href="#" onclick="window.alert("${'foo'}")">foo</a> + <a href="#" onclick="window.alert("bar")">bar</a> +</jsp:text> +<jsp:doBody /> +</jsp:root> Propchange: tomcat/trunk/test/webapp/WEB-INF/tags/bug55198.tagx ------------------------------------------------------------------------------ svn:eol-style = native --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org