geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmcma...@apache.org
Subject svn commit: r564771 - in /geronimo/sandbox/portals: ./ geronimo-console/ geronimo-pluto/ plugins/ plugins/console/ plugins/console/trunk/ plugins/console/trunk/console-base-portlets/ plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/ ...
Date Fri, 10 Aug 2007 21:17:29 GMT
Author: pmcmahan
Date: Fri Aug 10 14:17:24 2007
New Revision: 564771

URL: http://svn.apache.org/viewvc?view=rev&rev=564771
Log:
reorganize into two plugins: a pluto component that geronimo apps can use to access
portal services and a console component that contains a portal driver and the
base portlets for the geronimo administration console.  apps can add new portlets
to the admin console by making the pluto-container a parent and using the
(soon to be renamed) ACEGBean


Added:
    geronimo/sandbox/portals/plugins/
    geronimo/sandbox/portals/plugins/console/
    geronimo/sandbox/portals/plugins/console/trunk/
    geronimo/sandbox/portals/plugins/console/trunk/LICENSE.txt
      - copied unchanged from r564578, geronimo/sandbox/portals/LICENSE.txt
    geronimo/sandbox/portals/plugins/console/trunk/NOTICE.txt
      - copied unchanged from r564578, geronimo/sandbox/portals/NOTICE.txt
    geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/
      - copied from r564578, geronimo/sandbox/portals/geronimo-console/
    geronimo/sandbox/portals/plugins/console/trunk/console-ear/
    geronimo/sandbox/portals/plugins/console/trunk/console-ear/LICENSE.txt
      - copied unchanged from r564578, geronimo/sandbox/portals/LICENSE.txt
    geronimo/sandbox/portals/plugins/console/trunk/console-ear/NOTICE.txt
      - copied unchanged from r564578, geronimo/sandbox/portals/NOTICE.txt
    geronimo/sandbox/portals/plugins/console/trunk/console-ear/pom.xml   (with props)
    geronimo/sandbox/portals/plugins/console/trunk/console-ear/src/
    geronimo/sandbox/portals/plugins/console/trunk/console-ear/src/main/
    geronimo/sandbox/portals/plugins/console/trunk/console-ear/src/main/application/
    geronimo/sandbox/portals/plugins/console/trunk/console-ear/src/main/application/META-INF/
    geronimo/sandbox/portals/plugins/console/trunk/console-ear/src/main/application/META-INF/LICENSE.txt   (with props)
    geronimo/sandbox/portals/plugins/console/trunk/console-ear/src/main/application/META-INF/MANIFEST.MF
    geronimo/sandbox/portals/plugins/console/trunk/console-ear/src/main/application/META-INF/NOTICE.txt   (with props)
    geronimo/sandbox/portals/plugins/console/trunk/console-portal-driver/
      - copied from r564578, geronimo/sandbox/portals/pluto-portal/
    geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/
    geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/LICENSE.txt
      - copied unchanged from r564578, geronimo/sandbox/portals/LICENSE.txt
    geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/NOTICE.txt
      - copied unchanged from r564578, geronimo/sandbox/portals/NOTICE.txt
    geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/pom.xml   (with props)
    geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/
    geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/main/
    geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/main/resources/
    geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/main/resources/META-INF/
    geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/main/resources/META-INF/geronimo-plugin.xml   (with props)
    geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/plan/
    geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/plan/plan.xml   (with props)
    geronimo/sandbox/portals/plugins/console/trunk/pom.xml
      - copied, changed from r564578, geronimo/sandbox/portals/pom.xml
    geronimo/sandbox/portals/plugins/pluto/
    geronimo/sandbox/portals/plugins/pluto/trunk/
    geronimo/sandbox/portals/plugins/pluto/trunk/LICENSE.txt
      - copied unchanged from r564578, geronimo/sandbox/portals/LICENSE.txt
    geronimo/sandbox/portals/plugins/pluto/trunk/NOTICE.txt
      - copied unchanged from r564578, geronimo/sandbox/portals/NOTICE.txt
    geronimo/sandbox/portals/plugins/pluto/trunk/geronimo-pluto/
      - copied from r564578, geronimo/sandbox/portals/geronimo-pluto/
    geronimo/sandbox/portals/plugins/pluto/trunk/pluto-container/
      - copied from r564578, geronimo/sandbox/portals/pluto-container/
    geronimo/sandbox/portals/plugins/pluto/trunk/pom.xml
      - copied, changed from r564578, geronimo/sandbox/portals/pom.xml
