You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2003/05/20 16:32:38 UTC
cvs commit: cocoon-2.1/src/blocks/portal/samples/profiles/copletbasedata portal.xml
cziegeler 2003/05/20 07:32:37
Modified: src/blocks/portal/java/org/apache/cocoon/portal/profile/impl
CopletInstanceDataManager.java
CopletBaseDataManager.java
CopletInstanceDataReferenceFieldHandler.java
CopletBaseDataReferenceFieldHandler.java
CopletDataManager.java
CopletDataReferenceFieldHandler.java
SimpleProfileManager.java
src/blocks/portal/java/org/apache/cocoon/portal/coplet
CopletData.java CopletInstanceData.java
CopletBaseData.java
src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl
SizingAspect.java RemoveableAspect.java
CIncludeCopletAspect.java
src/blocks/portal/samples/profiles/mapping
copletbasedata.xml copletdata.xml
copletinstancedata.xml
src/blocks/portal/java/org/apache/cocoon/portal/event/impl
CopletStatusEvent.java
src/blocks/portal/samples/profiles/copletdata portal.xml
src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl
URICopletAdapter.java
src/blocks/portal/java/org/apache/cocoon/portal/event/aspect/impl
SizingEventSubscriber.java
src/blocks/portal/samples/profiles/copletbasedata portal.xml
Log:
Making interfaces consistent
Revision Changes Path
1.2 +3 -3 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/CopletInstanceDataManager.java
Index: CopletInstanceDataManager.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/CopletInstanceDataManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CopletInstanceDataManager.java 19 May 2003 09:14:09 -0000 1.1
+++ CopletInstanceDataManager.java 20 May 2003 14:32:35 -0000 1.2
@@ -88,7 +88,7 @@
* Puts the specified coplet instance data to the manager.
*/
public void putCopletInstanceData(CopletInstanceData data) {
- this.copletInstanceData.put(data.getCopletId(), data);
+ this.copletInstanceData.put(data.getId(), data);
}
/**
@@ -99,7 +99,7 @@
CopletInstanceData data;
while (iterator.hasNext()) {
data = (CopletInstanceData)iterator.next();
- data.setCopletData(manager.getCopletData(data.getCopletData().getName()));
+ data.setCopletData(manager.getCopletData(data.getCopletData().getId()));
}
}
}
1.2 +2 -2 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/CopletBaseDataManager.java
Index: CopletBaseDataManager.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/CopletBaseDataManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CopletBaseDataManager.java 19 May 2003 09:14:09 -0000 1.1
+++ CopletBaseDataManager.java 20 May 2003 14:32:36 -0000 1.2
@@ -87,6 +87,6 @@
* Puts the specified coplet base data to the manager.
*/
public void putCopletBaseData(CopletBaseData data) {
- this.copletBaseData.put(data.getName(), data);
+ this.copletBaseData.put(data.getId(), data);
}
}
1.2 +2 -2 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/CopletInstanceDataReferenceFieldHandler.java
Index: CopletInstanceDataReferenceFieldHandler.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/CopletInstanceDataReferenceFieldHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CopletInstanceDataReferenceFieldHandler.java 19 May 2003 09:14:09 -0000 1.1
+++ CopletInstanceDataReferenceFieldHandler.java 20 May 2003 14:32:36 -0000 1.2
@@ -69,7 +69,7 @@
public Object getValue(Object object) {
CopletInstanceData copletInstanceData = ((CopletLayout)object).getCopletInstanceData();
if (copletInstanceData != null) {
- return copletInstanceData.getCopletId();
+ return copletInstanceData.getId();
} else {
return null;
}
1.2 +2 -2 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/CopletBaseDataReferenceFieldHandler.java
Index: CopletBaseDataReferenceFieldHandler.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/CopletBaseDataReferenceFieldHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CopletBaseDataReferenceFieldHandler.java 19 May 2003 09:14:09 -0000 1.1
+++ CopletBaseDataReferenceFieldHandler.java 20 May 2003 14:32:36 -0000 1.2
@@ -72,7 +72,7 @@
{
CopletBaseData copletBaseData = ((CopletData)object).getCopletBaseData();
if (copletBaseData != null) {
- return copletBaseData.getName();
+ return copletBaseData.getId();
} else {
return null;
}
1.2 +4 -4 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/CopletDataManager.java
Index: CopletDataManager.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/CopletDataManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CopletDataManager.java 19 May 2003 09:14:09 -0000 1.1
+++ CopletDataManager.java 20 May 2003 14:32:36 -0000 1.2
@@ -90,7 +90,7 @@
* Puts the specified coplet data to the manager.
*/
public void putCopletData(CopletData data) {
- this.copletData.put(data.getName(), data);
+ this.copletData.put(data.getId(), data);
}
/**
@@ -104,7 +104,7 @@
CopletData data, delta;
while (iterator.hasNext()) {
delta = (CopletData)iterator.next();
- data = this.getCopletData(delta.getName());
+ data = this.getCopletData(delta.getId());
if (data == null) {
this.putCopletData(delta);
} else {
@@ -123,7 +123,7 @@
CopletData data;
while (iterator.hasNext()) {
data = (CopletData)iterator.next();
- data.setCopletBaseData(manager.getCopletBaseData(data.getCopletBaseData().getName()));
+ data.setCopletBaseData(manager.getCopletBaseData(data.getCopletBaseData().getId()));
}
}
}
1.2 +2 -2 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/CopletDataReferenceFieldHandler.java
Index: CopletDataReferenceFieldHandler.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/CopletDataReferenceFieldHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CopletDataReferenceFieldHandler.java 19 May 2003 09:14:09 -0000 1.1
+++ CopletDataReferenceFieldHandler.java 20 May 2003 14:32:36 -0000 1.2
@@ -71,7 +71,7 @@
{
CopletData copletData = ((CopletInstanceData)object).getCopletData();
if (copletData != null) {
- return copletData.getName();
+ return copletData.getId();
} else {
return null;
}
1.4 +4 -4 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/SimpleProfileManager.java
Index: SimpleProfileManager.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/profile/impl/SimpleProfileManager.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SimpleProfileManager.java 19 May 2003 12:51:00 -0000 1.3
+++ SimpleProfileManager.java 20 May 2003 14:32:36 -0000 1.4
@@ -548,7 +548,7 @@
CopletLayout copletLayout = (CopletLayout)layout;
if (manager != null) {
- String copletId = copletLayout.getCopletInstanceData().getCopletId();
+ String copletId = copletLayout.getCopletInstanceData().getId();
copletLayout.setCopletInstanceData(manager.getCopletInstanceData(copletId));
}
@@ -557,10 +557,10 @@
throw new ProcessingException("Layout " + copletLayout.getId() + " has no coplet instance data.");
} else {
if ( copletLayout.getCopletInstanceData().getCopletData() == null ) {
- throw new ProcessingException("CopletInstanceData " + copletLayout.getCopletInstanceData().getCopletId() + " has no coplet data.");
+ throw new ProcessingException("CopletInstanceData " + copletLayout.getCopletInstanceData().getId() + " has no coplet data.");
}
}
- this.setAspectStatus(ProfileManager.SESSION_STATUS, copletLayout.getCopletInstanceData().getCopletData().getName(), new SizeableStatus());
+ this.setAspectStatus(ProfileManager.SESSION_STATUS, copletLayout.getCopletInstanceData().getCopletData().getId(), new SizeableStatus());
}
layout.setParent(item);
}
1.3 +6 -6 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletData.java
Index: CopletData.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletData.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CopletData.java 19 May 2003 09:14:07 -0000 1.2
+++ CopletData.java 20 May 2003 14:32:36 -0000 1.3
@@ -70,7 +70,7 @@
extends MapItem
implements DeltaApplicable {
- protected String name;
+ protected String id;
protected String title;
@@ -90,12 +90,12 @@
this.setValue(this);
}
- public String getName() {
- return name;
+ public String getId() {
+ return id;
}
- public void setName(String name) {
- this.name = name;
+ public void setId(String name) {
+ this.id = name;
// used for Castor map workaround
this.setKey(name);
1.3 +3 -3 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java
Index: CopletInstanceData.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletInstanceData.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CopletInstanceData.java 19 May 2003 09:14:06 -0000 1.2
+++ CopletInstanceData.java 20 May 2003 14:32:36 -0000 1.3
@@ -85,7 +85,7 @@
* Returns the copletId.
* @return String
*/
- public String getCopletId() {
+ public String getId() {
return copletId;
}
@@ -93,7 +93,7 @@
* Sets the copletId.
* @param copletId The copletId to set
*/
- public void setCopletId(String copletId) {
+ public void setId(String copletId) {
this.copletId = copletId;
// used for Castor map workaround
1.3 +6 -6 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletBaseData.java
Index: CopletBaseData.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/coplet/CopletBaseData.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CopletBaseData.java 19 May 2003 09:14:07 -0000 1.2
+++ CopletBaseData.java 20 May 2003 14:32:36 -0000 1.3
@@ -69,7 +69,7 @@
private Map copletConfig = new HashMap();
- private String name;
+ private String id;
private String copletAdapterName = null;
@@ -80,12 +80,12 @@
this.setValue(this);
}
- public String getName() {
- return name;
+ public String getId() {
+ return id;
}
- public void setName(String name) {
- this.name = name;
+ public void setId(String name) {
+ this.id = name;
// used for Castor map workaround
this.setKey(name);
1.2 +3 -3 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/SizingAspect.java
Index: SizingAspect.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/SizingAspect.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SizingAspect.java 7 May 2003 06:22:22 -0000 1.1
+++ SizingAspect.java 20 May 2003 14:32:36 -0000 1.2
@@ -83,9 +83,9 @@
CopletInstanceData cid = ((CopletLayout)layout).getCopletInstanceData();
- SizeableStatus sizeable = (SizeableStatus) this.getStatus(SizeableStatus.class, ProfileManager.SESSION_STATUS, cid.getCopletData().getName());
+ SizeableStatus sizeable = (SizeableStatus) this.getStatus(SizeableStatus.class, ProfileManager.SESSION_STATUS, cid.getCopletData().getId());
if ( sizeable != null ) {
- SizingStatus sizingstatus = (SizingStatus)this.getStatus(SizingStatus.class, ProfileManager.SESSION_STATUS, cid.getCopletId());
+ SizingStatus sizingstatus = (SizingStatus)this.getStatus(SizingStatus.class, ProfileManager.SESSION_STATUS, cid.getId());
int status = (sizingstatus == null ? SizingStatus.STATUS_MAXIMIZED : sizingstatus.getStatus());
SizingStatusEvent event;
1.2 +2 -2 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/RemoveableAspect.java
Index: RemoveableAspect.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/RemoveableAspect.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RemoveableAspect.java 7 May 2003 06:22:22 -0000 1.1
+++ RemoveableAspect.java 20 May 2003 14:32:36 -0000 1.2
@@ -85,7 +85,7 @@
if (cid.getCopletData().isRemovable()) {
}
- MandatoryStatus mandatory = (MandatoryStatus) this.getStatus(MandatoryStatus.class, ProfileManager.SESSION_STATUS, cid.getCopletData().getName());
+ MandatoryStatus mandatory = (MandatoryStatus) this.getStatus(MandatoryStatus.class, ProfileManager.SESSION_STATUS, cid.getCopletData().getId());
if ( mandatory == null || !mandatory.isMandatory()) {
LayoutRemoveEvent lre = new LayoutRemoveEvent(layout, 0);
XMLUtils.createElement(handler, "remove-uri", service.getLinkService().getLinkURI(lre));
1.3 +2 -2 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CIncludeCopletAspect.java
Index: CIncludeCopletAspect.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CIncludeCopletAspect.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CIncludeCopletAspect.java 7 May 2003 20:24:02 -0000 1.2
+++ CIncludeCopletAspect.java 20 May 2003 14:32:36 -0000 1.3
@@ -84,7 +84,7 @@
XMLUtils.startElement(handler, "content");
- this.createCInclude("coplet://" + cid.getCopletId(), handler);
+ this.createCInclude("coplet://" + cid.getId(), handler);
XMLUtils.endElement(handler, "content");
1.2 +2 -2 cocoon-2.1/src/blocks/portal/samples/profiles/mapping/copletbasedata.xml
Index: copletbasedata.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/samples/profiles/mapping/copletbasedata.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- copletbasedata.xml 19 May 2003 09:14:06 -0000 1.1
+++ copletbasedata.xml 20 May 2003 14:32:37 -0000 1.2
@@ -13,8 +13,8 @@
<class name="org.apache.cocoon.portal.coplet.CopletBaseData">
<map-to xml="coplet-base-data" />
- <field name="name" type="java.lang.String">
- <bind-xml name="name" node="attribute" />
+ <field name="id" type="java.lang.String">
+ <bind-xml name="id" node="attribute" />
</field>
<field name="copletAdapterName" type="java.lang.String">
1.2 +2 -2 cocoon-2.1/src/blocks/portal/samples/profiles/mapping/copletdata.xml
Index: copletdata.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/samples/profiles/mapping/copletdata.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- copletdata.xml 19 May 2003 09:14:06 -0000 1.1
+++ copletdata.xml 20 May 2003 14:32:37 -0000 1.2
@@ -13,8 +13,8 @@
<class name="org.apache.cocoon.portal.coplet.CopletData">
<map-to xml="coplet-data" />
- <field name="name" type="java.lang.String">
- <bind-xml name="name" node="attribute" />
+ <field name="id" type="java.lang.String">
+ <bind-xml name="id" node="attribute" />
</field>
<field name="title" type="java.lang.String">
1.2 +1 -1 cocoon-2.1/src/blocks/portal/samples/profiles/mapping/copletinstancedata.xml
Index: copletinstancedata.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/samples/profiles/mapping/copletinstancedata.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- copletinstancedata.xml 19 May 2003 09:14:06 -0000 1.1
+++ copletinstancedata.xml 20 May 2003 14:32:37 -0000 1.2
@@ -13,7 +13,7 @@
<class name="org.apache.cocoon.portal.coplet.CopletInstanceData">
<map-to xml="coplet-instance-data" />
- <field name="copletId" type="java.lang.String">
+ <field name="id" type="java.lang.String">
<bind-xml name="id" node="attribute" />
</field>
1.2 +2 -2 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/event/impl/CopletStatusEvent.java
Index: CopletStatusEvent.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/event/impl/CopletStatusEvent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CopletStatusEvent.java 7 May 2003 06:22:23 -0000 1.1
+++ CopletStatusEvent.java 20 May 2003 14:32:37 -0000 1.2
@@ -77,7 +77,7 @@
public boolean equalsEvent(ComparableEvent event) {
if (event instanceof CopletStatusEvent) {
- return ((CopletStatusEvent)event).getCopletInstanceData().getCopletId().equals( this.coplet.getCopletId() );
+ return ((CopletStatusEvent)event).getCopletInstanceData().getId().equals( this.coplet.getId() );
}
return false;
}
1.2 +12 -12 cocoon-2.1/src/blocks/portal/samples/profiles/copletdata/portal.xml
Index: portal.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/samples/profiles/copletdata/portal.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- portal.xml 19 May 2003 09:14:11 -0000 1.1
+++ portal.xml 20 May 2003 14:32:37 -0000 1.2
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<coplets>
- <coplet-data name="Newsweek">
+ <coplet-data id="Newsweek">
<title>Newsweek</title>
<maxpageable>true</maxpageable>
<removable>true</removable>
@@ -11,7 +11,7 @@
</attribute>
</coplet-data>
- <coplet-data name="NYTBusiness">
+ <coplet-data id="NYTBusiness">
<title>NYT Business</title>
<maxpageable>true</maxpageable>
<removable>true</removable>
@@ -22,7 +22,7 @@
</attribute>
</coplet-data>
- <coplet-data name="BBCNews">
+ <coplet-data id="BBCNews">
<title>BBC News</title>
<maxpageable>true</maxpageable>
<removable>true</removable>
@@ -33,7 +33,7 @@
</attribute>
</coplet-data>
- <coplet-data name="CNET News">
+ <coplet-data id="CNET News">
<title>CNET News</title>
<maxpageable>true</maxpageable>
<removable>true</removable>
@@ -44,7 +44,7 @@
</attribute>
</coplet-data>
- <coplet-data name="CNET Business">
+ <coplet-data id="CNET Business">
<title>CNET Business News</title>
<maxpageable>true</maxpageable>
<removable>true</removable>
@@ -55,7 +55,7 @@
</attribute>
</coplet-data>
- <coplet-data name="CSTNews">
+ <coplet-data id="CSTNews">
<title>Chicago Sunday Times</title>
<maxpageable>true</maxpageable>
<removable>true</removable>
@@ -66,7 +66,7 @@
</attribute>
</coplet-data>
- <coplet-data name="CNNEurope">
+ <coplet-data id="CNNEurope">
<title>CNN Europe</title>
<maxpageable>true</maxpageable>
<removable>true</removable>
@@ -77,7 +77,7 @@
</attribute>
</coplet-data>
- <coplet-data name="ML Weblog">
+ <coplet-data id="ML Weblog">
<title>ML's Weblog</title>
<maxpageable>true</maxpageable>
<removable>true</removable>
@@ -88,7 +88,7 @@
</attribute>
</coplet-data>
- <coplet-data name="CZ Weblog">
+ <coplet-data id="CZ Weblog">
<title>CZ's Weblog</title>
<maxpageable>true</maxpageable>
<removable>true</removable>
@@ -99,7 +99,7 @@
</attribute>
</coplet-data>
- <coplet-data name="Weblog">
+ <coplet-data id="Weblog">
<title>Another Weblog</title>
<maxpageable>true</maxpageable>
<removable>true</removable>
@@ -110,7 +110,7 @@
</attribute>
</coplet-data>
- <coplet-data name="Introduction">
+ <coplet-data id="Introduction">
<title>Cocoon Introduction</title>
<maxpageable>true</maxpageable>
<removable>true</removable>
@@ -121,7 +121,7 @@
</attribute>
</coplet-data>
- <coplet-data name="Overview">
+ <coplet-data id="Overview">
<title>Cocoon Overview</title>
<maxpageable>true</maxpageable>
<removable>true</removable>
1.3 +2 -2 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/URICopletAdapter.java
Index: URICopletAdapter.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/coplet/adapter/impl/URICopletAdapter.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- URICopletAdapter.java 8 May 2003 11:54:00 -0000 1.2
+++ URICopletAdapter.java 20 May 2003 14:32:37 -0000 1.3
@@ -107,7 +107,7 @@
portalService = (PortalService)this.manager.lookup(PortalService.ROLE);
HashMap par = new HashMap();
par.put(Constants.PORTAL_NAME_KEY, portalService.getPortalName());
- par.put(Constants.COPLET_ID_KEY, coplet.getCopletId());
+ par.put(Constants.COPLET_ID_KEY, coplet.getId());
copletSource = this.resolver.resolveURI(uri, null, par);
} else {
1.2 +2 -2 cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/event/aspect/impl/SizingEventSubscriber.java
Index: SizingEventSubscriber.java
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/java/org/apache/cocoon/portal/event/aspect/impl/SizingEventSubscriber.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SizingEventSubscriber.java 7 May 2003 06:22:27 -0000 1.1
+++ SizingEventSubscriber.java 20 May 2003 14:32:37 -0000 1.2
@@ -99,7 +99,7 @@
profileManager = (ProfileManager) this.componentManager.lookup(ProfileManager.ROLE);
target = new SizingStatus();
profileManager.setAspectStatus(ProfileManager.SESSION_STATUS,
- statusEvent.getCopletInstanceData().getCopletId(),
+ statusEvent.getCopletInstanceData().getId(),
target);
} catch (ComponentException ce) {
// ignore
1.2 +1 -1 cocoon-2.1/src/blocks/portal/samples/profiles/copletbasedata/portal.xml
Index: portal.xml
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/samples/profiles/copletbasedata/portal.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- portal.xml 19 May 2003 09:14:10 -0000 1.1
+++ portal.xml 20 May 2003 14:32:37 -0000 1.2
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<coplets>
- <coplet-base-data name="URICoplet">
+ <coplet-base-data id="URICoplet">
<coplet-adapter>uri</coplet-adapter>
<default-renderer>window</default-renderer>
</coplet-base-data>