portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r762775 - in /portals/pluto/trunk: pluto-container/src/main/java/org/apache/pluto/container/driver/impl/ pluto-container/src/main/resources/META-INF/ pluto-container/src/main/resources/org/apache/pluto/container/driver/ pluto-container/src/...
Date Tue, 07 Apr 2009 13:47:12 GMT
Author: cziegeler
Date: Tue Apr  7 13:47:12 2009
New Revision: 762775

URL: http://svn.apache.org/viewvc?rev=762775&view=rev
Log:
PLUTO-545 : Move container driver into portal driver

Added:
    portals/pluto/trunk/pluto-portal-driver/src/main/resources/META-INF/
    portals/pluto/trunk/pluto-portal-driver/src/main/resources/META-INF/pluto.properties 
 (contents, props changed)
      - copied, changed from r762752, portals/pluto/trunk/pluto-container/src/main/resources/META-INF/pluto.properties
    portals/pluto/trunk/pluto-portal-driver/src/main/resources/org/
    portals/pluto/trunk/pluto-portal-driver/src/main/resources/org/apache/
    portals/pluto/trunk/pluto-portal-driver/src/main/resources/org/apache/pluto/
    portals/pluto/trunk/pluto-portal-driver/src/main/resources/org/apache/pluto/driver/
    portals/pluto/trunk/pluto-portal-driver/src/main/resources/org/apache/pluto/driver/container/
    portals/pluto/trunk/pluto-portal-driver/src/main/resources/org/apache/pluto/driver/container/LocalStrings.properties
  (props changed)
      - copied unchanged from r762752, portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/driver/impl/LocalStrings.properties
    portals/pluto/trunk/pluto-portal-driver/src/main/resources/org/apache/pluto/driver/container/pluto-configuration.properties
  (props changed)
      - copied unchanged from r762752, portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/driver/impl/pluto-configuration.properties
Removed:
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/
    portals/pluto/trunk/pluto-container/src/main/resources/META-INF/
    portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/container/driver/
    portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/container/driver/
Modified:
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/Configuration.java

Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/Configuration.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/Configuration.java?rev=762775&r1=762774&r2=762775&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/Configuration.java
(original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/Configuration.java
Tue Apr  7 13:47:12 2009
@@ -35,7 +35,7 @@
         LogFactory.getLog(Configuration.class);
 
     public static final ResourceBundle BUNDLE =
-        ResourceBundle.getBundle("org.apache.pluto.container.driver.impl.pluto-configuration");
+        ResourceBundle.getBundle("org.apache.pluto.driver.container.pluto-configuration");
 
     private static final String DESCRIPTOR_SERVICE =
         "org.apache.pluto.descriptors.services.PortletAppDescriptorService";

Copied: portals/pluto/trunk/pluto-portal-driver/src/main/resources/META-INF/pluto.properties
(from r762752, portals/pluto/trunk/pluto-container/src/main/resources/META-INF/pluto.properties)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/resources/META-INF/pluto.properties?p2=portals/pluto/trunk/pluto-portal-driver/src/main/resources/META-INF/pluto.properties&p1=portals/pluto/trunk/pluto-container/src/main/resources/META-INF/pluto.properties&r1=762752&r2=762775&rev=762775&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/resources/META-INF/pluto.properties (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/resources/META-INF/pluto.properties Tue
Apr  7 13:47:12 2009
@@ -26,12 +26,12 @@
 #   of the following services:
 #
 #
-#  org.apache.pluto.container.driver.impl.ApplicationIdResolver -
+#  org.apache.pluto.driver.container.ApplicationIdResolver -
 #          used to resolve servlet context names in different environments.
 #          In a Servlet 2.5 world this is directly available at initialization
 #          however, in 2.4 and below, it must be resolved.  Unfortunately,
 #          different application servers do not all get resolved in the same
 #          manner.
-org.apache.pluto.container.driver.impl.ApplicationIdResolver=org.apache.pluto.container.driver.impl.DefaultApplicationIdResolver,\
-  org.apache.pluto.container.driver.impl.InitParameterApplicationIdResolver,\
-  org.apache.pluto.container.driver.impl.AttributeApplicationIdResolver
+org.apache.pluto.driver.container.ApplicationIdResolver=org.apache.pluto.driver.container.DefaultApplicationIdResolver,\
+  org.apache.pluto.driver.container.InitParameterApplicationIdResolver,\
+  org.apache.pluto.driver.container.AttributeApplicationIdResolver

Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/resources/META-INF/pluto.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/resources/META-INF/pluto.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/resources/org/apache/pluto/driver/container/LocalStrings.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/resources/org/apache/pluto/driver/container/LocalStrings.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/resources/org/apache/pluto/driver/container/pluto-configuration.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/resources/org/apache/pluto/driver/container/pluto-configuration.properties
------------------------------------------------------------------------------
    svn:mergeinfo = 



Mime
View raw message