portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject cvs commit: jakarta-jetspeed-2/components/cm/src/java/org/apache/jetspeed/components ComponentManager.java
Date Sun, 06 Jun 2004 01:48:52 GMT
taylor      2004/06/05 18:48:52

  Modified:    portal/test/testdata/deploy jetspeed-portlet.xml
               portal/src/webapp/WEB-INF/pages pam.psml
               portal/src/webapp/WEB-INF/assembly jetspeed.groovy
               portal/src/webapp/WEB-INF portlet.xml
               components/cm/src/java/org/apache/jetspeed/components
                        ComponentManager.java
  Removed:     portal/src/webapp/pages/pam pam-browser.jsp pam-detail.jsp
               portal/src/java/org/apache/jetspeed/portlets/pam
                        PortletApplicationBrowser.java
                        PortletApplicationDetail.java
  Log:
  removed PAM portlets and resources from /portal project
  
  CVS: ----------------------------------------------------------------------
  CVS: PR:
  CVS:   If this change addresses a PR in the problem report tracking
  CVS:   database, then enter the PR number(s) here.
  CVS: Obtained from:
  CVS:   If this change has been taken from another system, such as NCSA,
  CVS:   then name the system in this line, otherwise delete it.
  CVS: Submitted by:
  CVS:   If this code has been contributed to Apache by someone else; i.e.,
  CVS:   they sent us a patch or a new module, then include their name/email
  CVS:   address here. If this is your work then delete this line.
  CVS: Reviewed by:
  CVS:   If we are doing pre-commit code reviews and someone else has
  CVS:   reviewed your changes, include their name(s) here.
  CVS:   If you have not had it reviewed then delete this line.
  
  Revision  Changes    Path
  1.5       +4 -0      jakarta-jetspeed-2/portal/test/testdata/deploy/jetspeed-portlet.xml
  
  Index: jetspeed-portlet.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/test/testdata/deploy/jetspeed-portlet.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- jetspeed-portlet.xml	5 Jun 2004 20:11:42 -0000	1.4
  +++ jetspeed-portlet.xml	6 Jun 2004 01:48:52 -0000	1.5
  @@ -37,6 +37,10 @@
       <dc:type>Default Type</dc:type>
       <js:metadata name="my_metadata" xml:lang="en">English My_Metadata</js:metadata>
       
  +    <services>
  +    	<service name='PortletRegistryComponent'/>
  +    </services>
  +    
       <portlet>
           <portlet-name>HelloWorld Portlet</portlet-name>
           <dc:title>HelloWorldTitle</dc:title>
  
  
  
  1.3       +1 -1      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/pam.psml
  
  Index: pam.psml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/pages/pam.psml,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- pam.psml	6 Apr 2004 19:56:54 -0000	1.2
  +++ pam.psml	6 Jun 2004 01:48:52 -0000	1.3
  @@ -1,2 +1,2 @@
   <!--
Copyright 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.
-->
  -<page id="pam">
  <defaults
     skin="orange"
     layout-decorator="jetspeed"
    portlet-decorator="jetspeed"
  />
  <title>Portlet Application Manager</title>
 <fragment id="2" type="layout" name="jetspeed::VelocityTwoColumns">
    <fragment
id="13" type="portlet" name="jetspeed::PortletApplicationBrowser" decorator="minty-blue">
     <property layout="TwoColumns" name="row" value="0" />
      <property layout="TwoColumns"
name="column" value="0" />
    </fragment>
    <fragment id="14" type="portlet"
name="jetspeed::PortletApplicationDetail" decorator="minty-blue">
      <property layout="TwoColumns"
name="row" value="0" />
      <property layout="TwoColumns" name="column" value="1"
/>
    </fragment>
  </fragment>
</page>
  \ No newline at end of file
  +<page id="pam">
  <defaults
     skin="orange"
     layout-decorator="jetspeed"
    portlet-decorator="jetspeed"
  />
  <title>Portlet Application Manager</title>
 <fragment id="2" type="layout" name="jetspeed::VelocityTwoColumns">
    <fragment
id="13" type="portlet" name="pam::PortletApplicationBrowser" decorator="minty-blue">
 
    <property layout="TwoColumns" name="row" value="0" />
      <property layout="TwoColumns"
name="column" value="0" />
    </fragment>
    <fragment id="14" type="portlet"
name="pam::PortletApplicationDetail" decorator="minty-blue">
      <property layout="TwoColumns"
name="row" value="0" />
      <property layout="TwoColumns" name="column" value="1"
/>
    </fragment>
  </fragment>
