From: Joakim Erdfelt Date: Thu, 22 Mar 2007 21:06:07 +0000 (+0000) Subject: More directory moves X-Git-Tag: archiva-1.0-alpha-1~113^2~101 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=10a02b2cb1b5ad3583842c6602a6dd11a6ae95f0;p=archiva.git More directory moves git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/branches/archiva-jpox-database-refactor@521466 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/archiva-plexus-application/pom.xml b/archiva-plexus-application/pom.xml deleted file mode 100644 index 29e01dd28..000000000 --- a/archiva-plexus-application/pom.xml +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - archiva - org.apache.maven.archiva - 1.0-SNAPSHOT - - 4.0.0 - archiva-plexus-application - plexus-application - Archiva Plexus Application - - - - org.codehaus.plexus - plexus-appserver-maven-plugin - 2.0-alpha-8-SNAPSHOT - true - - src/conf/application.xml - src/conf - src/plexus.properties - archiva - src/conf/plexus.xml - src/plexus.properties - target/plexus-archiva-runtime - - - - - - - org.apache.maven.archiva - archiva-webapp - war - - - - - ${project.version} - - diff --git a/archiva-plexus-application/src/conf/application.xml b/archiva-plexus-application/src/conf/application.xml deleted file mode 100644 index 37fcd4e36..000000000 --- a/archiva-plexus-application/src/conf/application.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - jetty - - - - ${plexus.home}/lib/archiva-webapp-@archivaVersion@.war - /archiva - ${plexus.home}/webapp - true - - - 8080 - - - - - - - - - - diff --git a/archiva-plexus-application/src/conf/plexus.xml b/archiva-plexus-application/src/conf/plexus.xml deleted file mode 100644 index 3c9ebd89a..000000000 --- a/archiva-plexus-application/src/conf/plexus.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - diff --git a/archiva-plexus-application/src/plexus.properties b/archiva-plexus-application/src/plexus.properties deleted file mode 100644 index 3451f745c..000000000 --- a/archiva-plexus-application/src/plexus.properties +++ /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 index 3e93c782d..000000000 --- a/archiva-plexus-runtime/pom.xml +++ /dev/null @@ -1,168 +0,0 @@ - - - - - - org.apache.maven.archiva - archiva - 1.0-SNAPSHOT - - 4.0.0 - archiva-plexus-runtime - Archiva Runtime Generator - - - org.codehaus.plexus - plexus-component-api - - - org.codehaus.plexus - plexus-container-default - - - org.codehaus.plexus - plexus-utils - - - org.codehaus.plexus - plexus-appserver-host - 2.0-alpha-8-SNAPSHOT - - - - org.codehaus.plexus - plexus-appserver-service-jetty - 2.0-alpha-8-SNAPSHOT - plexus-service - - - - org.apache.maven.archiva - archiva-plexus-application - ${project.version} - plexus-application - - - - - log4j - log4j - 1.2.8 - - - commons-logging - commons-logging-api - 1.0.4 - - - org.apache.derby - derby - runtime - - - org.codehaus.plexus - plexus-naming - 1.0-alpha-3 - runtime - - - javax.mail - mail - 1.4 - runtime - - - - - - org.codehaus.plexus - plexus-appserver-maven-plugin - 2.0-alpha-8-SNAPSHOT - true - - - process-resources - - assemble-runtime - add-services - add-apps - - - - - src/conf/plexus.xml - src/plexus.properties - target/plexus-archiva-runtime - - commons-logging:commons-logging-api - log4j:log4j - org.apache.derby:derby - org.codehaus.plexus:plexus-naming - commons-pool:commons-pool - commons-dbcp:commons-dbcp - commons-collections:commons-collections - directory-naming:naming-core - directory-naming:naming-factory - directory-naming:naming-java - directory-naming:naming-config - javax.mail:mail - javax.activation:activation - - - - - maven-assembly-plugin - 2.1 - - - package - - single - - - - - src/main/assembly/bin.xml - archiva - - - - maven-antrun-plugin - - - config - process-resources - - - - - - - - - run - - - - - - - diff --git a/archiva-plexus-runtime/src/conf/plexus.xml b/archiva-plexus-runtime/src/conf/plexus.xml deleted file mode 100644 index 87a99722b..000000000 --- a/archiva-plexus-runtime/src/conf/plexus.xml +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - org.codehaus.plexus.naming.Naming - dataSources - - - - - org.codehaus.plexus.naming.Naming - org.codehaus.plexus.naming.DefaultNaming - dataSources - - - - - - mail/Session - javax.mail.Session - - - mail.smtp.host - localhost - - - mail.smtp.port - 25 - - - - - - jdbc/users - javax.sql.DataSource - - - driverClassName - org.apache.derby.jdbc.EmbeddedDriver - - - url - jdbc:derby:${plexus.home}/data/users/database;create=true - - - username - sa - - - password - - - - - - jdbc/archiva - javax.sql.DataSource - - - driverClassName - org.apache.derby.jdbc.EmbeddedDriver - - - url - jdbc:derby:${plexus.home}/data/archiva/database;create=true - - - username - sa - - - password - - - - - - - - - - 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 index 9afb83352..000000000 --- a/archiva-plexus-runtime/src/main/appserver/conf/archiva.xml +++ /dev/null @@ -1 +0,0 @@ - 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 index 9afb83352..000000000 --- a/archiva-plexus-runtime/src/main/appserver/conf/shared.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/archiva-plexus-runtime/src/main/assembly/bin.xml b/archiva-plexus-runtime/src/main/assembly/bin.xml deleted file mode 100644 index 42484eff1..000000000 --- a/archiva-plexus-runtime/src/main/assembly/bin.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - bin - - tar.gz - - - - - target/plexus-archiva-runtime/apps - apps - - - target/plexus-archiva-runtime/conf - conf - - - target/plexus-archiva-runtime/core - core - - - target/plexus-archiva-runtime/logs - logs - - - target/plexus-archiva-runtime/services - services - - - target/plexus-archiva-runtime/temp - temp - - - target/plexus-archiva-runtime/bin - bin - - **/*.sh - - unix - 0755 - - - target/plexus-archiva-runtime/bin - bin - - */wrapper.conf - - - - target/plexus-archiva-runtime/bin - bin - - */libwrapper.jnilib - */libwrapper.so - */wrapper - */wrapper.exe - */wrapper.dll - - 0755 - - - target/plexus-archiva-runtime/bin - bin - - **/*.bat - - 0755 - dos - - - - diff --git a/archiva-plexus-runtime/src/plexus.properties b/archiva-plexus-runtime/src/plexus.properties deleted file mode 100644 index 3451f745c..000000000 --- a/archiva-plexus-runtime/src/plexus.properties +++ /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 index 000000000..29e01dd28 --- /dev/null +++ b/archiva-web/archiva-standalone/archiva-plexus-application/pom.xml @@ -0,0 +1,62 @@ + + + + + + archiva + org.apache.maven.archiva + 1.0-SNAPSHOT + + 4.0.0 + archiva-plexus-application + plexus-application + Archiva Plexus Application + + + + org.codehaus.plexus + plexus-appserver-maven-plugin + 2.0-alpha-8-SNAPSHOT + true + + src/conf/application.xml + src/conf + src/plexus.properties + archiva + src/conf/plexus.xml + src/plexus.properties + target/plexus-archiva-runtime + + + + + + + org.apache.maven.archiva + archiva-webapp + war + + + + + ${project.version} + + 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 index 000000000..37fcd4e36 --- /dev/null +++ b/archiva-web/archiva-standalone/archiva-plexus-application/src/conf/application.xml @@ -0,0 +1,51 @@ + + + + + + + + jetty + + + + ${plexus.home}/lib/archiva-webapp-@archivaVersion@.war + /archiva + ${plexus.home}/webapp + true + + + 8080 + + + + + + + + + + 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 index 000000000..3c9ebd89a --- /dev/null +++ b/archiva-web/archiva-standalone/archiva-plexus-application/src/conf/plexus.xml @@ -0,0 +1,21 @@ + + + + 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 index 000000000..3451f745c --- /dev/null +++ b/archiva-web/archiva-standalone/archiva-plexus-application/src/plexus.properties @@ -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 index 000000000..3e93c782d --- /dev/null +++ b/archiva-web/archiva-standalone/archiva-plexus-runtime/pom.xml @@ -0,0 +1,168 @@ + + + + + + org.apache.maven.archiva + archiva + 1.0-SNAPSHOT + + 4.0.0 + archiva-plexus-runtime + Archiva Runtime Generator + + + org.codehaus.plexus + plexus-component-api + + + org.codehaus.plexus + plexus-container-default + + + org.codehaus.plexus + plexus-utils + + + org.codehaus.plexus + plexus-appserver-host + 2.0-alpha-8-SNAPSHOT + + + + org.codehaus.plexus + plexus-appserver-service-jetty + 2.0-alpha-8-SNAPSHOT + plexus-service + + + + org.apache.maven.archiva + archiva-plexus-application + ${project.version} + plexus-application + + + + + log4j + log4j + 1.2.8 + + + commons-logging + commons-logging-api + 1.0.4 + + + org.apache.derby + derby + runtime + + + org.codehaus.plexus + plexus-naming + 1.0-alpha-3 + runtime + + + javax.mail + mail + 1.4 + runtime + + + + + + org.codehaus.plexus + plexus-appserver-maven-plugin + 2.0-alpha-8-SNAPSHOT + true + + + process-resources + + assemble-runtime + add-services + add-apps + + + + + src/conf/plexus.xml + src/plexus.properties + target/plexus-archiva-runtime + + commons-logging:commons-logging-api + log4j:log4j + org.apache.derby:derby + org.codehaus.plexus:plexus-naming + commons-pool:commons-pool + commons-dbcp:commons-dbcp + commons-collections:commons-collections + directory-naming:naming-core + directory-naming:naming-factory + directory-naming:naming-java + directory-naming:naming-config + javax.mail:mail + javax.activation:activation + + + + + maven-assembly-plugin + 2.1 + + + package + + single + + + + + src/main/assembly/bin.xml + archiva + + + + maven-antrun-plugin + + + config + process-resources + + + + + + + + + run + + + + + + + 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 index 000000000..87a99722b --- /dev/null +++ b/archiva-web/archiva-standalone/archiva-plexus-runtime/src/conf/plexus.xml @@ -0,0 +1,113 @@ + + + + + + + org.codehaus.plexus.naming.Naming + dataSources + + + + + org.codehaus.plexus.naming.Naming + org.codehaus.plexus.naming.DefaultNaming + dataSources + + + + + + mail/Session + javax.mail.Session + + + mail.smtp.host + localhost + + + mail.smtp.port + 25 + + + + + + jdbc/users + javax.sql.DataSource + + + driverClassName + org.apache.derby.jdbc.EmbeddedDriver + + + url + jdbc:derby:${plexus.home}/data/users/database;create=true + + + username + sa + + + password + + + + + + jdbc/archiva + javax.sql.DataSource + + + driverClassName + org.apache.derby.jdbc.EmbeddedDriver + + + url + jdbc:derby:${plexus.home}/data/archiva/database;create=true + + + username + sa + + + password + + + + + + + + + + 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 index 000000000..9afb83352 --- /dev/null +++ b/archiva-web/archiva-standalone/archiva-plexus-runtime/src/main/appserver/conf/archiva.xml @@ -0,0 +1 @@ + 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 index 000000000..9afb83352 --- /dev/null +++ b/archiva-web/archiva-standalone/archiva-plexus-runtime/src/main/appserver/conf/shared.xml @@ -0,0 +1 @@ + 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 index 000000000..42484eff1 --- /dev/null +++ b/archiva-web/archiva-standalone/archiva-plexus-runtime/src/main/assembly/bin.xml @@ -0,0 +1,90 @@ + + + + bin + + tar.gz + + + + + target/plexus-archiva-runtime/apps + apps + + + target/plexus-archiva-runtime/conf + conf + + + target/plexus-archiva-runtime/core + core + + + target/plexus-archiva-runtime/logs + logs + + + target/plexus-archiva-runtime/services + services + + + target/plexus-archiva-runtime/temp + temp + + + target/plexus-archiva-runtime/bin + bin + + **/*.sh + + unix + 0755 + + + target/plexus-archiva-runtime/bin + bin + + */wrapper.conf + + + + target/plexus-archiva-runtime/bin + bin + + */libwrapper.jnilib + */libwrapper.so + */wrapper + */wrapper.exe + */wrapper.dll + + 0755 + + + target/plexus-archiva-runtime/bin + bin + + **/*.bat + + 0755 + dos + + + + 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 index 000000000..3451f745c --- /dev/null +++ b/archiva-web/archiva-standalone/archiva-plexus-runtime/src/plexus.properties @@ -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 index 000000000..264f6eff3 --- /dev/null +++ b/archiva-web/archiva-webapp-test/pom.xml @@ -0,0 +1,241 @@ + + + + + 4.0.0 + + org.apache.maven.archiva + archiva + 1.0-SNAPSHOT + + archiva-webapp-test + pom + Archiva Web Application Tests + + + org.apache.maven.archiva + archiva-webapp + ${project.version} + war + + + org.apache.maven.shared + maven-web-ui-tests + 1.0-SNAPSHOT + test + + + + + src/test/it + + + org.codehaus.mojo + dependency-maven-plugin + + + unzip-archiva-webapp + generate-resources + + unpack + + + + + ${project.groupId} + archiva-webapp + ${project.version} + war + + + ${project.build.directory}/${container.name}conf/webapps/archiva + + + + + + maven-antrun-plugin + + + copy-container-conf + package + + + + + + + + + + + + + + run + + + + check-archiva-loaded + integration-test + + + + + + + + run + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + + testCompile + + + + + + org.codehaus.mojo + selenium-maven-plugin + 1.0-SNAPSHOT + + + start-selenium + pre-integration-test + + start-server + + + + + true + + + + org.codehaus.cargo + cargo-maven2-plugin + + + start-container + pre-integration-test + + start + + + + stop-container + post-integration-test + + stop + + + + + false + + ${container.name} + + ${container.url} + ${project.build.directory}/installs/${container.name} + + ${project.build.directory}/logs/${container.name}.log + ${project.build.directory}/logs/${container.name}.out + 600000 + + ${project.build.directory} + + + + ${project.build.directory}/${container.name}conf + existing + + 9696 + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + integration-test + + test + + + + + + + browser + ${browser} + + + + + + + + + + tomcat5x + + true + + + tomcat5x + http://apache.multidist.com/tomcat/tomcat-5/v5.5.20/bin/apache-tomcat-5.5.20.zip + + + + + firefox + + true + + + *firefox + + + + iexplore + + *iexplore + + + + otherbrowser + + *custom ${browserPath} + + + + + \ 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 index 000000000..63510c7b1 --- /dev/null +++ b/archiva-web/archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/AbstractArchivaTestCase.java @@ -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 index 000000000..03093d37e --- /dev/null +++ b/archiva-web/archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/LoginTest.java @@ -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 index 000000000..af0692056 --- /dev/null +++ b/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/archiva.xml @@ -0,0 +1,30 @@ + + + + + + + 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 index 000000000..e41e1a918 --- /dev/null +++ b/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/host-manager.xml @@ -0,0 +1,32 @@ + + + + + + + + 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 index 000000000..29abc9f1c --- /dev/null +++ b/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/manager.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + 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 index 000000000..53a6c90e2 --- /dev/null +++ b/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/catalina.policy @@ -0,0 +1,172 @@ +// ============================================================================ +// catalina.corepolicy - Security Policy Permissions for Tomcat 5 +// +// This file contains a default set of security policies to be enforced (by the +// JVM) when Catalina is executed with the "-security" option. In addition +// to the permissions granted here, the following additional permissions are +// granted to the codebase specific to each web application: +// +// * Read access to the document root directory +// +// $Id: catalina.policy 393732 2006-04-13 06:32:25Z pero $ +// ============================================================================ + + +// ========== SYSTEM CODE PERMISSIONS ========================================= + + +// These permissions apply to javac +grant codeBase "file:${java.home}/lib/-" { + permission java.security.AllPermission; +}; + +// These permissions apply to all shared system extensions +grant codeBase "file:${java.home}/jre/lib/ext/-" { + permission java.security.AllPermission; +}; + +// These permissions apply to javac when ${java.home] points at $JAVA_HOME/jre +grant codeBase "file:${java.home}/../lib/-" { + permission java.security.AllPermission; +}; + +// These permissions apply to all shared system extensions when +// ${java.home} points at $JAVA_HOME/jre +grant codeBase "file:${java.home}/lib/ext/-" { + permission java.security.AllPermission; +}; + + +// ========== CATALINA CODE PERMISSIONS ======================================= + + +// These permissions apply to the launcher code +grant codeBase "file:${catalina.home}/bin/commons-launcher.jar" { + permission java.security.AllPermission; +}; + +// These permissions apply to the daemon code +grant codeBase "file:${catalina.home}/bin/commons-daemon.jar" { + permission java.security.AllPermission; +}; + +// These permissions apply to the commons-logging API +grant codeBase "file:${catalina.home}/bin/commons-logging-api.jar" { + permission java.security.AllPermission; +}; + +// These permissions apply to the server startup code +grant codeBase "file:${catalina.home}/bin/bootstrap.jar" { + permission java.security.AllPermission; +}; + +// These permissions apply to the JMX server +grant codeBase "file:${catalina.home}/bin/jmx.jar" { + permission java.security.AllPermission; +}; + +// These permissions apply to JULI +grant codeBase "file:${catalina.home}/bin/tomcat-juli.jar" { + permission java.security.AllPermission; +}; + +// These permissions apply to the servlet API classes +// and those that are shared across all class loaders +// located in the "common" directory +grant codeBase "file:${catalina.home}/common/-" { + permission java.security.AllPermission; +}; + +// These permissions apply to the container's core code, plus any additional +// libraries installed in the "server" directory +grant codeBase "file:${catalina.home}/server/-" { + permission java.security.AllPermission; +}; + +// The permissions granted to the balancer WEB-INF/classes and WEB-INF/lib directory +grant codeBase "file:${catalina.home}/webapps/balancer/-" { + permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.util.digester"; + permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.util.digester.*"; +}; +// ========== WEB APPLICATION PERMISSIONS ===================================== + + +// These permissions are granted by default to all web applications +// In addition, a web application will be given a read FilePermission +// and JndiPermission for all files and directories in its document root. +grant { + // Required for JNDI lookup of named JDBC DataSource's and + // javamail named MimePart DataSource used to send mail + permission java.util.PropertyPermission "java.home", "read"; + permission java.util.PropertyPermission "java.naming.*", "read"; + permission java.util.PropertyPermission "javax.sql.*", "read"; + + // OS Specific properties to allow read access + permission java.util.PropertyPermission "os.name", "read"; + permission java.util.PropertyPermission "os.version", "read"; + permission java.util.PropertyPermission "os.arch", "read"; + permission java.util.PropertyPermission "file.separator", "read"; + permission java.util.PropertyPermission "path.separator", "read"; + permission java.util.PropertyPermission "line.separator", "read"; + + // JVM properties to allow read access + permission java.util.PropertyPermission "java.version", "read"; + permission java.util.PropertyPermission "java.vendor", "read"; + permission java.util.PropertyPermission "java.vendor.url", "read"; + permission java.util.PropertyPermission "java.class.version", "read"; + permission java.util.PropertyPermission "java.specification.version", "read"; + permission java.util.PropertyPermission "java.specification.vendor", "read"; + permission java.util.PropertyPermission "java.specification.name", "read"; + + permission java.util.PropertyPermission "java.vm.specification.version", "read"; + permission java.util.PropertyPermission "java.vm.specification.vendor", "read"; + permission java.util.PropertyPermission "java.vm.specification.name", "read"; + permission java.util.PropertyPermission "java.vm.version", "read"; + permission java.util.PropertyPermission "java.vm.vendor", "read"; + permission java.util.PropertyPermission "java.vm.name", "read"; + + // Required for OpenJMX + permission java.lang.RuntimePermission "getAttribute"; + + // Allow read of JAXP compliant XML parser debug + permission java.util.PropertyPermission "jaxp.debug", "read"; + + // Precompiled JSPs need access to this package. + permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime"; + permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime.*"; + +}; + + +// You can assign additional permissions to particular web applications by +// adding additional "grant" entries here, based on the code base for that +// application, /WEB-INF/classes/, or /WEB-INF/lib/ jar files. +// +// Different permissions can be granted to JSP pages, classes loaded from +// the /WEB-INF/classes/ directory, all jar files in the /WEB-INF/lib/ +// directory, or even to individual jar files in the /WEB-INF/lib/ directory. +// +// For instance, assume that the standard "examples" application +// included a JDBC driver that needed to establish a network connection to the +// corresponding database and used the scrape taglib to get the weather from +// the NOAA web server. You might create a "grant" entries like this: +// +// The permissions granted to the context root directory apply to JSP pages. +// grant codeBase "file:${catalina.home}/webapps/examples/-" { +// permission java.net.SocketPermission "dbhost.mycompany.com:5432", "connect"; +// permission java.net.SocketPermission "*.noaa.gov:80", "connect"; +// }; +// +// The permissions granted to the context WEB-INF/classes directory +// grant codeBase "file:${catalina.home}/webapps/examples/WEB-INF/classes/-" { +// }; +// +// The permission granted to your JDBC driver +// grant codeBase "jar:file:${catalina.home}/webapps/examples/WEB-INF/lib/driver.jar!/-" { +// permission java.net.SocketPermission "dbhost.mycompany.com:5432", "connect"; +// }; +// The permission granted to the scrape taglib +// grant codeBase "jar:file:${catalina.home}/webapps/examples/WEB-INF/lib/scrape.jar!/-" { +// permission java.net.SocketPermission "*.noaa.gov:80", "connect"; +// }; + 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 index 000000000..3e937aced --- /dev/null +++ b/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/catalina.properties @@ -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 index 000000000..895adb9b1 --- /dev/null +++ b/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/context.xml @@ -0,0 +1,31 @@ + + + + + + + WEB-INF/web.xml + + + + + \ 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 index 000000000..07f85e265 --- /dev/null +++ b/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/logging.properties @@ -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 index 000000000..316475801 --- /dev/null +++ b/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/server-minimal.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + 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 index 000000000..22a041059 --- /dev/null +++ b/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/server.xml @@ -0,0 +1,384 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 index 000000000..472566645 --- /dev/null +++ b/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/tomcat-users.xml @@ -0,0 +1,29 @@ + + + + + + + + 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 index 000000000..0263f1e46 --- /dev/null +++ b/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/web.xml @@ -0,0 +1,1183 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + default + org.apache.catalina.servlets.DefaultServlet + + debug + 0 + + + listings + false + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + jsp + org.apache.jasper.servlet.JspServlet + + fork + false + + + xpoweredBy + false + + 3 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + default + / + + + + + + + + jsp + *.jsp + + + + jsp + *.jspx + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 30 + + + + + + + + + + + + abs + audio/x-mpeg + + + ai + application/postscript + + + aif + audio/x-aiff + + + aifc + audio/x-aiff + + + aiff + audio/x-aiff + + + aim + application/x-aim + + + art + image/x-jg + + + asf + video/x-ms-asf + + + asx + video/x-ms-asf + + + au + audio/basic + + + avi + video/x-msvideo + + + avx + video/x-rad-screenplay + + + bcpio + application/x-bcpio + + + bin + application/octet-stream + + + bmp + image/bmp + + + body + text/html + + + cdf + application/x-netcdf + + + cer + application/x-x509-ca-cert + + + class + application/java + + + cpio + application/x-cpio + + + csh + application/x-csh + + + css + text/css + + + dib + image/bmp + + + doc + application/msword + + + dtd + application/xml-dtd + + + dv + video/x-dv + + + dvi + application/x-dvi + + + eps + application/postscript + + + etx + text/x-setext + + + exe + application/octet-stream + + + gif + image/gif + + + gtar + application/x-gtar + + + gz + application/x-gzip + + + hdf + application/x-hdf + + + htc + text/x-component + + + htm + text/html + + + html + text/html + + + hqx + application/mac-binhex40 + + + ico + image/x-icon + + + ief + image/ief + + + jad + text/vnd.sun.j2me.app-descriptor + + + jar + application/java-archive + + + java + text/plain + + + jnlp + application/x-java-jnlp-file + + + jpe + image/jpeg + + + jpeg + image/jpeg + + + jpg + image/jpeg + + + js + text/javascript + + + jsf + text/plain + + + jspf + text/plain + + + kar + audio/midi + + + latex + application/x-latex + + + m3u + audio/x-mpegurl + + + mac + image/x-macpaint + + + man + application/x-troff-man + + + mathml + application/mathml+xml + + + me + application/x-troff-me + + + mid + audio/midi + + + midi + audio/midi + + + mif + application/vnd.mif + + + mov + video/quicktime + + + movie + video/x-sgi-movie + + + mp1 + audio/x-mpeg + + + mp2 + audio/mpeg + + + mp3 + audio/mpeg + + + mpa + audio/x-mpeg + + + mpe + video/mpeg + + + mpeg + video/mpeg + + + mpega + audio/x-mpeg + + + mpg + video/mpeg + + + mpv2 + video/mpeg2 + + + ms + application/x-troff-ms + + + nc + application/x-netcdf + + + oda + application/oda + + + + odb + application/vnd.oasis.opendocument.database + + + + odc + application/vnd.oasis.opendocument.chart + + + + odf + application/vnd.oasis.opendocument.formula + + + + odg + application/vnd.oasis.opendocument.graphics + + + + odi + application/vnd.oasis.opendocument.image + + + + odm + application/vnd.oasis.opendocument.text-master + + + + odp + application/vnd.oasis.opendocument.presentation + + + + ods + application/vnd.oasis.opendocument.spreadsheet + + + + odt + application/vnd.oasis.opendocument.text + + + ogg + application/ogg + + + + otg + application/vnd.oasis.opendocument.graphics-template + + + + oth + application/vnd.oasis.opendocument.text-web + + + + otp + application/vnd.oasis.opendocument.presentation-template + + + + ots + application/vnd.oasis.opendocument.spreadsheet-template + + + + ott + application/vnd.oasis.opendocument.text-template + + + pbm + image/x-portable-bitmap + + + pct + image/pict + + + pdf + application/pdf + + + pgm + image/x-portable-graymap + + + pic + image/pict + + + pict + image/pict + + + pls + audio/x-scpls + + + png + image/png + + + pnm + image/x-portable-anymap + + + pnt + image/x-macpaint + + + ppm + image/x-portable-pixmap + + + pps + application/vnd.ms-powerpoint + + + ppt + application/vnd.ms-powerpoint + + + ps + application/postscript + + + psd + image/x-photoshop + + + qt + video/quicktime + + + qti + image/x-quicktime + + + qtif + image/x-quicktime + + + ras + image/x-cmu-raster + + + rdf + application/rdf+xml + + + rgb + image/x-rgb + + + rm + application/vnd.rn-realmedia + + + roff + application/x-troff + + + rtf + text/rtf + + + rtx + text/richtext + + + sh + application/x-sh + + + shar + application/x-shar + + + + smf + audio/x-midi + + + sit + application/x-stuffit + + + snd + audio/basic + + + src + application/x-wais-source + + + sv4cpio + application/x-sv4cpio + + + sv4crc + application/x-sv4crc + + + svg + image/svg+xml + + + svgz + image/svg + + + swf + application/x-shockwave-flash + + + t + application/x-troff + + + tar + application/x-tar + + + tcl + application/x-tcl + + + tex + application/x-tex + + + texi + application/x-texinfo + + + texinfo + application/x-texinfo + + + tif + image/tiff + + + tiff + image/tiff + + + tr + application/x-troff + + + tsv + text/tab-separated-values + + + txt + text/plain + + + ulw + audio/basic + + + ustar + application/x-ustar + + + vrml + model/vrml + + + vsd + application/x-visio + + + vxml + application/voicexml+xml + + + wav + audio/x-wav + + + + wbmp + image/vnd.wap.wbmp + + + + wml + text/vnd.wap.wml + + + + wmlc + application/vnd.wap.wmlc + + + + wmls + text/vnd.wap.wmlscript + + + + wmlscriptc + application/vnd.wap.wmlscriptc + + + wrl + model/vrml + + + xbm + image/x-xbitmap + + + xht + application/xhtml+xml + + + xhtml + application/xhtml+xml + + + xls + application/vnd.ms-excel + + + xml + application/xml + + + xpm + image/x-xpixmap + + + xsl + application/xml + + + xslt + application/xslt+xml + + + xul + application/vnd.mozilla.xul+xml + + + xwd + image/x-xwindowdump + + + Z + application/x-compress + + + z + application/x-compress + + + zip + application/zip + + + + + + + + + + + + + + + + index.html + index.htm + index.jsp + + + diff --git a/archiva-webapp-test/pom.xml b/archiva-webapp-test/pom.xml deleted file mode 100644 index 264f6eff3..000000000 --- a/archiva-webapp-test/pom.xml +++ /dev/null @@ -1,241 +0,0 @@ - - - - - 4.0.0 - - org.apache.maven.archiva - archiva - 1.0-SNAPSHOT - - archiva-webapp-test - pom - Archiva Web Application Tests - - - org.apache.maven.archiva - archiva-webapp - ${project.version} - war - - - org.apache.maven.shared - maven-web-ui-tests - 1.0-SNAPSHOT - test - - - - - src/test/it - - - org.codehaus.mojo - dependency-maven-plugin - - - unzip-archiva-webapp - generate-resources - - unpack - - - - - ${project.groupId} - archiva-webapp - ${project.version} - war - - - ${project.build.directory}/${container.name}conf/webapps/archiva - - - - - - maven-antrun-plugin - - - copy-container-conf - package - - - - - - - - - - - - - - run - - - - check-archiva-loaded - integration-test - - - - - - - - run - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - - testCompile - - - - - - org.codehaus.mojo - selenium-maven-plugin - 1.0-SNAPSHOT - - - start-selenium - pre-integration-test - - start-server - - - - - true - - - - org.codehaus.cargo - cargo-maven2-plugin - - - start-container - pre-integration-test - - start - - - - stop-container - post-integration-test - - stop - - - - - false - - ${container.name} - - ${container.url} - ${project.build.directory}/installs/${container.name} - - ${project.build.directory}/logs/${container.name}.log - ${project.build.directory}/logs/${container.name}.out - 600000 - - ${project.build.directory} - - - - ${project.build.directory}/${container.name}conf - existing - - 9696 - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - integration-test - - test - - - - - - - browser - ${browser} - - - - - - - - - - tomcat5x - - true - - - tomcat5x - http://apache.multidist.com/tomcat/tomcat-5/v5.5.20/bin/apache-tomcat-5.5.20.zip - - - - - firefox - - true - - - *firefox - - - - iexplore - - *iexplore - - - - otherbrowser - - *custom ${browserPath} - - - - - \ 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 index 63510c7b1..000000000 --- a/archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/AbstractArchivaTestCase.java +++ /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 index 03093d37e..000000000 --- a/archiva-webapp-test/src/test/it/org/apache/maven/archiva/web/test/LoginTest.java +++ /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 index af0692056..000000000 --- a/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/archiva.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - 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 index e41e1a918..000000000 --- a/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/host-manager.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - 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 index 29abc9f1c..000000000 --- a/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/manager.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - 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 index 53a6c90e2..000000000 --- a/archiva-webapp-test/src/test/tomcat5x/conf/catalina.policy +++ /dev/null @@ -1,172 +0,0 @@ -// ============================================================================ -// catalina.corepolicy - Security Policy Permissions for Tomcat 5 -// -// This file contains a default set of security policies to be enforced (by the -// JVM) when Catalina is executed with the "-security" option. In addition -// to the permissions granted here, the following additional permissions are -// granted to the codebase specific to each web application: -// -// * Read access to the document root directory -// -// $Id: catalina.policy 393732 2006-04-13 06:32:25Z pero $ -// ============================================================================ - - -// ========== SYSTEM CODE PERMISSIONS ========================================= - - -// These permissions apply to javac -grant codeBase "file:${java.home}/lib/-" { - permission java.security.AllPermission; -}; - -// These permissions apply to all shared system extensions -grant codeBase "file:${java.home}/jre/lib/ext/-" { - permission java.security.AllPermission; -}; - -// These permissions apply to javac when ${java.home] points at $JAVA_HOME/jre -grant codeBase "file:${java.home}/../lib/-" { - permission java.security.AllPermission; -}; - -// These permissions apply to all shared system extensions when -// ${java.home} points at $JAVA_HOME/jre -grant codeBase "file:${java.home}/lib/ext/-" { - permission java.security.AllPermission; -}; - - -// ========== CATALINA CODE PERMISSIONS ======================================= - - -// These permissions apply to the launcher code -grant codeBase "file:${catalina.home}/bin/commons-launcher.jar" { - permission java.security.AllPermission; -}; - -// These permissions apply to the daemon code -grant codeBase "file:${catalina.home}/bin/commons-daemon.jar" { - permission java.security.AllPermission; -}; - -// These permissions apply to the commons-logging API -grant codeBase "file:${catalina.home}/bin/commons-logging-api.jar" { - permission java.security.AllPermission; -}; - -// These permissions apply to the server startup code -grant codeBase "file:${catalina.home}/bin/bootstrap.jar" { - permission java.security.AllPermission; -}; - -// These permissions apply to the JMX server -grant codeBase "file:${catalina.home}/bin/jmx.jar" { - permission java.security.AllPermission; -}; - -// These permissions apply to JULI -grant codeBase "file:${catalina.home}/bin/tomcat-juli.jar" { - permission java.security.AllPermission; -}; - -// These permissions apply to the servlet API classes -// and those that are shared across all class loaders -// located in the "common" directory -grant codeBase "file:${catalina.home}/common/-" { - permission java.security.AllPermission; -}; - -// These permissions apply to the container's core code, plus any additional -// libraries installed in the "server" directory -grant codeBase "file:${catalina.home}/server/-" { - permission java.security.AllPermission; -}; - -// The permissions granted to the balancer WEB-INF/classes and WEB-INF/lib directory -grant codeBase "file:${catalina.home}/webapps/balancer/-" { - permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.util.digester"; - permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.util.digester.*"; -}; -// ========== WEB APPLICATION PERMISSIONS ===================================== - - -// These permissions are granted by default to all web applications -// In addition, a web application will be given a read FilePermission -// and JndiPermission for all files and directories in its document root. -grant { - // Required for JNDI lookup of named JDBC DataSource's and - // javamail named MimePart DataSource used to send mail - permission java.util.PropertyPermission "java.home", "read"; - permission java.util.PropertyPermission "java.naming.*", "read"; - permission java.util.PropertyPermission "javax.sql.*", "read"; - - // OS Specific properties to allow read access - permission java.util.PropertyPermission "os.name", "read"; - permission java.util.PropertyPermission "os.version", "read"; - permission java.util.PropertyPermission "os.arch", "read"; - permission java.util.PropertyPermission "file.separator", "read"; - permission java.util.PropertyPermission "path.separator", "read"; - permission java.util.PropertyPermission "line.separator", "read"; - - // JVM properties to allow read access - permission java.util.PropertyPermission "java.version", "read"; - permission java.util.PropertyPermission "java.vendor", "read"; - permission java.util.PropertyPermission "java.vendor.url", "read"; - permission java.util.PropertyPermission "java.class.version", "read"; - permission java.util.PropertyPermission "java.specification.version", "read"; - permission java.util.PropertyPermission "java.specification.vendor", "read"; - permission java.util.PropertyPermission "java.specification.name", "read"; - - permission java.util.PropertyPermission "java.vm.specification.version", "read"; - permission java.util.PropertyPermission "java.vm.specification.vendor", "read"; - permission java.util.PropertyPermission "java.vm.specification.name", "read"; - permission java.util.PropertyPermission "java.vm.version", "read"; - permission java.util.PropertyPermission "java.vm.vendor", "read"; - permission java.util.PropertyPermission "java.vm.name", "read"; - - // Required for OpenJMX - permission java.lang.RuntimePermission "getAttribute"; - - // Allow read of JAXP compliant XML parser debug - permission java.util.PropertyPermission "jaxp.debug", "read"; - - // Precompiled JSPs need access to this package. - permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime"; - permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime.*"; - -}; - - -// You can assign additional permissions to particular web applications by -// adding additional "grant" entries here, based on the code base for that -// application, /WEB-INF/classes/, or /WEB-INF/lib/ jar files. -// -// Different permissions can be granted to JSP pages, classes loaded from -// the /WEB-INF/classes/ directory, all jar files in the /WEB-INF/lib/ -// directory, or even to individual jar files in the /WEB-INF/lib/ directory. -// -// For instance, assume that the standard "examples" application -// included a JDBC driver that needed to establish a network connection to the -// corresponding database and used the scrape taglib to get the weather from -// the NOAA web server. You might create a "grant" entries like this: -// -// The permissions granted to the context root directory apply to JSP pages. -// grant codeBase "file:${catalina.home}/webapps/examples/-" { -// permission java.net.SocketPermission "dbhost.mycompany.com:5432", "connect"; -// permission java.net.SocketPermission "*.noaa.gov:80", "connect"; -// }; -// -// The permissions granted to the context WEB-INF/classes directory -// grant codeBase "file:${catalina.home}/webapps/examples/WEB-INF/classes/-" { -// }; -// -// The permission granted to your JDBC driver -// grant codeBase "jar:file:${catalina.home}/webapps/examples/WEB-INF/lib/driver.jar!/-" { -// permission java.net.SocketPermission "dbhost.mycompany.com:5432", "connect"; -// }; -// The permission granted to the scrape taglib -// grant codeBase "jar:file:${catalina.home}/webapps/examples/WEB-INF/lib/scrape.jar!/-" { -// permission java.net.SocketPermission "*.noaa.gov:80", "connect"; -// }; - 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 index 3e937aced..000000000 --- a/archiva-webapp-test/src/test/tomcat5x/conf/catalina.properties +++ /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 index 895adb9b1..000000000 --- a/archiva-webapp-test/src/test/tomcat5x/conf/context.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - WEB-INF/web.xml - - - - - \ 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 index 07f85e265..000000000 --- a/archiva-webapp-test/src/test/tomcat5x/conf/logging.properties +++ /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 index 316475801..000000000 --- a/archiva-webapp-test/src/test/tomcat5x/conf/server-minimal.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - 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 index 22a041059..000000000 --- a/archiva-webapp-test/src/test/tomcat5x/conf/server.xml +++ /dev/null @@ -1,384 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 index 472566645..000000000 --- a/archiva-webapp-test/src/test/tomcat5x/conf/tomcat-users.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - 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 index 0263f1e46..000000000 --- a/archiva-webapp-test/src/test/tomcat5x/conf/web.xml +++ /dev/null @@ -1,1183 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - default - org.apache.catalina.servlets.DefaultServlet - - debug - 0 - - - listings - false - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - jsp - org.apache.jasper.servlet.JspServlet - - fork - false - - - xpoweredBy - false - - 3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - default - / - - - - - - - - jsp - *.jsp - - - - jsp - *.jspx - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 30 - - - - - - - - - - - - abs - audio/x-mpeg - - - ai - application/postscript - - - aif - audio/x-aiff - - - aifc - audio/x-aiff - - - aiff - audio/x-aiff - - - aim - application/x-aim - - - art - image/x-jg - - - asf - video/x-ms-asf - - - asx - video/x-ms-asf - - - au - audio/basic - - - avi - video/x-msvideo - - - avx - video/x-rad-screenplay - - - bcpio - application/x-bcpio - - - bin - application/octet-stream - - - bmp - image/bmp - - - body - text/html - - - cdf - application/x-netcdf - - - cer - application/x-x509-ca-cert - - - class - application/java - - - cpio - application/x-cpio - - - csh - application/x-csh - - - css - text/css - - - dib - image/bmp - - - doc - application/msword - - - dtd - application/xml-dtd - - - dv - video/x-dv - - - dvi - application/x-dvi - - - eps - application/postscript - - - etx - text/x-setext - - - exe - application/octet-stream - - - gif - image/gif - - - gtar - application/x-gtar - - - gz - application/x-gzip - - - hdf - application/x-hdf - - - htc - text/x-component - - - htm - text/html - - - html - text/html - - - hqx - application/mac-binhex40 - - - ico - image/x-icon - - - ief - image/ief - - - jad - text/vnd.sun.j2me.app-descriptor - - - jar - application/java-archive - - - java - text/plain - - - jnlp - application/x-java-jnlp-file - - - jpe - image/jpeg - - - jpeg - image/jpeg - - - jpg - image/jpeg - - - js - text/javascript - - - jsf - text/plain - - - jspf - text/plain - - - kar - audio/midi - - - latex - application/x-latex - - - m3u - audio/x-mpegurl - - - mac - image/x-macpaint - - - man - application/x-troff-man - - - mathml - application/mathml+xml - - - me - application/x-troff-me - - - mid - audio/midi - - - midi - audio/midi - - - mif - application/vnd.mif - - - mov - video/quicktime - - - movie - video/x-sgi-movie - - - mp1 - audio/x-mpeg - - - mp2 - audio/mpeg - - - mp3 - audio/mpeg - - - mpa - audio/x-mpeg - - - mpe - video/mpeg - - - mpeg - video/mpeg - - - mpega - audio/x-mpeg - - - mpg - video/mpeg - - - mpv2 - video/mpeg2 - - - ms - application/x-troff-ms - - - nc - application/x-netcdf - - - oda - application/oda - - - - odb - application/vnd.oasis.opendocument.database - - - - odc - application/vnd.oasis.opendocument.chart - - - - odf - application/vnd.oasis.opendocument.formula - - - - odg - application/vnd.oasis.opendocument.graphics - - - - odi - application/vnd.oasis.opendocument.image - - - - odm - application/vnd.oasis.opendocument.text-master - - - - odp - application/vnd.oasis.opendocument.presentation - - - - ods - application/vnd.oasis.opendocument.spreadsheet - - - - odt - application/vnd.oasis.opendocument.text - - - ogg - application/ogg - - - - otg - application/vnd.oasis.opendocument.graphics-template - - - - oth - application/vnd.oasis.opendocument.text-web - - - - otp - application/vnd.oasis.opendocument.presentation-template - - - - ots - application/vnd.oasis.opendocument.spreadsheet-template - - - - ott - application/vnd.oasis.opendocument.text-template - - - pbm - image/x-portable-bitmap - - - pct - image/pict - - - pdf - application/pdf - - - pgm - image/x-portable-graymap - - - pic - image/pict - - - pict - image/pict - - - pls - audio/x-scpls - - - png - image/png - - - pnm - image/x-portable-anymap - - - pnt - image/x-macpaint - - - ppm - image/x-portable-pixmap - - - pps - application/vnd.ms-powerpoint - - - ppt - application/vnd.ms-powerpoint - - - ps - application/postscript - - - psd - image/x-photoshop - - - qt - video/quicktime - - - qti - image/x-quicktime - - - qtif - image/x-quicktime - - - ras - image/x-cmu-raster - - - rdf - application/rdf+xml - - - rgb - image/x-rgb - - - rm - application/vnd.rn-realmedia - - - roff - application/x-troff - - - rtf - text/rtf - - - rtx - text/richtext - - - sh - application/x-sh - - - shar - application/x-shar - - - - smf - audio/x-midi - - - sit - application/x-stuffit - - - snd - audio/basic - - - src - application/x-wais-source - - - sv4cpio - application/x-sv4cpio - - - sv4crc - application/x-sv4crc - - - svg - image/svg+xml - - - svgz - image/svg - - - swf - application/x-shockwave-flash - - - t - application/x-troff - - - tar - application/x-tar - - - tcl - application/x-tcl - - - tex - application/x-tex - - - texi - application/x-texinfo - - - texinfo - application/x-texinfo - - - tif - image/tiff - - - tiff - image/tiff - - - tr - application/x-troff - - - tsv - text/tab-separated-values - - - txt - text/plain - - - ulw - audio/basic - - - ustar - application/x-ustar - - - vrml - model/vrml - - - vsd - application/x-visio - - - vxml - application/voicexml+xml - - - wav - audio/x-wav - - - - wbmp - image/vnd.wap.wbmp - - - - wml - text/vnd.wap.wml - - - - wmlc - application/vnd.wap.wmlc - - - - wmls - text/vnd.wap.wmlscript - - - - wmlscriptc - application/vnd.wap.wmlscriptc - - - wrl - model/vrml - - - xbm - image/x-xbitmap - - - xht - application/xhtml+xml - - - xhtml - application/xhtml+xml - - - xls - application/vnd.ms-excel - - - xml - application/xml - - - xpm - image/x-xpixmap - - - xsl - application/xml - - - xslt - application/xslt+xml - - - xul - application/vnd.mozilla.xul+xml - - - xwd - image/x-xwindowdump - - - Z - application/x-compress - - - z - application/x-compress - - - zip - application/zip - - - - - - - - - - - - - - - - index.html - index.htm - index.jsp - - -