]> source.dussan.org Git - archiva.git/commitdiff
More directory moves
authorJoakim Erdfelt <joakime@apache.org>
Thu, 22 Mar 2007 21:06:07 +0000 (21:06 +0000)
committerJoakim Erdfelt <joakime@apache.org>
Thu, 22 Mar 2007 21:06:07 +0000 (21:06 +0000)
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/branches/archiva-jpox-database-refactor@521466 13f79535-47bb-0310-9956-ffa450edef68

48 files changed:
archiva-plexus-application/pom.xml [deleted file]
archiva-plexus-application/src/conf/application.xml [deleted file]
archiva-plexus-application/src/conf/plexus.xml [deleted file]
archiva-plexus-application/src/plexus.properties [deleted file]
archiva-plexus-runtime/pom.xml [deleted file]
archiva-plexus-runtime/src/conf/plexus.xml [deleted file]
archiva-plexus-runtime/src/main/appserver/conf/archiva.xml [deleted file]
archiva-plexus-runtime/src/main/appserver/conf/shared.xml [deleted file]
archiva-plexus-runtime/src/main/assembly/bin.xml [deleted file]
archiva-plexus-runtime/src/plexus.properties [deleted file]
archiva-web/archiva-standalone/archiva-plexus-application/pom.xml [new file with mode: 0644]
archiva-web/archiva-standalone/archiva-plexus-application/src/conf/application.xml [new file with mode: 0644]
archiva-web/archiva-standalone/archiva-plexus-application/src/conf/plexus.xml [new file with mode: 0644]
archiva-web/archiva-standalone/archiva-plexus-application/src/plexus.properties [new file with mode: 0644]
archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml [new file with mode: 0644]
archiva-web/archiva-standalone/archiva-plexus-runtime/src/conf/plexus.xml [new file with mode: 0644]
archiva-web/archiva-standalone/archiva-plexus-runtime/src/main/appserver/conf/archiva.xml [new file with mode: 0644]
archiva-web/archiva-standalone/archiva-plexus-runtime/src/main/appserver/conf/shared.xml [new file with mode: 0644]
archiva-web/archiva-standalone/archiva-plexus-runtime/src/main/assembly/bin.xml [new file with mode: 0644]
archiva-web/archiva-standalone/archiva-plexus-runtime/src/plexus.properties [new file with mode: 0644]
archiva-web/archiva-webapp-test/pom.xml [new file with mode: 0644]
archiva-web/archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/AbstractArchivaTestCase.java [new file with mode: 0644]
archiva-web/archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/LoginTest.java [new file with mode: 0644]
archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/archiva.xml [new file with mode: 0644]
archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/host-manager.xml [new file with mode: 0644]
archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/manager.xml [new file with mode: 0644]
archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/catalina.policy [new file with mode: 0644]
archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/catalina.properties [new file with mode: 0644]
archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/context.xml [new file with mode: 0644]
archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/logging.properties [new file with mode: 0644]
archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/server-minimal.xml [new file with mode: 0644]
archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/server.xml [new file with mode: 0644]
archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/tomcat-users.xml [new file with mode: 0644]
archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/web.xml [new file with mode: 0644]
archiva-webapp-test/pom.xml [deleted file]
archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/AbstractArchivaTestCase.java [deleted file]
archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/LoginTest.java [deleted file]
archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/archiva.xml [deleted file]
archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/host-manager.xml [deleted file]
archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/manager.xml [deleted file]
archiva-webapp-test/src/test/tomcat5x/conf/catalina.policy [deleted file]
archiva-webapp-test/src/test/tomcat5x/conf/catalina.properties [deleted file]
archiva-webapp-test/src/test/tomcat5x/conf/context.xml [deleted file]
archiva-webapp-test/src/test/tomcat5x/conf/logging.properties [deleted file]
archiva-webapp-test/src/test/tomcat5x/conf/server-minimal.xml [deleted file]
archiva-webapp-test/src/test/tomcat5x/conf/server.xml [deleted file]
archiva-webapp-test/src/test/tomcat5x/conf/tomcat-users.xml [deleted file]
archiva-webapp-test/src/test/tomcat5x/conf/web.xml [deleted file]