Removed:
    geronimo/sandbox/portals/LICENSE.txt
    geronimo/sandbox/portals/NOTICE.txt
    geronimo/sandbox/portals/README.txt
    geronimo/sandbox/portals/geronimo-console/
    geronimo/sandbox/portals/geronimo-pluto/
    geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/sandbox/portals/plugins/console/trunk/console-portal-driver/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/sandbox/portals/pluto-container/
    geronimo/sandbox/portals/pluto-portal/
    geronimo/sandbox/portals/pom.xml
Modified:
    geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/pom.xml
    geronimo/sandbox/portals/plugins/console/trunk/console-portal-driver/pom.xml
    geronimo/sandbox/portals/plugins/console/trunk/console-portal-driver/src/main/webapp/WEB-INF/pluto-portal-driver-services-config.xml
    geronimo/sandbox/portals/plugins/pluto/trunk/geronimo-pluto/pom.xml
    geronimo/sandbox/portals/plugins/pluto/trunk/pluto-container/pom.xml
    geronimo/sandbox/portals/plugins/pluto/trunk/pluto-container/src/main/resources/META-INF/geronimo-plugin.xml

Modified: geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/pom.xml?view=diff&rev=564771&r1=564578&r2=564771
==============================================================================
--- geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/pom.xml (original)
+++ geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/pom.xml Fri Aug 10 14:17:24 2007
@@ -23,14 +23,14 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.portals</groupId>
-        <artifactId>portals</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>console</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>geronimo-console</artifactId>
-    <name>Geronimo Console</name>
+    <artifactId>console-base-portlets</artifactId>
+    <name>Geronimo Administration Console Plugin :: Base Portlets</name>
     <packaging>war</packaging>
 
     <dependencies>

Added: geronimo/sandbox/portals/plugins/console/trunk/console-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/console/trunk/console-ear/pom.xml?view=auto&rev=564771
==============================================================================
--- geronimo/sandbox/portals/plugins/console/trunk/console-ear/pom.xml (added)
+++ geronimo/sandbox/portals/plugins/console/trunk/console-ear/pom.xml Fri Aug 10 14:17:24 2007
@@ -0,0 +1,82 @@
+<?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$ $Date$ -->
+
+<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.plugins</groupId>
+        <artifactId>console</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>console-ear</artifactId>
+    <name>Geronimo Administration Console Plugin :: EAR</name>
+    <packaging>ear</packaging>
+    
+    <dependencies>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>console-base-portlets</artifactId>
+            <version>${version}</version>
+            <type>war</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>console-portal-driver</artifactId>
+            <version>${version}</version>
+            <type>war</type>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-ear-plugin</artifactId>
+                <configuration>
+                    <displayName>Geronimo Console Application</displayName>
+                    <generateApplicationXml>true</generateApplicationXml>
+                    <version>1.4</version>
+                    <modules>
+                        <webModule>
+                            <groupId>org.apache.geronimo.plugins</groupId>
+                            <artifactId>console-base-portlets</artifactId>
+                            <contextRoot>/console</contextRoot>
+                            <bundleFileName>base-portlets.war</bundleFileName>
+                        </webModule>
+                        <webModule>
+                            <groupId>org.apache.geronimo.plugins</groupId>
+                            <artifactId>console-portal-driver</artifactId>
+                            <contextRoot>/pluto</contextRoot>
+                            <bundleFileName>portal-driver.war</bundleFileName>
+                        </webModule>
+                    </modules>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Propchange: geronimo/sandbox/portals/plugins/console/trunk/console-ear/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/portals/plugins/console/trunk/console-ear/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/portals/plugins/console/trunk/console-ear/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/sandbox/portals/plugins/console/trunk/console-ear/src/main/application/META-INF/LICENSE.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/console/trunk/console-ear/src/main/application/META-INF/LICENSE.txt?view=auto&rev=564771
==============================================================================
--- geronimo/sandbox/portals/plugins/console/trunk/console-ear/src/main/application/META-INF/LICENSE.txt (added)
+++ geronimo/sandbox/portals/plugins/console/trunk/console-ear/src/main/application/META-INF/LICENSE.txt Fri Aug 10 14:17:24 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.
+

