geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r787936 - in /geronimo/server/trunk: ./ plugins/activemq/activemq-portlets/ plugins/console/ plugins/console/console-portal-driver/src/main/webapp/WEB-INF/ plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/ plugins/debugv...
Date Wed, 24 Jun 2009 07:56:33 GMT
Author: djencks
Date: Wed Jun 24 07:56:32 2009
New Revision: 787936

URL: http://svn.apache.org/viewvc?rev=787936&view=rev
Log:
GERONIMO-4708 Use released pluto version, implement icon handling in geronimo code.  Also put pluto dependency management into pluto plugin.  Also delete some now unused repository entries

Added:
    geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/impl/
    geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/impl/PageConfig.java   (with props)
    geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/impl/PropertyConfigServiceImpl.java
      - copied, changed from r787868, portals/pluto/tags/pluto-1.1.6/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/PropertyConfigServiceImpl.java
    geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/impl/RenderConfigServiceImpl.java
      - copied, changed from r787868, portals/pluto/tags/pluto-1.1.6/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/RenderConfigServiceImpl.java
    geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/impl/ResourceConfigReader.java
      - copied, changed from r787868, portals/pluto/tags/pluto-1.1.6/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/ResourceConfigReader.java
    geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/resources/pluto-portal-driver-config.xsd
      - copied, changed from r787868, portals/pluto/tags/pluto-1.1.6/pluto-portal-driver/src/main/resources/pluto-portal-driver-config.xsd
Removed:
    geronimo/server/trunk/repository/jstl/
    geronimo/server/trunk/repository/juddi/
    geronimo/server/trunk/repository/org/apache/tomcat/
Modified:
    geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml
    geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/pluto-portal-driver-services-config.xml
    geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp
    geronimo/server/trunk/plugins/console/pom.xml
    geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml
    geronimo/server/trunk/plugins/monitoring/pom.xml
    geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml
    geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml
    geronimo/server/trunk/plugins/pluto/geronimo-pluto/pom.xml
    geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/AdminConsoleExtensionGBean.java
    geronimo/server/trunk/plugins/pluto/pom.xml
    geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml
    geronimo/server/trunk/pom.xml
    geronimo/server/trunk/repository/pom.xml

Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml?rev=787936&r1=787935&r2=787936&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml Wed Jun 24 07:56:32 2009
@@ -22,6 +22,18 @@
     <name>Geronimo Plugins, ActiveMQ v5 :: Portlets</name>
     <packaging>war</packaging>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>pluto</artifactId>
