mpoeschl 01/08/01 14:28:18
Modified: src/share/sample/src/java/modules/screens ServletInfo.java
src/share/sample/src/java/modules/actions Upload.java
src/share/sample/build build.xml
Log:
fix sample application for turbine 2.x
Revision Changes Path
1.3 +6 -6
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ServletInfo.java 2001/06/28 12:53:26 1.2
+++ ServletInfo.java 2001/08/01 21:28:18 1.3
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -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", Turbine.getServerName());
+ context.put("serverName", TurbineServlet.getServerName());
}
}
1.3 +5 -6
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Upload.java 2001/06/28 12:53:23 1.2
+++ Upload.java 2001/08/01 21:28:18 1.3
@@ -25,13 +25,13 @@
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
- * 4. The names "Apache" and "Apache Software Foundation" and
- * "Apache Turbine" must not be used to endorse or promote products
- * derived from this software without prior written permission. For
+ * 4. The names "Apache" and "Apache Software Foundation" and
+ * "Apache Turbine" must not be used to endorse or promote products
+ * derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
- * "Apache Turbine", nor may "Apache" appear in their name, without
+ * "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
@@ -59,8 +59,7 @@
import org.apache.velocity.context.Context;
import org.apache.turbine.util.RunData;
-//import org.apache.turbine.util.upload.FileItem;
-import org.apache.turbine.services.upload.FileItem;
+import org.apache.turbine.util.upload.FileItem;
//import org.apache.turbine.services.servlet.TurbineServlet;
import org.apache.turbine.Turbine;
1.12 +2 -2 jakarta-turbine-tdk/src/share/sample/build/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-tdk/src/share/sample/build/build.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- build.xml 2001/07/03 18:01:58 1.11
+++ build.xml 2001/08/01 21:28:18 1.12
@@ -195,13 +195,13 @@
targetPackage="${targetPackage}.om"
xmlFile="${schemaDirectory}/${project}-schema.xml"
/>
-
+ <!--
<format-source>
<fileset dir="${src.dir}/${targetDirectory}">
<include name="**/*.java"/>
</fileset>
</format-source>
-
+ -->
</target>
<!-- ================================================================ -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
