cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r365578 [2/2] - in /cocoon/blocks: portal-sample/trunk/samples/conf/ portal-sample/trunk/samples/resources/ portal/trunk/java/org/apache/cocoon/portal/ portal/trunk/java/org/apache/cocoon/portal/acting/ portal/trunk/java/org/apache/cocoon/p...
Date Tue, 03 Jan 2006 08:35:52 GMT
Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/transformation/NewEventLinkTransformer.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/transformation/NewEventLinkTransformer.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/transformation/NewEventLinkTransformer.java
(original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/transformation/NewEventLinkTransformer.java
Tue Jan  3 00:34:59 2006
@@ -147,7 +147,7 @@
             CopletInstanceData cid = this.getCopletInstanceData(attributes.getValue("coplet"));
             // create event link
             CopletLinkEvent event = new CopletLinkEvent(cid, link);
-            String eventLink = this.portalService.getComponentManager().getLinkService().getLinkURI(event);
+            String eventLink = this.portalService.getLinkService().getLinkURI(event);
 
             //form elements need hidden inputs to change request parameters
             if (formSpecialTreatment) {

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java
(original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java
Tue Jan  3 00:34:59 2006
@@ -237,7 +237,7 @@
 
             // append all parameters of the current request, except internal ones
             final Enumeration enumeration = request.getParameterNames();
-            final LinkService linkService = this.portalService.getComponentManager().getLinkService();
+            final LinkService linkService = this.portalService.getLinkService();
             while (enumeration.hasMoreElements()) {
                 String paramName = (String) enumeration.nextElement();
 
@@ -590,7 +590,7 @@
                     throw new ProcessingException("copletId and portalName must be passed
as parameter or in the object model within the parent context.");
                 }
             }
-            return portalService.getComponentManager().getProfileManager().getCopletInstanceData(copletId);
+            return portalService.getProfileManager().getCopletInstanceData(copletId);
         } catch (ServiceException e) {
             throw new ProcessingException("Error getting portal service.", e);
         } finally {

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java
(original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java
Tue Jan  3 00:34:59 2006
@@ -267,7 +267,7 @@
         }
 
         // get the wsrp user and store it as an attribute on the instance
-        final String currentUserID = this.portalService.getComponentManager().getProfileManager().getUser().getUserName();
      
+        final String currentUserID = this.portalService.getProfileManager().getUser().getUserName();
      
         User user = this.consumerEnvironment.getUserRegistry().getUser(currentUserID);
         if ( user == null ) {
             // create a new user
@@ -633,25 +633,25 @@
             if (windowState != null) {
                 if ( !windowState.equals(windowSession.getWindowState()) ) {
                     final Layout layout = (Layout)coplet.getTemporaryAttribute(ATTRIBUTE_NAME_LAYOUT);
-                    final Layout rootLayout = service.getComponentManager().getProfileManager().getPortalLayout(null,
null);
+                    final Layout rootLayout = service.getProfileManager().getPortalLayout(null,
null);
                     final Layout fullScreenLayout = LayoutFeatures.getFullScreenInfo(rootLayout);
                     if ( fullScreenLayout != null 
                          && fullScreenLayout.equals( layout )
                          && !windowState.equals(WindowStates._maximized) ) {
                         Event e = new CopletInstanceSizingEvent( coplet, CopletInstanceData.SIZE_FULLSCREEN
);
-                        service.getComponentManager().getEventManager().send(e);
+                        service.getEventManager().send(e);
                     }
                     if ( windowState.equals(WindowStates._minimized) ) {
                         Event e = new CopletInstanceSizingEvent(coplet, CopletInstanceData.SIZE_MINIMIZED);
-                        service.getComponentManager().getEventManager().send(e);
+                        service.getEventManager().send(e);
                     }
                     if ( windowState.equals(WindowStates._normal) ) {
                         Event e = new CopletInstanceSizingEvent(coplet, CopletInstanceData.SIZE_NORMAL);
-                        service.getComponentManager().getEventManager().send(e);
+                        service.getEventManager().send(e);
                     }
                     if ( windowState.equals(WindowStates._maximized) ) {
                         Event e = new CopletInstanceSizingEvent( coplet, CopletInstanceData.SIZE_FULLSCREEN
);
-                        service.getComponentManager().getEventManager().send(e);
+                        service.getEventManager().send(e);
                     }
                     windowSession.setWindowState(windowState);
                 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/adapter/WSRPEventAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/adapter/WSRPEventAspect.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/adapter/WSRPEventAspect.java
(original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/adapter/WSRPEventAspect.java
Tue Jan  3 00:34:59 2006
@@ -55,10 +55,10 @@
                 }
             }
             final String copletid = values[0];
-            final CopletInstanceData cid = service.getComponentManager().getProfileManager().getCopletInstanceData(copletid);
+            final CopletInstanceData cid = service.getProfileManager().getCopletInstanceData(copletid);
 
             final Event e = new WSRPEvent(cid, parameters);
-            service.getComponentManager().getEventManager().send(e);
+            service.getEventManager().send(e);
         }
         context.invokeNext(service);
     }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/adapter/WSRPPortletWindowAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/adapter/WSRPPortletWindowAspect.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/adapter/WSRPPortletWindowAspect.java
(original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/adapter/WSRPPortletWindowAspect.java
Tue Jan  3 00:34:59 2006
@@ -99,7 +99,7 @@
      */
     public void initialize() throws Exception {
         super.initialize();
-        this.adapter = (WSRPAdapter)this.portalService.getComponentManager().getCopletAdapter(this.adapterName);
+        this.adapter = (WSRPAdapter)this.portalService.getCopletAdapter(this.adapterName);
         if ( this.adapter != null ) {
             this.environment = this.adapter.getConsumerEnvironment();
         }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/consumer/PortletDriverImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/consumer/PortletDriverImpl.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/consumer/PortletDriverImpl.java
(original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/consumer/PortletDriverImpl.java
Tue Jan  3 00:34:59 2006
@@ -246,7 +246,7 @@
             clientData.setUserAgent(producer.getRegistrationData().getConsumerAgent());
         }
         markupParams.setClientData(clientData);
-        markupParams.setSecureClientCommunication(this.service.getComponentManager().getLinkService().isSecure());
+        markupParams.setSecureClientCommunication(this.service.getLinkService().isSecure());
         markupParams.setLocales(consumerEnv.getSupportedLocales());
 
         markupParams.setMimeTypes(consumerEnv.getMimeTypes());

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/consumer/URLGeneratorImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/consumer/URLGeneratorImpl.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/consumer/URLGeneratorImpl.java
(original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/consumer/URLGeneratorImpl.java
Tue Jan  3 00:34:59 2006
@@ -115,7 +115,7 @@
         }
         final CopletInstanceData coplet = this.adapter.getCurrentCopletInstanceData();
         params.put(WSRPEventAspect.REQUEST_PARAMETER_NAME, coplet.getId());
-        final StringBuffer buffer = new StringBuffer(this.service.getComponentManager().getLinkService().getRefreshLinkURI(secureLink));
+        final StringBuffer buffer = new StringBuffer(this.service.getLinkService().getRefreshLinkURI(secureLink));
         boolean hasParams = buffer.indexOf("?") > 0;
         Iterator i = params.entrySet().iterator();
         while ( i.hasNext() ) {



Mime
View raw message