mpoeschl 2003/07/21 15:33:25
Modified: src/tdk/ancillary web.xml
. project.xml build-tomcat4.xml
src/tdk/apps/2/src/java/modules/actions Upload.java
Log:
update to work with turbine-2.3-dev
Revision Changes Path
1.3 +5 -1 jakarta-turbine-tdk/src/tdk/ancillary/web.xml
Index: web.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/tdk/ancillary/web.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- web.xml 10 Oct 2001 16:45:40 -0000 1.2
+++ web.xml 21 Jul 2003 22:33:25 -0000 1.3
@@ -6,7 +6,7 @@
<web-app>
<servlet>
- <servlet-name>@PROJECT@</servlet-name>
+ <servlet-name>turbine</servlet-name>
<servlet-class>org.apache.turbine.Turbine</servlet-class>
<init-param>
<param-name>applicationRoot</param-name>
@@ -18,6 +18,10 @@
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
+ <servlet-mapping>
+ <servlet-name>turbine</servlet-name>
+ <url-pattern>/@PROJECT@/*</url-pattern>
+ </servlet-mapping>
<security-constraint>
<web-resource-collection>
<web-resource-name>templates</web-resource-name>
1.13 +25 -0 jakarta-turbine-tdk/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/project.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- project.xml 21 Jul 2003 08:21:56 -0000 1.12
+++ project.xml 21 Jul 2003 22:33:25 -0000 1.13
@@ -94,6 +94,11 @@
<url>http://jakarta.apache.org/commons/</url>
</dependency>
<dependency>
+ <id>commons-fileupload</id>
+ <version>1.0</version>
+ <url>http://jakarta.apache.org/commons/fileupload/index.html</url>
+ </dependency>
+ <dependency>
<id>commons-lang</id>
<version>1.0.1</version>
<url>http://jakarta.apache.org/commons/</url>
@@ -109,6 +114,16 @@
<url>http://jakarta.apache.org/commons/pool/</url>
</dependency>
<dependency>
+ <id>ecs</id>
+ <version>1.4.2</version>
+ <url>http://jakarta.apache.org/ecs/</url>
+ </dependency>
+ <dependency>
+ <id>flux</id>
+ <version>2.3-dev</version>
+ <url>http://jakarta.apache.org/turbine/flux/</url>
+ </dependency>
+ <dependency>
<id>jcs</id>
<version>1.0-dev</version>
<url>http://jakarta.apache.org/turbine/jcs/</url>
@@ -149,6 +164,11 @@
<url>http://db.apache.org/torque/</url>
</dependency>
<dependency>
+ <id>turbine</id>
+ <version>2.3-dev</version>
+ <url>http://jakarta.apache.org/turbine/</url>
+ </dependency>
+ <dependency>
<id>velocity</id>
<version>1.3.1</version>
<url>http://jakarta.apache.org/velocity/</url>
@@ -167,6 +187,11 @@
<id>xml-apis</id>
<version>1.0.b2</version>
<url>http://xml.apache.org/commons/</url>
+ </dependency>
+ <dependency>
+ <id>xmlrpc</id>
+ <version>1.2-b1</version>
+ <url>http://xml.apache.org/xmlrpc/</url>
</dependency>
<dependency>
<id>junit</id>
1.7 +0 -34 jakarta-turbine-tdk/build-tomcat4.xml
Index: build-tomcat4.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/build-tomcat4.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- build-tomcat4.xml 23 Oct 2001 15:35:07 -0000 1.6
+++ build-tomcat4.xml 21 Jul 2003 22:33:25 -0000 1.7
@@ -28,40 +28,6 @@
<fileset dir="${tdk.containerSrc}/${tdk.servletContainer}"/>
</copy>
- <replace file="${tdk.root.dir}/conf/server.xml">
- <replacetoken><![CDATA[<!-- Tomcat Examples Context -->]]></replacetoken>
- <replacevalue><![CDATA[<!-- Comment Out Examples]]></replacevalue>
- </replace>
-
- <replace file="${tdk.root.dir}/conf/server.xml">
- <replacetoken><![CDATA[<!-- PersistentManager]]></replacetoken>
- <replacevalue><![CDATA[-->
- <!-- PersistentManager]]></replacevalue>
- </replace>
-
- <replace file="${tdk.root.dir}/conf/server.xml">
- <replacetoken><![CDATA[<Environment ]]></replacetoken>
- <replacevalue><![CDATA[<!--
- <Environment ]]></replacevalue>
- </replace>
-
- <replace file="${tdk.root.dir}/conf/server.xml">
- <replacetoken><![CDATA[</Context>]]></replacetoken>
- <replacevalue><![CDATA[</Context> -->
-
- <!--
- Uncomment the following if you want class reloading
- for the default 'newapp' sample application.
- -->
-
- <!--
- <Context path="/newapp" docBase="newapp" reloadable="true"/>
- -->
-
- <!-- TDK SITE -->
- ]]></replacevalue>
- </replace>
-
<chmod dir="${tdk.root.dir}/bin" perm="+x" includes="**/*.sh"/>
</target>
1.2 +3 -3
jakarta-turbine-tdk/src/tdk/apps/2/src/java/modules/actions/Upload.java
Index: Upload.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-tdk/src/tdk/apps/2/src/java/modules/actions/Upload.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Upload.java 7 Sep 2001 01:40:09 -0000 1.1
+++ Upload.java 21 Jul 2003 22:33:25 -0000 1.2
@@ -3,7 +3,7 @@
/* ====================================================================
* The Apache Software License, Version 1.1
*
- * Copyright (c) 2001 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -59,7 +59,7 @@
import org.apache.velocity.context.Context;
import org.apache.turbine.util.RunData;
-import org.apache.turbine.util.upload.FileItem;
+import org.apache.commons.fileupload.FileItem;
import org.apache.turbine.services.servlet.TurbineServlet;
/**
@@ -77,7 +77,7 @@
throws Exception
{
FileItem fileItem = data.getParameters().getFileItem("file");
- fileItem.write(TurbineServlet.getRealPath("/uploaded.file"));
+ fileItem.write(new File(TurbineServlet.getRealPath("/uploaded.file")));
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
