geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmcma...@apache.org
Subject svn commit: r551062 - in /geronimo/sandbox/portals: ./ geronimo-pluto/ geronimo-pluto/src/ geronimo-pluto/src/main/ geronimo-pluto/src/main/java/ geronimo-pluto/src/main/java/org/ geronimo-pluto/src/main/java/org/apache/ geronimo-pluto/src/main/java/or...
Date Wed, 27 Jun 2007 05:57:52 GMT
Author: pmcmahan
Date: Tue Jun 26 22:57:50 2007
New Revision: 551062

URL: http://svn.apache.org/viewvc?view=rev&rev=551062
Log:
make pluto's container services available from a gbean.  this gbean allows new pages
to be dynamically added and removed from the portal's navigator.

Added:
    geronimo/sandbox/portals/geronimo-pluto/
    geronimo/sandbox/portals/geronimo-pluto/LICENSE.txt
    geronimo/sandbox/portals/geronimo-pluto/NOTICE.txt
    geronimo/sandbox/portals/geronimo-pluto/pom.xml
    geronimo/sandbox/portals/geronimo-pluto/src/
    geronimo/sandbox/portals/geronimo-pluto/src/main/
    geronimo/sandbox/portals/geronimo-pluto/src/main/java/
    geronimo/sandbox/portals/geronimo-pluto/src/main/java/org/
    geronimo/sandbox/portals/geronimo-pluto/src/main/java/org/apache/
    geronimo/sandbox/portals/geronimo-pluto/src/main/java/org/apache/geronimo/
    geronimo/sandbox/portals/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/
    geronimo/sandbox/portals/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/PortalContainerServices.java
    geronimo/sandbox/portals/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/PortalContainerServicesGBean.java
    geronimo/sandbox/portals/geronimo-pluto/src/main/resources/
    geronimo/sandbox/portals/geronimo-pluto/src/main/resources/ToolTips.properties
Modified:
    geronimo/sandbox/portals/pluto-container/pom.xml
    geronimo/sandbox/portals/pluto-container/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/sandbox/portals/pluto-container/src/plan/plan.xml
    geronimo/sandbox/portals/pluto-portal/pom.xml
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-services-config.xml
    geronimo/sandbox/portals/pom.xml

Added: geronimo/sandbox/portals/geronimo-pluto/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/geronimo-pluto/LICENSE.txt?view=auto&rev=551062
==============================================================================
--- geronimo/sandbox/portals/geronimo-pluto/LICENSE.txt (added)
+++ geronimo/sandbox/portals/geronimo-pluto/LICENSE.txt Tue Jun 26 22:57:50 2007
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   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.
+

Added: geronimo/sandbox/portals/geronimo-pluto/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/geronimo-pluto/NOTICE.txt?view=auto&rev=551062
==============================================================================
--- geronimo/sandbox/portals/geronimo-pluto/NOTICE.txt (added)
+++ geronimo/sandbox/portals/geronimo-pluto/NOTICE.txt Tue Jun 26 22:57:50 2007
@@ -0,0 +1,5 @@
+Apache Geronimo 
+Copyright 2003-2006 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).

Added: geronimo/sandbox/portals/geronimo-pluto/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/geronimo-pluto/pom.xml?view=auto&rev=551062
==============================================================================
--- geronimo/sandbox/portals/geronimo-pluto/pom.xml (added)
+++ geronimo/sandbox/portals/geronimo-pluto/pom.xml Tue Jun 26 22:57:50 2007
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+-->
+
+<!-- $Rev: 544258 $ $Date: 2007-06-04 16:44:49 -0400 (Mon, 04 Jun 2007) $ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.portals</groupId>
+        <artifactId>portals</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>geronimo-pluto</artifactId>
+    <packaging>jar</packaging>
+    <name>Pluto Portal</name>
+
+    <dependencies>
+    
+        <dependency>
+            <groupId>org.apache.pluto</groupId>
+            <artifactId>pluto-container</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.pluto</groupId>
+            <artifactId>pluto-portal-driver</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.pluto</groupId>
+            <artifactId>pluto-portal-driver-impl</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>

