Change eol-style and add link to jdbc-pool on the documentation home page

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1144358 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/jdbc-pool/pom.xml b/modules/jdbc-pool/pom.xml
index 0e50832..203340e 100644 (file)
--- a/modules/jdbc-pool/pom.xml
+++ b/modules/jdbc-pool/pom.xml
@@ -1,140 +1,140 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
-  <modelVersion>4.0.0</modelVersion>\r
-\r
-  <parent>\r
-    <groupId>org.apache</groupId>\r
-    <artifactId>apache</artifactId>\r
-    <version>9</version>\r
-  </parent>\r
-  \r
-  <groupId>org.apache.tomcat</groupId>\r
-  <artifactId>jdbc-pool</artifactId>\r
-  <version>1.2-SNAPSHOT</version>\r
-  <packaging>jar</packaging>\r
-\r
-  <name>jdbc-pool</name>\r
-  <url>http://people.apache.org/~fhanik/jdbc-pool/</url>\r
-  \r
-  <properties>\r
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
-  </properties>\r
-  \r
-  <mailingLists>\r
-    <mailingList>\r
-      <name>Development List</name>\r
-      <subscribe>dev-subscribe@tomcat.apache.org</subscribe>\r
-      <unsubscribe>dev-unsubscribe@tomcat.apache.org</unsubscribe>\r
-      <post>dev@tomcat.apache.org</post>\r
-    </mailingList>\r
-    <mailingList>\r
-      <name>Users List</name>\r
-      <subscribe>users-subscribe@tomcat.apache.org</subscribe>\r
-      <unsubscribe>users-unsubscribe@tomcat.apache.org</unsubscribe>\r
-      <post>users@tomcat.apache.org</post>\r
-    </mailingList>\r
-  </mailingLists>\r
-  \r
-  <scm>\r
-    <connection>scm:svn:https://svn.apache.org/repos/asf/tomcat/trunk/modules/jdbc-pool</connection>\r
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tomcat/trunk/modules/jdbc-pool</developerConnection>\r
-    <url>http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool</url>\r
-  </scm>  \r
-\r
-  <dependencies>\r
-    <dependency>\r
-      <groupId>org.apache.tomcat</groupId>\r
-      <artifactId>juli</artifactId>\r
-      <version>6.0.32</version>\r
-    </dependency>\r
-    <dependency>\r
-      <groupId>junit</groupId>\r
-      <artifactId>junit</artifactId>\r
-      <version>3.8.1</version>\r
-      <scope>test</scope>\r
-    </dependency>\r
-    <dependency>\r
-      <groupId>org.apache.tomcat</groupId>\r
-      <artifactId>dbcp</artifactId>\r
-      <version>6.0.32</version>\r
-      <scope>test</scope>\r
-    </dependency>\r
-    <dependency>\r
-      <groupId>com.h2database</groupId>\r
-      <artifactId>h2</artifactId>\r
-      <version>1.3.152</version>\r
-      <scope>test</scope>\r
-    </dependency>\r
-  </dependencies>\r
-  <build>\r
-    <plugins>\r
-      <plugin>\r
-        <groupId>org.apache.maven.plugins</groupId>\r
-        <artifactId>maven-compiler-plugin</artifactId>\r
-        <configuration>\r
-          <source>1.6</source>\r
-          <target>1.6</target>\r
-          <optimize>true</optimize>\r
-          <debug>true</debug>\r
-          <showDeprecation>true</showDeprecation>\r
-          <showWarnings>true</showWarnings>\r
-        </configuration>\r
-      </plugin>\r
-      <plugin>\r
-        <groupId>org.apache.maven.plugins</groupId>\r
-        <artifactId>maven-jar-plugin</artifactId>\r
-        <configuration>\r
-        </configuration>\r
-      </plugin>\r
-      \r
-      \r
-      <plugin>\r
-        <groupId>org.apache.maven.plugins</groupId>\r
-        <artifactId>maven-gpg-plugin</artifactId>\r
-        <version>1.2</version>\r
-        <executions>\r
-          <execution>\r
-            <id>sign-artifacts</id>\r
-            <phase>verify</phase>\r
-            <goals>\r
-              <goal>sign</goal>\r
-            </goals>\r
-          </execution>\r
-        </executions>\r
-      </plugin>\r
-      <plugin>\r
-        <groupId>org.apache.maven.plugins</groupId>\r
-        <artifactId>maven-eclipse-plugin</artifactId>\r
-        <version>2.5.1</version>\r
-        <configuration>\r
-          <downloadSources>true</downloadSources>\r
-          <downloadJavadocs>true</downloadJavadocs>\r
-        </configuration>\r
-      </plugin>\r
-      <plugin>\r
-        <groupId>org.apache.maven.plugins</groupId>\r
-        <artifactId>maven-source-plugin</artifactId>\r
-        <executions>\r
-          <execution>\r
-            <id>attach-sources</id>\r
-            <goals>\r
-              <goal>jar</goal>\r
-            </goals>\r
-          </execution>\r
-        </executions>\r
-      </plugin>      \r
-      <plugin>\r
-        <groupId>org.apache.maven.plugins</groupId>\r
-        <artifactId>maven-javadoc-plugin</artifactId>\r
-        <executions>\r
-          <execution>\r
-            <id>attach-javadocs</id>\r
-            <goals>\r
-              <goal>jar</goal>\r
-            </goals>\r
-          </execution>\r
-        </executions>\r
-      </plugin>      \r
-    </plugins>    \r
-  </build>  \r
-</project>\r
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache</groupId>
+    <artifactId>apache</artifactId>
+    <version>9</version>
+  </parent>
+  
+  <groupId>org.apache.tomcat</groupId>
+  <artifactId>jdbc-pool</artifactId>
+  <version>1.2-SNAPSHOT</version>
+  <packaging>jar</packaging>
+
+  <name>jdbc-pool</name>
+  <url>http://people.apache.org/~fhanik/jdbc-pool/</url>
+  
+  <properties>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+  
+  <mailingLists>
+    <mailingList>
+      <name>Development List</name>
+      <subscribe>dev-subscribe@tomcat.apache.org</subscribe>
+      <unsubscribe>dev-unsubscribe@tomcat.apache.org</unsubscribe>
+      <post>dev@tomcat.apache.org</post>
+    </mailingList>
+    <mailingList>
+      <name>Users List</name>
+      <subscribe>users-subscribe@tomcat.apache.org</subscribe>
+      <unsubscribe>users-unsubscribe@tomcat.apache.org</unsubscribe>
+      <post>users@tomcat.apache.org</post>
+    </mailingList>
+  </mailingLists>
+  
+  <scm>
+    <connection>scm:svn:https://svn.apache.org/repos/asf/tomcat/trunk/modules/jdbc-pool</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/tomcat/trunk/modules/jdbc-pool</developerConnection>
+    <url>http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool</url>
+  </scm>  
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>juli</artifactId>
+      <version>6.0.32</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.tomcat</groupId>
+      <artifactId>dbcp</artifactId>
+      <version>6.0.32</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+      <version>1.3.152</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+          <optimize>true</optimize>
+          <debug>true</debug>
+          <showDeprecation>true</showDeprecation>
+          <showWarnings>true</showWarnings>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+        </configuration>
+      </plugin>
+      
+      
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-gpg-plugin</artifactId>
+        <version>1.2</version>
+        <executions>
+          <execution>
+            <id>sign-artifacts</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>sign</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-eclipse-plugin</artifactId>
+        <version>2.5.1</version>
+        <configuration>
+          <downloadSources>true</downloadSources>
+          <downloadJavadocs>true</downloadJavadocs>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>      
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-javadocs</id>
+            <goals>
+              <goal>jar</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>      
+    </plugins>    
+  </build>  
+</project>

diff --git a/webapps/docs/index.xml b/webapps/docs/index.xml
index aedcdce..a9a5253 100644 (file)
--- a/webapps/docs/index.xml
+++ b/webapps/docs/index.xml
@@ -133,6 +133,8 @@ Apache Tomcat 7, and using many of the Apache Tomcat features.</p>
     Running Tomcat as a service on Microsoft Windows.</li>
 <li><a href="windows-auth-howto.html"><strong>Windows Authentication</strong></a> -
     Configuring Tomcat to use integrated Windows authentication.</li>
+<li><a href="jdbc-pool.html"><strong>High Concurrency JDBC Pool</strong></a> -
+    Configuring Tomcat to use an alternative JDBC pool.</li>
 
 </ol>