</page>
  \ No newline at end of file
  
  
  
  1.40      +29 -19    jakarta-jetspeed-2/portal/src/webapp/WEB-INF/assembly/jetspeed.groovy
  
  Index: jetspeed.groovy
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/assembly/jetspeed.groovy,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- jetspeed.groovy	28 May 2004 19:53:03 -0000	1.39
  +++ jetspeed.groovy	6 Jun 2004 01:48:52 -0000	1.40
  @@ -104,9 +104,11 @@
   import org.apache.jetspeed.container.PortletContainerWrapper
   import org.apache.jetspeed.container.JetspeedPortletContainerWrapper
   
  +import org.apache.jetspeed.services.PortletServices
  +import org.apache.jetspeed.services.JetspeedPortletServices
          
   /* **********************************************************
  - *  U T I L L I T Y   C L O S U R E S                                                 
   *
  + *  U T I L L I T Y   C L O S U R E S                       *
    * ******************************************************** */
    
    // This creates a single component instance per thread
  @@ -156,7 +158,13 @@
   container = new DefaultPicoContainer()
   
   /* **********************************************************
  - *  Template Locators                                                                 
    *
  + *  Portlet Services                                        *
  + * ******************************************************** */
  +services = new JetspeedPortletServices()
  +container.registerComponentInstance("PortalServices", services)
  +
  +/* **********************************************************
  + *  Template Locators                                       *
    * ******************************************************** */
   roots = [ applicationRoot + "WEB-INF/templates" ]
   container.registerComponentInstance("TemplateLocator", new JetspeedTemplateLocator(roots,
applicationRoot))
  @@ -165,7 +173,7 @@
   container.registerComponentInstance("DecorationLocator", new JetspeedTemplateLocator(decorationRoots,
applicationRoot))
   
   /* **********************************************************
  - *  ID Generator                                                                      
        *
  + *  ID Generator                                            *
    * ******************************************************** */
   Long counterStart = 65536
   peidPrefix = "P-"
  @@ -174,7 +182,7 @@
   container.registerComponentInstance("IdGenerator", idgenerator)
   
   /* **********************************************************
  - *  Page Manager                                                                      
      *
  + *  Page Manager                                            *
    * ******************************************************** */
   root = applicationRoot + "/WEB-INF/pages"
   Long scanRate = 120
  @@ -184,7 +192,7 @@
   container.registerComponentInstance(PageManager, pageManager)
   
   /* **********************************************************
  - *  JNDI and Pooled Datasource                                                        *
  + *  JNDI and Pooled Datasource                              *
    * ******************************************************** */
    
   if(Boolean.getBoolean("portal.use.internal.jndi"))
  @@ -213,14 +221,14 @@
   
   
   /* **********************************************************
  - * Persistence Store: as a thread safe per thread component           *
  + * Persistence Store: as a thread safe per thread component *
    * ******************************************************** */
   
   container.registerComponent(makeThreadLocalAdapter(PersistenceStore, PBStore,  new Parameter[]{new
ConstantParameter("jetspeed")}))
   
   
   /* **********************************************************
  - *  Porlet Registry                                                                   
        *
  + *  Porlet Registry                                         *
    * ******************************************************** */
    container.registerComponentImplementation(
                               PortletRegistryComponent, 
  @@ -228,8 +236,10 @@
                               doParams([cmpParam(PersistenceStore)])
   )
   
  +services.addPortletService("PortletRegistryComponent", container.getComponentInstance(PortletRegistryComponent))
  +
   /* **********************************************************
  - *  Portlet Entity                                                                    
           *
  + *  Portlet Entity                                          *
    * ******************************************************** */
   container.registerComponentImplementation(
                              PortletEntityAccessComponent, 
  @@ -238,7 +248,7 @@
   )
   
   /* **********************************************************
  - *  Profiler                                                                          
             *
  + *  Profiler                                                *
    * ******************************************************** */
   container.registerComponentImplementation(
                          Profiler, 
  @@ -247,7 +257,7 @@
   )
   
   /* **********************************************************
  - *  Capabilities                                                                      
          *
  + *  Capabilities                                            *
    * ******************************************************** */
   container.registerComponentImplementation(
                         Capabilities, 
  @@ -256,7 +266,7 @@
   )
   
   /* **********************************************************
  - *  Preferences  & Properites (java.util.prefs implemnetation)           *
  + *  Preferences  & Properites (java.util.prefs implemnetation)           
    * ******************************************************** */
   container.registerComponentImplementation(
   	                      PropertyManager, 
  @@ -274,7 +284,7 @@
   
   
   /* **********************************************************
  - *  Security                                                                          
           *
  + *  Security                                                *
    * ******************************************************** */
   container.registerComponentImplementation(
                        UserManager, 
  @@ -320,7 +330,7 @@
   container.getComponentInstanceOfType(SecurityProviderImpl)
   
   /* **********************************************************
  - *  User Info                                                                         
           *
  + *  User Info                                               *
    * ******************************************************** */
   container.registerComponentImplementation(
                         UserInfoManager, 
  @@ -329,7 +339,7 @@
   )
   
   /* **********************************************************
  - *   Navigational State component                                                    *
  + *   Navigational State component                           *
    * ******************************************************** */
   // navigationKeys: prefix, action, mode, state, renderparam, pid, prev_mode, prev_state,
key_delim
   // navigationKeys = "_,ac,md,st,rp,pid,pm,ps,:"
  @@ -354,7 +364,7 @@
   )
   
   /* **********************************************************
  - *  Request Context component                                                        *
  + *  Request Context component                               *
    * ******************************************************** */
   requestContextClass = "org.apache.jetspeed.request.JetspeedRequestContext"
   container.registerComponentImplementation(
  @@ -369,7 +379,7 @@
   
   
   /* **********************************************************
  - *  Portlet Window component                                                          *
  + *  Portlet Window component                                *
    * ******************************************************** */
   container.registerComponentImplementation(
                         PortletWindowAccessor, 
  @@ -378,7 +388,7 @@
   )
   
   /* **********************************************************
  - *  Portlet Container                                                                 
       *
  + *  Portlet Container                                       *
    * ******************************************************** */
   container.registerComponentInstance("Pluto", new PortletContainerImpl())
   
  @@ -389,7 +399,7 @@
   )
   
   /* **********************************************************
  - *  Portlet Container                                                                 
       *
  + *  Portlet Container                                       *
    * ******************************************************** */
   container.registerComponentImplementation(
                         PortletRenderer, 
  @@ -398,7 +408,7 @@
   )
   
   /* **********************************************************
  - *  Aggregation                                                                       
        *
  + *  Aggregation                                             *
    * ******************************************************** */
   container.registerComponentImplementation(
                         PageAggregator, 
  
  
  
  1.10      +1 -1      jakarta-jetspeed-2/portal/src/webapp/WEB-INF/portlet.xml
  
  Index: portlet.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/webapp/WEB-INF/portlet.xml,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- portlet.xml	18 May 2004 19:51:39 -0000	1.9
  +++ portlet.xml	6 Jun 2004 01:48:52 -0000	1.10
  @@ -1 +1 @@
  -<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 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.
-->

<portlet-app
id="jetspeed" version="1.0">
    <portlet id="TwoColumns">
    <portlet-name>TwoColumns</portlet-name>
   <display-name>Two Columns Layout</display-name>
    <init-param>
   
  <name>ViewPage</name>
      <value>/WEB-INF/layout/columns.jsp</value>
   </init-param>
    <init-param>
      <name>columns</name>
    
 <value>2</value>
    </init-param>
    <init-param>
      <name>sizes</name>
     <value>50%,50%</value>
    </init-param>
    <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
   <expiration-cache>-1</expiration-cache>
    <supports>
      <mime-type>text/html</mime-type>
     <portlet-mode>VIEW</portlet-mode>
    </supports>
    <portlet-info>
     <title>TwoColumns</title>
      <short-title>TwoColumns</short-title>
   </portlet-info>
</portlet>

<portlet id="VelocityTwoColumns">
    <portlet-name>VelocityTwoColumns</portlet-name>
   <display-name>Two Columns Layout Using Velocity</display-name>
    <init-param>
     <name>ViewPage</name>
      <value>columns</value>
    </init-param>
   <init-param>
      <name>MaxPage</name>
      <value>maximized</value>
   </init-param>
    <init-param>
      <name>columns</name>
    
 <value>2</value>
    </init-param>
    <init-param>
      <name>sizes</name>
     <value>50%,50%</value>
    </init-param>
    <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
   <expiration-cache>-1</expiration-cache>
    <supports>
      <mime-type>text/html</mime-type>
     <portlet-mode>VIEW</portlet-mode>
    </supports>
    <portlet-info>
     <title>VelocityTwoColumns</title>
      <short-title>TwoColumns</short-title>
   </portlet-info>
</portlet>

<portlet id="PortletApplicationBrowser">
   <init-param>
    	<description>This parameter sets the template used in view
mode.</description>
		<name>ViewPage</name>
			<value>/pages/pam/pam-browser.jsp</value>
    </init-param>   
    <portlet-name>PortletApplicationBrowser</portlet-name>
   <display-name>Portlet Application Browser</display-name>
    <description>The
PAM (Portlet Application Manager) Portlet Application Browser displays a list of portlet applications
deployed to this portal. From here you can add, edit, and delete portlet applications.</description>
   <portlet-class>org.apache.jetspeed.portlets.pam.PortletApplicationBrowser</portlet-class>
   <expiration-cache>-1</expiration-cache>
    <supports>
      <mime-type>text/html</mime-type>
     <portlet-mode>EDIT</portlet-mode>
      <portlet-mode>VIEW</portlet-mode>
     <portlet-mode>HELP</portlet-mode>
    </supports>
    <portlet-info>
     <title>Portlet Application Browser</title>
      <short-title>Apps</short-title>
     <keywords>applications,apps,PAM</keywords>
    </portlet-info>
</portlet>





<portlet
id="PortletApplicationDetail">
    <init-param>
      <description>This parameter
sets the template used in view mode.</description>
      <name>ViewPage</name>
     <value>/pages/pam/pam-detail.jsp</value>
    </init-param>   
    <portlet-name>PortletApplicationDetail</portlet-name>
   <display-name>Portlet Application Detail</display-name>
    <description>The
PAM (Portlet Application Manager) Portlet Application Detail displays a specific portlet application
deployed to this portal. From here you can add, edit, and delete this portlet application.</description>
   <portlet-class>org.apache.jetspeed.portlets.pam.PortletApplicationDetail</portlet-class>
   <expiration-cache>-1</expiration-cache>
    <supports>
      <mime-type>text/html</mime-type>
     <portlet-mode>EDIT</portlet-mode>
      <portlet-mode>VIEW</portlet-mode>
     <portlet-mode>HELP</portlet-mode>
    </supports>
    <portlet-info>
     <title>Portlet Application Detail</title>
      <short-title>PAD</short-title>
     <keywords>applications,apps,PAM,PAD</keywords>
    </portlet-info>
 </portlet>

</portlet-app>

  \ No newline at end of file
  +<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 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.
-->

<portlet-app
id="jetspeed" version="1.0">
    <portlet id="TwoColumns">
    <portlet-name>TwoColumns</portlet-name>
   <display-name>Two Columns Layout</display-name>
    <init-param>
   
  <name>ViewPage</name>
      <value>/WEB-INF/layout/columns.jsp</value>
   </init-param>
    <init-param>
      <name>columns</name>
    
 <value>2</value>
    </init-param>
    <init-param>
      <name>sizes</name>
     <value>50%,50%</value>
    </init-param>
    <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
   <expiration-cache>-1</expiration-cache>
    <supports>
      <mime-type>text/html</mime-type>
     <portlet-mode>VIEW</portlet-mode>
    </supports>
    <portlet-info>
     <title>TwoColumns</title>
      <short-title>TwoColumns</short-title>
   </portlet-info>
</portlet>

<portlet id="VelocityTwoColumns">
    <portlet-name>VelocityTwoColumns</portlet-name>
   <display-name>Two Columns Layout Using Velocity</display-name>
    <init-param>
     <name>ViewPage</name>
      <value>columns</value>
    </init-param>
   <init-param>
      <name>MaxPage</name>
      <value>maximized</value>
   </init-param>
    <init-param>
      <name>columns</name>
    
 <value>2</value>
    </init-param>
    <init-param>
      <name>sizes</name>
     <value>50%,50%</value>
    </init-param>
    <portlet-class>org.apache.jetspeed.portlets.layout.MultiColumnPortlet</portlet-class>
   <expiration-cache>-1</expiration-cache>
    <supports>
      <mime-type>text/html</mime-type>
     <portlet-mode>VIEW</portlet-mode>
    </supports>
    <portlet-info>
     <title>VelocityTwoColumns</title>
      <short-title>TwoColumns</short-title>
   </portlet-info>
</portlet>

</portlet-app>

  \ No newline at end of file
  
  
  
  1.5       +1 -2      jakarta-jetspeed-2/components/cm/src/java/org/apache/jetspeed/components/ComponentManager.java
  
  Index: ComponentManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/components/cm/src/java/org/apache/jetspeed/components/ComponentManager.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ComponentManager.java	8 Mar 2004 00:42:51 -0000	1.4
  +++ ComponentManager.java	6 Jun 2004 01:48:52 -0000	1.5
  @@ -41,7 +41,6 @@
    */
   public class ComponentManager extends NanoContainer implements ComponentManagement, ContainerManagement
   {
  -    
       private MutablePicoContainer rootContainer;
   
       /**
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jetspeed-dev-help@jakarta.apache.org


Mime
View raw message