You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by tv...@apache.org on 2007/05/05 08:58:51 UTC
svn commit: r535465 [4/49] - in /jakarta/turbine/fulcrum/trunk: ./ bsf/
bsf/src/java/org/apache/fulcrum/bsf/ bsf/src/test/ bsf/xdocs/ cache/
cache/src/java/org/apache/fulcrum/cache/
cache/src/java/org/apache/fulcrum/cache/impl/ cache/src/test/ cache/sr...
Modified: jakarta/turbine/fulcrum/trunk/commonsemail/src/java/org/apache/fulcrum/commonsemail/impl/CommonsEmailDomainEntry.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/commonsemail/src/java/org/apache/fulcrum/commonsemail/impl/CommonsEmailDomainEntry.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/commonsemail/src/java/org/apache/fulcrum/commonsemail/impl/CommonsEmailDomainEntry.java (original)
+++ jakarta/turbine/fulcrum/trunk/commonsemail/src/java/org/apache/fulcrum/commonsemail/impl/CommonsEmailDomainEntry.java Fri May 4 23:58:06 2007
@@ -1,20 +1,22 @@
package org.apache.fulcrum.commonsemail.impl;
/*
- * Copyright 2004 Apache Software Foundation
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import java.util.Hashtable;
@@ -28,7 +30,7 @@
/**
* A service taking care of most of the commons-email configuration such as
- *
+ *
* <ul>
* <li>authentication</li>
* <li>mail session</li>
@@ -42,13 +44,13 @@
{
/** use SMTPAUTH */
public static final String AUTH_SMTP = "smtpauth";
-
+
/** use PopBeforeSmtp */
public static final String AUTH_POPBEFORESMTP = "popbeforesmtp";
-
+
/** use no authentication at all */
public static final String AUTH_NONE = "none";
-
+
/** the name of the domain */
private String domainName;
@@ -57,31 +59,31 @@
/** turn the diagnostic features on */
private boolean mailDump;
-
+
/** the bounce address */
private String mailBounceAddress;
-
+
/** debug mode for mail session */
private boolean mailDebug;
-
+
/** the charset being used for the mail */
private String mailCharset;
-
+
/** the address of the mail server */
private String mailSmtpHost;
/** the port of the mail server */
private int mailSmtpPort;
-
+
/** socket connection timeout value in milliseconds */
private int mailSmtpConnectionTimeout;
-
+
/** socket I/O timeout value in millisecond */
private int mailSmtpTimeout;
-
+
/** if the message has some valid and some invalid addresses, send the message anyway */
private boolean mailSmtpSendPartial;
-
+
/** the email address of the sender */
private String mailFromEmail;
@@ -93,25 +95,25 @@
/** the email address of the replyTo */
private String mailReplyToName;
-
+
/** the type of authentication */
private String authType;
-
+
/** the username for authentication */
private String authUsername;
-
+
/** the password for authentication */
private String authPassword;
-
- /** the POP server being used for popbeforesmtp */
+
+ /** the POP server being used for popbeforesmtp */
private String authPopHost;
-
+
/** the mail headers being used */
private Properties headers;
-
+
/** are we overwriting the TO recipients */
private boolean hasOverwriteTo;
-
+
/** the to address to be overwritten during send() */
private InternetAddress overwriteTo;
@@ -126,10 +128,10 @@
/** the bcc address to be overwritten during send() */
private InternetAddress overwriteBcc;
-
+
/** do we skip the sending */
private boolean mailDoNotSend;
-
+
/** is an application hook for onSuccess defined */
private boolean hasOnSuccessHook;
@@ -141,16 +143,16 @@
/** the configuration of the success hook */
private Configuration onSuccessHookConfiguration;
-
+
/** the configuration of the success hook */
- private Configuration onFailureHookConfiguration;
+ private Configuration onFailureHookConfiguration;
/** the configuration of the notSend hook */
- private Configuration onNotSendHookConfiguration;
+ private Configuration onNotSendHookConfiguration;
/**
- * Constructor.
- */
+ * Constructor.
+ */
public CommonsEmailDomainEntry()
{
this.headers = new Properties();
@@ -158,78 +160,78 @@
this.hasOverwriteCc = false;
this.hasOverwriteBcc = false;
}
-
+
/**
* Initialize this instance.
- *
- * @param conf the domain configuration
+ *
+ * @param conf the domain configuration
* @return the fully configured instance
* @throws ConfigurationException the configuration failed
*/
public CommonsEmailDomainEntry initialize( Configuration conf )
throws ConfigurationException
- {
+ {
// read the basic parameters
-
- this.domainName = conf.getChild("domainName").getValue();
+
+ this.domainName = conf.getChild("domainName").getValue();
this.domainMatch = conf.getChild("domainName").getValue(this.domainName);
-
+
this.mailBounceAddress = conf.getChild("mailBounceAddress").getValue(null);
this.mailDebug = conf.getChild("mailDebug").getValueAsBoolean(false);
this.mailCharset = conf.getChild("mailCharset").getValue(null);
-
+
this.mailSmtpHost = conf.getChild("mailSmtpHost").getValue(
System.getProperty("mail.smtp.host","localhost")
);
-
+
// determine SMTP port either from the configuration or from the system properties
-
- this.mailSmtpPort = conf.getChild("mailSmtpPort").getValueAsInteger(0);
-
+
+ this.mailSmtpPort = conf.getChild("mailSmtpPort").getValueAsInteger(0);
+
if( this.mailSmtpPort == 0 )
{
this.mailSmtpPort = Integer.parseInt(
System.getProperty("mail.smtp.port","25")
);
}
-
+
this.mailSmtpConnectionTimeout = conf.getChild("mailSmtpConnectionTimeout").getValueAsInteger(Integer.MAX_VALUE);
this.mailSmtpTimeout = conf.getChild("mailSmtpConnectionTimeout").getValueAsInteger(Integer.MAX_VALUE);
this.mailSmtpSendPartial = conf.getChild("mailSmtpSendPartial").getValueAsBoolean(false);
this.mailFromEmail = conf.getChild("mailFromEmail").getValue(null);
this.mailFromName = conf.getChild("mailFromName").getValue(null);
this.mailReplyToEmail = conf.getChild("mailReplyToEmail").getValue(this.mailFromEmail);
- this.mailReplyToName = conf.getChild("mailReplyToName").getValue(this.mailFromName);
+ this.mailReplyToName = conf.getChild("mailReplyToName").getValue(this.mailFromName);
this.mailDump = conf.getChild("mailDump").getValueAsBoolean(false);
this.mailDoNotSend = conf.getChild("mailDoNotSend").getValueAsBoolean(false);
-
+
// parse the authentication related parameters
-
+
this.authType = conf.getChild("authentication").getChild("type").getValue(AUTH_NONE);
-
+
if( this.hasAuthentication() )
{
this.authPopHost = conf.getChild("authentication").getChild("popHost").getValue(this.mailSmtpHost);
this.authUsername = conf.getChild("authentication").getChild("username").getValue();
this.authPassword = conf.getChild("authentication").getChild("password").getValue();
}
-
+
// parse the email headers
-
+
Configuration[] headersConf = conf.getChild("headers").getChildren("property");
-
+
for( int i=0; i<headersConf.length; i++ )
{
String name = headersConf[i].getAttribute("name");
String value = headersConf[i].getValue();
- this.headers.setProperty(name,value);
+ this.headers.setProperty(name,value);
}
-
+
// parse the overwrites
-
+
String internetAddress = null;
Configuration overwritesConf = conf.getChild("overwrites");
-
+
try
{
if( overwritesConf.getChild("mailToEmail",false) != null )
@@ -264,47 +266,47 @@
}
catch (AddressException e)
{
- String msg = "Unable to parse " + internetAddress;
+ String msg = "Unable to parse " + internetAddress;
throw new ConfigurationException(msg,e);
}
-
+
// parse the application hooks
-
+
Configuration hookConf = conf.getChild("hooks");
-
+
this.hasOnSuccessHook = hookConf.getChild("onSuccess").getAttributeAsBoolean("enabled", false);
-
+
if( this.hasOnSuccessHook() )
{
this.onSuccessHookConfiguration = hookConf.getChild("onSuccess");
}
-
+
this.hasOnFailureHook = hookConf.getChild("onFailure").getAttributeAsBoolean("enabled", false);
if( this.hasOnFailureHook())
{
this.onFailureHookConfiguration = hookConf.getChild("onFailure");
}
-
+
this.hasOnNotSendHook = hookConf.getChild("onNotSend").getAttributeAsBoolean("enabled", false);
if( this.hasOnNotSendHook())
{
this.onNotSendHookConfiguration = hookConf.getChild("onNotSend");
}
-
+
return this;
}
-
+
/**
* @see java.lang.Object#toString()
*/
public String toString()
{
StringBuffer result = new StringBuffer();
-
+
result.append(getClass().getName() + "@" + Integer.toHexString(hashCode()));
-
+
result.append('[');
result.append("authPopHost=" + this.getAuthPopHost());
result.append(',');
@@ -316,51 +318,51 @@
result.append(',');
result.append("domainName=" + this.getDomainName());
result.append(',');
- result.append("hasOverwriteCc=" + this.getHasOverwriteBcc());
+ result.append("hasOverwriteCc=" + this.getHasOverwriteBcc());
result.append(',');
- result.append("hasOverwriteBcc=" + this.getHasOverwriteBcc());
+ result.append("hasOverwriteBcc=" + this.getHasOverwriteBcc());
result.append(',');
- result.append("hasOverwriteTo=" + this.getHasOverwriteTo());
+ result.append("hasOverwriteTo=" + this.getHasOverwriteTo());
result.append(',');
- result.append("headers=" + this.getHeaders());
+ result.append("headers=" + this.getHeaders());
result.append(',');
- result.append("mailBounceAddress=" + this.getMailBounceAddress());
+ result.append("mailBounceAddress=" + this.getMailBounceAddress());
result.append(',');
- result.append("mailCharset=" + this.getMailCharset());
+ result.append("mailCharset=" + this.getMailCharset());
result.append(',');
- result.append("mailDebug=" + this.mailDebug);
+ result.append("mailDebug=" + this.mailDebug);
result.append(',');
- result.append("mailDump=" + this.mailDump);
+ result.append("mailDump=" + this.mailDump);
result.append(',');
- result.append("mailFromEmail=" + this.getMailFromEmail());
+ result.append("mailFromEmail=" + this.getMailFromEmail());
result.append(',');
- result.append("mailFromName=" + this.getMailFromName());
+ result.append("mailFromName=" + this.getMailFromName());
result.append(',');
- result.append("mailReplyToEmail=" + this.getMailReplyToEmail());
+ result.append("mailReplyToEmail=" + this.getMailReplyToEmail());
result.append(',');
- result.append("mailReplyToName=" + this.getMailReplyToName());
+ result.append("mailReplyToName=" + this.getMailReplyToName());
result.append(',');
- result.append("mailSmtpHost=" + this.getMailSmtpHost());
+ result.append("mailSmtpHost=" + this.getMailSmtpHost());
result.append(',');
- result.append("mailSmtpPort=" + this.getMailSmtpPort());
+ result.append("mailSmtpPort=" + this.getMailSmtpPort());
result.append(',');
- result.append("mailSmtpConnectionTimeout=" + this.getMailSmtpConnectionTimeout());
+ result.append("mailSmtpConnectionTimeout=" + this.getMailSmtpConnectionTimeout());
result.append(',');
- result.append("mailSmtpTimeout=" + this.getMailSmtpTimeout());
+ result.append("mailSmtpTimeout=" + this.getMailSmtpTimeout());
result.append(',');
- result.append("mailSmtpSendPartial=" + this.isMailSmtpSendPartial());
+ result.append("mailSmtpSendPartial=" + this.isMailSmtpSendPartial());
result.append(',');
- result.append("overwriteBcc=" + this.getOverwriteBcc());
+ result.append("overwriteBcc=" + this.getOverwriteBcc());
result.append(',');
- result.append("overwriteCc=" + this.getOverwriteCc());
+ result.append("overwriteCc=" + this.getOverwriteCc());
result.append(',');
- result.append("overwriteTo=" + this.getOverwriteTo());
+ result.append("overwriteTo=" + this.getOverwriteTo());
result.append(']');
-
- return result.toString();
+
+ return result.toString();
}
-
+
/**
* @return Returns the authPassword.
*/
@@ -368,7 +370,7 @@
{
return authPassword;
}
-
+
/**
* @return Returns the authPopHost.
*/
@@ -376,7 +378,7 @@
{
return authPopHost;
}
-
+
/**
* @return Returns the authType.
*/
@@ -384,7 +386,7 @@
{
return authType;
}
-
+
/**
* @return Returns the authUsername.
*/
@@ -392,7 +394,7 @@
{
return authUsername;
}
-
+
/**
* @return Returns the mailBounceAddress.
*/
@@ -400,7 +402,7 @@
{
return mailBounceAddress;
}
-
+
/**
* @return Returns the domainName.
*/
@@ -408,7 +410,7 @@
{
return domainName;
}
-
+
/**
* @return Returns the domainMatch.
*/
@@ -416,7 +418,7 @@
{
return domainMatch;
}
-
+
/**
* @return Returns the headers.
*/
@@ -424,7 +426,7 @@
{
return headers;
}
-
+
/**
* @return Returns the overwriteBcc.
*/
@@ -432,7 +434,7 @@
{
return overwriteBcc;
}
-
+
/**
* @return Returns the overwriteCc.
*/
@@ -440,7 +442,7 @@
{
return overwriteCc;
}
-
+
/**
* @return Returns the overwriteTo.
*/
@@ -448,7 +450,7 @@
{
return overwriteTo;
}
-
+
/**
* @return Returns the mailCharset.
*/
@@ -456,7 +458,7 @@
{
return mailCharset;
}
-
+
/**
* @return Returns the mailDebug.
*/
@@ -464,7 +466,7 @@
{
return mailDebug;
}
-
+
/**
* @return Returns the mailFromEmail.
*/
@@ -472,7 +474,7 @@
{
return mailFromEmail;
}
-
+
/**
* @return Returns the mailFromName.
*/
@@ -480,7 +482,7 @@
{
return mailFromName;
}
-
+
/**
* @return Returns the mailReplyToEmail.
*/
@@ -488,7 +490,7 @@
{
return mailReplyToEmail;
}
-
+
/**
* @return Returns the mailReplyToName.
*/
@@ -496,7 +498,7 @@
{
return mailReplyToName;
}
-
+
/**
* @return Returns the mailSmtpHost.
*/
@@ -504,7 +506,7 @@
{
return mailSmtpHost;
}
-
+
/**
* @return Returns the mailSmtpPort.
*/
@@ -512,7 +514,7 @@
{
return mailSmtpPort;
}
-
+
/**
* @return Returns the mailSmtpConnectionTimeout.
*/
@@ -520,7 +522,7 @@
{
return mailSmtpConnectionTimeout;
}
-
+
/**
* @return Returns the mailSmtpTimeout.
*/
@@ -528,7 +530,7 @@
{
return mailSmtpTimeout;
}
-
+
/**
* @return Returns the mailSmtpSendPartial.
*/
@@ -536,7 +538,7 @@
{
return mailSmtpSendPartial;
}
-
+
/**
* @return Is any type of authentication used for this domain?
*/
@@ -581,7 +583,7 @@
return false;
}
}
-
+
/**
* @return Returns the mailDump.
*/
@@ -589,7 +591,7 @@
{
return mailDump;
}
-
+
/**
* @return Returns the hasOverwriteBcc.
*/
@@ -597,7 +599,7 @@
{
return hasOverwriteBcc;
}
-
+
/**
* @return Returns the hasOverwriteCc.
*/
@@ -612,15 +614,15 @@
{
return hasOverwriteTo;
}
-
+
/**
* @return Returns the mailDoNotSend.
*/
public boolean isMailDoNotSend()
{
return mailDoNotSend;
- }
-
+ }
+
/**
* @return Returns the hasOnFailureHook.
*/
@@ -628,7 +630,7 @@
{
return hasOnFailureHook;
}
-
+
/**
* @return Returns the hasOnSuccessHook.
*/
@@ -636,7 +638,7 @@
{
return hasOnSuccessHook;
}
-
+
/**
* @return Returns the onFailureHookConfiguration.
*/
@@ -644,7 +646,7 @@
{
return onFailureHookConfiguration;
}
-
+
/**
* @return Returns the onSuccessHookConfiguration.
*/
@@ -652,7 +654,7 @@
{
return onSuccessHookConfiguration;
}
-
+
/**
* @return Returns the hasOnNotSendHook.
*/
@@ -660,7 +662,7 @@
{
return hasOnNotSendHook;
}
-
+
/**
* @return Returns the onNotSendHookConfiguration.
*/
@@ -668,4 +670,4 @@
{
return onNotSendHookConfiguration;
}
-}
\ No newline at end of file
+}
Modified: jakarta/turbine/fulcrum/trunk/commonsemail/src/java/org/apache/fulcrum/commonsemail/impl/CommonsEmailServiceImpl.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/commonsemail/src/java/org/apache/fulcrum/commonsemail/impl/CommonsEmailServiceImpl.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/commonsemail/src/java/org/apache/fulcrum/commonsemail/impl/CommonsEmailServiceImpl.java (original)
+++ jakarta/turbine/fulcrum/trunk/commonsemail/src/java/org/apache/fulcrum/commonsemail/impl/CommonsEmailServiceImpl.java Fri May 4 23:58:06 2007
@@ -1,20 +1,22 @@
package org.apache.fulcrum.commonsemail.impl;
/*
- * Copyright 2004 Apache Software Foundation
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import java.io.File;
@@ -1416,4 +1418,4 @@
return result;
}
-}
\ No newline at end of file
+}
Modified: jakarta/turbine/fulcrum/trunk/commonsemail/src/java/org/apache/fulcrum/commonsemail/impl/CommonsEmailSmtpConstants.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/commonsemail/src/java/org/apache/fulcrum/commonsemail/impl/CommonsEmailSmtpConstants.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/commonsemail/src/java/org/apache/fulcrum/commonsemail/impl/CommonsEmailSmtpConstants.java (original)
+++ jakarta/turbine/fulcrum/trunk/commonsemail/src/java/org/apache/fulcrum/commonsemail/impl/CommonsEmailSmtpConstants.java Fri May 4 23:58:06 2007
@@ -1,141 +1,143 @@
-package org.apache.fulcrum.commonsemail.impl;
-
-/*
- * Copyright 2004 Apache Software Foundation
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- * implied.
- *
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-/**
- * Contains all SMTP releated session properties for javamail-1.3.3.
- *
- * @author <a href="mailto:siegfried.goeschl@it20one.at">Siegfried Goeschl</a>
- */
-
-public interface CommonsEmailSmtpConstants
-{
- /** Default user name for SMTP */
- public static final String MAIL_SMTP_USER = "mail.smtp.user";
-
- /** The SMTP server to connect to */
- public static final String MAIL_SMTP_HOST = "mail.smtp.host";
-
- /**
- * The SMTP server port to connect to, if the connect() method
- * doesn't explicitly specify one. Defaults to 25
- */
- public static final String MAIL_SMTP_PORT = "mail.smtp.port";
-
- /**
- * Socket connection timeout value in milliseconds. Default is
- * infinite timeout.
- */
- public static final String MAIL_SMTP_CONNECTIONTIMEOUT = "mail.smtp.connectiontimeout";
-
- /**
- * Socket I/O timeout value in milliseconds. Default is infinite timeout.
- */
- public static final String MAIL_SMTP_TIMEOUT = "mail.smtp.timeout";
-
- /** Email address to use for SMTP MAIL command */
- public static final String MAIL_SMTP_FROM = "mail.smtp.from";
-
- /** Local host name used in the SMTP HELO or EHLO command */
- public static final String MAIL_SMTP_LOCALHOST = "mail.smtp.localhost";
-
- /** Local address (host name) to bind to when creating the SMTP socket */
- public static final String MAIL_SMTP_LOCALADDRESS = "mail.smtp.localaddress";
-
- /** Local port number to bind to when creating the SMTP socket */
- public static final String MAIL_SMTP_LOCALPORT = "mail.smtp.localport";
-
- /** If false, do not attempt to sign on with the EHLO command */
- public static final String MAIL_SMTP_EHLO = "mail.smtp.ehlo";
-
- /** If true, attempt to authenticate the user using the AUTH command */
- public static final String MAIL_SMTP_AUTH = "mail.smtp.auth";
-
- /** The submitter to use in the AUTH tag in the MAIL FROM command */
- public static final String MAIL_SMTP_SUBMITTER = "mail.smtp.submitter";
-
- /**
- * The NOTIFY option to the RCPT command. Either NEVER, or some combination of
- * SUCCESS, FAILURE, and DELAY (separated by commas).
- */
- public static final String MAIL_SMTP_DSN_NOTIFY = "mail.smtp.dsn.notify";
-
- /** The RET option to the MAIL command. Either FULL or HDRS. */
- public static final String MAIL_SMTP_DSN_RET = "mail.smtp.dsn.ret";
-
- /**
- * If set to true, and the server supports the 8BITMIME extension,
- * text parts of messages that use the "quoted-printable" or
- * "base64" encodings are converted to use "8bit" encoding if they
- * follow the RFC2045 rules for 8bit text.*/
- public static final String MAIL_SMTP_ALLOW8BITMIME = "mail.smtp.allow8bitmime";
-
- /**
- * If set to true, and a message has some valid and some invalid
- * addresses, send the message anyway, reporting the partial failure
- * with a SendFailedException. If set to false (the default), the
- * message is not sent to any of the recipients if there is an
- * invalid recipient address. */
- public static final String MAIL_SMTP_SENTPARTIAL = "mail.smtp.sendpartial";
-
- /** The realm to use with DIGEST-MD5 authentication. */
- public static final String MAIL_SMTP_SASL_REALM = "mail.smtp.sasl.realm";
-
- /** If set to true, causes the transport to wait for the response to the QUIT command */
- public static final String MAIL_SMTP_QUITWAIT = "mail.smtp.quitwait";
-
- /**
- * If set to true, causes the transport to include an SMTPAddressSucceededException
- * for each address that is successful. Note also that this will cause
- * a SendFailedException to be thrown from the sendMessage method of
- * SMTPTransport even if all addresses were correct and the message
- * was sent successfully.
- */
- public static final String MAIL_SMTP_REPORTSUCCESS = "mail.smtp.reportsuccess";
-
- /**
- * If set, specifies the name of a class that implements the
- * javax.net.SocketFactory interface. This class will be used to create
- * SMTP sockets.
- */
- public static final String MAIL_SMTP_SOCKETFACTORY_CLASS = "mail.smtp.socketFactory.class";
-
- /**
- * If set to true, failure to create a socket using the specified
- * socket factory class will cause the socket to be created
- * using the java.net.Socket class. Defaults to true
- */
- public static final String MAIL_SMTP_SOCKETFACTORY_FALLBACK = "mail.smtp.socketFactory.fallback";
-
- /**
- * Specifies the port to connect to when using the specified socket factory.
- * If not set, the default port will be used.
- */
- public static final String MAIL_SMTP_SOCKETFACTORY_PORT = "mail.smtp.socketFactory.port";
-
- /**
- * Extension string to append to the MAIL command. The extension string
- * can be used to specify standard SMTP service extensions as well
- * as vendor-specific extensions. Typically the application should use
- * the SMTPTransport method supportsExtension to verify that the server
- * supports the desired service extension. See RFC 1869 and other RFCs
- * that define specific extensions.
- * */
- public static final String MAIL_SMTP_MAILEXTENSION = "mail.smtp.mailextension";
-}
\ No newline at end of file
+package org.apache.fulcrum.commonsemail.impl;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+/**
+ * Contains all SMTP releated session properties for javamail-1.3.3.
+ *
+ * @author <a href="mailto:siegfried.goeschl@it20one.at">Siegfried Goeschl</a>
+ */
+
+public interface CommonsEmailSmtpConstants
+{
+ /** Default user name for SMTP */
+ public static final String MAIL_SMTP_USER = "mail.smtp.user";
+
+ /** The SMTP server to connect to */
+ public static final String MAIL_SMTP_HOST = "mail.smtp.host";
+
+ /**
+ * The SMTP server port to connect to, if the connect() method
+ * doesn't explicitly specify one. Defaults to 25
+ */
+ public static final String MAIL_SMTP_PORT = "mail.smtp.port";
+
+ /**
+ * Socket connection timeout value in milliseconds. Default is
+ * infinite timeout.
+ */
+ public static final String MAIL_SMTP_CONNECTIONTIMEOUT = "mail.smtp.connectiontimeout";
+
+ /**
+ * Socket I/O timeout value in milliseconds. Default is infinite timeout.
+ */
+ public static final String MAIL_SMTP_TIMEOUT = "mail.smtp.timeout";
+
+ /** Email address to use for SMTP MAIL command */
+ public static final String MAIL_SMTP_FROM = "mail.smtp.from";
+
+ /** Local host name used in the SMTP HELO or EHLO command */
+ public static final String MAIL_SMTP_LOCALHOST = "mail.smtp.localhost";
+
+ /** Local address (host name) to bind to when creating the SMTP socket */
+ public static final String MAIL_SMTP_LOCALADDRESS = "mail.smtp.localaddress";
+
+ /** Local port number to bind to when creating the SMTP socket */
+ public static final String MAIL_SMTP_LOCALPORT = "mail.smtp.localport";
+
+ /** If false, do not attempt to sign on with the EHLO command */
+ public static final String MAIL_SMTP_EHLO = "mail.smtp.ehlo";
+
+ /** If true, attempt to authenticate the user using the AUTH command */
+ public static final String MAIL_SMTP_AUTH = "mail.smtp.auth";
+
+ /** The submitter to use in the AUTH tag in the MAIL FROM command */
+ public static final String MAIL_SMTP_SUBMITTER = "mail.smtp.submitter";
+
+ /**
+ * The NOTIFY option to the RCPT command. Either NEVER, or some combination of
+ * SUCCESS, FAILURE, and DELAY (separated by commas).
+ */
+ public static final String MAIL_SMTP_DSN_NOTIFY = "mail.smtp.dsn.notify";
+
+ /** The RET option to the MAIL command. Either FULL or HDRS. */
+ public static final String MAIL_SMTP_DSN_RET = "mail.smtp.dsn.ret";
+
+ /**
+ * If set to true, and the server supports the 8BITMIME extension,
+ * text parts of messages that use the "quoted-printable" or
+ * "base64" encodings are converted to use "8bit" encoding if they
+ * follow the RFC2045 rules for 8bit text.*/
+ public static final String MAIL_SMTP_ALLOW8BITMIME = "mail.smtp.allow8bitmime";
+
+ /**
+ * If set to true, and a message has some valid and some invalid
+ * addresses, send the message anyway, reporting the partial failure
+ * with a SendFailedException. If set to false (the default), the
+ * message is not sent to any of the recipients if there is an
+ * invalid recipient address. */
+ public static final String MAIL_SMTP_SENTPARTIAL = "mail.smtp.sendpartial";
+
+ /** The realm to use with DIGEST-MD5 authentication. */
+ public static final String MAIL_SMTP_SASL_REALM = "mail.smtp.sasl.realm";
+
+ /** If set to true, causes the transport to wait for the response to the QUIT command */
+ public static final String MAIL_SMTP_QUITWAIT = "mail.smtp.quitwait";
+
+ /**
+ * If set to true, causes the transport to include an SMTPAddressSucceededException
+ * for each address that is successful. Note also that this will cause
+ * a SendFailedException to be thrown from the sendMessage method of
+ * SMTPTransport even if all addresses were correct and the message
+ * was sent successfully.
+ */
+ public static final String MAIL_SMTP_REPORTSUCCESS = "mail.smtp.reportsuccess";
+
+ /**
+ * If set, specifies the name of a class that implements the
+ * javax.net.SocketFactory interface. This class will be used to create
+ * SMTP sockets.
+ */
+ public static final String MAIL_SMTP_SOCKETFACTORY_CLASS = "mail.smtp.socketFactory.class";
+
+ /**
+ * If set to true, failure to create a socket using the specified
+ * socket factory class will cause the socket to be created
+ * using the java.net.Socket class. Defaults to true
+ */
+ public static final String MAIL_SMTP_SOCKETFACTORY_FALLBACK = "mail.smtp.socketFactory.fallback";
+
+ /**
+ * Specifies the port to connect to when using the specified socket factory.
+ * If not set, the default port will be used.
+ */
+ public static final String MAIL_SMTP_SOCKETFACTORY_PORT = "mail.smtp.socketFactory.port";
+
+ /**
+ * Extension string to append to the MAIL command. The extension string
+ * can be used to specify standard SMTP service extensions as well
+ * as vendor-specific extensions. Typically the application should use
+ * the SMTPTransport method supportsExtension to verify that the server
+ * supports the desired service extension. See RFC 1869 and other RFCs
+ * that define specific extensions.
+ * */
+ public static final String MAIL_SMTP_MAILEXTENSION = "mail.smtp.mailextension";
+}
Modified: jakarta/turbine/fulcrum/trunk/commonsemail/src/test/TestComponentConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/commonsemail/src/test/TestComponentConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/commonsemail/src/test/TestComponentConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/commonsemail/src/test/TestComponentConfig.xml Fri May 4 23:58:06 2007
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<componentConfig>
Modified: jakarta/turbine/fulcrum/trunk/commonsemail/src/test/TestRoleConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/commonsemail/src/test/TestRoleConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/commonsemail/src/test/TestRoleConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/commonsemail/src/test/TestRoleConfig.xml Fri May 4 23:58:06 2007
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<role-list>
<role
@@ -7,5 +25,5 @@
default-class="org.apache.fulcrum.commonsemail.impl.CommonsEmailServiceImpl"
early-init="true"
description="Simplifies the usage of commons-email"
- />
-</role-list>
\ No newline at end of file
+ />
+</role-list>
Modified: jakarta/turbine/fulcrum/trunk/commonsemail/src/test/org/apache/fulcrum/commonsemail/CommonsEmailServiceTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/commonsemail/src/test/org/apache/fulcrum/commonsemail/CommonsEmailServiceTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/commonsemail/src/test/org/apache/fulcrum/commonsemail/CommonsEmailServiceTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/commonsemail/src/test/org/apache/fulcrum/commonsemail/CommonsEmailServiceTest.java Fri May 4 23:58:06 2007
@@ -1,3 +1,21 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
package org.apache.fulcrum.commonsemail;
/*
@@ -36,13 +54,13 @@
{
/** the service to test */
private CommonsEmailService service;
-
+
/** the default subject */
private String subject;
-
+
/** the default domain */
private String domain;
-
+
/** the recipient of the email */
private String mailTo;
@@ -51,10 +69,10 @@
/** the generated MimeMessage */
private MimeMessage result;
-
+
/** default plain text content */
private static final String PLAIN_CONTENT = "Hello World";
-
+
/** default HTML text content */
private static final String HTML_CONTENT = "<h1>Hello World</h1>";
@@ -74,7 +92,7 @@
protected void setUp() throws Exception
{
super.setUp();
-
+
this.domain = "test";
this.subject = this.getName();
this.mailFrom = "demo@it20one.at";
@@ -90,14 +108,14 @@
fail(e.getMessage());
}
}
-
+
/**
* @see junit.framework.TestCase#tearDown()
*/
protected void tearDown()
{
if( this.result != null )
- {
+ {
try
{
File resultFile = new File( new File("temp"), this.getName()+".eml" );
@@ -110,30 +128,30 @@
{
e.printStackTrace();
throw new RuntimeException(e.getMessage());
- }
+ }
}
-
+
super.tearDown();
}
-
+
/**
* Add all of our test suites
*/
public static Test suite()
{
TestSuite suite= new TestSuite();
-
- suite.addTest( new CommonsEmailServiceTest("testDefaultDomain") );
- suite.addTest( new CommonsEmailServiceTest("testDerivedDomain") );
- suite.addTest( new CommonsEmailServiceTest("testHtmlEmail") );
- suite.addTest( new CommonsEmailServiceTest("testHtmlEmailWithHashtable") );
- suite.addTest( new CommonsEmailServiceTest("testMultiPartEmail") );
- suite.addTest( new CommonsEmailServiceTest("testSendEmailToUnknownServer") );
- suite.addTest( new CommonsEmailServiceTest("testSendMimeMessage") );
- suite.addTest( new CommonsEmailServiceTest("testSimpleEmail") );
- suite.addTest( new CommonsEmailServiceTest("testSimpleEmailWithHashtable") );
- suite.addTest( new CommonsEmailServiceTest("testCreateMimeMessageWithSession") );
-
+
+ suite.addTest( new CommonsEmailServiceTest("testDefaultDomain") );
+ suite.addTest( new CommonsEmailServiceTest("testDerivedDomain") );
+ suite.addTest( new CommonsEmailServiceTest("testHtmlEmail") );
+ suite.addTest( new CommonsEmailServiceTest("testHtmlEmailWithHashtable") );
+ suite.addTest( new CommonsEmailServiceTest("testMultiPartEmail") );
+ suite.addTest( new CommonsEmailServiceTest("testSendEmailToUnknownServer") );
+ suite.addTest( new CommonsEmailServiceTest("testSendMimeMessage") );
+ suite.addTest( new CommonsEmailServiceTest("testSimpleEmail") );
+ suite.addTest( new CommonsEmailServiceTest("testSimpleEmailWithHashtable") );
+ suite.addTest( new CommonsEmailServiceTest("testCreateMimeMessageWithSession") );
+
return suite;
}
@@ -144,7 +162,7 @@
{
return this.service;
}
-
+
/**
* @return Returns the mail subject.
*/
@@ -152,7 +170,7 @@
{
return subject;
}
-
+
/**
* @return Returns the domain name.
*/
@@ -160,7 +178,7 @@
{
return domain;
}
-
+
/**
* @return Returns the mailTo.
*/
@@ -168,7 +186,7 @@
{
return mailTo;
}
-
+
/**
* @return Returns the mailFrom.
*/
@@ -176,7 +194,7 @@
{
return mailFrom;
}
-
+
/**
* @return a preconfigured attachment
*/
@@ -187,94 +205,94 @@
attachment.setDisposition(EmailAttachment.ATTACHMENT);
attachment.setName("TestComponentConfig.xml");
attachment.setDescription("TestComponentConfig.xml");
-
- return attachment;
+
+ return attachment;
}
/////////////////////////////////////////////////////////////////////////
// Start of unit tests
/////////////////////////////////////////////////////////////////////////
/**
- * Create a simple email and send it.
+ * Create a simple email and send it.
*/
public void testSimpleEmail() throws Exception
{
SimpleEmail email = this.getService().createSimpleEmail(this.getDomain());
-
- email.setSubject(this.getSubject());
+
+ email.setSubject(this.getSubject());
email.setMsg(PLAIN_CONTENT);
email.addTo(this.getMailTo());
-
+
this. result = this.getService().send(this.getDomain(),email);
}
/**
- * Create a HTML email and send it.
+ * Create a HTML email and send it.
*/
public void testHtmlEmail() throws Exception
{
HtmlEmail email = this.getService().createHtmlEmail(this.getDomain());
-
- email.setSubject(this.getSubject());
+
+ email.setSubject(this.getSubject());
email.setTextMsg(PLAIN_CONTENT);
- email.setHtmlMsg(HTML_CONTENT);
+ email.setHtmlMsg(HTML_CONTENT);
email.addTo(this.getMailTo());
-
- this.result = this.getService().send(this.getDomain(),email);
+
+ this.result = this.getService().send(this.getDomain(),email);
}
-
+
/**
- * Create a MultiPart email and send it.
+ * Create a MultiPart email and send it.
*/
public void testMultiPartEmail() throws Exception
{
- MultiPartEmail email = this.getService().createMultiPartEmail(this.getDomain());
+ MultiPartEmail email = this.getService().createMultiPartEmail(this.getDomain());
EmailAttachment attachment = this.getEmailAttachment();
-
+
email.setSubject(this.getSubject());
- email.attach(attachment);
+ email.attach(attachment);
email.addTo(this.getMailTo());
email.setMsg(PLAIN_CONTENT);
this.result = this.getService().send(this.getDomain(),email);
- }
-
+ }
+
/**
* Use an undefined domain therefore reverting to the default domain.
- *
+ *
* @throws Exception
*/
public void testDefaultDomain() throws Exception
{
SimpleEmail email = this.getService().createSimpleEmail("grmpff");
-
- email.setSubject(this.getSubject());
+
+ email.setSubject(this.getSubject());
email.setMsg(PLAIN_CONTENT);
email.addTo(this.getMailTo());
-
- this.result = this.getService().send(this.getDomain(),email);
+
+ this.result = this.getService().send(this.getDomain(),email);
}
-
+
/**
* We pass "demo@it20one.at" therefore we should get the "it20one.at" domain
- *
+ *
* @throws Exception
*/
public void testDerivedDomain() throws Exception
{
SimpleEmail email = this.getService().createSimpleEmail("demo@it20one.at");
-
+
email.setFrom(this.getMailFrom());
- email.setSubject(this.getSubject());
+ email.setSubject(this.getSubject());
email.setMsg(PLAIN_CONTENT);
email.addTo(this.getMailTo());
-
- this.result = this.getService().send(email);
+
+ this.result = this.getService().send(email);
}
-
+
/**
* Create a HTML email using a Hashtable as input.
- *
+ *
* @throws Exception
*/
public void testHtmlEmailWithHashtable() throws Exception
@@ -290,18 +308,18 @@
content.put(Email.SENDER_EMAIL, this.getMailFrom());
content.put(Email.RECEIVER_EMAIL, this.getMailTo());
content.put(Email.ATTACHMENTS, attachments);
-
+
HtmlEmail email = this.getService().createHtmlEmail(
this.getMailFrom(),
content
);
-
- this.result = this.getService().send(email);
+
+ this.result = this.getService().send(email);
}
-
+
/**
* Create a simple email using a Hashtable as input.
- *
+ *
* @throws Exception
*/
public void testSimpleEmailWithHashtable() throws Exception
@@ -311,15 +329,15 @@
content.put(Email.EMAIL_BODY, PLAIN_CONTENT);
content.put(Email.SENDER_EMAIL, this.getMailFrom());
content.put(Email.RECEIVER_EMAIL, this.getMailTo());
-
+
SimpleEmail email = this.getService().createSimpleEmail(
this.getMailFrom(),
content
);
-
- this.result = this.getService().send(email);
- }
-
+
+ this.result = this.getService().send(email);
+ }
+
/**
* Create an email and send it to a bogus mailserver
* resulting in an EmailException. For this test we
@@ -335,16 +353,16 @@
content.put(Email.RECEIVER_EMAIL, this.getMailTo());
content.put(Email.MAIL_HOST, "localhost");
content.put(Email.MAIL_PORT, "63178");
-
+
SimpleEmail email = this.getService().createSimpleEmail(
this.getMailFrom(),
content
);
-
+
try
{
this.result = this.getService().send(email);
-
+
if( this.getService().isMailDoNotSend(email.getFromAddress().getAddress()) == false )
{
fail();
@@ -355,16 +373,16 @@
// expected
}
}
-
+
/**
- * Create a mail session and simple MimeMessage and sent it
+ * Create a mail session and simple MimeMessage and sent it
* @throws Exception the test failed
*/
public void testCreateMimeMessageWithSession() throws Exception
{
MimeMessage mimeMessage = null;
Session session = this.getService().createSmtpSession("test","foo","bar");
-
+
mimeMessage = new MimeMessage(session);
mimeMessage.setFrom(new InternetAddress(this.mailFrom));
mimeMessage.setSubject(this.getSubject());
@@ -378,21 +396,21 @@
}
/**
* Use commons-email to build a MimeMessage and send it directly
- *
+ *
* @throws Exception
*/
public void testSendMimeMessage() throws Exception
{
MimeMessage mimeMessage = null;
SimpleEmail email = this.getService().createSimpleEmail(this.getDomain());
-
- email.setSubject(this.getSubject());
+
+ email.setSubject(this.getSubject());
email.setMsg(PLAIN_CONTENT);
email.addTo(this.getMailTo());
-
+
email.buildMimeMessage();
mimeMessage = email.getMimeMessage();
-
+
this. result = this.getService().send(
email.getMailSession(),
mimeMessage
Modified: jakarta/turbine/fulcrum/trunk/commonsemail/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/commonsemail/xdocs/changes.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/commonsemail/xdocs/changes.xml (original)
+++ jakarta/turbine/fulcrum/trunk/commonsemail/xdocs/changes.xml Fri May 4 23:58:06 2007
@@ -1,4 +1,22 @@
<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<document>
<properties>
<title>Fulcrum CommonsEmail Service</title>
Modified: jakarta/turbine/fulcrum/trunk/commonsemail/xdocs/configuration.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/commonsemail/xdocs/configuration.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/commonsemail/xdocs/configuration.xml (original)
+++ jakarta/turbine/fulcrum/trunk/commonsemail/xdocs/configuration.xml Fri May 4 23:58:06 2007
@@ -1,4 +1,22 @@
<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<document>
<properties>
<title>Fulcrum CommonsEmail Service</title>
Modified: jakarta/turbine/fulcrum/trunk/commonsemail/xdocs/index.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/commonsemail/xdocs/index.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/commonsemail/xdocs/index.xml (original)
+++ jakarta/turbine/fulcrum/trunk/commonsemail/xdocs/index.xml Fri May 4 23:58:06 2007
@@ -1,4 +1,22 @@
<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<document>
<properties>
<title>Fulcrum CommonsEmail Service</title>
@@ -8,7 +26,7 @@
<section name="Overview">
<p>
The Fulcrum CommonsEmail Servivce simplifies the work with the commons-email library.
-
+
The provided functionality covers four areas
<ul>
<li>factory methods for preconfigured emails</li>
@@ -22,9 +40,9 @@
<p>
The service provides factory methods for creating SimpleEmail,
HtmlEmail and MultiPartEmail. The benefit of using these
- factory methods is getting a fully configured email
- where you can override the settings in your application.
-
+ factory methods is getting a fully configured email
+ where you can override the settings in your application.
+
The following items can be configured using the factory methods
<ul>
<li>SMTP server settings, authentication and debugging</li>
@@ -32,7 +50,7 @@
<li>email headers</li>
</ul>
</p>
- </subsection>
+ </subsection>
<subsection name="Overwriting Recipients">
<p>
@@ -41,7 +59,7 @@
addresses. Therefore it is useful to enforce that the
emails are sent to preconfigured mail account instead.
</p>
- </subsection>
+ </subsection>
<subsection name="Advanced Diagnostic Support">
<p>
@@ -56,10 +74,10 @@
</li>
<li>
the email can be dumped into the temp directory
- </li>
+ </li>
</ul>
</p>
- </subsection>
+ </subsection>
<subsection name="Extensibilty through Inheritance">
<p>
@@ -67,8 +85,8 @@
configuration. This allows integration with archiving systems through
a derived service.
</p>
- </subsection>
-
- </section>
+ </subsection>
+
+ </section>
</body>
</document>
Modified: jakarta/turbine/fulcrum/trunk/commonsemail/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/commonsemail/xdocs/navigation.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/commonsemail/xdocs/navigation.xml (original)
+++ jakarta/turbine/fulcrum/trunk/commonsemail/xdocs/navigation.xml Fri May 4 23:58:06 2007
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<project
name="pbe"
href="http://jakarta.apache.org/turbine/fulcrum/pbe/">
@@ -8,7 +26,7 @@
<item name="Home" href="../../../it20one-service-maven/target/docs/index.html"/>
<item name="Fulcrum" href="http://jakarta.apache.org/turbine/fulcrum/"/>
</links>
-
+
<menu name="Overview">
<item name="Overview" href="/index.html"/>
<item name="Configuration" href="/configuration.html"/>
@@ -16,4 +34,4 @@
</menu>
</body>
-</project>
\ No newline at end of file
+</project>
Modified: jakarta/turbine/fulcrum/trunk/commonsemail/xdocs/technical.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/commonsemail/xdocs/technical.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/commonsemail/xdocs/technical.xml (original)
+++ jakarta/turbine/fulcrum/trunk/commonsemail/xdocs/technical.xml Fri May 4 23:58:06 2007
@@ -1,4 +1,22 @@
<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<document>
<properties>
<title>Fulcrum CommonsEmail Service</title>
@@ -10,7 +28,7 @@
<subsection name="Complexity">
<p>
Your first impression might be that the implementation is
- overly complicated - and yes, you are right. On the other
+ overly complicated - and yes, you are right. On the other
hand sending emails is our core business and we regularly
have to do the following things
<ul>
@@ -21,8 +39,8 @@
</li>
</ul>
</p>
- </subsection>
-
+ </subsection>
+
<subsection name="Domain Centric Approach">
<p>
The configuration of the services is centered around domains whereas
@@ -30,16 +48,16 @@
contains all relevant configuration information for the email being
created or sent.
</p>
- </subsection>
+ </subsection>
<subsection name="Application Hooks">
<p>
The service provide methods which can be overriden by a derived class.
Since the author has no idea about the required configuration needed by
- a derived class the CommonsEmailDomainEntry allows access to the
+ a derived class the CommonsEmailDomainEntry allows access to the
corresponding configuration instance.
</p>
- </subsection>
+ </subsection>
<subsection name="Determining a Domain">
<p>
@@ -50,8 +68,8 @@
<li>take the default domain</li>
</ul>
</p>
- </subsection>
-
+ </subsection>
+
</section>
</body>
</document>
Modified: jakarta/turbine/fulcrum/trunk/configuration/impl/maven.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/configuration/impl/maven.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/configuration/impl/maven.xml (original)
+++ jakarta/turbine/fulcrum/trunk/configuration/impl/maven.xml Fri May 4 23:58:06 2007
@@ -1,7 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<project default="jar:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util">
<!--preGoal name="java:compile">
<attainGoal name="avalon:meta"/>
</preGoal-->
-</project>
\ No newline at end of file
+</project>
Modified: jakarta/turbine/fulcrum/trunk/configuration/impl/project.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/configuration/impl/project.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/configuration/impl/project.xml (original)
+++ jakarta/turbine/fulcrum/trunk/configuration/impl/project.xml Fri May 4 23:58:06 2007
@@ -1,4 +1,22 @@
<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<project>
@@ -11,56 +29,56 @@
<dependencies>
<dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils-core</artifactId>
- <version>1.7.0</version>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils-core</artifactId>
+ <version>1.7.0</version>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
<version>3.1</version>
<url>http://jakarta.apache.org/commons/collections.html</url>
- </dependency>
+ </dependency>
<dependency>
<groupId>commons-configuration</groupId>
- <artifactId>commons-configuration</artifactId>
+ <artifactId>commons-configuration</artifactId>
<version>1.2</version>
<url>http://jakarta.apache.org/commons/configuration/index.html</url>
</dependency>
<dependency>
- <groupId>commons-digester</groupId>
- <artifactId>commons-digester</artifactId>
- <version>1.5</version>
- </dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>1.5</version>
+ </dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
<version>2.1</version>
</dependency>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
<version>1.0.4</version>
<url>http://jakarta.apache.org/commons/logging.html</url>
- </dependency>
+ </dependency>
<dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>1.6.1</version>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
</dependency>
-
+
<!-- Needed only for testing -->
<dependency>
<groupId>fulcrum</groupId>
<artifactId>fulcrum-testcontainer</artifactId>
<version>1.0.5</version>
</dependency>
-
+
<dependency>
<groupId>fulcrum</groupId>
<artifactId>fulcrum-yaafi</artifactId>
<version>1.0.4</version>
- </dependency>
+ </dependency>
</dependencies>
Modified: jakarta/turbine/fulcrum/trunk/configuration/impl/src/java/org/apache/fulcrum/configuration/DefaultConfigurationService.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/configuration/impl/src/java/org/apache/fulcrum/configuration/DefaultConfigurationService.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/configuration/impl/src/java/org/apache/fulcrum/configuration/DefaultConfigurationService.java (original)
+++ jakarta/turbine/fulcrum/trunk/configuration/impl/src/java/org/apache/fulcrum/configuration/DefaultConfigurationService.java Fri May 4 23:58:06 2007
@@ -1,18 +1,21 @@
package org.apache.fulcrum.configuration;
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
*
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
*
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
import java.io.File;
@@ -43,7 +46,7 @@
/**
* Starts up a commons configuration Configuration object via an
* Avalon container.
- *
+ *
*
* The component configuration is carved after the
* <a href="http://jakarta.apache.org/commons/configuration/howto_configurationfactory.html">CompositeConfiguraton</a>
@@ -69,7 +72,7 @@
* @avalon.component name="config" lifestyle="singleton"
* @avalon.service type="org.apache.commons.configuration.Configuration"
* @avalon.attribute key="urn:composition:deployment.timeout" value="0"
- *
+ *
*/
public class DefaultConfigurationService
extends AbstractLogEnabled
@@ -447,7 +450,7 @@
// for backward compatibility
String confPath = conf.getAttribute(CONFIGURATION_PATH, null);
-
+
Configuration cfgs[] = conf.getChildren();
if ((cfgs == null || cfgs.length == 0) && (confPath == null || confPath.length() == 0))
@@ -478,7 +481,7 @@
e);
}
}
-
+
for (int i=0; i<cfgs.length; i++)
{
Configuration c = cfgs[i];
@@ -615,7 +618,7 @@
// try ECM, let exception throw on failure
applicationRoot = (String)context.get("componentAppRoot");
}
-
+
if (applicationRoot == null || applicationRoot.length() == 0)
{
throw new ContextException("Invalid Application Root");
Modified: jakarta/turbine/fulcrum/trunk/configuration/impl/src/java/org/apache/fulcrum/configuration/package.html
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/configuration/impl/src/java/org/apache/fulcrum/configuration/package.html?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/configuration/impl/src/java/org/apache/fulcrum/configuration/package.html (original)
+++ jakarta/turbine/fulcrum/trunk/configuration/impl/src/java/org/apache/fulcrum/configuration/package.html Fri May 4 23:58:06 2007
@@ -1,3 +1,21 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<html>
<head>
<!-- head part is ignored -->
Modified: jakarta/turbine/fulcrum/trunk/configuration/impl/src/test/TestComponentConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/configuration/impl/src/test/TestComponentConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/configuration/impl/src/test/TestComponentConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/configuration/impl/src/test/TestComponentConfig.xml Fri May 4 23:58:06 2007
@@ -1,7 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<componentConfig>
<config>
<properties fileName="src/test/org/test.properties"/>
<xml fileName="src/test/org/test.xml" optional="true"/>
<key>value</key>
</config>
-</componentConfig>
\ No newline at end of file
+</componentConfig>
Modified: jakarta/turbine/fulcrum/trunk/configuration/impl/src/test/TestRoleConfig.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/configuration/impl/src/test/TestRoleConfig.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/configuration/impl/src/test/TestRoleConfig.xml (original)
+++ jakarta/turbine/fulcrum/trunk/configuration/impl/src/test/TestRoleConfig.xml Fri May 4 23:58:06 2007
@@ -1,7 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<!-- This configuration file for Avalon components is used for testing the TestComponent -->
<role-list>
<role
name="org.apache.commons.configuration.Configuration"
shorthand="config"
default-class="org.apache.fulcrum.configuration.DefaultConfigurationService"/>
-</role-list>
\ No newline at end of file
+</role-list>
Modified: jakarta/turbine/fulcrum/trunk/configuration/impl/src/test/configuration.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/configuration/impl/src/test/configuration.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/configuration/impl/src/test/configuration.xml (original)
+++ jakarta/turbine/fulcrum/trunk/configuration/impl/src/test/configuration.xml Fri May 4 23:58:06 2007
@@ -1,12 +1,30 @@
<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<configuration>
<properties fileName="src/test/org/test.properties"/>
<xml fileName="src/test/org/test.xml"/>
</configuration>
-
-
+
+
Modified: jakarta/turbine/fulcrum/trunk/configuration/impl/src/test/org/apache/fulcrum/configuration/ConfigTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/configuration/impl/src/test/org/apache/fulcrum/configuration/ConfigTest.java?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/configuration/impl/src/test/org/apache/fulcrum/configuration/ConfigTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/configuration/impl/src/test/org/apache/fulcrum/configuration/ConfigTest.java Fri May 4 23:58:06 2007
@@ -1,19 +1,22 @@
package org.apache.fulcrum.configuration;
/*
- * Copyright 2001-2004 The Apache Software Foundation.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
import org.apache.avalon.framework.component.ComponentException;
import org.apache.fulcrum.testcontainer.BaseUnitTest;
@@ -29,7 +32,7 @@
public class ConfigTest extends BaseUnitTest
{
private Configuration config = null;
-
+
/**
* Constructor for test.
*
@@ -54,7 +57,7 @@
fail(e.getMessage());
}
}
-
+
/**
* Verifies that the ConfigurationFactory works properly.
*
@@ -65,5 +68,5 @@
assertEquals(
"I'm complex!",config.getString("element2.subelement.subsubelement"));
}
-
+
}
Modified: jakarta/turbine/fulcrum/trunk/configuration/impl/src/test/org/test.properties
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/configuration/impl/src/test/org/test.properties?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/configuration/impl/src/test/org/test.properties (original)
+++ jakarta/turbine/fulcrum/trunk/configuration/impl/src/test/org/test.properties Fri May 4 23:58:06 2007
@@ -1,3 +1,19 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
configuration.loaded = true
packages = packagea
@@ -49,4 +65,4 @@
test.short.array = 2
test.short.array = 3
-test.overwrite = 1
\ No newline at end of file
+test.overwrite = 1
Modified: jakarta/turbine/fulcrum/trunk/configuration/impl/src/test/org/test.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/configuration/impl/src/test/org/test.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/configuration/impl/src/test/org/test.xml (original)
+++ jakarta/turbine/fulcrum/trunk/configuration/impl/src/test/org/test.xml Fri May 4 23:58:06 2007
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<baseElement>
<element>value</element>
<element2>
@@ -8,4 +27,4 @@
<test>
<short>8</short>
</test>
-</baseElement>
\ No newline at end of file
+</baseElement>
Modified: jakarta/turbine/fulcrum/trunk/configuration/impl/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/configuration/impl/xdocs/changes.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/configuration/impl/xdocs/changes.xml (original)
+++ jakarta/turbine/fulcrum/trunk/configuration/impl/xdocs/changes.xml Fri May 4 23:58:06 2007
@@ -1,4 +1,22 @@
<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<document>
<properties>
<title>Fulcrum Configuration</title>
@@ -10,28 +28,28 @@
<action dev="epugh" type="update">
Upgrade to commons-configuration-1.1, remove deprecated
getVector() methods.
- </action>
+ </action>
<action dev="epugh" type="update">
Bump versions of dependencies.
- </action>
+ </action>
<action dev="epugh" type="update">
Upgrade to commons-configuration-1.0
- </action>
+ </action>
</release>
<release version="1.0.2" date="">
<action dev="epugh" type="update">
Upgrade unit tests to use merlin and merlin-unit-3.3.0
- </action>
+ </action>
<action dev="epugh" type="fix">
Added ThreadSafe marker interface so we have a singleton under ECM.
- </action>
+ </action>
</release>
<release version="1.0-alpha-1" date="">
<action dev="epugh" type="update">
Integrated Stephen McConnell's refactoring. Removed
API project as the API is provided by the Commons-Configuration
Configuration.java class.
- </action>
+ </action>
<action dev="epugh" type="add">
Initial creation of project.
</action>
Modified: jakarta/turbine/fulcrum/trunk/configuration/impl/xdocs/index.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/configuration/impl/xdocs/index.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/configuration/impl/xdocs/index.xml (original)
+++ jakarta/turbine/fulcrum/trunk/configuration/impl/xdocs/index.xml Fri May 4 23:58:06 2007
@@ -1,4 +1,22 @@
<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<document>
Modified: jakarta/turbine/fulcrum/trunk/configuration/impl/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/configuration/impl/xdocs/navigation.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/configuration/impl/xdocs/navigation.xml (original)
+++ jakarta/turbine/fulcrum/trunk/configuration/impl/xdocs/navigation.xml Fri May 4 23:58:06 2007
@@ -1,4 +1,22 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<project
name="Configuration"
href="http://jakarta.apache.org/turbine/fulcrum/configuration/">
@@ -15,4 +33,4 @@
<item name="Main" href="/index.html"/>
</menu>
</body>
-</project>
\ No newline at end of file
+</project>
Modified: jakarta/turbine/fulcrum/trunk/crypto/maven.xml
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/crypto/maven.xml?view=diff&rev=535465&r1=535464&r2=535465
==============================================================================
--- jakarta/turbine/fulcrum/trunk/crypto/maven.xml (original)
+++ jakarta/turbine/fulcrum/trunk/crypto/maven.xml Fri May 4 23:58:06 2007
@@ -1,7 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
<project default="jar:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util">
<!--preGoal name="java:compile">
<attainGoal name="avalon:meta"/>
</preGoal-->
-</project>
\ No newline at end of file
+</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org