diff options
| author | Joakim Erdfelt <joakime@apache.org> | 2007-02-23 19:05:21 +0000 |
|---|---|---|
| committer | Joakim Erdfelt <joakime@apache.org> | 2007-02-23 19:05:21 +0000 |
| commit | dee0d5a300ee0ba0240efc1277428b52cdcec9e0 (patch) | |
| tree | 0f4c8d3b8b8b0468deac3c8851380a68bfa1744e /archiva-webapp/src/jetty-env.xml | |
| parent | 2b50a18d22ef8972d241f54c20a131e05a584ac4 (diff) | |
| download | archiva-dee0d5a300ee0ba0240efc1277428b52cdcec9e0.tar.gz archiva-dee0d5a300ee0ba0240efc1277428b52cdcec9e0.zip | |
Merge from archiva-MRM-239 branch to trunk. r506385:HEAD
git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@511053 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'archiva-webapp/src/jetty-env.xml')
| -rw-r--r-- | archiva-webapp/src/jetty-env.xml | 63 |
1 files changed, 44 insertions, 19 deletions
diff --git a/archiva-webapp/src/jetty-env.xml b/archiva-webapp/src/jetty-env.xml index 7e260ebfe..bd1d76c14 100644 --- a/archiva-webapp/src/jetty-env.xml +++ b/archiva-webapp/src/jetty-env.xml @@ -21,37 +21,62 @@ <!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd"> <Configure class="org.mortbay.jetty.webapp.WebAppContext"> -<New id="validation_mail" class="org.mortbay.jetty.plus.naming.Resource"> - <Arg>mail/Session</Arg> - <Arg> - <New class="org.mortbay.naming.factories.MailSessionReference"> - <Set name="user"></Set> - <Set name="password"></Set> - <Set name="properties"> - <New class="java.util.Properties"> - <Put name="mail.smtp.host">localhost</Put> - <Put name="mail.smtp.port">25</Put> <!-- TODO: shouldn't this default? --> - </New> - </Set> - </New> - </Arg> -</New> + <New id="validation_mail" class="org.mortbay.jetty.plus.naming.Resource"> + <Arg>mail/Session</Arg> + <Arg> + <New class="org.mortbay.naming.factories.MailSessionReference"> + <Set name="user"></Set> + <Set name="password"></Set> + <Set name="properties"> + <New class="java.util.Properties"> + <Put name="mail.smtp.host">localhost</Put> + <Put name="mail.smtp.port">25</Put> <!-- TODO: shouldn't this default? --> + </New> + </Set> + </New> + </Arg> + </New> + <!-- Archiva database --> + <New id="archiva" class="org.mortbay.jetty.plus.naming.Resource"> + <Arg>jdbc/archiva</Arg> + <Arg> + <New class="org.apache.derby.jdbc.EmbeddedDataSource"> + <Set name="DatabaseName">target/databases/archiva</Set> + <Set name="user">sa</Set> + <Set name="createDatabase">create</Set> + </New> + </Arg> + </New> + + <New id="archivaShutdown" class="org.mortbay.jetty.plus.naming.Resource"> + <Arg>jdbc/archivaShutdown</Arg> + <Arg> + <New class="org.apache.derby.jdbc.EmbeddedDataSource"> + <Set name="DatabaseName">target/databases/archiva</Set> + <Set name="user">sa</Set> + <Set name="shutdownDatabase">shutdown</Set> + </New> + </Arg> + </New> + + <!-- Users / Security Database --> <New id="users" class="org.mortbay.jetty.plus.naming.Resource"> <Arg>jdbc/users</Arg> <Arg> <New class="org.apache.derby.jdbc.EmbeddedDataSource"> - <Set name="DatabaseName">target/database</Set> + <Set name="DatabaseName">target/databases/users</Set> <Set name="user">sa</Set> <Set name="createDatabase">create</Set> </New> </Arg> </New> - <New id="shutdown" class="org.mortbay.jetty.plus.naming.Resource"> - <Arg>jdbc/shutdown</Arg> + + <New id="usersShutdown" class="org.mortbay.jetty.plus.naming.Resource"> + <Arg>jdbc/usersShutdown</Arg> <Arg> <New class="org.apache.derby.jdbc.EmbeddedDataSource"> - <Set name="DatabaseName">target/database</Set> + <Set name="DatabaseName">target/databases/users</Set> <Set name="user">sa</Set> <Set name="shutdownDatabase">shutdown</Set> </New> |