epugh 2004/02/15 23:06:27
Modified: src/java/org/apache/turbine/services/security
BaseSecurityService.java
src/java/org/apache/turbine/services/rundata
DefaultTurbineRunData.java
src/java/org/apache/turbine/services/avaloncomponent
TurbineMerlinComponentService.java
TurbineAvalonComponentService.java
MerlinComponentService.java
src/java/org/apache/turbine/services/localization
LocalizationTool.java
src/java/org/apache/turbine/util/parser
DefaultParameterParser.java
Log:
Back out Merlin changes until the MerlinComponentService is finished.
Revision Changes Path
1.35 +3 -4
jakarta-turbine-2/src/java/org/apache/turbine/services/security/BaseSecurityService.java
Index: BaseSecurityService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/security/BaseSecurityService.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- BaseSecurityService.java 18 Nov 2003 11:54:01 -0000 1.34
+++ BaseSecurityService.java 16 Feb 2004 07:06:26 -0000 1.35
@@ -77,7 +77,6 @@
import org.apache.turbine.services.TurbineBaseService;
import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.services.avaloncomponent.AvalonComponentService;
-import org.apache.turbine.services.avaloncomponent.MerlinComponentService;
import org.apache.fulcrum.crypto.CryptoAlgorithm;
import org.apache.fulcrum.crypto.CryptoService;
import org.apache.turbine.services.factory.FactoryService;
@@ -196,10 +195,10 @@
SecurityService.SECURE_PASSWORDS_ALGORITHM_KEY,
SecurityService.SECURE_PASSWORDS_ALGORITHM_DEFAULT);
- MerlinComponentService merlin =
(MerlinComponentService)TurbineServices.getInstance().getService(MerlinComponentService.SERVICE_NAME);
+ AvalonComponentService ecm =
(AvalonComponentService)TurbineServices.getInstance().getService(AvalonComponentService.SERVICE_NAME);
CryptoService cs = null;
try {
- cs = (CryptoService)merlin.lookup("/fulcrum/crypto");
+ cs = (CryptoService)ecm.lookup(CryptoService.ROLE);
}
catch (Exception e){
throw new RuntimeException("Could not access Crypto Service",e);
1.20 +4 -6
jakarta-turbine-2/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java
Index: DefaultTurbineRunData.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/rundata/DefaultTurbineRunData.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- DefaultTurbineRunData.java 14 Nov 2003 14:46:11 -0000 1.19
+++ DefaultTurbineRunData.java 16 Feb 2004 07:06:27 -0000 1.20
@@ -83,7 +83,7 @@
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.om.security.User;
import org.apache.turbine.services.TurbineServices;
-import org.apache.turbine.services.avaloncomponent.MerlinComponentService;
+import org.apache.turbine.services.avaloncomponent.AvalonComponentService;
import org.apache.turbine.services.template.TurbineTemplate;
import org.apache.turbine.util.FormMessages;
import org.apache.turbine.util.ServerData;
@@ -351,12 +351,10 @@
if (!locale.equals(Locale.US))
{
log.debug("We don't have US Locale!");
- MerlinComponentService merlin=
(MerlinComponentService)TurbineServices.getInstance().getService(MerlinComponentService.SERVICE_NAME);
+ AvalonComponentService ecm=
(AvalonComponentService)TurbineServices.getInstance().getService(AvalonComponentService.SERVICE_NAME);
MimeTypeService mimeTypeService=null;
try {
- Object o = merlin.lookup("/fulcrum/mimetype");
- System.out.println(o.getClass().getName());
- mimeTypeService= (MimeTypeService)o;
+ mimeTypeService=
(MimeTypeService)ecm.lookup(MimeTypeService.ROLE);
}
catch (Exception e){
throw new RuntimeException(e);
1.3 +1 -1
jakarta-turbine-2/src/java/org/apache/turbine/services/avaloncomponent/TurbineMerlinComponentService.java
Index: TurbineMerlinComponentService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/avaloncomponent/TurbineMerlinComponentService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TurbineMerlinComponentService.java 14 Nov 2003 12:29:39 -0000 1.2
+++ TurbineMerlinComponentService.java 16 Feb 2004 07:06:27 -0000 1.3
@@ -72,7 +72,7 @@
/**
* An implementation of AvalonComponentService based on the Avalon
- * Merlin 3.2 container.
+ * Merlin 3.2 container. Not ready for Prime Time yet.
*
* @author <a mailto="[EMAIL PROTECTED]">Peter Courcoux</a>
* @author <a mailto="[EMAIL PROTECTED]">Eric Pugh</a>
1.18 +5 -1
jakarta-turbine-2/src/java/org/apache/turbine/services/avaloncomponent/TurbineAvalonComponentService.java
Index: TurbineAvalonComponentService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/avaloncomponent/TurbineAvalonComponentService.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- TurbineAvalonComponentService.java 29 Aug 2003 20:33:10 -0000 1.17
+++ TurbineAvalonComponentService.java 16 Feb 2004 07:06:27 -0000 1.18
@@ -203,7 +203,11 @@
String realPath = Turbine.getRealPath("/");
context.put(AvalonComponentService.COMPONENT_APP_ROOT, realPath);
+ // urn:avalon:home is used by Merlinized components. Makes things
+ // a bit more backwards compatible.
+ context.put("urn:avalon:home", realPath);
System.setProperty("applicationRoot", realPath);
+ System.setProperty("urn:avalon:home", realPath);
log.debug("Application Root is " + realPath);
1.2 +3 -2
jakarta-turbine-2/src/java/org/apache/turbine/services/avaloncomponent/MerlinComponentService.java
Index: MerlinComponentService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/avaloncomponent/MerlinComponentService.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MerlinComponentService.java 2 Nov 2003 21:52:39 -0000 1.1
+++ MerlinComponentService.java 16 Feb 2004 07:06:27 -0000 1.2
@@ -57,7 +57,8 @@
import org.apache.turbine.services.Service;
/**
- * This service allows access to avalon components.
+ * This service allows access to avalon components running in a Merlin
+ * container. This is not ready for Prime Time yet.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Quinton McCombs</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Henning P. Schmiedehausen</a>
1.11 +4 -4
jakarta-turbine-2/src/java/org/apache/turbine/services/localization/LocalizationTool.java
Index: LocalizationTool.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/localization/LocalizationTool.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- LocalizationTool.java 15 Nov 2003 19:42:47 -0000 1.10
+++ LocalizationTool.java 16 Feb 2004 07:06:27 -0000 1.11
@@ -60,7 +60,7 @@
import org.apache.fulcrum.localization.LocalizationService;
import org.apache.turbine.services.InstantiationException;
import org.apache.turbine.services.TurbineServices;
-import org.apache.turbine.services.avaloncomponent.MerlinComponentService;
+import org.apache.turbine.services.avaloncomponent.AvalonComponentService;
import org.apache.turbine.services.pull.ApplicationTool;
import org.apache.turbine.util.RunData;
/**
@@ -91,10 +91,10 @@
{
if (localizationService == null)
{
- MerlinComponentService merlin =
- (MerlinComponentService)
TurbineServices.getInstance().getService(MerlinComponentService.SERVICE_NAME);
+ AvalonComponentService ecm =
+ (AvalonComponentService)
TurbineServices.getInstance().getService(AvalonComponentService.SERVICE_NAME);
try {
- localizationService =
(LocalizationService)merlin.lookup("/fulcrum/localization");
+ localizationService =
(LocalizationService)ecm.lookup(LocalizationService.ROLE);
}
catch (Exception e) {
throw new InstantiationException("Problem looking up
Localization Service:"+e.getMessage());
1.21 +3 -1
jakarta-turbine-2/src/java/org/apache/turbine/util/parser/DefaultParameterParser.java
Index: DefaultParameterParser.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/parser/DefaultParameterParser.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- DefaultParameterParser.java 9 May 2003 11:09:53 -0000 1.20
+++ DefaultParameterParser.java 16 Feb 2004 07:06:27 -0000 1.21
@@ -93,6 +93,8 @@
* </pre>
*
* In the above example, result is 2.
+ *
+ * Note: In the jakarta-turbine-2 codebase things look much updated for parsing.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Ilkka Priha</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Jon S. Stevens</a>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
