Return-Path: 
 <archiva-commits-return-186-apmail-maven-archiva-commits-archive=maven.apache.org@maven.apache.org>
Delivered-To: apmail-maven-archiva-commits-archive@locus.apache.org
Received: (qmail 72662 invoked from network); 20 Sep 2006 13:33:14 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 20 Sep 2006 13:33:14 -0000
Received: (qmail 26689 invoked by uid 500); 20 Sep 2006 13:33:13 -0000
Delivered-To: apmail-maven-archiva-commits-archive@maven.apache.org
Received: (qmail 26654 invoked by uid 500); 20 Sep 2006 13:33:13 -0000
Mailing-List: contact archiva-commits-help@maven.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:archiva-commits-help@maven.apache.org>
List-Unsubscribe: <mailto:archiva-commits-unsubscribe@maven.apache.org>
List-Post: <mailto:archiva-commits@maven.apache.org>
List-Id: <archiva-commits.maven.apache.org>
Reply-To: archiva-dev@maven.apache.org
Delivered-To: mailing list archiva-commits@maven.apache.org
Received: (qmail 26643 invoked by uid 99); 20 Sep 2006 13:33:13 -0000
Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org)
 (140.211.166.84)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Sep 2006 06:33:13 -0700
X-ASF-Spam-Status: No, hits=-9.8 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME
Received: from [140.211.166.113] ([140.211.166.113:60434]
 helo=eris.apache.org)
	by idunn.apache.osuosl.org (ecelerity 2.1.1.8 r(12930)) with ESMTP
	id 7D/70-01963-81341154 for <archiva-commits@maven.apache.org>;
 Wed, 20 Sep 2006 06:33:13 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id C7ADD1A981A; Wed, 20 Sep 2006 06:33:10 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r448201 - in /maven/archiva/trunk/archiva-webapp: pom.xml
 src/jetty-env.xml src/main/resources/META-INF/plexus/application.xml
Date: Wed, 20 Sep 2006 13:33:10 -0000
To: archiva-commits@maven.apache.org
From: brett@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20060920133310.C7ADD1A981A@eris.apache.org>
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: brett
Date: Wed Sep 20 06:33:10 2006
New Revision: 448201

URL: http://svn.apache.org/viewvc?view=rev&rev=448201
Log:
upgrade derby

Modified:
    maven/archiva/trunk/archiva-webapp/pom.xml
    maven/archiva/trunk/archiva-webapp/src/jetty-env.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=448201&r1=448200&r2=448201
==============================================================================
--- maven/archiva/trunk/archiva-webapp/pom.xml (original)
+++ maven/archiva/trunk/archiva-webapp/pom.xml Wed Sep 20 06:33:10 2006
@@ -201,7 +201,7 @@
     <dependency>
       <groupId>org.apache.derby</groupId>
       <artifactId>derby</artifactId>
-      <version>10.1.2.1</version>
+      <version>10.1.3.1</version>
     </dependency>
     <dependency>
       <groupId>jpox</groupId>

Modified: 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=diff&rev=448201&r1=448200&r2=448201
==============================================================================
--- maven/archiva/trunk/archiva-webapp/src/jetty-env.xml (original)
+++ maven/archiva/trunk/archiva-webapp/src/jetty-env.xml Wed Sep 20 06:33:10 2006
@@ -8,6 +8,7 @@
   <Arg>
     <New class="org.apache.derby.jdbc.EmbeddedDataSource">
       <Set name="DatabaseName">target/database</Set>
+      <Set name="user">sa</Set>
       <Set name="createDatabase">create</Set>
     </New>
   </Arg>
@@ -17,6 +18,7 @@
   <Arg>
     <New class="org.apache.derby.jdbc.EmbeddedDataSource">
       <Set name="DatabaseName">target/database</Set>
+      <Set name="user">sa</Set>
       <Set name="shutdownDatabase">shutdown</Set>
     </New>
   </Arg>

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=448201&r1=448200&r2=448201
==============================================================================
--- 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 06:33:10 2006
@@ -177,15 +177,11 @@
             <value>true</value>
           </property>
           <property>
-            <name>org.jpox.autoStartMechanism</name>
-            <value>SchemaTable</value>
-          </property>
-          <property>
-            <name>org.jpox.autoStartMechanismMode</name>
-            <value>Ignored</value>
+            <name>org.jpox.validateTables</name>
+            <value>false</value>
           </property>
           <property>
-            <name>org.jpox.validateTables</name>
+            <name>org.jpox.validateColumns</name>
             <value>false</value>
           </property>
           <property>