You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by il...@apache.org on 2001/04/08 18:41:11 UTC
cvs commit: jakarta-turbine/src/java/org/apache/turbine/services/xslt XSLTService.java
ilkka 01/04/08 09:41:11
Modified: src/java/org/apache/turbine/services/assemblerbroker
AssemblerBrokerService.java
src/java/org/apache/turbine/services/castor
CastorService.java TurbineCastorService.java
src/java/org/apache/turbine/util/db CriteriaTest.java
src/java/org/apache/turbine/services/factory
FactoryService.java
src/java/org/apache/turbine/services/freemarker
FreeMarkerService.java
src/java/org/apache/turbine/services/cache
GlobalCacheService.java
src/java/org/apache/turbine/services/localization
LocalizationService.java
src/java/org/apache/turbine/services/logging
LoggingService.java
src/java/org/apache/turbine/services/naming
NamingService.java
src/java/org/apache/turbine/services/pool PoolService.java
src/java/org/apache/turbine/services/pull PullService.java
src/java/org/apache/turbine/services/assemblerbroker/util/python
PythonBaseFactory.java
src/java/org/apache/turbine/services/rundata
RunDataService.java
src/java/org/apache/turbine/services/schedule
ScheduleService.java
src/java/org/apache/turbine/services/security
SecurityService.java
src/java/org/apache/turbine/services/servlet
ServletService.java
src/java/org/apache/turbine/modules/pages TemplatePage.java
src/java/org/apache/turbine/services/template
TemplateService.java
src/java/org/apache/turbine/services/webmacro
TurbineWebMacroService.java WebMacroService.java
src/java/org/apache/turbine/services/uniqueid
UniqueIdService.java
src/java/org/apache/turbine/services/upload
UploadService.java
src/java/org/apache/turbine/services/velocity
VelocityService.java
src/java/org/apache/turbine/services/xmlrpc
XmlRpcService.java
src/java/org/apache/turbine/services/xslt XSLTService.java
Log:
Updated all services to use the voted naming standard for their service names.
Revision Changes Path
1.8 +1 -1 jakarta-turbine/src/java/org/apache/turbine/services/assemblerbroker/AssemblerBrokerService.java
Index: AssemblerBrokerService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/assemblerbroker/AssemblerBrokerService.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AssemblerBrokerService.java 2001/04/05 06:07:02 1.7
+++ AssemblerBrokerService.java 2001/04/08 16:41:06 1.8
@@ -72,7 +72,7 @@
public interface AssemblerBrokerService
extends Service
{
- public static final String SERVICE_NAME = "TurbineAssemblerBrokerService";
+ public static final String SERVICE_NAME = "AssemblerBrokerService";
/**Predefined types for Turbine built-in assemblers */
public static final String ACTION_TYPE = "action";
1.5 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/castor/CastorService.java
Index: CastorService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/castor/CastorService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- CastorService.java 2001/03/06 06:12:00 1.4
+++ CastorService.java 2001/04/08 16:41:07 1.5
@@ -70,11 +70,11 @@
* The interface a CastorService implements.
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
- * @version $Id: CastorService.java,v 1.4 2001/03/06 06:12:00 chrise Exp $
+ * @version $Id: CastorService.java,v 1.5 2001/04/08 16:41:07 ilkka Exp $
*/
public interface CastorService extends Service
{
- public static final String SERVICE_NAME = "TurbineCastorService";
+ public static final String SERVICE_NAME = "CastorService";
public static final String LOGFILE_PROPERTY = "logfile";
public static final String LOGPREFIX_PROPERTY = "logprefix";
public static final String DEFAULT_LOGPREFIX = "TurbineCastor";
1.7 +6 -6 jakarta-turbine/src/java/org/apache/turbine/services/castor/TurbineCastorService.java
Index: TurbineCastorService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/castor/TurbineCastorService.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TurbineCastorService.java 2001/03/06 06:12:00 1.6
+++ TurbineCastorService.java 2001/04/08 16:41:07 1.7
@@ -104,11 +104,11 @@
* The following properties are needed to configure this service:<br>
*
* <code><pre>
- * services.TurbineCastorService.classname=org.apache.turbine.services.castor.TurbineCastorService
- * services.TurbineCastorService.properties.logfile=/tmp/castor.log
- * services.TurbineCastorService.properties.logprefix=turbinecastor
- * services.TurbineCastorService.properties.databasefile=/tmp/database.xml
- * services.TurbineCastorService.properties.databasename=turbine
+ * services.CastorService.classname=org.apache.turbine.services.castor.TurbineCastorService
+ * services.CastorService.properties.logfile=/tmp/castor.log
+ * services.CastorService.properties.logprefix=turbinecastor
+ * services.CastorService.properties.databasefile=/tmp/database.xml
+ * services.CastorService.properties.databasename=turbine
* </pre></code>
*
* <dl>
@@ -124,7 +124,7 @@
*
* @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
* @author <a href="mailto:celkins@scardini.com">Christopher Elkins</a>
- * @version $Id: TurbineCastorService.java,v 1.6 2001/03/06 06:12:00 chrise Exp $
+ * @version $Id: TurbineCastorService.java,v 1.7 2001/04/08 16:41:07 ilkka Exp $
*/
public class TurbineCastorService
extends TurbineBaseService
1.3 +2 -2 jakarta-turbine/src/java/org/apache/turbine/util/db/CriteriaTest.java
Index: CriteriaTest.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/util/db/CriteriaTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CriteriaTest.java 2001/03/06 06:13:58 1.2
+++ CriteriaTest.java 2001/04/08 16:41:07 1.3
@@ -63,7 +63,7 @@
* Test class for Criteria.
*
* @author <a href="mailto:celkins@scardini.com">Christopher Elkins</a>
- * @version $Id: CriteriaTest.java,v 1.2 2001/03/06 06:13:58 chrise Exp $
+ * @version $Id: CriteriaTest.java,v 1.3 2001/04/08 16:41:07 ilkka Exp $
*/
public class CriteriaTest extends BaseTestCase
{
@@ -96,7 +96,7 @@
{
final String table = "myTable";
final String column = "myColumn";
- final String value = "myValue";
+ String value = "myValue";
// Add the string
c.add(table, column, (Object)value);
1.6 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/factory/FactoryService.java
Index: FactoryService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/factory/FactoryService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FactoryService.java 2001/03/18 12:32:38 1.5
+++ FactoryService.java 2001/04/08 16:41:07 1.6
@@ -64,14 +64,14 @@
* and can be tested with the isLoaderSupported method.
*
* @author <a href="mailto:ilkka.priha@simsoft.fi">Ilkka Priha</a>
- * @version $Id: FactoryService.java,v 1.5 2001/03/18 12:32:38 ilkka Exp $
+ * @version $Id: FactoryService.java,v 1.6 2001/04/08 16:41:07 ilkka Exp $
*/
public interface FactoryService extends Service
{
/**
* The key under which this service is stored in TurbineServices.
*/
- public static final String SERVICE_NAME = "TurbineFactoryService";
+ public static final String SERVICE_NAME = "FactoryService";
/**
* Gets an instance of a named class.
1.7 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/freemarker/FreeMarkerService.java
Index: FreeMarkerService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/freemarker/FreeMarkerService.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FreeMarkerService.java 2001/03/06 06:12:08 1.6
+++ FreeMarkerService.java 2001/04/08 16:41:07 1.7
@@ -69,7 +69,7 @@
* Implementations of the FreeMarkerService interface.
*
* @author <a href="mailto:john.mcnally@clearink.com">John D. McNally</a>
- * @version $Id: FreeMarkerService.java,v 1.6 2001/03/06 06:12:08 chrise Exp $
+ * @version $Id: FreeMarkerService.java,v 1.7 2001/04/08 16:41:07 ilkka Exp $
*/
public interface FreeMarkerService
extends Service
@@ -78,7 +78,7 @@
* The name used to specify this service in
* TurbineResources.properties.
*/
- public static final String SERVICE_NAME = "TurbineFreeMarkerService";
+ public static final String SERVICE_NAME = "FreeMarkerService";
/**
* The name used as a key in TurbineInfo when storing the
1.6 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/cache/GlobalCacheService.java
Index: GlobalCacheService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/cache/GlobalCacheService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- GlobalCacheService.java 2001/03/06 06:11:55 1.5
+++ GlobalCacheService.java 2001/04/08 16:41:07 1.6
@@ -66,12 +66,12 @@
* GlobalCacheService interface.
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: GlobalCacheService.java,v 1.5 2001/03/06 06:11:55 chrise Exp $
+ * @version $Id: GlobalCacheService.java,v 1.6 2001/04/08 16:41:07 ilkka Exp $
*/
public interface GlobalCacheService
extends Service
{
- public static final String SERVICE_NAME = "TurbineGlobalCacheService";
+ public static final String SERVICE_NAME = "GlobalCacheService";
/**
* Gets a cached object given its id (a String).
1.5 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/localization/LocalizationService.java
Index: LocalizationService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/localization/LocalizationService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- LocalizationService.java 2001/03/06 06:12:22 1.4
+++ LocalizationService.java 2001/04/08 16:41:08 1.5
@@ -65,12 +65,12 @@
* Implementations of the LocalizationService interface.
*
* @author <a href="mailto:jon@clearink.com">Jon S. Stevens</a>
- * @version $Id: LocalizationService.java,v 1.4 2001/03/06 06:12:22 chrise Exp $
+ * @version $Id: LocalizationService.java,v 1.5 2001/04/08 16:41:08 ilkka Exp $
*/
public interface LocalizationService
extends Service
{
- public static final String SERVICE_NAME = "TurbineLocalizationService";
+ public static final String SERVICE_NAME = "LocalizationService";
/**
* Convenience method to get a default ResourceBundle.
1.7 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/logging/LoggingService.java
Index: LoggingService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/logging/LoggingService.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LoggingService.java 2001/03/06 06:12:27 1.6
+++ LoggingService.java 2001/04/08 16:41:08 1.7
@@ -73,12 +73,12 @@
* @see org.apache.turbine.services.logging.Logger
* @author <a href="mailto:Tomasz.Zielinski@e-point.pl">Tomasz Zielinski</a>
* @author <a href="mailto:jon@latchkey.com">Jon S. Stevens</a>
- * @version $Id: LoggingService.java,v 1.6 2001/03/06 06:12:27 chrise Exp $
+ * @version $Id: LoggingService.java,v 1.7 2001/04/08 16:41:08 ilkka Exp $
*/
public interface LoggingService extends Service
{
/** The name of the service */
- public static final String SERVICE_NAME = "TurbineLoggingService";
+ public static final String SERVICE_NAME = "LoggingService";
/**
* This method returns default logger for Turbine System
1.5 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/naming/NamingService.java
Index: NamingService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/naming/NamingService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NamingService.java 2001/03/06 06:12:33 1.4
+++ NamingService.java 2001/04/08 16:41:08 1.5
@@ -65,11 +65,11 @@
* contexts.
*
* @author <a href="mailto:greg@shwoop.com">Greg Ritter</a>
- * @version $Id: NamingService.java,v 1.4 2001/03/06 06:12:33 chrise Exp $
+ * @version $Id: NamingService.java,v 1.5 2001/04/08 16:41:08 ilkka Exp $
*/
public interface NamingService extends Service {
- public static final String SERVICE_NAME = "TurbineNamingService";
+ public static final String SERVICE_NAME = "NamingService";
/**
* Return the Context with the specified name.
1.5 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/pool/PoolService.java
Index: PoolService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/pool/PoolService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PoolService.java 2001/03/16 00:38:16 1.4
+++ PoolService.java 2001/04/08 16:41:08 1.5
@@ -71,14 +71,14 @@
* a dispose method, when they are returned to the pool.
*
* @author <a href="mailto:ilkka.priha@simsoft.fi">Ilkka Priha</a>
- * @version $Id: PoolService.java,v 1.4 2001/03/16 00:38:16 ilkka Exp $
+ * @version $Id: PoolService.java,v 1.5 2001/04/08 16:41:08 ilkka Exp $
*/
public interface PoolService extends FactoryService
{
/**
* The key under which this service is stored in TurbineServices.
*/
- public static final String SERVICE_NAME = "TurbinePoolService";
+ public static final String SERVICE_NAME = "PoolService";
/**
* The default pool capacity.
1.6 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/pull/PullService.java
Index: PullService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/pull/PullService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PullService.java 2001/03/06 06:12:36 1.5
+++ PullService.java 2001/04/08 16:41:09 1.6
@@ -86,14 +86,14 @@
* be specified as well.
*
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
- * @version $Id: PullService.java,v 1.5 2001/03/06 06:12:36 chrise Exp $
+ * @version $Id: PullService.java,v 1.6 2001/04/08 16:41:09 ilkka Exp $
*/
public interface PullService extends Service
{
/**
* The key under which this service is stored in TurbineServices.
*/
- public static final String SERVICE_NAME = "TurbinePullService";
+ public static final String SERVICE_NAME = "PullService";
/**
* Get the context containing global tools that will be
1.2 +1 -1 jakarta-turbine/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonBaseFactory.java
Index: PythonBaseFactory.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/assemblerbroker/util/python/PythonBaseFactory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PythonBaseFactory.java 2001/04/05 05:45:52 1.1
+++ PythonBaseFactory.java 2001/04/08 16:41:09 1.2
@@ -91,7 +91,7 @@
try
{
- String path = TurbineResources.getString ("services.TurbineAssemblerBrokerService.python.path")+"/";
+ String path = TurbineResources.getString ("services.AssemblerBrokerService.python.path")+"/";
confName = path+"conf.py";
fName = path+subDirectory+"/"+name.toLowerCase()+".py";
}
1.2 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/rundata/RunDataService.java
Index: RunDataService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/rundata/RunDataService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RunDataService.java 2001/03/14 22:48:35 1.1
+++ RunDataService.java 2001/04/08 16:41:09 1.2
@@ -70,14 +70,14 @@
* the implementations should implement the Recyclable interface.
*
* @author <a href="mailto:ilkka.priha@simsoft.fi">Ilkka Priha</a>
- * @version $Id: RunDataService.java,v 1.1 2001/03/14 22:48:35 ilkka Exp $
+ * @version $Id: RunDataService.java,v 1.2 2001/04/08 16:41:09 ilkka Exp $
*/
public interface RunDataService extends Service
{
/**
* The key under which this service is stored in TurbineServices.
*/
- public static final String SERVICE_NAME = "TurbineRunDataService";
+ public static final String SERVICE_NAME = "RunDataService";
/**
* The default configuration key.
1.5 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/schedule/ScheduleService.java
Index: ScheduleService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/schedule/ScheduleService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ScheduleService.java 2001/03/06 06:12:44 1.4
+++ ScheduleService.java 2001/04/08 16:41:09 1.5
@@ -65,12 +65,12 @@
* ScheduleService interface.
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: ScheduleService.java,v 1.4 2001/03/06 06:12:44 chrise Exp $
+ * @version $Id: ScheduleService.java,v 1.5 2001/04/08 16:41:09 ilkka Exp $
*/
public interface ScheduleService
extends Service
{
- public static final String SERVICE_NAME = "TurbineSchedulerService";
+ public static final String SERVICE_NAME = "SchedulerService";
/**
* Get a specific Job from Storage.
1.18 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/security/SecurityService.java
Index: SecurityService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/security/SecurityService.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- SecurityService.java 2001/03/23 11:15:15 1.17
+++ SecurityService.java 2001/04/08 16:41:09 1.18
@@ -88,13 +88,13 @@
* and directory server as the data backend.<br>
*
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
- * @version $Id: SecurityService.java,v 1.17 2001/03/23 11:15:15 rafal Exp $
+ * @version $Id: SecurityService.java,v 1.18 2001/04/08 16:41:09 ilkka Exp $
*/
public interface SecurityService
extends Service
{
/** The name of the service */
- public static final String SERVICE_NAME = "TurbineSecurityService";
+ public static final String SERVICE_NAME = "SecurityService";
/** the key within services's properties for user implementation classname (user.class) */
public static final String USER_CLASS_KEY = "user.class";
1.5 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/servlet/ServletService.java
Index: ServletService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/servlet/ServletService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ServletService.java 2001/03/06 06:12:49 1.4
+++ ServletService.java 2001/04/08 16:41:10 1.5
@@ -67,14 +67,14 @@
* @author <a href="mailto:ekkerbj@netscape.net">Jeff Brekke</a>
* @author <a href="mailto:raphael@apache.org">Rapha�l Luta</a>
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
- * @version $Id: ServletService.java,v 1.4 2001/03/06 06:12:49 chrise Exp $
+ * @version $Id: ServletService.java,v 1.5 2001/04/08 16:41:10 ilkka Exp $
*/
public interface ServletService extends Service
{
/**
* The service identifier
*/
- public String SERVICE_NAME = "TurbineServletService";
+ public String SERVICE_NAME = "ServletService";
/**
* Returns an URL object for a given URI string.
1.13 +3 -3 jakarta-turbine/src/java/org/apache/turbine/modules/pages/TemplatePage.java
Index: TemplatePage.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/pages/TemplatePage.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- TemplatePage.java 2001/04/01 06:12:58 1.12
+++ TemplatePage.java 2001/04/08 16:41:10 1.13
@@ -114,7 +114,7 @@
*
* @author <a href="mailto:john.mcnally@clearink.com">John D. McNally</a>
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: TemplatePage.java,v 1.12 2001/04/01 06:12:58 jvanzyl Exp $
+ * @version $Id: TemplatePage.java,v 1.13 2001/04/08 16:41:10 ilkka Exp $
*/
public class TemplatePage extends DefaultPage
{
@@ -155,8 +155,8 @@
{
throw new Exception("Screen could not be determined. \n" +
"No matches were found by TemplateService and the \n" +
- "services.TurbineTemplateService.default.screen \n" +
- "property was not set.");
+ "services.TemplateService.default.screen property\n" +
+ "was not set.");
}
data.setScreen(screen);
}
1.14 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/template/TemplateService.java
Index: TemplateService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/template/TemplateService.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- TemplateService.java 2001/04/05 17:25:46 1.13
+++ TemplateService.java 2001/04/08 16:41:10 1.14
@@ -69,14 +69,14 @@
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
* @author <a href="mailto:ilkka.priha@simsoft.fi">Ilkka Priha</a>
- * @version $Id: TemplateService.java,v 1.13 2001/04/05 17:25:46 jvanzyl Exp $
+ * @version $Id: TemplateService.java,v 1.14 2001/04/08 16:41:10 ilkka Exp $
*/
public interface TemplateService extends Service
{
/**
* The key under which this service is stored in TurbineServices.
*/
- public static final String SERVICE_NAME = "TurbineTemplateService";
+ public static final String SERVICE_NAME = "TemplateService";
/**
* Get the default template name extension specified
1.34 +3 -3 jakarta-turbine/src/java/org/apache/turbine/services/webmacro/TurbineWebMacroService.java
Index: TurbineWebMacroService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/webmacro/TurbineWebMacroService.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- TurbineWebMacroService.java 2001/04/07 19:11:01 1.33
+++ TurbineWebMacroService.java 2001/04/08 16:41:10 1.34
@@ -113,7 +113,7 @@
* @author <a href="mailto:krzewski@e-point.pl">Rafal Krzewski</a>
* @author <a href="mailto:dlr@collab.net">Daniel Rall</a>
* @author <a href="mailto:jvanzyl@apache.org">Jason van Zyl</a>
- * @version $Id: TurbineWebMacroService.java,v 1.33 2001/04/07 19:11:01 dlr Exp $
+ * @version $Id: TurbineWebMacroService.java,v 1.34 2001/04/08 16:41:10 ilkka Exp $
*/
public class TurbineWebMacroService extends BaseTemplateEngineService
implements WebMacroService
@@ -255,7 +255,7 @@
throw new TurbineException
("An error occurred while rendering template: " + filename, e);
}
-
+
return results;
}
@@ -313,7 +313,7 @@
* This method returns the WebMacro object which will be used to
* load, access, and manage the Broker. The WM first tries to
* locate the WebMacro properties file in the location specified
- * by the 'services.TurbineWebmacroService.properties' key in the
+ * by the 'services.WebmacroService.properties' key in the
* TurbineResource file. If the key is not set, it will search
* the classpath looking for the file.
*
1.14 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/webmacro/WebMacroService.java
Index: WebMacroService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/webmacro/WebMacroService.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- WebMacroService.java 2001/03/06 22:40:43 1.13
+++ WebMacroService.java 2001/04/08 16:41:10 1.14
@@ -71,7 +71,7 @@
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
* @author <a href="mailto:dlr@collab.net">Daniel Rall</a>
- * @version $Id: WebMacroService.java,v 1.13 2001/03/06 22:40:43 chrise Exp $
+ * @version $Id: WebMacroService.java,v 1.14 2001/04/08 16:41:10 ilkka Exp $
*/
public interface WebMacroService
extends Service
@@ -79,7 +79,7 @@
/**
* The name of this service. Used to retrieve it from the broker.
*/
- public static final String SERVICE_NAME = "TurbineWebMacroService";
+ public static final String SERVICE_NAME = "WebMacroService";
/**
* The key for a WebMacro context.
1.5 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/uniqueid/UniqueIdService.java
Index: UniqueIdService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/uniqueid/UniqueIdService.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- UniqueIdService.java 2001/03/06 06:12:52 1.4
+++ UniqueIdService.java 2001/04/08 16:41:10 1.5
@@ -62,12 +62,12 @@
* Turbine, and for objects it creates.
*
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
- * @version $Id: UniqueIdService.java,v 1.4 2001/03/06 06:12:52 chrise Exp $
+ * @version $Id: UniqueIdService.java,v 1.5 2001/04/08 16:41:10 ilkka Exp $
*/
public interface UniqueIdService
extends Service
{
- public static final String SERVICE_NAME = "TurbineUniqueIdService";
+ public static final String SERVICE_NAME = "UniqueIdService";
/**
* <p> Returs an identifer of this Turbine instance that is unique
1.6 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/upload/UploadService.java
Index: UploadService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/upload/UploadService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- UploadService.java 2001/03/06 06:12:54 1.5
+++ UploadService.java 2001/04/08 16:41:11 1.6
@@ -70,7 +70,7 @@
* definded {@link org.apache.turbine.modules.Action}.
*
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
- * @version $Id: UploadService.java,v 1.5 2001/03/06 06:12:54 chrise Exp $
+ * @version $Id: UploadService.java,v 1.6 2001/04/08 16:41:11 ilkka Exp $
*/
public interface UploadService
extends Service
@@ -79,7 +79,7 @@
* The key in the TurbineResources.properties that references this
* service.
*/
- public static final String SERVICE_NAME = "TurbineUploadService";
+ public static final String SERVICE_NAME = "UploadService";
/**
* The key in UploadService properties in
1.12 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/velocity/VelocityService.java
Index: VelocityService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/velocity/VelocityService.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- VelocityService.java 2001/03/18 16:55:46 1.11
+++ VelocityService.java 2001/04/08 16:41:11 1.12
@@ -72,11 +72,11 @@
* @author <a href="mailto:john.mcnally@clearink.com">John D. McNally</a>
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
- * @version $Id: VelocityService.java,v 1.11 2001/03/18 16:55:46 jvanzyl Exp $
+ * @version $Id: VelocityService.java,v 1.12 2001/04/08 16:41:11 ilkka Exp $
*/
public interface VelocityService extends Service
{
- public static final String SERVICE_NAME = "TurbineVelocityService";
+ public static final String SERVICE_NAME = "VelocityService";
public static final String CONTEXT = "VELOCITY_CONTEXT";
/**
1.11 +2 -2 jakarta-turbine/src/java/org/apache/turbine/services/xmlrpc/XmlRpcService.java
Index: XmlRpcService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/xmlrpc/XmlRpcService.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XmlRpcService.java 2001/03/06 06:13:01 1.10
+++ XmlRpcService.java 2001/04/08 16:41:11 1.11
@@ -74,13 +74,13 @@
* @author <a href="mailto:magnus@handtolvur.is">Magn�s ��r Torfason</a>
* @author <a href="mailto:Rafal.Krzewski@e-point.pl">Rafal Krzewski</a>
* @author <a href="jvanzyl@periapt.com">Jason van Zyl</a>
- * @version $Id: XmlRpcService.java,v 1.10 2001/03/06 06:13:01 chrise Exp $
+ * @version $Id: XmlRpcService.java,v 1.11 2001/04/08 16:41:11 ilkka Exp $
*/
public interface XmlRpcService
extends Service
{
/** TurbineXmlRpcService. */
- public static final String SERVICE_NAME = "TurbineXmlRpcService";
+ public static final String SERVICE_NAME = "XmlRpcService";
/**
* Execute a remote procedure call.
1.4 +1 -1 jakarta-turbine/src/java/org/apache/turbine/services/xslt/XSLTService.java
Index: XSLTService.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/xslt/XSLTService.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XSLTService.java 2001/03/06 06:13:04 1.3
+++ XSLTService.java 2001/04/08 16:41:11 1.4
@@ -72,7 +72,7 @@
public interface XSLTService
extends Service
{
- public static final String SERVICE_NAME = "TurbineXSLTService";
+ public static final String SERVICE_NAME = "XSLTService";
/**
* Uses an xsl file to transform xml input from a reader and writes the
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org