taylor 2004/03/04 16:37:02
Modified: components/jetspeed/src/java/org/apache/jetspeed/locator
JetspeedTemplateLocator.java
components/registry/src/java/org/apache/jetspeed/components/portletentity
PortletEntityAccessComponentImpl.java
Log:
quick fix for bug in template locator
Revision Changes Path
1.2 +2 -2
jakarta-jetspeed-2/components/jetspeed/src/java/org/apache/jetspeed/locator/JetspeedTemplateLocator.java
Index: JetspeedTemplateLocator.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/jetspeed/src/java/org/apache/jetspeed/locator/JetspeedTemplateLocator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JetspeedTemplateLocator.java 21 Feb 2004 03:51:33 -0000 1.1
+++ JetspeedTemplateLocator.java 5 Mar 2004 00:37:02 -0000 1.2
@@ -221,7 +221,7 @@
+ " returning "
+ workingPath);
}
- return createTemplateFromPath(path, templateName, realPath, root +
workingPath);
+ return createTemplateFromPath(path, templateName, realPath,
"/WEB-INF/templates" + workingPath);
}
// else strip path of one of its components and loop
int pt = path.lastIndexOf(PATH_SEPARATOR);
1.6 +2 -2
jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/components/portletentity/PortletEntityAccessComponentImpl.java
Index: PortletEntityAccessComponentImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/registry/src/java/org/apache/jetspeed/components/portletentity/PortletEntityAccessComponentImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PortletEntityAccessComponentImpl.java 1 Mar 2004 02:04:05 -0000 1.5
+++ PortletEntityAccessComponentImpl.java 5 Mar 2004 00:37:02 -0000 1.6
@@ -129,7 +129,7 @@
public StoreablePortletEntityDelegate getPortletEntity(PortletDefinition
portletDefinition, String entityName)
{
ObjectID entityId =
JetspeedObjectID.createPortletEntityId(portletDefinition, entityName);
- PortletEntity portletEntity = null; // TODO: DST: this is failing, need a
unit test for it: getPortletEntity(entityId);
+ PortletEntity portletEntity = getPortletEntity(entityId);
if (portletEntity == null)
{
portletEntity = newPortletEntityInstance(portletDefinition);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