Propchange: geronimo/sandbox/portals/plugins/console/trunk/console-ear/src/main/application/META-INF/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/portals/plugins/console/trunk/console-ear/src/main/application/META-INF/LICENSE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/portals/plugins/console/trunk/console-ear/src/main/application/META-INF/LICENSE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/sandbox/portals/plugins/console/trunk/console-ear/src/main/application/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/console/trunk/console-ear/src/main/application/META-INF/MANIFEST.MF?view=auto&rev=564771
==============================================================================
--- geronimo/sandbox/portals/plugins/console/trunk/console-ear/src/main/application/META-INF/MANIFEST.MF (added)
+++ geronimo/sandbox/portals/plugins/console/trunk/console-ear/src/main/application/META-INF/MANIFEST.MF Fri Aug 10 14:17:24 2007
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Created-By: Apache Software Foundation
+Class-Path: console-portlet-container-1.0-SNAPSHOT.jar

Added: geronimo/sandbox/portals/plugins/console/trunk/console-ear/src/main/application/META-INF/NOTICE.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/console/trunk/console-ear/src/main/application/META-INF/NOTICE.txt?view=auto&rev=564771
==============================================================================
--- geronimo/sandbox/portals/plugins/console/trunk/console-ear/src/main/application/META-INF/NOTICE.txt (added)
+++ geronimo/sandbox/portals/plugins/console/trunk/console-ear/src/main/application/META-INF/NOTICE.txt Fri Aug 10 14:17:24 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/).

Propchange: geronimo/sandbox/portals/plugins/console/trunk/console-ear/src/main/application/META-INF/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/portals/plugins/console/trunk/console-ear/src/main/application/META-INF/NOTICE.txt
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/portals/plugins/console/trunk/console-ear/src/main/application/META-INF/NOTICE.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/sandbox/portals/plugins/console/trunk/console-portal-driver/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/console/trunk/console-portal-driver/pom.xml?view=diff&rev=564771&r1=564578&r2=564771
==============================================================================
--- geronimo/sandbox/portals/plugins/console/trunk/console-portal-driver/pom.xml (original)
+++ geronimo/sandbox/portals/plugins/console/trunk/console-portal-driver/pom.xml Fri Aug 10 14:17:24 2007
@@ -23,15 +23,15 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.portals</groupId>
-        <artifactId>portals</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>console</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>pluto-portal</artifactId>
+    <artifactId>console-portal-driver</artifactId>
     <packaging>war</packaging>
-    <name>Pluto Portal</name>
+    <name>Geronimo Administration Console Plugin :: Pluto Portal Driver</name>
 
     <dependencies>
     

Modified: geronimo/sandbox/portals/plugins/console/trunk/console-portal-driver/src/main/webapp/WEB-INF/pluto-portal-driver-services-config.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/console/trunk/console-portal-driver/src/main/webapp/WEB-INF/pluto-portal-driver-services-config.xml?view=diff&rev=564771&r1=564578&r2=564771
==============================================================================
--- geronimo/sandbox/portals/plugins/console/trunk/console-portal-driver/src/main/webapp/WEB-INF/pluto-portal-driver-services-config.xml (original)
+++ geronimo/sandbox/portals/plugins/console/trunk/console-portal-driver/src/main/webapp/WEB-INF/pluto-portal-driver-services-config.xml Fri Aug 10 14:17:24 2007
@@ -140,7 +140,7 @@
       <property name="portalCallbackService"><ref bean="PortalCallbackService"/></property>
       <property name="propertyConfigService"><ref bean="PropertyConfigService"/></property>
       <property name="driverConfiguration"><ref bean="DriverConfiguration"/></property>
-	<property name="adminConfiguration"><ref bean="AdminConfiguration"/></property>   
- </bean>
+      <property name="adminConfiguration"><ref bean="AdminConfiguration"/></property>   
+    </bean>
 
 </beans>

