Author: olamy
Date: Fri Jun 17 15:52:41 2011
New Revision: 1136916
URL: http://svn.apache.org/viewvc?rev=1136916&view=rev
Log:
add configuration for tomcat6 for cargo and made it default, add some test
around forcing locale via request_locale=en_US but still failed :-(
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/Catalina/
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/Catalina/localhost/
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/Catalina/localhost/archiva.xml
(with props)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/Catalina/localhost/host-manager.xml
(with props)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/Catalina/localhost/manager.xml
(with props)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/catalina.policy
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/catalina.properties
(with props)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/context.xml
(with props)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/logging.properties
(with props)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/server.xml
(with props)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/tomcat-users.xml
(with props)
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/web.xml
(with props)
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArchivaAdminTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/MergingRepositoriesTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractBrowseTest.java
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java
Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml?rev=1136916&r1=1136915&r2=1136916&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml
(original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/pom.xml Fri
Jun 17 15:52:41 2011
@@ -34,10 +34,11 @@
<tomcat5x.version>5.5.33</tomcat5x.version>
<tomcat6x.version>6.0.32</tomcat6x.version>
<cargo.wait>false</cargo.wait>
+ <cargo.timeout>600000</cargo.timeout>
<cargo.install.dir>cargo-installs</cargo.install.dir>
<maxWaitTimeInMs>60000</maxWaitTimeInMs>
<!-- TODO: review how appropriate the memory settings are - should work
with less -->
- <cargo.jvm.args>-Xmx512m -XX:MaxPermSize=256m</cargo.jvm.args>
+ <cargo.jvm.args>-Xmx512m -XX:MaxPermSize=256m
-Duser.language=en</cargo.jvm.args>
<seleniumPluginVersion>2.0-SNAPSHOT</seleniumPluginVersion>
</properties>
@@ -234,9 +235,33 @@
</activation>
<build>
<plugins>
+ <!--
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.4.1</version>
+ <configuration>
+ <filesets>
+ <fileset>
+
<directory>${project.build.directory}/${container.name}conf/webapps/archiva</directory>
+ </fileset>
+ </filesets>
+ </configuration>
+ <executions>
+ <execution>
+ <id>clean-webapp</id>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>clean</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
+ <version>2.2</version>
<executions>
<execution>
<id>unzip-archiva-webapp</id>
@@ -254,6 +279,7 @@
</artifactItem>
</artifactItems>
<outputDirectory>${project.build.directory}/${container.name}conf/webapps/archiva</outputDirectory>
+ <overWriteSnapshots>true</overWriteSnapshots>
</configuration>
</execution>
<execution>
@@ -313,7 +339,14 @@
<fileset dir="src/test/${container.name}"/>
</copy>
<copy
-
todir="${cargo.install.dir}/${container.name}/apache-tomcat-${tomcat5x.version}/apache-tomcat-${tomcat5x.version}/common/lib">
+
todir="${cargo.install.dir}/${container.name}/apache-tomcat-${tomcat.version}/apache-tomcat-${tomcat.version}/common/lib">
+ <fileset
dir="${project.build.directory}/providedDependencies">
+ <include name="**/*.jar"/>
+ </fileset>
+ </copy>
+ <!-- for tomcat 6 -->
+ <copy
+
todir="${cargo.install.dir}/${container.name}/apache-tomcat-${tomcat.version}/apache-tomcat-${tomcat.version}/lib">
<fileset
dir="${project.build.directory}/providedDependencies">
<include name="**/*.jar"/>
</fileset>
@@ -369,10 +402,12 @@
</zipUrlInstaller>
<log>${project.build.directory}/logs/${container.name}.log</log>
<output>${project.build.directory}/logs/${container.name}.out</output>
- <timeout>600000</timeout>
+ <timeout>${cargo.timeout}</timeout>
<systemProperties>
<appserver.base>${project.build.directory}/appserver-base</appserver.base>
<appserver.home>${project.build.directory}/appserver-base</appserver.home>
+ <user.language>en</user.language>
+ <user.region>US</user.region>
</systemProperties>
</container>
<configuration>
@@ -436,11 +471,12 @@
<id>tomcat5x</id>
<activation>
<property>
- <name>!container</name>
+ <name>tomcat5</name>
</property>
</activation>
<properties>
<container.name>tomcat5x</container.name>
+ <tomcat.version>${tomcat5x.version}</tomcat.version>
<container.url>
http://archive.apache.org/dist/tomcat/tomcat-5/v${tomcat5x.version}/bin/apache-tomcat-${tomcat5x.version}.zip
</container.url>
@@ -450,11 +486,12 @@
<id>tomcat6x</id>
<activation>
<property>
- <name>tomcat6</name>
+ <name>!container</name>
</property>
</activation>
<properties>
<container.name>tomcat6x</container.name>
+ <tomcat.version>${tomcat6x.version}</tomcat.version>
<container.url>
http://archive.apache.org/dist/tomcat/tomcat-6/v${tomcat6x.version}/bin/apache-tomcat-${tomcat6x.version}.zip
</container.url>
@@ -569,7 +606,7 @@
<cargo.jvm.args>
-Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=${cargo.debug.port}
- -Xmx512m -XX:MaxPermSize=256m
+ -Xmx512m -XX:MaxPermSize=256m -Duser.language=en
</cargo.jvm.args>
<cargo.debug.port>8000</cargo.debug.port>
<!-- wait an unusual amount of time (1hr) to allow debugging to occur
-->
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArchivaAdminTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArchivaAdminTest.java?rev=1136916&r1=1136915&r2=1136916&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArchivaAdminTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArchivaAdminTest.java
Fri Jun 17 15:52:41 2011
@@ -54,8 +54,9 @@ public class ArchivaAdminTest
@Optional( "localhost" ) String
seleniumHost, @Optional( "4444" ) int seleniumPort )
throws Exception
{
- super.open( baseUrl, browser, seleniumHost, seleniumPort,
Integer.toString( maxWaitTimeInMs ) );
- getSelenium().open( baseUrl );
+ super.open( baseUrl + "/index.action?" + forceLocaleParam , browser,
seleniumHost, seleniumPort, Integer.toString( maxWaitTimeInMs ) );
+
+ getSelenium().open( baseUrl + "?" + forceLocaleParam );
String title = getSelenium().getTitle();
if ( title.endsWith( "Create Admin User" ) )
{
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java?rev=1136916&r1=1136915&r2=1136916&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java
Fri Jun 17 15:52:41 2011
@@ -103,7 +103,7 @@ public class ArtifactManagementTest
addArtifact( groupId, artifactId, getVersion(), packaging,
getArtifactFilePath(), getRepositoryId() );
assertTextPresent( "Artifact '" + groupId + ":" + artifactId + ":" +
getVersion()
+ "' was successfully deployed to repository 'internal'" );
- getSelenium().open( baseUrl + "/browse/" + groupId + "/" + artifactId
+ "/" + getVersion() );
+ getSelenium().open( baseUrl + "/browse/" + groupId + "/" + artifactId
+ "/" + getVersion() + "?" + forceLocaleParam );
waitPage();
assertTextPresent( "<type>library</type>" );
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java?rev=1136916&r1=1136915&r2=1136916&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java
Fri Jun 17 15:52:41 2011
@@ -28,7 +28,7 @@ public class AuditLogsReportTest
{
private void goToAuditLogReports()
{
- getSelenium().open( "/archiva/report/queryAuditLogReport.action" );
+ getSelenium().open(
"/archiva/report/queryAuditLogReport.action?"+forceLocaleParam );
}
private void assertAuditLogsReportPage()
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/MergingRepositoriesTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/MergingRepositoriesTest.java?rev=1136916&r1=1136915&r2=1136916&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/MergingRepositoriesTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/MergingRepositoriesTest.java
Fri Jun 17 15:52:41 2011
@@ -30,7 +30,7 @@ public class MergingRepositoriesTest
public void testAddStagingRepository()
{
goToRepositoriesPage();
- getSelenium().open( "/archiva/admin/addRepository.action" );
+ getSelenium().open( "/archiva/admin/addRepository.action?" +
forceLocaleParam );
addStagingRepository( "merging-repo", "merging-repo",
getRepositoryDir() + "merging-repo/", "",
"Maven 2.x Repository", "0 0 * * * ?", "", "" );
assertTextPresent( "merging-repo" );
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java?rev=1136916&r1=1136915&r2=1136916&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java
Fri Jun 17 15:52:41 2011
@@ -101,7 +101,7 @@ public abstract class AbstractArchivaTes
// Go to Login Page
public void goToLoginPage()
{
- getSelenium().open( baseUrl );
+ getSelenium().open( baseUrl + "?" + forceLocaleParam );
clickLinkWithText( "Login" );
assertLoginPage();
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractBrowseTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractBrowseTest.java?rev=1136916&r1=1136915&r2=1136916&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractBrowseTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractBrowseTest.java
Fri Jun 17 15:52:41 2011
@@ -26,7 +26,7 @@ public abstract class AbstractBrowseTest
// Browse
public void goToBrowsePage()
{
- getSelenium().open( "/archiva/browse" );
+ getSelenium().open( "/archiva/browse" + "?" + forceLocaleParam );
assertBrowsePage();
}
Modified:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java?rev=1136916&r1=1136915&r2=1136916&view=diff
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java
(original)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java
Fri Jun 17 15:52:41 2011
@@ -44,6 +44,8 @@ public abstract class AbstractSeleniumTe
public static String baseUrl;
+ public static String forceLocaleParam = "request_locale=en_US";
+
public static String maxWaitTimeInMs;
private static ThreadLocal<Selenium> selenium = new
ThreadLocal<Selenium>();
@@ -70,7 +72,7 @@ public abstract class AbstractSeleniumTe
if ( getSelenium() == null )
{
- DefaultSelenium s = new DefaultSelenium( seleniumHost,
seleniumPort, browser, baseUrl );
+ DefaultSelenium s = new DefaultSelenium( seleniumHost,
seleniumPort, browser, baseUrl + "?" + forceLocaleParam );
s.start();
s.setTimeout( maxWaitTimeInMs );
selenium.set( s );
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/Catalina/localhost/archiva.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/Catalina/localhost/archiva.xml?rev=1136916&view=auto
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/Catalina/localhost/archiva.xml
(added)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/Catalina/localhost/archiva.xml
Fri Jun 17 15:52:41 2011
@@ -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>
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/Catalina/localhost/archiva.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/Catalina/localhost/archiva.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/Catalina/localhost/host-manager.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/Catalina/localhost/host-manager.xml?rev=1136916&view=auto
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/Catalina/localhost/host-manager.xml
(added)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/Catalina/localhost/host-manager.xml
Fri Jun 17 15:52:41 2011
@@ -0,0 +1,34 @@
+<!--
+ ~ 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}/webapps/host-manager"/>
+ <!--
+ privileged="true" antiResourceLocking="false" antiJARLocking="false">
+
+</Context>
+-->
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/Catalina/localhost/host-manager.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/Catalina/localhost/host-manager.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/Catalina/localhost/manager.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/Catalina/localhost/manager.xml?rev=1136916&view=auto
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/Catalina/localhost/manager.xml
(added)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/Catalina/localhost/manager.xml
Fri Jun 17 15:52:41 2011
@@ -0,0 +1,38 @@
+<!--
+ ~ 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}/webapps/manager"/>
+ <!--
+ privileged="true" antiResourceLocking="false" antiJARLocking="false">
+
+
+ <ResourceLink name="users" global="UserDatabase"
+ type="org.apache.catalina.UserDatabase"/>
+
+</Context>
+ -->
\ No newline at end of file
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/Catalina/localhost/manager.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/Catalina/localhost/manager.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/catalina.policy
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/catalina.policy?rev=1136916&view=auto
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/catalina.policy
(added)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/catalina.policy
Fri Jun 17 15:52:41 2011
@@ -0,0 +1,7 @@
+ grant {
+ permission java.security.AllPermission;
+ };
+
+grant codeBase "file:${catalina.home}/lib/tomcat-juli.jar" {
+ permission java.lang.RuntimePermission "setContextClassLoader";
+};
\ No newline at end of file
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/catalina.properties
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/catalina.properties?rev=1136916&view=auto
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/catalina.properties
(added)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/catalina.properties
Fri Jun 17 15:52:41 2011
@@ -0,0 +1,81 @@
+# 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.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/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=
+
+#
+# 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 single jars, e.g. bar.jar, you need the URL form
+# starting with file:.
+shared.loader=
+
+#
+# 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
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/catalina.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/catalina.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/context.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/context.xml?rev=1136916&view=auto
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/context.xml
(added)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/context.xml
Fri Jun 17 15:52:41 2011
@@ -0,0 +1,35 @@
+<?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.
+-->
+<!-- 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="" />
+ -->
+
+ <!-- Uncomment this to enable Comet connection tacking (provides events
+ on session expiration as well as webapp lifecycle) -->
+ <!--
+ <Valve className="org.apache.catalina.valves.CometConnectionManagerValve"
/>
+ -->
+
+</Context>
\ No newline at end of file
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/context.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/context.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/logging.properties
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/logging.properties?rev=1136916&view=auto
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/logging.properties
(added)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/logging.properties
Fri Jun 17 15:52:41 2011
@@ -0,0 +1,46 @@
+# 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 = java.util.logging.ConsoleHandler
+
+############################################################
+# Handler specific properties.
+# Describes specific configuration info for Handlers.
+############################################################
+
+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.level = @catalina.logging.level@
+org.apache.catalina.startup.HostConfig.level = INFO
+org.apache.catalina.session.ManagerBase.level = INFO
+
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers =
java.util.logging.ConsoleHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level
= INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers
= java.util.logging.ConsoleHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/admin].level =
INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/admin].handlers
= java.util.logging.ConsoleHandler
+
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level
= INFO
+org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers
= java.util.logging.ConsoleHandler
\ No newline at end of file
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/logging.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/logging.properties
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/server.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/server.xml?rev=1136916&view=auto
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/server.xml
(added)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/server.xml
Fri Jun 17 15:52:41 2011
@@ -0,0 +1,68 @@
+<?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.
+-->
+<!-- Note: A "Server" is not itself a "Container", so you may not
+ define subcomponents such as "Valves" at this level.
+ Documentation at /docs/config/server.html
+ -->
+<Server port="8005" shutdown="SHUTDOWN">
+
+ <!--APR library loader. Documentation at /docs/apr.html -->
+ <Listener className="org.apache.catalina.core.AprLifecycleListener"
SSLEngine="on" />
+ <!--Initialize Jasper prior to webapps are loaded. Documentation at
/docs/jasper-howto.html -->
+ <Listener className="org.apache.catalina.core.JasperListener" />
+ <!-- Prevent memory leaks due to use of particular java/javax APIs-->
+ <Listener
className="org.apache.catalina.core.JreMemoryLeakPreventionListener" />
+ <!-- JMX Support for the Tomcat server. Documentation at
/docs/non-existent.html -->
+ <Listener className="org.apache.catalina.mbeans.ServerLifecycleListener" />
+ <Listener
className="org.apache.catalina.mbeans.GlobalResourcesLifecycleListener" />
+
+ <!-- Global JNDI resources
+ Documentation at /docs/jndi-resources-howto.html
+ -->
+ <GlobalNamingResources>
+ <!-- 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>
+
+ <Service name="Catalina">
+
+ <Connector port="9696" protocol="HTTP/1.1"
+ connectionTimeout="20000"
+ redirectPort="8443" />
+
+ <Engine name="Catalina" defaultHost="localhost">
+
+ <Realm className="org.apache.catalina.realm.UserDatabaseRealm"
+ resourceName="UserDatabase"/>
+ <Valve className="org.apache.catalina.valves.AccessLogValve"
+ resolveHosts="false" pattern="%t-m:%m-url:%U-%q-%Dms"/>
+
+ <Host name="localhost" appBase="webapps"
+ unpackWARs="true" autoDeploy="true"
+ xmlValidation="false" xmlNamespaceAware="false">
+
+ </Host>
+ </Engine>
+ </Service>
+</Server>
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/server.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/server.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/tomcat-users.xml
URL:
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/tomcat-users.xml?rev=1136916&view=auto
==============================================================================
---
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/tomcat-users.xml
(added)
+++
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/tomcat-users.xml
Fri Jun 17 15:52:41 2011
@@ -0,0 +1,36 @@
+<?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.
+-->
+<tomcat-users>
+<!--
+ NOTE: By default, no user is included in the "manager-gui" role required
+ to operate the "/manager/html" web application. If you wish to use this app,
+ you must define such a user - the username and password are arbitrary.
+-->
+<!--
+ NOTE: The sample user and role entries below are wrapped in a comment
+ and thus are ignored when reading this file. Do not forget to remove
+ <!.. ..> that surrounds them.
+-->
+<!--
+ <role rolename="tomcat"/>
+ <role rolename="role1"/>
+ <user username="tomcat" password="tomcat" roles="tomcat"/>
+ <user username="both" password="tomcat" roles="tomcat,role1"/>
+ <user username="role1" password="tomcat" roles="role1"/>
+-->
+</tomcat-users>
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/tomcat-users.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/tomcat-users.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
