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 2006/07/30 20:41:50 UTC
svn commit: r426912 [4/6] - in /cocoon/trunk/blocks/cocoon-portal:
cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/acting/
cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/acting/helpers/
cocoon-portal-impl/src/main/java/org/apache/c...
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/serialization/IncludingHTMLSerializer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/serialization/IncludingHTMLSerializer.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/serialization/IncludingHTMLSerializer.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/serialization/IncludingHTMLSerializer.java Sun Jul 30 11:41:45 2006
@@ -47,9 +47,7 @@
protected LinkedList orderedPortletList = new LinkedList();
- protected static final char token = '~';
-
- protected static final char[] tokens = new char[] {token, token};
+ protected static final char[] tokens = new char[] {ReplacingOutputStream.token, ReplacingOutputStream.token};
/** The encoding. */
protected String encoding = "utf-8";
@@ -129,128 +127,3 @@
}
}
-final class ReplacingOutputStream extends OutputStream {
-
- /** Stream. */
- protected final OutputStream stream;
-
- protected boolean inKey;
-
- protected final LinkedList orderedValues;
-
- /** Encoding. */
- protected final String encoding;
-
- /**
- * Constructor.
- */
- public ReplacingOutputStream(OutputStream stream,
- LinkedList values,
- String enc) {
- this.stream = stream;
- this.orderedValues = values;
- this.inKey = false;
- this.encoding = enc;
- }
-
- /**
- * @see java.io.OutputStream#close()
- */
- public void close() throws IOException {
- this.stream.close();
- }
-
- /**
- * @see java.io.OutputStream#flush()
- */
- public void flush() throws IOException {
- this.stream.flush();
- }
-
- /**
- * @see java.io.OutputStream#write(byte[], int, int)
- */
- public void write(byte[] b, int off, int len) throws IOException {
- if ( len == 0 ) {
- return;
- }
- if ( this.inKey ) {
- if ( b[off] == IncludingHTMLSerializer.token ) {
- this.writeNextValue();
- off++;
- len--;
- } else {
- this.write(IncludingHTMLSerializer.token);
- }
- this.inKey = false;
- }
- // search for key
- boolean end = false;
- do {
- int s = off;
- int e = off+len;
- while (s < e && b[s] != IncludingHTMLSerializer.token) {
- s++;
- }
- if ( s == e ) {
- this.stream.write(b, off, len);
- end = true;
- } else if ( s == e-1 ) {
- this.stream.write(b, off, len-1);
- this.inKey = true;
- end = true;
- } else {
- if ( b[s+1] == IncludingHTMLSerializer.token) {
- final int l = s-off;
- this.stream.write(b, off, l);
- off += (l+2);
- len -= (l+2);
- this.writeNextValue();
-
- } else {
- final int l = s-off+2;
- this.stream.write(b, off, l);
- off += l;
- len -= l;
- }
- end = (len == 0);
- }
- } while (!end);
- }
-
- /**
- * @see java.io.OutputStream#write(byte[])
- */
- public void write(byte[] b) throws IOException {
- this.write(b, 0, b.length);
- }
-
- /**
- * @see java.io.OutputStream#write(int)
- */
- public void write(int b) throws IOException {
- if ( b == IncludingHTMLSerializer.token ) {
- if ( this.inKey ) {
- this.writeNextValue();
- }
- this.inKey = !this.inKey;
- } else {
- if ( this.inKey ) {
- this.inKey = false;
- this.stream.write(IncludingHTMLSerializer.token);
- }
- this.stream.write(b);
- }
- }
-
- /**
- * Write next value
- */
- protected void writeNextValue() throws IOException {
- final String value = (String)this.orderedValues.removeLast();
- if ( value != null ) {
- this.stream.write(value.getBytes(this.encoding), 0, value.length());
- }
- }
-}
-
Added: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/serialization/ReplacingOutputStream.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/serialization/ReplacingOutputStream.java?rev=426912&view=auto
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/serialization/ReplacingOutputStream.java (added)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/serialization/ReplacingOutputStream.java Sun Jul 30 11:41:45 2006
@@ -0,0 +1,152 @@
+/*
+ * Copyright 2004-2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cocoon.portal.serialization;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.LinkedList;
+
+/**
+ *
+ * @version $Id$
+ * @since 2.2
+ */
+final class ReplacingOutputStream extends OutputStream {
+
+ public static final char token = '\0';
+
+ /** Stream. */
+ protected final OutputStream stream;
+
+ protected boolean inKey;
+
+ protected final LinkedList orderedValues;
+
+ /** Encoding. */
+ protected final String encoding;
+
+ /**
+ * Constructor.
+ */
+ public ReplacingOutputStream(OutputStream stream,
+ LinkedList values,
+ String enc) {
+ this.stream = stream;
+ this.orderedValues = values;
+ this.inKey = false;
+ this.encoding = enc;
+ }
+
+ /**
+ * @see java.io.OutputStream#close()
+ */
+ public void close() throws IOException {
+ this.stream.close();
+ }
+
+ /**
+ * @see java.io.OutputStream#flush()
+ */
+ public void flush() throws IOException {
+ this.stream.flush();
+ }
+
+ /**
+ * @see java.io.OutputStream#write(byte[], int, int)
+ */
+ public void write(byte[] b, int off, int len) throws IOException {
+ if ( len == 0 ) {
+ return;
+ }
+ if ( this.inKey ) {
+ if ( b[off] == ReplacingOutputStream.token ) {
+ this.writeNextValue();
+ off++;
+ len--;
+ } else {
+ this.write(ReplacingOutputStream.token);
+ }
+ this.inKey = false;
+ }
+ // search for key
+ boolean end = false;
+ do {
+ int s = off;
+ int e = off+len;
+ while (s < e && b[s] != ReplacingOutputStream.token) {
+ s++;
+ }
+ if ( s == e ) {
+ this.stream.write(b, off, len);
+ end = true;
+ } else if ( s == e-1 ) {
+ this.stream.write(b, off, len-1);
+ this.inKey = true;
+ end = true;
+ } else {
+ if ( b[s+1] == ReplacingOutputStream.token) {
+ final int l = s-off;
+ this.stream.write(b, off, l);
+ off += (l+2);
+ len -= (l+2);
+ this.writeNextValue();
+
+ } else {
+ final int l = s-off+2;
+ this.stream.write(b, off, l);
+ off += l;
+ len -= l;
+ }
+ end = (len == 0);
+ }
+ } while (!end);
+ }
+
+ /**
+ * @see java.io.OutputStream#write(byte[])
+ */
+ public void write(byte[] b) throws IOException {
+ this.write(b, 0, b.length);
+ }
+
+ /**
+ * @see java.io.OutputStream#write(int)
+ */
+ public void write(int b) throws IOException {
+ if ( b == ReplacingOutputStream.token ) {
+ if ( this.inKey ) {
+ this.writeNextValue();
+ }
+ this.inKey = !this.inKey;
+ } else {
+ if ( this.inKey ) {
+ this.inKey = false;
+ this.stream.write(ReplacingOutputStream.token);
+ }
+ this.stream.write(b);
+ }
+ }
+
+ /**
+ * Write next value
+ */
+ protected void writeNextValue() throws IOException {
+ final String value = (String)this.orderedValues.removeLast();
+ if ( value != null ) {
+ this.stream.write(value.getBytes(this.encoding), 0, value.length());
+ }
+ }
+}
Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/serialization/ReplacingOutputStream.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/serialization/ReplacingOutputStream.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/source/CopletSource.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/source/CopletSource.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/source/CopletSource.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/source/CopletSource.java Sun Jul 30 11:41:45 2006
@@ -29,7 +29,7 @@
import org.apache.avalon.framework.service.Serviceable;
import org.apache.cocoon.CascadingIOException;
import org.apache.cocoon.components.ContextHelper;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
import org.apache.cocoon.portal.coplet.adapter.CopletAdapter;
import org.apache.cocoon.serialization.Serializer;
import org.apache.excalibur.source.Source;
@@ -53,7 +53,7 @@
protected String uri;
protected String copletControllerName;
- protected CopletInstanceData copletInstanceData;
+ protected CopletInstance copletInstanceData;
/** The used protocol */
protected String scheme;
@@ -61,8 +61,8 @@
/**
* @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
*/
- public void service(ServiceManager manager) throws ServiceException {
- this.manager = manager;
+ public void service(ServiceManager aManager) throws ServiceException {
+ this.manager = aManager;
}
/**
@@ -73,11 +73,11 @@
}
public CopletSource(String location, String protocol,
- CopletInstanceData coplet) {
+ CopletInstance coplet) {
this.uri = location;
this.scheme = (protocol == null ? "coplet" : protocol);
this.copletInstanceData = coplet;
- this.copletControllerName = this.copletInstanceData.getCopletData().getCopletBaseData().getCopletAdapterName();
+ this.copletControllerName = this.copletInstanceData.getCopletDefinition().getCopletType().getCopletAdapterName();
}
/**
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/source/CopletSourceFactory.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/source/CopletSourceFactory.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/source/CopletSourceFactory.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/source/CopletSourceFactory.java Sun Jul 30 11:41:45 2006
@@ -21,7 +21,7 @@
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.service.ServiceException;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
import org.apache.cocoon.portal.impl.AbstractComponent;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
@@ -52,7 +52,7 @@
location = location.substring(position+2);
}
try {
- CopletInstanceData coplet = this.portalService.getProfileManager().getCopletInstanceData(location);
+ CopletInstance coplet = this.portalService.getProfileManager().getCopletInstanceData(location);
if ( coplet == null ) {
throw new IOException("Unable to get coplet for " + location);
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/transformation/AbstractCopletTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/transformation/AbstractCopletTransformer.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/transformation/AbstractCopletTransformer.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/transformation/AbstractCopletTransformer.java Sun Jul 30 11:41:45 2006
@@ -23,7 +23,7 @@
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.portal.Constants;
import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
import org.apache.cocoon.transformation.AbstractSAXTransformer;
import org.xml.sax.SAXException;
@@ -65,9 +65,9 @@
* @return The coplet instance data
* @throws SAXException If an errors occurs or the instance data is not available
*/
- protected CopletInstanceData getCopletInstanceData()
+ protected CopletInstance getCopletInstanceData()
throws SAXException {
- CopletInstanceData cid = this.getCopletInstanceData(null);
+ CopletInstance cid = this.getCopletInstanceData(null);
if ( cid == null ) {
throw new SAXException("Could not find coplet instance data for the current pipeline.");
}
@@ -76,19 +76,19 @@
/**
* Try to get the coplet instance data with the given id
- * @param copletId The id of the coplet instance or null if this transformer
- * is used inside a coplet pipeline
+ * @param instanceId The id of the coplet instance or null if this transformer
+ * is used inside a coplet pipeline
* @return The coplet instance data or null
* @throws SAXException If an error occurs
*/
- protected CopletInstanceData getCopletInstanceData(String copletId)
+ protected CopletInstance getCopletInstanceData(String instanceId)
throws SAXException {
- final Map context = (Map)objectModel.get(ObjectModelHelper.PARENT_CONTEXT);
-
+ final Map parentContext = (Map)objectModel.get(ObjectModelHelper.PARENT_CONTEXT);
+ String copletId = instanceId;
if ( copletId == null ) {
// determine coplet id
- if (context != null) {
- copletId = (String)context.get(Constants.COPLET_ID_KEY);
+ if (parentContext != null) {
+ copletId = (String)parentContext.get(Constants.COPLET_ID_KEY);
} else {
copletId = (String)objectModel.get(Constants.COPLET_ID_KEY);
if ( copletId == null ) {
@@ -105,7 +105,7 @@
throw new SAXException("copletId must be passed as parameter or in the object model within the parent context.");
}
- CopletInstanceData object = this.portalService.getProfileManager().getCopletInstanceData( copletId );
+ CopletInstance object = this.portalService.getProfileManager().getCopletInstanceData( copletId );
return object;
}
@@ -113,8 +113,8 @@
/**
* @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
*/
- public void service(ServiceManager manager) throws ServiceException {
- super.service(manager);
+ public void service(ServiceManager aManager) throws ServiceException {
+ super.service(aManager);
this.portalService = (PortalService)this.manager.lookup(PortalService.ROLE);
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/transformation/CopletTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/transformation/CopletTransformer.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/transformation/CopletTransformer.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/transformation/CopletTransformer.java Sun Jul 30 11:41:45 2006
@@ -25,7 +25,7 @@
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.wrapper.RequestParameters;
import org.apache.cocoon.portal.LinkService;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
import org.apache.cocoon.portal.event.coplet.CopletJXPathEvent;
import org.apache.cocoon.portal.event.impl.JXPathEvent;
import org.apache.cocoon.portal.event.layout.LayoutJXPathEvent;
@@ -143,7 +143,7 @@
throw new SAXException("Attribute '"+SELECT_ATTR+"' must be specified on element " + COPLET_ELEM + ".");
}
final String copletId = attr.getValue("id");
- final CopletInstanceData cid = this.getCopletInstanceData(copletId);
+ final CopletInstance cid = this.getCopletInstanceData(copletId);
if ( cid == null ) {
throw new SAXException("Unable to find coplet instance data with id '" + copletId + "'.");
}
@@ -180,7 +180,7 @@
newAttrs.removeAttribute("format");
if ( attr.getValue("href") != null ) {
- final CopletInstanceData cid = this.getCopletInstanceData();
+ final CopletInstance cid = this.getCopletInstanceData();
CopletJXPathEvent event = new CopletJXPathEvent(cid, null, null);
String value = linkService.getLinkURI(event);
@@ -209,7 +209,7 @@
} else {
String copletId = attr.getValue("coplet");
newAttrs.removeAttribute("coplet");
- final CopletInstanceData cid = this.getCopletInstanceData(copletId);
+ final CopletInstance cid = this.getCopletInstanceData(copletId);
if ( cid != null ) {
event = new CopletJXPathEvent(cid, path, value);
}
@@ -323,14 +323,14 @@
} else if ( "html-form".equals(format) ) {
boolean addParametersAsHiddenFields = false;
- String parameters = null;
+ String reqParams = null;
final String enctype = newAttrs.getValue("enctype");
if ( enctype== null
|| "application/x-www-form-urlencoded".equalsIgnoreCase(enctype)
|| "multipart/form-data".equalsIgnoreCase(enctype) ) {
final int pos = uri.indexOf('?');
if ( pos != -1 ) {
- parameters = uri.substring(pos+1);
+ reqParams = uri.substring(pos+1);
uri = uri.substring(0, pos);
addParametersAsHiddenFields = true;
}
@@ -340,7 +340,7 @@
this.stack.push("form");
if ( addParametersAsHiddenFields ) {
// create hidden input fields
- RequestParameters pars = new RequestParameters(parameters);
+ RequestParameters pars = new RequestParameters(reqParams);
Enumeration enumeration = pars.getParameterNames();
while ( enumeration.hasMoreElements() ) {
final String pName = (String)enumeration.nextElement();
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/transformation/EventLinkTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/transformation/EventLinkTransformer.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/transformation/EventLinkTransformer.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/transformation/EventLinkTransformer.java Sun Jul 30 11:41:45 2006
@@ -18,7 +18,7 @@
import java.util.Stack;
import org.apache.cocoon.portal.LinkService;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
import org.apache.cocoon.portal.event.impl.CopletLinkEvent;
import org.w3c.dom.DocumentFragment;
import org.xml.sax.Attributes;
@@ -165,7 +165,7 @@
// if attribute found that contains a link
if (link != null) {
- CopletInstanceData cid = this.getCopletInstanceData(attr.getValue("coplet"));
+ CopletInstance cid = this.getCopletInstanceData(attr.getValue("coplet"));
LinkService linkService = this.portalService.getLinkService();
// create event link
@@ -184,7 +184,7 @@
if (this.elementName != null && name.equals(this.elementName)) {
String link = this.endTextRecording();
- CopletInstanceData cid = this.getCopletInstanceData();
+ CopletInstance cid = this.getCopletInstanceData();
LinkService linkService = this.portalService.getLinkService();
// create event link
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/transformation/HTMLEventLinkTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/transformation/HTMLEventLinkTransformer.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/transformation/HTMLEventLinkTransformer.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/transformation/HTMLEventLinkTransformer.java Sun Jul 30 11:41:45 2006
@@ -21,7 +21,7 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
import org.apache.cocoon.xml.AttributesImpl;
import org.apache.excalibur.source.SourceUtil;
import org.xml.sax.Attributes;
@@ -131,7 +131,7 @@
newAttributes.removeAttribute("external");
String link = attributes.getValue("href");
- CopletInstanceData cid = this.getCopletInstanceData();
+ CopletInstance cid = this.getCopletInstanceData();
link = this.getLink((String)cid.getTemporaryAttribute(this.attributeName), link);
newAttributes.addCDATAAttribute("path", this.jxPath);
@@ -151,7 +151,7 @@
newAttributes.removeAttribute("action");
String link = attributes.getValue("action");
- CopletInstanceData cid = this.getCopletInstanceData();
+ CopletInstance cid = this.getCopletInstanceData();
link = this.getLink((String)cid.getTemporaryAttribute(this.attributeName), link);
newAttributes.addCDATAAttribute("path", this.jxPath);
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/transformation/LinkTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/transformation/LinkTransformer.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/transformation/LinkTransformer.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/transformation/LinkTransformer.java Sun Jul 30 11:41:45 2006
@@ -26,7 +26,7 @@
import org.apache.avalon.framework.service.Serviceable;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
import org.apache.cocoon.transformation.AbstractTransformer;
import org.apache.cocoon.xml.AttributesImpl;
import org.xml.sax.Attributes;
@@ -68,7 +68,7 @@
/**
* The coplet instance data
*/
- protected CopletInstanceData copletInstanceData;
+ protected CopletInstance copletInstanceData;
/**
* The html document base uri
@@ -86,8 +86,8 @@
/**
* @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
*/
- public void service(ServiceManager manager) throws ServiceException {
- this.manager = manager;
+ public void service(ServiceManager aManager) throws ServiceException {
+ this.manager = aManager;
}
/** The prefix */
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/transformation/NewEventLinkTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/transformation/NewEventLinkTransformer.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/transformation/NewEventLinkTransformer.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/transformation/NewEventLinkTransformer.java Sun Jul 30 11:41:45 2006
@@ -15,7 +15,7 @@
*/
package org.apache.cocoon.portal.transformation;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
import org.apache.cocoon.portal.event.impl.CopletLinkEvent;
import org.apache.cocoon.xml.AttributesImpl;
import org.apache.cocoon.xml.XMLUtils;
@@ -144,7 +144,7 @@
// if attribute found that contains a link
if (link != null) {
- CopletInstanceData cid = this.getCopletInstanceData(attributes.getValue("coplet"));
+ CopletInstance cid = this.getCopletInstanceData(attributes.getValue("coplet"));
// create event link
CopletLinkEvent event = new CopletLinkEvent(cid, link);
String eventLink = this.portalService.getLinkService().getLinkURI(event);
@@ -193,12 +193,12 @@
* Instead hidden input fields must be inserted into the SAX stream to add request parameters.
* This method sends two hidden inputs adding the "cocoon-portal-action" parameter and
* the "cocoon-portal-event" parameter.
- * @param contentHandler the content handler recieving the SAX events
+ * @param handler the content handler recieving the SAX events
* @param portalAction value of the "cocoon-portal-action" parameter
* @param portalEvent value of the "cocoon-portal-event" parameter
* @throws SAXException if sending the SAX events failed
*/
- private void sendHiddenFields(ContentHandler contentHandler,
+ private void sendHiddenFields(ContentHandler handler,
String portalAction,
String portalEvent)
throws SAXException {
@@ -207,13 +207,13 @@
attributes.addCDATAAttribute("type", "hidden");
attributes.addCDATAAttribute("name", "cocoon-portal-action");
attributes.addCDATAAttribute("value", portalAction);
- XMLUtils.createElement(contentHandler, "input", attributes);
+ XMLUtils.createElement(handler, "input", attributes);
attributes.clear();
}
attributes.addCDATAAttribute("type", "hidden");
attributes.addCDATAAttribute("name", "cocoon-portal-event");
attributes.addCDATAAttribute("value", portalEvent);
- XMLUtils.createElement(contentHandler, "input", attributes);
+ XMLUtils.createElement(handler, "input", attributes);
}
/**
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java Sun Jul 30 11:41:45 2006
@@ -38,8 +38,8 @@
import org.apache.cocoon.portal.Constants;
import org.apache.cocoon.portal.LinkService;
import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.coplet.CopletData;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletDefinition;
+import org.apache.cocoon.portal.coplet.CopletInstance;
import org.apache.cocoon.portal.util.HtmlDomParser;
import org.apache.cocoon.portal.util.InputModuleHelper;
import org.apache.cocoon.transformation.AbstractTransformer;
@@ -98,7 +98,7 @@
protected ServiceManager manager;
/** The coplet instance data. */
- protected CopletInstanceData copletInstanceData;
+ protected CopletInstance copletInstanceData;
/** The original request to the portal. */
protected Request request;
@@ -121,8 +121,8 @@
/**
* @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
*/
- public void service(ServiceManager manager) throws ServiceException {
- this.manager = manager;
+ public void service(ServiceManager aManager) throws ServiceException {
+ this.manager = aManager;
this.portalService = (PortalService)this.manager.lookup(PortalService.ROLE);
this.imHelper = new InputModuleHelper(manager);
}
@@ -163,7 +163,7 @@
this.copletInstanceData = getInstanceData(this.manager, objectModel, parameters);
- final CopletData copletData = this.copletInstanceData.getCopletData();
+ final CopletDefinition copletData = this.copletInstanceData.getCopletDefinition();
this.link = (String) this.copletInstanceData.getTemporaryAttribute(LINK);
@@ -573,7 +573,7 @@
* @return CopletInstanceData
* @throws ProcessingException
*/
- public static CopletInstanceData getInstanceData(ServiceManager manager,
+ public static CopletInstance getInstanceData(ServiceManager manager,
Map objectModel,
Parameters parameters)
throws ProcessingException {
Copied: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/persistence/castor/copletdefinition.xml (from r426594, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/persistence/castor/copletdata.xml)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/persistence/castor/copletdefinition.xml?p2=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/persistence/castor/copletdefinition.xml&p1=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/persistence/castor/copletdata.xml&r1=426594&r2=426912&rev=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/persistence/castor/copletdata.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/persistence/castor/copletdefinition.xml Sun Jul 30 11:41:45 2006
@@ -16,20 +16,20 @@
-->
<!-- @version $Id$ -->
<mapping>
- <description>Coplet data mapping file</description>
+ <description>Coplet definition mapping file</description>
<class name="org.apache.cocoon.portal.persistence.castor.CollectionWrapper">
<map-to xml="coplets" />
<field name="objects"
- type="org.apache.cocoon.portal.coplet.CopletData"
+ type="org.apache.cocoon.portal.coplet.CopletDefinition"
collection="collection">
- <bind-xml matches="coplet-data"/>
+ <bind-xml matches="coplet-definition"/>
</field>
</class>
- <class name="org.apache.cocoon.portal.coplet.CopletData" verify-constructable="false">
- <map-to xml="coplet-data" />
+ <class name="org.apache.cocoon.portal.coplet.CopletDefinition" verify-constructable="false">
+ <map-to xml="coplet-definition" />
<field name="id" type="java.lang.String" set-method="%1" get-method="getId">
<bind-xml name="id" node="attribute" />
@@ -50,10 +50,10 @@
<bind-xml name="attribute"/>
</field>
- <field name="copletBaseData"
+ <field name="copletType"
type="java.lang.String"
handler="org.apache.cocoon.portal.persistence.castor.ReferenceFieldHandler">
- <bind-xml name="coplet-base-data"/>
+ <bind-xml name="coplet-type"/>
</field>
</class>
Copied: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/persistence/castor/copletinstance.xml (from r426594, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/persistence/castor/copletinstancedata.xml)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/persistence/castor/copletinstance.xml?p2=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/persistence/castor/copletinstance.xml&p1=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/persistence/castor/copletinstancedata.xml&r1=426594&r2=426912&rev=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/persistence/castor/copletinstancedata.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/persistence/castor/copletinstance.xml Sun Jul 30 11:41:45 2006
@@ -16,29 +16,29 @@
-->
<!-- @version $Id$ -->
<mapping>
- <description>Coplet instance data mapping file</description>
+ <description>Coplet instance mapping file</description>
<class name="org.apache.cocoon.portal.persistence.castor.CollectionWrapper">
<map-to xml="coplets" />
<field name="objects"
- type="org.apache.cocoon.portal.coplet.CopletInstanceData"
+ type="org.apache.cocoon.portal.coplet.CopletInstance"
collection="collection">
- <bind-xml matches="coplet-instance-data"/>
+ <bind-xml matches="coplet-instance"/>
</field>
</class>
- <class name="org.apache.cocoon.portal.coplet.CopletInstanceData" verify-constructable="false">
- <map-to xml="coplet-instance-data"/>
+ <class name="org.apache.cocoon.portal.coplet.CopletInstance" verify-constructable="false">
+ <map-to xml="coplet-instance"/>
<field name="id" type="java.lang.String" set-method="%1" get-method="getId">
<bind-xml name="id" node="attribute" />
</field>
- <field name="copletData"
+ <field name="copletDefinition"
type="java.lang.String"
handler="org.apache.cocoon.portal.persistence.castor.ReferenceFieldHandler">
- <bind-xml name="coplet-data"/>
+ <bind-xml name="coplet-definition"/>
</field>
<field name="attributes"
Copied: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/persistence/castor/coplettype.xml (from r426594, cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/persistence/castor/copletbasedata.xml)
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/persistence/castor/coplettype.xml?p2=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/persistence/castor/coplettype.xml&p1=cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/persistence/castor/copletbasedata.xml&r1=426594&r2=426912&rev=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/persistence/castor/copletbasedata.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/persistence/castor/coplettype.xml Sun Jul 30 11:41:45 2006
@@ -16,20 +16,20 @@
-->
<!-- @version $Id$ -->
<mapping>
- <description>Coplet base data mapping file</description>
+ <description>Coplet type mapping file</description>
<class name="org.apache.cocoon.portal.persistence.castor.CollectionWrapper">
<map-to xml="coplets" />
<field name="objects"
- type="org.apache.cocoon.portal.coplet.CopletBaseData"
+ type="org.apache.cocoon.portal.coplet.CopletType"
collection="collection">
- <bind-xml matches="coplet-base-data" />
+ <bind-xml matches="coplet-type" />
</field>
</class>
- <class name="org.apache.cocoon.portal.coplet.CopletBaseData" verify-constructable="false">
- <map-to xml="coplet-base-data" />
+ <class name="org.apache.cocoon.portal.coplet.CopletType" verify-constructable="false">
+ <map-to xml="coplet-type" />
<field name="id" type="java.lang.String" set-method="%1" get-method="getId">
<bind-xml name="id" node="attribute" />
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/persistence/castor/layout.xml
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/persistence/castor/layout.xml?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/persistence/castor/layout.xml (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/persistence/castor/layout.xml Sun Jul 30 11:41:45 2006
@@ -94,10 +94,10 @@
<bind-xml name="name" node="attribute"/>
</field>
- <field name="copletInstanceData"
+ <field name="copletInstance"
type="java.lang.String"
handler="org.apache.cocoon.portal.persistence.castor.ReferenceFieldHandler">
- <bind-xml name="coplet-instance-data"/>
+ <bind-xml name="coplet-instance"/>
</field>
</class>
Added: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/update-profile.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/update-profile.xsl?rev=426912&view=auto
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/update-profile.xsl (added)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/update-profile.xsl Sun Jul 30 11:41:45 2006
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+<xsl:output method="xml" encoding="UTF-8" indent="yes"/>
+<xsl:strip-space elements="*"/>
+
+
+ <xsl:template match="coplet-base-data">
+ <coplet-type>
+ <xsl:apply-templates/>
+ </coplet-type>
+ </xsl:template>
+
+ <xsl:template match="coplet-data">
+ <coplet-definition>
+ <xsl:apply-templates/>
+ </coplet-definition>
+ </xsl:template>
+
+ <xsl:template match="coplet-instance-data">
+ <coplet-instance>
+ <xsl:apply-templates/>
+ </coplet-instance>
+ </xsl:template>
+
+ <xsl:template match="@*|node()">
+ <xsl:copy><xsl:apply-templates select="@*|node()"/></xsl:copy>
+ </xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/update-profile.xsl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/update-profile.xsl
------------------------------------------------------------------------------
svn:keywords = Id
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/DynamicInformationProviderImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/DynamicInformationProviderImpl.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/DynamicInformationProviderImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/DynamicInformationProviderImpl.java Sun Jul 30 11:41:45 2006
@@ -23,7 +23,7 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
import org.apache.cocoon.portal.pluto.adapter.PortletAdapter;
import org.apache.cocoon.portal.pluto.om.PortletEntityImpl;
import org.apache.pluto.om.window.PortletWindow;
@@ -91,7 +91,7 @@
* @see org.apache.pluto.services.information.DynamicInformationProvider#getPortletMode(org.apache.pluto.om.window.PortletWindow)
*/
public PortletMode getPortletMode(PortletWindow portletWindow) {
- final CopletInstanceData cid = ((PortletEntityImpl)portletWindow.getPortletEntity()).getCopletInstanceData();
+ final CopletInstance cid = ((PortletEntityImpl)portletWindow.getPortletEntity()).getCopletInstanceData();
final String pmString = (String)cid.getTemporaryAttribute(PortletAdapter.PORTLET_MODE_ATTRIBUTE_NAME);
if ( pmString == null ) {
return PortletMode.VIEW;
@@ -103,7 +103,7 @@
* @see org.apache.pluto.services.information.DynamicInformationProvider#getWindowState(org.apache.pluto.om.window.PortletWindow)
*/
public WindowState getWindowState(PortletWindow portletWindow) {
- final CopletInstanceData cid = ((PortletEntityImpl)portletWindow.getPortletEntity()).getCopletInstanceData();
+ final CopletInstance cid = ((PortletEntityImpl)portletWindow.getPortletEntity()).getCopletInstanceData();
final String wsString = (String)cid.getTemporaryAttribute(PortletAdapter.WINDOW_STATE_ATTRIBUTE_NAME);
if ( wsString == null ) {
return WindowState.NORMAL;
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletActionProviderImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletActionProviderImpl.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletActionProviderImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletActionProviderImpl.java Sun Jul 30 11:41:45 2006
@@ -22,7 +22,7 @@
import javax.portlet.WindowState;
import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
import org.apache.cocoon.portal.event.Event;
import org.apache.cocoon.portal.event.coplet.CopletInstanceSizingEvent;
import org.apache.cocoon.portal.pluto.adapter.PortletAdapter;
@@ -56,7 +56,7 @@
*/
public void changePortletMode(PortletMode mode) {
if ( mode != null ) {
- final CopletInstanceData cid = ((PortletEntityImpl)portletWindow.getPortletEntity()).getCopletInstanceData();
+ final CopletInstance cid = ((PortletEntityImpl)portletWindow.getPortletEntity()).getCopletInstanceData();
cid.setTemporaryAttribute(PortletAdapter.PORTLET_MODE_ATTRIBUTE_NAME, mode.toString());
}
}
@@ -66,13 +66,13 @@
*/
public void changePortletWindowState(WindowState state) {
if ( state != null ) {
- final CopletInstanceData cid = ((PortletEntityImpl)portletWindow.getPortletEntity()).getCopletInstanceData();
+ final CopletInstance cid = ((PortletEntityImpl)portletWindow.getPortletEntity()).getCopletInstanceData();
cid.setTemporaryAttribute(PortletAdapter.WINDOW_STATE_ATTRIBUTE_NAME, state.toString());
- int size = CopletInstanceData.SIZE_NORMAL;
+ int size = CopletInstance.SIZE_NORMAL;
if ( state.equals(WindowState.MAXIMIZED) ) {
- size = CopletInstanceData.SIZE_MAXIMIZED;
+ size = CopletInstance.SIZE_MAXIMIZED;
} else if ( state.equals(WindowState.MINIMIZED) ) {
- size = CopletInstanceData.SIZE_MINIMIZED;
+ size = CopletInstance.SIZE_MINIMIZED;
}
if ( size != cid.getSize() ) {
final Event e = new CopletInstanceSizingEvent(cid, size);
@@ -82,7 +82,7 @@
}
public void changeRenderParameters(Map parameters) {
- final CopletInstanceData cid = ((PortletEntityImpl)portletWindow.getPortletEntity()).getCopletInstanceData();
+ final CopletInstance cid = ((PortletEntityImpl)portletWindow.getPortletEntity()).getCopletInstanceData();
if ( parameters == null ) {
cid.removeTemporaryAttribute("render-parameters");
} else {
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletPreferencesProvider.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletPreferencesProvider.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletPreferencesProvider.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletPreferencesProvider.java Sun Jul 30 11:41:45 2006
@@ -15,7 +15,7 @@
*/
package org.apache.cocoon.portal.pluto;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
import org.apache.pluto.om.common.PreferenceSet;
/**
@@ -23,7 +23,7 @@
*/
public interface PortletPreferencesProvider {
- PreferenceSet getPreferenceSet(CopletInstanceData cid);
+ PreferenceSet getPreferenceSet(CopletInstance cid);
- void storePreferenceSet(CopletInstanceData cid, PreferenceSet prefs);
+ void storePreferenceSet(CopletInstance cid, PreferenceSet prefs);
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletPreferencesProviderImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletPreferencesProviderImpl.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletPreferencesProviderImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletPreferencesProviderImpl.java Sun Jul 30 11:41:45 2006
@@ -23,7 +23,7 @@
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
import org.apache.cocoon.portal.impl.AbstractComponent;
import org.apache.cocoon.portal.pluto.om.common.PreferenceSetImpl;
import org.apache.cocoon.portal.profile.ProfileLS;
@@ -104,9 +104,9 @@
}
/**
- * @see org.apache.cocoon.portal.pluto.PortletPreferencesProvider#getPreferenceSet(org.apache.cocoon.portal.coplet.CopletInstanceData)
+ * @see org.apache.cocoon.portal.pluto.PortletPreferencesProvider#getPreferenceSet(org.apache.cocoon.portal.coplet.CopletInstance)
*/
- public PreferenceSet getPreferenceSet(CopletInstanceData cid) {
+ public PreferenceSet getPreferenceSet(CopletInstance cid) {
final Map parameters = new HashMap();
parameters.put(ProfileLS.PARAMETER_PROFILETYPE, PROFILETYPE_PREFERENCES);
try {
@@ -118,9 +118,9 @@
}
/**
- * @see org.apache.cocoon.portal.pluto.PortletPreferencesProvider#storePreferenceSet(org.apache.cocoon.portal.coplet.CopletInstanceData, org.apache.pluto.om.common.PreferenceSet)
+ * @see org.apache.cocoon.portal.pluto.PortletPreferencesProvider#storePreferenceSet(org.apache.cocoon.portal.coplet.CopletInstance, org.apache.pluto.om.common.PreferenceSet)
*/
- public void storePreferenceSet(CopletInstanceData cid, PreferenceSet prefs) {
+ public void storePreferenceSet(CopletInstance cid, PreferenceSet prefs) {
final Map parameters = new HashMap();
parameters.put(ProfileLS.PARAMETER_PROFILETYPE, PROFILETYPE_PREFERENCES);
try {
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletURLConverter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletURLConverter.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletURLConverter.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletURLConverter.java Sun Jul 30 11:41:45 2006
@@ -25,7 +25,7 @@
import javax.portlet.WindowState;
import org.apache.pluto.util.StringUtils;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
/**
* Create the URL for a portlet.
@@ -49,7 +49,7 @@
* Constructor used when the URL will be marshalled.
* @param cid The coplet id.
*/
- public PortletURLConverter(CopletInstanceData cid) {
+ public PortletURLConverter(CopletInstance cid) {
this.portletId = cid.getId();
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletURLProviderImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletURLProviderImpl.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletURLProviderImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/PortletURLProviderImpl.java Sun Jul 30 11:41:45 2006
@@ -28,7 +28,7 @@
import org.apache.cocoon.portal.LinkService;
import org.apache.cocoon.portal.PortalRuntimeException;
import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
import org.apache.cocoon.portal.event.CopletInstanceEvent;
import org.apache.cocoon.portal.event.ConvertableEvent;
import org.apache.cocoon.portal.pluto.adapter.PortletAdapter;
@@ -96,7 +96,7 @@
this.linkService = service.getLinkService();
PortletURLConverter urlConverter = new PortletURLConverter(eventData);
String copletId = urlConverter.getPortletId();
- CopletInstanceData cid = service.getProfileManager()
+ CopletInstance cid = service.getProfileManager()
.getCopletInstanceData(copletId);
this.portletWindow = (PortletWindow)cid.getTemporaryAttribute(PortletAdapter.PORTLET_WINDOW_ATTRIBUTE_NAME);
this.mode = urlConverter.getMode();
@@ -225,7 +225,7 @@
/**
* @see org.apache.cocoon.portal.event.CopletInstanceEvent#getTarget()
*/
- public CopletInstanceData getTarget() {
+ public CopletInstance getTarget() {
return ((PortletEntityImpl)this.portletWindow.getPortletEntity()).getCopletInstanceData();
}
@@ -237,7 +237,7 @@
public String asString() {
final PortletWindowImpl impl = (PortletWindowImpl) this.portletWindow;
- final CopletInstanceData cid = impl.getCopletInstanceData();
+ final CopletInstance cid = impl.getCopletInstanceData();
PortletURLConverter urlConverter = new PortletURLConverter(cid);
if (this.mode != null) {
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/TestProfileManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/TestProfileManager.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/TestProfileManager.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/TestProfileManager.java Sun Jul 30 11:41:45 2006
@@ -22,8 +22,8 @@
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.coplet.CopletData;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletDefinition;
+import org.apache.cocoon.portal.coplet.CopletInstance;
import org.apache.cocoon.portal.event.Receiver;
import org.apache.cocoon.portal.event.user.UserEvent;
import org.apache.cocoon.portal.event.user.UserIsAccessingEvent;
@@ -75,22 +75,22 @@
final ProfileImpl profile = new ProfileImpl(layoutKey);
// first "load" the global data
- profile.setCopletBaseDatas( this.getGlobalBaseDatas( layoutKey) );
- profile.setCopletDatas( this.getGlobalDatas( info, profile, layoutKey) );
+ profile.setCopletTypes( this.getGlobalBaseDatas( layoutKey) );
+ profile.setCopletDefinitions( this.getGlobalDatas( info, profile, layoutKey) );
// create root layout
CompositeLayout rootLayout = new CompositeLayoutImpl("root", "row");
// create coplet instances and layouts
final List instances = new ArrayList();
- final Iterator i = this.deployedCopletDatas.values().iterator();
+ final Iterator i = this.deployedCopletDefinitions.values().iterator();
while ( i.hasNext() ) {
- final CopletData cd = (CopletData)i.next();
+ final CopletDefinition cd = (CopletDefinition)i.next();
// check for portlets
- if ( "portlet".equals(cd.getCopletBaseData().getCopletAdapterName()) ) {
+ if ( "portlet".equals(cd.getCopletType().getCopletAdapterName()) ) {
final String id = StringUtils.replaceChars(cd.getId() + "-1", '_', '-');
- final CopletInstanceData cid = new CopletInstanceData(id);
- cid.setCopletData(cd);
+ final CopletInstance cid = new CopletInstance(id);
+ cid.setCopletDefinition(cd);
instances.add(cid);
if ( portletNames.size() == 0 || portletNames.contains(cd.getId())) {
final CopletLayout copletLayout = new CopletLayout(null, "coplet");
@@ -142,8 +142,8 @@
// create new set
final Iterator i = this.getCopletInstanceDatas().iterator();
while ( i.hasNext() ) {
- final CopletInstanceData cid = (CopletInstanceData)i.next();
- if ( portletNames.contains(cid.getCopletData().getId())) {
+ final CopletInstance cid = (CopletInstance)i.next();
+ if ( portletNames.contains(cid.getCopletDefinition().getId())) {
final CopletLayout copletLayout = new CopletLayout(null, "coplet");
copletLayout.setCopletInstanceData(cid);
copletLayout.setLayoutRendererName("portlet-window");
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java Sun Jul 30 11:41:45 2006
@@ -37,8 +37,8 @@
import org.apache.cocoon.portal.PortalManagerAspectPrepareContext;
import org.apache.cocoon.portal.PortalManagerAspectRenderContext;
import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.coplet.CopletDataFeatures;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletDefinitionFeatures;
+import org.apache.cocoon.portal.coplet.CopletInstance;
import org.apache.cocoon.portal.coplet.adapter.CopletDecorationProvider;
import org.apache.cocoon.portal.coplet.adapter.DecorationAction;
import org.apache.cocoon.portal.coplet.adapter.impl.AbstractCopletAdapter;
@@ -121,9 +121,9 @@
}
/**
- * @see org.apache.cocoon.portal.coplet.adapter.CopletAdapter#login(org.apache.cocoon.portal.coplet.CopletInstanceData)
+ * @see org.apache.cocoon.portal.coplet.adapter.CopletAdapter#login(org.apache.cocoon.portal.coplet.CopletInstance)
*/
- public void login(CopletInstanceData coplet) {
+ public void login(CopletInstance coplet) {
super.login(coplet);
if ( this.portletContainer == null ) {
@@ -173,9 +173,9 @@
}
/**
- * @see org.apache.cocoon.portal.coplet.adapter.impl.AbstractCopletAdapter#streamContent(org.apache.cocoon.portal.coplet.CopletInstanceData, org.xml.sax.ContentHandler)
+ * @see org.apache.cocoon.portal.coplet.adapter.impl.AbstractCopletAdapter#streamContent(org.apache.cocoon.portal.coplet.CopletInstance, org.xml.sax.ContentHandler)
*/
- public void streamContent(CopletInstanceData coplet,
+ public void streamContent(CopletInstance coplet,
ContentHandler contentHandler)
throws SAXException {
if ( this.portletContainer == null ) {
@@ -219,9 +219,9 @@
}
/**
- * @see org.apache.cocoon.portal.coplet.adapter.CopletAdapter#logout(org.apache.cocoon.portal.coplet.CopletInstanceData)
+ * @see org.apache.cocoon.portal.coplet.adapter.CopletAdapter#logout(org.apache.cocoon.portal.coplet.CopletInstance)
*/
- public void logout(CopletInstanceData coplet) {
+ public void logout(CopletInstance coplet) {
super.logout(coplet);
if ( this.portletContainer == null ) {
return;
@@ -347,14 +347,14 @@
public void inform(CopletInstanceSizingEvent event, PortalService service) {
WindowState ws = WindowState.NORMAL;
- if ( event.getSize() == CopletInstanceData.SIZE_NORMAL ) {
+ if ( event.getSize() == CopletInstance.SIZE_NORMAL ) {
ws = WindowState.NORMAL;
- } else if ( event.getSize() == CopletInstanceData.SIZE_MAXIMIZED ) {
+ } else if ( event.getSize() == CopletInstance.SIZE_MAXIMIZED ) {
ws = WindowState.MAXIMIZED;
- } else if ( event.getSize() == CopletInstanceData.SIZE_MINIMIZED ) {
+ } else if ( event.getSize() == CopletInstance.SIZE_MINIMIZED ) {
ws = WindowState.MINIMIZED;
- } else if ( event.getSize() == CopletInstanceData.SIZE_FULLSCREEN ) {
- ws = new WindowState((String)CopletDataFeatures.getAttributeValue(event.getTarget().getCopletData(), FULL_SCREEN_WINDOW_STATE_ATTRIBUTE_NAME, null));
+ } else if ( event.getSize() == CopletInstance.SIZE_FULLSCREEN ) {
+ ws = new WindowState((String)CopletDefinitionFeatures.getAttributeValue(event.getTarget().getCopletDefinition(), FULL_SCREEN_WINDOW_STATE_ATTRIBUTE_NAME, null));
}
final String wsString = (String)event.getTarget().getTemporaryAttribute(WINDOW_STATE_ATTRIBUTE_NAME);
if ( !wsString.equals(ws.toString()) ) {
@@ -413,14 +413,14 @@
}
}
- protected String getResponse(CopletInstanceData instance, HttpServletResponse response) {
+ protected String getResponse(CopletInstance instance, HttpServletResponse response) {
return response.toString();
}
/**
- * @see org.apache.cocoon.portal.coplet.adapter.CopletDecorationProvider#getPossibleCopletModes(CopletInstanceData)
+ * @see org.apache.cocoon.portal.coplet.adapter.CopletDecorationProvider#getPossibleCopletModes(CopletInstance)
*/
- public List getPossibleCopletModes(CopletInstanceData copletInstanceData) {
+ public List getPossibleCopletModes(CopletInstance copletInstanceData) {
final List modes = new ArrayList();
final PortletWindow window = (PortletWindow)copletInstanceData.getTemporaryAttribute(PORTLET_WINDOW_ATTRIBUTE_NAME);
if ( window != null ) {
@@ -459,9 +459,9 @@
}
/**
- * @see org.apache.cocoon.portal.coplet.adapter.CopletDecorationProvider#getPossibleWindowStates(CopletInstanceData)
+ * @see org.apache.cocoon.portal.coplet.adapter.CopletDecorationProvider#getPossibleWindowStates(CopletInstance)
*/
- public List getPossibleWindowStates(CopletInstanceData copletInstanceData) {
+ public List getPossibleWindowStates(CopletInstance copletInstanceData) {
final List states = new ArrayList();
final PortletWindow window = (PortletWindow)copletInstanceData.getTemporaryAttribute(PORTLET_WINDOW_ATTRIBUTE_NAME);
if ( window != null ) {
@@ -509,9 +509,9 @@
}
/**
- * @see org.apache.cocoon.portal.coplet.adapter.CopletDecorationProvider#getTitle(org.apache.cocoon.portal.coplet.CopletInstanceData)
+ * @see org.apache.cocoon.portal.coplet.adapter.CopletDecorationProvider#getTitle(org.apache.cocoon.portal.coplet.CopletInstance)
*/
- public String getTitle(CopletInstanceData copletInstanceData) {
+ public String getTitle(CopletInstance copletInstanceData) {
String title = null;
final PortletWindow window = (PortletWindow)copletInstanceData.getTemporaryAttribute(PORTLET_WINDOW_ATTRIBUTE_NAME);
if ( window != null ) {
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionRegistryImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionRegistryImpl.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionRegistryImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionRegistryImpl.java Sun Jul 30 11:41:45 2006
@@ -41,8 +41,8 @@
import org.apache.cocoon.components.thread.RunnableManager;
import org.apache.cocoon.portal.PortalComponentManager;
import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.coplet.CopletBaseData;
-import org.apache.cocoon.portal.coplet.CopletData;
+import org.apache.cocoon.portal.coplet.CopletDefinition;
+import org.apache.cocoon.portal.coplet.CopletType;
import org.apache.cocoon.portal.deployment.DeploymentEvent;
import org.apache.cocoon.portal.deployment.DeploymentException;
import org.apache.cocoon.portal.deployment.DeploymentStatus;
@@ -509,9 +509,9 @@
}
if ( this.createCoplets ) {
// TODO - parse coplet.xml if available
- final CopletBaseData cbd = pcm.getProfileManager().getCopletBaseData(this.copletBaseDataName);
+ final CopletType cbd = pcm.getProfileManager().getCopletType(this.copletBaseDataName);
// TODO - check portletId for invalid characters!
- final CopletData cd = pcm.getCopletFactory().newInstance(cbd, portlet.getId().toString());
+ final CopletDefinition cd = pcm.getCopletFactory().newInstance(cbd, portlet.getId().toString());
cd.setAttribute("portlet", portlet.getId().toString());
cd.setAttribute("buffer", Boolean.TRUE);
if ( this.getLogger().isInfoEnabled() ) {
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletEntityImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletEntityImpl.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletEntityImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletEntityImpl.java Sun Jul 30 11:41:45 2006
@@ -19,7 +19,7 @@
import java.util.Locale;
import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
import org.apache.cocoon.portal.pluto.PortletPreferencesProvider;
import org.apache.pluto.PortletContainerServices;
import org.apache.pluto.om.common.Description;
@@ -40,7 +40,7 @@
protected final PortletWindowList portletWindows;
protected final ObjectID objectId;
protected final PortletDefinition definition;
- protected final CopletInstanceData coplet;
+ protected final CopletInstance coplet;
protected final PortletApplicationEntity applicationEntity;
protected final PortalService service;
protected final PortletPreferencesProvider prefProvider;
@@ -51,7 +51,7 @@
* Constructor.
*/
PortletEntityImpl(PortletApplicationEntity pae,
- CopletInstanceData cid,
+ CopletInstance cid,
PortletDefinition pd,
PortalService service) {
this.objectId = org.apache.cocoon.portal.pluto.om.common.ObjectIDImpl.createFromString("CID" + cid.hashCode());
@@ -114,7 +114,7 @@
/**
* Return the coplet instance data.
*/
- public CopletInstanceData getCopletInstanceData() {
+ public CopletInstance getCopletInstanceData() {
return this.coplet;
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletEntityListImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletEntityListImpl.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletEntityListImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletEntityListImpl.java Sun Jul 30 11:41:45 2006
@@ -19,7 +19,7 @@
import java.util.Iterator;
import java.util.Map;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
import org.apache.cocoon.portal.pluto.om.common.ObjectIDImpl;
import org.apache.pluto.PortletContainerServices;
import org.apache.pluto.om.common.ObjectID;
@@ -64,7 +64,7 @@
PortletDefinition pd = registry.getPortletDefinition(ObjectIDImpl.createFromString(definitionId));
PortletApplicationEntity pae = registry.getPortletApplicationEntityList().get(ObjectIDImpl.createFromString("cocoon"));
// FIXME
- CopletInstanceData coplet = null;
+ CopletInstance coplet = null;
PortletEntity portletEntity = new PortletEntityImpl(pae, coplet, pd, registry.getPortalService());
this.portlets.put(portletEntity.getId(), portletEntity);
@@ -76,7 +76,7 @@
*/
public PortletEntity add(PortletApplicationEntity appEntity,
String definitionId,
- CopletInstanceData coplet,
+ CopletInstance coplet,
PortletDefinitionRegistry registry) {
PortletDefinition pd = registry.getPortletDefinition(ObjectIDImpl.createFromString(definitionId));
PortletEntity portletEntity = new PortletEntityImpl(appEntity, coplet, pd, registry.getPortalService());
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletWindowImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletWindowImpl.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletWindowImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/om/PortletWindowImpl.java Sun Jul 30 11:41:45 2006
@@ -15,7 +15,7 @@
*/
package org.apache.cocoon.portal.pluto.om;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
import org.apache.pluto.om.common.ObjectID;
import org.apache.pluto.om.entity.PortletEntity;
import org.apache.pluto.om.window.PortletWindow;
@@ -30,9 +30,9 @@
private ObjectID objectId;
private String id;
private PortletEntity portletEntity;
- private final CopletInstanceData coplet;
+ private final CopletInstance coplet;
- public PortletWindowImpl(CopletInstanceData coplet, String id) {
+ public PortletWindowImpl(CopletInstance coplet, String id) {
this.id = id;
this.coplet = coplet;
}
@@ -80,7 +80,7 @@
this.portletEntity = portletEntity;
}
- public CopletInstanceData getCopletInstanceData() {
+ public CopletInstance getCopletInstanceData() {
return this.coplet;
}
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/servlet/ServletRequestImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/servlet/ServletRequestImpl.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/servlet/ServletRequestImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/servlet/ServletRequestImpl.java Sun Jul 30 11:41:45 2006
@@ -25,7 +25,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletRequestWrapper;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
import org.apache.cocoon.portal.pluto.PortletURLProviderImpl;
import org.apache.cocoon.portal.pluto.om.PortletWindowImpl;
import org.apache.pluto.om.window.PortletWindow;
@@ -152,7 +152,7 @@
} else {
// provider is null or different window, use stored render parameters
if ( window != null ) {
- final CopletInstanceData cid = ((PortletWindowImpl)this.window).getCopletInstanceData();
+ final CopletInstance cid = ((PortletWindowImpl)this.window).getCopletInstanceData();
this.portletParameterMap = (Map)cid.getTemporaryAttribute("render-parameters");
}
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/AddToBasketAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/AddToBasketAspect.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/AddToBasketAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/AddToBasketAspect.java Sun Jul 30 11:41:45 2006
@@ -20,7 +20,7 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
import org.apache.cocoon.portal.coplets.basket.events.AddItemEvent;
import org.apache.cocoon.portal.event.Event;
import org.apache.cocoon.portal.layout.Layout;
@@ -72,7 +72,7 @@
PortalService service,
ContentHandler contenthandler)
throws SAXException {
- final CopletInstanceData cid = ((CopletLayout)layout).getCopletInstanceData();
+ final CopletInstance cid = ((CopletLayout)layout).getCopletInstanceData();
final ContentStore store;
final String elementName;
if ( context.getAspectConfiguration().equals(Boolean.TRUE) ) {
@@ -83,13 +83,13 @@
elementName = "briefcase-add-content";
}
- Boolean b = (Boolean)cid.getCopletData().getAttribute("basket-content");
+ Boolean b = (Boolean)cid.getCopletDefinition().getAttribute("basket-content");
if ( b != null && b.equals(Boolean.TRUE) ) {
Object item = new ContentItem(cid, true);
Event event = new AddItemEvent(store, item);
XMLUtils.createElement(contenthandler, elementName, service.getLinkService().getLinkURI(event));
}
- b = (Boolean)cid.getCopletData().getAttribute("basket-link");
+ b = (Boolean)cid.getCopletDefinition().getAttribute("basket-link");
if ( b != null && b.equals(Boolean.TRUE) ) {
Object item = new ContentItem(cid, false);
Event event = new AddItemEvent(store, item);
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/BasketContentGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/BasketContentGenerator.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/BasketContentGenerator.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/BasketContentGenerator.java Sun Jul 30 11:41:45 2006
@@ -24,7 +24,7 @@
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.source.SourceUtil;
import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
import org.apache.cocoon.portal.generation.AbstractCopletGenerator;
import org.apache.cocoon.xml.SaxBuffer;
import org.apache.cocoon.xml.XMLUtils;
@@ -67,7 +67,7 @@
try {
parser = (SAXParser) this.manager.lookup(SAXParser.ROLE);
if ( this.attributeName != null ) {
- CopletInstanceData cid = this.getCopletInstanceData();
+ CopletInstance cid = this.getCopletInstanceData();
byte[] content = (byte[])cid.getAttribute(this.attributeName);
if ( content == null ) {
this.xmlConsumer.startDocument();
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/BasketManagerImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/BasketManagerImpl.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/BasketManagerImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/BasketManagerImpl.java Sun Jul 30 11:41:45 2006
@@ -45,8 +45,8 @@
import org.apache.cocoon.environment.Session;
import org.apache.cocoon.portal.PortalException;
import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.coplet.CopletData;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletDefinition;
+import org.apache.cocoon.portal.coplet.CopletInstance;
import org.apache.cocoon.portal.coplets.basket.events.AddItemEvent;
import org.apache.cocoon.portal.coplets.basket.events.CleanBriefcaseEvent;
import org.apache.cocoon.portal.coplets.basket.events.ContentStoreEvent;
@@ -232,9 +232,9 @@
ContentItem ci = (ContentItem)event.getItem();
CopletLayout layout = (CopletLayout) event.getLayout();
- CopletInstanceData cid = null;
+ CopletInstance cid = null;
if ( ci.isContent() ) {
- CopletData copletData = this.portalService.getProfileManager().getCopletData(event.getCopletDataId());
+ CopletDefinition copletData = this.portalService.getProfileManager().getCopletDefinition(event.getCopletDataId());
cid = this.portalService.getCopletFactory().newInstance(copletData);
cid.setAttribute("item-content", ci.getContent());
} else {
@@ -246,7 +246,7 @@
resolver = (SourceResolver)this.manager.lookup(SourceResolver.ROLE);
url = ci.getURL();
source = resolver.resolveURI(url);
- CopletData copletData = this.portalService.getProfileManager().getCopletData(event.getCopletDataId());
+ CopletDefinition copletData = this.portalService.getProfileManager().getCopletDefinition(event.getCopletDataId());
cid = this.portalService.getCopletFactory().newInstance(copletData);
cid.setAttribute("item-content", IOUtils.toByteArray(source.getInputStream()));
} catch (IOException se) {
@@ -261,8 +261,8 @@
}
} else {
- final CopletInstanceData original = this.portalService.getProfileManager().getCopletInstanceData(ci.getCopletId());
- final CopletData copletData = original.getCopletData();
+ final CopletInstance original = this.portalService.getProfileManager().getCopletInstanceData(ci.getCopletId());
+ final CopletDefinition copletData = original.getCopletDefinition();
cid = this.portalService.getCopletFactory().newInstance(copletData);
Map attributes = (Map) ci.getAttribute("coplet-attributes");
Iterator i = attributes.entrySet().iterator();
@@ -361,7 +361,7 @@
url = ci.getURL();
if ( url == null ) {
// copy coplet attributes
- CopletInstanceData cid = this.portalService.getProfileManager().getCopletInstanceData(ci.getCopletId());
+ CopletInstance cid = this.portalService.getProfileManager().getCopletInstanceData(ci.getCopletId());
url = "coplet://" + ci.getCopletId();
Map attributes = new HashMap();
Iterator i = cid.getAttributes().entrySet().iterator();
@@ -369,7 +369,7 @@
Map.Entry entry = (Map.Entry)i.next();
attributes.put(entry.getKey(), entry.getValue());
}
- i = cid.getCopletData().getAttributes().entrySet().iterator();
+ i = cid.getCopletDefinition().getAttributes().entrySet().iterator();
while ( i.hasNext() ) {
Map.Entry entry = (Map.Entry)i.next();
attributes.put(entry.getKey(), entry.getValue());
@@ -390,14 +390,14 @@
}
} else if ( ci.getURL() == null ) {
// copy coplet attributes
- CopletInstanceData cid = this.portalService.getProfileManager().getCopletInstanceData(ci.getCopletId());
+ CopletInstance cid = this.portalService.getProfileManager().getCopletInstanceData(ci.getCopletId());
Map attributes = new HashMap();
Iterator i = cid.getAttributes().entrySet().iterator();
while ( i.hasNext() ) {
Map.Entry entry = (Map.Entry)i.next();
attributes.put(entry.getKey(), entry.getValue());
}
- i = cid.getCopletData().getAttributes().entrySet().iterator();
+ i = cid.getCopletDefinition().getAttributes().entrySet().iterator();
while ( i.hasNext() ) {
Map.Entry entry = (Map.Entry)i.next();
attributes.put(entry.getKey(), entry.getValue());
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/BasketTransformer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/BasketTransformer.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/BasketTransformer.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/BasketTransformer.java Sun Jul 30 11:41:45 2006
@@ -24,7 +24,7 @@
import org.apache.avalon.framework.service.ServiceException;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.portal.PortalService;
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
import org.apache.cocoon.portal.coplets.basket.BasketManager.ActionInfo;
import org.apache.cocoon.portal.coplets.basket.events.AddItemEvent;
import org.apache.cocoon.portal.event.Event;
@@ -107,7 +107,7 @@
ci = new ContentItem(href, addContent);
} else {
final String copletId = attr.getValue("coplet");
- final CopletInstanceData cid = service.getProfileManager().getCopletInstanceData(copletId);
+ final CopletInstance cid = service.getProfileManager().getCopletInstanceData(copletId);
ci = new ContentItem(cid, addContent);
}