You are viewing a plain text version of this content. The canonical link for it is here.
Posted to tdk-dev@turbine.apache.org by jv...@apache.org on 2001/06/28 14:53:29 UTC
cvs commit: jakarta-turbine-tdk/src/share/sample/src/java/modules/screens ServletInfo.java
jvanzyl 01/06/28 05:53:29
Modified: src build.xml
src/share/sample/conf project-schema.xml
src/share/sample/src/java/modules/actions Upload.java
src/share/sample/src/java/modules/screens ServletInfo.java
Removed: src/share/sample/conf project-inputs.xml
Log:
- updating cvs with changes i have made over the last week or so.
Revision Changes Path
1.14 +3 -2 jakarta-turbine-tdk/src/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/build.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- build.xml 2001/06/28 10:16:49 1.13
+++ build.xml 2001/06/28 12:53:14 1.14
@@ -247,8 +247,8 @@
/>
<move
- file="${app.conf}/project-inputs.xml"
- tofile="${app.conf}/${turbine.app}-inputs.xml"
+ file="${app.conf}/project-intake.xml"
+ tofile="${app.conf}/${turbine.app}-intake.xml"
/>
</target>
@@ -327,6 +327,7 @@
<property name="module.packages" value="${target.package}.modules,${flux.modules}"/>
<property name="include.file" value="include = Flux.properties"/>
<property name="template.path" value="/templates/app,/templates/flux"/>
+ <property name="intake.descriptor" value="WEB-INF/conf/${turbine.app}-intake.xml"/>
</ant>
</target>
1.3 +2 -2 jakarta-turbine-tdk/src/share/sample/conf/project-schema.xml
Index: project-schema.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/share/sample/conf/project-schema.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project-schema.xml 2001/06/08 17:08:55 1.2
+++ project-schema.xml 2001/06/28 12:53:19 1.3
@@ -8,9 +8,9 @@
<app-data>
-<database name="@PROJECT@" defaultIdMethod="idBroker">
+<database>
- <table name="RDF">
+ <table name="RDF" idMethod="idbroker">
<column name="RDF_ID" required="true" primaryKey="true" type="INTEGER"/>
<column name="TITLE" size="255" type="VARCHAR"/>
<column name="BODY" size="255" type="VARCHAR"/>
1.2 +5 -3 jakarta-turbine-tdk/src/share/sample/src/java/modules/actions/Upload.java
Index: Upload.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/share/sample/src/java/modules/actions/Upload.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Upload.java 2001/05/27 22:35:33 1.1
+++ Upload.java 2001/06/28 12:53:23 1.2
@@ -59,8 +59,10 @@
import org.apache.velocity.context.Context;
import org.apache.turbine.util.RunData;
-import org.apache.turbine.util.upload.FileItem;
-import org.apache.turbine.services.servlet.TurbineServlet;
+//import org.apache.turbine.util.upload.FileItem;
+import org.apache.turbine.services.upload.FileItem;
+//import org.apache.turbine.services.servlet.TurbineServlet;
+import org.apache.turbine.Turbine;
/**
* Class responsible for performing the company admin actions
@@ -77,7 +79,7 @@
throws Exception
{
FileItem fileItem = data.getParameters().getFileItem("file");
- fileItem.write(TurbineServlet.getRealPath("/uploaded.file"));
+ fileItem.write(Turbine.getRealPath("/uploaded.file"));
}
/**
1.2 +2 -2 jakarta-turbine-tdk/src/share/sample/src/java/modules/screens/ServletInfo.java
Index: ServletInfo.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/share/sample/src/java/modules/screens/ServletInfo.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServletInfo.java 2001/05/31 22:01:43 1.1
+++ ServletInfo.java 2001/06/28 12:53:26 1.2
@@ -54,8 +54,8 @@
* <http://www.apache.org/>.
*/
+import org.apache.turbine.Turbine;
import org.apache.turbine.util.RunData;
-import org.apache.turbine.services.servlet.TurbineServlet;
import org.apache.velocity.context.Context;
/**
@@ -73,6 +73,6 @@
*/
public void doBuildTemplate( RunData data, Context context )
{
- context.put("serverName", TurbineServlet.getServerName());
+ context.put("serverName", Turbine.getServerName());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-tdk-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-tdk-dev-help@jakarta.apache.org