use data source instead

git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@448135 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-webapp/pom.xml b/archiva-webapp/pom.xml
index 98bd725de4dbe99159a9367ece3a1556458d89e7..515df07ebc5a25a75f6fdc6a903256751ae89de9 100644 (file)
--- a/archiva-webapp/pom.xml
+++ b/archiva-webapp/pom.xml
@@ -280,6 +280,7 @@
         <configuration>
           <scanIntervalSeconds>10</scanIntervalSeconds>
           <contextPath>/</contextPath>
+          <jettyEnvXml>src/jetty-env.xml</jettyEnvXml>
           <connectors>
             <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
               <port>9000</port>

diff --git a/archiva-webapp/src/jetty-env.xml b/archiva-webapp/src/jetty-env.xml
new file mode 100644 (file)
index 0000000..91e2f9a
--- /dev/null
+++ b/archiva-webapp/src/jetty-env.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
+
+<Configure class="org.mortbay.jetty.webapp.WebAppContext">
+
+<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="createDatabase">create</Set>
+    </New>
+  </Arg>
+</New>
+<New id="shutdown" class="org.mortbay.jetty.plus.naming.Resource">
+  <Arg>jdbc/shutdown</Arg>
+  <Arg>
+    <New class="org.apache.derby.jdbc.EmbeddedDataSource">
+      <Set name="DatabaseName">target/database</Set>
+      <Set name="shutdownDatabase">shutdown</Set>
+    </New>
+  </Arg>
+</New>
+
+</Configure>
+

diff --git a/archiva-webapp/src/main/resources/META-INF/plexus/application.xml b/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
index afadbcaa1ec8ca8738563ac1c587b1da56ea1032..ad2f054037840884e55cc6cd67c2cdcd1b4f04ad 100644 (file)
--- a/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
+++ b/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
@@ -74,6 +74,12 @@
             <hierarchy>JPOX</hierarchy>
             <level>WARN</level>
           </level>
+<!--
+          <level>
+            <hierarchy>JPOX.RDBMS.SQL</hierarchy>
+            <level>DEBUG</level>
+          </level>
+-->
           <level>
             <hierarchy>freemarker</hierarchy>
             <level>WARN</level>
@@ -123,9 +129,15 @@
 
     <component>
       <role>org.codehaus.plexus.jdo.JdoFactory</role>
+<!--
       <implementation>org.codehaus.plexus.jdo.DefaultConfigurableJdoFactory</implementation>
+-->
+      <implementation>org.codehaus.plexus.jdo.DataSourceConfigurableJdoFactory</implementation>
       <configuration>
 
+        <connectionFactoryName>java:comp/env/jdbc/users</connectionFactoryName>
+        <shutdownConnectionFactoryName>java:comp/env/jdbc/shutdown</shutdownConnectionFactoryName>
+
         <!-- HSQLDB Configuration -->
         <!--
           NOTE: NO NOT USE THIS CONFIGURATION FOR A PRODUCTION SYSTEM.
@@ -142,10 +154,12 @@
             -->
 
         <!-- Apache Derby Configuration -->
+<!--
         <driverName>org.apache.derby.jdbc.EmbeddedDriver</driverName>
         <url>jdbc:derby:${plexus.home}/database;create=true</url>
         <userName>sa</userName>
         <password></password>
+-->
 
         <!-- Postgresql Configuration -->
         <!--