Synching archiva's jetty-env.xml and application.xml to that of continuum's to elimin...

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

diff --git a/archiva-web/archiva-webapp/pom.xml b/archiva-web/archiva-webapp/pom.xml
index 5ae5e347bc78f89adc9836cdec952926892234e8..b862a72ec339e693fa3cad89424f33a58c583def 100644 (file)
--- a/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-web/archiva-webapp/pom.xml
@@ -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>

diff --git a/archiva-web/archiva-webapp/src/jetty-env.xml b/archiva-web/archiva-webapp/src/jetty-env.xml
index bd1d76c14aeea34f8eb8de4dfc7645e30c9e05e1..6774b0e32ecec801a939969ee16ffbbcd82b6c95 100644 (file)
--- a/archiva-web/archiva-webapp/src/jetty-env.xml
+++ b/archiva-web/archiva-webapp/src/jetty-env.xml
@@ -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>

diff --git a/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml b/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
index ca45a256391836686f4bff9cc6898e5457c55eab..f4a3d1a5c46fb198aa4160cb7e111ccd205e8ffb 100644 (file)
--- a/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
+++ b/archiva-web/archiva-webapp/src/main/resources/META-INF/plexus/application.xml
@@ -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>