You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by mp...@apache.org on 2002/07/11 09:37:46 UTC
cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/util/mail SimpleEmail.java MultiPartEmail.java Email.java
mpoeschl 2002/07/11 00:37:46
Modified: src/java/org/apache/turbine/util/mail SimpleEmail.java
MultiPartEmail.java Email.java
Log:
use org.apache.torque
Revision Changes Path
1.2 +6 -6 jakarta-turbine-2/src/java/org/apache/turbine/util/mail/SimpleEmail.java
Index: SimpleEmail.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/mail/SimpleEmail.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimpleEmail.java 16 Aug 2001 05:09:57 -0000 1.1
+++ SimpleEmail.java 11 Jul 2002 07:37:46 -0000 1.2
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -59,7 +59,7 @@
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
-import org.apache.turbine.util.db.Criteria;
+import org.apache.torque.util.Criteria;
/**
* This class is used to send simple internet email messages without
1.2 +7 -7 jakarta-turbine-2/src/java/org/apache/turbine/util/mail/MultiPartEmail.java
Index: MultiPartEmail.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/mail/MultiPartEmail.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MultiPartEmail.java 16 Aug 2001 05:09:57 -0000 1.1
+++ MultiPartEmail.java 11 Jul 2002 07:37:46 -0000 1.2
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -70,7 +70,7 @@
import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeMultipart;
-import org.apache.turbine.util.db.Criteria;
+import org.apache.torque.util.Criteria;
/**
* A multipart email.
@@ -297,7 +297,7 @@
{
return attach( new URLDataSource(url), name, description, disposition );
}
-
+
/**
* Attach a file specified as a DataSource interface.
*
1.3 +6 -6 jakarta-turbine-2/src/java/org/apache/turbine/util/mail/Email.java
Index: Email.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/mail/Email.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Email.java 7 Sep 2001 17:20:30 -0000 1.2
+++ Email.java 11 Jul 2002 07:37:46 -0000 1.3
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -69,7 +69,7 @@
import javax.mail.internet.MimeMessage;
import org.apache.turbine.services.resources.TurbineResources;
-import org.apache.turbine.util.db.Criteria;
+import org.apache.torque.util.Criteria;
/**
* The base class for all email messages. This class sets the
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>