Fix svn:eol-style and svn:keywords properties for java/xml files

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@796166 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 134 insertions, 134 deletions

diff --git a/java/sca/distribution/tomcat/tomcat-war/src/main/assembly/war.xml b/java/sca/distribution/tomcat/tomcat-war/src/main/assembly/war.xml
index 67f976459e..695acee3f0 100644
--- a/java/sca/distribution/tomcat/tomcat-war/src/main/assembly/war.xml
+++ b/java/sca/distribution/tomcat/tomcat-war/src/main/assembly/war.xml
@@ -1,94 +1,94 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

-

-    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.

--->

-<assembly>

-  <id>war</id>

-  <formats>

-    <format>war</format>

-  </formats>

-  <includeBaseDirectory>false</includeBaseDirectory>

-  <fileSets>

-    <fileSet>

-      <directory>${basedir}</directory>

-      <includes>

-        <include>README.txt</include>

-      </includes>

-    </fileSet>

-    <fileSet>

-      <directory>${basedir}/target/classes</directory>

-      <outputDirectory>/</outputDirectory>

-      <includes>

-        <include>README.txt</include>

-        <include>NOTICE.txt</include>

-        <include>LICENSE.txt</include>

-      </includes>

-    </fileSet>

-    <fileSet>

-      <directory>${basedir}/src/main/webapp</directory>

-      <outputDirectory>/</outputDirectory>

-    </fileSet>

-    <fileSet>

-      <directory>${basedir}/target/classes</directory>

-      <outputDirectory>/</outputDirectory>

-      <excludes>

-          <exclude>org/**</exclude>

-          <exclude>META-INF/LICENSE</exclude>

-          <exclude>META-INF/NOTICE</exclude>

-      </excludes>

-    </fileSet>

-    <fileSet>

-      <directory>${basedir}/target/classes</directory>

-      <outputDirectory>WEB-INF/classes</outputDirectory>

-    </fileSet>

-    <fileSet>

-      <directory>${basedir}/target</directory>

-      <outputDirectory>lib</outputDirectory>

-      <includes>

-        <include>tuscany-host*.jar</include>

-      </includes>

-    </fileSet>

-  </fileSets>

-  <dependencySets>

-    <dependencySet>

-      <outputDirectory>tuscany-lib</outputDirectory>

-      <scope>runtime</scope>

-      <excludes>

-          <exclude>org.apache.tomcat:catalina</exclude>

-          <exclude>org.apache.tomcat:annotations-api</exclude>

-          <exclude>org.apache.tomcat:juli</exclude>

-          <exclude>org.apache.tomcat:servlet-api</exclude>

-      </excludes>

-    </dependencySet>

-    <dependencySet>

-      <outputDirectory>tomcat-lib</outputDirectory>

-      <scope>runtime</scope>

-      <includes>

-          <include>org.apache.tuscany.sca:tuscany-tomcat-hook</include>

-      </includes>

-    </dependencySet>

-    <dependencySet>

-      <outputDirectory>WEB-INF/lib</outputDirectory>

-      <scope>runtime</scope>

-      <includes>

-          <include>org.apache.tuscany.sca:tuscany-tomcat-servlet</include>

-          <include>org.codehaus.swizzle:swizzle-stream</include>

-      </includes>

-    </dependencySet>

-  </dependencySets>

-</assembly>

-

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+-->
+<assembly>
+  <id>war</id>
+  <formats>
+    <format>war</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>${basedir}</directory>
+      <includes>
+        <include>README.txt</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>${basedir}/target/classes</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>README.txt</include>
+        <include>NOTICE.txt</include>
+        <include>LICENSE.txt</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>${basedir}/src/main/webapp</directory>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>${basedir}/target/classes</directory>
+      <outputDirectory>/</outputDirectory>
+      <excludes>
+          <exclude>org/**</exclude>
+          <exclude>META-INF/LICENSE</exclude>
+          <exclude>META-INF/NOTICE</exclude>
+      </excludes>
+    </fileSet>
+    <fileSet>
+      <directory>${basedir}/target/classes</directory>
+      <outputDirectory>WEB-INF/classes</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>${basedir}/target</directory>
+      <outputDirectory>lib</outputDirectory>
+      <includes>
+        <include>tuscany-host*.jar</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>tuscany-lib</outputDirectory>
+      <scope>runtime</scope>
+      <excludes>
+          <exclude>org.apache.tomcat:catalina</exclude>
+          <exclude>org.apache.tomcat:annotations-api</exclude>
+          <exclude>org.apache.tomcat:juli</exclude>
+          <exclude>org.apache.tomcat:servlet-api</exclude>
+      </excludes>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory>tomcat-lib</outputDirectory>
+      <scope>runtime</scope>
+      <includes>
+          <include>org.apache.tuscany.sca:tuscany-tomcat-hook</include>
+      </includes>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory>WEB-INF/lib</outputDirectory>
+      <scope>runtime</scope>
+      <includes>
+          <include>org.apache.tuscany.sca:tuscany-tomcat-servlet</include>
+          <include>org.codehaus.swizzle:swizzle-stream</include>
+      </includes>
+    </dependencySet>
+  </dependencySets>
+</assembly>
+
diff --git a/java/sca/distribution/tomcat/tomcat-war/src/main/webapp/WEB-INF/web.xml b/java/sca/distribution/tomcat/tomcat-war/src/main/webapp/WEB-INF/web.xml
index f416c92c26..e6c3d23e9e 100644
--- a/java/sca/distribution/tomcat/tomcat-war/src/main/webapp/WEB-INF/web.xml
+++ b/java/sca/distribution/tomcat/tomcat-war/src/main/webapp/WEB-INF/web.xml
@@ -1,40 +1,40 @@
-<?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.

--->

-<!DOCTYPE web-app

-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"

-    "http://java.sun.com/dtd/web-app_2_3.dtd">

-

-<web-app>

-

-  <display-name>Tuscany Installer Application</display-name>

-

-  <servlet>

-    <servlet-name>InstallerServlet</servlet-name>

-    <servlet-class>org.apache.tuscany.sca.war.InstallerServlet</servlet-class>

-  </servlet>

-

-  <servlet-mapping>

-    <servlet-name>InstallerServlet</servlet-name>

-    <url-pattern>/installer</url-pattern>

-  </servlet-mapping>

-

-  <welcome-file-list id="WelcomeFileList">

-    <welcome-file>installer.jsp</welcome-file>

-  </welcome-file-list>

-

-</web-app>

+<?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.
+-->
+<!DOCTYPE web-app
+    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+    "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
+
+  <display-name>Tuscany Installer Application</display-name>
+
+  <servlet>
+    <servlet-name>InstallerServlet</servlet-name>
+    <servlet-class>org.apache.tuscany.sca.war.InstallerServlet</servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>InstallerServlet</servlet-name>
+    <url-pattern>/installer</url-pattern>
+  </servlet-mapping>
+
+  <welcome-file-list id="WelcomeFileList">
+    <welcome-file>installer.jsp</welcome-file>
+  </welcome-file-list>
+
+</web-app>