Added: geronimo/sandbox/portals/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/PortalContainerServices.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/PortalContainerServices.java?view=auto&rev=551062
==============================================================================
--- geronimo/sandbox/portals/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/PortalContainerServices.java
(added)
+++ geronimo/sandbox/portals/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/PortalContainerServices.java
Tue Jun 26 22:57:50 2007
@@ -0,0 +1,45 @@
+/**
+ *
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You 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.geronimo.pluto;
+
+import org.apache.pluto.driver.config.DriverConfiguration;
+import org.apache.pluto.driver.services.portal.PropertyConfigService;
+import org.apache.pluto.driver.services.portal.RenderConfigService;
+import org.apache.pluto.spi.PortalCallbackService;
+
+/**
+ * Classes implementing this interface provide access to pluto's
+ * container services
+ * 
+ * @version $Rev: 472167 $ $Date: 2006-11-07 12:00:18 -0500 (Tue, 07 Nov 2006) $
+ */
+public interface PortalContainerServices {
+    
+    RenderConfigService getRenderConfigService();
+    void setRenderConfigService(RenderConfigService renderConfigService);
+    
+    PortalCallbackService getPortalCallbackService();
+    void setPortalCallbackService(PortalCallbackService portalCallbackService);
+
+    PropertyConfigService getPropertyConfigService();
+    void setPropertyConfigService(PropertyConfigService propertyConfigService);
+
+    DriverConfiguration getDriverConfiguration();
+    void setDriverConfiguration(DriverConfiguration driverConfiguration);
+    
+}
\ No newline at end of file

