taylor 2004/03/09 11:35:47
Modified: portal/src/java/org/apache/jetspeed/aggregator
BasicAggregator.java PortletWindowFactory.java
portal/src/java/org/apache/jetspeed/aggregator/impl
PortletRendererImpl.java
portal/src/java/org/apache/jetspeed/deployment/impl
DeployPortletAppEventListener.java
portal/src/java/org/apache/jetspeed/engine/core
PortalControlParameter.java
portal/src/java/org/apache/jetspeed/mbeans/registry
RegistryMBeanImpl.java
portal/src/java/org/apache/jetspeed/services/information
StaticInformationProviderImpl.java
portal/src/java/org/apache/jetspeed/tools/pamanager
FileSystemPAM.java
portal/src/java/org/apache/jetspeed/tools/pamanager/containers
pa-container.groovy
portal/src/test/org/apache/jetspeed/deployment
TestSimpleDeployment.java
portal/src/test/org/apache/jetspeed/tools/pamanager
TestPortletDescriptor.java
Log:
fixed spelling
Revision Changes Path
1.11 +2 -2
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/BasicAggregator.java
Index: BasicAggregator.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/BasicAggregator.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- BasicAggregator.java 8 Mar 2004 00:22:31 -0000 1.10
+++ BasicAggregator.java 9 Mar 2004 19:35:46 -0000 1.11
@@ -24,7 +24,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.Jetspeed;
-import org.apache.jetspeed.components.portletregsitry.PortletRegistryComponent;
+import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent;
import org.apache.jetspeed.container.PortletContainerFactory;
import org.apache.jetspeed.cps.BaseCommonService;
import org.apache.jetspeed.cps.CPSInitializationException;
1.14 +7 -7
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/PortletWindowFactory.java
Index: PortletWindowFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/aggregator/PortletWindowFactory.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- PortletWindowFactory.java 8 Mar 2004 00:22:31 -0000 1.13
+++ PortletWindowFactory.java 9 Mar 2004 19:35:46 -0000 1.14
@@ -36,12 +36,12 @@
{
public static PortletWindow getWindow(PortletDefinition portletDefinition,
String portletName)
{
- if(portletDefinition == null)
- {
- throw new IllegalArgumentException("PortletDefinition for
PortletWindow.getWindow() cannot be null.");
- }
-
- PortletEntityAccessComponent entityAccess = (PortletEntityAccessComponent)
Jetspeed.getComponentManager().getComponent(PortletEntityAccessComponent.class);
+ if(portletDefinition == null)
+ {
+ throw new IllegalArgumentException("PortletDefinition for
PortletWindow.getWindow() cannot be null.");
+ }
+
+ PortletEntityAccessComponent entityAccess = (PortletEntityAccessComponent)
Jetspeed.getComponentManager().getComponent(PortletEntityAccessComponent.class);
PortletEntity portletEntity =
entityAccess.getPortletEntity(portletDefinition, portletName);
1.12 +2 -2
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PortletRendererImpl.java 8 Mar 2004 00:22:00 -0000 1.11
+++ PortletRendererImpl.java 9 Mar 2004 19:35:46 -0000 1.12
@@ -28,7 +28,7 @@
import org.apache.jetspeed.aggregator.PortletWindowFactory;
import org.apache.jetspeed.aggregator.UnknownPortletDefinitionException;
import org.apache.jetspeed.components.portletentity.PortletEntityAccessComponent;
-import org.apache.jetspeed.components.portletregsitry.PortletRegistryComponent;
+import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent;
import org.apache.jetspeed.container.PortletContainerFactory;
import org.apache.jetspeed.cps.BaseCommonService;
import org.apache.jetspeed.om.page.Fragment;
1.7 +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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DeployPortletAppEventListener.java 23 Feb 2004 13:14:43 -0000 1.6
+++ DeployPortletAppEventListener.java 9 Mar 2004 19:35:46 -0000 1.7
@@ -14,7 +14,7 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.Jetspeed;
-import org.apache.jetspeed.components.portletregsitry.PortletRegistryComponent;
+import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent;
import org.apache.jetspeed.deployment.DeploymentEvent;
import org.apache.jetspeed.deployment.DeploymentEventListener;
import org.apache.jetspeed.deployment.DeploymentException;
@@ -78,7 +78,7 @@
throw new PortletApplicationException("<portlet-app>
requires a unique \"id\" attribute.");
}
PortletRegistryComponent regsitry =
(PortletRegistryComponent)
Jetspeed.getComponentManager().getComponent(PortletRegistryComponent.class);
- if (regsitry.getPortletApplicationByIndetifier(id) != null)
+ if (regsitry.getPortletApplicationByIdentifier(id) != null)
{
log.info("Portlet application \"" + id + "\"" + " already
been registered. Skipping initial deployment.");
// still need to register the filename to the app name so
undeploy works correctly
1.11 +5 -4
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/core/PortalControlParameter.java
Index: PortalControlParameter.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/engine/core/PortalControlParameter.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- PortalControlParameter.java 8 Mar 2004 00:26:09 -0000 1.10
+++ PortalControlParameter.java 9 Mar 2004 19:35:46 -0000 1.11
@@ -26,7 +26,7 @@
import org.apache.jetspeed.Jetspeed;
import org.apache.jetspeed.aggregator.PortletWindowFactory;
-import org.apache.jetspeed.components.portletregsitry.PortletRegistryComponent;
+import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent;
import org.apache.jetspeed.exception.JetspeedException;
import org.apache.pluto.om.portlet.PortletDefinition;
import org.apache.pluto.om.window.PortletWindow;
@@ -235,9 +235,10 @@
String portletName = idTokenizer.nextToken();
String sequence = idTokenizer.nextToken();
String entityName = idTokenizer.nextToken();
- PortletRegistryComponent regsitry =
+ PortletRegistryComponent registry =
(PortletRegistryComponent)
Jetspeed.getComponentManager().getComponent(PortletRegistryComponent.class);
- PortletDefinition portletDefinition =
regsitry.getPortletDefinitionByUniqueName(entityName + "::" + portletName);
+ PortletDefinition portletDefinition =
registry.getPortletDefinitionByUniqueName(entityName + "::" + portletName);
+
if (portletDefinition == null)
{
throw new JetspeedException("Failed to load: " + portletName +
" from registry");
1.6 +2 -2
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/mbeans/registry/RegistryMBeanImpl.java
Index: RegistryMBeanImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/mbeans/registry/RegistryMBeanImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- RegistryMBeanImpl.java 8 Mar 2004 00:28:18 -0000 1.5
+++ RegistryMBeanImpl.java 9 Mar 2004 19:35:46 -0000 1.6
@@ -20,7 +20,7 @@
import java.util.List;
import org.apache.jetspeed.Jetspeed;
-import org.apache.jetspeed.components.portletregsitry.PortletRegistryComponent;
+import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent;
import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
/**
1.8 +3 -3
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/information/StaticInformationProviderImpl.java
Index: StaticInformationProviderImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/services/information/StaticInformationProviderImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- StaticInformationProviderImpl.java 8 Mar 2004 00:35:26 -0000 1.7
+++ StaticInformationProviderImpl.java 9 Mar 2004 19:35:46 -0000 1.8
@@ -19,7 +19,7 @@
import javax.servlet.ServletContext;
import org.apache.jetspeed.Jetspeed;
-import org.apache.jetspeed.components.portletregsitry.PortletRegistryComponent;
+import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent;
import org.apache.jetspeed.engine.core.PortalContextProviderImpl;
import org.apache.pluto.om.common.ObjectID;
import org.apache.pluto.om.portlet.PortletDefinition;
@@ -54,7 +54,7 @@
{
PortletRegistryComponent regsitry =
(PortletRegistryComponent)
Jetspeed.getComponentManager().getComponent(PortletRegistryComponent.class);
- return regsitry.getPortletDefinitionByIndetifier(uniqueId);
+ return regsitry.getPortletDefinitionByIdentifier(uniqueId);
}
/**
1.23 +3 -4
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/FileSystemPAM.java
Index: FileSystemPAM.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/FileSystemPAM.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- FileSystemPAM.java 8 Mar 2004 00:34:16 -0000 1.22
+++ FileSystemPAM.java 9 Mar 2004 19:35:46 -0000 1.23
@@ -21,9 +21,8 @@
import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.Jetspeed;
import org.apache.jetspeed.components.persistence.store.PersistenceStore;
-import org.apache.jetspeed.components.persistence.store.PersistenceStoreContainer;
-import org.apache.jetspeed.components.portletregsitry.PortletRegistryComponent;
-import org.apache.jetspeed.components.portletregsitry.RegistryException;
+import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent;
+import org.apache.jetspeed.components.portletregistry.RegistryException;
import org.apache.jetspeed.container.JetspeedPortletContext;
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
import org.apache.jetspeed.om.common.servlet.MutableWebApplication;
1.3 +2 -2
jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/containers/pa-container.groovy
Index: pa-container.groovy
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/java/org/apache/jetspeed/tools/pamanager/containers/pa-container.groovy,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pa-container.groovy 4 Mar 2004 21:16:55 -0000 1.2
+++ pa-container.groovy 9 Mar 2004 19:35:46 -0000 1.3
@@ -18,8 +18,8 @@
import org.apache.jetspeed.components.persistence.store.PersistenceStoreContainer
import org.apache.jetspeed.components.util.system.FSSystemResourceUtilImpl
-import org.apache.jetspeed.components.portletregsitry.PortletRegistryComponentImpl
-import org.apache.jetspeed.components.portletregsitry.PortletRegistryComponent
+import org.apache.jetspeed.components.portletregistry.PortletRegistryComponentImpl
+import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent
import java.io.File
1.6 +3 -3
jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/deployment/TestSimpleDeployment.java
Index: TestSimpleDeployment.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/deployment/TestSimpleDeployment.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestSimpleDeployment.java 23 Feb 2004 13:15:56 -0000 1.5
+++ TestSimpleDeployment.java 9 Mar 2004 19:35:46 -0000 1.6
@@ -13,7 +13,7 @@
import junit.framework.Test;
import org.apache.jetspeed.Jetspeed;
-import org.apache.jetspeed.components.portletregsitry.PortletRegistryComponent;
+import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent;
import org.apache.jetspeed.deployment.fs.FileSystemScanner;
import org.apache.jetspeed.deployment.fs.JARObjectHandlerImpl;
import org.apache.jetspeed.deployment.impl.DeployDecoratorEventListener;
@@ -115,7 +115,7 @@
assertTrue(decoratorVm.getCanonicalPath() + " was not created!",
decoratorVm.exists());
PortletRegistryComponent portletRegistry = (PortletRegistryComponent)
Jetspeed.getComponentManager().getComponent(PortletRegistryComponent.class);
- assertNotNull(TEST_PORTLET_APP_NAME+" was not registered into the portlet
registery.", portletRegistry.getPortletApplicationByIndetifier(TEST_PORTLET_APP_NAME));
+ assertNotNull(TEST_PORTLET_APP_NAME+" was not registered into the portlet
registery.", portletRegistry.getPortletApplicationByIdentifier(TEST_PORTLET_APP_NAME));
}
1.16 +2 -6
jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/tools/pamanager/TestPortletDescriptor.java
Index: TestPortletDescriptor.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/tools/pamanager/TestPortletDescriptor.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TestPortletDescriptor.java 8 Mar 2004 00:38:37 -0000 1.15
+++ TestPortletDescriptor.java 9 Mar 2004 19:35:47 -0000 1.16
@@ -30,17 +30,13 @@
import org.apache.jetspeed.components.AbstractComponentAwareTestCase;
import org.apache.jetspeed.components.ComponentAwareTestSuite;
import org.apache.jetspeed.components.persistence.store.PersistenceStore;
-import org.apache.jetspeed.components.portletregsitry.PortletRegistryComponent;
-import org.apache.jetspeed.cps.CommonPortletServices;
+import org.apache.jetspeed.components.portletregistry.PortletRegistryComponent;
import org.apache.jetspeed.om.common.MutableLanguage;
import org.apache.jetspeed.om.common.ParameterComposite;
import org.apache.jetspeed.om.common.portlet.ContentTypeComposite;
import org.apache.jetspeed.om.common.portlet.MutablePortletApplication;
import org.apache.jetspeed.om.common.portlet.PortletDefinitionComposite;
import org.apache.jetspeed.om.common.preference.PreferenceComposite;
-import org.apache.jetspeed.om.portlet.impl.PortletApplicationDefinitionImpl;
-import org.apache.jetspeed.persistence.PersistencePlugin;
-import org.apache.jetspeed.persistence.PersistenceService;
import org.apache.log4j.PropertyConfigurator;
import org.apache.pluto.om.common.DisplayName;
import org.apache.pluto.om.common.LanguageSet;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
