mpoeschl 2002/12/12 23:40:55
Modified: . project.properties
conf TurbineResources.properties
conf/master TurbineResources.master meta.properties
xdocs changes.xml index.xml
xdocs/howto index.xml navigation.xml
xdocs/services index.xml navigation.xml
Removed: conf/view webmacro
src/java/org/apache/turbine/modules/actions
FreeMarkerSiteCooker.java WebMacroSiteAction.java
WebMacroSiteSecureAction.java
src/java/org/apache/turbine/modules/layouts
FreeMarkerLayout.java FreeMarkerSiteLayout.java
WebMacroOnlyLayout.java WebMacroSiteLayout.java
src/java/org/apache/turbine/modules/navigations
BaseFreeMarkerNavigation.java
WebMacroSiteNavigation.java
src/java/org/apache/turbine/modules/pages
FreeMarkerSitePage.java WebMacroSitePage.java
src/java/org/apache/turbine/modules/screens
BaseFreeMarkerScreen.java
WebMacroSiteErrorScreen.java
WebMacroSiteScreen.java
WebMacroSiteSecureScreen.java
src/java/org/apache/turbine/services/castor
CastorService.java package.html
TurbineCastorService.java
src/java/org/apache/turbine/services/freemarker
AddTemplatesToHeadModel.java AddToHeadModel.java
DynamicURIModel.java FreeMarkerService.java
InputModel.java NavigationModel.java
SetBodyAttributesModel.java SetTitleModel.java
TurbineFreeMarkerService.java TextAreaModel.java
package.html
src/java/org/apache/turbine/services/upload
FileHandlerUploadService.java
OReillyUploadService.java
src/java/org/apache/turbine/services/webmacro
TurbineTemplateProvider.java TurbineWebMacro.java
TurbineWebMacroService.java WebMacroService.java
package.html
src/java/org/apache/turbine/util/upload FileHandler.java
src/java/org/apache/turbine/util/webmacro
WebMacroActionEvent.java WebMacroEmail.java
WebMacroFormatter.java WebMacroHtmlEmail.java
xdocs/howto webmacro-site-howto.xml
xdocs/services castor-service.xml freemarker-service.xml
webmacro-service.xml
Log:
remove deprecated services (freemarker, webmacro, castor)
Revision Changes Path
1.8 +1 -1 jakarta-turbine-2/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/project.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.properties 6 Dec 2002 17:38:21 -0000 1.7
+++ project.properties 13 Dec 2002 07:40:53 -0000 1.8
@@ -13,7 +13,7 @@
compile.debug = on
compile.optimize = off
compile.deprecation = off
-
+maven.compile.deprecation = on
# -------------------------------------------------------------------
# C A C T U S T E S T P R O P E R T I E S
# -------------------------------------------------------------------
1.18 +7 -50 jakarta-turbine-2/conf/TurbineResources.properties
Index: TurbineResources.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/conf/TurbineResources.properties,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- TurbineResources.properties 8 Dec 2002 15:45:57 -0000 1.17
+++ TurbineResources.properties 13 Dec 2002 07:40:53 -0000 1.18
@@ -41,6 +41,12 @@
services.LoggingService.debug.className=org.apache.turbine.services.logging.FileLogger
services.LoggingService.debug.level=INFO
+# A facility for SQL query logging
+# To enable SQL query logging, set the system and sql log level to DEBUG
+services.LoggingService.sql.destination.file=/logs/turbine.log
+services.LoggingService.sql.className=org.apache.turbine.services.logging.FileLogger
+services.LoggingService.sql.level=ERROR
+
# A facility for security audit. NOTE! As of 23 Jan 2001
# Turbine does not have any standard security auditing
# functionality. It's up to your application.
@@ -582,55 +588,6 @@
services.JspService.templates = /templates/app
services.JspService.buffer.size = 8192
-
-# -------------------------------------------------------------------
-#
-# W E B M A C R O S E R V I C E
-#
-# the webmacro-service is deprecated. you should use velocity instead!
-# see http://jakarta.apache.org/velocity/migration.html
-#
-# -------------------------------------------------------------------
-
-services.WebMacroService.template.extension=wm
-services.WebMacroService.default.page = WebMacroSitePage
-services.WebMacroService.default.screen=WebMacroSiteScreen
-services.WebMacroService.default.layout = WebMacroSiteLayout
-services.WebMacroService.default.navigation=WebMacroSiteNavigation
-services.WebMacroService.default.error.screen = WebMacroSiteErrorScreen
-services.WebMacroService.default.layout.template = Default.wm
-
-# The location of WebMacro configuration file, relative to webapp
-# root.
-
-services.WebMacroService.properties=/WEB-INF/conf/WebMacro.properties
-
-# The path where WebMacro will look for templates, relative to webapp
-# root. Use your system's path separator to specify multiple paths.
-
-services.WebMacroService.templates=/templates/app
-
-# The class that will act as a template provider in webmacro. We can
-# use default class from WebMacro (template path above is pushed into
-# WebMacro configuration mechanism, so that class can pick it up), or
-# some other custom class
-
-services.WebMacroService.templates.provider=org.apache.turbine.services.webmacro.TurbineTemplateProvider
-
-# -------------------------------------------------------------------
-#
-# F R E E M A R K E R S E R V I C E
-#
-# the freemarker-service is deprecated. you should use velocity instead!
-# see http://jakarta.apache.org/velocity
-# -------------------------------------------------------------------
-
-# The path where FreeMarker will look for templates, relative to
-# webapp root, if supported by the servlet engine.
-#
-# Default: /templates
-
-services.FreeMarkerService.templates=/templates
# -------------------------------------------------------------------
#
1.17 +1 -50 jakarta-turbine-2/conf/master/TurbineResources.master
Index: TurbineResources.master
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/conf/master/TurbineResources.master,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- TurbineResources.master 11 Oct 2002 10:27:28 -0000 1.16
+++ TurbineResources.master 13 Dec 2002 07:40:54 -0000 1.17
@@ -591,55 +591,6 @@
# -------------------------------------------------------------------
#
-# W E B M A C R O S E R V I C E
-#
-# the webmacro-service is deprecated. you should use velocity instead!
-# see http://jakarta.apache.org/velocity/migration.html
-#
-# -------------------------------------------------------------------
-
-services.WebMacroService.template.extension=wm
-services.WebMacroService.default.page = WebMacroSitePage
-services.WebMacroService.default.screen=WebMacroSiteScreen
-services.WebMacroService.default.layout = WebMacroSiteLayout
-services.WebMacroService.default.navigation=WebMacroSiteNavigation
-services.WebMacroService.default.error.screen = WebMacroSiteErrorScreen
-services.WebMacroService.default.layout.template = Default.wm
-
-# The location of WebMacro configuration file, relative to webapp
-# root.
-
-services.WebMacroService.properties=/WEB-INF/conf/WebMacro.properties
-
-# The path where WebMacro will look for templates, relative to webapp
-# root. Use your system's path separator to specify multiple paths.
-
-services.WebMacroService.templates=@TEMPLATE_PATH@
-
-# The class that will act as a template provider in webmacro. We can
-# use default class from WebMacro (template path above is pushed into
-# WebMacro configuration mechanism, so that class can pick it up), or
-# some other custom class
-
-services.WebMacroService.templates.provider=org.apache.turbine.services.webmacro.TurbineTemplateProvider
-
-# -------------------------------------------------------------------
-#
-# F R E E M A R K E R S E R V I C E
-#
-# the freemarker-service is deprecated. you should use velocity instead!
-# see http://jakarta.apache.org/velocity
-# -------------------------------------------------------------------
-
-# The path where FreeMarker will look for templates, relative to
-# webapp root, if supported by the servlet engine.
-#
-# Default: /templates
-
-services.FreeMarkerService.templates=/templates
-
-# -------------------------------------------------------------------
-#
# U P L O A D S E R V I C E
#
# -------------------------------------------------------------------
1.2 +0 -1 jakarta-turbine-2/conf/master/meta.properties
Index: meta.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/conf/master/meta.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- meta.properties 16 Aug 2001 05:06:57 -0000 1.1
+++ meta.properties 13 Dec 2002 07:40:54 -0000 1.2
@@ -4,7 +4,6 @@
database.user=username
database.password=password
-#view.type=webmacro
view.type=velocity
turbine.log=/logs/turbine.log
1.13 +43 -2 jakarta-turbine-2/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/xdocs/changes.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- changes.xml 20 Nov 2002 18:40:26 -0000 1.12
+++ changes.xml 13 Dec 2002 07:40:54 -0000 1.13
@@ -51,9 +51,50 @@
</section>
-->
-<section name="Turbine 2.2-rc2">
+<section name="Turbine 2.3-dev">
+
<p>
-Changes between Turbine 2.2-rc1 and 2.2-rc2.
+Changes between Turbine 2.2 and 2.3-dev.
+</p>
+
+<p>
+</p>
+
+<subsection name="Changes that could break older environments">
+<p>
+ <ul>
+ <li>
+ removed all deprecated java code (incl. support for webmacro, freemarker
+ and castor). Make sure to not get any deprecation warnings before you
+ switch to 2.3!
+ </li>
+ </ul>
+</p>
+</subsection>
+
+
+<subsection name="Other changes">
+<p>
+ <ul>
+ <li>
+ </li>
+ </ul>
+</p>
+</subsection>
+
+<subsection name="Fixed bugs">
+<p>
+ <ul>
+ <li>
+ </li>
+ </ul>
+</p>
+</subsection>
+</section>
+
+<section name="Turbine 2.2 (= 2.2-rc2)">
+<p>
+Changes between Turbine 2.2-rc1 and 2.2.
</p>
<subsection name="Other changes">
1.5 +4 -6 jakarta-turbine-2/xdocs/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/xdocs/index.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- index.xml 6 Dec 2002 17:38:21 -0000 1.4
+++ index.xml 13 Dec 2002 07:40:54 -0000 1.5
@@ -56,8 +56,8 @@
The point of Turbine is to collect that code into one location and
make it easy to create re-usable components (such as
ParameterParsing, Database Connection Pools, Job Scheduling,
- GlobalCaches, integration with other tools such as Castor, Velocity,
- Webmacro, etc...) all under a <a href="license.html">license</a>
+ GlobalCaches, integration with other tools such as Torque, Velocity,
+ etc...) all under a <a href="license.html">license</a>
(Apache) that allows you to create useful websites for your
customers without worrying about viral code. Turbine is not the end
all answer, but it sure is a nice way to make your development life
@@ -77,7 +77,7 @@
</p>
<p>
- <strong>Integration with Velocity, Webmacro and FreeMarker is well
+ <strong>Integration with Velocity is well
defined and makes doing applications using these tools painless for
both the developers and the web designers!</strong>
</p>
@@ -85,9 +85,7 @@
<p>
Turbine can be integrated with existing <a
href="http://jakarta.apache.org/velocity/";>Velocity</a>, <a
- href="http://www.webmacro.org/";>Webmacro</a>, <a
- href="http://jakarta.apache.org/";>Java Server Pages (JSP)</a>, <a
- href="http://freemarker.sourceforge.net";>FreeMarker</a> and <a
+ href="http://jakarta.apache.org/";>Java Server Pages (JSP)</a> and <a
href="http://xml.apache.org/cocoon/";>Cocoon</a> technologies by
specially creating Screens that use Services to parse templates.
Screens can also be created to read files from other websites as
1.3 +0 -1 jakarta-turbine-2/xdocs/howto/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/xdocs/howto/index.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.xml 3 Dec 2002 10:14:02 -0000 1.2
+++ index.xml 13 Dec 2002 07:40:55 -0000 1.3
@@ -23,7 +23,6 @@
<li><a href="url-rewriting-howto.html">URL rewriting Howto</a></li>
<li><a href="velocity-site-howto.html">Velocity Site Howto</a></li>
<li><a href="context-howto.html">Velocity Context Howto</a></li>
- <li><a href="webmacro-site-howto.html">Webmacro Site Howto</a></li>
</ul>
</p>
</section>
1.2 +0 -1 jakarta-turbine-2/xdocs/howto/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/xdocs/howto/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 16 Nov 2002 17:36:44 -0000 1.1
+++ navigation.xml 13 Dec 2002 07:40:55 -0000 1.2
@@ -42,7 +42,6 @@
<item name="URL rewriting Howto" href="/howto/url-rewriting-howto.html"/>
<item name="Velocity Site Howto" href="/howto/velocity-site-howto.html"/>
<item name="Velocity Context Howto" href="/howto/context-howto.html"/>
- <item name="Webmacro Site Howto" href="/howto/webmacro-site-howto.html"/>
</item>
</menu>
1.3 +0 -20 jakarta-turbine-2/xdocs/services/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/xdocs/services/index.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.xml 3 Dec 2002 10:14:02 -0000 1.2
+++ index.xml 13 Dec 2002 07:40:55 -0000 1.3
@@ -62,12 +62,6 @@
</li>
<li>
-<a href="castor-service.html">Castor Service</a>
-<br/>
-Castor is a OR tool that is supported by Turbine.
-</li>
-
-<li>
<a href="component-service.html">Component Service</a>
<br/>
Initializes external components which implement the lifecycle interface, e.g.
Torque und Fulcrum.
@@ -88,13 +82,6 @@
</li>
<li>
-<a href="freemarker-service.html">FreeMarker Service</a>
-<br/>
-The FreeMarker Service is the set of classes that process FreeMarker
-files inside the Turbine Layout/Navigations and Screen structure.
-</li>
-
-<li>
<a href="intake-service.html">Intake Service</a>
<br/>
A service that provides input validation along with a standard
@@ -214,13 +201,6 @@
<br/>
<b>[TO DO]</b> The service for the processing of Velocity Templates from within
the Turbine Layout/Navigations and Screen structure.
-</li>
-
-<li>
-<a href="webmacro-service.html">WebMacro Service</a>
-<br/>
-<b>[TO DO]</b> The service for the processing of WebMacro Templates from within
-Turbine Layout/Navigations and Screen structure.
</li>
<li>
1.2 +0 -3 jakarta-turbine-2/xdocs/services/navigation.xml
Index: navigation.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/xdocs/services/navigation.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- navigation.xml 16 Nov 2002 17:36:44 -0000 1.1
+++ navigation.xml 13 Dec 2002 07:40:55 -0000 1.2
@@ -32,11 +32,9 @@
<item name="Services" href="/services/index.html">
<item name="Assembler Broker Service"
href="/services/assemblerbroker-service.html"/>
<item name="Cache Service" href="/services/cache-service.html"/>
- <item name="Castor Service" href="/services/castor-service.html"/>
<item name="Component Service" href="/services/component-service.html"/>
<item name="DB Service (deprecated)" href="/services/db-service.html"/>
<item name="Factory Service" href="/services/factory-service.html"/>
- <item name="FreeMarker Service" href="/services/freemarker-service.html"/>
<item name="Intake Service" href="/services/intake-service.html"/>
<item name="JSP Service" href="/services/jsp-service.html"/>
<item name="Localization Service"
href="/services/localization-service.html"/>
@@ -54,7 +52,6 @@
<item name="Unique ID Service" href="/services/uniqueid-service.html"/>
<item name="Upload Service" href="/services/upload-service.html"/>
<item name="Velocity Service" href="/services/velocity-service.html"/>
- <item name="WebMacro Service" href="/services/webmacro-service.html"/>
<item name="XML-RPC Service" href="/services/xmlrpc-service.html"/>
<item name="XSLT Service" href="/services/xslt-service.html"/>
</item>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
