epugh 2003/11/14 06:46:11
Modified: src/java/org/apache/turbine/services/rundata
DefaultTurbineRunData.java
conf/test/merlin/BLOCK-INF block.xml
src/test/org/apache/turbine/services/rundata
DefaultTurbineRunDataTest.java
Log:
RunData now loads Mimetype component properly!
Revision Changes Path
1.19 +8 -7
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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- DefaultTurbineRunData.java 2 Nov 2003 22:43:47 -0000 1.18
+++ DefaultTurbineRunData.java 14 Nov 2003 14:46:11 -0000 1.19
@@ -69,7 +69,6 @@
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import org.apache.avalon.framework.component.ComponentException;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
@@ -84,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.AvalonComponentService;
+import org.apache.turbine.services.avaloncomponent.MerlinComponentService;
import org.apache.turbine.services.template.TurbineTemplate;
import org.apache.turbine.util.FormMessages;
import org.apache.turbine.util.ServerData;
@@ -352,13 +351,15 @@
if (!locale.equals(Locale.US))
{
log.debug("We don't have US Locale!");
- AvalonComponentService acs=
(AvalonComponentService)TurbineServices.getInstance().getService(AvalonComponentService.SERVICE_NAME);
+ MerlinComponentService merlin=
(MerlinComponentService)TurbineServices.getInstance().getService(MerlinComponentService.SERVICE_NAME);
MimeTypeService mimeTypeService=null;
try {
- mimeTypeService=
(MimeTypeService)acs.lookup(MimeTypeService.ROLE);
+ Object o = merlin.lookup("/fulcrum/mimetype");
+ System.out.println(o.getClass().getName());
+ mimeTypeService= (MimeTypeService)o;
}
- catch (ComponentException ce){
- throw new RuntimeException(ce);
+ catch (Exception e){
+ throw new RuntimeException(e);
}
charset = mimeTypeService.getCharSet(locale);
1.3 +7 -1 jakarta-turbine-2/conf/test/merlin/BLOCK-INF/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/conf/test/merlin/BLOCK-INF/block.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- block.xml 14 Nov 2003 12:29:39 -0000 1.2
+++ block.xml 14 Nov 2003 14:46:11 -0000 1.3
@@ -4,10 +4,16 @@
<classpath>
<repository>
<resource id="merlin/tutorial:hello" version="1.1"/>
+ <resource id="fulcrum:fulcrum-mimetype-api" version="1.0-alpha-4"/>
+ <resource id="fulcrum:fulcrum-mimetype-impl" version="1.0-alpha-4"/>
+ <resource id="fulcrum:fulcrum-localization-api" version="1.0-alpha-4"/>
+ <resource id="fulcrum:fulcrum-localization-impl" version="1.0-alpha-4"/>
</repository>
</classpath>
</classloader>
<component name="hello" class="tutorial.HelloComponent"/>
-
+ <component name="mimetype"
class="org.apache.fulcrum.mimetype.DefaultMimeTypeService"/>
+ <component name="localizer"
class="org.apache.fulcrum.localization.DefaultLocalizationService"
+ activation="true"/>
</container>
1.2 +50 -39
jakarta-turbine-2/src/test/org/apache/turbine/services/rundata/DefaultTurbineRunDataTest.java
Index: DefaultTurbineRunDataTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/services/rundata/DefaultTurbineRunDataTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultTurbineRunDataTest.java 2 Nov 2003 22:43:47 -0000 1.1
+++ DefaultTurbineRunDataTest.java 14 Nov 2003 14:46:11 -0000 1.2
@@ -1,46 +1,57 @@
package org.apache.turbine.services.rundata;
-/*
- * ==================================================================== The
- * Apache Software License, Version 1.1
- *
- * Copyright (c) 2001-2003 The Apache Software Foundation. All rights reserved.
- *
+/* ====================================================================
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
+ * reserved.
+ *
* Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * 1. Redistributions of source code must retain the above copyright notice,
- * this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. The end-user documentation included with the redistribution, if any,
- * must include the following acknowledgment: "This product includes software
- * developed by the Apache Software Foundation (http://www.apache.org/)."
- * 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 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 prior written
- * permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
- * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. The end-user documentation included with the redistribution,
+ * if any, must include the following acknowledgment:
+ * "This product includes software developed by the
+ * Apache Software Foundation (http://www.apache.org/)."
+ * 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
+ * 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
+ * prior written permission of the Apache Software Foundation.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
* ====================================================================
- *
- * This software consists of voluntary contributions made by many individuals
- * on behalf of the Apache Software Foundation. For more information on the
- * Apache Software Foundation, please see <http://www.apache.org/> .
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation. For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
*/
import org.apache.turbine.Turbine;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
