weaver 2004/10/13 08:53:23
Modified: components/capability locator.ent project.xml
components/prefs locator.ent
components/locator/src/java/org/apache/jetspeed/locator
JetspeedTemplateLocator.java
components/search locator.ent
components/security locator.ent
portal/src/java/org/apache/jetspeed/tools/pamanager
PortletApplicationManager.java
ApplicationServerPAM.java
components/jetspeed/src/java/org/apache/jetspeed/scheduler
AbstractScheduler.java MemoryBasedScheduler.java
components/rdbms/src/java/org/apache/jetspeed/components/datasource
DBCPDatasourceComponent.java
portal locator.ent
portal/src/java/org/apache/jetspeed/tools/pamanager/servletcontainer
JBossManager.java WeblogicManager.java
TomcatManager.java
components/locator locator.ent
components/rdbms locator.ent
portal/src/java/org/apache/jetspeed/aggregator/impl
BasicAggregator.java PortletRendererImpl.java
components/profiler locator.ent
components/jetspeed/src/test/org/apache/jetspeed/rewriter
TestRewriterController.java
components/page-manager locator.ent
components/id-generator locator.ent
cps locator.ent
components/registry locator.ent
components/id-generator/src/java/org/apache/jetspeed/idgenerator
JetspeedIdGenerator.java
portal/src/test/org/apache/jetspeed/container
TestPortletContainer.java
components/jetspeed/src/java/org/apache/jetspeed/rewriter
JetspeedRewriterController.java
RewriterController.java
components/cm locator.ent
components/prefs/src/java/org/apache/jetspeed/prefs/impl
PreferencesProviderImpl.java
portal/src/test/org/apache/jetspeed/container/session
TestNavigationalState.java
. .classpath locator.ent
components/jetspeed locator.ent
components/persistence locator.ent
portal/src/java/org/apache/jetspeed/deployment/impl
StandardDeploymentManager.java
components/file-cache locator.ent
components/web-content locator.ent
Added: etc/project-dependencies spring-deps.xml
Removed: components/persistence/src/java/org/apache/jetspeed/components/omfactory
OMRuntimeException.java OMHelper.java
OMFactory.java OMFactoryComponentImpl.java
portal/src/java/org/apache/jetspeed/engine PicoEngine.java
components/cm/src/java/org/apache/jetspeed/components/adapters
InterceptorAdapterFactory.java
AbstractDelegationStrategy.java
StandardDelegationStrategy.java
ThreadLocalDelegationStrategy.java
DelegationStrategy.java InterceptorAdapter.java
components/cm/src/java/org/apache/jetspeed/components
ComponentAssemblyTestCase.java
PicoComponentManager.java
AbstractComponentAwareTestCase.java
components/cm/src/java/org/apache/jetspeed/components/pico/groovy
ParameterReader.java GroovyComponentAdapter.java
portal/src/java/org/apache/jetspeed/container/factory/impl
PlutoFactoryContainer.java
portal/src/java/org/apache/jetspeed/container/factory
PlutoFactory.java
components/cm/src/test/org/apache/jetspeed/components
TestComponentManager.java BaseMockComponent.groovy
TestInterceptorAdapter.java
TestGroovyComponentAdapter.java
etc/project-dependencies pico-nano-groovy.xml
portal/src/test/org/apache/jetspeed/engine TestEngine.java
portal/src/test/org/apache/jetspeed
PortalComponentAssemblyTestCase.java
components/jetspeed/test/assembly
TestRewriterController.groovy
Log:
see: http://nagoya.apache.org/jira/browse/JS2-148
Revision Changes Path
1.3 +1 -1 jakarta-jetspeed-2/components/capability/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/capability/locator.ent,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- locator.ent 25 Sep 2004 23:01:19 -0000 1.2
+++ locator.ent 13 Oct 2004 15:53:21 -0000 1.3
@@ -1,5 +1,5 @@
<!-- Project dependencies -->
-<!ENTITY pico-nano-groovy SYSTEM
"file:../../etc/project-dependencies/pico-nano-groovy.xml">
+<!ENTITY pico-nano-groovy SYSTEM
"file:../../etc/project-dependencies/spring-deps.xml">
<!ENTITY db-ojb-deps SYSTEM "file:../../etc/project-dependencies/db-ojb-deps.xml">
<!-- Project resources -->
1.9 +0 -4 jakarta-jetspeed-2/components/capability/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/capability/project.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project.xml 25 Sep 2004 23:01:19 -0000 1.8
+++ project.xml 13 Oct 2004 15:53:21 -0000 1.9
@@ -121,10 +121,6 @@
<id>commons-dbcp</id>
<version>1.2.1</version>
</dependency>
- <dependency>
- <id>picocontainer</id>
- <version>1.0-beta-5</version>
- </dependency>
<!-- This is only a test dependency -->
<dependency>
1.3 +1 -1 jakarta-jetspeed-2/components/prefs/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/prefs/locator.ent,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- locator.ent 25 Sep 2004 23:01:19 -0000 1.2
+++ locator.ent 13 Oct 2004 15:53:21 -0000 1.3
@@ -1,5 +1,5 @@
<!-- Project dependencies -->
-<!ENTITY pico-nano-groovy SYSTEM
"file:../../etc/project-dependencies/pico-nano-groovy.xml">
+<!ENTITY pico-nano-groovy SYSTEM
"file:../../etc/project-dependencies/spring-deps.xml">
<!ENTITY db-ojb-deps SYSTEM "file:../../etc/project-dependencies/db-ojb-deps.xml">
<!-- Project resources -->
1.3 +4 -5
jakarta-jetspeed-2/components/locator/src/java/org/apache/jetspeed/locator/JetspeedTemplateLocator.java
Index: JetspeedTemplateLocator.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/locator/src/java/org/apache/jetspeed/locator/JetspeedTemplateLocator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JetspeedTemplateLocator.java 20 May 2004 16:06:37 -0000 1.2
+++ JetspeedTemplateLocator.java 13 Oct 2004 15:53:21 -0000 1.3
@@ -15,17 +15,16 @@
*/
package org.apache.jetspeed.locator;
-import java.util.Iterator;
import java.io.File;
import java.io.FileNotFoundException;
+import java.util.HashMap;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.HashMap;
import java.util.StringTokenizer;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.picocontainer.Startable;
/**
* Jetspeed's default implementation of a template locator.
@@ -33,7 +32,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">David Sean Taylor</a>
* @version $Id$
*/
-public class JetspeedTemplateLocator implements TemplateLocator, Startable
+public class JetspeedTemplateLocator implements TemplateLocator
{
private final static Log log = LogFactory.getLog(JetspeedTemplateLocator.class);
1.2 +1 -1 jakarta-jetspeed-2/components/search/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/search/locator.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- locator.ent 28 Sep 2004 20:42:43 -0000 1.1
+++ locator.ent 13 Oct 2004 15:53:21 -0000 1.2
@@ -1,5 +1,5 @@
<!-- Project dependencies -->
-<!ENTITY pico-nano-groovy SYSTEM
"file:../../etc/project-dependencies/pico-nano-groovy.xml">
+<!ENTITY pico-nano-groovy SYSTEM
"file:../../etc/project-dependencies/spring-deps.xml">
<!-- Project resources -->
<!ENTITY log4j-resources SYSTEM
"file:../../etc/project-resources/log4j-resources.xml">
1.3 +1 -1 jakarta-jetspeed-2/components/security/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/security/locator.ent,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- locator.ent 25 Sep 2004 23:03:17 -0000 1.2
+++ locator.ent 13 Oct 2004 15:53:21 -0000 1.3
@@ -1,5 +1,5 @@
<!-- Project dependencies -->
-<!ENTITY pico-nano-groovy SYSTEM
"file:../../etc/project-dependencies/pico-nano-groovy.xml">
+<!ENTITY pico-nano-groovy SYSTEM
"file:../../etc/project-dependencies/spring-deps.xml">
<!ENTITY db-ojb-deps SYSTEM "file:../../etc/project-dependencies/db-ojb-deps.xml">
<!-- Project resources -->
1.17 +4 -4
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java
Index: PortletApplicationManager.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/PortletApplicationManager.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- PortletApplicationManager.java 20 Jul 2004 13:55:51 -0000 1.16
+++ PortletApplicationManager.java 13 Oct 2004 15:53:21 -0000 1.17
@@ -33,8 +33,8 @@
import org.apache.jetspeed.deployment.impl.FileNotDeployableException;
import org.apache.jetspeed.deployment.impl.StandardDeploymentObject;
import org.apache.jetspeed.engine.Engine;
-import org.apache.jetspeed.engine.PicoEngine;
import org.apache.jetspeed.engine.JetspeedEngineConstants;
+import org.apache.jetspeed.engine.SpringEngine;
import org.apache.jetspeed.exception.JetspeedException;
import org.apache.jetspeed.util.DirectoryHelper;
import org.apache.jetspeed.util.descriptor.PortletApplicationWar;
@@ -214,7 +214,7 @@
// Override the properties with PAM specifice settings
overrideProperties(strAppRoot, properties);
- engine = Jetspeed.createEngine(properties, strAppRoot, null,
PicoEngine.class);
+ engine = Jetspeed.createEngine(properties, strAppRoot, null,
SpringEngine.class);
}
catch (Exception e)
{
1.9 +2 -3
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/ApplicationServerPAM.java
Index: ApplicationServerPAM.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/ApplicationServerPAM.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ApplicationServerPAM.java 4 Aug 2004 04:00:59 -0000 1.8
+++ ApplicationServerPAM.java 13 Oct 2004 15:53:21 -0000 1.9
@@ -24,7 +24,6 @@
import
org.apache.jetspeed.tools.pamanager.servletcontainer.ApplicationServerManager;
import org.apache.jetspeed.util.ArgUtil;
import org.apache.jetspeed.util.descriptor.PortletApplicationWar;
-import org.picocontainer.Startable;
/**
* This is the catalina specific implemenation for deplyment of Portlet
@@ -36,7 +35,7 @@
* @version $Id$
*/
-public class ApplicationServerPAM extends FileSystemPAM implements Lifecycle,
Startable, DeploymentRegistration
+public class ApplicationServerPAM extends FileSystemPAM implements Lifecycle,
DeploymentRegistration
{
// Implementaion of deplyment interface
public final static String PAM_PROPERTY_SERVER = "server";
1.3 +2 -3
jakarta-jetspeed-2/components/jetspeed/src/java/org/apache/jetspeed/scheduler/AbstractScheduler.java
Index: AbstractScheduler.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/jetspeed/src/java/org/apache/jetspeed/scheduler/AbstractScheduler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractScheduler.java 8 Mar 2004 00:45:07 -0000 1.2
+++ AbstractScheduler.java 13 Oct 2004 15:53:21 -0000 1.3
@@ -19,7 +19,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.picocontainer.Startable;
/**
* Service for a cron like scheduler.
@@ -27,7 +26,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Dave Bryson</a>
* @version $Id$
*/
-public abstract class AbstractScheduler implements Scheduler, Startable
+public abstract class AbstractScheduler implements Scheduler
{
private final static Log log = LogFactory.getLog(MemoryBasedScheduler.class);
1.3 +2 -3
jakarta-jetspeed-2/components/jetspeed/src/java/org/apache/jetspeed/scheduler/MemoryBasedScheduler.java
Index: MemoryBasedScheduler.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/jetspeed/src/java/org/apache/jetspeed/scheduler/MemoryBasedScheduler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MemoryBasedScheduler.java 8 Mar 2004 00:45:07 -0000 1.2
+++ MemoryBasedScheduler.java 13 Oct 2004 15:53:21 -0000 1.3
@@ -20,7 +20,6 @@
import org.apache.commons.configuration.Configuration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.picocontainer.Startable;
/**
* Service for a cron like scheduler that uses the
@@ -59,7 +58,7 @@
* @version $Id$
*/
public class MemoryBasedScheduler
- extends AbstractScheduler implements Scheduler, Startable
+ extends AbstractScheduler implements Scheduler
{
private final static Log log = LogFactory.getLog(MemoryBasedScheduler.class);
private Configuration config;
1.3 +1 -2
jakarta-jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/datasource/DBCPDatasourceComponent.java
Index: DBCPDatasourceComponent.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/rdbms/src/java/org/apache/jetspeed/components/datasource/DBCPDatasourceComponent.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DBCPDatasourceComponent.java 25 Feb 2004 20:44:54 -0000 1.2
+++ DBCPDatasourceComponent.java 13 Oct 2004 15:53:21 -0000 1.3
@@ -28,7 +28,6 @@
import org.apache.commons.logging.LogFactory;
import org.apache.commons.pool.ObjectPool;
import org.apache.commons.pool.impl.GenericObjectPool;
-import org.picocontainer.Startable;
/**
* <p>
@@ -41,7 +40,7 @@
* @version $ $
*
*/
-public class DBCPDatasourceComponent implements DatasourceComponent, Startable
+public class DBCPDatasourceComponent implements DatasourceComponent
{
private static final Log log = LogFactory.getLog(DBCPDatasourceComponent.class);
1.4 +1 -1 jakarta-jetspeed-2/portal/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/portal/locator.ent,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- locator.ent 27 Sep 2004 22:02:22 -0000 1.3
+++ locator.ent 13 Oct 2004 15:53:21 -0000 1.4
@@ -1,5 +1,5 @@
<!-- Project dependencies -->
-<!ENTITY pico-nano-groovy SYSTEM
"file:../etc/project-dependencies/pico-nano-groovy.xml">
+<!ENTITY pico-nano-groovy SYSTEM "file:../etc/project-dependencies/spring-deps.xml">
<!ENTITY db-ojb-deps SYSTEM "file:../etc/project-dependencies/db-ojb-deps.xml">
<!-- Project resources -->
1.3 +2 -4
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/servletcontainer/JBossManager.java
Index: JBossManager.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/servletcontainer/JBossManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JBossManager.java 4 Aug 2004 04:01:00 -0000 1.2
+++ JBossManager.java 13 Oct 2004 15:53:21 -0000 1.3
@@ -20,15 +20,13 @@
import org.apache.commons.httpclient.HttpException;
-import groovy.swing.impl.Startable;
-
/**
* JBoss application server management
*
* @author <a href="mailto:[EMAIL PROTECTED]">David Sean Taylor</a>
* @version $Id$
*/
-public class JBossManager implements ApplicationServerManager, Startable
+public class JBossManager implements ApplicationServerManager
{
/* (non-Javadoc)
1.2 +2 -3
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/servletcontainer/WeblogicManager.java
Index: WeblogicManager.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/servletcontainer/WeblogicManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- WeblogicManager.java 16 Aug 2004 18:32:18 -0000 1.1
+++ WeblogicManager.java 13 Oct 2004 15:53:21 -0000 1.2
@@ -19,7 +19,6 @@
import java.io.InputStream;
import org.apache.commons.httpclient.HttpException;
-import org.picocontainer.Startable;
/**
* Weblogic application server management
@@ -27,7 +26,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">David Sean Taylor</a>
* @version $Id$
*/
-public class WeblogicManager implements ApplicationServerManager, Startable
+public class WeblogicManager implements ApplicationServerManager
{
/* (non-Javadoc)
1.9 +2 -3
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/servletcontainer/TomcatManager.java
Index: TomcatManager.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/servletcontainer/TomcatManager.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TomcatManager.java 6 Aug 2004 02:23:37 -0000 1.8
+++ TomcatManager.java 13 Oct 2004 15:53:21 -0000 1.9
@@ -39,7 +39,6 @@
import org.jdom.input.SAXBuilder;
import org.jdom.output.Format;
import org.jdom.output.XMLOutputter;
-import org.picocontainer.Startable;
/**
* <p>
@@ -50,7 +49,7 @@
* @version $Id$
*
*/
-public class TomcatManager implements ApplicationServerManager, Startable
+public class TomcatManager implements ApplicationServerManager
{
private static final String DEFUALT_MANAGER_APP_PATH = "/manager";
private static final String EMBEDDED_CONTEXT_FILE_PATH =
"/META-INF/tomcat-context.xml";
1.3 +1 -1 jakarta-jetspeed-2/components/locator/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/locator/locator.ent,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- locator.ent 25 Sep 2004 23:01:19 -0000 1.2
+++ locator.ent 13 Oct 2004 15:53:21 -0000 1.3
@@ -1,5 +1,5 @@
<!-- Project dependencies -->
-<!ENTITY pico-nano-groovy SYSTEM
"file:../../etc/project-dependencies/pico-nano-groovy.xml">
+<!ENTITY pico-nano-groovy SYSTEM
"file:../../etc/project-dependencies/spring-deps.xml">
<!-- Project resources -->
<!ENTITY log4j-resources SYSTEM
"file:../../etc/project-resources/log4j-resources.xml">
1.3 +1 -1 jakarta-jetspeed-2/components/rdbms/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/rdbms/locator.ent,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- locator.ent 25 Sep 2004 23:02:02 -0000 1.2
+++ locator.ent 13 Oct 2004 15:53:21 -0000 1.3
@@ -1,5 +1,5 @@
<!-- Project dependencies -->
-<!ENTITY pico-nano-groovy SYSTEM
"file:../../etc/project-dependencies/pico-nano-groovy.xml">
+<!ENTITY pico-nano-groovy SYSTEM
"file:../../etc/project-dependencies/spring-deps.xml">
<!-- Project reports -->
<!ENTITY j2-reports SYSTEM "file:../../etc/project-reports/j2-reports.xml">
1.5 +2 -3
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/BasicAggregator.java
Index: BasicAggregator.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/BasicAggregator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BasicAggregator.java 31 Mar 2004 01:19:24 -0000 1.4
+++ BasicAggregator.java 13 Oct 2004 15:53:22 -0000 1.5
@@ -34,7 +34,6 @@
import org.apache.pluto.PortletContainer;
import org.apache.pluto.om.portlet.PortletDefinition;
import org.apache.pluto.om.window.PortletWindow;
-import org.picocontainer.Startable;
/**
* Basic Aggregator, nothing complicated.
@@ -42,7 +41,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">David Sean Taylor</a>
* @version $Id$
*/
-public class BasicAggregator implements Aggregator, Startable
+public class BasicAggregator implements Aggregator
{
private final static Log log = LogFactory.getLog(BasicAggregator.class);
1.24 +2 -3
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java
Index: PortletRendererImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/impl/PortletRendererImpl.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- PortletRendererImpl.java 23 Sep 2004 03:30:52 -0000 1.23
+++ PortletRendererImpl.java 13 Oct 2004 15:53:22 -0000 1.24
@@ -37,7 +37,6 @@
import org.apache.pluto.om.common.ObjectID;
import org.apache.pluto.om.entity.PortletEntity;
import org.apache.pluto.om.window.PortletWindow;
-import org.picocontainer.Startable;
/**
* <h4>PortletRendererService<br />
@@ -48,7 +47,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Rapha�l Luta</a>
* @version $Id$
*/
-public class PortletRendererImpl implements PortletRenderer, Startable
+public class PortletRendererImpl implements PortletRenderer
{
protected final static Log log = LogFactory.getLog(PortletRendererImpl.class);
1.3 +1 -1 jakarta-jetspeed-2/components/profiler/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/profiler/locator.ent,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- locator.ent 25 Sep 2004 23:02:02 -0000 1.2
+++ locator.ent 13 Oct 2004 15:53:22 -0000 1.3
@@ -1,5 +1,5 @@
<!-- Project dependencies -->
-<!ENTITY pico-nano-groovy SYSTEM
"file:../../etc/project-dependencies/pico-nano-groovy.xml">
+<!ENTITY pico-nano-groovy SYSTEM
"file:../../etc/project-dependencies/spring-deps.xml">
<!ENTITY db-ojb-deps SYSTEM "file:../../etc/project-dependencies/db-ojb-deps.xml">
<!-- Project resources -->
1.3 +18 -9
jakarta-jetspeed-2/components/jetspeed/src/test/org/apache/jetspeed/rewriter/TestRewriterController.java
Index: TestRewriterController.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/jetspeed/src/test/org/apache/jetspeed/rewriter/TestRewriterController.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestRewriterController.java 8 Mar 2004 00:46:00 -0000 1.2
+++ TestRewriterController.java 13 Oct 2004 15:53:22 -0000 1.3
@@ -18,17 +18,19 @@
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
+import java.util.Arrays;
import java.util.Iterator;
-
import junit.framework.Test;
+import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.jetspeed.components.ComponentAssemblyTestCase;
+import org.apache.jetspeed.rewriter.html.SwingParserAdaptor;
import org.apache.jetspeed.rewriter.rules.Attribute;
import org.apache.jetspeed.rewriter.rules.Rule;
import org.apache.jetspeed.rewriter.rules.Ruleset;
import org.apache.jetspeed.rewriter.rules.Tag;
+import org.apache.jetspeed.rewriter.xml.SaxParserAdaptor;
/**
* TestRewriterRules
@@ -36,7 +38,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">David Sean Taylor</a>
* @version $Id$
*/
-public class TestRewriterController extends ComponentAssemblyTestCase
+public class TestRewriterController extends TestCase
{
/**
* Defines the testcase name for JUnit.
@@ -72,7 +74,7 @@
public void testFactories()
throws Exception
{
- RewriterController component =
(RewriterController)componentManager.getComponent("RewriterController");
+ RewriterController component = getController();
assertNotNull("template component is null", component);
Rewriter basic = component.createRewriter();
@@ -88,7 +90,7 @@
public void testRules()
throws Exception
{
- RewriterController component =
(RewriterController)componentManager.getComponent("RewriterController");
+ RewriterController component = getController();
assertNotNull("template component is null", component);
assertNotNull("rewriter component is null", component);
@@ -189,7 +191,7 @@
public void testRewriting()
throws Exception
{
- RewriterController component =
(RewriterController)componentManager.getComponent("RewriterController");
+ RewriterController component = getController();
assertNotNull("template component is null", component);
assertNotNull("rewriter component is null", component);
@@ -242,7 +244,7 @@
private FileReader getTestReader(String filename)
throws IOException
{
- return new FileReader(getApplicationRoot() + "/rewriter/" + filename);
+ return new FileReader("test/rewriter/" + filename);
}
/**
@@ -256,7 +258,14 @@
{
String cwd = System.getProperty("user.dir");
String path;
- return new FileWriter(getApplicationRoot() + "/rewriter/" + filename);
+ return new FileWriter("test/rewriter/" + filename);
+ }
+
+ private RewriterController getController() throws Exception
+ {
+ Class[] rewrtierClasses = new Class[]{BasicRewriter.class,
RulesetRewriterImpl.class};
+ Class[] adaptorClasses = new Class[]{SwingParserAdaptor.class,
SaxParserAdaptor.class};
+ return new
JetspeedRewriterController("test/WEB-INF/conf/rewriter-rules-mapping.xml",
Arrays.asList(rewrtierClasses), Arrays.asList(adaptorClasses));
}
}
1.3 +1 -1 jakarta-jetspeed-2/components/page-manager/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/page-manager/locator.ent,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- locator.ent 25 Sep 2004 23:01:20 -0000 1.2
+++ locator.ent 13 Oct 2004 15:53:22 -0000 1.3
@@ -1,5 +1,5 @@
<!-- Project dependencies -->
-<!ENTITY pico-nano-groovy SYSTEM
"file:../../etc/project-dependencies/pico-nano-groovy.xml">
+<!ENTITY pico-nano-groovy SYSTEM
"file:../../etc/project-dependencies/spring-deps.xml">
<!ENTITY db-ojb-deps SYSTEM "file:../../etc/project-dependencies/db-ojb-deps.xml">
<!-- Project resources -->
1.3 +1 -1 jakarta-jetspeed-2/components/id-generator/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/id-generator/locator.ent,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- locator.ent 25 Sep 2004 23:01:19 -0000 1.2
+++ locator.ent 13 Oct 2004 15:53:22 -0000 1.3
@@ -1,5 +1,5 @@
<!-- Project dependencies -->
-<!ENTITY pico-nano-groovy SYSTEM
"file:../../etc/project-dependencies/pico-nano-groovy.xml">
+<!ENTITY pico-nano-groovy SYSTEM
"file:../../etc/project-dependencies/spring-deps.xml">
<!-- Project resources -->
<!ENTITY log4j-resources SYSTEM
"file:../../etc/project-resources/log4j-resources.xml">
1.3 +1 -1 jakarta-jetspeed-2/cps/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/cps/locator.ent,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- locator.ent 25 Sep 2004 23:03:18 -0000 1.2
+++ locator.ent 13 Oct 2004 15:53:22 -0000 1.3
@@ -1,5 +1,5 @@
<!-- Project dependencies -->
-<!ENTITY pico-nano-groovy SYSTEM
"file:../etc/project-dependencies/pico-nano-groovy.xml">
+<!ENTITY pico-nano-groovy SYSTEM "file:../etc/project-dependencies/spring-deps.xml">
<!-- Project reports -->
<!ENTITY j2-reports SYSTEM "file:../etc/project-reports/j2-reports.xml">
1.3 +1 -1 jakarta-jetspeed-2/components/registry/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/registry/locator.ent,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- locator.ent 25 Sep 2004 23:02:02 -0000 1.2
+++ locator.ent 13 Oct 2004 15:53:22 -0000 1.3
@@ -1,5 +1,5 @@
<!-- Project dependencies -->
-<!ENTITY pico-nano-groovy SYSTEM
"file:../../etc/project-dependencies/pico-nano-groovy.xml">
+<!ENTITY pico-nano-groovy SYSTEM
"file:../../etc/project-dependencies/spring-deps.xml">
<!ENTITY db-ojb-deps SYSTEM "file:../../etc/project-dependencies/db-ojb-deps.xml">
<!-- Project resources -->
1.2 +2 -3
jakarta-jetspeed-2/components/id-generator/src/java/org/apache/jetspeed/idgenerator/JetspeedIdGenerator.java
Index: JetspeedIdGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/id-generator/src/java/org/apache/jetspeed/idgenerator/JetspeedIdGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JetspeedIdGenerator.java 19 May 2004 19:14:22 -0000 1.1
+++ JetspeedIdGenerator.java 13 Oct 2004 15:53:22 -0000 1.2
@@ -19,7 +19,6 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.picocontainer.Startable;
/**
* Simple implementation of the IdGeneratorService.
@@ -28,7 +27,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">David Sean Taylor</a>
* @version $Id$
*/
-public class JetspeedIdGenerator implements IdGenerator, Startable
+public class JetspeedIdGenerator implements IdGenerator
{
private final static Log log = LogFactory.getLog(JetspeedIdGenerator.class);
1.4 +2 -3
jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/container/TestPortletContainer.java
Index: TestPortletContainer.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/container/TestPortletContainer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestPortletContainer.java 27 May 2004 19:55:52 -0000 1.3
+++ TestPortletContainer.java 13 Oct 2004 15:53:22 -0000 1.4
@@ -21,7 +21,6 @@
import org.apache.pluto.PortletContainer;
import org.apache.pluto.PortletContainerImpl;
-import org.picocontainer.MutablePicoContainer;
/**
* TestPortletContainer
@@ -31,7 +30,7 @@
*/
public class TestPortletContainer extends TestCase
{
- private MutablePicoContainer container;
+
private PortletContainer portletContainer;
/**
1.3 +65 -93
jakarta-jetspeed-2/components/jetspeed/src/java/org/apache/jetspeed/rewriter/JetspeedRewriterController.java
Index: JetspeedRewriterController.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/jetspeed/src/java/org/apache/jetspeed/rewriter/JetspeedRewriterController.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JetspeedRewriterController.java 8 Mar 2004 00:44:40 -0000 1.2
+++ JetspeedRewriterController.java 13 Oct 2004 15:53:22 -0000 1.3
@@ -27,25 +27,23 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
import org.apache.jetspeed.rewriter.html.SwingParserAdaptor;
import org.apache.jetspeed.rewriter.rules.Ruleset;
import org.apache.jetspeed.rewriter.xml.SaxParserAdaptor;
import org.exolab.castor.mapping.Mapping;
import org.exolab.castor.xml.Unmarshaller;
-import org.picocontainer.Startable;
import org.w3c.dom.Document;
-
import org.w3c.dom.Node;
import org.xml.sax.InputSource;
/**
* RewriterServiceImpl
- *
- * @author <a href="mailto:[EMAIL PROTECTED]">David Sean Taylor</a>
- * @version $Id$
+ *
+ * @author <a href="mailto:[EMAIL PROTECTED]">David Sean Taylor </a>
+ * @version $Id: JetspeedRewriterController.java,v 1.2 2004/03/08 00:44:40 jford
+ * Exp $
*/
-public class JetspeedRewriterController implements RewriterController, Startable
+public class JetspeedRewriterController implements RewriterController
{
protected final static Log log =
LogFactory.getLog(JetspeedRewriterController.class);
final static String CONFIG_MAPPING_FILE = "mapping";
@@ -53,16 +51,16 @@
final static String CONFIG_RULESET_REWRITER = "ruleset.class";
final static String CONFIG_ADAPTOR_HTML = "adaptor.html";
final static String CONFIG_ADAPTOR_XML = "adaptor.xml";
-
+
// configuration parameters
- private String mappingFile = null;
-
+ private String mappingFile = null;
+
/** the Castor mapping file name */
private Mapping mapper = null;
-
+
/** Collection of rulesets in the system */
private Map rulesets = new HashMap();
-
+
/** configured basic rewriter class */
private Class basicRewriterClass = BasicRewriter.class;
@@ -71,111 +69,84 @@
/** Adaptors */
private Class adaptorHtmlClass = SwingParserAdaptor.class;
- private Class adaptorXmlClass = SaxParserAdaptor.class;
-
-
- private JetspeedRewriterController()
- {
- }
+ private Class adaptorXmlClass = SaxParserAdaptor.class;
- public JetspeedRewriterController(String mappingFile)
- {
+ public JetspeedRewriterController( String mappingFile ) throws RewriterException
+ {
this.mappingFile = mappingFile;
+ loadMapping();
}
- public JetspeedRewriterController(String mappingFile, List rewriterClasses,
List adaptorClasses)
- {
+ public JetspeedRewriterController( String mappingFile, List rewriterClasses,
List adaptorClasses )
+ throws RewriterException
+ {
this.mappingFile = mappingFile;
if (rewriterClasses.size() > 0)
{
- this.basicRewriterClass = (Class)rewriterClasses.get(0);
+ this.basicRewriterClass = (Class) rewriterClasses.get(0);
if (rewriterClasses.size() > 1)
{
- this.rulesetRewriterClass = (Class)rewriterClasses.get(1);
+ this.rulesetRewriterClass = (Class) rewriterClasses.get(1);
}
- }
+ }
if (adaptorClasses.size() > 0)
{
- this.adaptorHtmlClass = (Class)adaptorClasses.get(0);
+ this.adaptorHtmlClass = (Class) adaptorClasses.get(0);
if (adaptorClasses.size() > 1)
{
- this.adaptorXmlClass = (Class)adaptorClasses.get(1);
+ this.adaptorXmlClass = (Class) adaptorClasses.get(1);
}
- }
-
- }
-
- public void start()
- {
- log.info("Starting Rewriter service");
-
- try
- {
- loadMapping();
}
- catch (Exception e)
- {
- log.error("Failed to load rewriter rules", e);
- }
-
- }
-
- public void stop()
- {
+
+ loadMapping();
}
-
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
+ *
* @see org.apache.jetspeed.rewriter.RewriterService#createRewriter()
*/
- public Rewriter createRewriter()
- throws RewriterException
+ public Rewriter createRewriter() throws InstantiationException,
IllegalAccessException
{
- try
- {
- return (Rewriter)basicRewriterClass.newInstance();
- }
- catch (Exception e)
- {
- log.error("Error creating rewriter class", e);
- }
- return null;
+ return (Rewriter) basicRewriterClass.newInstance();
}
-
-
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
+ *
* @see
org.apache.jetspeed.rewriter.RewriterService#createRewriter(org.apache.jetspeed.rewriter.rules.Ruleset)
*/
- public RulesetRewriter createRewriter(Ruleset ruleset)
- throws RewriterException
+ public RulesetRewriter createRewriter( Ruleset ruleset ) throws
RewriterException
{
try
- {
- RulesetRewriter rewriter =
(RulesetRewriter)rulesetRewriterClass.newInstance();
+ {
+ RulesetRewriter rewriter = (RulesetRewriter)
rulesetRewriterClass.newInstance();
rewriter.setRuleset(ruleset);
- return rewriter;
+ return rewriter;
}
catch (Exception e)
{
- log.error("Error creating rewriter class", e);
+ log.error("Error creating rewriter class", e);
}
return null;
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see
org.apache.jetspeed.rewriter.RewriterService#createParserAdaptor(java.lang.String)
*/
- public ParserAdaptor createParserAdaptor(String mimeType)
- throws RewriterException
+ public ParserAdaptor createParserAdaptor( String mimeType ) throws
RewriterException
{
try
{
if (mimeType.equals("text/html"))
- {
- return (ParserAdaptor)adaptorHtmlClass.newInstance();
+ {
+ return (ParserAdaptor) adaptorHtmlClass.newInstance();
}
else if (mimeType.equals("text/xml"))
{
- return (ParserAdaptor)adaptorXmlClass.newInstance();
+ return (ParserAdaptor) adaptorXmlClass.newInstance();
}
else
{
@@ -185,15 +156,14 @@
{
log.error("Error creating rewriter class", e);
}
- return null;
+ return null;
}
-
+
/**
* Load the mapping file for ruleset configuration
- *
+ *
*/
- private void loadMapping()
- throws RewriterException
+ private void loadMapping() throws RewriterException
{
File map = new File(this.mappingFile);
if (map.exists() && map.isFile() && map.canRead())
@@ -215,7 +185,7 @@
}
else
{
-
+
String msg = "RewriterService: Mapping not found or not a file or
unreadable: " + this.mappingFile;
System.out.println(msg);
log.error(msg);
@@ -224,19 +194,22 @@
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see
org.apache.jetspeed.rewriter.RewriterService#lookupRuleset(java.lang.String)
*/
- public Ruleset lookupRuleset(String id)
+ public Ruleset lookupRuleset( String id )
{
- return (Ruleset)rulesets.get(id);
+ return (Ruleset) rulesets.get(id);
}
-
-
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
+ *
* @see org.apache.jetspeed.rewriter.RewriterService#loadRuleset(java.io.Reader)
*/
- public Ruleset loadRuleset(Reader reader)
+ public Ruleset loadRuleset( Reader reader )
{
Ruleset ruleset = null;
try
@@ -249,11 +222,10 @@
Document doc = builder.parse(source);
Unmarshaller unmarshaller = new Unmarshaller(this.mapper);
-
+
ruleset = (Ruleset) unmarshaller.unmarshal((Node) doc);
ruleset.sync();
rulesets.put(ruleset.getId(), ruleset);
-
}
catch (Throwable t)
@@ -261,7 +233,7 @@
log.error("ForwardService: Could not unmarshal: " + reader, t);
}
- return ruleset;
+ return ruleset;
}
-
-}
+
+}
\ No newline at end of file
1.3 +5 -2
jakarta-jetspeed-2/components/jetspeed/src/java/org/apache/jetspeed/rewriter/RewriterController.java
Index: RewriterController.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/jetspeed/src/java/org/apache/jetspeed/rewriter/RewriterController.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RewriterController.java 8 Mar 2004 00:44:40 -0000 1.2
+++ RewriterController.java 13 Oct 2004 15:53:22 -0000 1.3
@@ -34,9 +34,12 @@
* The Rewriter implementation is configured in the service configuration.
*
* @return A new rewriter that does not support rulesets.
+ * @throws InstantiationException
+ * @throws
+ * @throws IllegalAccessException
*/
Rewriter createRewriter()
- throws RewriterException;
+ throws IllegalAccessException, InstantiationException;
/**
* Creates a rewriter that supports rulesets configurations.
1.3 +1 -1 jakarta-jetspeed-2/components/cm/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/cm/locator.ent,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- locator.ent 25 Sep 2004 23:01:20 -0000 1.2
+++ locator.ent 13 Oct 2004 15:53:22 -0000 1.3
@@ -1,5 +1,5 @@
<!-- Project dependencies -->
-<!ENTITY pico-nano-groovy SYSTEM
"file:../../etc/project-dependencies/pico-nano-groovy.xml">
+<!ENTITY pico-nano-groovy SYSTEM
"file:../../etc/project-dependencies/spring-deps.xml">
<!-- Project resources -->
<!ENTITY log4j-resources SYSTEM
"file:../../etc/project-resources/log4j-resources.xml">
1.1 jakarta-jetspeed-2/etc/project-dependencies/spring-deps.xml
Index: spring-deps.xml
===================================================================
<dependency>
<id>cglib</id>
<version>2.0.1</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
<id>springframework:spring-core</id>
<version>1.1.1</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
<id>springframework:spring-aop</id>
<version>1.1.1</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
<id>springframework:spring-context</id>
<version>1.1.1</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
<id>springframework:spring-dao</id>
<version>1.1.1</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
<id>springframework:spring-orm</id>
<version>1.1.1</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
<id>aopalliance</id>
<version>1.0</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
1.9 +1 -2
jakarta-jetspeed-2/components/prefs/src/java/org/apache/jetspeed/prefs/impl/PreferencesProviderImpl.java
Index: PreferencesProviderImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/prefs/src/java/org/apache/jetspeed/prefs/impl/PreferencesProviderImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- PreferencesProviderImpl.java 1 Aug 2004 20:23:00 -0000 1.8
+++ PreferencesProviderImpl.java 13 Oct 2004 15:53:22 -0000 1.9
@@ -18,13 +18,12 @@
import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.components.persistence.store.PersistenceStore;
import org.apache.jetspeed.prefs.PreferencesProvider;
-import org.picocontainer.Startable;
/**
* @author <a href="">David Le Strat</a>
*
*/
-public class PreferencesProviderImpl implements PreferencesProvider, Startable
+public class PreferencesProviderImpl implements PreferencesProvider
{
/** Logger. */
private static final Log log = LogFactory.getLog(PreferencesProviderImpl.class);
1.9 +1 -3
jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/container/session/TestNavigationalState.java
Index: TestNavigationalState.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/container/session/TestNavigationalState.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TestNavigationalState.java 27 May 2004 19:56:11 -0000 1.8
+++ TestNavigationalState.java 13 Oct 2004 15:53:22 -0000 1.9
@@ -29,7 +29,6 @@
import org.apache.jetspeed.om.window.impl.PortletWindowImpl;
import org.apache.jetspeed.request.JetspeedRequestContext;
import org.apache.pluto.om.window.PortletWindow;
-import org.picocontainer.MutablePicoContainer;
import com.mockrunner.mock.web.MockHttpServletRequest;
import com.mockrunner.mock.web.MockHttpServletResponse;
@@ -45,7 +44,6 @@
public class TestNavigationalState extends TestCase
{
- private MutablePicoContainer container;
private NavigationalStateComponent navSession;
private NavigationalStateComponent navPluto;
/**
1.66 +1 -8 jakarta-jetspeed-2/.classpath
Index: .classpath
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/.classpath,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- .classpath 12 Oct 2004 20:24:29 -0000 1.65
+++ .classpath 13 Oct 2004 15:53:22 -0000 1.66
@@ -78,21 +78,14 @@
<classpathentry exported="true" kind="var"
path="MAVEN_REPO/regexp/jars/regexp-1.2.jar"/>
<classpathentry exported="true" kind="var"
path="MAVEN_REPO/velocity/jars/velocity-1.3.1.jar"/>
<classpathentry exported="true" kind="var"
path="MAVEN_REPO/tyrex/jars/tyrex-1.0.1.jar"/>
- <classpathentry exported="true" kind="var"
path="MAVEN_REPO/ojb/jars/db-ojb-1.0.rc6-PATCHED.jar"/>
+ <classpathentry kind="var" path="MAVEN_REPO/ojb/jars/db-ojb-1.0.1.jar"/>
<classpathentry kind="var"
path="MAVEN_REPO/commons-httpclient/jars/commons-httpclient-2.0.jar"/>
<classpathentry exported="true" kind="var"
path="MAVEN_REPO/velocity-tools/jars/velocity-tools-view-1.1-beta1.jar"/>
- <classpathentry kind="var"
path="MAVEN_REPO/picocontainer/jars/picocontainer-1.1-20040709.jar"/>
<classpathentry kind="var"
path="MAVEN_REPO/commons-dbcp/jars/commons-dbcp-1.2.1.jar"/>
<classpathentry exported="true" kind="var"
path="MAVEN_REPO/commons-configuration/jars/commons-configuration-SNAPSHOT.jar"/>
- <classpathentry kind="var"
path="MAVEN_REPO/nanocontainer/jars/nanocontainer-1.0-20040709.jar"/>
- <classpathentry kind="var"
path="MAVEN_REPO/groovy/jars/groovy-1.0-rc1-snapshot.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/asm/jars/asm-1.4.3.jar"/>
<classpathentry exported="true" kind="var"
path="MAVEN_REPO/mockrunner/jars/mockrunner-0.2.7.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/struts/jars/struts-1.2.1.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/jmock/jars/jmock-SNAPSHOT.jar"/>
- <classpathentry kind="var"
path="MAVEN_REPO/nanocontainer/jars/nanocontainer-proxytoys-1.0-20040709.jar"/>
- <classpathentry kind="var"
path="MAVEN_REPO/proxytoys/jars/proxytoys-0.1-J2PATCHED.jar"/>
- <classpathentry kind="var" path="MAVEN_REPO/asm/jars/asm-util-1.4.1.jar"/>
<classpathentry kind="var" path="MAVEN_REPO/saxpath/jars/saxpath-1.0-FCS.jar"/>
<classpathentry kind="var"
path="MAVEN_REPO/jaxen/jars/jaxen-1.0-FCS-full.jar"/>
<classpathentry kind="var"
path="MAVEN_REPO/aopalliance/jars/aopalliance-1.0.jar"/>
1.3 +1 -1 jakarta-jetspeed-2/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/locator.ent,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- locator.ent 25 Sep 2004 23:03:47 -0000 1.2
+++ locator.ent 13 Oct 2004 15:53:22 -0000 1.3
@@ -1,5 +1,5 @@
<!-- Project dependencies -->
-<!ENTITY pico-nano-groovy SYSTEM
"file:etc/project-dependencies/pico-nano-groovy.xml">
+<!ENTITY pico-nano-groovy SYSTEM "file:etc/project-dependencies/spring-deps.xml">
<!ENTITY db-ojb-deps SYSTEM "file:etc/project-dependencies/db-ojb-deps.xml">
<!-- Project resources -->
1.3 +1 -1 jakarta-jetspeed-2/components/jetspeed/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/jetspeed/locator.ent,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- locator.ent 25 Sep 2004 23:01:20 -0000 1.2
+++ locator.ent 13 Oct 2004 15:53:22 -0000 1.3
@@ -1,5 +1,5 @@
<!-- Project dependencies -->
-<!ENTITY pico-nano-groovy SYSTEM
"file:../../etc/project-dependencies/pico-nano-groovy.xml">
+<!ENTITY pico-nano-groovy SYSTEM
"file:../../etc/project-dependencies/spring-deps.xml">
<!-- Project reports -->
<!ENTITY j2-reports SYSTEM "file:../../etc/project-reports/j2-reports.xml">
1.3 +1 -1 jakarta-jetspeed-2/components/persistence/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/persistence/locator.ent,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- locator.ent 25 Sep 2004 23:01:20 -0000 1.2
+++ locator.ent 13 Oct 2004 15:53:22 -0000 1.3
@@ -1,5 +1,5 @@
<!-- Project dependencies -->
-<!ENTITY pico-nano-groovy SYSTEM
"file:../../etc/project-dependencies/pico-nano-groovy.xml">
+<!ENTITY pico-nano-groovy SYSTEM
"file:../../etc/project-dependencies/spring-deps.xml">
<!ENTITY db-ojb-deps SYSTEM "file:../../etc/project-dependencies/db-ojb-deps.xml">
<!-- Project resources -->
1.4 +1 -2
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/deployment/impl/StandardDeploymentManager.java
Index: StandardDeploymentManager.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/deployment/impl/StandardDeploymentManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StandardDeploymentManager.java 4 Aug 2004 21:22:53 -0000 1.3
+++ StandardDeploymentManager.java 13 Oct 2004 15:53:23 -0000 1.4
@@ -35,7 +35,6 @@
import org.apache.jetspeed.deployment.DeploymentException;
import org.apache.jetspeed.deployment.DeploymentManager;
import org.apache.jetspeed.deployment.DeploymentObject;
-import org.picocontainer.Startable;
/**
* <p>
@@ -48,7 +47,7 @@
* Exp $
*
*/
-public class StandardDeploymentManager implements Startable, DeploymentManager
+public class StandardDeploymentManager implements DeploymentManager
{
protected Log log = LogFactory.getLog("deployment");
1.3 +1 -1 jakarta-jetspeed-2/components/file-cache/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/file-cache/locator.ent,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- locator.ent 25 Sep 2004 23:01:20 -0000 1.2
+++ locator.ent 13 Oct 2004 15:53:23 -0000 1.3
@@ -1,5 +1,5 @@
<!-- Project dependencies -->
-<!ENTITY pico-nano-groovy SYSTEM
"file:../../etc/project-dependencies/pico-nano-groovy.xml">
+<!ENTITY pico-nano-groovy SYSTEM
"file:../../etc/project-dependencies/spring-deps.xml">
<!-- Project resources -->
<!ENTITY log4j-resources SYSTEM
"file:../../etc/project-resources/log4j-resources.xml">
1.3 +1 -1 jakarta-jetspeed-2/components/web-content/locator.ent
Index: locator.ent
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/web-content/locator.ent,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- locator.ent 25 Sep 2004 23:03:17 -0000 1.2
+++ locator.ent 13 Oct 2004 15:53:23 -0000 1.3
@@ -1,5 +1,5 @@
<!-- Project dependencies -->
-<!ENTITY pico-nano-groovy SYSTEM
"file:../../etc/project-dependencies/pico-nano-groovy.xml">
+<!ENTITY pico-nano-groovy SYSTEM
"file:../../etc/project-dependencies/spring-deps.xml">
<!-- Project resources -->
<!ENTITY log4j-resources SYSTEM
"file:../../etc/project-resources/log4j-resources.xml">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
