You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by he...@apache.org on 2003/04/11 16:07:09 UTC
cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/util/velocity VelocityHtmlEmail.java
henning 2003/04/11 07:07:09
Modified: src/java/org/apache/turbine/modules Assembler.java
GenericLoader.java
src/java/org/apache/turbine/modules/layouts
VelocityXslLayout.java
src/java/org/apache/turbine/services/velocity
TurbineVelocityService.java
src/java/org/apache/turbine/util/mail HtmlEmail.java
MultiPartEmail.java
src/java/org/apache/turbine/util/template
TemplateSecurityCheck.java
src/java/org/apache/turbine/util/velocity
VelocityHtmlEmail.java
Log:
Some minor style fixes I have lying around for ages.
Revision Changes Path
1.6 +1 -3 jakarta-turbine-2/src/java/org/apache/turbine/modules/Assembler.java
Index: Assembler.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/Assembler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Assembler.java 9 Mar 2003 02:41:45 -0000 1.5
+++ Assembler.java 11 Apr 2003 14:07:08 -0000 1.6
@@ -52,8 +52,6 @@
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
- *
- * ====================================================================
*/
/**
1.10 +1 -2 jakarta-turbine-2/src/java/org/apache/turbine/modules/GenericLoader.java
Index: GenericLoader.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/GenericLoader.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- GenericLoader.java 14 Mar 2003 15:15:46 -0000 1.9
+++ GenericLoader.java 11 Apr 2003 14:07:08 -0000 1.10
@@ -58,7 +58,6 @@
import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
-
import org.apache.turbine.util.RunData;
/**
1.9 +3 -9 jakarta-turbine-2/src/java/org/apache/turbine/modules/layouts/VelocityXslLayout.java
Index: VelocityXslLayout.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/layouts/VelocityXslLayout.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- VelocityXslLayout.java 11 Mar 2003 13:54:11 -0000 1.8
+++ VelocityXslLayout.java 11 Apr 2003 14:07:08 -0000 1.9
@@ -54,25 +54,19 @@
* <http://www.apache.org/>.
*/
+import java.io.StringReader;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import java.io.StringReader;
-
import org.apache.ecs.ConcreteElement;
import org.apache.turbine.TurbineConstants;
-
import org.apache.turbine.modules.Layout;
import org.apache.turbine.modules.ScreenLoader;
-
import org.apache.turbine.services.velocity.TurbineVelocity;
-import org.apache.turbine.services.velocity.VelocityService;
-
import org.apache.turbine.services.xslt.TurbineXSLT;
-
import org.apache.turbine.util.RunData;
-
import org.apache.turbine.util.template.TemplateNavigation;
import org.apache.velocity.context.Context;
1.22 +2 -11 jakarta-turbine-2/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java
Index: TurbineVelocityService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- TurbineVelocityService.java 19 Mar 2003 09:35:10 -0000 1.21
+++ TurbineVelocityService.java 11 Apr 2003 14:07:08 -0000 1.22
@@ -59,6 +59,7 @@
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.Writer;
+
import java.util.Iterator;
import java.util.Vector;
@@ -145,7 +146,6 @@
*/
private boolean refreshToolsPerRequest = false;
-
/**
* Load all configured components and initialize them. This is
* a zero parameter variant which queries the Turbine Servlet
@@ -188,10 +188,8 @@
setInit(true);
}
-
catch (Exception e)
{
- log.error("Error: ", e);
throw new InitializationException(
"Failed to initialize TurbineVelocityService", e);
}
@@ -274,7 +272,6 @@
return context;
}
-
/**
* Process the request and fill in the template with the values
* you set in the Context.
@@ -325,7 +322,6 @@
return results;
}
-
/**
* Process the request and fill in the template with the values
* you set in the Context.
@@ -439,7 +435,6 @@
}
}
-
/**
* Retrieve the required charset from the Turbine RunData in the context
*
@@ -459,7 +454,6 @@
return (StringUtils.isEmpty(charset)) ? DEFAULT_CHAR_SET : charset;
}
-
/**
* Retrieve the required encoding from the Turbine RunData in the context
*
@@ -479,7 +473,6 @@
return encoding;
}
-
/**
* Macro to handle rendering errors.
*
@@ -497,7 +490,6 @@
throw new TurbineException(err, e);
}
-
/**
* Setup the velocity runtime by using a subset of the
* Turbine configuration which relates to velocity.
@@ -644,4 +636,3 @@
}
}
}
-
1.7 +4 -1 jakarta-turbine-2/src/java/org/apache/turbine/util/mail/HtmlEmail.java
Index: HtmlEmail.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/mail/HtmlEmail.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- HtmlEmail.java 9 Mar 2003 02:54:13 -0000 1.6
+++ HtmlEmail.java 11 Apr 2003 14:07:08 -0000 1.7
@@ -55,13 +55,16 @@
*/
import java.net.URL;
+
import javax.activation.DataHandler;
import javax.activation.URLDataSource;
+
import javax.mail.MessagingException;
import javax.mail.internet.MimeBodyPart;
import javax.mail.internet.MimeMultipart;
import org.apache.commons.lang.StringUtils;
+
import org.apache.ecs.Document;
import org.apache.ecs.ElementContainer;
import org.apache.ecs.html.Body;
1.7 +4 -1 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MultiPartEmail.java 9 Mar 2003 02:54:13 -0000 1.6
+++ MultiPartEmail.java 11 Apr 2003 14:07:08 -0000 1.7
@@ -55,10 +55,13 @@
*/
import java.net.URL;
+
import java.util.Vector;
+
import javax.activation.DataHandler;
import javax.activation.DataSource;
import javax.activation.URLDataSource;
+
import javax.mail.MessagingException;
import javax.mail.internet.MimeBodyPart;
import javax.mail.internet.MimeMultipart;
1.7 +1 -5 jakarta-turbine-2/src/java/org/apache/turbine/util/template/TemplateSecurityCheck.java
Index: TemplateSecurityCheck.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/template/TemplateSecurityCheck.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TemplateSecurityCheck.java 25 Mar 2003 17:15:30 -0000 1.6
+++ TemplateSecurityCheck.java 11 Apr 2003 14:07:09 -0000 1.7
@@ -56,14 +56,10 @@
import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
-
import org.apache.turbine.om.security.Permission;
import org.apache.turbine.om.security.Role;
-
import org.apache.turbine.services.security.TurbineSecurity;
-
import org.apache.turbine.services.template.TurbineTemplate;
-
import org.apache.turbine.util.RunData;
/**
1.12 +3 -1 jakarta-turbine-2/src/java/org/apache/turbine/util/velocity/VelocityHtmlEmail.java
Index: VelocityHtmlEmail.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/velocity/VelocityHtmlEmail.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- VelocityHtmlEmail.java 12 Mar 2003 18:04:29 -0000 1.11
+++ VelocityHtmlEmail.java 11 Apr 2003 14:07:09 -0000 1.12
@@ -55,7 +55,9 @@
*/
import java.net.URL;
+
import java.util.Hashtable;
+
import javax.mail.MessagingException;
import org.apache.commons.lang.StringUtils;
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org