Added: geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/pom.xml?view=auto&rev=564771
==============================================================================
--- geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/pom.xml (added)
+++ geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/pom.xml Fri Aug 10 14:17:24 2007
@@ -0,0 +1,190 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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$ $Date$ -->
+
+<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.plugins</groupId>
+        <artifactId>console</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <groupId>org.apache.geronimo.plugins</groupId>
+    <artifactId>console-tomcat</artifactId>
+    <name>Geronimo Administration Console Plugin :: Configuration for Tomcat</name>
+    <packaging>car</packaging>
+
+    <dependencies>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>console-ear</artifactId>
+            <version>${version}</version>
+            <type>ear</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>pluto-container</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <type>car</type>
+        </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.pluto</groupId>
+            <artifactId>pluto-container</artifactId>
+        </dependency>
+
+	<dependency>
+            <groupId>org.apache.pluto</groupId>
+            <artifactId>pluto-descriptor-api</artifactId>
+        </dependency>
+
+	<dependency>
+            <groupId>org.apache.pluto</groupId>
+            <artifactId>pluto-descriptor-impl</artifactId>
+        </dependency>
+
+	<dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging-api</artifactId>
+        </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>
+
+	<dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jee-specs</artifactId>
+            <type>car</type>
+        </dependency>
+-->
+
+	<dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-deploy-jsr88</artifactId>
+        </dependency>
+
+	<dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-security</artifactId>
+            <type>car</type>
+        </dependency>
+
+<!--
+	<dependency>
+            <groupId>org.codehaus.castor</groupId>
+            <artifactId>castor</artifactId>
+        </dependency>
+
+	<dependency>
+            <groupId>org.apache.pluto</groupId>
+            <artifactId>pluto-taglib</artifactId>
+        </dependency>
+
+	<dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+        </dependency>
+
+	<dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+        </dependency>
+
+	<dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+        </dependency>
+
+	<dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+        </dependency>
+
+	<dependency>
+            <groupId>commons-digester</groupId>
+            <artifactId>commons-digester</artifactId>
+        </dependency>
+-->
+
+    </dependencies>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>${pom.basedir}/src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <deploymentConfigs>
+                        <deploymentConfig>${gbeanDeployer}</deploymentConfig>
+                        <deploymentConfig>${j2eeDeployer}</deploymentConfig>
+                        <deploymentConfig>${tomcatDeployer}</deploymentConfig>
+                        <deploymentConfig>${jasperDeployer}</deploymentConfig>
+                    </deploymentConfigs>
+                    <module>
+                        <groupId>org.apache.geronimo.plugins</groupId>
+                        <artifactId>console-ear</artifactId>
+                        <type>ear</type>
+                    </module>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Propchange: geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/main/resources/META-INF/geronimo-plugin.xml?view=auto&rev=564771
==============================================================================
--- geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/main/resources/META-INF/geronimo-plugin.xml (added)
+++ geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/main/resources/META-INF/geronimo-plugin.xml Fri Aug 10 14:17:24 2007
@@ -0,0 +1,73 @@
+<?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$ $Date$ -->
+
+<geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
+    <name>Administration Console -- Tomcat</name>
+    <module-id>org.apache.geronimo.plugins/console-tomcat/1.0-SNAPSHOT/car</module-id>
+    <category>Application</category>
+    <description>
+       Geronimo Administration Console for Tomcat
+    </description>
+
+    <url>http://geronimo.apache.org/</url>
+    <author>The Apache Geronimo development community</author>
+    <license osi-approved="true">BSD -- Apache Software License (ASL) 2.0</license>
+    <geronimo-version>2.1-SNAPSHOT</geronimo-version>
+
+    <prerequisite>
+        <id>org.apache.geronimo.configs/tomcat6/2.1-SNAPSHOT/car</id>
+        <resource-type>Web Container</resource-type>
+        <description>
+            This version of the Roller application works with the Geronimo/Tomcat distribution.
+            It is not intended to run in the Geronimo/Jetty distribution.
+            There is a separate version of the Roller application that works with Jetty.
+            Please install the version appropriate to your Geronimo distribution.
+        </description>
+    </prerequisite>
+    <dependency>org.apache.geronimo.configs/j2ee-server/2.1-SNAPSHOT/car</dependency>
+    <dependency>org.apache.geronimo.configs/jee-specs/2.1-SNAPSHOT/car</dependency>
+    <dependency>org.apache.geronimo.plugins/pluto-container/1.0-SNAPSHOT/car</dependency>
+    <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.codehaus.castor/castor/1.1.1/jar</dependency>
+    <dependency>commons-digester/commons-digester/1.8/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>
+
+<!--  pom.xml has this dep, is it needed here?
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+        </dependency>
+-->
+
+    <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
+    <source-repository>http://repo1.maven.org/maven2/</source-repository>
+</geronimo-plugin>

