archiva-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From joak...@apache.org
Subject svn commit: r540299 - in /maven/archiva/trunk/archiva-web/archiva-webapp: pom.xml src/jetty-env.xml src/main/resources/META-INF/plexus/application.xml
Date Mon, 21 May 2007 21:06:42 GMT
Author: joakime
Date: Mon May 21 14:06:41 2007
New Revision: 540299

URL: http://svn.apache.org/viewvc?view=rev&rev=540299
Log:
Synching archiva's jetty-env.xml and application.xml to that of continuum's to eliminate as
many derby + jpox errors

Modified:
    maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml
    maven/archiva/trunk/archiva-web/archiva-webapp/src/jetty-env.xml
    maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml

Modified: maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml?view=diff&rev=540299&r1=540298&r2=540299
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/pom.xml Mon May 21 14:06:41 2007
@@ -16,7 +16,7 @@
   ~ KIND, either express or implied.  See the License for the
   ~ specific language governing permissions and limitations
   ~ under the License.
-  --> 
+  -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -307,6 +307,26 @@
             <artifactId>derby</artifactId>
             <version>10.1.3.1</version>
           </dependency>
+          <!-- Enable the following if you want JSP 2.0 or JVM version < 1.5
+          <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1</version>
+            <type>jar</type>
+          </dependency>
+          <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jcl</artifactId>
+            <version>1.0.1</version>
+            <type>jar</type>
+          </dependency>
+          <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.14</version>
+            <type>jar</type>
+          </dependency>
+           -->
         </dependencies>
       </plugin>
       <plugin>

Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/jetty-env.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/jetty-env.xml?view=diff&rev=540299&r1=540298&r2=540299
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/jetty-env.xml (original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/jetty-env.xml Mon May 21 14:06:41 2007
@@ -30,7 +30,9 @@
         <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? -->
+            <Put name="mail.from">archiva@localhost</Put>
+            <Put name="mail.senderName">Archiva</Put>
+            <Put name="mail.debug">true</Put>
           </New>
         </Set>
       </New>
@@ -42,7 +44,7 @@
     <Arg>jdbc/archiva</Arg>
     <Arg>
       <New class="org.apache.derby.jdbc.EmbeddedDataSource">
-        <Set name="DatabaseName">target/databases/archiva</Set>
+        <Set name="DatabaseName">../databases/archiva</Set>
         <Set name="user">sa</Set>
         <Set name="createDatabase">create</Set>
       </New>
@@ -53,7 +55,7 @@
     <Arg>jdbc/archivaShutdown</Arg>
     <Arg>
       <New class="org.apache.derby.jdbc.EmbeddedDataSource">
-        <Set name="DatabaseName">target/databases/archiva</Set>
+        <Set name="DatabaseName">../databases/archiva</Set>
         <Set name="user">sa</Set>
         <Set name="shutdownDatabase">shutdown</Set>
       </New>
@@ -65,7 +67,7 @@
     <Arg>jdbc/users</Arg>
     <Arg>
       <New class="org.apache.derby.jdbc.EmbeddedDataSource">
-        <Set name="DatabaseName">target/databases/users</Set>
+        <Set name="DatabaseName">../databases/users</Set>
         <Set name="user">sa</Set>
         <Set name="createDatabase">create</Set>
       </New>
@@ -76,7 +78,7 @@
     <Arg>jdbc/usersShutdown</Arg>
     <Arg>
       <New class="org.apache.derby.jdbc.EmbeddedDataSource">
-        <Set name="DatabaseName">target/databases/users</Set>
+        <Set name="DatabaseName">../databases/users</Set>
         <Set name="user">sa</Set>
         <Set name="shutdownDatabase">shutdown</Set>
       </New>

Modified: maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml?view=diff&rev=540299&r1=540298&r2=540299
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
(original)
+++ maven/archiva/trunk/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
Mon May 21 14:06:41 2007
@@ -128,11 +128,11 @@
           </property>
           <property>
             <name>org.jpox.transactionIsolation</name>
-            <value>READ_UNCOMMITTED</value>
+            <value>READ_COMMITTED</value>
           </property>
           <property>
             <name>org.jpox.poid.transactionIsolation</name>
-            <value>READ_UNCOMMITTED</value>
+            <value>READ_COMMITTED</value>
           </property>
           <property>
             <name>org.jpox.rdbms.dateTimezone</name>
@@ -182,11 +182,11 @@
           </property>
           <property>
             <name>org.jpox.transactionIsolation</name>
-            <value>READ_UNCOMMITTED</value>
+            <value>READ_COMMITTED</value>
           </property>
           <property>
             <name>org.jpox.poid.transactionIsolation</name>
-            <value>READ_UNCOMMITTED</value>
+            <value>READ_COMMITTED</value>
           </property>
           <property>
             <name>org.jpox.rdbms.dateTimezone</name>



Mime
View raw message