You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by da...@apache.org on 2005/12/12 05:18:03 UTC
svn commit: r356138 - in /geronimo/trunk:
assemblies/j2ee-installer/src/var/config/ assemblies/j2ee-jetty-server/
assemblies/j2ee-jetty-server/src/var/config/
assemblies/j2ee-tomcat-server/src/var/config/ configs/javamail/
configs/javamail/src/ configs...
Author: dain
Date: Sun Dec 11 20:17:58 2005
New Revision: 356138
URL: http://svn.apache.org/viewcvs?rev=356138&view=rev
Log:
Merged revision 356060 from branch 1.0: Added javamail configuration
Added:
geronimo/trunk/configs/javamail/
- copied from r356060, geronimo/branches/1.0/configs/javamail/
geronimo/trunk/configs/javamail/LICENSE.txt
- copied unchanged from r356060, geronimo/branches/1.0/configs/javamail/LICENSE.txt
geronimo/trunk/configs/javamail/NOTICE.txt
- copied unchanged from r356060, geronimo/branches/1.0/configs/javamail/NOTICE.txt
geronimo/trunk/configs/javamail/maven.xml
- copied unchanged from r356060, geronimo/branches/1.0/configs/javamail/maven.xml
geronimo/trunk/configs/javamail/project.properties
- copied unchanged from r356060, geronimo/branches/1.0/configs/javamail/project.properties
geronimo/trunk/configs/javamail/project.xml
- copied unchanged from r356060, geronimo/branches/1.0/configs/javamail/project.xml
geronimo/trunk/configs/javamail/src/
- copied from r356060, geronimo/branches/1.0/configs/javamail/src/
geronimo/trunk/configs/javamail/src/plan/
- copied from r356060, geronimo/branches/1.0/configs/javamail/src/plan/
geronimo/trunk/configs/javamail/src/plan/plan.xml
- copied unchanged from r356060, geronimo/branches/1.0/configs/javamail/src/plan/plan.xml
Modified:
geronimo/trunk/assemblies/j2ee-installer/src/var/config/config.xml
geronimo/trunk/assemblies/j2ee-jetty-server/project.xml
geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml
geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml
Modified: geronimo/trunk/assemblies/j2ee-installer/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-installer/src/var/config/config.xml?rev=356138&r1=356137&r2=356138&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-installer/src/var/config/config.xml (original)
+++ geronimo/trunk/assemblies/j2ee-installer/src/var/config/config.xml Sun Dec 11 20:17:58 2005
@@ -97,6 +97,12 @@
<attribute name="port">${PlanHTTPSPortPrimary}</attribute>
</gbean>
</configuration>
+ <configuration name="geronimo/javamail/1.0/car" load="false">
+ <gbean name="SMTPTransport">
+ <attribute name="host">localhost</attribute>
+ <attribute name="port">25</attribute>
+ </gbean>
+ </configuration>
<configuration name="geronimo/welcome-tomcat/${pom.currentVersion}/car" load="false"/>
<configuration name="geronimo/servlets-examples-tomcat/${pom.currentVersion}/car" load="false"/>
<configuration name="geronimo/jsp-examples-tomcat/${pom.currentVersion}/car" load="false"/>
Modified: geronimo/trunk/assemblies/j2ee-jetty-server/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-jetty-server/project.xml?rev=356138&r1=356137&r2=356138&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-jetty-server/project.xml (original)
+++ geronimo/trunk/assemblies/j2ee-jetty-server/project.xml Sun Dec 11 20:17:58 2005
@@ -172,6 +172,15 @@
<geronimo.assemble>install</geronimo.assemble>
</properties>
</dependency>
+ <dependency>
+ <groupId>geronimo</groupId>
+ <artifactId>javamail</artifactId>
+ <type>car</type>
+ <version>${pom.currentVersion}</version>
+ <properties>
+ <geronimo.assemble>install</geronimo.assemble>
+ </properties>
+ </dependency>
<!-- deployers -->
<dependency>
<groupId>geronimo</groupId>
Modified: geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml?rev=356138&r1=356137&r2=356138&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml (original)
+++ geronimo/trunk/assemblies/j2ee-jetty-server/src/var/config/config.xml Sun Dec 11 20:17:58 2005
@@ -83,6 +83,12 @@
<attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=geronimo/jetty/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=GBean,name=JettyWebContainer</attribute>
</gbean>
</configuration>
+ <configuration name="geronimo/javamail/1.0/car" load="false">
+ <gbean name="SMTPTransport">
+ <attribute name="host">localhost</attribute>
+ <attribute name="port">25</attribute>
+ </gbean>
+ </configuration>
<configuration name="geronimo/jetty-deployer/${pom.currentVersion}/car"/>
<configuration name="geronimo/welcome-jetty/${pom.currentVersion}/car"/>
<configuration name="geronimo/ldap-demo-jetty/${pom.currentVersion}/car"/>
Modified: geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml?rev=356138&r1=356137&r2=356138&view=diff
==============================================================================
--- geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml (original)
+++ geronimo/trunk/assemblies/j2ee-tomcat-server/src/var/config/config.xml Sun Dec 11 20:17:58 2005
@@ -89,6 +89,12 @@
<attribute name="listener">geronimo.server:J2EEApplication=null,J2EEModule=geronimo/tomcat/${pom.currentVersion}/car,J2EEServer=geronimo,j2eeType=GBean,name=TomcatWebContainer</attribute>
</gbean>
</configuration>
+ <configuration name="geronimo/javamail/1.0/car" load="false">
+ <gbean name="SMTPTransport">
+ <attribute name="host">localhost</attribute>
+ <attribute name="port">25</attribute>
+ </gbean>
+ </configuration>
<configuration name="geronimo/tomcat-deployer/${pom.currentVersion}/car"/>
<configuration name="geronimo/welcome-tomcat/${pom.currentVersion}/car"/>
<configuration name="geronimo/ldap-demo-tomcat/${pom.currentVersion}/car"/>