Author: brett
Date: Wed Sep 20 02:19:35 2006
New Revision: 448135
URL: http://svn.apache.org/viewvc?view=rev&rev=448135
Log:
use data source instead
Added:
maven/archiva/trunk/archiva-webapp/src/jetty-env.xml (with props)
Modified:
maven/archiva/trunk/archiva-webapp/pom.xml
maven/archiva/trunk/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
Modified: maven/archiva/trunk/archiva-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/pom.xml?view=diff&rev=448135&r1=448134&r2=448135
==============================================================================
--- maven/archiva/trunk/archiva-webapp/pom.xml (original)
+++ maven/archiva/trunk/archiva-webapp/pom.xml Wed Sep 20 02:19:35 2006
@@ -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>
Added: maven/archiva/trunk/archiva-webapp/src/jetty-env.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/jetty-env.xml?view=auto&rev=448135
==============================================================================
--- maven/archiva/trunk/archiva-webapp/src/jetty-env.xml (added)
+++ maven/archiva/trunk/archiva-webapp/src/jetty-env.xml Wed Sep 20 02:19:35
2006
@@ -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>
+
Propchange: maven/archiva/trunk/archiva-webapp/src/jetty-env.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
maven/archiva/trunk/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
URL:
http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-webapp/src/main/resources/META-INF/plexus/application.xml?view=diff&rev=448135&r1=448134&r2=448135
==============================================================================
---
maven/archiva/trunk/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
(original)
+++
maven/archiva/trunk/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
Wed Sep 20 02:19:35 2006
@@ -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 -->
<!--