Added: geronimo/sandbox/portals/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/PortalContainerServicesGBean.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/PortalContainerServicesGBean.java?view=auto&rev=551062
==============================================================================
--- geronimo/sandbox/portals/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/PortalContainerServicesGBean.java
(added)
+++ geronimo/sandbox/portals/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/PortalContainerServicesGBean.java
Tue Jun 26 22:57:50 2007
@@ -0,0 +1,99 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.geronimo.pluto;
+
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.KernelRegistry;
+import org.apache.pluto.driver.config.DriverConfiguration;
+import org.apache.pluto.driver.services.portal.PropertyConfigService;
+import org.apache.pluto.driver.services.portal.RenderConfigService;
+import org.apache.pluto.spi.PortalCallbackService;
+
+/*
+ * a gbean that provides access to pluto's container services.
+ */
+public class PortalContainerServicesGBean implements PortalContainerServices {
+    private RenderConfigService renderConfigService;
+    private PortalCallbackService portalCallbackService;
+    private PropertyConfigService propertyConfigService;
+    private DriverConfiguration driverConfiguration;
+
+    public RenderConfigService getRenderConfigService() {
+        return renderConfigService;
+    }
+
+    public void setRenderConfigService(RenderConfigService renderConfigService) {
+        this.renderConfigService = renderConfigService;
+    }
+
+    public DriverConfiguration getDriverConfiguration() {
+        return driverConfiguration;
+    }
+
+    public void setDriverConfiguration(DriverConfiguration driverConfigurion) {
+        this.driverConfiguration = driverConfigurion;
+    }
+
+    public PortalCallbackService getPortalCallbackService() {
+        return portalCallbackService;
+    }
+
+    public void setPortalCallbackService(
+            PortalCallbackService portalCallbackService) {
+        this.portalCallbackService = portalCallbackService;
+    }
+
+    public PropertyConfigService getPropertyConfigService() {
+        return propertyConfigService;
+    }
+
+    public void setPropertyConfigService(
+            PropertyConfigService propertyConfigService) {
+        this.propertyConfigService = propertyConfigService;
+    }
+
+    public static PortalContainerServices getInstance() {
+        Kernel kernel = KernelRegistry.getSingleKernel();
+        PortalContainerServices portalServices = null;
+        try {
+            portalServices = (PortalContainerServices) kernel.getGBean(PortalContainerServices.class);
+        } catch (Exception e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        return portalServices;
+    }
+
+    public static final GBeanInfo GBEAN_INFO;
+
+    static {
+        GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic(
+                "Pluto Container Services", PortalContainerServicesGBean.class);
+        infoFactory.addInterface(PortalContainerServices.class);
+        infoFactory.setConstructor(new String[0]);
+        GBEAN_INFO = infoFactory.getBeanInfo();
+    }
+
+    public static GBeanInfo getGBeanInfo() {
+        return GBEAN_INFO;
+    }
+
+}
\ No newline at end of file

Added: geronimo/sandbox/portals/geronimo-pluto/src/main/resources/ToolTips.properties
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/geronimo-pluto/src/main/resources/ToolTips.properties?view=auto&rev=551062
==============================================================================
--- geronimo/sandbox/portals/geronimo-pluto/src/main/resources/ToolTips.properties (added)
+++ geronimo/sandbox/portals/geronimo-pluto/src/main/resources/ToolTips.properties Tue Jun
26 22:57:50 2007
@@ -0,0 +1,27 @@
+# 
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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.
+
+tooltip.windowstate.maximized = Maximize
+tooltip.windowstate.minimized = Minimize
+tooltip.windowstate.normal = Restore
+
+tooltip.mode.view = View
+tooltip.mode.help = Help
+tooltip.mode.edit = Edit
+
+tooltip.css.classname = tooltip
\ No newline at end of file

Modified: geronimo/sandbox/portals/pluto-container/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-container/pom.xml?view=diff&rev=551062&r1=551061&r2=551062
==============================================================================
--- geronimo/sandbox/portals/pluto-container/pom.xml (original)
+++ geronimo/sandbox/portals/pluto-container/pom.xml Tue Jun 26 22:57:50 2007
@@ -37,6 +37,16 @@
     
         <dependency>
             <groupId>org.apache.pluto</groupId>
+            <artifactId>pluto-portal-driver</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.pluto</groupId>
+            <artifactId>pluto-portal-driver-impl</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.pluto</groupId>
             <artifactId>pluto-container</artifactId>
         </dependency>
 
@@ -56,6 +66,16 @@
         </dependency>
 
         <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>javax.portlet</groupId>
             <artifactId>portlet-api</artifactId>
         </dependency>
@@ -94,6 +114,17 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-web</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-digester</groupId>
+            <artifactId>commons-digester</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.portals</groupId>
+            <artifactId>geronimo-pluto</artifactId>
+            <version>${version}</version>
         </dependency>
 
     </dependencies>

Modified: geronimo/sandbox/portals/pluto-container/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-container/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=551062&r1=551061&r2=551062
==============================================================================
--- geronimo/sandbox/portals/pluto-container/src/main/resources/META-INF/geronimo-plugin.xml
(original)
+++ geronimo/sandbox/portals/pluto-container/src/main/resources/META-INF/geronimo-plugin.xml
Tue Jun 26 22:57:50 2007
@@ -37,18 +37,19 @@
             This prerequisite ensures that a servlet container with JSP support is available.
         </description>
     </prerequisite>
+    <dependency>org.apache.pluto/pluto-portal-driver/1.2.0-SNAPSHOT/jar</dependency>
+    <dependency>org.apache.pluto/pluto-portal-driver-impl/1.2.0-SNAPSHOT/jar</dependency>
     <dependency>org.apache.pluto/pluto-container/1.2.0-SNAPSHOT/jar</dependency>
     <dependency>org.apache.pluto/pluto-descriptor-api/1.2.0-SNAPSHOT/jar</dependency>
     <dependency>org.apache.pluto/pluto-descriptor-impl/1.2.0-SNAPSHOT/jar</dependency>
     <dependency>org.apache.pluto/pluto-taglib/1.2.0-SNAPSHOT/jar</dependency>
     <dependency>commons-logging/commons-logging-api/1.0.4/jar</dependency>
+    <dependency>commons-beanutils/commons-beanutils/1.7.0/jar</dependency>
     <dependency>javax.portlet/portlet-api/1.0/jar</dependency>
     <dependency>org.apache.geronimo.specs/geronimo-servlet_2.5_spec/1.1-SNAPSHOT/jar</dependency>
+    <dependency>org.apache.geronimo.portals/geronimo-pluto/1.0-SNAPSHOT/jar</dependency>
     <dependency>org.codehaus.castor/castor/1.1.1/jar</dependency>
-    <dependency>org.springframework/spring-beans/2.0.2/jar</dependency>
-    <dependency>org.springframework/spring-context/2.0.2/jar</dependency>
-    <dependency>org.springframework/spring-core/2.0.2/jar</dependency>
-    <dependency>org.springframework/spring-web/2.0.2/jar</dependency>
+    <dependency>commons-digester/commons-digester/1.8/jar</dependency>
     <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
     <source-repository>http://repo1.maven.org/maven2/</source-repository>
     <source-repository>http://www.ibiblio.org/maven2/</source-repository>

Modified: geronimo/sandbox/portals/pluto-container/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-container/src/plan/plan.xml?view=diff&rev=551062&r1=551061&r2=551062
==============================================================================
--- geronimo/sandbox/portals/pluto-container/src/plan/plan.xml (original)
+++ geronimo/sandbox/portals/pluto-container/src/plan/plan.xml Tue Jun 26 22:57:50 2007
@@ -19,5 +19,5 @@
 <!-- $Rev: 543827 $ $Date: 2007-06-02 22:05:28 -0400 (Sat, 02 Jun 2007) $ -->
 
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-
+  <gbean name="PlutoPortalServices" class="org.apache.geronimo.pluto.PortalContainerServicesGBean"
xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2"/>
 </module>

Modified: geronimo/sandbox/portals/pluto-portal/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/pom.xml?view=diff&rev=551062&r1=551061&r2=551062
==============================================================================
--- geronimo/sandbox/portals/pluto-portal/pom.xml (original)
+++ geronimo/sandbox/portals/pluto-portal/pom.xml Tue Jun 26 22:57:50 2007
@@ -38,11 +38,13 @@
         <dependency>
             <groupId>org.apache.pluto</groupId>
             <artifactId>pluto-portal-driver</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.pluto</groupId>
             <artifactId>pluto-portal-driver-impl</artifactId>
+            <scope>provided</scope>
         </dependency>
 
     </dependencies>

Modified: geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-services-config.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-services-config.xml?view=diff&rev=551062&r1=551061&r2=551062
==============================================================================
--- geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-services-config.xml
(original)
+++ geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/pluto-portal-driver-services-config.xml
Tue Jun 26 22:57:50 2007
@@ -129,4 +129,17 @@
           singleton="true">
     </bean>
 
+    <!-- ================================================ -->
+    <!-- PortalServices for Geronimo                      -->
+    <!-- ================================================ -->
+    <bean id="GeronimoPortalServices"
+          class="org.apache.geronimo.pluto.PortalContainerServicesGBean"
+          factory-method="getInstance"
+          singleton="true">
+      <property name="renderConfigService"><ref bean="RenderConfigService"/></property>
+      <property name="portalCallbackService"><ref bean="PortalCallbackService"/></property>
+      <property name="propertyConfigService"><ref bean="PropertyConfigService"/></property>
+      <property name="driverConfiguration"><ref bean="DriverConfiguration"/></property>
+    </bean>
+
 </beans>

Modified: geronimo/sandbox/portals/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pom.xml?view=diff&rev=551062&r1=551061&r2=551062
==============================================================================
--- geronimo/sandbox/portals/pom.xml (original)
+++ geronimo/sandbox/portals/pom.xml Tue Jun 26 22:57:50 2007
@@ -195,6 +195,12 @@
             </dependency>
 
             <dependency>
+                <groupId>commons-beanutils</groupId>
+                <artifactId>commons-beanutils</artifactId>
+                <version>1.7.0</version>
+            </dependency>
+
+            <dependency>
                 <groupId>commons-logging</groupId>
                 <artifactId>commons-logging-api</artifactId>
                 <version>1.0.4</version>
@@ -232,6 +238,12 @@
             </dependency>
 
             <dependency>
+                <groupId>commons-collections</groupId>
+                <artifactId>commons-collections</artifactId>
+                <version>3.1</version>
+            </dependency>
+
+            <dependency>
                 <groupId>org.apache.geronimo.specs</groupId>
                 <artifactId>geronimo-servlet_2.5_spec</artifactId>
                 <version>1.1-SNAPSHOT</version>
@@ -279,6 +291,12 @@
                 <version>${springVersion}</version>
             </dependency>
 
+             <dependency>
+                <groupId>org.apache.geronimo.modules</groupId>
+                <artifactId>geronimo-kernel</artifactId>
+                <version>${geronimoVersion}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 
@@ -447,6 +465,7 @@
             </activation>
 
             <modules>
+                <module>geronimo-pluto</module>
                 <module>pluto-container</module>
                 <module>pluto-portal</module>
                 <module>pluto-testsuite</module>



Mime
View raw message