Propchange: geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/main/resources/META-INF/geronimo-plugin.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/plan/plan.xml?view=auto&rev=564771
==============================================================================
--- geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/plan/plan.xml (added)
+++ geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/plan/plan.xml Fri Aug 10 14:17:24 2007
@@ -0,0 +1,202 @@
+<?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$ $Date$ -->
+
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+
+    <module>
+        <web>portal-driver.war</web>
+        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+            <dep:environment>
+                <dep:moduleId>
+                    <dep:groupId>org.apache.geronimo.plugins</dep:groupId>
+                    <dep:artifactId>console-portal-driver</dep:artifactId>
+                    <dep:version>1.0-SNAPSHOT</dep:version>
+                    <dep:type>war</dep:type>
+                </dep:moduleId>
+                <dep:dependencies/> <!-- deps are declared in pom.xml -->
+                <dep:hidden-classes />
+                <dep:non-overridable-classes />
+            </dep:environment>
+            <context-root>/pluto</context-root>
+            <cross-context />
+            <security-realm-name>geronimo-admin</security-realm-name>
+        </web-app>
+    </module>
+
+    <module>
+        <web>base-portlets.war</web>
+        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+            <dep:environment>
+                <dep:moduleId>
+                    <dep:groupId>org.apache.geronimo.plugins</dep:groupId>
+                    <dep:artifactId>console-base-portlets</dep:artifactId>
+                    <dep:version>1.0-SNAPSHOT</dep:version>
+                    <dep:type>war</dep:type>
+                </dep:moduleId>
+                <dep:dependencies/> <!-- deps are declared in pom.xml -->
+                <dep:hidden-classes>
+                    <filter>org.apache.commons.digester</filter>
+                </dep:hidden-classes>
+                <dep:non-overridable-classes />
+            </dep:environment>
+
+            <context-root>/console</context-root>
+            <cross-context />
+            <security-realm-name>geronimo-admin</security-realm-name>
+
+
+            <!---  TODO:  are these gbeans still needed ?
+                <gbean name="CARExportForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+                <attribute name="portalPathPrefix">/car-export</attribute>
+                <attribute name="portletContextPath">/console-standard</attribute>
+                <attribute name="portletServletPath">/car-export</attribute>
+                </gbean>
+                <gbean name="SVGForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+                <attribute name="portalPathPrefix">/graphs</attribute>
+                <attribute name="portletContextPath">/console-standard</attribute>
+                <attribute name="portletServletPath">/graphs</attribute>
+                </gbean>
+                <gbean name="PlanExportForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+                <attribute name="portalPathPrefix">/plan-export</attribute>
+                <attribute name="portletContextPath">/console-standard</attribute>
+                <attribute name="portletServletPath">/plan-export</attribute>
+                </gbean>
+            -->
+
+            <gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">
+                <reference name="ServerInfo">
+                    <name>ServerInfo</name>
+                </reference>
+                <reference name="LoginModule">
+                    <name>properties-login</name>
+                </reference>
+            </gbean>
+
+<!-- TODO: can't start these gbeans here because the ContainerServicesGBean hasn't been
+           initialized by spring yet.  since they can't be defined here they are instead
+           defined in the renderConfig section of pluto's pluto-portal-driver-config.xml,
+           which is not ideal.  maybe the deps can be moved around so that this section
+           can be reenabled and the pages removed from the driver config xml.
+           <gbean name="Welcome" class="org.apache.geronimo.pluto.ACEGBean">
+               <attribute name="pageTitle">Welcome</attribute>
+               <attribute name="portletContext">/console</attribute>
+               <attribute name="portletList">[Welcome]</attribute>
+           </gbean>
+
+           <gbean name="ServerInfo" class="org.apache.geronimo.pluto.ACEGBean">
+               <attribute name="pageTitle">Server/Information</attribute>
+               <attribute name="portletContext">/console</attribute>
+               <attribute name="portletList">[ServerInfo]</attribute>
+           </gbean>
+           <gbean name="JavaSysInfo" class="org.apache.geronimo.pluto.ACEGBean">
+               <attribute name="pageTitle">Server/Java System Info</attribute>
+               <attribute name="portletContext">/console</attribute>
+               <attribute name="portletList">[JavaSysInfo]</attribute>
+           </gbean>
+           <gbean name="Logs" class="org.apache.geronimo.pluto.ACEGBean">
+               <attribute name="pageTitle">Server/Server Logs</attribute>
+               <attribute name="portletContext">/console</attribute>
+               <attribute name="portletList">[LogManager, LogViewer, WebAccessLogViewer]</attribute>
+           </gbean>
+           <gbean name="Shutdown" class="org.apache.geronimo.pluto.ACEGBean">
+               <attribute name="pageTitle">Server/Shutdown</attribute>
+               <attribute name="portletContext">/console</attribute>
+               <attribute name="portletList">[ServerManager]</attribute>
+           </gbean>
+           <gbean name="WebServer" class="org.apache.geronimo.pluto.ACEGBean">
+               <attribute name="pageTitle">Server/Web Server</attribute>
+               <attribute name="portletContext">/console</attribute>
+               <attribute name="portletList">[WebServerManager, ConnectorManager]</attribute>
+           </gbean>
+           <gbean name="ThreadPool" class="org.apache.geronimo.pluto.ACEGBean">
+               <attribute name="pageTitle">Server/Thread Pools</attribute>
+               <attribute name="portletContext">/console</attribute>
+               <attribute name="portletList">[ThreadPool]</attribute>
+           </gbean>
+           <gbean name="ApacheJK" class="org.apache.geronimo.pluto.ACEGBean">
+               <attribute name="pageTitle">Server/Apache HTTP</attribute>
+               <attribute name="portletContext">/console</attribute>
+               <attribute name="portletList">[ApacheJK]</attribute>
+           </gbean>
+
+           <gbean name="RepositoryViewer" class="org.apache.geronimo.pluto.ACEGBean">
+               <attribute name="pageTitle">Services/Repository</attribute>
+               <attribute name="portletContext">/console</attribute>
+               <attribute name="portletList">[RepositoryViewer]</attribute>
+           </gbean>
+
+           <gbean name="Deployment" class="org.apache.geronimo.pluto.ACEGBean">
+               <attribute name="pageTitle">Applications/Deploy New</attribute>
+               <attribute name="portletContext">/console</attribute>
+               <attribute name="portletList">[Deployment]</attribute>
+           </gbean>
+           <gbean name="WARModules" class="org.apache.geronimo.pluto.ACEGBean">
+               <attribute name="pageTitle">Applications/Web Apps</attribute>
+               <attribute name="portletContext">/console</attribute>
+               <attribute name="portletList">[WARModules]</attribute>
+           </gbean>
+           <gbean name="SystemModules" class="org.apache.geronimo.pluto.ACEGBean">
+               <attribute name="pageTitle">Applications/System Modules</attribute>
+               <attribute name="portletContext">/console</attribute>
+               <attribute name="portletList">[SystemModules]</attribute>
+           </gbean>
+           <gbean name="ImportExport" class="org.apache.geronimo.pluto.ACEGBean">
+               <attribute name="pageTitle">Applications/Plugins</attribute>
+               <attribute name="portletContext">/console</attribute>
+               <attribute name="portletList">[ImportExport]</attribute>
+           </gbean>
+
+           <gbean name="UsersGroups" class="org.apache.geronimo.pluto.ACEGBean">
+               <attribute name="pageTitle">Security/Users and Groups</attribute>
+               <attribute name="portletContext">/console</attribute>
+               <attribute name="portletList">[SEUsers, SEGroups]</attribute>
+           </gbean>
+           <gbean name="RealmWizard" class="org.apache.geronimo.pluto.ACEGBean">
+               <attribute name="pageTitle">Security/Security Realms</attribute>
+               <attribute name="portletContext">/console</attribute>
+               <attribute name="portletList">[RealmWizard]</attribute>
+           </gbean>
+           <gbean name="Keystores" class="org.apache.geronimo.pluto.ACEGBean">
+               <attribute name="pageTitle">Security/Keystores</attribute>
+               <attribute name="portletContext">/console</attribute>
+               <attribute name="portletList">[Keystores]</attribute>
+           </gbean>
+           <gbean name="CertificationAuthority" class="org.apache.geronimo.pluto.ACEGBean">
+               <attribute name="pageTitle">Security/Certificate Authority</attribute>
+               <attribute name="portletContext">/console</attribute>
+               <attribute name="portletList">[CertificationAuthority]</attribute>
+           </gbean>
+-->
+
+        </web-app>
+    </module>
+
+    <security xmlns="http://geronimo.apache.org/xml/ns/security-1.2">
+        <role-mappings>
+            <role role-name="admin">
+                <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="admin" />
+            </role>
+        </role-mappings>
+    </security>
+
+    <!-- TODO: what is this? -->
+    <gbean name="DeploymentFactory" class="org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryWithKernel" />
+
+</application>

