cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r426912 [6/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...
Date Sun, 30 Jul 2006 18:41:50 GMT
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java
(original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java
Sun Jul 30 11:41:45 2006
@@ -49,9 +49,9 @@
 import org.apache.cocoon.portal.PortalManagerAspectPrepareContext;
 import org.apache.cocoon.portal.PortalManagerAspectRenderContext;
 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.CopletInstanceDataFeatures;
+import org.apache.cocoon.portal.coplet.CopletDefinition;
+import org.apache.cocoon.portal.coplet.CopletInstance;
+import org.apache.cocoon.portal.coplet.CopletInstanceFeatures;
 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;
@@ -229,12 +229,12 @@
      * and stores its into the copletInstanceData<br/>
      * After that it initiates the <tt>getServiceDescription()</tt>-call<br/>
      * 
-     * @see org.apache.cocoon.portal.coplet.adapter.impl.AbstractCopletAdapter#login(org.apache.cocoon.portal.coplet.CopletInstanceData)
+     * @see org.apache.cocoon.portal.coplet.adapter.impl.AbstractCopletAdapter#login(org.apache.cocoon.portal.coplet.CopletInstance)
      */
-    public void login(CopletInstanceData coplet) {
+    public void login(CopletInstance coplet) {
         super.login(coplet);
 
-        final CopletData copletData = coplet.getCopletData();
+        final CopletDefinition copletData = coplet.getCopletDefinition();
 
         // get the producer
         final String producerId = (String) copletData.getAttribute("producer-id");
@@ -319,9 +319,9 @@
      * Checks the values of the <tt>portlet-key</tt> and the <tt>user</tt>
for current portlet-instance<br/>
      * After that all passed the <tt>getMarkup()</tt>-call will be initiated<br
/>
      * 
-	 * @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, ContentHandler contentHandler) 
+	public void streamContent(CopletInstance coplet, ContentHandler contentHandler) 
     throws SAXException {
         try {
             // set the coplet in the thread local variable to give other components access
to
@@ -394,9 +394,9 @@
     /**
      * Releases all sessions (<tt>userSession, groupSession, portletSession</tt>)<br/>
      * 
-     * @see org.apache.cocoon.portal.coplet.adapter.impl.AbstractCopletAdapter#logout(org.apache.cocoon.portal.coplet.CopletInstanceData)
+     * @see org.apache.cocoon.portal.coplet.adapter.impl.AbstractCopletAdapter#logout(org.apache.cocoon.portal.coplet.CopletInstance)
      */
-    public void logout(CopletInstanceData coplet) {
+    public void logout(CopletInstance coplet) {
     	super.logout(coplet);
 
         PortletKey portletKey = (PortletKey)coplet.getTemporaryAttribute(ATTRIBUTE_NAME_PORTLET_KEY);
@@ -573,7 +573,7 @@
      * @return the unique string which represents the portlet-instance 
      * */
     protected String getPortletInstanceKey(PortletKey key, 
-                                           CopletInstanceData coplet,
+                                           CopletInstance coplet,
                                            String userName) {
         final StringBuffer buffer = new StringBuffer(key.getProducerId());
         buffer.append('_').append(key.getPortletHandle()).append('_');
@@ -591,7 +591,7 @@
      * @see Receiver
      */
     public void inform(WSRPEvent event, PortalService service) {
-        final CopletInstanceData coplet = event.getTarget();
+        final CopletInstance coplet = event.getTarget();
         this.setCurrentCopletInstanceData(coplet);
         
         try {
@@ -618,24 +618,24 @@
                 if ( !windowState.equals(windowSession.getWindowState()) ) {
                     
                     final Layout rootLayout = service.getProfileManager().getPortalLayout(null,
null);
-                    final Layout layout = CopletInstanceDataFeatures.searchLayout(coplet.getId(),
rootLayout);
+                    final Layout layout = CopletInstanceFeatures.searchLayout(coplet.getId(),
rootLayout);
                     final Layout fullScreenLayout = LayoutFeatures.getFullScreenInfo(rootLayout);
                     if ( fullScreenLayout != null 
                          && fullScreenLayout.equals( layout )
                          && !windowState.equals(WindowStates._maximized) ) {
-                        Event e = new CopletInstanceSizingEvent( coplet, CopletInstanceData.SIZE_FULLSCREEN
);
+                        Event e = new CopletInstanceSizingEvent( coplet, CopletInstance.SIZE_FULLSCREEN
);
                         service.getEventManager().send(e);
                     }
                     if ( windowState.equals(WindowStates._minimized) ) {
-                        Event e = new CopletInstanceSizingEvent(coplet, CopletInstanceData.SIZE_MINIMIZED);
+                        Event e = new CopletInstanceSizingEvent(coplet, CopletInstance.SIZE_MINIMIZED);
                         service.getEventManager().send(e);
                     }
                     if ( windowState.equals(WindowStates._normal) ) {
-                        Event e = new CopletInstanceSizingEvent(coplet, CopletInstanceData.SIZE_NORMAL);
+                        Event e = new CopletInstanceSizingEvent(coplet, CopletInstance.SIZE_NORMAL);
                         service.getEventManager().send(e);
                     }
                     if ( windowState.equals(WindowStates._maximized) ) {
-                        Event e = new CopletInstanceSizingEvent( coplet, CopletInstanceData.SIZE_FULLSCREEN
);
+                        Event e = new CopletInstanceSizingEvent( coplet, CopletInstance.SIZE_FULLSCREEN
);
                         service.getEventManager().send(e);
                     }
                     windowSession.setWindowState(windowState);
@@ -702,7 +702,7 @@
      * 
      * @param coplet The coplet instance data or null to clear the information.
      */
-    public void setCurrentCopletInstanceData(CopletInstanceData coplet) {
+    public void setCurrentCopletInstanceData(CopletInstance coplet) {
         this.copletInstanceData.set(coplet);
     }
 
@@ -711,8 +711,8 @@
      * 
      * @return Returns the instance or null.
      */
-    public CopletInstanceData getCurrentCopletInstanceData() {
-        return (CopletInstanceData)this.copletInstanceData.get();
+    public CopletInstance getCurrentCopletInstanceData() {
+        return (CopletInstance)this.copletInstanceData.get();
     }
 
     /**
@@ -837,9 +837,9 @@
     }
 
     /**
-     * @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 PortletKey portletKey = (PortletKey)copletInstanceData.getTemporaryAttribute(WSRPAdapter.ATTRIBUTE_NAME_PORTLET_KEY);
 
@@ -897,9 +897,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 PortletKey portletKey = (PortletKey)copletInstanceData.getTemporaryAttribute(WSRPAdapter.ATTRIBUTE_NAME_PORTLET_KEY);
 
@@ -958,9 +958,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 PortletKey portletKey = (PortletKey)copletInstanceData.getTemporaryAttribute(WSRPAdapter.ATTRIBUTE_NAME_PORTLET_KEY);
 

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPEvent.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPEvent.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPEvent.java
(original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPEvent.java
Sun Jul 30 11:41:45 2006
@@ -17,7 +17,7 @@
 
 import java.util.Map;
 
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
 import org.apache.cocoon.portal.event.CopletInstanceEvent;
 
 /**
@@ -29,7 +29,7 @@
     implements CopletInstanceEvent {
 
     /** The corresponding coplet instance data. */
-    protected final CopletInstanceData coplet;
+    protected final CopletInstance coplet;
 
     /** The parameters for the wsrp url. */
     protected final Map producerParams;
@@ -40,7 +40,7 @@
      * @param coplet corresponding coplet instance data
      * @param pParams producer-parameters
      */
-    public WSRPEvent(CopletInstanceData coplet, Map pParams) {
+    public WSRPEvent(CopletInstance coplet, Map pParams) {
         this.coplet = coplet;
         this.producerParams = pParams;
     }
@@ -48,7 +48,7 @@
     /**
      * @see org.apache.cocoon.portal.event.CopletInstanceEvent#getTarget()
      */
-    public CopletInstanceData getTarget() {
+    public CopletInstance getTarget() {
         return this.coplet;
     }
 

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPEventAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPEventAspect.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPEventAspect.java
(original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPEventAspect.java
Sun Jul 30 11:41:45 2006
@@ -23,7 +23,7 @@
 import org.apache.cocoon.environment.ObjectModelHelper;
 import org.apache.cocoon.environment.Request;
 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.aspect.EventAspect;
 import org.apache.cocoon.portal.event.aspect.EventAspectContext;
@@ -55,7 +55,7 @@
                 }
             }
             final String copletid = values[0];
-            final CopletInstanceData cid = service.getProfileManager().getCopletInstanceData(copletid);
+            final CopletInstance cid = service.getProfileManager().getCopletInstanceData(copletid);
 
             final Event e = new WSRPEvent(cid, parameters);
             service.getEventManager().send(e);

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/ConsumerEnvironmentImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/ConsumerEnvironmentImpl.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/ConsumerEnvironmentImpl.java
(original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/ConsumerEnvironmentImpl.java
Sun Jul 30 11:41:45 2006
@@ -21,7 +21,7 @@
 import org.apache.avalon.framework.container.ContainerUtil;
 import org.apache.avalon.framework.parameters.Parameters;
 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.wsrp.adapter.WSRPAdapter;
 import org.apache.wsrp4j.consumer.PortletDriverRegistry;
 import org.apache.wsrp4j.consumer.PortletRegistry;
@@ -127,7 +127,7 @@
      * @see org.apache.wsrp4j.consumer.driver.GenericConsumerEnvironment#getSupportedLocales()
      */
     public String[] getSupportedLocales() {
-        CopletInstanceData coplet = this.adapter.getCurrentCopletInstanceData();
+        CopletInstance coplet = this.adapter.getCurrentCopletInstanceData();
         User user = (User)coplet.getTemporaryAttribute(WSRPAdapter.ATTRIBUTE_NAME_USER);
         
         return ((UserContextExtension)user.getUserContext()).getSupportedLocales();
@@ -137,7 +137,7 @@
      * @see org.apache.wsrp4j.consumer.ConsumerCapabilities#getUserAuthentication()
      */
     public String getUserAuthentication() {
-        CopletInstanceData coplet = this.adapter.getCurrentCopletInstanceData();
+        CopletInstance coplet = this.adapter.getCurrentCopletInstanceData();
         User user = (User)coplet.getTemporaryAttribute(WSRPAdapter.ATTRIBUTE_NAME_USER);
         
         return ((UserContextExtension)user.getUserContext()).getUserAuthentication();

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/URLGeneratorImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/URLGeneratorImpl.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/URLGeneratorImpl.java
(original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/URLGeneratorImpl.java
Sun Jul 30 11:41:45 2006
@@ -20,7 +20,7 @@
 import java.util.Map;
 
 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.wsrp.adapter.WSRPAdapter;
 import org.apache.cocoon.portal.wsrp.adapter.WSRPEventAspect;
 import org.apache.wsrp4j.consumer.URLGenerator;
@@ -94,7 +94,7 @@
      * @see org.apache.wsrp4j.consumer.URLGenerator#getNamespacedToken(java.lang.String)
      */
     public String getNamespacedToken(String token) {
-        final CopletInstanceData coplet = this.adapter.getCurrentCopletInstanceData();
+        final CopletInstance coplet = this.adapter.getCurrentCopletInstanceData();
         return coplet.getId();
     }
 
@@ -113,7 +113,7 @@
         if ( "true".equalsIgnoreCase((String)params.get(Constants.SECURE_URL)) ) { 
             secureLink = Boolean.TRUE;
         }
-        final CopletInstanceData coplet = this.adapter.getCurrentCopletInstanceData();
+        final CopletInstance coplet = this.adapter.getCurrentCopletInstanceData();
         params.put(WSRPEventAspect.REQUEST_PARAMETER_NAME, coplet.getId());
         final StringBuffer buffer = new StringBuffer(this.service.getLinkService().getRefreshLinkURI(secureLink));
         boolean hasParams = buffer.indexOf("?") > 0;

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/URLTemplateComposerImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/URLTemplateComposerImpl.java?rev=426912&r1=426911&r2=426912&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/URLTemplateComposerImpl.java
(original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/consumer/URLTemplateComposerImpl.java
Sun Jul 30 11:41:45 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.cocoon.portal.wsrp.consumer;
 
-import org.apache.cocoon.portal.coplet.CopletInstanceData;
+import org.apache.cocoon.portal.coplet.CopletInstance;
 import org.apache.cocoon.portal.wsrp.adapter.WSRPAdapter;
 import org.apache.wsrp4j.consumer.URLGenerator;
 import org.apache.wsrp4j.consumer.URLTemplateComposer;
@@ -242,7 +242,7 @@
      * @see org.apache.wsrp4j.consumer.URLTemplateComposer#getNamespacePrefix()
      */
     public String getNamespacePrefix() {
-        final CopletInstanceData coplet = this.adapter.getCurrentCopletInstanceData();
+        final CopletInstance coplet = this.adapter.getCurrentCopletInstanceData();
         return coplet.getId();
     }
 



Mime
View raw message