weaver 2004/10/29 07:18:04
Modified: portal/src/java/org/apache/jetspeed/deployment/impl
StandardDeploymentManager.java
DeployPortletAppEventListener.java
portal/src/java/org/apache/jetspeed/aggregator/impl
BasicAggregator.java
Log:
rename of PortletRegsitryComponent to PortletRegistry.
Revision Changes Path
1.5 +2 -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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StandardDeploymentManager.java 13 Oct 2004 15:53:23 -0000 1.4
+++ StandardDeploymentManager.java 29 Oct 2004 14:18:04 -0000 1.5
@@ -29,7 +29,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent;
+import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.deployment.DeploymentEvent;
import org.apache.jetspeed.deployment.DeploymentEventListener;
import org.apache.jetspeed.deployment.DeploymentException;
@@ -53,7 +53,7 @@
protected FileSystemScanner scanner;
- protected PortletRegistryComponent registry;
+ protected PortletRegistry registry;
protected Collection deploymentListeners;
1.19 +3 -3
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/deployment/impl/DeployPortletAppEventListener.java
Index: DeployPortletAppEventListener.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/deployment/impl/DeployPortletAppEventListener.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- DeployPortletAppEventListener.java 19 Sep 2004 22:28:10 -0000 1.18
+++ DeployPortletAppEventListener.java 29 Oct 2004 14:18:04 -0000 1.19
@@ -15,7 +15,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent;
+import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.deployment.DeploymentEvent;
import org.apache.jetspeed.deployment.DeploymentEventListener;
import org.apache.jetspeed.deployment.DeploymentException;
@@ -48,7 +48,7 @@
private String webAppDir;
private PortletApplicationManagement pam;
private Map appNameToFile;
- protected PortletRegistryComponent registry;
+ protected PortletRegistry registry;
private PortletFactory portletFactory;
@@ -61,7 +61,7 @@
* the <code>webAppDir</code> directory does not exist.
*/
public DeployPortletAppEventListener( String webAppDir,
PortletApplicationManagement pam,
- PortletRegistryComponent registry, PortletFactory portletFactory )
throws FileNotFoundException
+ PortletRegistry registry, PortletFactory portletFactory ) throws
FileNotFoundException
{
File checkFile = new File(webAppDir);
this.portletFactory = portletFactory;
1.7 +5 -5
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BasicAggregator.java 15 Oct 2004 21:44:32 -0000 1.6
+++ BasicAggregator.java 29 Oct 2004 14:18:04 -0000 1.7
@@ -23,7 +23,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.aggregator.Aggregator;
-import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent;
+import org.apache.jetspeed.components.portletregistry.PortletRegistry;
import org.apache.jetspeed.container.window.PortletWindowAccessor;
import org.apache.jetspeed.exception.JetspeedException;
import org.apache.jetspeed.om.page.Fragment;
@@ -47,11 +47,11 @@
public final static int STRATEGY_PARALLEL = 1;
private int strategy = STRATEGY_SEQUENTIAL;
- private PortletRegistryComponent registry;
+ private PortletRegistry registry;
private PortletWindowAccessor windowAccessor;
private PortletContainer portletContainer;
- public BasicAggregator(PortletRegistryComponent registry,
+ public BasicAggregator(PortletRegistry registry,
PortletWindowAccessor windowAccessor,
PortletContainer portletContainer,
int strategy)
@@ -62,7 +62,7 @@
this.portletContainer = portletContainer;
}
- public BasicAggregator(PortletRegistryComponent registry,
+ public BasicAggregator(PortletRegistry registry,
PortletWindowAccessor windowAccessor,
PortletContainer portletContainer)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