Propchange: geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/plan/plan.xml
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/plan/plan.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Copied: geronimo/sandbox/portals/plugins/console/trunk/pom.xml (from r564578, geronimo/sandbox/portals/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/console/trunk/pom.xml?view=diff&rev=564771&p1=geronimo/sandbox/portals/pom.xml&r1=564578&p2=geronimo/sandbox/portals/plugins/console/trunk/pom.xml&r2=564771
==============================================================================
--- geronimo/sandbox/portals/pom.xml (original)
+++ geronimo/sandbox/portals/plugins/console/trunk/pom.xml Fri Aug 10 14:17:24 2007
@@ -28,21 +28,21 @@
         <version>1.2</version>
     </parent>
 
-    <groupId>org.apache.geronimo.portals</groupId>
-    <artifactId>portals</artifactId>
-    <name>Geronimo portals</name>
+    <groupId>org.apache.geronimo.plugins</groupId>
+    <artifactId>console</artifactId>
+    <name>Geronimo Administration Console Plugin</name>
     <packaging>pom</packaging>
 
     <version>1.0-SNAPSHOT</version>
 
     <description>
-        Experimental portals stuff for Geronimo
+        Geronimo administration console supporting dynamic extensions
     </description>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/sandbox/portals</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/sandbox/portals</developerConnection>
-        <url>http://svn.apache.org/viewvc/geronimo/sandbox/portals</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/plugins/console/trunk</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/plugins/console/trunk</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/plugins/console/trunk</url>
     </scm>
 
     <properties>
@@ -59,6 +59,13 @@
         <junitVersion>3.8.2</junitVersion>
         <plutoVersion>1.2.0-SNAPSHOT</plutoVersion>
         <springVersion>2.0.2</springVersion>
+
+        <!-- deployers needed to create the CAR files -->
+        <gbeanDeployer>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
+        <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
+        <tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${geronimoVersion}/car</tomcatDeployer>
+        <jetty6Deployer>org.apache.geronimo.configs/jetty6-deployer/${geronimoVersion}/car</jetty6Deployer>
+        <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
     </properties>
 
     <dependencyManagement>
@@ -226,6 +233,13 @@
             </dependency>
 
             <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>geronimo-gbean-deployer</artifactId>
+                <version>${geronimoVersion}</version>
+                <type>car</type>
+            </dependency>
+
+            <dependency>
                 <groupId>org.codehaus.castor</groupId>
                 <artifactId>castor</artifactId>
                 <version>1.1.1</version>
@@ -298,6 +312,13 @@
             </dependency>
 
              <dependency>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>j2ee-security</artifactId>
+                <version>${geronimoVersion}</version>
+                <type>car</type>
+            </dependency>
+
+             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-upgrade</artifactId>
                 <version>${geronimoVersion}</version>
@@ -507,10 +528,10 @@
             </activation>
 
             <modules>
-                <module>geronimo-pluto</module>
-                <module>pluto-container</module>
-                <module>pluto-portal</module>
-                <module>geronimo-console</module>
+                <module>console-base-portlets</module>
+                <module>console-portal-driver</module>
+                <module>console-ear</module>
+                <module>console-tomcat</module>
             </modules>
         </profile>
     </profiles>

Modified: geronimo/sandbox/portals/plugins/pluto/trunk/geronimo-pluto/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/pluto/trunk/geronimo-pluto/pom.xml?view=diff&rev=564771&r1=564578&r2=564771
==============================================================================
--- geronimo/sandbox/portals/plugins/pluto/trunk/geronimo-pluto/pom.xml (original)
+++ geronimo/sandbox/portals/plugins/pluto/trunk/geronimo-pluto/pom.xml Fri Aug 10 14:17:24 2007
@@ -23,15 +23,15 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.portals</groupId>
-        <artifactId>portals</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>pluto</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>geronimo-pluto</artifactId>
     <packaging>jar</packaging>
-    <name>Pluto Portal</name>
+    <name>Pluto Plugin :: Geronimo Enablement for Pluto</name>
 
     <dependencies>
     

Modified: geronimo/sandbox/portals/plugins/pluto/trunk/pluto-container/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/pluto/trunk/pluto-container/pom.xml?view=diff&rev=564771&r1=564578&r2=564771
==============================================================================
--- geronimo/sandbox/portals/plugins/pluto/trunk/pluto-container/pom.xml (original)
+++ geronimo/sandbox/portals/plugins/pluto/trunk/pluto-container/pom.xml Fri Aug 10 14:17:24 2007
@@ -23,15 +23,15 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.portals</groupId>
-        <artifactId>portals</artifactId>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>pluto</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>pluto-container</artifactId>
     <packaging>car</packaging>
-    <name>Pluto Container Configuration for Geronimo</name>
+    <name>Pluto Plugin :: Container Configuration for Geronimo</name>
 
     <dependencies>
     
@@ -92,6 +92,12 @@
         </dependency>
 
         <dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>geronimo-pluto</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.pluto</groupId>
             <artifactId>pluto-taglib</artifactId>
         </dependency>
@@ -119,12 +125,6 @@
         <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/plugins/pluto/trunk/pluto-container/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/pluto/trunk/pluto-container/src/main/resources/META-INF/geronimo-plugin.xml?view=diff&rev=564771&r1=564578&r2=564771
==============================================================================
--- geronimo/sandbox/portals/plugins/pluto/trunk/pluto-container/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/sandbox/portals/plugins/pluto/trunk/pluto-container/src/main/resources/META-INF/geronimo-plugin.xml Fri Aug 10 14:17:24 2007
@@ -20,7 +20,7 @@
 
 <geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
     <name>Pluto Container for Geronimo</name>
-    <module-id>org.apache.geronimo.portals/pluto-container/1.0-SNAPSHOT/car</module-id>
+    <module-id>org.apache.geronimo.plugins/pluto-container/1.0-SNAPSHOT/car</module-id>
     <category>Portals</category>
     <description>
       Pluto portal container for Geronimo.  This configuration provides the components
@@ -47,10 +47,9 @@
     <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.apache.geronimo.plugins/geronimo-pluto/1.0-SNAPSHOT/jar</dependency>
     <dependency>org.codehaus.castor/castor/1.1.1/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>
 </geronimo-plugin>

Copied: geronimo/sandbox/portals/plugins/pluto/trunk/pom.xml (from r564578, geronimo/sandbox/portals/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/pluto/trunk/pom.xml?view=diff&rev=564771&p1=geronimo/sandbox/portals/pom.xml&r1=564578&p2=geronimo/sandbox/portals/plugins/pluto/trunk/pom.xml&r2=564771
==============================================================================
--- geronimo/sandbox/portals/pom.xml (original)
+++ geronimo/sandbox/portals/plugins/pluto/trunk/pom.xml Fri Aug 10 14:17:24 2007
@@ -28,21 +28,21 @@
         <version>1.2</version>
     </parent>
 
-    <groupId>org.apache.geronimo.portals</groupId>
-    <artifactId>portals</artifactId>
-    <name>Geronimo portals</name>
+    <groupId>org.apache.geronimo.plugins</groupId>
+    <artifactId>pluto</artifactId>
+    <name>Pluto Plugin</name>
     <packaging>pom</packaging>
 
     <version>1.0-SNAPSHOT</version>
 
     <description>
-        Experimental portals stuff for Geronimo
+        Pluto Portlet Container and Geronimo GBeans for Managing the Portal Driver
     </description>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/sandbox/portals</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/sandbox/portals</developerConnection>
-        <url>http://svn.apache.org/viewvc/geronimo/sandbox/portals</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/plugins/pluto/trunk</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/plugins/pluto/trunk</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/plugins/pluto/trunk</url>
     </scm>
 
     <properties>
@@ -509,8 +509,6 @@
             <modules>
                 <module>geronimo-pluto</module>
                 <module>pluto-container</module>
-                <module>pluto-portal</module>
-                <module>geronimo-console</module>
             </modules>
         </profile>
     </profiles>



Mime
View raw message