You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by oc...@apache.org on 2008/03/04 07:13:46 UTC
svn commit: r633367 - in
/maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/src/main:
assembly/bin.xml etc/jetty.xml
Author: oching
Date: Mon Mar 3 22:13:38 2008
New Revision: 633367
URL: http://svn.apache.org/viewvc?rev=633367&view=rev
Log:
[MRM-688]
-added config for mail session and archiva and users db in jetty.xml
-unpack webapp included in tar ball
Modified:
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/src/main/assembly/bin.xml
maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/src/main/etc/jetty.xml
Modified: maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/src/main/assembly/bin.xml?rev=633367&r1=633366&r2=633367&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/src/main/assembly/bin.xml (original)
+++ maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/src/main/assembly/bin.xml Mon Mar 3 22:13:38 2008
@@ -114,7 +114,7 @@
</fileSets>
<dependencySets>
<dependencySet>
- <unpack>false</unpack>
+ <unpack>true</unpack>
<outputDirectory>apps/archiva</outputDirectory>
<includes>
<include>org.apache.maven.archiva:archiva-webapp</include>
Modified: maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/src/main/etc/jetty.xml
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/src/main/etc/jetty.xml?rev=633367&r1=633366&r2=633367&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/src/main/etc/jetty.xml (original)
+++ maven/archiva/trunk/archiva-web/archiva-standalone/archiva-jetty/src/main/etc/jetty.xml Mon Mar 3 22:13:38 2008
@@ -305,4 +305,72 @@
<Arg type="boolean">False</Arg>
</Call>
+
+ <!-- ARCHIVA CONFIG -->
+
+ <New id="validation_mail" class="org.mortbay.jetty.plus.naming.Resource">
+ <Arg>mail/Session</Arg>
+ <Arg>
+ <New class="org.mortbay.naming.factories.MailSessionReference">
+ <Set name="user"></Set>
+ <Set name="password"></Set>
+ <Set name="properties">
+ <New class="java.util.Properties">
+ <Put name="mail.smtp.host">localhost</Put>
+ <Put name="mail.from">archiva@localhost</Put>
+ <Put name="mail.senderName">Archiva</Put>
+ <Put name="mail.debug">true</Put>
+ </New>
+ </Set>
+ </New>
+ </Arg>
+ </New>
+
+ <!-- Archiva database -->
+
+ <New id="archiva" class="org.mortbay.jetty.plus.naming.Resource">
+ <Arg>jdbc/archiva</Arg>
+ <Arg>
+ <New class="org.apache.derby.jdbc.EmbeddedDataSource">
+ <Set name="DatabaseName">../databases/archiva</Set>
+ <Set name="user">sa</Set>
+ <Set name="createDatabase">create</Set>
+ </New>
+ </Arg>
+ </New>
+
+ <New id="archivaShutdown" class="org.mortbay.jetty.plus.naming.Resource">
+ <Arg>jdbc/archivaShutdown</Arg>
+ <Arg>
+ <New class="org.apache.derby.jdbc.EmbeddedDataSource">
+ <Set name="DatabaseName">../databases/archiva</Set>
+ <Set name="user">sa</Set>
+ <Set name="shutdownDatabase">shutdown</Set>
+ </New>
+ </Arg>
+ </New>
+
+ <!-- Users / Security Database -->
+
+ <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">../databases/users</Set>
+ <Set name="user">sa</Set>
+ <Set name="createDatabase">create</Set>
+ </New>
+ </Arg>
+ </New>
+
+ <New id="usersShutdown" class="org.mortbay.jetty.plus.naming.Resource">
+ <Arg>jdbc/usersShutdown</Arg>
+ <Arg>
+ <New class="org.apache.derby.jdbc.EmbeddedDataSource">
+ <Set name="DatabaseName">../databases/users</Set>
+ <Set name="user">sa</Set>
+ <Set name="shutdownDatabase">shutdown</Set>
+ </New>
+ </Arg>
+ </New>
</Configure>