diff options
Diffstat (limited to 'archiva-jetty')
| -rw-r--r-- | archiva-jetty/pom.xml | 11 | ||||
| -rw-r--r-- | archiva-jetty/src/main/conf/jetty.xml | 35 |
2 files changed, 32 insertions, 14 deletions
diff --git a/archiva-jetty/pom.xml b/archiva-jetty/pom.xml index deb0d0aff..a655722d2 100644 --- a/archiva-jetty/pom.xml +++ b/archiva-jetty/pom.xml @@ -132,6 +132,17 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>commons-dbcp</groupId> + <artifactId>commons-dbcp</artifactId> + <version>1.2.1</version> + <exclusions> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + </exclusions> + </dependency> </dependencies> <build> <plugins> diff --git a/archiva-jetty/src/main/conf/jetty.xml b/archiva-jetty/src/main/conf/jetty.xml index 439d808c3..5a106f08e 100644 --- a/archiva-jetty/src/main/conf/jetty.xml +++ b/archiva-jetty/src/main/conf/jetty.xml @@ -296,26 +296,33 @@ </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"><SystemProperty name="appserver.base" default=".."/>/data/databases/archiva</Set> - <Set name="user">sa</Set> - <Set name="createDatabase">create</Set> - </New> - </Arg> + <Arg>jdbc/archiva</Arg> + <Arg> + <New class="org.apache.commons.dbcp.BasicDataSource"> + <Set name="driverClassName">org.apache.derby.jdbc.EmbeddedDataSource</Set> + <Set name="url">jdbc:derby:<SystemProperty name="appserver.base" default=".."/>/data/databases/archiva</Set> + <Set name="username">sa</Set> + <Call name="addConnectionProperty"> + <Arg>create</Arg> + <Arg>true</Arg> + </Call> + </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"><SystemProperty name="appserver.base" default=".."/>/data/databases/archiva</Set> - <Set name="user">sa</Set> - <Set name="shutdownDatabase">shutdown</Set> - </New> + <New class="org.apache.commons.dbcp.BasicDataSource"> + <Set name="driverClassName">org.apache.derby.jdbc.EmbeddedDataSource</Set> + <Set name="url">jdbc:derby:<SystemProperty name="appserver.base" default=".."/>/data/databases/archiva</Set> + <Set name="username">sa</Set> + <Call name="addConnectionProperty"> + <Arg>shutdown</Arg> + <Arg>true</Arg> + </Call> + </New> </Arg> </New> |