diff --git a/archiva-plexus-application/pom.xml b/archiva-plexus-application/pom.xml
deleted file mode 100644 (file)
index 29e01dd..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-<?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.
-  -->
-
-<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/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>archiva</artifactId>
-    <groupId>org.apache.maven.archiva</groupId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>archiva-plexus-application</artifactId>
-  <packaging>plexus-application</packaging>
-  <name>Archiva Plexus Application</name>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-appserver-maven-plugin</artifactId>
-        <version>2.0-alpha-8-SNAPSHOT</version>
-        <extensions>true</extensions>
-        <configuration>
-          <applicationConfiguration>src/conf/application.xml</applicationConfiguration>
-          <configurationsDirectory>src/conf</configurationsDirectory>
-          <configurationProperties>src/plexus.properties</configurationProperties>
-          <applicationName>archiva</applicationName>
-          <runtimeConfiguration>src/conf/plexus.xml</runtimeConfiguration>
-          <runtimeConfigurationProperties>src/plexus.properties</runtimeConfigurationProperties>
-          <runtimePath>target/plexus-archiva-runtime</runtimePath>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
-      <artifactId>archiva-webapp</artifactId>
-      <type>war</type>
-    </dependency>
-  </dependencies>
-  <!-- For filtering -->
-  <properties>
-    <archivaVersion>${project.version}</archivaVersion>
-  </properties>
-</project>
diff --git a/archiva-plexus-application/src/conf/application.xml b/archiva-plexus-application/src/conf/application.xml
deleted file mode 100644 (file)
index 37fcd4e..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-<?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.
-  -->
-
-<application>
-
-  <services>
-    <service>
-      <id>jetty</id>
-      <configuration>
-        <webapps>
-          <webapp>
-            <file>${plexus.home}/lib/archiva-webapp-@archivaVersion@.war</file>
-            <context>/archiva</context>
-            <extraction-path>${plexus.home}/webapp</extraction-path>
-            <standardWebappClassloader>true</standardWebappClassloader>
-            <listeners>
-              <http-listener>
-                <port>8080</port>
-              </http-listener>
-              <!--
-              <proxy-http-listener>
-                <port>8090</port>
-                <proxy-host>localhost</proxy-host>
-                <proxy-port>80</proxy-port>
-              </proxy-http-listener>
-              -->
-            </listeners>
-          </webapp>
-        </webapps>
-      </configuration>
-    </service>
-  </services>
-
-</application>
diff --git a/archiva-plexus-application/src/conf/plexus.xml b/archiva-plexus-application/src/conf/plexus.xml
deleted file mode 100644 (file)
index 3c9ebd8..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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.
-  -->
-
-<plexus/>
diff --git a/archiva-plexus-application/src/plexus.properties b/archiva-plexus-application/src/plexus.properties
deleted file mode 100644 (file)
index 3451f74..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# 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.
-#
-
-app.name = archiva
-app.long.name = Archiva
-app.description = Archiva - the Maven Repository Manager
diff --git a/archiva-plexus-runtime/pom.xml b/archiva-plexus-runtime/pom.xml
deleted file mode 100644 (file)
index 3e93c78..0000000
+++ /dev/null
@@ -1,168 +0,0 @@
-<?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.
-  -->
-
-<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/maven-v4_0_0.xsd">
-  <parent>
-    <groupId>org.apache.maven.archiva</groupId>
-    <artifactId>archiva</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>archiva-plexus-runtime</artifactId>
-  <name>Archiva Runtime Generator</name>
-  <dependencies>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-component-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-appserver-host</artifactId>
-      <version>2.0-alpha-8-SNAPSHOT</version>
-    </dependency>
-    <!-- Services -->
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-appserver-service-jetty</artifactId>
-      <version>2.0-alpha-8-SNAPSHOT</version>
-      <type>plexus-service</type>
-    </dependency>
-    <!-- Plexus applications -->
-    <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
-      <artifactId>archiva-plexus-application</artifactId>
-      <version>${project.version}</version>
-      <type>plexus-application</type>
-    </dependency>
-
-    <!-- Additional Core Artifacts -->
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <version>1.2.8</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging-api</artifactId>
-      <version>1.0.4</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.derby</groupId>
-      <artifactId>derby</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-naming</artifactId>
-      <version>1.0-alpha-3</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.mail</groupId>
-      <artifactId>mail</artifactId>
-      <version>1.4</version>
-      <scope>runtime</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.plexus</groupId>
-        <artifactId>plexus-appserver-maven-plugin</artifactId>
-        <version>2.0-alpha-8-SNAPSHOT</version>
-        <extensions>true</extensions>
-        <executions>
-          <execution>
-            <phase>process-resources</phase>
-            <goals>
-              <goal>assemble-runtime</goal>
-              <goal>add-services</goal>
-              <goal>add-apps</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <runtimeConfiguration>src/conf/plexus.xml</runtimeConfiguration>
-          <runtimeConfigurationProperties>src/plexus.properties</runtimeConfigurationProperties>
-          <runtimePath>target/plexus-archiva-runtime</runtimePath>
-          <additionalCoreArtifacts>
-            <additionalCoreArtifact>commons-logging:commons-logging-api</additionalCoreArtifact>
-            <additionalCoreArtifact>log4j:log4j</additionalCoreArtifact>
-            <additionalCoreArtifact>org.apache.derby:derby</additionalCoreArtifact>
-            <additionalCoreArtifact>org.codehaus.plexus:plexus-naming</additionalCoreArtifact>
-            <additionalCoreArtifact>commons-pool:commons-pool</additionalCoreArtifact>
-            <additionalCoreArtifact>commons-dbcp:commons-dbcp</additionalCoreArtifact>
-            <additionalCoreArtifact>commons-collections:commons-collections</additionalCoreArtifact>
-            <additionalCoreArtifact>directory-naming:naming-core</additionalCoreArtifact>
-            <additionalCoreArtifact>directory-naming:naming-factory</additionalCoreArtifact>
-            <additionalCoreArtifact>directory-naming:naming-java</additionalCoreArtifact>
-            <additionalCoreArtifact>directory-naming:naming-config</additionalCoreArtifact>
-            <additionalCoreArtifact>javax.mail:mail</additionalCoreArtifact>
-            <additionalCoreArtifact>javax.activation:activation</additionalCoreArtifact>
-          </additionalCoreArtifacts>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.1</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <descriptor>src/main/assembly/bin.xml</descriptor>
-          <finalName>archiva</finalName>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>config</id>
-            <phase>process-resources</phase>
-            <configuration>
-              <tasks>
-                <copy todir="target/plexus-archiva-runtime/conf">
-                  <fileset dir="src/main/appserver/conf" />
-                </copy>
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/archiva-plexus-runtime/src/conf/plexus.xml b/archiva-plexus-runtime/src/conf/plexus.xml
deleted file mode 100644 (file)
index 87a9972..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-<?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.
-  -->
-
-<plexus>
-  <load-on-start>
-    <component>
-      <role>org.codehaus.plexus.naming.Naming</role>
-      <role-hint>dataSources</role-hint>
-    </component>
-  </load-on-start>
-  <components>
-    <component>
-      <role>org.codehaus.plexus.naming.Naming</role>
-      <implementation>org.codehaus.plexus.naming.DefaultNaming</implementation>
-      <role-hint>dataSources</role-hint>
-      <configuration>
-        <!-- Example override:
-                <environments>
-                  <environment>
-                    <name>org/apache/maven/archiva/indexPath</name>
-                    <value>${user.home}/.m2/my-index</value>
-                    <type>java.lang.String</type>
-                  </environment>
-                </environments>
-        -->
-        <resources>
-          <!--
-               Mail Session
-          -->
-          <resource>
-            <name>mail/Session</name>
-            <type>javax.mail.Session</type>
-            <properties>
-              <property>
-                <name>mail.smtp.host</name>
-                <value>localhost</value>
-              </property>
-              <property>
-                <name>mail.smtp.port</name>
-                <value>25</value>
-              </property>
-            </properties>
-          </resource>
-          <!--
-               Datasources
-          -->
-          <resource>
-            <name>jdbc/users</name>
-            <type>javax.sql.DataSource</type>
-            <properties>
-              <property>
-                <name>driverClassName</name>
-                <value>org.apache.derby.jdbc.EmbeddedDriver</value>
-              </property>
-              <property>
-                <name>url</name>
-                <value>jdbc:derby:${plexus.home}/data/users/database;create=true</value>
-              </property>
-              <property>
-                <name>username</name>
-                <value>sa</value>
-              </property>
-              <property>
-                <name>password</name>
-                <value></value>
-              </property>
-            </properties>
-          </resource>
-          <resource>
-            <name>jdbc/archiva</name>
-            <type>javax.sql.DataSource</type>
-            <properties>
-              <property>
-                <name>driverClassName</name>
-                <value>org.apache.derby.jdbc.EmbeddedDriver</value>
-              </property>
-              <property>
-                <name>url</name>
-                <value>jdbc:derby:${plexus.home}/data/archiva/database;create=true</value>
-              </property>
-              <property>
-                <name>username</name>
-                <value>sa</value>
-              </property>
-              <property>
-                <name>password</name>
-                <value></value>
-              </property>
-            </properties>
-          </resource>
-        </resources>
-      </configuration>
-    </component>
-  </components>
-</plexus>
-
diff --git a/archiva-plexus-runtime/src/main/appserver/conf/archiva.xml b/archiva-plexus-runtime/src/main/appserver/conf/archiva.xml
deleted file mode 100644 (file)
index 9afb833..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<configuration />
diff --git a/archiva-plexus-runtime/src/main/appserver/conf/shared.xml b/archiva-plexus-runtime/src/main/appserver/conf/shared.xml
deleted file mode 100644 (file)
index 9afb833..0000000
+++ /dev/null
@@ -1 +0,0 @@
-<configuration />
diff --git a/archiva-plexus-runtime/src/main/assembly/bin.xml b/archiva-plexus-runtime/src/main/assembly/bin.xml
deleted file mode 100644 (file)
index 42484ef..0000000
+++ /dev/null
@@ -1,90 +0,0 @@
-<!--
-  ~ 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>bin</id>
-  <formats>
-    <format>tar.gz</format>
-  </formats>
-  <fileSets>
-    <fileSet>
-      <!-- TODO: use expressions instead: ${project.build.directory}, ${project.build.finalName}, or have a <build /> tag to include the built artifact -->
-      <directory>target/plexus-archiva-runtime/apps</directory>
-      <outputDirectory>apps</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>target/plexus-archiva-runtime/conf</directory>
-      <outputDirectory>conf</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>target/plexus-archiva-runtime/core</directory>
-      <outputDirectory>core</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>target/plexus-archiva-runtime/logs</directory>
-      <outputDirectory>logs</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>target/plexus-archiva-runtime/services</directory>
-      <outputDirectory>services</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>target/plexus-archiva-runtime/temp</directory>
-      <outputDirectory>temp</outputDirectory>
-    </fileSet>
-    <fileSet>
-      <directory>target/plexus-archiva-runtime/bin</directory>
-      <outputDirectory>bin</outputDirectory>
-      <includes>
-        <include>**/*.sh</include>
-      </includes>
-      <lineEnding>unix</lineEnding>
-      <fileMode>0755</fileMode>
-    </fileSet>
-    <fileSet>
-      <directory>target/plexus-archiva-runtime/bin</directory>
-      <outputDirectory>bin</outputDirectory>
-      <includes>
-        <include>*/wrapper.conf</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>target/plexus-archiva-runtime/bin</directory>
-      <outputDirectory>bin</outputDirectory>
-      <includes>
-        <include>*/libwrapper.jnilib</include>
-        <include>*/libwrapper.so</include>
-        <include>*/wrapper</include>
-        <include>*/wrapper.exe</include>
-        <include>*/wrapper.dll</include>
-      </includes>
-      <fileMode>0755</fileMode>
-    </fileSet>
-    <fileSet>
-      <directory>target/plexus-archiva-runtime/bin</directory>
-      <outputDirectory>bin</outputDirectory>
-      <includes>
-        <include>**/*.bat</include>
-      </includes>
-      <fileMode>0755</fileMode>
-      <lineEnding>dos</lineEnding>
-    </fileSet>
-  </fileSets>
-</assembly>
-
diff --git a/archiva-plexus-runtime/src/plexus.properties b/archiva-plexus-runtime/src/plexus.properties
deleted file mode 100644 (file)
index 3451f74..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# 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.
-#
-
-app.name = archiva
-app.long.name = Archiva
-app.description = Archiva - the Maven Repository Manager
diff --git a/archiva-web/archiva-standalone/archiva-plexus-application/pom.xml b/archiva-web/archiva-standalone/archiva-plexus-application/pom.xml
new file mode 100644 (file)
index 0000000..29e01dd
--- /dev/null
@@ -0,0 +1,62 @@
+<?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.
+  -->
+
+<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/maven-v4_0_0.xsd">
+  <parent>
+    <artifactId>archiva</artifactId>
+    <groupId>org.apache.maven.archiva</groupId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>archiva-plexus-application</artifactId>
+  <packaging>plexus-application</packaging>
+  <name>Archiva Plexus Application</name>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-appserver-maven-plugin</artifactId>
+        <version>2.0-alpha-8-SNAPSHOT</version>
+        <extensions>true</extensions>
+        <configuration>
+          <applicationConfiguration>src/conf/application.xml</applicationConfiguration>
+          <configurationsDirectory>src/conf</configurationsDirectory>
+          <configurationProperties>src/plexus.properties</configurationProperties>
+          <applicationName>archiva</applicationName>
+          <runtimeConfiguration>src/conf/plexus.xml</runtimeConfiguration>
+          <runtimeConfigurationProperties>src/plexus.properties</runtimeConfigurationProperties>
+          <runtimePath>target/plexus-archiva-runtime</runtimePath>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.archiva</groupId>
+      <artifactId>archiva-webapp</artifactId>
+      <type>war</type>
+    </dependency>
+  </dependencies>
+  <!-- For filtering -->
+  <properties>
+    <archivaVersion>${project.version}</archivaVersion>
+  </properties>
+</project>
diff --git a/archiva-web/archiva-standalone/archiva-plexus-application/src/conf/application.xml b/archiva-web/archiva-standalone/archiva-plexus-application/src/conf/application.xml
new file mode 100644 (file)
index 0000000..37fcd4e
--- /dev/null
@@ -0,0 +1,51 @@
+<?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.
+  -->
+
+<application>
+
+  <services>
+    <service>
+      <id>jetty</id>
+      <configuration>
+        <webapps>
+          <webapp>
+            <file>${plexus.home}/lib/archiva-webapp-@archivaVersion@.war</file>
+            <context>/archiva</context>
+            <extraction-path>${plexus.home}/webapp</extraction-path>
+            <standardWebappClassloader>true</standardWebappClassloader>
+            <listeners>
+              <http-listener>
+                <port>8080</port>
+              </http-listener>
+              <!--
+              <proxy-http-listener>
+                <port>8090</port>
+                <proxy-host>localhost</proxy-host>
+                <proxy-port>80</proxy-port>
+              </proxy-http-listener>
+              -->
+            </listeners>
+          </webapp>
+        </webapps>
+      </configuration>
+    </service>
+  </services>
+
+</application>
diff --git a/archiva-web/archiva-standalone/archiva-plexus-application/src/conf/plexus.xml b/archiva-web/archiva-standalone/archiva-plexus-application/src/conf/plexus.xml
new file mode 100644 (file)
index 0000000..3c9ebd8
--- /dev/null
@@ -0,0 +1,21 @@
+<?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.
+  -->
+
+<plexus/>
diff --git a/archiva-web/archiva-standalone/archiva-plexus-application/src/plexus.properties b/archiva-web/archiva-standalone/archiva-plexus-application/src/plexus.properties
new file mode 100644 (file)
index 0000000..3451f74
--- /dev/null
@@ -0,0 +1,22 @@
+#
+# 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.
+#
+
+app.name = archiva
+app.long.name = Archiva
+app.description = Archiva - the Maven Repository Manager
diff --git a/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml b/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml
new file mode 100644 (file)
index 0000000..3e93c78
--- /dev/null
@@ -0,0 +1,168 @@
+<?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.
+  -->
+
+<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/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.apache.maven.archiva</groupId>
+    <artifactId>archiva</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>archiva-plexus-runtime</artifactId>
+  <name>Archiva Runtime Generator</name>
+  <dependencies>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-component-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-container-default</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-appserver-host</artifactId>
+      <version>2.0-alpha-8-SNAPSHOT</version>
+    </dependency>
+    <!-- Services -->
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-appserver-service-jetty</artifactId>
+      <version>2.0-alpha-8-SNAPSHOT</version>
+      <type>plexus-service</type>
+    </dependency>
+    <!-- Plexus applications -->
+    <dependency>
+      <groupId>org.apache.maven.archiva</groupId>
+      <artifactId>archiva-plexus-application</artifactId>
+      <version>${project.version}</version>
+      <type>plexus-application</type>
+    </dependency>
+
+    <!-- Additional Core Artifacts -->
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <version>1.2.8</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging-api</artifactId>
+      <version>1.0.4</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-naming</artifactId>
+      <version>1.0-alpha-3</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.mail</groupId>
+      <artifactId>mail</artifactId>
+      <version>1.4</version>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-appserver-maven-plugin</artifactId>
+        <version>2.0-alpha-8-SNAPSHOT</version>
+        <extensions>true</extensions>
+        <executions>
+          <execution>
+            <phase>process-resources</phase>
+            <goals>
+              <goal>assemble-runtime</goal>
+              <goal>add-services</goal>
+              <goal>add-apps</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <runtimeConfiguration>src/conf/plexus.xml</runtimeConfiguration>
+          <runtimeConfigurationProperties>src/plexus.properties</runtimeConfigurationProperties>
+          <runtimePath>target/plexus-archiva-runtime</runtimePath>
+          <additionalCoreArtifacts>
+            <additionalCoreArtifact>commons-logging:commons-logging-api</additionalCoreArtifact>
+            <additionalCoreArtifact>log4j:log4j</additionalCoreArtifact>
+            <additionalCoreArtifact>org.apache.derby:derby</additionalCoreArtifact>
+            <additionalCoreArtifact>org.codehaus.plexus:plexus-naming</additionalCoreArtifact>
+            <additionalCoreArtifact>commons-pool:commons-pool</additionalCoreArtifact>
+            <additionalCoreArtifact>commons-dbcp:commons-dbcp</additionalCoreArtifact>
+            <additionalCoreArtifact>commons-collections:commons-collections</additionalCoreArtifact>
+            <additionalCoreArtifact>directory-naming:naming-core</additionalCoreArtifact>
+            <additionalCoreArtifact>directory-naming:naming-factory</additionalCoreArtifact>
+            <additionalCoreArtifact>directory-naming:naming-java</additionalCoreArtifact>
+            <additionalCoreArtifact>directory-naming:naming-config</additionalCoreArtifact>
+            <additionalCoreArtifact>javax.mail:mail</additionalCoreArtifact>
+            <additionalCoreArtifact>javax.activation:activation</additionalCoreArtifact>
+          </additionalCoreArtifacts>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.1</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>single</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <descriptor>src/main/assembly/bin.xml</descriptor>
+          <finalName>archiva</finalName>
+        </configuration>
+      </plugin>
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>config</id>
+            <phase>process-resources</phase>
+            <configuration>
+              <tasks>
+                <copy todir="target/plexus-archiva-runtime/conf">
+                  <fileset dir="src/main/appserver/conf" />
+                </copy>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/archiva-web/archiva-standalone/archiva-plexus-runtime/src/conf/plexus.xml b/archiva-web/archiva-standalone/archiva-plexus-runtime/src/conf/plexus.xml
new file mode 100644 (file)
index 0000000..87a9972
--- /dev/null
@@ -0,0 +1,113 @@
+<?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.
+  -->
+
+<plexus>
+  <load-on-start>
+    <component>
+      <role>org.codehaus.plexus.naming.Naming</role>
+      <role-hint>dataSources</role-hint>
+    </component>
+  </load-on-start>
+  <components>
+    <component>
+      <role>org.codehaus.plexus.naming.Naming</role>
+      <implementation>org.codehaus.plexus.naming.DefaultNaming</implementation>
+      <role-hint>dataSources</role-hint>
+      <configuration>
+        <!-- Example override:
+                <environments>
+                  <environment>
+                    <name>org/apache/maven/archiva/indexPath</name>
+                    <value>${user.home}/.m2/my-index</value>
+                    <type>java.lang.String</type>
+                  </environment>
+                </environments>
+        -->
+        <resources>
+          <!--
+               Mail Session
+          -->
+          <resource>
+            <name>mail/Session</name>
+            <type>javax.mail.Session</type>
+            <properties>
+              <property>
+                <name>mail.smtp.host</name>
+                <value>localhost</value>
+              </property>
+              <property>
+                <name>mail.smtp.port</name>
+                <value>25</value>
+              </property>
+            </properties>
+          </resource>
+          <!--
+               Datasources
+          -->
+          <resource>
+            <name>jdbc/users</name>
+            <type>javax.sql.DataSource</type>
+            <properties>
+              <property>
+                <name>driverClassName</name>
+                <value>org.apache.derby.jdbc.EmbeddedDriver</value>
+              </property>
+              <property>
+                <name>url</name>
+                <value>jdbc:derby:${plexus.home}/data/users/database;create=true</value>
+              </property>
+              <property>
+                <name>username</name>
+                <value>sa</value>
+              </property>
+              <property>
+                <name>password</name>
+                <value></value>
+              </property>
+            </properties>
+          </resource>
+          <resource>
+            <name>jdbc/archiva</name>
+            <type>javax.sql.DataSource</type>
+            <properties>
+              <property>
+                <name>driverClassName</name>
+                <value>org.apache.derby.jdbc.EmbeddedDriver</value>
+              </property>
+              <property>
+                <name>url</name>
+                <value>jdbc:derby:${plexus.home}/data/archiva/database;create=true</value>
+              </property>
+              <property>
+                <name>username</name>
+                <value>sa</value>
+              </property>
+              <property>
+                <name>password</name>
+                <value></value>
+              </property>
+            </properties>
+          </resource>
+        </resources>
+      </configuration>
+    </component>
+  </components>
+</plexus>
+
diff --git a/archiva-web/archiva-standalone/archiva-plexus-runtime/src/main/appserver/conf/archiva.xml b/archiva-web/archiva-standalone/archiva-plexus-runtime/src/main/appserver/conf/archiva.xml
new file mode 100644 (file)
index 0000000..9afb833
--- /dev/null
@@ -0,0 +1 @@
+<configuration />
diff --git a/archiva-web/archiva-standalone/archiva-plexus-runtime/src/main/appserver/conf/shared.xml b/archiva-web/archiva-standalone/archiva-plexus-runtime/src/main/appserver/conf/shared.xml
new file mode 100644 (file)
index 0000000..9afb833
--- /dev/null
@@ -0,0 +1 @@
+<configuration />
diff --git a/archiva-web/archiva-standalone/archiva-plexus-runtime/src/main/assembly/bin.xml b/archiva-web/archiva-standalone/archiva-plexus-runtime/src/main/assembly/bin.xml
new file mode 100644 (file)
index 0000000..42484ef
--- /dev/null
@@ -0,0 +1,90 @@
+<!--
+  ~ 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>bin</id>
+  <formats>
+    <format>tar.gz</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <!-- TODO: use expressions instead: ${project.build.directory}, ${project.build.finalName}, or have a <build /> tag to include the built artifact -->
+      <directory>target/plexus-archiva-runtime/apps</directory>
+      <outputDirectory>apps</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>target/plexus-archiva-runtime/conf</directory>
+      <outputDirectory>conf</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>target/plexus-archiva-runtime/core</directory>
+      <outputDirectory>core</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>target/plexus-archiva-runtime/logs</directory>
+      <outputDirectory>logs</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>target/plexus-archiva-runtime/services</directory>
+      <outputDirectory>services</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>target/plexus-archiva-runtime/temp</directory>
+      <outputDirectory>temp</outputDirectory>
+    </fileSet>
+    <fileSet>
+      <directory>target/plexus-archiva-runtime/bin</directory>
+      <outputDirectory>bin</outputDirectory>
+      <includes>
+        <include>**/*.sh</include>
+      </includes>
+      <lineEnding>unix</lineEnding>
+      <fileMode>0755</fileMode>
+    </fileSet>
+    <fileSet>
+      <directory>target/plexus-archiva-runtime/bin</directory>
+      <outputDirectory>bin</outputDirectory>
+      <includes>
+        <include>*/wrapper.conf</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>target/plexus-archiva-runtime/bin</directory>
+      <outputDirectory>bin</outputDirectory>
+      <includes>
+        <include>*/libwrapper.jnilib</include>
+        <include>*/libwrapper.so</include>
+        <include>*/wrapper</include>
+        <include>*/wrapper.exe</include>
+        <include>*/wrapper.dll</include>
+      </includes>
+      <fileMode>0755</fileMode>
+    </fileSet>
+    <fileSet>
+      <directory>target/plexus-archiva-runtime/bin</directory>
+      <outputDirectory>bin</outputDirectory>
+      <includes>
+        <include>**/*.bat</include>
+      </includes>
+      <fileMode>0755</fileMode>
+      <lineEnding>dos</lineEnding>
+    </fileSet>
+  </fileSets>
+</assembly>
+
diff --git a/archiva-web/archiva-standalone/archiva-plexus-runtime/src/plexus.properties b/archiva-web/archiva-standalone/archiva-plexus-runtime/src/plexus.properties
new file mode 100644 (file)
index 0000000..3451f74
--- /dev/null
@@ -0,0 +1,22 @@
+#
+# 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.
+#
+
+app.name = archiva
+app.long.name = Archiva
+app.description = Archiva - the Maven Repository Manager
diff --git a/archiva-web/archiva-webapp-test/pom.xml b/archiva-web/archiva-webapp-test/pom.xml
new file mode 100644 (file)
index 0000000..264f6ef
--- /dev/null
@@ -0,0 +1,241 @@
+<?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.
+  -->
+
+<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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.maven.archiva</groupId>
+    <artifactId>archiva</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>archiva-webapp-test</artifactId>
+  <packaging>pom</packaging>
+  <name>Archiva Web Application Tests</name>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.archiva</groupId>
+      <artifactId>archiva-webapp</artifactId>
+      <version>${project.version}</version>
+      <type>war</type>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.shared</groupId>
+      <artifactId>maven-web-ui-tests</artifactId>
+      <version>1.0-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <testSourceDirectory>src/test/it</testSourceDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>dependency-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>unzip-archiva-webapp</id>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>unpack</goal>
+            </goals>
+            <configuration>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>${project.groupId}</groupId>
+                  <artifactId>archiva-webapp</artifactId>
+                  <version>${project.version}</version>
+                  <type>war</type>
+                </artifactItem>
+              </artifactItems>
+              <outputDirectory>${project.build.directory}/${container.name}conf/webapps/archiva</outputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>copy-container-conf</id>
+            <phase>package</phase>
+            <configuration>
+              <tasks>
+                <copy todir="${project.build.directory}/${container.name}conf">
+                  <fileset dir="src/test/${container.name}"/>
+                </copy>
+                <copy
+                    todir="${project.build.directory}/installs/${container.name}/apache-tomcat-5.5.20/apache-tomcat-5.5.20/common/lib">
+                  <fileset dir="${project.build.directory}/${container.name}conf/webapps/archiva/WEB-INF/lib">
+                    <include name="**/derby-*.jar"/>
+                  </fileset>
+                </copy>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>check-archiva-loaded</id>
+            <phase>integration-test</phase>
+            <configuration>
+              <tasks>
+                <get src="http://localhost:9696/archiva/" dest="${project.build.directory}/index.html"/>
+                <delete file="${project.build.directory}/index.html"/>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>testCompile</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>selenium-maven-plugin</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <executions>
+          <execution>
+            <id>start-selenium</id>
+            <phase>pre-integration-test</phase>
+            <goals>
+              <goal>start-server</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <background>true</background>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.cargo</groupId>
+        <artifactId>cargo-maven2-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>start-container</id>
+            <phase>pre-integration-test</phase>
+            <goals>
+              <goal>start</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>stop-container</id>
+            <phase>post-integration-test</phase>
+            <goals>
+              <goal>stop</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <wait>false</wait>
+          <container>
+            <containerId>${container.name}</containerId>
+            <zipUrlInstaller>
+              <url>${container.url}</url>
+              <installDir>${project.build.directory}/installs/${container.name}</installDir>
+            </zipUrlInstaller>
+            <log>${project.build.directory}/logs/${container.name}.log</log>
+            <output>${project.build.directory}/logs/${container.name}.out</output>
+            <timeout>600000</timeout>
+            <systemProperties>
+              <appserver.base>${project.build.directory}</appserver.base>
+            </systemProperties>
+          </container>
+          <configuration>
+            <home>${project.build.directory}/${container.name}conf</home>
+            <type>existing</type>
+            <properties>
+              <cargo.servlet.port>9696</cargo.servlet.port>
+            </properties>
+          </configuration>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>integration-test</phase>
+            <goals>
+              <goal>test</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <systemProperties>
+            <property>
+              <name>browser</name>
+              <value>${browser}</value>
+            </property>
+          </systemProperties>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>tomcat5x</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <properties>
+        <container.name>tomcat5x</container.name>
+        <container.url>http://apache.multidist.com/tomcat/tomcat-5/v5.5.20/bin/apache-tomcat-5.5.20.zip</container.url>
+      </properties>
+    </profile>
+
+    <profile>
+      <id>firefox</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <properties>
+        <browser>*firefox</browser>
+      </properties>
+    </profile>
+    <profile>
+      <id>iexplore</id>
+      <properties>
+        <browser>*iexplore</browser>
+      </properties>
+    </profile>
+    <profile>
+      <id>otherbrowser</id>
+      <properties>
+        <browser>*custom ${browserPath}</browser>
+      </properties>
+    </profile>
+  </profiles>
+
+</project>
\ No newline at end of file
diff --git a/archiva-web/archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/AbstractArchivaTestCase.java b/archiva-web/archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/AbstractArchivaTestCase.java
new file mode 100644 (file)
index 0000000..63510c7
--- /dev/null
@@ -0,0 +1,89 @@
+package org.apache.maven.archiva.web.test;
+
+/*
+ * 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.
+ */
+
+import org.apache.maven.shared.web.test.AbstractSeleniumTestCase;
+
+/**
+ * @author Edwin Punzalan
+ */
+public abstract class AbstractArchivaTestCase
+    extends AbstractSeleniumTestCase
+{
+    private String baseUrl = "http://localhost:9696/archiva";
+
+    protected String getApplicationName()
+    {
+        return "Archiva";
+    }
+
+    protected String getInceptionYear()
+    {
+        return "2005";
+    }
+
+    protected void postAdminUserCreation()
+    {
+        if ( getTitle().equals( getTitlePrefix() + "Configuration" ) )
+        {
+            //Add Managed Repository
+            setFieldValue( "id", "web-ui" );
+            setFieldValue( "urlName", "web-ui" );
+            setFieldValue( "name", "Web UI Test Managed Repository" );
+            setFieldValue( "directory", getBasedir() + "target/web-ui-dir" );
+            clickButtonWithValue( "Add Repository" );
+
+            //Set Index location
+            assertPage( "Configuration" );
+            setFieldValue( "indexPath", getBasedir() + "target/web-ui-index" );
+            clickButtonWithValue( "Save Configuration" );
+            assertPage( "Administration" );
+        }
+    }
+
+    public void assertHeader()
+    {
+        assertTrue( "banner is missing" , getSelenium().isElementPresent( "xpath=//div[@id='banner']" ) );
+        assertTrue( "bannerLeft is missing" , getSelenium().isElementPresent( "xpath=//div[@id='banner']" +
+            "/span[@id='bannerLeft']" ) );
+        assertTrue( "bannerLeft link is missing" , getSelenium().isElementPresent( "xpath=//div[@id='banner']" +
+            "/span[@id='bannerLeft']/a[@href='http://maven.apache.org/archiva/']" ) );
+        assertTrue( "bannerLeft img is missing" , getSelenium().isElementPresent( "xpath=//div[@id='banner']" +
+            "/span[@id='bannerLeft']/a[@href='http://maven.apache.org/archiva/']" +
+            "/img[@src='" + getWebContext() + "/images/archiva.png']" ) );
+
+        assertTrue( "bannerRight is missing",  getSelenium().isElementPresent( "xpath=//div[@id='banner']/span[@id='bannerRight']" ) );
+    }
+
+    protected String getTitlePrefix()
+    {
+        return "Maven Archiva :: ";
+    }
+
+    public String getBaseUrl()
+    {
+        return baseUrl;
+    }
+
+    protected String getWebContext()
+    {
+        return "/archiva";
+    }
+}
diff --git a/archiva-web/archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/LoginTest.java b/archiva-web/archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/LoginTest.java
new file mode 100644 (file)
index 0000000..03093d3
--- /dev/null
@@ -0,0 +1,102 @@
+package org.apache.maven.archiva.web.test;
+
+/*
+ * 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.
+ */
+
+/**
+ * @author Edwin Punzalan
+ */
+public class LoginTest
+    extends AbstractArchivaTestCase
+{
+    public void testBadLogin()
+    {
+        goToLoginPage();
+        submitLoginPage( "badUsername", "badPassword", false );
+        assertTextPresent( "You have entered an incorrect username and/or password" );
+    }
+
+    public void testUserLogin()
+    {
+        createUser( "test-user", "temp-pass" );
+
+        goToLoginPage();
+        submitLoginPage( "test-user", "temp-pass" );
+
+        // change of password required for new users
+        if ( getTitle().equals( getTitlePrefix() + "Change Password" ) )
+        {
+            setFieldValue( "existingPassword", "temp-pass" );
+            setFieldValue( "newPassword", "p4ssw0rd" );
+            setFieldValue( "newPasswordConfirm", "p4ssw0rd" );
+            clickButtonWithValue( "Change Password" );
+        }
+
+        logout();
+
+        deleteUser( "test-user" );
+    }
+
+    private void createUser( String username, String password )
+    {
+        goToLoginPage();
+        submitLoginPage( adminUsername, adminPassword );
+
+        clickLinkWithText( "User Management" );
+        assertPage( "[Admin] User List" );
+        assertLinkNotPresent( username );
+        clickButtonWithValue( "Create New User" );
+
+        assertPage( "[Admin] User Create" );
+        setFieldValue( "user.username", username );
+        setFieldValue( "user.fullName", username + " FullName" );
+        setFieldValue( "user.email", username + "@localhost.com" );
+        setFieldValue( "user.password", password );
+        setFieldValue( "user.confirmPassword", password );
+        clickButtonWithValue( "Create User" );
+        waitPage();
+        assertPage( "[Admin] User List" );
+        assertLinkPresent( username );
+
+        logout();
+    }
+
+    private void deleteUser( String username )
+    {
+        goToLoginPage();
+        submitLoginPage( adminUsername, adminPassword );
+
+        clickLinkWithText( "User Management" );
+        assertPage( "[Admin] User List" );
+        assertLinkPresent( username );
+
+        //this does not work bec the image is pointing to /archiva/archiva/images/pss/admin/delete.gif
+        // when ran in selenium
+        // clickLinkWithXPath( "//a[@href='/security/userdelete.action?username=" + username + "']" );
+        //so instead we use this
+        open( "/archiva/security/userdelete.action?username=" + username );
+
+        assertPage( "[Admin] User Delete" );
+        assertTextPresent( "The following user will be deleted: " + username );
+        clickButtonWithValue( "Delete User" );
+        assertPage( "[Admin] User List" );
+
+        logout();
+    }
+}
diff --git a/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/archiva.xml b/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/archiva.xml
new file mode 100644 (file)
index 0000000..af06920
--- /dev/null
@@ -0,0 +1,30 @@
+<?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.
+  -->
+
+<Context path="/archiva"
+         docBase="${catalina.base}/webapps/archiva">
+
+  <Resource name="jdbc/users" auth="Container" type="javax.sql.DataSource"
+            username="sa"
+            password=""
+            driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
+            url="jdbc:derby:target/database/users;create=true"
+      />
+</Context>
diff --git a/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/host-manager.xml b/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/host-manager.xml
new file mode 100644 (file)
index 0000000..e41e1a9
--- /dev/null
@@ -0,0 +1,32 @@
+<!--
+  ~ 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.
+  -->
+
+    <!--
+
+        Context configuration file for the Tomcat Host Manager Web App
+
+        $Id$
+
+    -->
+
+
+<Context docBase="${catalina.home}/server/webapps/host-manager"
+         privileged="true" antiResourceLocking="false" antiJARLocking="false">
+
+</Context>
diff --git a/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/manager.xml b/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/manager.xml
new file mode 100644 (file)
index 0000000..29abc9f
--- /dev/null
@@ -0,0 +1,36 @@
+<!--
+  ~ 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.
+  -->
+
+    <!--
+
+        Context configuration file for the Tomcat Manager Web App
+
+        $Id$
+
+    -->
+
+
+<Context docBase="${catalina.home}/server/webapps/manager"
+         privileged="true" antiResourceLocking="false" antiJARLocking="false">
+
+  <!-- Link to the user database we will get roles from -->
+  <ResourceLink name="users" global="UserDatabase"
+                type="org.apache.catalina.UserDatabase"/>
+
+</Context>
diff --git a/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/catalina.policy b/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/catalina.policy
new file mode 100644 (file)
index 0000000..53a6c90
--- /dev/null
@@ -0,0 +1,172 @@
+// ============================================================================\r
+// catalina.corepolicy - Security Policy Permissions for Tomcat 5\r
+//\r
+// This file contains a default set of security policies to be enforced (by the\r
+// JVM) when Catalina is executed with the "-security" option.  In addition\r
+// to the permissions granted here, the following additional permissions are\r
+// granted to the codebase specific to each web application:\r
+//\r
+// * Read access to the document root directory\r
+//\r
+// $Id: catalina.policy 393732 2006-04-13 06:32:25Z pero $\r
+// ============================================================================\r
+\r
+\r
+// ========== SYSTEM CODE PERMISSIONS =========================================\r
+\r
+\r
+// These permissions apply to javac\r
+grant codeBase "file:${java.home}/lib/-" {\r
+        permission java.security.AllPermission;\r
+};\r
+\r
+// These permissions apply to all shared system extensions\r
+grant codeBase "file:${java.home}/jre/lib/ext/-" {\r
+        permission java.security.AllPermission;\r
+};\r
+\r
+// These permissions apply to javac when ${java.home] points at $JAVA_HOME/jre\r
+grant codeBase "file:${java.home}/../lib/-" {\r
+        permission java.security.AllPermission;\r
+};\r
+\r
+// These permissions apply to all shared system extensions when\r
+// ${java.home} points at $JAVA_HOME/jre\r
+grant codeBase "file:${java.home}/lib/ext/-" {\r
+        permission java.security.AllPermission;\r
+};\r
+\r
+\r
+// ========== CATALINA CODE PERMISSIONS =======================================\r
+\r
+\r
+// These permissions apply to the launcher code\r
+grant codeBase "file:${catalina.home}/bin/commons-launcher.jar" {\r
+        permission java.security.AllPermission;\r
+};\r
+\r
+// These permissions apply to the daemon code\r
+grant codeBase "file:${catalina.home}/bin/commons-daemon.jar" {\r
+        permission java.security.AllPermission;\r
+};\r
+\r
+// These permissions apply to the commons-logging API\r
+grant codeBase "file:${catalina.home}/bin/commons-logging-api.jar" {\r
+        permission java.security.AllPermission;\r
+};\r
+\r
+// These permissions apply to the server startup code\r
+grant codeBase "file:${catalina.home}/bin/bootstrap.jar" {\r
+        permission java.security.AllPermission;\r
+};\r
+\r
+// These permissions apply to the JMX server\r
+grant codeBase "file:${catalina.home}/bin/jmx.jar" {\r
+        permission java.security.AllPermission;\r
+};\r
+\r
+// These permissions apply to JULI\r
+grant codeBase "file:${catalina.home}/bin/tomcat-juli.jar" {\r
+        permission java.security.AllPermission;\r
+};\r
+\r
+// These permissions apply to the servlet API classes\r
+// and those that are shared across all class loaders\r
+// located in the "common" directory\r
+grant codeBase "file:${catalina.home}/common/-" {\r
+        permission java.security.AllPermission;\r
+};\r
+\r
+// These permissions apply to the container's core code, plus any additional\r
+// libraries installed in the "server" directory\r
+grant codeBase "file:${catalina.home}/server/-" {\r
+        permission java.security.AllPermission;\r
+};\r
+\r
+// The permissions granted to the balancer WEB-INF/classes and WEB-INF/lib directory\r
+grant codeBase "file:${catalina.home}/webapps/balancer/-" {\r
+        permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.util.digester";\r
+        permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.util.digester.*";\r
+};\r
+// ========== WEB APPLICATION PERMISSIONS =====================================\r
+\r
+\r
+// These permissions are granted by default to all web applications\r
+// In addition, a web application will be given a read FilePermission\r
+// and JndiPermission for all files and directories in its document root.\r
+grant { \r
+    // Required for JNDI lookup of named JDBC DataSource's and\r
+    // javamail named MimePart DataSource used to send mail\r
+    permission java.util.PropertyPermission "java.home", "read";\r
+    permission java.util.PropertyPermission "java.naming.*", "read";\r
+    permission java.util.PropertyPermission "javax.sql.*", "read";\r
+\r
+    // OS Specific properties to allow read access\r
+    permission java.util.PropertyPermission "os.name", "read";\r
+    permission java.util.PropertyPermission "os.version", "read";\r
+    permission java.util.PropertyPermission "os.arch", "read";\r
+    permission java.util.PropertyPermission "file.separator", "read";\r
+    permission java.util.PropertyPermission "path.separator", "read";\r
+    permission java.util.PropertyPermission "line.separator", "read";\r
+\r
+    // JVM properties to allow read access\r
+    permission java.util.PropertyPermission "java.version", "read";\r
+    permission java.util.PropertyPermission "java.vendor", "read";\r
+    permission java.util.PropertyPermission "java.vendor.url", "read";\r
+    permission java.util.PropertyPermission "java.class.version", "read";\r
+       permission java.util.PropertyPermission "java.specification.version", "read";\r
+       permission java.util.PropertyPermission "java.specification.vendor", "read";\r
+       permission java.util.PropertyPermission "java.specification.name", "read";\r
+\r
+       permission java.util.PropertyPermission "java.vm.specification.version", "read";\r
+       permission java.util.PropertyPermission "java.vm.specification.vendor", "read";\r
+       permission java.util.PropertyPermission "java.vm.specification.name", "read";\r
+       permission java.util.PropertyPermission "java.vm.version", "read";\r
+       permission java.util.PropertyPermission "java.vm.vendor", "read";\r
+       permission java.util.PropertyPermission "java.vm.name", "read";\r
+\r
+    // Required for OpenJMX\r
+    permission java.lang.RuntimePermission "getAttribute";\r
+\r
+       // Allow read of JAXP compliant XML parser debug\r
+       permission java.util.PropertyPermission "jaxp.debug", "read";\r
+\r
+    // Precompiled JSPs need access to this package.\r
+    permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime";\r
+    permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime.*";\r
+    \r
+};\r
+\r
+\r
+// You can assign additional permissions to particular web applications by\r
+// adding additional "grant" entries here, based on the code base for that\r
+// application, /WEB-INF/classes/, or /WEB-INF/lib/ jar files.\r
+//\r
+// Different permissions can be granted to JSP pages, classes loaded from\r
+// the /WEB-INF/classes/ directory, all jar files in the /WEB-INF/lib/\r
+// directory, or even to individual jar files in the /WEB-INF/lib/ directory.\r
+//\r
+// For instance, assume that the standard "examples" application\r
+// included a JDBC driver that needed to establish a network connection to the\r
+// corresponding database and used the scrape taglib to get the weather from\r
+// the NOAA web server.  You might create a "grant" entries like this:\r
+//\r
+// The permissions granted to the context root directory apply to JSP pages.\r
+// grant codeBase "file:${catalina.home}/webapps/examples/-" {\r
+//      permission java.net.SocketPermission "dbhost.mycompany.com:5432", "connect";\r
+//      permission java.net.SocketPermission "*.noaa.gov:80", "connect";\r
+// };\r
+//\r
+// The permissions granted to the context WEB-INF/classes directory\r
+// grant codeBase "file:${catalina.home}/webapps/examples/WEB-INF/classes/-" {\r
+// };\r
+//\r
+// The permission granted to your JDBC driver\r
+// grant codeBase "jar:file:${catalina.home}/webapps/examples/WEB-INF/lib/driver.jar!/-" {\r
+//      permission java.net.SocketPermission "dbhost.mycompany.com:5432", "connect";\r
+// };\r
+// The permission granted to the scrape taglib\r
+// grant codeBase "jar:file:${catalina.home}/webapps/examples/WEB-INF/lib/scrape.jar!/-" {\r
+//      permission java.net.SocketPermission "*.noaa.gov:80", "connect";\r
+// };\r
+\r
diff --git a/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/catalina.properties b/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/catalina.properties
new file mode 100644 (file)
index 0000000..3e937ac
--- /dev/null
@@ -0,0 +1,85 @@
+#
+# 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.
+#
+
+#
+# List of comma-separated packages that start with or equal this string
+# will cause a security exception to be thrown when
+# passed to checkPackageAccess unless the
+# corresponding RuntimePermission ("accessClassInPackage."+package) has
+# been granted.
+package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper.,sun.beans.
+#
+# List of comma-separated packages that start with or equal this string
+# will cause a security exception to be thrown when
+# passed to checkPackageDefinition unless the
+# corresponding RuntimePermission ("defineClassInPackage."+package) has
+# been granted.
+#
+# by default, no packages are restricted for definition, and none of
+# the class loaders supplied with the JDK call checkPackageDefinition.
+#
+package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper.
+
+#
+#
+# List of comma-separated paths defining the contents of the "common" 
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
+# If left as blank,the JVM system loader will be used as Catalina's "common" 
+# loader.
+# Examples:
+#     "foo": Add this folder as a class repository
+#     "foo/*.jar": Add all the JARs of the specified folder as class 
+#                  repositories
+#     "foo/bar.jar": Add bar.jar as a class repository
+common.loader=${catalina.home}/common/classes,${catalina.home}/common/i18n/*.jar,${catalina.home}/common/endorsed/*.jar,${catalina.home}/common/lib/*.jar
+
+#
+# List of comma-separated paths defining the contents of the "server" 
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
+# If left as blank, the "common" loader will be used as Catalina's "server" 
+# loader.
+# Examples:
+#     "foo": Add this folder as a class repository
+#     "foo/*.jar": Add all the JARs of the specified folder as class 
+#                  repositories
+#     "foo/bar.jar": Add bar.jar as a class repository
+server.loader=${catalina.home}/server/classes,${catalina.home}/server/lib/*.jar
+
+#
+# List of comma-separated paths defining the contents of the "shared" 
+# classloader. Prefixes should be used to define what is the repository type.
+# Path may be relative to the CATALINA_BASE path or absolute. If left as blank,
+# the "common" loader will be used as Catalina's "shared" loader.
+# Examples:
+#     "foo": Add this folder as a class repository
+#     "foo/*.jar": Add all the JARs of the specified folder as class 
+#                  repositories
+#     "foo/bar.jar": Add bar.jar as a class repository 
+# Please note that for individual jar files, e.g. bar.jar, you need the URL form
+# starting with file:.
+shared.loader=${catalina.base}/shared/classes,${catalina.base}/shared/lib/*.jar
+
+#
+# String cache configuration.
+tomcat.util.buf.StringCache.byte.enabled=true
+#tomcat.util.buf.StringCache.char.enabled=true
+#tomcat.util.buf.StringCache.trainThreshold=500000
+#tomcat.util.buf.StringCache.cacheSize=5000
diff --git a/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/context.xml b/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/context.xml
new file mode 100644 (file)
index 0000000..895adb9
--- /dev/null
@@ -0,0 +1,31 @@
+<!--
+  ~ 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.
+  -->
+
+    <!-- The contents of this file will be loaded for each web application -->
+<Context>
+
+  <!-- Default set of monitored resources -->
+  <WatchedResource>WEB-INF/web.xml</WatchedResource>
+
+  <!-- Uncomment this to disable session persistence across Tomcat restarts -->
+  <!--
+  <Manager pathname="" />
+  -->
+
+</Context>
\ No newline at end of file
diff --git a/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/logging.properties b/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/logging.properties
new file mode 100644 (file)
index 0000000..07f85e2
--- /dev/null
@@ -0,0 +1,74 @@
+#
+# 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.
+#
+
+handlers = 1catalina.org.apache.juli.FileHandler, 2localhost.org.apache.juli.FileHandler, 3manager.org.apache.juli.FileHandler, 4admin.org.apache.juli.FileHandler, 5host-manager.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
+
+.handlers = 1catalina.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
+
+############################################################
+# Handler specific properties.
+# Describes specific configuration info for Handlers.
+############################################################
+
+1catalina.org.apache.juli.FileHandler.level = FINE
+1catalina.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
+1catalina.org.apache.juli.FileHandler.prefix = catalina.
+
+2localhost.org.apache.juli.FileHandler.level = FINE
+2localhost.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
+2localhost.org.apache.juli.FileHandler.prefix = localhost.
+
+3manager.org.apache.juli.FileHandler.level = FINE
+3manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
+3manager.org.apache.juli.FileHandler.prefix = manager.
+
+4admin.org.apache.juli.FileHandler.level = FINE
+4admin.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
+4admin.org.apache.juli.FileHandler.prefix = admin.
+
+5host-manager.org.apache.juli.FileHandler.level = FINE
+5host-manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
+5host-manager.org.apache.juli.FileHandler.prefix = host-manager.
+
+java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
+
+
+############################################################
+# Facility specific properties.
+# Provides extra control for each logger.
+############################################################
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.FileHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = 3manager.org.apache.juli.FileHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/admin].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/admin].handlers = 4admin.org.apache.juli.FileHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = 5host-manager.org.apache.juli.FileHandler
+
+# For example, set the com.xyz.foo logger to only log SEVERE
+# messages:
+#org.apache.catalina.startup.ContextConfig.level = FINE
+#org.apache.catalina.startup.HostConfig.level = FINE
+#org.apache.catalina.session.ManagerBase.level = FINE
diff --git a/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/server-minimal.xml b/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/server-minimal.xml
new file mode 100644 (file)
index 0000000..3164758
--- /dev/null
@@ -0,0 +1,44 @@
+<!--
+  ~ 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.
+  -->
+
+<Server port="8005" shutdown="SHUTDOWN">
+
+  <GlobalNamingResources>
+    <!-- Used by Manager webapp -->
+    <Resource name="UserDatabase" auth="Container"
+              type="org.apache.catalina.UserDatabase"
+              description="User database that can be updated and saved"
+              factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+              pathname="conf/tomcat-users.xml"/>
+  </GlobalNamingResources>
+
+  <Service name="Catalina">
+    <Connector port="8080"/>
+
+    <!-- This is here for compatibility only, not required -->
+    <Connector port="8009" protocol="AJP/1.3"/>
+
+    <Engine name="Catalina" defaultHost="localhost">
+      <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+             resourceName="UserDatabase"/>
+      <Host name="localhost" appBase="webapps"/>
+    </Engine>
+
+  </Service>
+</Server>
diff --git a/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/server.xml b/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/server.xml
new file mode 100644 (file)
index 0000000..22a0410
--- /dev/null
@@ -0,0 +1,384 @@
+<!--
+  ~ 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.
+  -->
+
+    <!-- Example Server Configuration File -->
+    <!-- Note that component elements are nested corresponding to their
+parent-child relationships with each other -->
+
+    <!-- A "Server" is a singleton element that represents the entire JVM,
+        which may contain one or more "Service" instances.  The Server
+        listens for a shutdown command on the indicated port.
+
+        Note:  A "Server" is not itself a "Container", so you may not
+        define subcomponents such as "Valves" or "Loggers" at this level.
+    -->
+
+<Server port="8005" shutdown="SHUTDOWN">
+
+  <!-- Comment these entries out to disable JMX MBeans support used for the 
+       administration web application -->
+  <Listener className="org.apache.catalina.core.AprLifecycleListener"/>
+  <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener"/>
+  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"/>
+  <Listener className="org.apache.catalina.storeconfig.StoreConfigLifecycleListener"/>
+
+  <!-- Global JNDI resources -->
+  <GlobalNamingResources>
+
+    <!-- Test entry for demonstration purposes -->
+    <Environment name="simpleValue" type="java.lang.Integer" value="30"/>
+
+    <!-- Editable user database that can also be used by
+         UserDatabaseRealm to authenticate users -->
+    <Resource name="UserDatabase" auth="Container"
+              type="org.apache.catalina.UserDatabase"
+              description="User database that can be updated and saved"
+              factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
+              pathname="conf/tomcat-users.xml"/>
+
+  </GlobalNamingResources>
+
+  <!-- A "Service" is a collection of one or more "Connectors" that share
+       a single "Container" (and therefore the web applications visible
+       within that Container).  Normally, that Container is an "Engine",
+       but this is not required.
+
+       Note:  A "Service" is not itself a "Container", so you may not
+       define subcomponents such as "Valves" or "Loggers" at this level.
+   -->
+
+  <!-- Define the Tomcat Stand-Alone Service -->
+  <Service name="Catalina">
+
+    <!-- A "Connector" represents an endpoint by which requests are received
+         and responses are returned.  Each Connector passes requests on to the
+         associated "Container" (normally an Engine) for processing.
+
+         By default, a non-SSL HTTP/1.1 Connector is established on port 8080.
+         You can also enable an SSL HTTP/1.1 Connector on port 8443 by
+         following the instructions below and uncommenting the second Connector
+         entry.  SSL support requires the following steps (see the SSL Config
+         HOWTO in the Tomcat 5 documentation bundle for more detailed
+         instructions):
+         * If your JDK version 1.3 or prior, download and install JSSE 1.0.2 or
+           later, and put the JAR files into "$JAVA_HOME/jre/lib/ext".
+         * Execute:
+             %JAVA_HOME%\bin\keytool -genkey -alias tomcat -keyalg RSA (Windows)
+             $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA  (Unix)
+           with a password value of "changeit" for both the certificate and
+           the keystore itself.
+
+         By default, DNS lookups are enabled when a web application calls
+         request.getRemoteHost().  This can have an adverse impact on
+         performance, so you can disable it by setting the
+         "enableLookups" attribute to "false".  When DNS lookups are disabled,
+         request.getRemoteHost() will return the String version of the
+         IP address of the remote client.
+    -->
+
+    <!-- Define a non-SSL HTTP/1.1 Connector on port 8080 -->
+    <Connector port="9696" maxHttpHeaderSize="8192"
+               maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
+               enableLookups="false" redirectPort="8443" acceptCount="100"
+               connectionTimeout="20000" disableUploadTimeout="true"/>
+    <!-- Note : To disable connection timeouts, set connectionTimeout value
+     to 0 -->
+
+    <!-- Note : To use gzip compression you could set the following properties :
+
+          compression="on"
+          compressionMinSize="2048"
+          noCompressionUserAgents="gozilla, traviata"
+          compressableMimeType="text/html,text/xml"
+   -->
+
+    <!-- Define a SSL HTTP/1.1 Connector on port 8443 -->
+    <!--
+    <Connector port="8443" maxHttpHeaderSize="8192"
+               maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
+               enableLookups="false" disableUploadTimeout="true"
+               acceptCount="100" scheme="https" secure="true"
+               clientAuth="false" sslProtocol="TLS" />
+    -->
+
+    <!-- Define an AJP 1.3 Connector on port 8009 -->
+    <Connector port="8009"
+               enableLookups="false" redirectPort="8443" protocol="AJP/1.3"/>
+
+    <!-- Define a Proxied HTTP/1.1 Connector on port 8082 -->
+    <!-- See proxy documentation for more information about using this. -->
+    <!--
+    <Connector port="8082" 
+               maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
+               enableLookups="false" acceptCount="100" connectionTimeout="20000"
+               proxyPort="80" disableUploadTimeout="true" />
+    -->
+
+    <!-- An Engine represents the entry point (within Catalina) that processes
+         every request.  The Engine implementation for Tomcat stand alone
+         analyzes the HTTP headers included with the request, and passes them
+         on to the appropriate Host (virtual host). -->
+
+    <!-- You should set jvmRoute to support load-balancing via AJP ie :
+    <Engine name="Standalone" defaultHost="localhost" jvmRoute="jvm1">         
+    -->
+
+    <!-- Define the top level container in our container hierarchy -->
+    <Engine name="Catalina" defaultHost="localhost">
+
+      <!-- The request dumper valve dumps useful debugging information about
+           the request headers and cookies that were received, and the response
+           headers and cookies that were sent, for all requests received by
+           this instance of Tomcat.  If you care only about requests to a
+           particular virtual host, or a particular application, nest this
+           element inside the corresponding <Host> or <Context> entry instead.
+
+           For a similar mechanism that is portable to all Servlet 2.4
+           containers, check out the "RequestDumperFilter" Filter in the
+           example application (the source for this filter may be found in
+           "$CATALINA_HOME/webapps/examples/WEB-INF/classes/filters").
+
+           Request dumping is disabled by default.  Uncomment the following
+           element to enable it. -->
+      <!--
+      <Valve className="org.apache.catalina.valves.RequestDumperValve"/>
+      -->
+
+      <!-- Because this Realm is here, an instance will be shared globally -->
+
+      <!-- This Realm uses the UserDatabase configured in the global JNDI
+           resources under the key "UserDatabase".  Any edits
+           that are performed against this UserDatabase are immediately
+           available for use by the Realm.  -->
+      <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+             resourceName="UserDatabase"/>
+
+      <!-- Comment out the old realm but leave here for now in case we
+           need to go back quickly -->
+      <!--
+      <Realm className="org.apache.catalina.realm.MemoryRealm" />
+      -->
+
+      <!-- Replace the above Realm with one of the following to get a Realm
+           stored in a database and accessed via JDBC -->
+
+      <!--
+      <Realm  className="org.apache.catalina.realm.JDBCRealm"
+             driverName="org.gjt.mm.mysql.Driver"
+          connectionURL="jdbc:mysql://localhost/authority"
+         connectionName="test" connectionPassword="test"
+              userTable="users" userNameCol="user_name" userCredCol="user_pass"
+          userRoleTable="user_roles" roleNameCol="role_name" />
+      -->
+
+      <!--
+      <Realm  className="org.apache.catalina.realm.JDBCRealm"
+             driverName="oracle.jdbc.driver.OracleDriver"
+          connectionURL="jdbc:oracle:thin:@ntserver:1521:ORCL"
+         connectionName="scott" connectionPassword="tiger"
+              userTable="users" userNameCol="user_name" userCredCol="user_pass"
+          userRoleTable="user_roles" roleNameCol="role_name" />
+      -->
+
+      <!--
+      <Realm  className="org.apache.catalina.realm.JDBCRealm"
+             driverName="sun.jdbc.odbc.JdbcOdbcDriver"
+          connectionURL="jdbc:odbc:CATALINA"
+              userTable="users" userNameCol="user_name" userCredCol="user_pass"
+          userRoleTable="user_roles" roleNameCol="role_name" />
+      -->
+
+      <!-- Define the default virtual host
+           Note: XML Schema validation will not work with Xerces 2.2.
+       -->
+      <Host name="localhost" appBase="webapps"
+            unpackWARs="true" autoDeploy="true"
+            xmlValidation="false" xmlNamespaceAware="false">
+
+        <!-- Defines a cluster for this node,
+             By defining this element, means that every manager will be changed.
+             So when running a cluster, only make sure that you have webapps in there
+             that need to be clustered and remove the other ones.
+             A cluster has the following parameters:
+
+             className = the fully qualified name of the cluster class
+
+             clusterName = a descriptive name for your cluster, can be anything
+
+             mcastAddr = the multicast address, has to be the same for all the nodes
+
+             mcastPort = the multicast port, has to be the same for all the nodes
+             
+             mcastBindAddress = bind the multicast socket to a specific address
+             
+             mcastTTL = the multicast TTL if you want to limit your broadcast
+             
+             mcastSoTimeout = the multicast readtimeout 
+
+             mcastFrequency = the number of milliseconds in between sending a "I'm alive" heartbeat
+
+             mcastDropTime = the number a milliseconds before a node is considered "dead" if no heartbeat is received
+
+             tcpThreadCount = the number of threads to handle incoming replication requests, optimal would be the same amount of threads as nodes 
+
+             tcpListenAddress = the listen address (bind address) for TCP cluster request on this host, 
+                                in case of multiple ethernet cards.
+                                auto means that address becomes
+                                InetAddress.getLocalHost().getHostAddress()
+
+             tcpListenPort = the tcp listen port
+
+             tcpSelectorTimeout = the timeout (ms) for the Selector.select() method in case the OS
+                                  has a wakup bug in java.nio. Set to 0 for no timeout
+
+             printToScreen = true means that managers will also print to std.out
+
+             expireSessionsOnShutdown = true means that 
+
+             useDirtyFlag = true means that we only replicate a session after setAttribute,removeAttribute has been called.
+                            false means to replicate the session after each request.
+                            false means that replication would work for the following piece of code: (only for SimpleTcpReplicationManager)
+                            <%
+                            HashMap map = (HashMap)session.getAttribute("map");
+                            map.put("key","value");
+                            %>
+             replicationMode = can be either 'pooled', 'synchronous' or 'asynchronous'.
+                               * Pooled means that the replication happens using several sockets in a synchronous way. Ie, the data gets replicated, then the request return. This is the same as the 'synchronous' setting except it uses a pool of sockets, hence it is multithreaded. This is the fastest and safest configuration. To use this, also increase the nr of tcp threads that you have dealing with replication.
+                               * Synchronous means that the thread that executes the request, is also the
+                               thread the replicates the data to the other nodes, and will not return until all
+                               nodes have received the information.
+                               * Asynchronous means that there is a specific 'sender' thread for each cluster node,
+                               so the request thread will queue the replication request into a "smart" queue,
+                               and then return to the client.
+                               The "smart" queue is a queue where when a session is added to the queue, and the same session
+                               already exists in the queue from a previous request, that session will be replaced
+                               in the queue instead of replicating two requests. This almost never happens, unless there is a 
+                               large network delay.
+        -->
+        <!--
+            When configuring for clustering, you also add in a valve to catch all the requests
+            coming in, at the end of the request, the session may or may not be replicated.
+            A session is replicated if and only if all the conditions are met:
+            1. useDirtyFlag is true or setAttribute or removeAttribute has been called AND
+            2. a session exists (has been created)
+            3. the request is not trapped by the "filter" attribute
+
+            The filter attribute is to filter out requests that could not modify the session,
+            hence we don't replicate the session after the end of this request.
+            The filter is negative, ie, anything you put in the filter, you mean to filter out,
+            ie, no replication will be done on requests that match one of the filters.
+            The filter attribute is delimited by ;, so you can't escape out ; even if you wanted to.
+
+            filter=".*\.gif;.*\.js;" means that we will not replicate the session after requests with the URI
+            ending with .gif and .js are intercepted.
+            
+            The deployer element can be used to deploy apps cluster wide.
+            Currently the deployment only deploys/undeploys to working members in the cluster
+            so no WARs are copied upons startup of a broken node.
+            The deployer watches a directory (watchDir) for WAR files when watchEnabled="true"
+            When a new war file is added the war gets deployed to the local instance,
+            and then deployed to the other instances in the cluster.
+            When a war file is deleted from the watchDir the war is undeployed locally 
+            and cluster wide
+        -->
+
+        <!--
+        <Cluster className="org.apache.catalina.cluster.tcp.SimpleTcpCluster"
+                 managerClassName="org.apache.catalina.cluster.session.DeltaManager"
+                 expireSessionsOnShutdown="false"
+                 useDirtyFlag="true"
+                 notifyListenersOnReplication="true">
+
+            <Membership 
+                className="org.apache.catalina.cluster.mcast.McastService"
+                mcastAddr="228.0.0.4"
+                mcastPort="45564"
+                mcastFrequency="500"
+                mcastDropTime="3000"/>
+
+            <Receiver 
+                className="org.apache.catalina.cluster.tcp.ReplicationListener"
+                tcpListenAddress="auto"
+                tcpListenPort="4001"
+                tcpSelectorTimeout="100"
+                tcpThreadCount="6"/>
+
+            <Sender
+                className="org.apache.catalina.cluster.tcp.ReplicationTransmitter"
+                replicationMode="pooled"
+                ackTimeout="15000"
+                waitForAck="true"/>
+
+            <Valve className="org.apache.catalina.cluster.tcp.ReplicationValve"
+                   filter=".*\.gif;.*\.js;.*\.jpg;.*\.png;.*\.htm;.*\.html;.*\.css;.*\.txt;"/>
+                   
+            <Deployer className="org.apache.catalina.cluster.deploy.FarmWarDeployer"
+                      tempDir="/tmp/war-temp/"
+                      deployDir="/tmp/war-deploy/"
+                      watchDir="/tmp/war-listen/"
+                      watchEnabled="false"/>
+                      
+            <ClusterListener className="org.apache.catalina.cluster.session.ClusterSessionListener"/>
+        </Cluster>
+        -->
+
+
+        <!-- Normally, users must authenticate themselves to each web app
+    individually.  Uncomment the following entry if you would like
+    a user to be authenticated the first time they encounter a
+    resource protected by a security constraint, and then have that
+    user identity maintained across *all* web applications contained
+    in this virtual host. -->
+        <!--
+        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+        -->
+
+        <!-- Access log processes all requests for this virtual host.  By
+             default, log files are created in the "logs" directory relative to
+             $CATALINA_HOME.  If you wish, you can specify a different
+             directory with the "directory" attribute.  Specify either a relative
+             (to $CATALINA_HOME) or absolute path to the desired directory.
+        -->
+        <!--
+        <Valve className="org.apache.catalina.valves.AccessLogValve"
+                 directory="logs"  prefix="localhost_access_log." suffix=".txt"
+                 pattern="common" resolveHosts="false"/>
+        -->
+
+        <!-- Access log processes all requests for this virtual host.  By
+             default, log files are created in the "logs" directory relative to
+             $CATALINA_HOME.  If you wish, you can specify a different
+             directory with the "directory" attribute.  Specify either a relative
+             (to $CATALINA_HOME) or absolute path to the desired directory.
+             This access log implementation is optimized for maximum performance,
+             but is hardcoded to support only the "common" and "combined" patterns.
+        -->
+        <!--
+        <Valve className="org.apache.catalina.valves.FastCommonAccessLogValve"
+                 directory="logs"  prefix="localhost_access_log." suffix=".txt"
+                 pattern="common" resolveHosts="false"/>
+        -->
+
+      </Host>
+
+    </Engine>
+
+  </Service>
+
+</Server>
diff --git a/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/tomcat-users.xml b/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/tomcat-users.xml
new file mode 100644 (file)
index 0000000..4725666
--- /dev/null
@@ -0,0 +1,29 @@
+<!--
+  ~ 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.
+  -->
+
+    <!--
+      NOTE:  By default, no user is included in the "manager" role required
+      to operate the "/manager" web application.  If you wish to use this app,
+      you must define such a user - the username and password are arbitrary.
+    -->
+<tomcat-users>
+  <user name="tomcat" password="tomcat" roles="tomcat"/>
+  <user name="role1" password="tomcat" roles="role1"/>
+  <user name="both" password="tomcat" roles="tomcat,role1"/>
+</tomcat-users>
diff --git a/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/web.xml b/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/web.xml
new file mode 100644 (file)
index 0000000..0263f1e
--- /dev/null
@@ -0,0 +1,1183 @@
+<?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.
+  -->
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+         version="2.4">
+
+  <!-- ======================== Introduction ============================== -->
+  <!-- This document defines default values for *all* web applications      -->
+  <!-- loaded into this instance of Tomcat.  As each application is         -->
+  <!-- deployed, this file is processed, followed by the                    -->
+  <!-- "/WEB-INF/web.xml" deployment descriptor from your own               -->
+  <!-- applications.                                                        -->
+  <!--                                                                      -->
+  <!-- WARNING:  Do not configure application-specific resources here!      -->
+  <!-- They should go in the "/WEB-INF/web.xml" file in your application.   -->
+
+
+  <!-- ================== Built In Servlet Definitions ==================== -->
+
+
+  <!-- The default servlet for all web applications, that serves static     -->
+  <!-- resources.  It processes all requests that are not mapped to other   -->
+  <!-- servlets with servlet mappings (defined either here or in your own   -->
+  <!-- web.xml file.  This servlet supports the following initialization    -->
+  <!-- parameters (default values are in square brackets):                  -->
+  <!--                                                                      -->
+  <!--   debug               Debugging detail level for messages logged     -->
+  <!--                       by this servlet.  [0]                          -->
+  <!--                                                                      -->
+  <!--   fileEncoding        Encoding to be used to read static resources   -->
+  <!--                       [platform default]                             -->
+  <!--                                                                      -->
+  <!--   input               Input buffer size (in bytes) when reading      -->
+  <!--                       resources to be served.  [2048]                -->
+  <!--                                                                      -->
+  <!--   listings            Should directory listings be produced if there -->
+  <!--                       is no welcome file in this directory?  [false] -->
+  <!--                       WARNING: Listings for directories with many    -->
+  <!--                       entries can be slow and may consume            -->
+  <!--                       significant proportions of server resources.   -->
+  <!--                                                                      -->
+  <!--   output              Output buffer size (in bytes) when writing     -->
+  <!--                       resources to be served.  [2048]                -->
+  <!--                                                                      -->
+  <!--   readonly            Is this context "read only", so HTTP           -->
+  <!--                       commands like PUT and DELETE are               -->
+  <!--                       rejected?  [true]                              -->
+  <!--                                                                      -->
+  <!--   readmeFile          File name to display with the directory        -->
+  <!--                       contents. [null]                               -->
+  <!--                                                                      -->
+  <!--   sendfileSize        If the connector used supports sendfile, this  -->
+  <!--                       represents the minimal file size in KB for     -->
+  <!--                       which sendfile will be used. Use a negative    -->
+  <!--                       value to always disable sendfile.  [48]        -->
+  <!--                                                                      -->
+  <!--  For directory listing customization. Checks localXsltFile, then     -->
+  <!--  globalXsltFile, then defaults to original behavior.                 -->
+  <!--                                                                      -->
+  <!--   localXsltFile       Make directory listings an XML doc and         -->
+  <!--                       pass the result to this style sheet residing   -->
+  <!--                       in that directory. This overrides              -->
+  <!--                        globalXsltFile[null]                          -->
+  <!--                                                                      -->
+  <!--   globalXsltFile      Site wide configuration version of             -->
+  <!--                       localXsltFile This argument is expected        -->
+  <!--                       to be a physical file. [null]                  -->
+  <!--                                                                      -->
+  <!--                                                                      -->
+
+  <servlet>
+    <servlet-name>default</servlet-name>
+    <servlet-class>org.apache.catalina.servlets.DefaultServlet</servlet-class>
+    <init-param>
+      <param-name>debug</param-name>
+      <param-value>0</param-value>
+    </init-param>
+    <init-param>
+      <param-name>listings</param-name>
+      <param-value>false</param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+
+
+  <!-- The "invoker" servlet, which executes anonymous servlet classes      -->
+  <!-- that have not been defined in a web.xml file.  Traditionally, this   -->
+  <!-- servlet is mapped to the URL pattern "/servlet/*", but you can map   -->
+  <!-- it to other patterns as well.  The extra path info portion of such a -->
+  <!-- request must be the fully qualified class name of a Java class that  -->
+  <!-- implements Servlet (or extends HttpServlet), or the servlet name     -->
+  <!-- of an existing servlet definition.     This servlet supports the     -->
+  <!-- following initialization parameters (default values are in square    -->
+  <!-- brackets):                                                           -->
+  <!--                                                                      -->
+  <!--   debug               Debugging detail level for messages logged     -->
+  <!--                       by this servlet.  [0]                          -->
+
+  <!--
+      <servlet>
+          <servlet-name>invoker</servlet-name>
+          <servlet-class>
+            org.apache.catalina.servlets.InvokerServlet
+          </servlet-class>
+          <init-param>
+              <param-name>debug</param-name>
+              <param-value>0</param-value>
+          </init-param>
+          <load-on-startup>2</load-on-startup>
+      </servlet>
+  -->
+
+
+  <!-- The JSP page compiler and execution servlet, which is the mechanism  -->
+  <!-- used by Tomcat to support JSP pages.  Traditionally, this servlet    -->
+  <!-- is mapped to the URL pattern "*.jsp".  This servlet supports the     -->
+  <!-- following initialization parameters (default values are in square    -->
+  <!-- brackets):                                                           -->
+  <!--                                                                      -->
+  <!--   checkInterval       If development is false and checkInterval is   -->
+  <!--                       greater than zero, background compilations are -->
+  <!--                       enabled. checkInterval is the time in seconds  -->
+  <!--                       between checks to see if a JSP page needs to   -->
+  <!--                       be recompiled. [0]                             -->
+  <!--                                                                      -->
+  <!--   modificationTestInterval                                           -->
+  <!--                       Causes a JSP (and its dependent files) to not  -->
+  <!--                       be checked for modification during the         -->
+  <!--                       specified time interval (in seconds) from the  -->
+  <!--                       last time the JSP was checked for              -->
+  <!--                       modification. A value of 0 will cause the JSP  -->
+  <!--                       to be checked on every access.                 -->
+  <!--                       Used in development mode only. [4]             -->
+  <!--                                                                      -->
+  <!--   compiler            Which compiler Ant should use to compile JSP   -->
+  <!--                       pages.  See the Ant documentation for more     -->
+  <!--                       information. [javac]                           -->
+  <!--                                                                      -->
+  <!--   classdebuginfo      Should the class file be compiled with         -->
+  <!--                       debugging information?  [true]                 -->
+  <!--                                                                      -->
+  <!--   classpath           What class path should I use while compiling   -->
+  <!--                       generated servlets?  [Created dynamically      -->
+  <!--                       based on the current web application]          -->
+  <!--                                                                      -->
+  <!--   development         Is Jasper used in development mode? If true,   -->
+  <!--                       the frequency at which JSPs are checked for    -->
+  <!--                       modification may be specified via the          -->
+  <!--                       modificationTestInterval parameter. [true]     -->
+  <!--                                                                      -->
+  <!--   enablePooling       Determines whether tag handler pooling is      -->
+  <!--                       enabled  [true]                                -->
+  <!--                                                                      -->
+  <!--   fork                Tell Ant to fork compiles of JSP pages so that -->
+  <!--                       a separate JVM is used for JSP page compiles   -->
+  <!--                       from the one Tomcat is running in. [true]      -->
+  <!--                                                                      -->
+  <!--   ieClassId           The class-id value to be sent to Internet      -->
+  <!--                       Explorer when using <jsp:plugin> tags.         -->
+  <!--                       [clsid:8AD9C840-044E-11D1-B3E9-00805F499D93]   -->
+  <!--                                                                      -->
+  <!--   javaEncoding        Java file encoding to use for generating java  -->
+  <!--                       source files. [UTF8]                           -->
+  <!--                                                                      -->
+  <!--   keepgenerated       Should we keep the generated Java source code  -->
+  <!--                       for each page instead of deleting it? [true]   -->
+  <!--                                                                      -->
+  <!--   mappedfile          Should we generate static content with one     -->
+  <!--                       print statement per input line, to ease        -->
+  <!--                       debugging?  [true]                             -->
+  <!--                                                                      -->
+  <!--   trimSpaces          Should white spaces in template text between   -->
+  <!--                       actions or directives be trimmed?  [false]     -->
+  <!--                                                                      -->
+  <!--   suppressSmap        Should the generation of SMAP info for JSR45   -->
+  <!--                       debugging be suppressed?  [false]              -->
+  <!--                                                                      -->
+  <!--   dumpSmap            Should the SMAP info for JSR45 debugging be    -->
+  <!--                       dumped to a file? [false]                      -->
+  <!--                       False if suppressSmap is true                  -->
+  <!--                                                                      -->
+  <!--   genStrAsCharArray   Should text strings be generated as char       -->
+  <!--                       arrays, to improve performance in some cases?  -->
+  <!--                       [false]                                        -->
+  <!--                                                                      -->
+  <!--   errorOnUseBeanInvalidClassAttribute                                -->
+  <!--                       Should Jasper issue an error when the value of -->
+  <!--                       the class attribute in an useBean action is    -->
+  <!--                       not a valid bean class?  [true]                -->
+  <!--                                                                      -->
+  <!--   scratchdir          What scratch directory should we use when      -->
+  <!--                       compiling JSP pages?  [default work directory  -->
+  <!--                       for the current web application]               -->
+  <!--                                                                      -->
+  <!--   xpoweredBy          Determines whether X-Powered-By response       -->
+  <!--                       header is added by generated servlet  [false]  -->
+  <!--                                                                      -->
+  <!--   compilerTargetVM    Compiler target VM                             -->
+  <!--                       default is System.properties                   -->
+  <!--                        java.specification.version > 1.4              -->
+  <!--                        [1.5] else [1.4]                              -->
+  <!--                                                                      -->
+  <!--   compilerSourceVM    Compiler source VM                             -->
+  <!--                       default is System.properties                   -->
+  <!--                        java.specification.version > 1.4              -->
+  <!--                        [1.5] else [1.4]                              -->
+  <!--                                                                      -->
+  <!-- If you wish to use Jikes to compile JSP pages:                       -->
+  <!--   Please see the "Using Jikes" section of the Jasper-HowTo           -->
+  <!--   page in the Tomcat documentation.                                  -->
+
+  <servlet>
+    <servlet-name>jsp</servlet-name>
+    <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
+    <init-param>
+      <param-name>fork</param-name>
+      <param-value>false</param-value>
+    </init-param>
+    <init-param>
+      <param-name>xpoweredBy</param-name>
+      <param-value>false</param-value>
+    </init-param>
+    <load-on-startup>3</load-on-startup>
+  </servlet>
+
+
+  <!-- NOTE: An SSI Filter is also available as an alternative SSI          -->
+  <!-- implementation. Use either the Servlet or the Filter but NOT both.   -->
+  <!--                                                                      -->
+  <!-- Server Side Includes processing servlet, which processes SSI         -->
+  <!-- directives in HTML pages consistent with similar support in web      -->
+  <!-- servers like Apache.  Traditionally, this servlet is mapped to the   -->
+  <!-- URL pattern "*.shtml".  This servlet supports the following          -->
+  <!-- initialization parameters (default values are in square brackets):   -->
+  <!--                                                                      -->
+  <!--   buffered            Should output from this servlet be buffered?   -->
+  <!--                       (0=false, 1=true)  [0]                         -->
+  <!--                                                                      -->
+  <!--   debug               Debugging detail level for messages logged     -->
+  <!--                       by this servlet.  [0]                          -->
+  <!--                                                                      -->
+  <!--   expires             The number of seconds before a page with SSI   -->
+  <!--                       directives will expire.  [No default]          -->
+  <!--                                                                      -->
+  <!--   isVirtualWebappRelative                                            -->
+  <!--                       Should "virtual" paths be interpreted as       -->
+  <!--                       relative to the context root, instead of       -->
+  <!--                       the server root?  (0=false, 1=true) [0]        -->
+  <!--                                                                      -->
+  <!--   inputEncoding       The encoding to assume for SSI resources if    -->
+  <!--                       one is not available from the resource.        -->
+  <!--                       [Platform default]                             -->
+  <!--                                                                      -->
+  <!--   outputEncoding      The encoding to use for the page that results  -->
+  <!--                       from the SSI processing. [UTF-8]               -->
+  <!--                                                                      -->
+  <!--                                                                      -->
+  <!-- IMPORTANT: To use the SSI servlet, you also need to rename the       -->
+  <!--            $CATALINA_HOME/server/lib/servlets-ssi.renametojar file   -->
+  <!--            to $CATALINA_HOME/server/lib/servlets-ssi.jar             -->
+
+  <!--
+      <servlet>
+          <servlet-name>ssi</servlet-name>
+          <servlet-class>
+            org.apache.catalina.ssi.SSIServlet
+          </servlet-class>
+          <init-param>
+            <param-name>buffered</param-name>
+            <param-value>1</param-value>
+          </init-param>
+          <init-param>
+            <param-name>debug</param-name>
+            <param-value>0</param-value>
+          </init-param>
+          <init-param>
+            <param-name>expires</param-name>
+            <param-value>666</param-value>
+          </init-param>
+          <init-param>
+            <param-name>isVirtualWebappRelative</param-name>
+            <param-value>0</param-value>
+          </init-param>
+          <load-on-startup>4</load-on-startup>
+      </servlet>
+  -->
+
+
+  <!-- Common Gateway Includes (CGI) processing servlet, which supports     -->
+  <!-- execution of external applications that conform to the CGI spec      -->
+  <!-- requirements.  Typically, this servlet is mapped to the URL pattern  -->
+  <!-- "/cgi-bin/*", which means that any CGI applications that are         -->
+  <!-- executed must be present within the web application.  This servlet   -->
+  <!-- supports the following initialization parameters (default values     -->
+  <!-- are in square brackets):                                             -->
+  <!--                                                                      -->
+  <!--   cgiPathPrefix        The CGI search path will start at             -->
+  <!--                        webAppRootDir + File.separator + this prefix. -->
+  <!--                        [WEB-INF/cgi]                                 -->
+  <!--                                                                      -->
+  <!--   debug                Debugging detail level for messages logged    -->
+  <!--                        by this servlet.  [0]                         -->
+  <!--                                                                      -->
+  <!--   executable           Name of the exectuable used to run the        -->
+  <!--                        script. [perl]                                -->
+  <!--                                                                      -->
+  <!--   parameterEncoding    Name of parameter encoding to be used with    -->
+  <!--                        CGI servlet.                                  -->
+  <!--                        [System.getProperty("file.encoding","UTF-8")] -->
+  <!--                                                                      -->
+  <!--   passShellEnvironment Should the shell environment variables (if    -->
+  <!--                        any) be passed to the CGI script? [false]     -->
+  <!--                                                                      -->
+  <!-- IMPORTANT: To use the CGI servlet, you also need to rename the       -->
+  <!--            $CATALINA_HOME/server/lib/servlets-cgi.renametojar file   -->
+  <!--            to $CATALINA_HOME/server/lib/servlets-cgi.jar             -->
+
+  <!--
+      <servlet>
+          <servlet-name>cgi</servlet-name>
+          <servlet-class>org.apache.catalina.servlets.CGIServlet</servlet-class>
+          <init-param>
+            <param-name>debug</param-name>
+            <param-value>0</param-value>
+          </init-param>
+          <init-param>
+            <param-name>cgiPathPrefix</param-name>
+            <param-value>WEB-INF/cgi</param-value>
+          </init-param>
+           <load-on-startup>5</load-on-startup>
+      </servlet>
+  -->
+
+
+  <!-- ================ Built In Servlet Mappings ========================= -->
+
+
+  <!-- The servlet mappings for the built in servlets defined above.  Note  -->
+  <!-- that, by default, the CGI and SSI servlets are *not* mapped.  You    -->
+  <!-- must uncomment these mappings (or add them to your application's own -->
+  <!-- web.xml deployment descriptor) to enable these services              -->
+
+  <!-- The mapping for the default servlet -->
+  <servlet-mapping>
+    <servlet-name>default</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+
+  <!-- The mapping for the invoker servlet -->
+  <!--
+      <servlet-mapping>
+          <servlet-name>invoker</servlet-name>
+          <url-pattern>/servlet/*</url-pattern>
+      </servlet-mapping>
+  -->
+
+  <!-- The mapping for the JSP servlet -->
+  <servlet-mapping>
+    <servlet-name>jsp</servlet-name>
+    <url-pattern>*.jsp</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>jsp</servlet-name>
+    <url-pattern>*.jspx</url-pattern>
+  </servlet-mapping>
+
+  <!-- The mapping for the SSI servlet -->
+  <!--
+      <servlet-mapping>
+          <servlet-name>ssi</servlet-name>
+          <url-pattern>*.shtml</url-pattern>
+      </servlet-mapping>
+  -->
+
+  <!-- The mapping for the CGI Gateway servlet -->
+
+  <!--
+      <servlet-mapping>
+          <servlet-name>cgi</servlet-name>
+          <url-pattern>/cgi-bin/*</url-pattern>
+      </servlet-mapping>
+  -->
+
+
+  <!-- ================== Built In Filter Definitions ===================== -->
+
+  <!-- NOTE: An SSI Servlet is also available as an alternative SSI         -->
+  <!-- implementation. Use either the Servlet or the Filter but NOT both.   -->
+  <!--                                                                      -->
+  <!-- Server Side Includes processing filter, which processes SSI          -->
+  <!-- directives in HTML pages consistent with similar support in web      -->
+  <!-- servers like Apache.  Traditionally, this filter is mapped to the    -->
+  <!-- URL pattern "*.shtml", though it can be mapped to "*" as it will     -->
+  <!-- selectively enable/disable SSI processing based on mime types. For   -->
+  <!-- this to work you will need to uncomment the .shtml mime type         -->
+  <!-- definition towards the bottom of this file.                          -->
+  <!-- The contentType init param allows you to apply SSI processing to JSP -->
+  <!-- pages, javascript, or any other content you wish.  This filter       -->
+  <!-- supports the following initialization parameters (default values are -->
+  <!-- in square brackets):                                                 -->
+  <!--                                                                      -->
+  <!--   contentType         A regex pattern that must be matched before    -->
+  <!--                       SSI processing is applied.                     -->
+  <!--                       [text/x-server-parsed-html(;.*)?]              -->
+  <!--                                                                      -->
+  <!--   debug               Debugging detail level for messages logged     -->
+  <!--                       by this servlet.  [0]                          -->
+  <!--                                                                      -->
+  <!--   expires             The number of seconds before a page with SSI   -->
+  <!--                       directives will expire.  [No default]          -->
+  <!--                                                                      -->
+  <!--   isVirtualWebappRelative                                            -->
+  <!--                       Should "virtual" paths be interpreted as       -->
+  <!--                       relative to the context root, instead of       -->
+  <!--                       the server root?  (0=false, 1=true) [0]        -->
+  <!--                                                                      -->
+  <!--                                                                      -->
+  <!-- IMPORTANT: To use the SSI filter, you also need to rename the        -->
+  <!--            $CATALINA_HOME/server/lib/servlets-ssi.renametojar file   -->
+  <!--            to $CATALINA_HOME/server/lib/servlets-ssi.jar             -->
+
+  <!--
+      <filter>
+          <filter-name>ssi</filter-name>
+          <filter-class>
+            org.apache.catalina.ssi.SSIFilter
+          </filter-class>
+          <init-param>
+            <param-name>contentType</param-name>
+            <param-value>text/x-server-parsed-html(;.*)?</param-value>
+          </init-param>
+          <init-param>
+            <param-name>debug</param-name>
+            <param-value>0</param-value>
+          </init-param>
+          <init-param>
+            <param-name>expires</param-name>
+            <param-value>666</param-value>
+          </init-param>
+          <init-param>
+            <param-name>isVirtualWebappRelative</param-name>
+            <param-value>0</param-value>
+          </init-param>
+      </filter>
+  -->
+
+
+  <!-- ==================== Built In Filter Mappings ====================== -->
+
+  <!-- The mapping for the SSI Filter -->
+  <!--
+      <filter-mapping>
+          <filter-name>ssi</filter-name>
+          <url-pattern>*.shtml</url-pattern>
+      </filter-mapping>
+  -->
+
+
+  <!-- ==================== Default Session Configuration ================= -->
+  <!-- You can set the default session timeout (in minutes) for all newly   -->
+  <!-- created sessions by modifying the value below.                       -->
+
+  <session-config>
+    <session-timeout>30</session-timeout>
+  </session-config>
+
+
+  <!-- ===================== Default MIME Type Mappings =================== -->
+  <!-- When serving static resources, Tomcat will automatically generate    -->
+  <!-- a "Content-Type" header based on the resource's filename extension,  -->
+  <!-- based on these mappings.  Additional mappings can be added here (to  -->
+  <!-- apply to all web applications), or in your own application's web.xml -->
+  <!-- deployment descriptor.                                               -->
+
+  <mime-mapping>
+    <extension>abs</extension>
+    <mime-type>audio/x-mpeg</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>ai</extension>
+    <mime-type>application/postscript</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>aif</extension>
+    <mime-type>audio/x-aiff</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>aifc</extension>
+    <mime-type>audio/x-aiff</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>aiff</extension>
+    <mime-type>audio/x-aiff</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>aim</extension>
+    <mime-type>application/x-aim</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>art</extension>
+    <mime-type>image/x-jg</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>asf</extension>
+    <mime-type>video/x-ms-asf</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>asx</extension>
+    <mime-type>video/x-ms-asf</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>au</extension>
+    <mime-type>audio/basic</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>avi</extension>
+    <mime-type>video/x-msvideo</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>avx</extension>
+    <mime-type>video/x-rad-screenplay</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>bcpio</extension>
+    <mime-type>application/x-bcpio</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>bin</extension>
+    <mime-type>application/octet-stream</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>bmp</extension>
+    <mime-type>image/bmp</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>body</extension>
+    <mime-type>text/html</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>cdf</extension>
+    <mime-type>application/x-netcdf</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>cer</extension>
+    <mime-type>application/x-x509-ca-cert</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>class</extension>
+    <mime-type>application/java</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>cpio</extension>
+    <mime-type>application/x-cpio</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>csh</extension>
+    <mime-type>application/x-csh</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>css</extension>
+    <mime-type>text/css</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>dib</extension>
+    <mime-type>image/bmp</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>doc</extension>
+    <mime-type>application/msword</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>dtd</extension>
+    <mime-type>application/xml-dtd</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>dv</extension>
+    <mime-type>video/x-dv</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>dvi</extension>
+    <mime-type>application/x-dvi</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>eps</extension>
+    <mime-type>application/postscript</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>etx</extension>
+    <mime-type>text/x-setext</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>exe</extension>
+    <mime-type>application/octet-stream</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>gif</extension>
+    <mime-type>image/gif</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>gtar</extension>
+    <mime-type>application/x-gtar</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>gz</extension>
+    <mime-type>application/x-gzip</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>hdf</extension>
+    <mime-type>application/x-hdf</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>htc</extension>
+    <mime-type>text/x-component</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>htm</extension>
+    <mime-type>text/html</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>html</extension>
+    <mime-type>text/html</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>hqx</extension>
+    <mime-type>application/mac-binhex40</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>ico</extension>
+    <mime-type>image/x-icon</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>ief</extension>
+    <mime-type>image/ief</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>jad</extension>
+    <mime-type>text/vnd.sun.j2me.app-descriptor</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>jar</extension>
+    <mime-type>application/java-archive</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>java</extension>
+    <mime-type>text/plain</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>jnlp</extension>
+    <mime-type>application/x-java-jnlp-file</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>jpe</extension>
+    <mime-type>image/jpeg</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>jpeg</extension>
+    <mime-type>image/jpeg</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>jpg</extension>
+    <mime-type>image/jpeg</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>js</extension>
+    <mime-type>text/javascript</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>jsf</extension>
+    <mime-type>text/plain</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>jspf</extension>
+    <mime-type>text/plain</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>kar</extension>
+    <mime-type>audio/midi</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>latex</extension>
+    <mime-type>application/x-latex</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>m3u</extension>
+    <mime-type>audio/x-mpegurl</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>mac</extension>
+    <mime-type>image/x-macpaint</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>man</extension>
+    <mime-type>application/x-troff-man</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>mathml</extension>
+    <mime-type>application/mathml+xml</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>me</extension>
+    <mime-type>application/x-troff-me</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>mid</extension>
+    <mime-type>audio/midi</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>midi</extension>
+    <mime-type>audio/midi</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>mif</extension>
+    <mime-type>application/vnd.mif</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>mov</extension>
+    <mime-type>video/quicktime</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>movie</extension>
+    <mime-type>video/x-sgi-movie</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>mp1</extension>
+    <mime-type>audio/x-mpeg</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>mp2</extension>
+    <mime-type>audio/mpeg</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>mp3</extension>
+    <mime-type>audio/mpeg</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>mpa</extension>
+    <mime-type>audio/x-mpeg</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>mpe</extension>
+    <mime-type>video/mpeg</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>mpeg</extension>
+    <mime-type>video/mpeg</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>mpega</extension>
+    <mime-type>audio/x-mpeg</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>mpg</extension>
+    <mime-type>video/mpeg</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>mpv2</extension>
+    <mime-type>video/mpeg2</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>ms</extension>
+    <mime-type>application/x-troff-ms</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>nc</extension>
+    <mime-type>application/x-netcdf</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>oda</extension>
+    <mime-type>application/oda</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <!-- OpenDocument Database -->
+    <extension>odb</extension>
+    <mime-type>application/vnd.oasis.opendocument.database</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <!-- OpenDocument Chart -->
+    <extension>odc</extension>
+    <mime-type>application/vnd.oasis.opendocument.chart</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <!-- OpenDocument Formula -->
+    <extension>odf</extension>
+    <mime-type>application/vnd.oasis.opendocument.formula</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <!-- OpenDocument Drawing -->
+    <extension>odg</extension>
+    <mime-type>application/vnd.oasis.opendocument.graphics</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <!-- OpenDocument Image -->
+    <extension>odi</extension>
+    <mime-type>application/vnd.oasis.opendocument.image</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <!-- OpenDocument Master Document -->
+    <extension>odm</extension>
+    <mime-type>application/vnd.oasis.opendocument.text-master</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <!-- OpenDocument Presentation -->
+    <extension>odp</extension>
+    <mime-type>application/vnd.oasis.opendocument.presentation</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <!-- OpenDocument Spreadsheet -->
+    <extension>ods</extension>
+    <mime-type>application/vnd.oasis.opendocument.spreadsheet</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <!-- OpenDocument Text -->
+    <extension>odt</extension>
+    <mime-type>application/vnd.oasis.opendocument.text</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>ogg</extension>
+    <mime-type>application/ogg</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <!-- OpenDocument Drawing Template -->
+    <extension>otg</extension>
+    <mime-type>application/vnd.oasis.opendocument.graphics-template</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <!-- HTML Document Template -->
+    <extension>oth</extension>
+    <mime-type>application/vnd.oasis.opendocument.text-web</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <!-- OpenDocument Presentation Template -->
+    <extension>otp</extension>
+    <mime-type>application/vnd.oasis.opendocument.presentation-template</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <!-- OpenDocument Spreadsheet Template -->
+    <extension>ots</extension>
+    <mime-type>application/vnd.oasis.opendocument.spreadsheet-template</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <!-- OpenDocument Text Template -->
+    <extension>ott</extension>
+    <mime-type>application/vnd.oasis.opendocument.text-template</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>pbm</extension>
+    <mime-type>image/x-portable-bitmap</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>pct</extension>
+    <mime-type>image/pict</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>pdf</extension>
+    <mime-type>application/pdf</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>pgm</extension>
+    <mime-type>image/x-portable-graymap</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>pic</extension>
+    <mime-type>image/pict</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>pict</extension>
+    <mime-type>image/pict</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>pls</extension>
+    <mime-type>audio/x-scpls</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>png</extension>
+    <mime-type>image/png</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>pnm</extension>
+    <mime-type>image/x-portable-anymap</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>pnt</extension>
+    <mime-type>image/x-macpaint</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>ppm</extension>
+    <mime-type>image/x-portable-pixmap</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>pps</extension>
+    <mime-type>application/vnd.ms-powerpoint</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>ppt</extension>
+    <mime-type>application/vnd.ms-powerpoint</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>ps</extension>
+    <mime-type>application/postscript</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>psd</extension>
+    <mime-type>image/x-photoshop</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>qt</extension>
+    <mime-type>video/quicktime</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>qti</extension>
+    <mime-type>image/x-quicktime</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>qtif</extension>
+    <mime-type>image/x-quicktime</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>ras</extension>
+    <mime-type>image/x-cmu-raster</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>rdf</extension>
+    <mime-type>application/rdf+xml</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>rgb</extension>
+    <mime-type>image/x-rgb</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>rm</extension>
+    <mime-type>application/vnd.rn-realmedia</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>roff</extension>
+    <mime-type>application/x-troff</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>rtf</extension>
+    <mime-type>text/rtf</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>rtx</extension>
+    <mime-type>text/richtext</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>sh</extension>
+    <mime-type>application/x-sh</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>shar</extension>
+    <mime-type>application/x-shar</mime-type>
+  </mime-mapping>
+  <!--
+      <mime-mapping>
+          <extension>shtml</extension>
+          <mime-type>text/x-server-parsed-html</mime-type>
+      </mime-mapping>
+  -->
+  <mime-mapping>
+    <extension>smf</extension>
+    <mime-type>audio/x-midi</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>sit</extension>
+    <mime-type>application/x-stuffit</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>snd</extension>
+    <mime-type>audio/basic</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>src</extension>
+    <mime-type>application/x-wais-source</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>sv4cpio</extension>
+    <mime-type>application/x-sv4cpio</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>sv4crc</extension>
+    <mime-type>application/x-sv4crc</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>svg</extension>
+    <mime-type>image/svg+xml</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>svgz</extension>
+    <mime-type>image/svg</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>swf</extension>
+    <mime-type>application/x-shockwave-flash</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>t</extension>
+    <mime-type>application/x-troff</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>tar</extension>
+    <mime-type>application/x-tar</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>tcl</extension>
+    <mime-type>application/x-tcl</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>tex</extension>
+    <mime-type>application/x-tex</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>texi</extension>
+    <mime-type>application/x-texinfo</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>texinfo</extension>
+    <mime-type>application/x-texinfo</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>tif</extension>
+    <mime-type>image/tiff</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>tiff</extension>
+    <mime-type>image/tiff</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>tr</extension>
+    <mime-type>application/x-troff</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>tsv</extension>
+    <mime-type>text/tab-separated-values</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>txt</extension>
+    <mime-type>text/plain</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>ulw</extension>
+    <mime-type>audio/basic</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>ustar</extension>
+    <mime-type>application/x-ustar</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>vrml</extension>
+    <mime-type>model/vrml</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>vsd</extension>
+    <mime-type>application/x-visio</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>vxml</extension>
+    <mime-type>application/voicexml+xml</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>wav</extension>
+    <mime-type>audio/x-wav</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <!-- Wireless Bitmap -->
+    <extension>wbmp</extension>
+    <mime-type>image/vnd.wap.wbmp</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <!-- WML Source -->
+    <extension>wml</extension>
+    <mime-type>text/vnd.wap.wml</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <!-- Compiled WML -->
+    <extension>wmlc</extension>
+    <mime-type>application/vnd.wap.wmlc</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <!-- WML Script Source -->
+    <extension>wmls</extension>
+    <mime-type>text/vnd.wap.wmlscript</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <!-- Compiled WML Script -->
+    <extension>wmlscriptc</extension>
+    <mime-type>application/vnd.wap.wmlscriptc</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>wrl</extension>
+    <mime-type>model/vrml</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>xbm</extension>
+    <mime-type>image/x-xbitmap</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>xht</extension>
+    <mime-type>application/xhtml+xml</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>xhtml</extension>
+    <mime-type>application/xhtml+xml</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>xls</extension>
+    <mime-type>application/vnd.ms-excel</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>xml</extension>
+    <mime-type>application/xml</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>xpm</extension>
+    <mime-type>image/x-xpixmap</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>xsl</extension>
+    <mime-type>application/xml</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>xslt</extension>
+    <mime-type>application/xslt+xml</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>xul</extension>
+    <mime-type>application/vnd.mozilla.xul+xml</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>xwd</extension>
+    <mime-type>image/x-xwindowdump</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>Z</extension>
+    <mime-type>application/x-compress</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>z</extension>
+    <mime-type>application/x-compress</mime-type>
+  </mime-mapping>
+  <mime-mapping>
+    <extension>zip</extension>
+    <mime-type>application/zip</mime-type>
+  </mime-mapping>
+
+  <!-- ==================== Default Welcome File List ===================== -->
+  <!-- When a request URI refers to a directory, the default servlet looks  -->
+  <!-- for a "welcome file" within that directory and, if present,          -->
+  <!-- to the corresponding resource URI for display.  If no welcome file   -->
+  <!-- is present, the default servlet either serves a directory listing,   -->
+  <!-- or returns a 404 status, depending on how it is configured.          -->
+  <!--                                                                      -->
+  <!-- If you define welcome files in your own application's web.xml        -->
+  <!-- deployment descriptor, that list *replaces* the list configured      -->
+  <!-- here, so be sure that you include any of the default values that     -->
+  <!-- you wish to include.                                                 -->
+
+  <welcome-file-list>
+    <welcome-file>index.html</welcome-file>
+    <welcome-file>index.htm</welcome-file>
+    <welcome-file>index.jsp</welcome-file>
+  </welcome-file-list>
+
+</web-app>
diff --git a/archiva-webapp-test/pom.xml b/archiva-webapp-test/pom.xml
deleted file mode 100644 (file)
index 264f6ef..0000000
+++ /dev/null
@@ -1,241 +0,0 @@
-<?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.
-  -->
-
-<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/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.apache.maven.archiva</groupId>
-    <artifactId>archiva</artifactId>
-    <version>1.0-SNAPSHOT</version>
-  </parent>
-  <artifactId>archiva-webapp-test</artifactId>
-  <packaging>pom</packaging>
-  <name>Archiva Web Application Tests</name>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven.archiva</groupId>
-      <artifactId>archiva-webapp</artifactId>
-      <version>${project.version}</version>
-      <type>war</type>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.shared</groupId>
-      <artifactId>maven-web-ui-tests</artifactId>
-      <version>1.0-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <testSourceDirectory>src/test/it</testSourceDirectory>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>dependency-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>unzip-archiva-webapp</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>${project.groupId}</groupId>
-                  <artifactId>archiva-webapp</artifactId>
-                  <version>${project.version}</version>
-                  <type>war</type>
-                </artifactItem>
-              </artifactItems>
-              <outputDirectory>${project.build.directory}/${container.name}conf/webapps/archiva</outputDirectory>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>copy-container-conf</id>
-            <phase>package</phase>
-            <configuration>
-              <tasks>
-                <copy todir="${project.build.directory}/${container.name}conf">
-                  <fileset dir="src/test/${container.name}"/>
-                </copy>
-                <copy
-                    todir="${project.build.directory}/installs/${container.name}/apache-tomcat-5.5.20/apache-tomcat-5.5.20/common/lib">
-                  <fileset dir="${project.build.directory}/${container.name}conf/webapps/archiva/WEB-INF/lib">
-                    <include name="**/derby-*.jar"/>
-                  </fileset>
-                </copy>
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>check-archiva-loaded</id>
-            <phase>integration-test</phase>
-            <configuration>
-              <tasks>
-                <get src="http://localhost:9696/archiva/" dest="${project.build.directory}/index.html"/>
-                <delete file="${project.build.directory}/index.html"/>
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>testCompile</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>selenium-maven-plugin</artifactId>
-        <version>1.0-SNAPSHOT</version>
-        <executions>
-          <execution>
-            <id>start-selenium</id>
-            <phase>pre-integration-test</phase>
-            <goals>
-              <goal>start-server</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <background>true</background>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.cargo</groupId>
-        <artifactId>cargo-maven2-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>start-container</id>
-            <phase>pre-integration-test</phase>
-            <goals>
-              <goal>start</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>stop-container</id>
-            <phase>post-integration-test</phase>
-            <goals>
-              <goal>stop</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <wait>false</wait>
-          <container>
-            <containerId>${container.name}</containerId>
-            <zipUrlInstaller>
-              <url>${container.url}</url>
-              <installDir>${project.build.directory}/installs/${container.name}</installDir>
-            </zipUrlInstaller>
-            <log>${project.build.directory}/logs/${container.name}.log</log>
-            <output>${project.build.directory}/logs/${container.name}.out</output>
-            <timeout>600000</timeout>
-            <systemProperties>
-              <appserver.base>${project.build.directory}</appserver.base>
-            </systemProperties>
-          </container>
-          <configuration>
-            <home>${project.build.directory}/${container.name}conf</home>
-            <type>existing</type>
-            <properties>
-              <cargo.servlet.port>9696</cargo.servlet.port>
-            </properties>
-          </configuration>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>integration-test</phase>
-            <goals>
-              <goal>test</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <systemProperties>
-            <property>
-              <name>browser</name>
-              <value>${browser}</value>
-            </property>
-          </systemProperties>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <profiles>
-    <profile>
-      <id>tomcat5x</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <properties>
-        <container.name>tomcat5x</container.name>
-        <container.url>http://apache.multidist.com/tomcat/tomcat-5/v5.5.20/bin/apache-tomcat-5.5.20.zip</container.url>
-      </properties>
-    </profile>
-
-    <profile>
-      <id>firefox</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <properties>
-        <browser>*firefox</browser>
-      </properties>
-    </profile>
-    <profile>
-      <id>iexplore</id>
-      <properties>
-        <browser>*iexplore</browser>
-      </properties>
-    </profile>
-    <profile>
-      <id>otherbrowser</id>
-      <properties>
-        <browser>*custom ${browserPath}</browser>
-      </properties>
-    </profile>
-  </profiles>
-
-</project>
\ No newline at end of file
diff --git a/archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/AbstractArchivaTestCase.java b/archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/AbstractArchivaTestCase.java
deleted file mode 100644 (file)
index 63510c7..0000000
+++ /dev/null
@@ -1,89 +0,0 @@
-package org.apache.maven.archiva.web.test;
-
-/*
- * 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.
- */
-
-import org.apache.maven.shared.web.test.AbstractSeleniumTestCase;
-
-/**
- * @author Edwin Punzalan
- */
-public abstract class AbstractArchivaTestCase
-    extends AbstractSeleniumTestCase
-{
-    private String baseUrl = "http://localhost:9696/archiva";
-
-    protected String getApplicationName()
-    {
-        return "Archiva";
-    }
-
-    protected String getInceptionYear()
-    {
-        return "2005";
-    }
-
-    protected void postAdminUserCreation()
-    {
-        if ( getTitle().equals( getTitlePrefix() + "Configuration" ) )
-        {
-            //Add Managed Repository
-            setFieldValue( "id", "web-ui" );
-            setFieldValue( "urlName", "web-ui" );
-            setFieldValue( "name", "Web UI Test Managed Repository" );
-            setFieldValue( "directory", getBasedir() + "target/web-ui-dir" );
-            clickButtonWithValue( "Add Repository" );
-
-            //Set Index location
-            assertPage( "Configuration" );
-            setFieldValue( "indexPath", getBasedir() + "target/web-ui-index" );
-            clickButtonWithValue( "Save Configuration" );
-            assertPage( "Administration" );
-        }
-    }
-
-    public void assertHeader()
-    {
-        assertTrue( "banner is missing" , getSelenium().isElementPresent( "xpath=//div[@id='banner']" ) );
-        assertTrue( "bannerLeft is missing" , getSelenium().isElementPresent( "xpath=//div[@id='banner']" +
-            "/span[@id='bannerLeft']" ) );
-        assertTrue( "bannerLeft link is missing" , getSelenium().isElementPresent( "xpath=//div[@id='banner']" +
-            "/span[@id='bannerLeft']/a[@href='http://maven.apache.org/archiva/']" ) );
-        assertTrue( "bannerLeft img is missing" , getSelenium().isElementPresent( "xpath=//div[@id='banner']" +
-            "/span[@id='bannerLeft']/a[@href='http://maven.apache.org/archiva/']" +
-            "/img[@src='" + getWebContext() + "/images/archiva.png']" ) );
-
-        assertTrue( "bannerRight is missing",  getSelenium().isElementPresent( "xpath=//div[@id='banner']/span[@id='bannerRight']" ) );
-    }
-
-    protected String getTitlePrefix()
-    {
-        return "Maven Archiva :: ";
-    }
-
-    public String getBaseUrl()
-    {
-        return baseUrl;
-    }
-
-    protected String getWebContext()
-    {
-        return "/archiva";
-    }
-}
diff --git a/archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/LoginTest.java b/archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/LoginTest.java
deleted file mode 100644 (file)
index 03093d3..0000000
+++ /dev/null
@@ -1,102 +0,0 @@
-package org.apache.maven.archiva.web.test;
-
-/*
- * 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.
- */
-
-/**
- * @author Edwin Punzalan
- */
-public class LoginTest
-    extends AbstractArchivaTestCase
-{
-    public void testBadLogin()
-    {
-        goToLoginPage();
-        submitLoginPage( "badUsername", "badPassword", false );
-        assertTextPresent( "You have entered an incorrect username and/or password" );
-    }
-
-    public void testUserLogin()
-    {
-        createUser( "test-user", "temp-pass" );
-
-        goToLoginPage();
-        submitLoginPage( "test-user", "temp-pass" );
-
-        // change of password required for new users
-        if ( getTitle().equals( getTitlePrefix() + "Change Password" ) )
-        {
-            setFieldValue( "existingPassword", "temp-pass" );
-            setFieldValue( "newPassword", "p4ssw0rd" );
-            setFieldValue( "newPasswordConfirm", "p4ssw0rd" );
-            clickButtonWithValue( "Change Password" );
-        }
-
-        logout();
-
-        deleteUser( "test-user" );
-    }
-
-    private void createUser( String username, String password )
-    {
-        goToLoginPage();
-        submitLoginPage( adminUsername, adminPassword );
-
-        clickLinkWithText( "User Management" );
-        assertPage( "[Admin] User List" );
-        assertLinkNotPresent( username );
-        clickButtonWithValue( "Create New User" );
-
-        assertPage( "[Admin] User Create" );
-        setFieldValue( "user.username", username );
-        setFieldValue( "user.fullName", username + " FullName" );
-        setFieldValue( "user.email", username + "@localhost.com" );
-        setFieldValue( "user.password", password );
-        setFieldValue( "user.confirmPassword", password );
-        clickButtonWithValue( "Create User" );
-        waitPage();
-        assertPage( "[Admin] User List" );
-        assertLinkPresent( username );
-
-        logout();
-    }
-
-    private void deleteUser( String username )
-    {
-        goToLoginPage();
-        submitLoginPage( adminUsername, adminPassword );
-
-        clickLinkWithText( "User Management" );
-        assertPage( "[Admin] User List" );
-        assertLinkPresent( username );
-
-        //this does not work bec the image is pointing to /archiva/archiva/images/pss/admin/delete.gif
-        // when ran in selenium
-        // clickLinkWithXPath( "//a[@href='/security/userdelete.action?username=" + username + "']" );
-        //so instead we use this
-        open( "/archiva/security/userdelete.action?username=" + username );
-
-        assertPage( "[Admin] User Delete" );
-        assertTextPresent( "The following user will be deleted: " + username );
-        clickButtonWithValue( "Delete User" );
-        assertPage( "[Admin] User List" );
-
-        logout();
-    }
-}
diff --git a/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/archiva.xml b/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/archiva.xml
deleted file mode 100644 (file)
index af06920..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-<?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.
-  -->
-
-<Context path="/archiva"
-         docBase="${catalina.base}/webapps/archiva">
-
-  <Resource name="jdbc/users" auth="Container" type="javax.sql.DataSource"
-            username="sa"
-            password=""
-            driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
-            url="jdbc:derby:target/database/users;create=true"
-      />
-</Context>
diff --git a/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/host-manager.xml b/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/host-manager.xml
deleted file mode 100644 (file)
index e41e1a9..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
-  ~ 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.
-  -->
-
-    <!--
-
-        Context configuration file for the Tomcat Host Manager Web App
-
-        $Id$
-
-    -->
-
-
-<Context docBase="${catalina.home}/server/webapps/host-manager"
-         privileged="true" antiResourceLocking="false" antiJARLocking="false">
-
-</Context>
diff --git a/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/manager.xml b/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/manager.xml
deleted file mode 100644 (file)
index 29abc9f..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-<!--
-  ~ 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.
-  -->
-
-    <!--
-
-        Context configuration file for the Tomcat Manager Web App
-
-        $Id$
-
-    -->
-
-
-<Context docBase="${catalina.home}/server/webapps/manager"
-         privileged="true" antiResourceLocking="false" antiJARLocking="false">
-
-  <!-- Link to the user database we will get roles from -->
-  <ResourceLink name="users" global="UserDatabase"
-                type="org.apache.catalina.UserDatabase"/>
-
-</Context>
diff --git a/archiva-webapp-test/src/test/tomcat5x/conf/catalina.policy b/archiva-webapp-test/src/test/tomcat5x/conf/catalina.policy
deleted file mode 100644 (file)
index 53a6c90..0000000
+++ /dev/null
@@ -1,172 +0,0 @@
-// ============================================================================\r
-// catalina.corepolicy - Security Policy Permissions for Tomcat 5\r
-//\r
-// This file contains a default set of security policies to be enforced (by the\r
-// JVM) when Catalina is executed with the "-security" option.  In addition\r
-// to the permissions granted here, the following additional permissions are\r
-// granted to the codebase specific to each web application:\r
-//\r
-// * Read access to the document root directory\r
-//\r
-// $Id: catalina.policy 393732 2006-04-13 06:32:25Z pero $\r
-// ============================================================================\r
-\r
-\r
-// ========== SYSTEM CODE PERMISSIONS =========================================\r
-\r
-\r
-// These permissions apply to javac\r
-grant codeBase "file:${java.home}/lib/-" {\r
-        permission java.security.AllPermission;\r
-};\r
-\r
-// These permissions apply to all shared system extensions\r
-grant codeBase "file:${java.home}/jre/lib/ext/-" {\r
-        permission java.security.AllPermission;\r
-};\r
-\r
-// These permissions apply to javac when ${java.home] points at $JAVA_HOME/jre\r
-grant codeBase "file:${java.home}/../lib/-" {\r
-        permission java.security.AllPermission;\r
-};\r
-\r
-// These permissions apply to all shared system extensions when\r
-// ${java.home} points at $JAVA_HOME/jre\r
-grant codeBase "file:${java.home}/lib/ext/-" {\r
-        permission java.security.AllPermission;\r
-};\r
-\r
-\r
-// ========== CATALINA CODE PERMISSIONS =======================================\r
-\r
-\r
-// These permissions apply to the launcher code\r
-grant codeBase "file:${catalina.home}/bin/commons-launcher.jar" {\r
-        permission java.security.AllPermission;\r
-};\r
-\r
-// These permissions apply to the daemon code\r
-grant codeBase "file:${catalina.home}/bin/commons-daemon.jar" {\r
-        permission java.security.AllPermission;\r
-};\r
-\r
-// These permissions apply to the commons-logging API\r
-grant codeBase "file:${catalina.home}/bin/commons-logging-api.jar" {\r
-        permission java.security.AllPermission;\r
-};\r
-\r
-// These permissions apply to the server startup code\r
-grant codeBase "file:${catalina.home}/bin/bootstrap.jar" {\r
-        permission java.security.AllPermission;\r
-};\r
-\r
-// These permissions apply to the JMX server\r
-grant codeBase "file:${catalina.home}/bin/jmx.jar" {\r
-        permission java.security.AllPermission;\r
-};\r
-\r
-// These permissions apply to JULI\r
-grant codeBase "file:${catalina.home}/bin/tomcat-juli.jar" {\r
-        permission java.security.AllPermission;\r
-};\r
-\r
-// These permissions apply to the servlet API classes\r
-// and those that are shared across all class loaders\r
-// located in the "common" directory\r
-grant codeBase "file:${catalina.home}/common/-" {\r
-        permission java.security.AllPermission;\r
-};\r
-\r
-// These permissions apply to the container's core code, plus any additional\r
-// libraries installed in the "server" directory\r
-grant codeBase "file:${catalina.home}/server/-" {\r
-        permission java.security.AllPermission;\r
-};\r
-\r
-// The permissions granted to the balancer WEB-INF/classes and WEB-INF/lib directory\r
-grant codeBase "file:${catalina.home}/webapps/balancer/-" {\r
-        permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.util.digester";\r
-        permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.util.digester.*";\r
-};\r
-// ========== WEB APPLICATION PERMISSIONS =====================================\r
-\r
-\r
-// These permissions are granted by default to all web applications\r
-// In addition, a web application will be given a read FilePermission\r
-// and JndiPermission for all files and directories in its document root.\r
-grant { \r
-    // Required for JNDI lookup of named JDBC DataSource's and\r
-    // javamail named MimePart DataSource used to send mail\r
-    permission java.util.PropertyPermission "java.home", "read";\r
-    permission java.util.PropertyPermission "java.naming.*", "read";\r
-    permission java.util.PropertyPermission "javax.sql.*", "read";\r
-\r
-    // OS Specific properties to allow read access\r
-    permission java.util.PropertyPermission "os.name", "read";\r
-    permission java.util.PropertyPermission "os.version", "read";\r
-    permission java.util.PropertyPermission "os.arch", "read";\r
-    permission java.util.PropertyPermission "file.separator", "read";\r
-    permission java.util.PropertyPermission "path.separator", "read";\r
-    permission java.util.PropertyPermission "line.separator", "read";\r
-\r
-    // JVM properties to allow read access\r
-    permission java.util.PropertyPermission "java.version", "read";\r
-    permission java.util.PropertyPermission "java.vendor", "read";\r
-    permission java.util.PropertyPermission "java.vendor.url", "read";\r
-    permission java.util.PropertyPermission "java.class.version", "read";\r
-       permission java.util.PropertyPermission "java.specification.version", "read";\r
-       permission java.util.PropertyPermission "java.specification.vendor", "read";\r
-       permission java.util.PropertyPermission "java.specification.name", "read";\r
-\r
-       permission java.util.PropertyPermission "java.vm.specification.version", "read";\r
-       permission java.util.PropertyPermission "java.vm.specification.vendor", "read";\r
-       permission java.util.PropertyPermission "java.vm.specification.name", "read";\r
-       permission java.util.PropertyPermission "java.vm.version", "read";\r
-       permission java.util.PropertyPermission "java.vm.vendor", "read";\r
-       permission java.util.PropertyPermission "java.vm.name", "read";\r
-\r
-    // Required for OpenJMX\r
-    permission java.lang.RuntimePermission "getAttribute";\r
-\r
-       // Allow read of JAXP compliant XML parser debug\r
-       permission java.util.PropertyPermission "jaxp.debug", "read";\r
-\r
-    // Precompiled JSPs need access to this package.\r
-    permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime";\r
-    permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime.*";\r
-    \r
-};\r
-\r
-\r
-// You can assign additional permissions to particular web applications by\r
-// adding additional "grant" entries here, based on the code base for that\r
-// application, /WEB-INF/classes/, or /WEB-INF/lib/ jar files.\r
-//\r
-// Different permissions can be granted to JSP pages, classes loaded from\r
-// the /WEB-INF/classes/ directory, all jar files in the /WEB-INF/lib/\r
-// directory, or even to individual jar files in the /WEB-INF/lib/ directory.\r
-//\r
-// For instance, assume that the standard "examples" application\r
-// included a JDBC driver that needed to establish a network connection to the\r
-// corresponding database and used the scrape taglib to get the weather from\r
-// the NOAA web server.  You might create a "grant" entries like this:\r
-//\r
-// The permissions granted to the context root directory apply to JSP pages.\r
-// grant codeBase "file:${catalina.home}/webapps/examples/-" {\r
-//      permission java.net.SocketPermission "dbhost.mycompany.com:5432", "connect";\r
-//      permission java.net.SocketPermission "*.noaa.gov:80", "connect";\r
-// };\r
-//\r
-// The permissions granted to the context WEB-INF/classes directory\r
-// grant codeBase "file:${catalina.home}/webapps/examples/WEB-INF/classes/-" {\r
-// };\r
-//\r
-// The permission granted to your JDBC driver\r
-// grant codeBase "jar:file:${catalina.home}/webapps/examples/WEB-INF/lib/driver.jar!/-" {\r
-//      permission java.net.SocketPermission "dbhost.mycompany.com:5432", "connect";\r
-// };\r
-// The permission granted to the scrape taglib\r
-// grant codeBase "jar:file:${catalina.home}/webapps/examples/WEB-INF/lib/scrape.jar!/-" {\r
-//      permission java.net.SocketPermission "*.noaa.gov:80", "connect";\r
-// };\r
-\r
diff --git a/archiva-webapp-test/src/test/tomcat5x/conf/catalina.properties b/archiva-webapp-test/src/test/tomcat5x/conf/catalina.properties
deleted file mode 100644 (file)
index 3e937ac..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-#
-# 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.
-#
-
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageAccess unless the
-# corresponding RuntimePermission ("accessClassInPackage."+package) has
-# been granted.
-package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper.,sun.beans.
-#
-# List of comma-separated packages that start with or equal this string
-# will cause a security exception to be thrown when
-# passed to checkPackageDefinition unless the
-# corresponding RuntimePermission ("defineClassInPackage."+package) has
-# been granted.
-#
-# by default, no packages are restricted for definition, and none of
-# the class loaders supplied with the JDK call checkPackageDefinition.
-#
-package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper.
-
-#
-#
-# List of comma-separated paths defining the contents of the "common" 
-# classloader. Prefixes should be used to define what is the repository type.
-# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
-# If left as blank,the JVM system loader will be used as Catalina's "common" 
-# loader.
-# Examples:
-#     "foo": Add this folder as a class repository
-#     "foo/*.jar": Add all the JARs of the specified folder as class 
-#                  repositories
-#     "foo/bar.jar": Add bar.jar as a class repository
-common.loader=${catalina.home}/common/classes,${catalina.home}/common/i18n/*.jar,${catalina.home}/common/endorsed/*.jar,${catalina.home}/common/lib/*.jar
-
-#
-# List of comma-separated paths defining the contents of the "server" 
-# classloader. Prefixes should be used to define what is the repository type.
-# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute.
-# If left as blank, the "common" loader will be used as Catalina's "server" 
-# loader.
-# Examples:
-#     "foo": Add this folder as a class repository
-#     "foo/*.jar": Add all the JARs of the specified folder as class 
-#                  repositories
-#     "foo/bar.jar": Add bar.jar as a class repository
-server.loader=${catalina.home}/server/classes,${catalina.home}/server/lib/*.jar
-
-#
-# List of comma-separated paths defining the contents of the "shared" 
-# classloader. Prefixes should be used to define what is the repository type.
-# Path may be relative to the CATALINA_BASE path or absolute. If left as blank,
-# the "common" loader will be used as Catalina's "shared" loader.
-# Examples:
-#     "foo": Add this folder as a class repository
-#     "foo/*.jar": Add all the JARs of the specified folder as class 
-#                  repositories
-#     "foo/bar.jar": Add bar.jar as a class repository 
-# Please note that for individual jar files, e.g. bar.jar, you need the URL form
-# starting with file:.
-shared.loader=${catalina.base}/shared/classes,${catalina.base}/shared/lib/*.jar
-
-#
-# String cache configuration.
-tomcat.util.buf.StringCache.byte.enabled=true
-#tomcat.util.buf.StringCache.char.enabled=true
-#tomcat.util.buf.StringCache.trainThreshold=500000
-#tomcat.util.buf.StringCache.cacheSize=5000
diff --git a/archiva-webapp-test/src/test/tomcat5x/conf/context.xml b/archiva-webapp-test/src/test/tomcat5x/conf/context.xml
deleted file mode 100644 (file)
index 895adb9..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
-  ~ 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.
-  -->
-
-    <!-- The contents of this file will be loaded for each web application -->
-<Context>
-
-  <!-- Default set of monitored resources -->
-  <WatchedResource>WEB-INF/web.xml</WatchedResource>
-
-  <!-- Uncomment this to disable session persistence across Tomcat restarts -->
-  <!--
-  <Manager pathname="" />
-  -->
-
-</Context>
\ No newline at end of file
diff --git a/archiva-webapp-test/src/test/tomcat5x/conf/logging.properties b/archiva-webapp-test/src/test/tomcat5x/conf/logging.properties
deleted file mode 100644 (file)
index 07f85e2..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-#
-# 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.
-#
-
-handlers = 1catalina.org.apache.juli.FileHandler, 2localhost.org.apache.juli.FileHandler, 3manager.org.apache.juli.FileHandler, 4admin.org.apache.juli.FileHandler, 5host-manager.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
-
-.handlers = 1catalina.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
-
-############################################################
-# Handler specific properties.
-# Describes specific configuration info for Handlers.
-############################################################
-
-1catalina.org.apache.juli.FileHandler.level = FINE
-1catalina.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
-1catalina.org.apache.juli.FileHandler.prefix = catalina.
-
-2localhost.org.apache.juli.FileHandler.level = FINE
-2localhost.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
-2localhost.org.apache.juli.FileHandler.prefix = localhost.
-
-3manager.org.apache.juli.FileHandler.level = FINE
-3manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
-3manager.org.apache.juli.FileHandler.prefix = manager.
-
-4admin.org.apache.juli.FileHandler.level = FINE
-4admin.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
-4admin.org.apache.juli.FileHandler.prefix = admin.
-
-5host-manager.org.apache.juli.FileHandler.level = FINE
-5host-manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs
-5host-manager.org.apache.juli.FileHandler.prefix = host-manager.
-
-java.util.logging.ConsoleHandler.level = FINE
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
-
-
-############################################################
-# Facility specific properties.
-# Provides extra control for each logger.
-############################################################
-
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.FileHandler
-
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = 3manager.org.apache.juli.FileHandler
-
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/admin].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/admin].handlers = 4admin.org.apache.juli.FileHandler
-
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO
-org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = 5host-manager.org.apache.juli.FileHandler
-
-# For example, set the com.xyz.foo logger to only log SEVERE
-# messages:
-#org.apache.catalina.startup.ContextConfig.level = FINE
-#org.apache.catalina.startup.HostConfig.level = FINE
-#org.apache.catalina.session.ManagerBase.level = FINE
diff --git a/archiva-webapp-test/src/test/tomcat5x/conf/server-minimal.xml b/archiva-webapp-test/src/test/tomcat5x/conf/server-minimal.xml
deleted file mode 100644 (file)
index 3164758..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-<!--
-  ~ 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.
-  -->
-
-<Server port="8005" shutdown="SHUTDOWN">
-
-  <GlobalNamingResources>
-    <!-- Used by Manager webapp -->
-    <Resource name="UserDatabase" auth="Container"
-              type="org.apache.catalina.UserDatabase"
-              description="User database that can be updated and saved"
-              factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
-              pathname="conf/tomcat-users.xml"/>
-  </GlobalNamingResources>
-
-  <Service name="Catalina">
-    <Connector port="8080"/>
-
-    <!-- This is here for compatibility only, not required -->
-    <Connector port="8009" protocol="AJP/1.3"/>
-
-    <Engine name="Catalina" defaultHost="localhost">
-      <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
-             resourceName="UserDatabase"/>
-      <Host name="localhost" appBase="webapps"/>
-    </Engine>
-
-  </Service>
-</Server>
diff --git a/archiva-webapp-test/src/test/tomcat5x/conf/server.xml b/archiva-webapp-test/src/test/tomcat5x/conf/server.xml
deleted file mode 100644 (file)
index 22a0410..0000000
+++ /dev/null
@@ -1,384 +0,0 @@
-<!--
-  ~ 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.
-  -->
-
-    <!-- Example Server Configuration File -->
-    <!-- Note that component elements are nested corresponding to their
-parent-child relationships with each other -->
-
-    <!-- A "Server" is a singleton element that represents the entire JVM,
-        which may contain one or more "Service" instances.  The Server
-        listens for a shutdown command on the indicated port.
-
-        Note:  A "Server" is not itself a "Container", so you may not
-        define subcomponents such as "Valves" or "Loggers" at this level.
-    -->
-
-<Server port="8005" shutdown="SHUTDOWN">
-
-  <!-- Comment these entries out to disable JMX MBeans support used for the 
-       administration web application -->
-  <Listener className="org.apache.catalina.core.AprLifecycleListener"/>
-  <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener"/>
-  <Listener className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener"/>
-  <Listener className="org.apache.catalina.storeconfig.StoreConfigLifecycleListener"/>
-
-  <!-- Global JNDI resources -->
-  <GlobalNamingResources>
-
-    <!-- Test entry for demonstration purposes -->
-    <Environment name="simpleValue" type="java.lang.Integer" value="30"/>
-
-    <!-- Editable user database that can also be used by
-         UserDatabaseRealm to authenticate users -->
-    <Resource name="UserDatabase" auth="Container"
-              type="org.apache.catalina.UserDatabase"
-              description="User database that can be updated and saved"
-              factory="org.apache.catalina.users.MemoryUserDatabaseFactory"
-              pathname="conf/tomcat-users.xml"/>
-
-  </GlobalNamingResources>
-
-  <!-- A "Service" is a collection of one or more "Connectors" that share
-       a single "Container" (and therefore the web applications visible
-       within that Container).  Normally, that Container is an "Engine",
-       but this is not required.
-
-       Note:  A "Service" is not itself a "Container", so you may not
-       define subcomponents such as "Valves" or "Loggers" at this level.
-   -->
-
-  <!-- Define the Tomcat Stand-Alone Service -->
-  <Service name="Catalina">
-
-    <!-- A "Connector" represents an endpoint by which requests are received
-         and responses are returned.  Each Connector passes requests on to the
-         associated "Container" (normally an Engine) for processing.
-
-         By default, a non-SSL HTTP/1.1 Connector is established on port 8080.
-         You can also enable an SSL HTTP/1.1 Connector on port 8443 by
-         following the instructions below and uncommenting the second Connector
-         entry.  SSL support requires the following steps (see the SSL Config
-         HOWTO in the Tomcat 5 documentation bundle for more detailed
-         instructions):
-         * If your JDK version 1.3 or prior, download and install JSSE 1.0.2 or
-           later, and put the JAR files into "$JAVA_HOME/jre/lib/ext".
-         * Execute:
-             %JAVA_HOME%\bin\keytool -genkey -alias tomcat -keyalg RSA (Windows)
-             $JAVA_HOME/bin/keytool -genkey -alias tomcat -keyalg RSA  (Unix)
-           with a password value of "changeit" for both the certificate and
-           the keystore itself.
-
-         By default, DNS lookups are enabled when a web application calls
-         request.getRemoteHost().  This can have an adverse impact on
-         performance, so you can disable it by setting the
-         "enableLookups" attribute to "false".  When DNS lookups are disabled,
-         request.getRemoteHost() will return the String version of the
-         IP address of the remote client.
-    -->
-
-    <!-- Define a non-SSL HTTP/1.1 Connector on port 8080 -->
-    <Connector port="9696" maxHttpHeaderSize="8192"
-               maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
-               enableLookups="false" redirectPort="8443" acceptCount="100"
-               connectionTimeout="20000" disableUploadTimeout="true"/>
-    <!-- Note : To disable connection timeouts, set connectionTimeout value
-     to 0 -->
-
-    <!-- Note : To use gzip compression you could set the following properties :
-
-          compression="on"
-          compressionMinSize="2048"
-          noCompressionUserAgents="gozilla, traviata"
-          compressableMimeType="text/html,text/xml"
-   -->
-
-    <!-- Define a SSL HTTP/1.1 Connector on port 8443 -->
-    <!--
-    <Connector port="8443" maxHttpHeaderSize="8192"
-               maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
-               enableLookups="false" disableUploadTimeout="true"
-               acceptCount="100" scheme="https" secure="true"
-               clientAuth="false" sslProtocol="TLS" />
-    -->
-
-    <!-- Define an AJP 1.3 Connector on port 8009 -->
-    <Connector port="8009"
-               enableLookups="false" redirectPort="8443" protocol="AJP/1.3"/>
-
-    <!-- Define a Proxied HTTP/1.1 Connector on port 8082 -->
-    <!-- See proxy documentation for more information about using this. -->
-    <!--
-    <Connector port="8082" 
-               maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
-               enableLookups="false" acceptCount="100" connectionTimeout="20000"
-               proxyPort="80" disableUploadTimeout="true" />
-    -->
-
-    <!-- An Engine represents the entry point (within Catalina) that processes
-         every request.  The Engine implementation for Tomcat stand alone
-         analyzes the HTTP headers included with the request, and passes them
-         on to the appropriate Host (virtual host). -->
-
-    <!-- You should set jvmRoute to support load-balancing via AJP ie :
-    <Engine name="Standalone" defaultHost="localhost" jvmRoute="jvm1">         
-    -->
-
-    <!-- Define the top level container in our container hierarchy -->
-    <Engine name="Catalina" defaultHost="localhost">
-
-      <!-- The request dumper valve dumps useful debugging information about
-           the request headers and cookies that were received, and the response
-           headers and cookies that were sent, for all requests received by
-           this instance of Tomcat.  If you care only about requests to a
-           particular virtual host, or a particular application, nest this
-           element inside the corresponding <Host> or <Context> entry instead.
-
-           For a similar mechanism that is portable to all Servlet 2.4
-           containers, check out the "RequestDumperFilter" Filter in the
-           example application (the source for this filter may be found in
-           "$CATALINA_HOME/webapps/examples/WEB-INF/classes/filters").
-
-           Request dumping is disabled by default.  Uncomment the following
-           element to enable it. -->
-      <!--
-      <Valve className="org.apache.catalina.valves.RequestDumperValve"/>
-      -->
-
-      <!-- Because this Realm is here, an instance will be shared globally -->
-
-      <!-- This Realm uses the UserDatabase configured in the global JNDI
-           resources under the key "UserDatabase".  Any edits
-           that are performed against this UserDatabase are immediately
-           available for use by the Realm.  -->
-      <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
-             resourceName="UserDatabase"/>
-
-      <!-- Comment out the old realm but leave here for now in case we
-           need to go back quickly -->
-      <!--
-      <Realm className="org.apache.catalina.realm.MemoryRealm" />
-      -->
-
-      <!-- Replace the above Realm with one of the following to get a Realm
-           stored in a database and accessed via JDBC -->
-
-      <!--
-      <Realm  className="org.apache.catalina.realm.JDBCRealm"
-             driverName="org.gjt.mm.mysql.Driver"
-          connectionURL="jdbc:mysql://localhost/authority"
-         connectionName="test" connectionPassword="test"
-              userTable="users" userNameCol="user_name" userCredCol="user_pass"
-          userRoleTable="user_roles" roleNameCol="role_name" />
-      -->
-
-      <!--
-      <Realm  className="org.apache.catalina.realm.JDBCRealm"
-             driverName="oracle.jdbc.driver.OracleDriver"
-          connectionURL="jdbc:oracle:thin:@ntserver:1521:ORCL"
-         connectionName="scott" connectionPassword="tiger"
-              userTable="users" userNameCol="user_name" userCredCol="user_pass"
-          userRoleTable="user_roles" roleNameCol="role_name" />
-      -->
-
-      <!--
-      <Realm  className="org.apache.catalina.realm.JDBCRealm"
-             driverName="sun.jdbc.odbc.JdbcOdbcDriver"
-          connectionURL="jdbc:odbc:CATALINA"
-              userTable="users" userNameCol="user_name" userCredCol="user_pass"
-          userRoleTable="user_roles" roleNameCol="role_name" />
-      -->
-
-      <!-- Define the default virtual host
-           Note: XML Schema validation will not work with Xerces 2.2.
-       -->
-      <Host name="localhost" appBase="webapps"
-            unpackWARs="true" autoDeploy="true"
-            xmlValidation="false" xmlNamespaceAware="false">
-
-        <!-- Defines a cluster for this node,
-             By defining this element, means that every manager will be changed.
-             So when running a cluster, only make sure that you have webapps in there
-             that need to be clustered and remove the other ones.
-             A cluster has the following parameters:
-
-             className = the fully qualified name of the cluster class
-
-             clusterName = a descriptive name for your cluster, can be anything
-
-             mcastAddr = the multicast address, has to be the same for all the nodes
-
-             mcastPort = the multicast port, has to be the same for all the nodes
-             
-             mcastBindAddress = bind the multicast socket to a specific address
-             
-             mcastTTL = the multicast TTL if you want to limit your broadcast
-             
-             mcastSoTimeout = the multicast readtimeout 
-
-             mcastFrequency = the number of milliseconds in between sending a "I'm alive" heartbeat
-
-             mcastDropTime = the number a milliseconds before a node is considered "dead" if no heartbeat is received
-
-             tcpThreadCount = the number of threads to handle incoming replication requests, optimal would be the same amount of threads as nodes 
-
-             tcpListenAddress = the listen address (bind address) for TCP cluster request on this host, 
-                                in case of multiple ethernet cards.
-                                auto means that address becomes
-                                InetAddress.getLocalHost().getHostAddress()
-
-             tcpListenPort = the tcp listen port
-
-             tcpSelectorTimeout = the timeout (ms) for the Selector.select() method in case the OS
-                                  has a wakup bug in java.nio. Set to 0 for no timeout
-
-             printToScreen = true means that managers will also print to std.out
-
-             expireSessionsOnShutdown = true means that 
-
-             useDirtyFlag = true means that we only replicate a session after setAttribute,removeAttribute has been called.
-                            false means to replicate the session after each request.
-                            false means that replication would work for the following piece of code: (only for SimpleTcpReplicationManager)
-                            <%
-                            HashMap map = (HashMap)session.getAttribute("map");
-                            map.put("key","value");
-                            %>
-             replicationMode = can be either 'pooled', 'synchronous' or 'asynchronous'.
-                               * Pooled means that the replication happens using several sockets in a synchronous way. Ie, the data gets replicated, then the request return. This is the same as the 'synchronous' setting except it uses a pool of sockets, hence it is multithreaded. This is the fastest and safest configuration. To use this, also increase the nr of tcp threads that you have dealing with replication.
-                               * Synchronous means that the thread that executes the request, is also the
-                               thread the replicates the data to the other nodes, and will not return until all
-                               nodes have received the information.
-                               * Asynchronous means that there is a specific 'sender' thread for each cluster node,
-                               so the request thread will queue the replication request into a "smart" queue,
-                               and then return to the client.
-                               The "smart" queue is a queue where when a session is added to the queue, and the same session
-                               already exists in the queue from a previous request, that session will be replaced
-                               in the queue instead of replicating two requests. This almost never happens, unless there is a 
-                               large network delay.
-        -->
-        <!--
-            When configuring for clustering, you also add in a valve to catch all the requests
-            coming in, at the end of the request, the session may or may not be replicated.
-            A session is replicated if and only if all the conditions are met:
-            1. useDirtyFlag is true or setAttribute or removeAttribute has been called AND
-            2. a session exists (has been created)
-            3. the request is not trapped by the "filter" attribute
-
-            The filter attribute is to filter out requests that could not modify the session,
-            hence we don't replicate the session after the end of this request.
-            The filter is negative, ie, anything you put in the filter, you mean to filter out,
-            ie, no replication will be done on requests that match one of the filters.
-            The filter attribute is delimited by ;, so you can't escape out ; even if you wanted to.
-
-            filter=".*\.gif;.*\.js;" means that we will not replicate the session after requests with the URI
-            ending with .gif and .js are intercepted.
-            
-            The deployer element can be used to deploy apps cluster wide.
-            Currently the deployment only deploys/undeploys to working members in the cluster
-            so no WARs are copied upons startup of a broken node.
-            The deployer watches a directory (watchDir) for WAR files when watchEnabled="true"
-            When a new war file is added the war gets deployed to the local instance,
-            and then deployed to the other instances in the cluster.
-            When a war file is deleted from the watchDir the war is undeployed locally 
-            and cluster wide
-        -->
-
-        <!--
-        <Cluster className="org.apache.catalina.cluster.tcp.SimpleTcpCluster"
-                 managerClassName="org.apache.catalina.cluster.session.DeltaManager"
-                 expireSessionsOnShutdown="false"
-                 useDirtyFlag="true"
-                 notifyListenersOnReplication="true">
-
-            <Membership 
-                className="org.apache.catalina.cluster.mcast.McastService"
-                mcastAddr="228.0.0.4"
-                mcastPort="45564"
-                mcastFrequency="500"
-                mcastDropTime="3000"/>
-
-            <Receiver 
-                className="org.apache.catalina.cluster.tcp.ReplicationListener"
-                tcpListenAddress="auto"
-                tcpListenPort="4001"
-                tcpSelectorTimeout="100"
-                tcpThreadCount="6"/>
-
-            <Sender
-                className="org.apache.catalina.cluster.tcp.ReplicationTransmitter"
-                replicationMode="pooled"
-                ackTimeout="15000"
-                waitForAck="true"/>
-
-            <Valve className="org.apache.catalina.cluster.tcp.ReplicationValve"
-                   filter=".*\.gif;.*\.js;.*\.jpg;.*\.png;.*\.htm;.*\.html;.*\.css;.*\.txt;"/>
-                   
-            <Deployer className="org.apache.catalina.cluster.deploy.FarmWarDeployer"
-                      tempDir="/tmp/war-temp/"
-                      deployDir="/tmp/war-deploy/"
-                      watchDir="/tmp/war-listen/"
-                      watchEnabled="false"/>
-                      
-            <ClusterListener className="org.apache.catalina.cluster.session.ClusterSessionListener"/>
-        </Cluster>
-        -->
-
-
-        <!-- Normally, users must authenticate themselves to each web app
-    individually.  Uncomment the following entry if you would like
-    a user to be authenticated the first time they encounter a
-    resource protected by a security constraint, and then have that
-    user identity maintained across *all* web applications contained
-    in this virtual host. -->
-        <!--
-        <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
-        -->
-
-        <!-- Access log processes all requests for this virtual host.  By
-             default, log files are created in the "logs" directory relative to
-             $CATALINA_HOME.  If you wish, you can specify a different
-             directory with the "directory" attribute.  Specify either a relative
-             (to $CATALINA_HOME) or absolute path to the desired directory.
-        -->
-        <!--
-        <Valve className="org.apache.catalina.valves.AccessLogValve"
-                 directory="logs"  prefix="localhost_access_log." suffix=".txt"
-                 pattern="common" resolveHosts="false"/>
-        -->
-
-        <!-- Access log processes all requests for this virtual host.  By
-             default, log files are created in the "logs" directory relative to
-             $CATALINA_HOME.  If you wish, you can specify a different
-             directory with the "directory" attribute.  Specify either a relative
-             (to $CATALINA_HOME) or absolute path to the desired directory.
-             This access log implementation is optimized for maximum performance,
-             but is hardcoded to support only the "common" and "combined" patterns.
-        -->
-        <!--
-        <Valve className="org.apache.catalina.valves.FastCommonAccessLogValve"
-                 directory="logs"  prefix="localhost_access_log." suffix=".txt"
-                 pattern="common" resolveHosts="false"/>
-        -->
-
-      </Host>
-
-    </Engine>
-
-  </Service>
-
-</Server>
diff --git a/archiva-webapp-test/src/test/tomcat5x/conf/tomcat-users.xml b/archiva-webapp-test/src/test/tomcat5x/conf/tomcat-users.xml
deleted file mode 100644 (file)
index 4725666..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-  ~ 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.
-  -->
-
-    <!--
-      NOTE:  By default, no user is included in the "manager" role required
-      to operate the "/manager" web application.  If you wish to use this app,
-      you must define such a user - the username and password are arbitrary.
-    -->
-<tomcat-users>
-  <user name="tomcat" password="tomcat" roles="tomcat"/>
-  <user name="role1" password="tomcat" roles="role1"/>
-  <user name="both" password="tomcat" roles="tomcat,role1"/>
-</tomcat-users>
diff --git a/archiva-webapp-test/src/test/tomcat5x/conf/web.xml b/archiva-webapp-test/src/test/tomcat5x/conf/web.xml
deleted file mode 100644 (file)
index 0263f1e..0000000
+++ /dev/null
@@ -1,1183 +0,0 @@
-<?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.
-  -->
-
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-         version="2.4">
-
-  <!-- ======================== Introduction ============================== -->
-  <!-- This document defines default values for *all* web applications      -->
-  <!-- loaded into this instance of Tomcat.  As each application is         -->
-  <!-- deployed, this file is processed, followed by the                    -->
-  <!-- "/WEB-INF/web.xml" deployment descriptor from your own               -->
-  <!-- applications.                                                        -->
-  <!--                                                                      -->
-  <!-- WARNING:  Do not configure application-specific resources here!      -->
-  <!-- They should go in the "/WEB-INF/web.xml" file in your application.   -->
-
-
-  <!-- ================== Built In Servlet Definitions ==================== -->
-
-
-  <!-- The default servlet for all web applications, that serves static     -->
-  <!-- resources.  It processes all requests that are not mapped to other   -->
-  <!-- servlets with servlet mappings (defined either here or in your own   -->
-  <!-- web.xml file.  This servlet supports the following initialization    -->
-  <!-- parameters (default values are in square brackets):                  -->
-  <!--                                                                      -->
-  <!--   debug               Debugging detail level for messages logged     -->
-  <!--                       by this servlet.  [0]                          -->
-  <!--                                                                      -->
-  <!--   fileEncoding        Encoding to be used to read static resources   -->
-  <!--                       [platform default]                             -->
-  <!--                                                                      -->
-  <!--   input               Input buffer size (in bytes) when reading      -->
-  <!--                       resources to be served.  [2048]                -->
-  <!--                                                                      -->
-  <!--   listings            Should directory listings be produced if there -->
-  <!--                       is no welcome file in this directory?  [false] -->
-  <!--                       WARNING: Listings for directories with many    -->
-  <!--                       entries can be slow and may consume            -->
-  <!--                       significant proportions of server resources.   -->
-  <!--                                                                      -->
-  <!--   output              Output buffer size (in bytes) when writing     -->
-  <!--                       resources to be served.  [2048]                -->
-  <!--                                                                      -->
-  <!--   readonly            Is this context "read only", so HTTP           -->
-  <!--                       commands like PUT and DELETE are               -->
-  <!--                       rejected?  [true]                              -->
-  <!--                                                                      -->
-  <!--   readmeFile          File name to display with the directory        -->
-  <!--                       contents. [null]                               -->
-  <!--                                                                      -->
-  <!--   sendfileSize        If the connector used supports sendfile, this  -->
-  <!--                       represents the minimal file size in KB for     -->
-  <!--                       which sendfile will be used. Use a negative    -->
-  <!--                       value to always disable sendfile.  [48]        -->
-  <!--                                                                      -->
-  <!--  For directory listing customization. Checks localXsltFile, then     -->
-  <!--  globalXsltFile, then defaults to original behavior.                 -->
-  <!--                                                                      -->
-  <!--   localXsltFile       Make directory listings an XML doc and         -->
-  <!--                       pass the result to this style sheet residing   -->
-  <!--                       in that directory. This overrides              -->
-  <!--                        globalXsltFile[null]                          -->
-  <!--                                                                      -->
-  <!--   globalXsltFile      Site wide configuration version of             -->
-  <!--                       localXsltFile This argument is expected        -->
-  <!--                       to be a physical file. [null]                  -->
-  <!--                                                                      -->
-  <!--                                                                      -->
-
-  <servlet>
-    <servlet-name>default</servlet-name>
-    <servlet-class>org.apache.catalina.servlets.DefaultServlet</servlet-class>
-    <init-param>
-      <param-name>debug</param-name>
-      <param-value>0</param-value>
-    </init-param>
-    <init-param>
-      <param-name>listings</param-name>
-      <param-value>false</param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-
-
-  <!-- The "invoker" servlet, which executes anonymous servlet classes      -->
-  <!-- that have not been defined in a web.xml file.  Traditionally, this   -->
-  <!-- servlet is mapped to the URL pattern "/servlet/*", but you can map   -->
-  <!-- it to other patterns as well.  The extra path info portion of such a -->
-  <!-- request must be the fully qualified class name of a Java class that  -->
-  <!-- implements Servlet (or extends HttpServlet), or the servlet name     -->
-  <!-- of an existing servlet definition.     This servlet supports the     -->
-  <!-- following initialization parameters (default values are in square    -->
-  <!-- brackets):                                                           -->
-  <!--                                                                      -->
-  <!--   debug               Debugging detail level for messages logged     -->
-  <!--                       by this servlet.  [0]                          -->
-
-  <!--
-      <servlet>
-          <servlet-name>invoker</servlet-name>
-          <servlet-class>
-            org.apache.catalina.servlets.InvokerServlet
-          </servlet-class>
-          <init-param>
-              <param-name>debug</param-name>
-              <param-value>0</param-value>
-          </init-param>
-          <load-on-startup>2</load-on-startup>
-      </servlet>
-  -->
-
-
-  <!-- The JSP page compiler and execution servlet, which is the mechanism  -->
-  <!-- used by Tomcat to support JSP pages.  Traditionally, this servlet    -->
-  <!-- is mapped to the URL pattern "*.jsp".  This servlet supports the     -->
-  <!-- following initialization parameters (default values are in square    -->
-  <!-- brackets):                                                           -->
-  <!--                                                                      -->
-  <!--   checkInterval       If development is false and checkInterval is   -->
-  <!--                       greater than zero, background compilations are -->
-  <!--                       enabled. checkInterval is the time in seconds  -->
-  <!--                       between checks to see if a JSP page needs to   -->
-  <!--                       be recompiled. [0]                             -->
-  <!--                                                                      -->
-  <!--   modificationTestInterval                                           -->
-  <!--                       Causes a JSP (and its dependent files) to not  -->
-  <!--                       be checked for modification during the         -->
-  <!--                       specified time interval (in seconds) from the  -->
-  <!--                       last time the JSP was checked for              -->
-  <!--                       modification. A value of 0 will cause the JSP  -->
-  <!--                       to be checked on every access.                 -->
-  <!--                       Used in development mode only. [4]             -->
-  <!--                                                                      -->
-  <!--   compiler            Which compiler Ant should use to compile JSP   -->
-  <!--                       pages.  See the Ant documentation for more     -->
-  <!--                       information. [javac]                           -->
-  <!--                                                                      -->
-  <!--   classdebuginfo      Should the class file be compiled with         -->
-  <!--                       debugging information?  [true]                 -->
-  <!--                                                                      -->
-  <!--   classpath           What class path should I use while compiling   -->
-  <!--                       generated servlets?  [Created dynamically      -->
-  <!--                       based on the current web application]          -->
-  <!--                                                                      -->
-  <!--   development         Is Jasper used in development mode? If true,   -->
-  <!--                       the frequency at which JSPs are checked for    -->
-  <!--                       modification may be specified via the          -->
-  <!--                       modificationTestInterval parameter. [true]     -->
-  <!--                                                                      -->
-  <!--   enablePooling       Determines whether tag handler pooling is      -->
-  <!--                       enabled  [true]                                -->
-  <!--                                                                      -->
-  <!--   fork                Tell Ant to fork compiles of JSP pages so that -->
-  <!--                       a separate JVM is used for JSP page compiles   -->
-  <!--                       from the one Tomcat is running in. [true]      -->
-  <!--                                                                      -->
-  <!--   ieClassId           The class-id value to be sent to Internet      -->
-  <!--                       Explorer when using <jsp:plugin> tags.         -->
-  <!--                       [clsid:8AD9C840-044E-11D1-B3E9-00805F499D93]   -->
-  <!--                                                                      -->
-  <!--   javaEncoding        Java file encoding to use for generating java  -->
-  <!--                       source files. [UTF8]                           -->
-  <!--                                                                      -->
-  <!--   keepgenerated       Should we keep the generated Java source code  -->
-  <!--                       for each page instead of deleting it? [true]   -->
-  <!--                                                                      -->
-  <!--   mappedfile          Should we generate static content with one     -->
-  <!--                       print statement per input line, to ease        -->
-  <!--                       debugging?  [true]                             -->
-  <!--                                                                      -->
-  <!--   trimSpaces          Should white spaces in template text between   -->
-  <!--                       actions or directives be trimmed?  [false]     -->
-  <!--                                                                      -->
-  <!--   suppressSmap        Should the generation of SMAP info for JSR45   -->
-  <!--                       debugging be suppressed?  [false]              -->
-  <!--                                                                      -->
-  <!--   dumpSmap            Should the SMAP info for JSR45 debugging be    -->
-  <!--                       dumped to a file? [false]                      -->
-  <!--                       False if suppressSmap is true                  -->
-  <!--                                                                      -->
-  <!--   genStrAsCharArray   Should text strings be generated as char       -->
-  <!--                       arrays, to improve performance in some cases?  -->
-  <!--                       [false]                                        -->
-  <!--                                                                      -->
-  <!--   errorOnUseBeanInvalidClassAttribute                                -->
-  <!--                       Should Jasper issue an error when the value of -->
-  <!--                       the class attribute in an useBean action is    -->
-  <!--                       not a valid bean class?  [true]                -->
-  <!--                                                                      -->
-  <!--   scratchdir          What scratch directory should we use when      -->
-  <!--                       compiling JSP pages?  [default work directory  -->
-  <!--                       for the current web application]               -->
-  <!--                                                                      -->
-  <!--   xpoweredBy          Determines whether X-Powered-By response       -->
-  <!--                       header is added by generated servlet  [false]  -->
-  <!--                                                                      -->
-  <!--   compilerTargetVM    Compiler target VM                             -->
-  <!--                       default is System.properties                   -->
-  <!--                        java.specification.version > 1.4              -->
-  <!--                        [1.5] else [1.4]                              -->
-  <!--                                                                      -->
-  <!--   compilerSourceVM    Compiler source VM                             -->
-  <!--                       default is System.properties                   -->
-  <!--                        java.specification.version > 1.4              -->
-  <!--                        [1.5] else [1.4]                              -->
-  <!--                                                                      -->
-  <!-- If you wish to use Jikes to compile JSP pages:                       -->
-  <!--   Please see the "Using Jikes" section of the Jasper-HowTo           -->
-  <!--   page in the Tomcat documentation.                                  -->
-
-  <servlet>
-    <servlet-name>jsp</servlet-name>
-    <servlet-class>org.apache.jasper.servlet.JspServlet</servlet-class>
-    <init-param>
-      <param-name>fork</param-name>
-      <param-value>false</param-value>
-    </init-param>
-    <init-param>
-      <param-name>xpoweredBy</param-name>
-      <param-value>false</param-value>
-    </init-param>
-    <load-on-startup>3</load-on-startup>
-  </servlet>
-
-
-  <!-- NOTE: An SSI Filter is also available as an alternative SSI          -->
-  <!-- implementation. Use either the Servlet or the Filter but NOT both.   -->
-  <!--                                                                      -->
-  <!-- Server Side Includes processing servlet, which processes SSI         -->
-  <!-- directives in HTML pages consistent with similar support in web      -->
-  <!-- servers like Apache.  Traditionally, this servlet is mapped to the   -->
-  <!-- URL pattern "*.shtml".  This servlet supports the following          -->
-  <!-- initialization parameters (default values are in square brackets):   -->
-  <!--                                                                      -->
-  <!--   buffered            Should output from this servlet be buffered?   -->
-  <!--                       (0=false, 1=true)  [0]                         -->
-  <!--                                                                      -->
-  <!--   debug               Debugging detail level for messages logged     -->
-  <!--                       by this servlet.  [0]                          -->
-  <!--                                                                      -->
-  <!--   expires             The number of seconds before a page with SSI   -->
-  <!--                       directives will expire.  [No default]          -->
-  <!--                                                                      -->
-  <!--   isVirtualWebappRelative                                            -->
-  <!--                       Should "virtual" paths be interpreted as       -->
-  <!--                       relative to the context root, instead of       -->
-  <!--                       the server root?  (0=false, 1=true) [0]        -->
-  <!--                                                                      -->
-  <!--   inputEncoding       The encoding to assume for SSI resources if    -->
-  <!--                       one is not available from the resource.        -->
-  <!--                       [Platform default]                             -->
-  <!--                                                                      -->
-  <!--   outputEncoding      The encoding to use for the page that results  -->
-  <!--                       from the SSI processing. [UTF-8]               -->
-  <!--                                                                      -->
-  <!--                                                                      -->
-  <!-- IMPORTANT: To use the SSI servlet, you also need to rename the       -->
-  <!--            $CATALINA_HOME/server/lib/servlets-ssi.renametojar file   -->
-  <!--            to $CATALINA_HOME/server/lib/servlets-ssi.jar             -->
-
-  <!--
-      <servlet>
-          <servlet-name>ssi</servlet-name>
-          <servlet-class>
-            org.apache.catalina.ssi.SSIServlet
-          </servlet-class>
-          <init-param>
-            <param-name>buffered</param-name>
-            <param-value>1</param-value>
-          </init-param>
-          <init-param>
-            <param-name>debug</param-name>
-            <param-value>0</param-value>
-          </init-param>
-          <init-param>
-            <param-name>expires</param-name>
-            <param-value>666</param-value>
-          </init-param>
-          <init-param>
-            <param-name>isVirtualWebappRelative</param-name>
-            <param-value>0</param-value>
-          </init-param>
-          <load-on-startup>4</load-on-startup>
-      </servlet>
-  -->
-
-
-  <!-- Common Gateway Includes (CGI) processing servlet, which supports     -->
-  <!-- execution of external applications that conform to the CGI spec      -->
-  <!-- requirements.  Typically, this servlet is mapped to the URL pattern  -->
-  <!-- "/cgi-bin/*", which means that any CGI applications that are         -->
-  <!-- executed must be present within the web application.  This servlet   -->
-  <!-- supports the following initialization parameters (default values     -->
-  <!-- are in square brackets):                                             -->
-  <!--                                                                      -->
-  <!--   cgiPathPrefix        The CGI search path will start at             -->
-  <!--                        webAppRootDir + File.separator + this prefix. -->
-  <!--                        [WEB-INF/cgi]                                 -->
-  <!--                                                                      -->
-  <!--   debug                Debugging detail level for messages logged    -->
-  <!--                        by this servlet.  [0]                         -->
-  <!--                                                                      -->
-  <!--   executable           Name of the exectuable used to run the        -->
-  <!--                        script. [perl]                                -->
-  <!--                                                                      -->
-  <!--   parameterEncoding    Name of parameter encoding to be used with    -->
-  <!--                        CGI servlet.                                  -->
-  <!--                        [System.getProperty("file.encoding","UTF-8")] -->
-  <!--                                                                      -->
-  <!--   passShellEnvironment Should the shell environment variables (if    -->
-  <!--                        any) be passed to the CGI script? [false]     -->
-  <!--                                                                      -->
-  <!-- IMPORTANT: To use the CGI servlet, you also need to rename the       -->
-  <!--            $CATALINA_HOME/server/lib/servlets-cgi.renametojar file   -->
-  <!--            to $CATALINA_HOME/server/lib/servlets-cgi.jar             -->
-
-  <!--
-      <servlet>
-          <servlet-name>cgi</servlet-name>
-          <servlet-class>org.apache.catalina.servlets.CGIServlet</servlet-class>
-          <init-param>
-            <param-name>debug</param-name>
-            <param-value>0</param-value>
-          </init-param>
-          <init-param>
-            <param-name>cgiPathPrefix</param-name>
-            <param-value>WEB-INF/cgi</param-value>
-          </init-param>
-           <load-on-startup>5</load-on-startup>
-      </servlet>
-  -->
-
-
-  <!-- ================ Built In Servlet Mappings ========================= -->
-
-
-  <!-- The servlet mappings for the built in servlets defined above.  Note  -->
-  <!-- that, by default, the CGI and SSI servlets are *not* mapped.  You    -->
-  <!-- must uncomment these mappings (or add them to your application's own -->
-  <!-- web.xml deployment descriptor) to enable these services              -->
-
-  <!-- The mapping for the default servlet -->
-  <servlet-mapping>
-    <servlet-name>default</servlet-name>
-    <url-pattern>/</url-pattern>
-  </servlet-mapping>
-
-  <!-- The mapping for the invoker servlet -->
-  <!--
-      <servlet-mapping>
-          <servlet-name>invoker</servlet-name>
-          <url-pattern>/servlet/*</url-pattern>
-      </servlet-mapping>
-  -->
-
-  <!-- The mapping for the JSP servlet -->
-  <servlet-mapping>
-    <servlet-name>jsp</servlet-name>
-    <url-pattern>*.jsp</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>jsp</servlet-name>
-    <url-pattern>*.jspx</url-pattern>
-  </servlet-mapping>
-
-  <!-- The mapping for the SSI servlet -->
-  <!--
-      <servlet-mapping>
-          <servlet-name>ssi</servlet-name>
-          <url-pattern>*.shtml</url-pattern>
-      </servlet-mapping>
-  -->
-
-  <!-- The mapping for the CGI Gateway servlet -->
-
-  <!--
-      <servlet-mapping>
-          <servlet-name>cgi</servlet-name>
-          <url-pattern>/cgi-bin/*</url-pattern>
-      </servlet-mapping>
-  -->
-
-
-  <!-- ================== Built In Filter Definitions ===================== -->
-
-  <!-- NOTE: An SSI Servlet is also available as an alternative SSI         -->
-  <!-- implementation. Use either the Servlet or the Filter but NOT both.   -->
-  <!--                                                                      -->
-  <!-- Server Side Includes processing filter, which processes SSI          -->
-  <!-- directives in HTML pages consistent with similar support in web      -->
-  <!-- servers like Apache.  Traditionally, this filter is mapped to the    -->
-  <!-- URL pattern "*.shtml", though it can be mapped to "*" as it will     -->
-  <!-- selectively enable/disable SSI processing based on mime types. For   -->
-  <!-- this to work you will need to uncomment the .shtml mime type         -->
-  <!-- definition towards the bottom of this file.                          -->
-  <!-- The contentType init param allows you to apply SSI processing to JSP -->
-  <!-- pages, javascript, or any other content you wish.  This filter       -->
-  <!-- supports the following initialization parameters (default values are -->
-  <!-- in square brackets):                                                 -->
-  <!--                                                                      -->
-  <!--   contentType         A regex pattern that must be matched before    -->
-  <!--                       SSI processing is applied.                     -->
-  <!--                       [text/x-server-parsed-html(;.*)?]              -->
-  <!--                                                                      -->
-  <!--   debug               Debugging detail level for messages logged     -->
-  <!--                       by this servlet.  [0]                          -->
-  <!--                                                                      -->
-  <!--   expires             The number of seconds before a page with SSI   -->
-  <!--                       directives will expire.  [No default]          -->
-  <!--                                                                      -->
-  <!--   isVirtualWebappRelative                                            -->
-  <!--                       Should "virtual" paths be interpreted as       -->
-  <!--                       relative to the context root, instead of       -->
-  <!--                       the server root?  (0=false, 1=true) [0]        -->
-  <!--                                                                      -->
-  <!--                                                                      -->
-  <!-- IMPORTANT: To use the SSI filter, you also need to rename the        -->
-  <!--            $CATALINA_HOME/server/lib/servlets-ssi.renametojar file   -->
-  <!--            to $CATALINA_HOME/server/lib/servlets-ssi.jar             -->
-
-  <!--
-      <filter>
-          <filter-name>ssi</filter-name>
-          <filter-class>
-            org.apache.catalina.ssi.SSIFilter
-          </filter-class>
-          <init-param>
-            <param-name>contentType</param-name>
-            <param-value>text/x-server-parsed-html(;.*)?</param-value>
-          </init-param>
-          <init-param>
-            <param-name>debug</param-name>
-            <param-value>0</param-value>
-          </init-param>
-          <init-param>
-            <param-name>expires</param-name>
-            <param-value>666</param-value>
-          </init-param>
-          <init-param>
-            <param-name>isVirtualWebappRelative</param-name>
-            <param-value>0</param-value>
-          </init-param>
-      </filter>
-  -->
-
-
-  <!-- ==================== Built In Filter Mappings ====================== -->
-
-  <!-- The mapping for the SSI Filter -->
-  <!--
-      <filter-mapping>
-          <filter-name>ssi</filter-name>
-          <url-pattern>*.shtml</url-pattern>
-      </filter-mapping>
-  -->
-
-
-  <!-- ==================== Default Session Configuration ================= -->
-  <!-- You can set the default session timeout (in minutes) for all newly   -->
-  <!-- created sessions by modifying the value below.                       -->
-
-  <session-config>
-    <session-timeout>30</session-timeout>
-  </session-config>
-
-
-  <!-- ===================== Default MIME Type Mappings =================== -->
-  <!-- When serving static resources, Tomcat will automatically generate    -->
-  <!-- a "Content-Type" header based on the resource's filename extension,  -->
-  <!-- based on these mappings.  Additional mappings can be added here (to  -->
-  <!-- apply to all web applications), or in your own application's web.xml -->
-  <!-- deployment descriptor.                                               -->
-
-  <mime-mapping>
-    <extension>abs</extension>
-    <mime-type>audio/x-mpeg</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>ai</extension>
-    <mime-type>application/postscript</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>aif</extension>
-    <mime-type>audio/x-aiff</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>aifc</extension>
-    <mime-type>audio/x-aiff</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>aiff</extension>
-    <mime-type>audio/x-aiff</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>aim</extension>
-    <mime-type>application/x-aim</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>art</extension>
-    <mime-type>image/x-jg</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>asf</extension>
-    <mime-type>video/x-ms-asf</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>asx</extension>
-    <mime-type>video/x-ms-asf</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>au</extension>
-    <mime-type>audio/basic</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>avi</extension>
-    <mime-type>video/x-msvideo</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>avx</extension>
-    <mime-type>video/x-rad-screenplay</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>bcpio</extension>
-    <mime-type>application/x-bcpio</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>bin</extension>
-    <mime-type>application/octet-stream</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>bmp</extension>
-    <mime-type>image/bmp</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>body</extension>
-    <mime-type>text/html</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>cdf</extension>
-    <mime-type>application/x-netcdf</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>cer</extension>
-    <mime-type>application/x-x509-ca-cert</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>class</extension>
-    <mime-type>application/java</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>cpio</extension>
-    <mime-type>application/x-cpio</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>csh</extension>
-    <mime-type>application/x-csh</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>css</extension>
-    <mime-type>text/css</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>dib</extension>
-    <mime-type>image/bmp</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>doc</extension>
-    <mime-type>application/msword</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>dtd</extension>
-    <mime-type>application/xml-dtd</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>dv</extension>
-    <mime-type>video/x-dv</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>dvi</extension>
-    <mime-type>application/x-dvi</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>eps</extension>
-    <mime-type>application/postscript</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>etx</extension>
-    <mime-type>text/x-setext</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>exe</extension>
-    <mime-type>application/octet-stream</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>gif</extension>
-    <mime-type>image/gif</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>gtar</extension>
-    <mime-type>application/x-gtar</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>gz</extension>
-    <mime-type>application/x-gzip</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>hdf</extension>
-    <mime-type>application/x-hdf</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>htc</extension>
-    <mime-type>text/x-component</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>htm</extension>
-    <mime-type>text/html</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>html</extension>
-    <mime-type>text/html</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>hqx</extension>
-    <mime-type>application/mac-binhex40</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>ico</extension>
-    <mime-type>image/x-icon</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>ief</extension>
-    <mime-type>image/ief</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>jad</extension>
-    <mime-type>text/vnd.sun.j2me.app-descriptor</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>jar</extension>
-    <mime-type>application/java-archive</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>java</extension>
-    <mime-type>text/plain</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>jnlp</extension>
-    <mime-type>application/x-java-jnlp-file</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>jpe</extension>
-    <mime-type>image/jpeg</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>jpeg</extension>
-    <mime-type>image/jpeg</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>jpg</extension>
-    <mime-type>image/jpeg</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>js</extension>
-    <mime-type>text/javascript</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>jsf</extension>
-    <mime-type>text/plain</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>jspf</extension>
-    <mime-type>text/plain</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>kar</extension>
-    <mime-type>audio/midi</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>latex</extension>
-    <mime-type>application/x-latex</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>m3u</extension>
-    <mime-type>audio/x-mpegurl</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mac</extension>
-    <mime-type>image/x-macpaint</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>man</extension>
-    <mime-type>application/x-troff-man</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mathml</extension>
-    <mime-type>application/mathml+xml</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>me</extension>
-    <mime-type>application/x-troff-me</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mid</extension>
-    <mime-type>audio/midi</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>midi</extension>
-    <mime-type>audio/midi</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mif</extension>
-    <mime-type>application/vnd.mif</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mov</extension>
-    <mime-type>video/quicktime</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>movie</extension>
-    <mime-type>video/x-sgi-movie</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mp1</extension>
-    <mime-type>audio/x-mpeg</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mp2</extension>
-    <mime-type>audio/mpeg</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mp3</extension>
-    <mime-type>audio/mpeg</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mpa</extension>
-    <mime-type>audio/x-mpeg</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mpe</extension>
-    <mime-type>video/mpeg</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mpeg</extension>
-    <mime-type>video/mpeg</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mpega</extension>
-    <mime-type>audio/x-mpeg</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mpg</extension>
-    <mime-type>video/mpeg</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>mpv2</extension>
-    <mime-type>video/mpeg2</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>ms</extension>
-    <mime-type>application/x-troff-ms</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>nc</extension>
-    <mime-type>application/x-netcdf</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>oda</extension>
-    <mime-type>application/oda</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <!-- OpenDocument Database -->
-    <extension>odb</extension>
-    <mime-type>application/vnd.oasis.opendocument.database</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <!-- OpenDocument Chart -->
-    <extension>odc</extension>
-    <mime-type>application/vnd.oasis.opendocument.chart</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <!-- OpenDocument Formula -->
-    <extension>odf</extension>
-    <mime-type>application/vnd.oasis.opendocument.formula</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <!-- OpenDocument Drawing -->
-    <extension>odg</extension>
-    <mime-type>application/vnd.oasis.opendocument.graphics</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <!-- OpenDocument Image -->
-    <extension>odi</extension>
-    <mime-type>application/vnd.oasis.opendocument.image</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <!-- OpenDocument Master Document -->
-    <extension>odm</extension>
-    <mime-type>application/vnd.oasis.opendocument.text-master</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <!-- OpenDocument Presentation -->
-    <extension>odp</extension>
-    <mime-type>application/vnd.oasis.opendocument.presentation</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <!-- OpenDocument Spreadsheet -->
-    <extension>ods</extension>
-    <mime-type>application/vnd.oasis.opendocument.spreadsheet</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <!-- OpenDocument Text -->
-    <extension>odt</extension>
-    <mime-type>application/vnd.oasis.opendocument.text</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>ogg</extension>
-    <mime-type>application/ogg</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <!-- OpenDocument Drawing Template -->
-    <extension>otg</extension>
-    <mime-type>application/vnd.oasis.opendocument.graphics-template</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <!-- HTML Document Template -->
-    <extension>oth</extension>
-    <mime-type>application/vnd.oasis.opendocument.text-web</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <!-- OpenDocument Presentation Template -->
-    <extension>otp</extension>
-    <mime-type>application/vnd.oasis.opendocument.presentation-template</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <!-- OpenDocument Spreadsheet Template -->
-    <extension>ots</extension>
-    <mime-type>application/vnd.oasis.opendocument.spreadsheet-template</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <!-- OpenDocument Text Template -->
-    <extension>ott</extension>
-    <mime-type>application/vnd.oasis.opendocument.text-template</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>pbm</extension>
-    <mime-type>image/x-portable-bitmap</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>pct</extension>
-    <mime-type>image/pict</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>pdf</extension>
-    <mime-type>application/pdf</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>pgm</extension>
-    <mime-type>image/x-portable-graymap</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>pic</extension>
-    <mime-type>image/pict</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>pict</extension>
-    <mime-type>image/pict</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>pls</extension>
-    <mime-type>audio/x-scpls</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>png</extension>
-    <mime-type>image/png</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>pnm</extension>
-    <mime-type>image/x-portable-anymap</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>pnt</extension>
-    <mime-type>image/x-macpaint</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>ppm</extension>
-    <mime-type>image/x-portable-pixmap</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>pps</extension>
-    <mime-type>application/vnd.ms-powerpoint</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>ppt</extension>
-    <mime-type>application/vnd.ms-powerpoint</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>ps</extension>
-    <mime-type>application/postscript</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>psd</extension>
-    <mime-type>image/x-photoshop</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>qt</extension>
-    <mime-type>video/quicktime</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>qti</extension>
-    <mime-type>image/x-quicktime</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>qtif</extension>
-    <mime-type>image/x-quicktime</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>ras</extension>
-    <mime-type>image/x-cmu-raster</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>rdf</extension>
-    <mime-type>application/rdf+xml</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>rgb</extension>
-    <mime-type>image/x-rgb</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>rm</extension>
-    <mime-type>application/vnd.rn-realmedia</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>roff</extension>
-    <mime-type>application/x-troff</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>rtf</extension>
-    <mime-type>text/rtf</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>rtx</extension>
-    <mime-type>text/richtext</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>sh</extension>
-    <mime-type>application/x-sh</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>shar</extension>
-    <mime-type>application/x-shar</mime-type>
-  </mime-mapping>
-  <!--
-      <mime-mapping>
-          <extension>shtml</extension>
-          <mime-type>text/x-server-parsed-html</mime-type>
-      </mime-mapping>
-  -->
-  <mime-mapping>
-    <extension>smf</extension>
-    <mime-type>audio/x-midi</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>sit</extension>
-    <mime-type>application/x-stuffit</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>snd</extension>
-    <mime-type>audio/basic</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>src</extension>
-    <mime-type>application/x-wais-source</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>sv4cpio</extension>
-    <mime-type>application/x-sv4cpio</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>sv4crc</extension>
-    <mime-type>application/x-sv4crc</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>svg</extension>
-    <mime-type>image/svg+xml</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>svgz</extension>
-    <mime-type>image/svg</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>swf</extension>
-    <mime-type>application/x-shockwave-flash</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>t</extension>
-    <mime-type>application/x-troff</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>tar</extension>
-    <mime-type>application/x-tar</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>tcl</extension>
-    <mime-type>application/x-tcl</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>tex</extension>
-    <mime-type>application/x-tex</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>texi</extension>
-    <mime-type>application/x-texinfo</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>texinfo</extension>
-    <mime-type>application/x-texinfo</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>tif</extension>
-    <mime-type>image/tiff</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>tiff</extension>
-    <mime-type>image/tiff</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>tr</extension>
-    <mime-type>application/x-troff</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>tsv</extension>
-    <mime-type>text/tab-separated-values</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>txt</extension>
-    <mime-type>text/plain</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>ulw</extension>
-    <mime-type>audio/basic</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>ustar</extension>
-    <mime-type>application/x-ustar</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>vrml</extension>
-    <mime-type>model/vrml</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>vsd</extension>
-    <mime-type>application/x-visio</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>vxml</extension>
-    <mime-type>application/voicexml+xml</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>wav</extension>
-    <mime-type>audio/x-wav</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <!-- Wireless Bitmap -->
-    <extension>wbmp</extension>
-    <mime-type>image/vnd.wap.wbmp</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <!-- WML Source -->
-    <extension>wml</extension>
-    <mime-type>text/vnd.wap.wml</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <!-- Compiled WML -->
-    <extension>wmlc</extension>
-    <mime-type>application/vnd.wap.wmlc</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <!-- WML Script Source -->
-    <extension>wmls</extension>
-    <mime-type>text/vnd.wap.wmlscript</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <!-- Compiled WML Script -->
-    <extension>wmlscriptc</extension>
-    <mime-type>application/vnd.wap.wmlscriptc</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>wrl</extension>
-    <mime-type>model/vrml</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>xbm</extension>
-    <mime-type>image/x-xbitmap</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>xht</extension>
-    <mime-type>application/xhtml+xml</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>xhtml</extension>
-    <mime-type>application/xhtml+xml</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>xls</extension>
-    <mime-type>application/vnd.ms-excel</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>xml</extension>
-    <mime-type>application/xml</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>xpm</extension>
-    <mime-type>image/x-xpixmap</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>xsl</extension>
-    <mime-type>application/xml</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>xslt</extension>
-    <mime-type>application/xslt+xml</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>xul</extension>
-    <mime-type>application/vnd.mozilla.xul+xml</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>xwd</extension>
-    <mime-type>image/x-xwindowdump</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>Z</extension>
-    <mime-type>application/x-compress</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>z</extension>
-    <mime-type>application/x-compress</mime-type>
-  </mime-mapping>
-  <mime-mapping>
-    <extension>zip</extension>
-    <mime-type>application/zip</mime-type>
-  </mime-mapping>
-
-  <!-- ==================== Default Welcome File List ===================== -->
-  <!-- When a request URI refers to a directory, the default servlet looks  -->
-  <!-- for a "welcome file" within that directory and, if present,          -->
-  <!-- to the corresponding resource URI for display.  If no welcome file   -->
-  <!-- is present, the default servlet either serves a directory listing,   -->
-  <!-- or returns a 404 status, depending on how it is configured.          -->
-  <!--                                                                      -->
-  <!-- If you define welcome files in your own application's web.xml        -->
-  <!-- deployment descriptor, that list *replaces* the list configured      -->
-  <!-- here, so be sure that you include any of the default values that     -->
-  <!-- you wish to include.                                                 -->
-
-  <welcome-file-list>
-    <welcome-file>index.html</welcome-file>
-    <welcome-file>index.htm</welcome-file>
-    <welcome-file>index.jsp</welcome-file>
-  </welcome-file-list>
-
-</web-app>