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 2005/08/30 12:30:18 UTC
svn commit: r264755 [4/4] - in /cocoon/branches/BRANCH_2_1_X: ./ legal/ lib/
lib/optional/ src/blocks/portal/conf/
src/blocks/portal/java/org/apache/cocoon/portal/wsrp/
src/blocks/portal/java/org/apache/cocoon/portal/wsrp/adapter/
src/blocks/portal/jav...
Added: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/wsrp/consumer/WSRPRequestImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/wsrp/consumer/WSRPRequestImpl.java?rev=264755&view=auto
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/wsrp/consumer/WSRPRequestImpl.java (added)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/wsrp/consumer/WSRPRequestImpl.java Tue Aug 30 03:29:21 2005
@@ -0,0 +1,187 @@
+/*
+ * Copyright 2000-2001,2004 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.wsrp.consumer;
+
+import oasis.names.tc.wsrp.v1.types.ClientData;
+import oasis.names.tc.wsrp.v1.types.MarkupContext;
+import oasis.names.tc.wsrp.v1.types.NamedString;
+import oasis.names.tc.wsrp.v1.types.SessionContext;
+
+import org.apache.wsrp4j.consumer.ConsumerEnvironment;
+import org.apache.wsrp4j.consumer.InteractionRequest;
+import org.apache.wsrp4j.consumer.MarkupRequest;
+import org.apache.wsrp4j.consumer.driver.GenericWSRPBaseRequestImpl;
+
+/**
+ * Holds all parameters to communicate with the producer to get the right portlet.
+ * It uses the {@link org.apache.cocoon.portal.wsrp.consumer#SimplePortletSessionImpl}
+ * to get the window-information, the {@link org.apache.cocoon.portal.wsrp.consumer#Request}
+ * for the interaction-state, form-parameters and so on, last but not least the
+ * {@link org.apache.cocoon.portal.wsrp.consumer#consumerEnvironment} for all
+ * other information.<br/>
+ *
+ * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
+ * @author <a href="mailto:malessandrini@s-und-n.de">Michel Alessandrini</a>
+ *
+ * @version $Id$
+ */
+public class WSRPRequestImpl extends GenericWSRPBaseRequestImpl
+ implements InteractionRequest, MarkupRequest {
+
+ /** Portlet-window settings */
+ protected final SimplePortletWindowSession windowSession;
+
+ /** Request-parameters */
+ protected final Request request;
+
+ /** Consumer environment contains all registries to get the required information*/
+ protected final ConsumerEnvironment consEnv;
+
+ /**
+ * Constructor
+ *
+ * @param session
+ * @param request
+ * @param env ConsumerEnvironment
+ */
+ public WSRPRequestImpl(SimplePortletWindowSession session,
+ Request request,
+ ConsumerEnvironment env) {
+ if (session == null) {
+ throw(new IllegalStateException("session must not be null"));
+ }
+ if (env == null) {
+ throw(new IllegalStateException("environment must not be null"));
+ }
+ if ( request == null ) {
+ this.request = new RequestImpl();
+ } else {
+ this.request = request;
+ }
+ this.windowSession = session;
+ this.consEnv = env;
+ }
+
+ /**
+ * @see org.apache.wsrp4j.consumer.driver.GenericWSRPBaseRequestImpl#getSessionID()
+ */
+ public String getSessionID() {
+ SessionContext sessionCtx = windowSession.getPortletSession().getSessionContext();
+ if (sessionCtx != null) {
+ return sessionCtx.getSessionID();
+ }
+ return null;
+ }
+
+ /**
+ * @see org.apache.wsrp4j.consumer.driver.GenericWSRPBaseRequestImpl#getPortletInstanceKey()
+ */
+ public String getPortletInstanceKey() {
+ return windowSession.getWindowID();
+ }
+
+ /**
+ * @see org.apache.wsrp4j.consumer.driver.GenericWSRPBaseRequestImpl#getNavigationalState()
+ */
+ public String getNavigationalState() {
+ return windowSession.getNavigationalState();
+ }
+
+ /**
+ * @see org.apache.wsrp4j.consumer.driver.GenericWSRPBaseRequestImpl#getWindowState()
+ */
+ public String getWindowState() {
+ return windowSession.getWindowState();
+ }
+
+ /**
+ * @see org.apache.wsrp4j.consumer.driver.GenericWSRPBaseRequestImpl#getMode()
+ */
+ public String getMode() {
+ return this.windowSession.getMode();
+ }
+
+ /**
+ * @see org.apache.wsrp4j.consumer.driver.GenericWSRPBaseRequestImpl#getClientData()
+ */
+ public ClientData getClientData() {
+ return null;
+ }
+
+ /**
+ * @see org.apache.wsrp4j.consumer.driver.GenericWSRPBaseRequestImpl#getLocales()
+ */
+ public String[] getLocales() {
+ return this.consEnv.getSupportedLocales();
+ }
+
+ /**
+ * @see org.apache.wsrp4j.consumer.driver.GenericWSRPBaseRequestImpl#getModes()
+ */
+ public String[] getModes() {
+ return this.consEnv.getSupportedModes();
+ }
+
+ /**
+ * @see org.apache.wsrp4j.consumer.driver.GenericWSRPBaseRequestImpl#getWindowStates()
+ */
+ public String[] getWindowStates() {
+ return this.consEnv.getSupportedWindowStates();
+ }
+
+ /**
+ * @see org.apache.wsrp4j.consumer.driver.GenericWSRPBaseRequestImpl#getMimeTypes()
+ */
+ public String[] getMimeTypes() {
+ return consEnv.getMimeTypes();
+ }
+
+ /**
+ * @see org.apache.wsrp4j.consumer.driver.GenericWSRPBaseRequestImpl#getCharacterEncodingSet()
+ */
+ public String[] getCharacterEncodingSet() {
+ return this.consEnv.getCharacterEncodingSet();
+ }
+
+ /**
+ * @see org.apache.wsrp4j.consumer.driver.GenericWSRPBaseRequestImpl#getUserAuthentication()
+ */
+ public String getUserAuthentication() {
+ return this.consEnv.getUserAuthentication();
+ }
+
+ /**
+ * @see org.apache.wsrp4j.consumer.InteractionRequest#getInteractionState()
+ */
+ public String getInteractionState() {
+ return this.request.getInteractionState();
+ }
+
+ /**
+ * @see org.apache.wsrp4j.consumer.InteractionRequest#getFormParameters()
+ */
+ public NamedString[] getFormParameters() {
+ return this.request.getFormParameters();
+ }
+
+ /**
+ * @see org.apache.wsrp4j.consumer.MarkupRequest#getCachedMarkup()
+ */
+ public MarkupContext getCachedMarkup() {
+ return this.windowSession.getCachedMarkup();
+ }
+}
Propchange: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/wsrp/consumer/WSRPRequestImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/wsrp/consumer/WSRPRequestImpl.java
------------------------------------------------------------------------------
svn:keywords = Id
Added: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/wsrp/logging/WSRPLogManager.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/wsrp/logging/WSRPLogManager.java?rev=264755&view=auto
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/wsrp/logging/WSRPLogManager.java (added)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/wsrp/logging/WSRPLogManager.java Tue Aug 30 03:29:21 2005
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2005 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.wsrp.logging;
+
+import org.apache.wsrp4j.log.LogManager;
+import org.apache.wsrp4j.log.Logger;
+
+/**
+ * This log manager implementation just always returns the portal logger.<br/>
+ *
+ * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
+ * @author <a href="mailto:malessandrini@s-und-n.de">Michel Alessandrini</a>
+ *
+ * @version $Id$
+ */
+public class WSRPLogManager extends LogManager {
+
+ /** The logger-object */
+ protected final WSRPLogger logger;
+
+ /**
+ * constructor<br/>
+ *
+ * @param logger
+ */
+ public WSRPLogManager(WSRPLogger logger) {
+ this.logger = logger;
+ }
+
+ /**
+ * @see org.apache.wsrp4j.log.LogManager#getLogger(java.lang.Class)
+ */
+ public Logger getLogger(Class arg0) {
+ return this.logger;
+ }
+
+}
Propchange: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/wsrp/logging/WSRPLogManager.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/wsrp/logging/WSRPLogManager.java
------------------------------------------------------------------------------
svn:keywords = Id
Added: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/wsrp/logging/WSRPLogger.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/wsrp/logging/WSRPLogger.java?rev=264755&view=auto
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/wsrp/logging/WSRPLogger.java (added)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/wsrp/logging/WSRPLogger.java Tue Aug 30 03:29:21 2005
@@ -0,0 +1,224 @@
+/*
+ * Copyright 2005 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.wsrp.logging;
+
+import org.apache.wsrp4j.log.Logger;
+
+/**
+ * A wrapper for the cocoon logger<br/>
+ *
+ * @author <a href="mailto:cziegeler@s-und-n.de">Carsten Ziegeler</a>
+ * @author <a href="mailto:malessandrini@s-und-n.de">Michel Alessandrini</a>
+ *
+ * @version $Id$
+ */
+public class WSRPLogger implements Logger {
+
+ /** The avalon logger */
+ protected final org.apache.avalon.framework.logger.Logger logger;
+
+ /**
+ * constructor<br/>
+ *
+ * @param logger
+ */
+ public WSRPLogger(org.apache.avalon.framework.logger.Logger logger) {
+ this.logger = logger;
+ }
+
+ /**
+ * @see org.apache.wsrp4j.log.Logger#entry(int, java.lang.String)
+ */
+ public void entry(int logLevel, String loggingMethod) {
+ this.entry(logLevel, loggingMethod, null);
+ }
+
+ /**
+ * @see org.apache.wsrp4j.log.Logger#entry(int, java.lang.String, java.lang.Object)
+ */
+ public void entry(int logLevel, String loggingMethod, Object parm1) {
+ this.entry(logLevel, loggingMethod, new Object[] { parm1 });
+ }
+
+ /**
+ * @see org.apache.wsrp4j.log.Logger#entry(int, java.lang.String, java.lang.Object[])
+ */
+ public void entry(int logLevel, String loggingMethod, Object[] parms) {
+ this.text(logLevel, loggingMethod, "Entering method", parms);
+ }
+
+ /**
+ * @see org.apache.wsrp4j.log.Logger#exit(int, java.lang.String)
+ */
+ public void exit(int logLevel, String loggingMethod) {
+ this.text(logLevel, loggingMethod, "Exiting method.");
+ }
+
+ /**
+ * @see org.apache.wsrp4j.log.Logger#exit(int, java.lang.String, byte)
+ */
+ public void exit(int logLevel, String loggingMethod, byte retValue) {
+ this.exit(logLevel, loggingMethod, new Byte(retValue));
+ }
+
+ /**
+ * @see org.apache.wsrp4j.log.Logger#exit(int, java.lang.String, short)
+ */
+ public void exit(int logLevel, String loggingMethod, short retValue) {
+ this.exit(logLevel, loggingMethod, new Short(retValue));
+ }
+
+ /**
+ * @see org.apache.wsrp4j.log.Logger#exit(int, java.lang.String, int)
+ */
+ public void exit(int logLevel, String loggingMethod, int retValue) {
+ this.exit(logLevel, loggingMethod, new Integer(retValue));
+ }
+
+ /**
+ * @see org.apache.wsrp4j.log.Logger#exit(int, java.lang.String, long)
+ */
+ public void exit(int logLevel, String loggingMethod, long retValue) {
+ this.exit(logLevel, loggingMethod, new Long(retValue));
+ }
+
+ /**
+ * @see org.apache.wsrp4j.log.Logger#exit(int, java.lang.String, float)
+ */
+ public void exit(int logLevel, String loggingMethod, float retValue) {
+ this.exit(logLevel, loggingMethod, new Float(retValue));
+ }
+
+ /**
+ * @see org.apache.wsrp4j.log.Logger#exit(int, java.lang.String, double)
+ */
+ public void exit(int logLevel, String loggingMethod, double retValue) {
+ this.exit(logLevel, loggingMethod, new Double(retValue));
+ }
+
+ /**
+ * @see org.apache.wsrp4j.log.Logger#exit(int, java.lang.String, char)
+ */
+ public void exit(int logLevel, String loggingMethod, char retValue) {
+ this.exit(logLevel, loggingMethod, new Character(retValue));
+ }
+
+ /**
+ * @see org.apache.wsrp4j.log.Logger#exit(int, java.lang.String, boolean)
+ */
+ public void exit(int logLevel, String loggingMethod, boolean retValue) {
+ this.exit(logLevel, loggingMethod, new Boolean(retValue));
+ }
+
+ /**
+ * @see org.apache.wsrp4j.log.Logger#exit(int, java.lang.String, java.lang.Object)
+ */
+ public void exit(int logLevel, String loggingMethod, Object retValue) {
+ this.text(logLevel, loggingMethod, "Exiting method. Returned value: {0}", retValue);
+ }
+
+ /**
+ * @see org.apache.wsrp4j.log.Logger#isLogging(int)
+ */
+ public boolean isLogging(int logLevel) {
+ if (logLevel == Logger.ERROR ) {
+ return this.logger.isErrorEnabled();
+ } else if ( logLevel == Logger.INFO ) {
+ return this.logger.isInfoEnabled();
+ } else if ( logLevel == Logger.WARN ) {
+ return this.logger.isWarnEnabled();
+ } else if ( logLevel == Logger.TRACE_HIGH ) {
+ return this.logger.isInfoEnabled();
+ } else if ( logLevel == Logger.TRACE_MEDIUM ) {
+ return this.logger.isDebugEnabled();
+ } else if ( logLevel == Logger.TRACE_LOW ) {
+ return this.logger.isDebugEnabled();
+ }
+ return false;
+ }
+
+ /**
+ * @see org.apache.wsrp4j.log.Logger#stackTrace(int, java.lang.String, java.lang.String)
+ */
+ public void stackTrace(int logLevel, String loggingMethod, String text) {
+ this.text(logLevel, loggingMethod, new Throwable("Stacktrace"), text);
+ }
+
+ /**
+ * @see org.apache.wsrp4j.log.Logger#text(int, java.lang.String, java.lang.String)
+ */
+ public void text(int logLevel, String loggingMethod, String text) {
+ this.text(logLevel, loggingMethod, text, null);
+ }
+
+ /**
+ * @see org.apache.wsrp4j.log.Logger#text(int, java.lang.String, java.lang.String, java.lang.Object)
+ */
+ public void text(int logLevel, String loggingMethod, String text, Object parm1) {
+ this.text(logLevel, loggingMethod, text, new Object[] { parm1 });
+ }
+
+ /**
+ * @see org.apache.wsrp4j.log.Logger#text(int, java.lang.String, java.lang.String, java.lang.Object[])
+ */
+ public void text(int logLevel, String loggingMethod, String text, Object[] parms) {
+ this.text(logLevel, loggingMethod, (Throwable) null, text, parms);
+ }
+
+ /**
+ * @see org.apache.wsrp4j.log.Logger#text(int, java.lang.String, java.lang.Throwable, java.lang.String)
+ */
+ public void text(int logLevel, String loggingMethod, Throwable t, String text) {
+ this.text(logLevel, loggingMethod, t, text, null);
+ }
+
+ /**
+ * @see org.apache.wsrp4j.log.Logger#text(int, java.lang.String, java.lang.Throwable, java.lang.String, java.lang.Object[])
+ */
+ public void text(int logLevel, String loggingMethod, Throwable t, String text, Object[] parms) {
+ if (!this.isLogging(logLevel)) {
+ return;
+ }
+ StringBuffer msgBuffer = new StringBuffer();
+ if (loggingMethod != null) {
+ msgBuffer.append(loggingMethod);
+ msgBuffer.append(" - ");
+ }
+ if (text != null) {
+ msgBuffer.append(text);
+ }
+ if (parms != null) {
+ msgBuffer.append("\nParameters:\n");
+ for (int i = 0; i < parms.length; i++) {
+ msgBuffer.append(parms[i]);
+ }
+ }
+
+ if (logLevel == Logger.ERROR ) {
+ this.logger.error(msgBuffer.toString(), t);
+ } else if ( logLevel == Logger.INFO ) {
+ this.logger.info(msgBuffer.toString(), t);
+ } else if ( logLevel == Logger.WARN ) {
+ this.logger.warn(msgBuffer.toString(), t);
+ } else if ( logLevel == Logger.TRACE_HIGH ) {
+ this.logger.info(msgBuffer.toString(), t);
+ } else if ( logLevel == Logger.TRACE_MEDIUM ) {
+ this.logger.debug(msgBuffer.toString(), t);
+ } else if ( logLevel == Logger.TRACE_LOW ) {
+ this.logger.debug(msgBuffer.toString(), t);
+ }
+ }
+}
Propchange: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/wsrp/logging/WSRPLogger.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/java/org/apache/cocoon/portal/wsrp/logging/WSRPLogger.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/coplets/docs/portal-demo.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/coplets/docs/portal-demo.xml?rev=264755&r1=264754&r2=264755&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/coplets/docs/portal-demo.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/coplets/docs/portal-demo.xml Tue Aug 30 03:29:21 2005
@@ -33,6 +33,7 @@
<li>The TabDemo2 shows the same content as TabDemo2 but with just a different stylesheet for the tab.</li>
<li>The Gallery tab shows some more coplets.</li>
<li>The JSR-168 tab demonstrates the integration of Portlets (read more below).</li>
+ <li>The WSRP tab demonstrates the integration of WSRP portlets (read more below).</li>
</ul>
<p><strong>THIS IS A SAMPLE PORTAL!</strong></p>
<p>It demonstrates several features of
@@ -58,6 +59,15 @@
<p>The current implementation searches for portlets in all directories that are next to
the Cocoon webapp directory. So, if you put Cocoon into the webapps directory of Tomcat,
you should put your portlets there as well.</p>
+ </s1>
+ <s1 title="WSRP">
+ <p>The Cocoon portal supports portlets conforming to the WSRP. The WSRP tab contains
+ a sample using the testsuite from the <fork href="http://ws.apache.org/wsrp4j">WSRP4J project</fork>.</p>
+ <p>These samples only work if you follow these installation instructions:</p>
+ <ul>
+ <li>Get the WSRP4J project and install it into Tomcat (Test WSRP using the SwingConsumer now).</li>
+ <li>Start up Tomcat (with the WSRP producer) and Cocoon (using Jetty) and run the Cocoon portal demo. You should see the WSRP portlets now.</li>
+ </ul>
</s1>
</body>
</document>
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/copletbasedata/portal.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/copletbasedata/portal.xml?rev=264755&r1=264754&r2=264755&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/copletbasedata/portal.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/copletbasedata/portal.xml Tue Aug 30 03:29:21 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 1999-2004 The Apache Software Foundation
+ Copyright 1999-2005 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.
@@ -15,7 +15,7 @@
limitations under the License.
-->
<!-- SVN $Id$ -->
-<coplets>
+<coplets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<coplet-base-data id="URICoplet">
<coplet-adapter>uri</coplet-adapter>
</coplet-base-data>
@@ -27,6 +27,13 @@
</coplet-base-data>
<coplet-base-data id="Application">
<coplet-adapter>application</coplet-adapter>
+ </coplet-base-data>
+ <coplet-base-data id="WSRP">
+ <coplet-adapter>wsrp</coplet-adapter>
+ <configuration>
+ <name>buffer</name>
+ <value xsi:type="java:java.lang.Boolean">true</value>
+ </configuration>
</coplet-base-data>
</coplets>
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/copletdata/portal.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/copletdata/portal.xml?rev=264755&r1=264754&r2=264755&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/copletdata/portal.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/copletdata/portal.xml Tue Aug 30 03:29:21 2005
@@ -15,7 +15,7 @@
limitations under the License.
-->
<!-- SVN $Id$ -->
-<coplets>
+<coplets xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<!--
+ Different news coplets
+ Read content from a file - for offline presentation
@@ -25,7 +25,7 @@
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/news/newsweek.rss</value>
+ <value xsi:type="java:java.lang.String">cocoon:/coplets/news/newsweek.rss</value>
</attribute>
</coplet-data>
@@ -34,7 +34,7 @@
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/news/nyt_business.rss</value>
+ <value xsi:type="java:java.lang.String">cocoon:/coplets/news/nyt_business.rss</value>
</attribute>
</coplet-data>
@@ -43,7 +43,7 @@
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/news/bbc_news.rss</value>
+ <value xsi:type="java:java.lang.String">cocoon:/coplets/news/bbc_news.rss</value>
</attribute>
</coplet-data>
@@ -52,7 +52,7 @@
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/news/cnet_news.rss</value>
+ <value xsi:type="java:java.lang.String">cocoon:/coplets/news/cnet_news.rss</value>
</attribute>
</coplet-data>
@@ -61,7 +61,7 @@
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/news/cnet_business.rss</value>
+ <value xsi:type="java:java.lang.String">cocoon:/coplets/news/cnet_business.rss</value>
</attribute>
</coplet-data>
@@ -70,7 +70,7 @@
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/news/cst_news.rss</value>
+ <value xsi:type="java:java.lang.String">cocoon:/coplets/news/cst_news.rss</value>
</attribute>
</coplet-data>
@@ -79,7 +79,7 @@
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/news/cnn_europe.rss</value>
+ <value xsi:type="java:java.lang.String">cocoon:/coplets/news/cnn_europe.rss</value>
</attribute>
</coplet-data>
@@ -88,7 +88,7 @@
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/news/ml_weblog.weblog-rss</value>
+ <value xsi:type="java:java.lang.String">cocoon:/coplets/news/ml_weblog.weblog-rss</value>
</attribute>
</coplet-data>
@@ -97,7 +97,7 @@
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/news/nn_weblog.weblog-rss</value>
+ <value xsi:type="java:java.lang.String">cocoon:/coplets/news/nn_weblog.weblog-rss</value>
</attribute>
</coplet-data>
@@ -111,15 +111,15 @@
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/news/live.weblog-rss?feed=http://www.osoco.org/weblogs/rael/index.xml</value>
+ <value xsi:type="java:java.lang.String">cocoon:/coplets/news/live.weblog-rss?feed=http://www.osoco.net/weblogs/rael/index.xml</value>
</attribute>
<attribute>
<name>buffer</name>
- <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+ <value xsi:type="java:java.lang.Boolean">true</value>
</attribute>
<attribute>
<name>error-uri</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/news/cz_weblog.weblog-rss</value>
+ <value xsi:type="java:java.lang.String">cocoon:/coplets/news/cz_weblog.weblog-rss</value>
</attribute>
</coplet-data>
@@ -131,11 +131,11 @@
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/docs/portal-intro.html</value>
+ <value xsi:type="java:java.lang.String">cocoon:/coplets/docs/portal-intro.html</value>
</attribute>
<aspect>
<name>mandatory</name>
- <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+ <value xsi:type="java:java.lang.Boolean">true</value>
</aspect>
</coplet-data>
<coplet-data id="Portal-Demo" name="standard">
@@ -143,15 +143,15 @@
<coplet-base-data>CachingURICoplet</coplet-base-data>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/docs/portal-demo.html</value>
+ <value xsi:type="java:java.lang.String">cocoon:/coplets/docs/portal-demo.html</value>
</attribute>
<attribute>
<name>cache-global</name>
- <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+ <value xsi:type="java:java.lang.Boolean">true</value>
</attribute>
<aspect>
<name>mandatory</name>
- <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+ <value xsi:type="java:java.lang.Boolean">true</value>
</aspect>
</coplet-data>
<coplet-data id="Portal-Right" name="standard">
@@ -159,11 +159,11 @@
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/docs/portal-right.html</value>
+ <value xsi:type="java:java.lang.String">cocoon:/coplets/docs/portal-right.html</value>
</attribute>
<aspect>
<name>mandatory</name>
- <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+ <value xsi:type="java:java.lang.Boolean">true</value>
</aspect>
</coplet-data>
<coplet-data id="Portal-Left" name="standard">
@@ -171,11 +171,11 @@
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/docs/portal-left.html</value>
+ <value xsi:type="java:java.lang.String">cocoon:/coplets/docs/portal-left.html</value>
</attribute>
<aspect>
<name>mandatory</name>
- <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+ <value xsi:type="java:java.lang.Boolean">true</value>
</aspect>
</coplet-data>
<coplet-data id="Portal-Bottom" name="standard">
@@ -183,11 +183,11 @@
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/docs/portal-bottom.html</value>
+ <value xsi:type="java:java.lang.String">cocoon:/coplets/docs/portal-bottom.html</value>
</attribute>
<aspect>
<name>mandatory</name>
- <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+ <value xsi:type="java:java.lang.Boolean">true</value>
</aspect>
</coplet-data>
@@ -199,19 +199,19 @@
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/gallery/browser</value>
+ <value xsi:type="java:java.lang.String">cocoon:/coplets/gallery/browser</value>
</attribute>
<attribute>
<name>image-dir</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">samplepics</value>
+ <value xsi:type="java:java.lang.String">samplepics</value>
</attribute>
<attribute>
<name>image-include</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">.jpg</value>
+ <value xsi:type="java:java.lang.String">.jpg</value>
</attribute>
<attribute>
<name>image-uri-prefix</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">coplets/gallery/images</value>
+ <value xsi:type="java:java.lang.String">coplets/gallery/images</value>
</attribute>
</coplet-data>
<coplet-data id="GalleryViewer" name="standard">
@@ -219,7 +219,7 @@
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/gallery/viewer</value>
+ <value xsi:type="java:java.lang.String">cocoon:/coplets/gallery/viewer</value>
</attribute>
</coplet-data>
@@ -231,11 +231,11 @@
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/login/coplet</value>
+ <value xsi:type="java:java.lang.String">cocoon:/coplets/login/coplet</value>
</attribute>
<aspect>
<name>mandatory</name>
- <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+ <value xsi:type="java:java.lang.Boolean">true</value>
</aspect>
</coplet-data>
@@ -248,7 +248,7 @@
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon://samples/blocks/portal/coplets/basket/content</value>
+ <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/content</value>
</attribute>
</coplet-data>
<coplet-data id="BasketAdmin" name="standard">
@@ -256,7 +256,7 @@
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon://samples/blocks/portal/coplets/basket/basket-admin</value>
+ <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/basket-admin</value>
</attribute>
</coplet-data>
<coplet-data id="Basket" name="standard">
@@ -264,7 +264,7 @@
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon://samples/blocks/portal/coplets/basket/basket</value>
+ <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/basket</value>
</attribute>
</coplet-data>
<coplet-data id="Basket.admin" name="standard">
@@ -272,7 +272,7 @@
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon://samples/blocks/portal/coplets/basket/basket.admin</value>
+ <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/basket.admin</value>
</attribute>
</coplet-data>
<coplet-data id="BasketSampleStaticCoplet" name="standard">
@@ -280,11 +280,11 @@
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
<name>group</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">document</value>
+ <value xsi:type="java:java.lang.String">document</value>
</attribute>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon://samples/blocks/portal/coplets/basket/staticcoplet.add.preflow</value>
+ <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/staticcoplet.add.preflow</value>
</attribute>
</coplet-data>
<coplet-data id="BasketSampleCopletWithAttribute" name="standard">
@@ -292,11 +292,11 @@
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
<name>group</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">document</value>
+ <value xsi:type="java:java.lang.String">document</value>
</attribute>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon://samples/blocks/portal/coplets/basket/copletwithattr.add.preflow</value>
+ <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/copletwithattr.add.preflow</value>
</attribute>
</coplet-data>
<coplet-data id="BasketSampleCopletWithInlineProcess" name="standard">
@@ -304,11 +304,11 @@
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
<name>group</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">document</value>
+ <value xsi:type="java:java.lang.String">document</value>
</attribute>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon://samples/blocks/portal/coplets/basket/copletwithinline.add.preflow</value>
+ <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/copletwithinline.add.preflow</value>
</attribute>
</coplet-data>
<coplet-data id="BasketSampleCopletWithInputProcess" name="standard">
@@ -316,23 +316,23 @@
<coplet-base-data>CachingURICoplet</coplet-base-data>
<attribute>
<name>group</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">notepad</value>
+ <value xsi:type="java:java.lang.String">notepad</value>
</attribute>
<attribute>
<name>buffer</name>
- <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+ <value xsi:type="java:java.lang.Boolean">true</value>
</attribute>
<attribute>
<name>handleParameters</name>
- <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+ <value xsi:type="java:java.lang.Boolean">true</value>
</attribute>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon://samples/blocks/portal/coplets/basket/application</value>
+ <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/application</value>
</attribute>
<attribute>
<name>temporary:application-uri</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon://samples/blocks/portal/coplets/basket/copletwithinput.add.flow</value>
+ <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/copletwithinput.add.flow</value>
</attribute>
</coplet-data>
<coplet-data id="BasketSampleCopletWithInputProcessShow" name="standard">
@@ -340,11 +340,11 @@
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
<name>group</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">notepad</value>
+ <value xsi:type="java:java.lang.String">notepad</value>
</attribute>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon://samples/blocks/portal/coplets/basket/copletwithinputshow.changeTitle.preflow</value>
+ <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/copletwithinputshow.changeTitle.preflow</value>
</attribute>
</coplet-data>
<coplet-data id="BasketSampleCopletWithApp" name="standard">
@@ -352,23 +352,23 @@
<coplet-base-data>CachingURICoplet</coplet-base-data>
<attribute>
<name>group</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">request</value>
+ <value xsi:type="java:java.lang.String">request</value>
</attribute>
<attribute>
<name>buffer</name>
- <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+ <value xsi:type="java:java.lang.Boolean">true</value>
</attribute>
<attribute>
<name>handleParameters</name>
- <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+ <value xsi:type="java:java.lang.Boolean">true</value>
</attribute>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon://samples/blocks/portal/coplets/basket/application</value>
+ <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/application</value>
</attribute>
<attribute>
<name>temporary:application-uri</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon://samples/blocks/portal/coplets/basket/copletwithapp.add.flow</value>
+ <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/copletwithapp.add.flow</value>
</attribute>
</coplet-data>
<coplet-data id="BasketSampleCopletList" name="standard">
@@ -376,23 +376,23 @@
<coplet-base-data>CachingURICoplet</coplet-base-data>
<attribute>
<name>group</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">request</value>
+ <value xsi:type="java:java.lang.String">request</value>
</attribute>
<attribute>
<name>buffer</name>
- <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+ <value xsi:type="java:java.lang.Boolean">true</value>
</attribute>
<attribute>
<name>handleParameters</name>
- <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+ <value xsi:type="java:java.lang.Boolean">true</value>
</attribute>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon://samples/blocks/portal/coplets/basket/application</value>
+ <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/application</value>
</attribute>
<attribute>
<name>temporary:application-uri</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon://samples/blocks/portal/coplets/basket/copletlist</value>
+ <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/copletlist</value>
</attribute>
</coplet-data>
<coplet-data id="BasketSampleCopletWithUpload" name="standard">
@@ -400,11 +400,11 @@
<coplet-base-data>URICoplet</coplet-base-data>
<attribute>
<name>group</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">folder</value>
+ <value xsi:type="java:java.lang.String">folder</value>
</attribute>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon://samples/blocks/portal/coplets/basket/copletwithupload.add.preflow</value>
+ <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/basket/copletwithupload.add.preflow</value>
</attribute>
</coplet-data>
@@ -417,11 +417,11 @@
<coplet-base-data>Portlet</coplet-base-data>
<attribute>
<name>portlet</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">testsuite.TestPortlet1</value>
+ <value xsi:type="java:java.lang.String">testsuite.TestPortlet1</value>
</attribute>
<attribute>
<name>buffer</name>
- <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+ <value xsi:type="java:java.lang.Boolean">true</value>
</attribute>
</coplet-data>
<coplet-data id="Portlet2" name="standard">
@@ -429,11 +429,11 @@
<coplet-base-data>Portlet</coplet-base-data>
<attribute>
<name>portlet</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">testsuite.TestPortlet2</value>
+ <value xsi:type="java:java.lang.String">testsuite.TestPortlet2</value>
</attribute>
<attribute>
<name>buffer</name>
- <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+ <value xsi:type="java:java.lang.Boolean">true</value>
</attribute>
</coplet-data>
<coplet-data id="TestPortlet1" name="standard">
@@ -441,11 +441,11 @@
<coplet-base-data>Portlet</coplet-base-data>
<attribute>
<name>portlet</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">webapp.TestPortlet1</value>
+ <value xsi:type="java:java.lang.String">webapp.TestPortlet1</value>
</attribute>
<attribute>
<name>buffer</name>
- <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+ <value xsi:type="java:java.lang.Boolean">true</value>
</attribute>
</coplet-data>
<coplet-data id="CocoonPortlet" name="standard">
@@ -453,11 +453,11 @@
<coplet-base-data>Portlet</coplet-base-data>
<attribute>
<name>portlet</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">webapp.CocoonPortlet</value>
+ <value xsi:type="java:java.lang.String">webapp.CocoonPortlet</value>
</attribute>
<attribute>
<name>buffer</name>
- <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+ <value xsi:type="java:java.lang.Boolean">true</value>
</attribute>
</coplet-data>
@@ -471,19 +471,19 @@
<coplet-base-data>CachingURICoplet</coplet-base-data>
<attribute>
<name>buffer</name>
- <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+ <value xsi:type="java:java.lang.Boolean">true</value>
</attribute>
<attribute>
<name>handleParameters</name>
- <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+ <value xsi:type="java:java.lang.Boolean">true</value>
</attribute>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/html/application</value>
+ <value xsi:type="java:java.lang.String">cocoon:/coplets/html/application</value>
</attribute>
<attribute>
<name>temporary:application-uri</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon://samples/blocks/portal/coplets/samples/form</value>
+ <value xsi:type="java:java.lang.String">cocoon://samples/blocks/portal/coplets/samples/form</value>
</attribute>
</coplet-data>
<coplet-data id="app-test-two" name="standard">
@@ -491,19 +491,19 @@
<coplet-base-data>CachingURICoplet</coplet-base-data>
<attribute>
<name>buffer</name>
- <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+ <value xsi:type="java:java.lang.Boolean">true</value>
</attribute>
<attribute>
<name>handleParameters</name>
- <value xsi:type="java:java.lang.Boolean" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">true</value>
+ <value xsi:type="java:java.lang.Boolean">true</value>
</attribute>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/html/application</value>
+ <value xsi:type="java:java.lang.String">cocoon:/coplets/html/application</value>
</attribute>
<attribute>
<name>temporary:application-uri</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon://samples/flow/jxcalc/</value>
+ <value xsi:type="java:java.lang.String">cocoon://samples/flow/jxcalc/</value>
</attribute>
</coplet-data>
@@ -513,11 +513,43 @@
<coplet-base-data>Application</coplet-base-data>
<attribute>
<name>uri</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">cocoon:/coplets/html/app-coplet</value>
+ <value xsi:type="java:java.lang.String">cocoon:/coplets/html/app-coplet</value>
</attribute>
<attribute>
<name>start-uri</name>
- <value xsi:type="java:java.lang.String" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">http://www.google.com/index.html</value>
+ <value xsi:type="java:java.lang.String">http://www.google.com/index.html</value>
</attribute>
</coplet-data>
+
+ <!-- Example for the wsrp portlet -->
+ <coplet-data id="wsrp-calc-portlet" name="standard">
+ <title>WSRP-Calc-Portlet</title>
+ <coplet-base-data>WSRP</coplet-base-data>
+ <attribute>
+ <name>producer-id</name>
+ <value xsi:type="java:java.lang.String">prod_localhost_8081</value>
+ </attribute>
+ <attribute>
+ <name>portlet-handle</name>
+ <value xsi:type="java:java.lang.String">calc_1.1</value>
+ </attribute>
+ </coplet-data>
+
+ <coplet-data id="wsrp-test-portlet" name="standard">
+ <title>WSRP-Test-Portlet</title>
+ <coplet-base-data>WSRP</coplet-base-data>
+ <attribute>
+ <name>producer-id</name>
+ <value xsi:type="java:java.lang.String">prod_localhost_8081</value>
+ </attribute>
+ <attribute>
+ <name>portlet-handle</name>
+ <value xsi:type="java:java.lang.String">0.1</value>
+ </attribute>
+ <attribute>
+ <name>use-pipeline</name>
+ <value xsi:type="java:java.lang.Boolean">true</value>
+ </attribute>
+ </coplet-data>
+
</coplets>
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/copletinstancedata/portal.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/copletinstancedata/portal.xml?rev=264755&r1=264754&r2=264755&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/copletinstancedata/portal.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/copletinstancedata/portal.xml Tue Aug 30 03:29:21 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 1999-2004 The Apache Software Foundation
+ Copyright 1999-2005 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.
@@ -192,6 +192,14 @@
</coplet-instance-data>
<coplet-instance-data id="Google-1" name="standard">
<coplet-data>Google</coplet-data>
+ </coplet-instance-data>
+
+ <!-- wsrp example -->
+ <coplet-instance-data id="WSRP-Calc-1" name="standard">
+ <coplet-data>wsrp-calc-portlet</coplet-data>
+ </coplet-instance-data>
+ <coplet-instance-data id="WSRP-Test-1" name="standard">
+ <coplet-data>wsrp-test-portlet</coplet-data>
</coplet-instance-data>
</coplets>
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/layout/portal.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/layout/portal.xml?rev=264755&r1=264754&r2=264755&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/layout/portal.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/layout/portal.xml Tue Aug 30 03:29:21 2005
@@ -16,6 +16,7 @@
-->
<!-- SVN $Id$ -->
<composite-layout name="tab" id="maintab">
+
<named-item name="Main">
<coplet-layout name="coplet">
<coplet-instance-data>Portal-Demo-1</coplet-instance-data>
@@ -212,6 +213,21 @@
</coplet-layout>
</item>
</composite-layout>
+ </item>
+ </composite-layout>
+ </named-item>
+
+ <named-item name="WSRP">
+ <composite-layout name="column">
+ <item>
+ <coplet-layout name="coplet" layout-renderer-name="wsrp-window">
+ <coplet-instance-data>WSRP-Calc-1</coplet-instance-data>
+ </coplet-layout>
+ </item>
+ <item>
+ <coplet-layout name="coplet" layout-renderer-name="wsrp-window">
+ <coplet-instance-data>WSRP-Test-1</coplet-instance-data>
+ </coplet-layout>
</item>
</composite-layout>
</named-item>
Added: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/wsrp-config.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/wsrp-config.xml?rev=264755&view=auto
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/wsrp-config.xml (added)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/wsrp-config.xml Tue Aug 30 03:29:21 2005
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright 2005 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.
+-->
+<!-- @version $Id$ -->
+<wsrp-config>
+ <producers>
+ <producer id="prod_localhost_8081">
+ <markup-interface-url>http://localhost:8081/wsrp/wsrp4j/WSRPBaseService</markup-interface-url>
+ <service-description-interface-url>http://localhost:8081/wsrp/wsrp4j/WSRPServiceDescriptionService</service-description-interface-url>
+ <registration-interface-url>http://localhost:8081/wsrp/wsrp4j/WSRPRegistrationService</registration-interface-url>
+ <portlet-management-interface-url>http://localhost:8081/wsrp/wsrp4j/WSRPPortletManagementService</portlet-management-interface-url>
+ <name>WSRP4j</name>
+ <description>This is the test producer from the WSRP4J project.</description>
+ </producer>
+ </producers>
+</wsrp-config>
Propchange: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/wsrp-config.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/wsrp-config.xml
------------------------------------------------------------------------------
svn:keywords = Id
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/sitemap-auth.xmap
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/sitemap-auth.xmap?rev=264755&r1=264754&r2=264755&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/sitemap-auth.xmap (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/sitemap-auth.xmap Tue Aug 30 03:29:21 2005
@@ -184,6 +184,10 @@
<map:match pattern="proxy-**">
<map:read type="portal-proxy"/>
</map:match>
+ <!-- WSRP Resources -->
+ <map:match pattern="wsrprsc">
+ <map:read src="{request-param:wsrp-url}"/>
+ </map:match>
<map:match pattern="images/*.gif">
<map:read mime-type="image/gif" src="{portal-skin:skin.basepath}/images/{1}.gif"/>
</map:match>
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/sitemap.xmap?rev=264755&r1=264754&r2=264755&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/sitemap.xmap (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/sitemap.xmap Tue Aug 30 03:29:21 2005
@@ -157,6 +157,10 @@
<map:match pattern="proxy-**">
<map:read type="portal-proxy"/>
</map:match>
+ <!-- WSRP Resources -->
+ <map:match pattern="wsrprsc">
+ <map:read src="{request-param:wsrp-url}"/>
+ </map:match>
<map:match pattern="images/*.gif">
<map:read mime-type="image/gif" src="{portal-skin:skin.basepath}/images/{1}.gif"/>
</map:match>
Added: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/basic/css/wsrp.css
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/basic/css/wsrp.css?rev=264755&view=auto
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/basic/css/wsrp.css (added)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/basic/css/wsrp.css Tue Aug 30 03:29:21 2005
@@ -0,0 +1,65 @@
+/*
+* Copyright 2005 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.
+*/
+<!-- all css-specification of an (wsrp-)portlet -->
+
+<!-- Fonts -->
+portlet-font { font-size:10pt;}
+portlet-font-dim { }
+
+<!-- Messages -->
+portlet-msg-status { }
+portlet-msg-info { }
+portlet-msg-error { }
+portlet-msg-alert { }
+portlet-msg-success { }
+
+<!-- Sections -->
+portlet-section-header { }
+portlet-section-body { }
+portlet-section-alternate { }
+portlet-section-selected { }
+portlet-section-subheader { }
+portlet-section-footer { }
+portlet-section-text { }
+
+<!-- Tables -->
+portlet-table-header { }
+portlet-table-body { }
+portlet-table-alternate { }
+portlet-table-selected { }
+portlet-table-subheader { }
+portlet-table-footer { }
+portlet-table-text { }
+
+<!-- Forms -->
+portlet-form-label { }
+portlet-form-input-field { }
+portlet-form-button { }
+portlet-icon-label { }
+portlet-dlg-icon-label { }
+portlet-form-field-label { }
+portlet-form-field { }
+
+<!-- Menus -->
+portlet-menu { }
+portlet-menu-item { }
+portlet-menu-item-selected { }
+portlet-menu-item-hover { }
+portlet-menu-item-hover-selected { }
+portlet-menu-cascade-item { }
+portlet-menu-cascade-item-selected { }
+portlet-menu-description { }
+portlet-menu-caption { }
\ No newline at end of file
Propchange: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/basic/css/wsrp.css
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/basic/css/wsrp.css
------------------------------------------------------------------------------
svn:keywords = Id
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/basic/styles/portal-page.xsl
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/basic/styles/portal-page.xsl?rev=264755&r1=264754&r2=264755&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/basic/styles/portal-page.xsl (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/basic/styles/portal-page.xsl Tue Aug 30 03:29:21 2005
@@ -27,6 +27,7 @@
<head>
<title><xsl:value-of select="$title"/></title>
<link type="text/css" rel="stylesheet" href="{$base}css/page.css"/>
+ <link type="text/css" rel="stylesheet" href="{$base}css/wsrp.css"/>
</head>
<body>
<table bgColor="#ffffff" border="0" cellPadding="0" cellSpacing="0" width="100%">
Added: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/css/wsrp.css
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/css/wsrp.css?rev=264755&view=auto
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/css/wsrp.css (added)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/css/wsrp.css Tue Aug 30 03:29:21 2005
@@ -0,0 +1,65 @@
+/*
+* Copyright 2005 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.
+*/
+<!-- all css-specification of an (wsrp-)portlet -->
+
+<!-- Fonts -->
+portlet-font { font-size:10pt;}
+portlet-font-dim { }
+
+<!-- Messages -->
+portlet-msg-status { }
+portlet-msg-info { }
+portlet-msg-error { }
+portlet-msg-alert { }
+portlet-msg-success { }
+
+<!-- Sections -->
+portlet-section-header { }
+portlet-section-body { }
+portlet-section-alternate { }
+portlet-section-selected { }
+portlet-section-subheader { }
+portlet-section-footer { }
+portlet-section-text { }
+
+<!-- Tables -->
+portlet-table-header { }
+portlet-table-body { }
+portlet-table-alternate { }
+portlet-table-selected { }
+portlet-table-subheader { }
+portlet-table-footer { }
+portlet-table-text { }
+
+<!-- Forms -->
+portlet-form-label { }
+portlet-form-input-field { }
+portlet-form-button { }
+portlet-icon-label { }
+portlet-dlg-icon-label { }
+portlet-form-field-label { }
+portlet-form-field { }
+
+<!-- Menus -->
+portlet-menu { }
+portlet-menu-item { }
+portlet-menu-item-selected { }
+portlet-menu-item-hover { }
+portlet-menu-item-hover-selected { }
+portlet-menu-cascade-item { }
+portlet-menu-cascade-item-selected { }
+portlet-menu-description { }
+portlet-menu-caption { }
\ No newline at end of file
Propchange: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/css/wsrp.css
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/css/wsrp.css
------------------------------------------------------------------------------
svn:keywords = Id
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/portal-page.xsl
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/portal-page.xsl?rev=264755&r1=264754&r2=264755&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/portal-page.xsl (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/portal-page.xsl Tue Aug 30 03:29:21 2005
@@ -27,6 +27,7 @@
<head>
<title><xsl:value-of select="$title"/></title>
<link type="text/css" rel="stylesheet" href="{$base}css/page.css"/>
+ <link type="text/css" rel="stylesheet" href="{$base}css/wsrp.css"/>
</head>
<body>
<table bgColor="#ffffff" border="0" cellPadding="0" cellSpacing="0" width="100%"><tbody>
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/window.xsl
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/window.xsl?rev=264755&r1=264754&r2=264755&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/window.xsl (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/window.xsl Tue Aug 30 03:29:21 2005
@@ -85,6 +85,9 @@
</a>
</td>
</xsl:if>
+ <xsl:if test="edit-uri or view-uri or help-uri">
+ <td width="15"> </td>
+ </xsl:if>
<xsl:if test="fullscreen-uri and not(maximize-uri)">
<td width="15">
<a href="{fullscreen-uri}">
Modified: cocoon/branches/BRANCH_2_1_X/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/status.xml?rev=264755&r1=264754&r2=264755&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/status.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/status.xml Tue Aug 30 03:29:21 2005
@@ -197,6 +197,9 @@
<changes>
<release version="@version@" date="@date@">
<action dev="CZ" type="add">
+ Portal block: Add WSRP consumer support (through WSRP4J).
+ </action>
+ <action dev="CZ" type="add">
Add possibility to remove comments to all text based serializers and to cinclude transformer.
</action>
<action dev="AG" type="update">