epugh 2004/11/24 10:23:45
Modified: . project.xml
src/java/org/apache/turbine/services/localization
Localization.java
src/test/org/apache/turbine/services/cache
FulcrumCacheComponentTest.java
src/test/org/apache/turbine/services/intake
IntakeToolTest.java
src/java/org/apache/turbine/services/intake/model Field.java
xdocs changes.xml
Removed: src/test/org/apache/turbine/services/crypto
CryptoRunningInMerlinTest.java
src/java/org/apache/turbine/services/avaloncomponent
TurbineMerlinComponentService.java
MerlinComponentService.java
src/test/org/apache/turbine/services/avaloncomponent
MerlinComponentServiceTest.java
Log:
Update to released Fulcrum components. Remove Merlin service in favor of
future
Metro service.
Revision Changes Path
1.169 +8 -128 jakarta-turbine-2/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/project.xml,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -r1.168 -r1.169
--- project.xml 24 Nov 2004 17:22:38 -0000 1.168
+++ project.xml 24 Nov 2004 18:23:44 -0000 1.169
@@ -334,144 +334,23 @@
</contributors>
<dependencies>
- <!-- t3 -->
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j-jmx</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>mx4j</groupId>
- <artifactId>mx4j-tools</artifactId>
- <version>1.1.1</version>
- </dependency>
+
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>4.1.5</version>
+ <version>4.2.0</version>
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <version>4.1.5</version>
+ <version>4.2.0</version>
</dependency>
+
<dependency>
- <groupId>merlin</groupId>
- <artifactId>merlin-kernel-spi</artifactId>
- <version>3.2-dev</version>
- </dependency>
- <dependency>
- <groupId>merlin</groupId>
- <artifactId>merlin-kernel-impl</artifactId>
- <version>3.2-dev</version>
- </dependency>
-
- <dependency>
- <groupId>avalon-activation</groupId>
- <artifactId>avalon-activation-api</artifactId>
- <version>1.2-dev</version>
- </dependency>
- <dependency>
- <groupId>avalon-activation</groupId>
- <artifactId>avalon-activation-spi</artifactId>
- <version>1.2-dev</version>
- </dependency>
- <dependency>
- <groupId>avalon-activation</groupId>
- <artifactId>avalon-activation-impl</artifactId>
- <version>1.2-dev</version>
- </dependency>
-
- <dependency>
- <groupId>avalon-composition</groupId>
- <artifactId>avalon-composition-api</artifactId>
- <version>1.2-dev</version>
- </dependency>
- <dependency>
- <groupId>avalon-composition</groupId>
- <artifactId>avalon-composition-spi</artifactId>
- <version>1.2-dev</version>
- </dependency>
- <dependency>
- <groupId>avalon-composition</groupId>
- <artifactId>avalon-composition-impl</artifactId>
- <version>1.2-dev</version>
- </dependency>
-
- <dependency>
- <groupId>avalon-extension</groupId>
- <artifactId>avalon-extension-spi</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>avalon-extension</groupId>
- <artifactId>avalon-extension-impl</artifactId>
- <version>1.0</version>
- </dependency>
-
- <dependency>
- <groupId>avalon-meta</groupId>
- <artifactId>avalon-meta-api</artifactId>
- <version>1.2.1-dev</version>
- </dependency>
- <dependency>
- <groupId>avalon-meta</groupId>
- <artifactId>avalon-meta-spi</artifactId>
- <version>1.2.1-dev</version>
- </dependency>
- <dependency>
- <groupId>avalon-meta</groupId>
- <artifactId>avalon-meta-impl</artifactId>
- <version>1.2.1-dev</version>
- </dependency>
-
- <dependency>
- <groupId>avalon-repository</groupId>
- <artifactId>avalon-repository-spi</artifactId>
- <version>1.0b1</version>
- </dependency>
- <dependency>
- <groupId>avalon-repository</groupId>
- <artifactId>avalon-repository-impl</artifactId>
- <version>1.0b1</version>
- </dependency>
- <dependency>
<id>logkit</id>
<version>1.2</version>
<url>http://jakarta.apache.org/avalon/logkit/</url>
</dependency>
-
- <dependency>
- <groupId>excalibur-lifecycle</groupId>
- <artifactId>excalibur-lifecycle-api</artifactId>
- <version>1.0</version>
- </dependency>
-
- <dependency>
- <id>excalibur-i18n</id>
- <version>1.1</version>
- </dependency>
-
- <dependency>
- <id>excalibur-thread</id>
- <version>1.1.1</version>
- </dependency>
-
- <dependency>
- <id>excalibur-event</id>
- <version>1.0.3</version>
- </dependency>
-
- <dependency>
- <groupId>excalibur</groupId>
- <artifactId>excalibur-util-concurrent</artifactId>
- <version>1.3.1</version>
- </dependency>
-
- <dependency>
- <id>excalibur-configuration</id>
- <version>1.1</version>
- </dependency>
<dependency>
<id>commons-beanutils</id>
@@ -480,7 +359,7 @@
</dependency>
<dependency>
<id>commons-codec</id>
- <version>1.1</version>
+ <version>1.3</version>
</dependency>
<dependency>
<id>commons-collections</id>
@@ -659,11 +538,12 @@
<version>2.3</version>
<url>http://java.sun.com/products/servlet/</url>
</dependency>
- <!--dependency>
+ <!-- needed for integrated email, will be replaced by commons-email -->
+ <dependency>
<id>torque</id>
<version>20041102.134240</version>
<url>http://db.apache.org/torque/</url>
- </dependency-->
+ </dependency>
<!--
<dependency>
<groupId>turbine</groupId>
1.12 +24 -3
jakarta-turbine-2/src/java/org/apache/turbine/services/localization/Localization.java
Index: Localization.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/localization/Localization.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Localization.java 14 Oct 2003 09:43:14 -0000 1.11
+++ Localization.java 24 Nov 2004 18:23:44 -0000 1.12
@@ -60,7 +60,10 @@
import javax.servlet.http.HttpServletRequest;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.commons.lang.exception.NestableRuntimeException;
import org.apache.turbine.services.TurbineServices;
+import org.apache.turbine.services.avaloncomponent.AvalonComponentService;
import org.apache.turbine.util.RunData;
/**
@@ -276,8 +279,15 @@
*/
protected static final LocalizationService getService()
{
- return (LocalizationService) TurbineServices.getInstance()
- .getService(LocalizationService.SERVICE_NAME);
+ try {
+ AvalonComponentService acs = (AvalonComponentService)
TurbineServices.getInstance().getService(AvalonComponentService.SERVICE_NAME);
+ return
(LocalizationService)acs.lookup(LocalizationService.class.getName());
+ }
+ catch (ComponentException ce){
+ throw new NestableRuntimeException(ce);
+ }
+
+
}
/**
@@ -294,5 +304,16 @@
public static ResourceBundle getBundle(String bundleName, RunData data)
{
return getBundle(bundleName, data.getRequest());
+ }
+
+ public static boolean isInitialized() {
+ try {
+ AvalonComponentService acs = (AvalonComponentService)
TurbineServices.getInstance().getService(AvalonComponentService.SERVICE_NAME);
+ acs.lookup(LocalizationService.class.getName());
+ return true;
+ }
+ catch (ComponentException ce){
+ return false;
+ }
}
}
1.2 +2 -4
jakarta-turbine-2/src/test/org/apache/turbine/services/cache/FulcrumCacheComponentTest.java
Index: FulcrumCacheComponentTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/services/cache/FulcrumCacheComponentTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FulcrumCacheComponentTest.java 19 Nov 2003 14:05:39 -0000 1.1
+++ FulcrumCacheComponentTest.java 24 Nov 2004 18:23:44 -0000 1.2
@@ -52,7 +52,6 @@
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
-import org.apache.fulcrum.cache.CacheServiceFacade;
import org.apache.fulcrum.cache.CachedObject;
import org.apache.fulcrum.cache.GlobalCacheService;
import org.apache.turbine.services.TurbineServices;
@@ -79,8 +78,7 @@
GlobalCacheService cache =
(GlobalCacheService)acs.lookup(GlobalCacheService.ROLE);
CachedObject inputObject = new CachedObject(new Double(10.2));
cache.addObject("testObj",inputObject);
- CachedObject returnObject =
CacheServiceFacade.getObject("testObj");
- assertEquals(inputObject,returnObject);
+
}
1.4 +8 -5
jakarta-turbine-2/src/test/org/apache/turbine/services/intake/IntakeToolTest.java
Index: IntakeToolTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/test/org/apache/turbine/services/intake/IntakeToolTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- IntakeToolTest.java 19 Nov 2003 14:05:39 -0000 1.3
+++ IntakeToolTest.java 24 Nov 2004 18:23:44 -0000 1.4
@@ -54,18 +54,21 @@
*/
import java.io.File;
import java.util.Vector;
+
import javax.servlet.ServletConfig;
import javax.servlet.http.HttpServletResponse;
+import org.apache.fulcrum.intake.IntakeService;
import org.apache.fulcrum.intake.model.Group;
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.rundata.RunDataService;
import org.apache.turbine.test.BaseTestCase;
import org.apache.turbine.test.EnhancedMockHttpServletRequest;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.TurbineConfig;
+
import com.mockobjects.servlet.MockHttpServletResponse;
import com.mockobjects.servlet.MockHttpSession;
import com.mockobjects.servlet.MockServletConfig;
@@ -142,10 +145,10 @@
tc = new TurbineConfig(".",
"/conf/test/TestFulcrumComponents.properties");
tc.initialize();
- MerlinComponentService merlin =
- (MerlinComponentService)
TurbineServices.getInstance().getService(MerlinComponentService.SERVICE_NAME);
+ AvalonComponentService avalon =
+ (AvalonComponentService)
TurbineServices.getInstance().getService(AvalonComponentService.SERVICE_NAME);
- merlin.lookup("/fulcrum/intake");
+ avalon.lookup(IntakeService.class.getName());
}
public void tearDown() throws Exception
1.23 +2 -6
jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/Field.java
Index: Field.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/intake/model/Field.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Field.java 14 Oct 2003 12:17:24 -0000 1.22
+++ Field.java 24 Nov 2004 18:23:44 -0000 1.23
@@ -56,15 +56,11 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-
import java.util.Locale;
import org.apache.commons.lang.StringUtils;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.fulcrum.localization.Localization;
-
import org.apache.turbine.om.Retrievable;
import org.apache.turbine.services.intake.IntakeException;
import org.apache.turbine.services.intake.TurbineIntake;
@@ -74,7 +70,7 @@
import org.apache.turbine.services.intake.validator.Validator;
import org.apache.turbine.services.intake.xmlmodel.Rule;
import org.apache.turbine.services.intake.xmlmodel.XmlField;
-
+import org.apache.turbine.services.localization.Localization;
import org.apache.turbine.util.SystemError;
import org.apache.turbine.util.parser.ParameterParser;
import org.apache.turbine.util.parser.ValueParser;
1.95 +4 -0 jakarta-turbine-2/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/xdocs/changes.xml,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- changes.xml 24 Nov 2004 17:22:38 -0000 1.94
+++ changes.xml 24 Nov 2004 18:23:44 -0000 1.95
@@ -24,6 +24,10 @@
<body>
<release version="2.4-M2" date="in cvs">
+ <action dev="epugh" type="remove">
+ Remove Merlin service. When the replacement for Merlin (Metro) is
released, then
+ add back in support.
+ </action>
<action dev="epugh" type="update">
Use RELEASED versions of Fulcrum components!
</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
