mpoeschl 02/02/06 09:32:52
Modified: src/java/org/apache/turbine Turbine.java
src/java/org/apache/turbine/pipeline DefaultTargetValve.java
Log:
fix conflicts
Revision Changes Path
1.27 +2 -17 jakarta-turbine-3/src/java/org/apache/turbine/Turbine.java
Index: Turbine.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/Turbine.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- Turbine.java 6 Feb 2002 17:26:34 -0000 1.26
+++ Turbine.java 6 Feb 2002 17:32:52 -0000 1.27
@@ -122,12 +122,8 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
-<<<<<<< Turbine.java
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
- * @version $Id: Turbine.java,v 1.26 2002/02/06 17:26:34 mpoeschl Exp $
-=======
- * @version $Id: Turbine.java,v 1.26 2002/02/06 17:26:34 mpoeschl Exp $
->>>>>>> 1.25
+ * @version $Id: Turbine.java,v 1.27 2002/02/06 17:32:52 mpoeschl Exp $
*/
public class Turbine
extends HttpServlet
@@ -573,13 +569,8 @@
// runtime. Right now this creates the directories
// for logging but we might have more of these
// directories in the future.
-<<<<<<< Turbine.java
- createRuntimeDirectories();
-
-=======
createRuntimeDirectories(config.getInitParameter(LOGGING_ROOT));
-
->>>>>>> 1.25
+
// Get the full path to the properties file.
if (propsFile == null)
{
@@ -721,18 +712,12 @@
*/
private static void createRuntimeDirectories(String path)
{
-<<<<<<< Turbine.java
- // Create the logging directory
- File logDir = new File(getRealPath("/logs"));
-
-=======
if (StringUtils.isEmpty(path))
{
path = "/logs";
}
File logDir = new File(getRealPath(path));
->>>>>>> 1.25
if (!logDir.exists())
{
// Create the logging directory
1.12 +12 -33
jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultTargetValve.java
Index: DefaultTargetValve.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/pipeline/DefaultTargetValve.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DefaultTargetValve.java 6 Feb 2002 17:26:34 -0000 1.11
+++ DefaultTargetValve.java 6 Feb 2002 17:32:52 -0000 1.12
@@ -81,12 +81,8 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Mike Haberman</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>James Taylor</a>
-<<<<<<< DefaultTargetValve.java
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
- * @version $Id: DefaultTargetValve.java,v 1.11 2002/02/06 17:26:34 mpoeschl Exp $
-=======
- * @version $Id: DefaultTargetValve.java,v 1.11 2002/02/06 17:26:34 mpoeschl Exp $
->>>>>>> 1.10
+ * @version $Id: DefaultTargetValve.java,v 1.12 2002/02/06 17:32:52 mpoeschl Exp $
*/
public class DefaultTargetValve
extends AbstractValve
@@ -151,48 +147,31 @@
String target = data.getTarget();
-<<<<<<< DefaultTargetValve.java
- // Get the template context, already populated by any context
- // builders that were found for this target
-
- TemplateContext context = Module.getTemplateContext( data );
-
- context.put( "template", target );
-
- // Resolve the layout template for this target
-
- String layout = Turbine.getResolver().getTemplate("layouts", target);
-
- // Use the renderer to render the layout,
-
- render( data, context, layout );
-=======
- if ( target != null )
+ if ( target != null )
{
// Get the template context, already populated by any context
// builders that were found for this target
-
+
TemplateContext context = Module.getTemplateContext( data );
-
- context.put( "template", target );
-
- // Resolve the layout template for this target
-
+
+ context.put( "template", target );
+
+ // Resolve the layout template for this target
+
String layout = Turbine.getResolver()
.getTemplate("layouts", target);
-
- // Use the renderer to render the layout,
-
+
+ // Use the renderer to render the layout,
+
render( data, context, layout );
}
- else
+ else
{
if ( log.isDebugEnabled() )
{
log.debug( "Target was null." );
}
}
->>>>>>> 1.10
}
protected void render( RunData data, TemplateContext context, String target )
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