+                <version>${version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
         <!-- for jspc maven plugin -->
         <dependency>

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/pluto-portal-driver-services-config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/pluto-portal-driver-services-config.xml?rev=787936&r1=787935&r2=787936&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/pluto-portal-driver-services-config.xml (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/pluto-portal-driver-services-config.xml Wed Jun 24 07:56:32 2009
@@ -100,12 +100,12 @@
     </bean>
 
     <bean id="PropertyConfigService"
-          class="org.apache.pluto.driver.services.impl.resource.PropertyConfigServiceImpl"
+          class="org.apache.geronimo.pluto.impl.PropertyConfigServiceImpl"
           singleton="true">
     </bean>
 
     <bean id="RenderConfigService"
-          class="org.apache.pluto.driver.services.impl.resource.RenderConfigServiceImpl"
+          class="org.apache.geronimo.pluto.impl.RenderConfigServiceImpl"
           singleton="true">
     </bean>
     

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp?rev=787936&r1=787935&r2=787936&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp Wed Jun 24 07:56:32 2009
@@ -22,7 +22,7 @@
 <fmt:setLocale value="<%=request.getLocale()%>"/>
 <fmt:setBundle basename="org.apache.geronimo.console.i18n.ConsoleResource"/>
 
-<%@ page import="java.util.ArrayList,java.util.HashMap,org.apache.pluto.driver.services.portal.PageConfig" %>
+<%@ page import="java.util.ArrayList,java.util.HashMap,org.apache.geronimo.pluto.impl.PageConfig" %>
 
 
 <%

Modified: geronimo/server/trunk/plugins/console/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/pom.xml?rev=787936&r1=787935&r2=787936&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/pom.xml Wed Jun 24 07:56:32 2009
@@ -50,5 +50,18 @@
         <module>plugin-console-tomcat</module>
     </modules>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>pluto</artifactId>
+                <version>${version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            
+        </dependencies>
+    </dependencyManagement>
+
 </project>
 

Modified: geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml?rev=787936&r1=787935&r2=787936&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml Wed Jun 24 07:56:32 2009
@@ -32,6 +32,18 @@
     <name>Geronimo Plugins, Debug Views :: Portlets</name>
     <packaging>war</packaging>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>pluto</artifactId>
+                <version>${version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
         <!-- for jspc maven plugin -->
         <dependency>

Modified: geronimo/server/trunk/plugins/monitoring/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/pom.xml?rev=787936&r1=787935&r2=787936&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/pom.xml Wed Jun 24 07:56:32 2009
@@ -40,7 +40,15 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-	</dependencies>
+            <dependency>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>pluto</artifactId>
+                <version>${version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+        </dependencies>
     </dependencyManagement>
 
     <modules>

Modified: geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml?rev=787936&r1=787935&r2=787936&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-portlets/pom.xml Wed Jun 24 07:56:32 2009
@@ -31,6 +31,19 @@
     <artifactId>openejb-portlets</artifactId>
     <name>Geronimo Plugins, OpenEJB :: Portlets</name>
     <packaging>war</packaging>
+    
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>pluto</artifactId>
+                <version>${version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+        </dependencies>
+    </dependencyManagement>
 
     <dependencies>
         <!-- for jspc maven plugin -->
@@ -53,7 +66,6 @@
         <dependency>
             <groupId>org.apache.pluto</groupId>
             <artifactId>pluto-taglib</artifactId>
-            <version>${plutoVersion}</version>
             <scope>provided</scope>
         </dependency>
 

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml?rev=787936&r1=787935&r2=787936&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml Wed Jun 24 07:56:32 2009
@@ -32,6 +32,19 @@
     <name>Geronimo Plugins, Plan Creator :: Portlets</name>
     <packaging>war</packaging>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>pluto</artifactId>
+                <version>${version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <!-- for jspc maven plugin -->
         <dependency>

Modified: geronimo/server/trunk/plugins/pluto/geronimo-pluto/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pluto/geronimo-pluto/pom.xml?rev=787936&r1=787935&r2=787936&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pluto/geronimo-pluto/pom.xml (original)
+++ geronimo/server/trunk/plugins/pluto/geronimo-pluto/pom.xml Wed Jun 24 07:56:32 2009
@@ -52,6 +52,11 @@
             <artifactId>geronimo-kernel</artifactId>
             <version>${version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
 </project>

Modified: geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/AdminConsoleExtensionGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/AdminConsoleExtensionGBean.java?rev=787936&r1=787935&r2=787936&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/AdminConsoleExtensionGBean.java (original)
+++ geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/AdminConsoleExtensionGBean.java Wed Jun 24 07:56:32 2009
@@ -25,7 +25,7 @@
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
-import org.apache.pluto.driver.services.portal.PageConfig;
+import org.apache.geronimo.pluto.impl.PageConfig;
 import org.apache.pluto.driver.services.portal.PortletWindowConfig;
 import org.apache.pluto.driver.services.portal.RenderConfigService;
 import org.apache.pluto.driver.services.portal.admin.RenderConfigAdminService;
@@ -154,7 +154,7 @@
     private PageConfig getPageConfigFromPluto() {
         RenderConfigService service = portletContainerServices.getRenderConfigService();
 
-        return service.getPage(pageTitle);
+        return (PageConfig) service.getPage(pageTitle);
     }
 
     /*

Added: geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/impl/PageConfig.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/impl/PageConfig.java?rev=787936&view=auto
==============================================================================
--- geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/impl/PageConfig.java (added)
+++ geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/impl/PageConfig.java Wed Jun 24 07:56:32 2009
@@ -0,0 +1,37 @@
+/*
+ * 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.impl;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class PageConfig extends org.apache.pluto.driver.services.portal.PageConfig {
+
+    private String icon;
+
+    public String getIcon() {
+        return icon;
+    }
+
+    public void setIcon(String icon) {
+        this.icon = icon;
+    }
+}

Propchange: geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/impl/PageConfig.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/impl/PageConfig.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/impl/PageConfig.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/impl/PropertyConfigServiceImpl.java (from r787868, portals/pluto/tags/pluto-1.1.6/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/PropertyConfigServiceImpl.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/impl/PropertyConfigServiceImpl.java?p2=geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/impl/PropertyConfigServiceImpl.java&p1=portals/pluto/tags/pluto-1.1.6/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/PropertyConfigServiceImpl.java&r1=787868&r2=787936&rev=787936&view=diff
==============================================================================
--- portals/pluto/tags/pluto-1.1.6/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/PropertyConfigServiceImpl.java (original)
+++ geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/impl/PropertyConfigServiceImpl.java Wed Jun 24 07:56:32 2009
@@ -14,30 +14,33 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.driver.services.impl.resource;
+package org.apache.geronimo.pluto.impl;
 
 import java.io.InputStream;
 import java.util.Set;
 
 import javax.servlet.ServletContext;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+//import org.apache.commons.logging.Log;
+//import org.apache.commons.logging.LogFactory;
 import org.apache.pluto.driver.config.DriverConfigurationException;
 import org.apache.pluto.driver.services.portal.PropertyConfigService;
+import org.apache.pluto.driver.services.impl.resource.ResourceConfig;
 
 /**
  * Default implementation of all of the portal Services.
  * Utilizes resource configuration from
  * <code>pluto-portal-driver-config.xml</code>
  *
+ * copied from  https://svn.apache.org/repos/asf/portals/pluto/tags/pluto-1.1.6/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/PropertyConfigServiceImpl.java
+ *
  * @since Aug 10, 2005
  */
 public class PropertyConfigServiceImpl implements
     PropertyConfigService {
 
-    private static final Log LOG =
-        LogFactory.getLog(PropertyConfigServiceImpl.class);
+//    private static final Log LOG =
+//        LogFactory.getLog(PropertyConfigServiceImpl.class);
 
     private ResourceConfig config;
 
@@ -47,7 +50,7 @@
 
     /**
      * Initialization Lifecycle Method
-     * @param ctx
+     * @param ctx ServletContext for finding resources
      */
     public void init(ServletContext ctx) {
         try {
@@ -55,7 +58,7 @@
             config = ResourceConfigReader.getFactory().parse(in);
         }
         catch(Exception e) {
-            LOG.error("Unable to parse resource config "+e.getMessage(), e);
+//            LOG.error("Unable to parse resource config "+e.getMessage(), e);
             throw new DriverConfigurationException(e);
         }
     }

Copied: geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/impl/RenderConfigServiceImpl.java (from r787868, portals/pluto/tags/pluto-1.1.6/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/RenderConfigServiceImpl.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/impl/RenderConfigServiceImpl.java?p2=geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/impl/RenderConfigServiceImpl.java&p1=portals/pluto/tags/pluto-1.1.6/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/RenderConfigServiceImpl.java&r1=787868&r2=787936&rev=787936&view=diff
==============================================================================
--- portals/pluto/tags/pluto-1.1.6/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/RenderConfigServiceImpl.java (original)
+++ geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/impl/RenderConfigServiceImpl.java Wed Jun 24 07:56:32 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.driver.services.impl.resource;
+package org.apache.geronimo.pluto.impl;
 
 import java.io.InputStream;
 import java.util.List;
@@ -26,12 +26,15 @@
 import org.apache.pluto.driver.services.portal.PageConfig;
 import org.apache.pluto.driver.services.portal.RenderConfigService;
 import org.apache.pluto.driver.services.portal.admin.RenderConfigAdminService;
+import org.apache.pluto.driver.services.impl.resource.ResourceConfig;
 
 /**
  * Default implementation of all of the portal Services.
  * Utilizes resource configuration from
  * <code>pluto-portal-driver-config.xml</code>
  *
+ * copied from https://svn.apache.org/repos/asf/portals/pluto/tags/pluto-1.1.6/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/RenderConfigServiceImpl.java
+ *
  * @since Aug 10, 2005
  */
 public class RenderConfigServiceImpl

Copied: geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/impl/ResourceConfigReader.java (from r787868, portals/pluto/tags/pluto-1.1.6/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/ResourceConfigReader.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/impl/ResourceConfigReader.java?p2=geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/impl/ResourceConfigReader.java&p1=portals/pluto/tags/pluto-1.1.6/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/ResourceConfigReader.java&r1=787868&r2=787936&rev=787936&view=diff
==============================================================================
--- portals/pluto/tags/pluto-1.1.6/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/ResourceConfigReader.java (original)
+++ geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/impl/ResourceConfigReader.java Wed Jun 24 07:56:32 2009
@@ -14,27 +14,30 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.driver.services.impl.resource;
+package org.apache.geronimo.pluto.impl;
 
 import java.io.IOException;
 import java.io.InputStream;
 
 import org.apache.commons.digester.Digester;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.pluto.driver.services.portal.PageConfig;
+//import org.apache.commons.logging.Log;
+//import org.apache.commons.logging.LogFactory;
+//import org.apache.pluto.driver.services.portal.PageConfig;
 import org.apache.pluto.driver.services.portal.RenderConfig;
+import org.apache.pluto.driver.services.impl.resource.ResourceConfig;
 import org.xml.sax.SAXException;
 
 /**
  * @version 1.0
+ *
+ * Copied from https://svn.apache.org/repos/asf/portals/pluto/tags/pluto-1.1.6/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/impl/resource/ResourceConfigReader.java
  * @since Sep 23, 2004
  */
 public class ResourceConfigReader {
 
-    private static final Log LOG = LogFactory.getLog(
-        ResourceConfigReader.class
-    );
+//    private static final Log LOG = LogFactory.getLog(
+//        ResourceConfigReader.class
+//    );
 
     public static final String CONFIG_FILE =
         "/WEB-INF/pluto-portal-driver-config.xml";
@@ -66,9 +69,9 @@
 // Digester Setup
 
     private void init() {
-        if (LOG.isDebugEnabled()) {
-            LOG.debug("Setting up digester...");
-        }
+//        if (LOG.isDebugEnabled()) {
+//            LOG.debug("Setting up digester...");
+//        }
         digester.addObjectCreate(
             "pluto-portal-driver",
             ResourceConfig.class

Copied: geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/resources/pluto-portal-driver-config.xsd (from r787868, portals/pluto/tags/pluto-1.1.6/pluto-portal-driver/src/main/resources/pluto-portal-driver-config.xsd)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/resources/pluto-portal-driver-config.xsd?p2=geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/resources/pluto-portal-driver-config.xsd&p1=portals/pluto/tags/pluto-1.1.6/pluto-portal-driver/src/main/resources/pluto-portal-driver-config.xsd&r1=787868&r2=787936&rev=787936&view=diff
==============================================================================
--- portals/pluto/tags/pluto-1.1.6/pluto-portal-driver/src/main/resources/pluto-portal-driver-config.xsd (original)
+++ geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/resources/pluto-portal-driver-config.xsd Wed Jun 24 07:56:32 2009
@@ -15,8 +15,9 @@
 	See the License for the specific language governing permissions and
 	limitations under the License.
 -->
+        <!-- copied from  https://svn.apache.org/repos/asf/portals/pluto/tags/pluto-1.1.6/pluto-portal-driver/src/main/resources/pluto-portal-driver-config.xsd  -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd"
+	targetNamespace="http://geronimo.apache.org/pluto/xsd/pluto-portal-driver-config.xsd"
 	elementFormDefault="qualified">
 
 	<xs:element name="pluto-portal-driver">
@@ -59,6 +60,8 @@
 										type="xs:string" />
 									<xs:attribute name="uri"
 										type="xs:string" />
+                                    <xs:attribute name="icon"
+                                        type="xs:string" />
 								</xs:complexType>
 							</xs:element>
 						</xs:sequence>

Modified: geronimo/server/trunk/plugins/pluto/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pluto/pom.xml?rev=787936&r1=787935&r2=787936&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pluto/pom.xml (original)
+++ geronimo/server/trunk/plugins/pluto/pom.xml Wed Jun 24 07:56:32 2009
@@ -41,5 +41,180 @@
         <module>pluto-support</module>
     </modules>
 
+    <properties>
+        <plutoVersion>1.1.6</plutoVersion>
+    </properties>
+
+  <dependencyManagement>
+    <dependencies>
+      <!-- Admin Console support -->
+      <dependency>
+          <groupId>org.apache.pluto</groupId>
+          <artifactId>pluto-portal-driver</artifactId>
+          <version>${plutoVersion}</version>
+          <exclusions>
+              <exclusion>
+                  <groupId>javax.servlet</groupId>
+                  <artifactId>jstl</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>taglibs</groupId>
+                  <artifactId>standard</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>javax.servlet</groupId>
+                  <artifactId>jsp-api</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>javax.servlet</groupId>
+                  <artifactId>servlet-api</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>xml-apis</groupId>
+                  <artifactId>xml-apis</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>junit</groupId>
+                  <artifactId>junit</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>org.springframework</groupId>
+                  <artifactId>spring-beans</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>org.springframework</groupId>
+                  <artifactId>spring-context</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>org.springframework</groupId>
+                  <artifactId>spring-core</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>org.springframework</groupId>
+                  <artifactId>spring-web</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>commons-io</groupId>
+                  <artifactId>commons-io</artifactId>
+              </exclusion>
+          </exclusions>
+      </dependency>
+
+      <dependency>
+          <groupId>org.apache.pluto</groupId>
+          <artifactId>pluto-portal-driver-impl</artifactId>
+          <version>${plutoVersion}</version>
+          <exclusions>
+              <exclusion>
+                  <groupId>javax.servlet</groupId>
+                  <artifactId>jstl</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>taglibs</groupId>
+                  <artifactId>standard</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>javax.servlet</groupId>
+                  <artifactId>jsp-api</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>javax.servlet</groupId>
+                  <artifactId>servlet-api</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>xml-apis</groupId>
+                  <artifactId>xml-apis</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>junit</groupId>
+                  <artifactId>junit</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>org.springframework</groupId>
+                  <artifactId>spring-beans</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>org.springframework</groupId>
+                  <artifactId>spring-context</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>org.springframework</groupId>
+                  <artifactId>spring-core</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>org.springframework</groupId>
+                  <artifactId>spring-web</artifactId>
+              </exclusion>
+          </exclusions>
+      </dependency>
+
+      <dependency>
+          <groupId>org.apache.pluto</groupId>
+          <artifactId>pluto-container</artifactId>
+          <version>${plutoVersion}</version>
+          <exclusions>
+              <exclusion>
+                  <groupId>commons-logging</groupId>
+                  <artifactId>commons-logging</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>commons-logging</groupId>
+                  <artifactId>commons-logging-api</artifactId>
+              </exclusion>
+          </exclusions>
+      </dependency>
+
+      <dependency>
+          <groupId>org.apache.pluto</groupId>
+          <artifactId>pluto-taglib</artifactId>
+          <version>${plutoVersion}</version>
+          <exclusions>
+              <exclusion>
+                  <groupId>commons-logging</groupId>
+                  <artifactId>commons-logging-api</artifactId>
+              </exclusion>
+          </exclusions>
+      </dependency>
+
+      <dependency>
+          <groupId>org.apache.pluto</groupId>
+          <artifactId>pluto-descriptor-impl</artifactId>
+          <version>${plutoVersion}</version>
+          <exclusions>
+              <exclusion>
+                  <groupId>commons-io</groupId>
+                  <artifactId>commons-io</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>commons-logging</groupId>
+                  <artifactId>commons-logging</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>commons-logging</groupId>
+                  <artifactId>commons-logging-api</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>xerces</groupId>
+                  <artifactId>xercesImpl</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>xerces</groupId>
+                  <artifactId>xmlParserAPIs</artifactId>
+              </exclusion>
+              <exclusion>
+                  <groupId>xml-apis</groupId>
+                  <artifactId>xml-apis</artifactId>
+              </exclusion>
+          </exclusions>
+      </dependency>
+
+      <dependency>
+          <groupId>org.apache.pluto</groupId>
+          <artifactId>pluto-descriptor-api</artifactId>
+          <version>${plutoVersion}</version>
+      </dependency>
+
+    </dependencies>
+  </dependencyManagement>
 </project>
 

Modified: geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml?rev=787936&r1=787935&r2=787936&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-portlets/pom.xml Wed Jun 24 07:56:32 2009
@@ -32,6 +32,19 @@
     <name>Geronimo Plugins, System Database :: Portlets</name>
     <packaging>war</packaging>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>pluto</artifactId>
+                <version>${version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
+        </dependencies>
+    </dependencyManagement>
+    
     <dependencies>
         <!-- for jspc maven plugin -->
         <dependency>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=787936&r1=787935&r2=787936&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Wed Jun 24 07:56:32 2009
@@ -82,7 +82,6 @@
         <axis2Version>1.5</axis2Version>
         <axiomVersion>1.2.8</axiomVersion>
         <springVersion>2.5.6</springVersion>
-        <plutoVersion>1.1.6-G643117</plutoVersion>
         <openjpaVersion>1.2.1</openjpaVersion>
         <xbeanVersion>3.6-SNAPSHOT</xbeanVersion>
         <!-- switch using  -Pee6 -->
@@ -1832,173 +1831,6 @@
                 <version>1.1.6</version>
             </dependency>
 
-            <!-- Admin Console support -->
-            <dependency>
-                <groupId>org.apache.pluto</groupId>
-                <artifactId>pluto-portal-driver</artifactId>
-                <version>${plutoVersion}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>javax.servlet</groupId>
-                        <artifactId>jstl</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>taglibs</groupId>
-                        <artifactId>standard</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.servlet</groupId>
-                        <artifactId>jsp-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.servlet</groupId>
-                        <artifactId>servlet-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>xml-apis</groupId>
-                        <artifactId>xml-apis</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>junit</groupId>
-                        <artifactId>junit</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-beans</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-context</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-core</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-web</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>commons-io</groupId>
-                        <artifactId>commons-io</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.pluto</groupId>
-                <artifactId>pluto-portal-driver-impl</artifactId>
-                <version>${plutoVersion}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>javax.servlet</groupId>
-                        <artifactId>jstl</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>taglibs</groupId>
-                        <artifactId>standard</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.servlet</groupId>
-                        <artifactId>jsp-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>javax.servlet</groupId>
-                        <artifactId>servlet-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>xml-apis</groupId>
-                        <artifactId>xml-apis</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>junit</groupId>
-                        <artifactId>junit</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-beans</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-context</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-core</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-web</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.pluto</groupId>
-                <artifactId>pluto-container</artifactId>
-                <version>${plutoVersion}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>commons-logging</groupId>
-                        <artifactId>commons-logging</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>commons-logging</groupId>
-                        <artifactId>commons-logging-api</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.pluto</groupId>
-                <artifactId>pluto-taglib</artifactId>
-                <version>${plutoVersion}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>commons-logging</groupId>
-                        <artifactId>commons-logging-api</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.pluto</groupId>
-                <artifactId>pluto-descriptor-impl</artifactId>
-                <version>${plutoVersion}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>commons-io</groupId>
-                        <artifactId>commons-io</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>commons-logging</groupId>
-                        <artifactId>commons-logging</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>commons-logging</groupId>
-                        <artifactId>commons-logging-api</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>xerces</groupId>
-                        <artifactId>xercesImpl</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>xerces</groupId>
-                        <artifactId>xmlParserAPIs</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>xml-apis</groupId>
-                        <artifactId>xml-apis</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.pluto</groupId>
-                <artifactId>pluto-descriptor-api</artifactId>
-                <version>${plutoVersion}</version>
-            </dependency>
-
             <dependency>
                 <groupId>org.dojotoolkit</groupId>
                 <artifactId>dojo-mini</artifactId>

Modified: geronimo/server/trunk/repository/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/repository/pom.xml?rev=787936&r1=787935&r2=787936&view=diff
==============================================================================
--- geronimo/server/trunk/repository/pom.xml (original)
+++ geronimo/server/trunk/repository/pom.xml Wed Jun 24 07:56:32 2009
@@ -79,30 +79,30 @@
         <!--</dependency>-->
 
         <!-- Added for patched build of Pluto 1.1.6-G643117 -->
-        <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>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-taglib</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>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-taglib</artifactId>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>jtidy</groupId>



Mime
View raw message