portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r762773 - in /portals/pluto/trunk: assembly/ pluto-ant-tasks/ pluto-container-driver-api/ pluto-container/src/main/java/org/apache/pluto/container/driver/impl/ pluto-container/src/main/java/org/apache/pluto/container/impl/ pluto-container/s...
Date Tue, 07 Apr 2009 13:41:01 GMT
Author: cziegeler
Date: Tue Apr  7 13:40:59 2009
New Revision: 762773

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

Added:
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/ApplicationIdResolver.java   (contents, props changed)
      - copied, changed from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/ApplicationIdResolver.java
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/AttributeApplicationIdResolver.java   (contents, props changed)
      - copied, changed from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/AttributeApplicationIdResolver.java
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/CombinedPortletResourceBundle.java   (contents, props changed)
      - copied, changed from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/CombinedPortletResourceBundle.java
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/Configuration.java   (contents, props changed)
      - copied, changed from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/Configuration.java
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultApplicationIdResolver.java   (contents, props changed)
      - copied, changed from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultApplicationIdResolver.java
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultNamespaceMapper.java   (contents, props changed)
      - copied, changed from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultNamespaceMapper.java
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultOptionalContainerServices.java   (contents, props changed)
      - copied, changed from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultOptionalContainerServices.java
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultPortalAdministrationService.java   (contents, props changed)
      - copied, changed from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultPortalAdministrationService.java
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultPortletInvokerService.java   (contents, props changed)
      - copied, changed from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultPortletInvokerService.java
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultPortletPreferencesService.java   (contents, props changed)
      - copied, changed from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultPortletPreferencesService.java
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultUserInfoService.java   (contents, props changed)
      - copied, changed from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultUserInfoService.java
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DriverPortletConfigImpl.java   (contents, props changed)
      - copied, changed from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DriverPortletConfigImpl.java
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DriverPortletContextImpl.java   (contents, props changed)
      - copied, changed from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DriverPortletContextImpl.java
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DummyCCPPProfileServiceImpl.java   (contents, props changed)
      - copied, changed from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DummyCCPPProfileServiceImpl.java
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DummyProfile.java   (contents, props changed)
      - copied, changed from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DummyProfile.java
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/Environment.java   (contents, props changed)
      - copied, changed from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/Environment.java
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/InitParameterApplicationIdResolver.java   (contents, props changed)
      - copied, changed from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/InitParameterApplicationIdResolver.java
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/InlinePortletResourceBundle.java   (contents, props changed)
      - copied, changed from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/InlinePortletResourceBundle.java
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PlutoContainerInfo.java   (contents, props changed)
      - copied, changed from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PlutoContainerInfo.java
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PortalDriverServicesImpl.java   (contents, props changed)
      - copied, changed from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PortalDriverServicesImpl.java
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PortletContextManager.java   (contents, props changed)
      - copied, changed from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PortletContextManager.java
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PortletDescriptorRegistry.java   (contents, props changed)
      - copied, changed from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PortletDescriptorRegistry.java
    portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/ResourceBundleFactory.java   (contents, props changed)
      - copied, changed from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/ResourceBundleFactory.java
    portals/pluto/trunk/pluto-portal-driver/src/test/java/org/apache/pluto/driver/container/   (props changed)
      - copied from r762752, portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/container/driver/impl/
    portals/pluto/trunk/pluto-portal-driver/src/test/java/org/apache/pluto/driver/container/PlutoTestCase.java   (with props)
Removed:
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/ApplicationIdResolver.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/AttributeApplicationIdResolver.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/CombinedPortletResourceBundle.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/Configuration.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultApplicationIdResolver.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultNamespaceMapper.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultOptionalContainerServices.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultPortalAdministrationService.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultPortletInvokerService.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultPortletPreferencesService.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultUserInfoService.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DriverPortletConfigImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DriverPortletContextImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DummyCCPPProfileServiceImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DummyProfile.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/Environment.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/InitParameterApplicationIdResolver.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/InlinePortletResourceBundle.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PlutoContainerInfo.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PortalDriverServicesImpl.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PortletContextManager.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PortletDescriptorRegistry.java
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/ResourceBundleFactory.java
    portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/container/driver/impl/
Modified:
    portals/pluto/trunk/assembly/pom.xml
    portals/pluto/trunk/pluto-ant-tasks/pom.xml
    portals/pluto/trunk/pluto-container-driver-api/   (props changed)
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContainerFactory.java
    portals/pluto/trunk/pluto-portal-driver-impl/pom.xml
    portals/pluto/trunk/pluto-portal-driver/pom.xml
    portals/pluto/trunk/pluto-portal-driver/src/test/java/org/apache/pluto/driver/container/DefaultNamespaceMapperTest.java
    portals/pluto/trunk/pluto-portal-driver/src/test/java/org/apache/pluto/driver/container/ResourceBundleFactoryTest.java
    portals/pluto/trunk/pluto-portal/pom.xml
    portals/pluto/trunk/pluto-site-skin/pom.xml
    portals/pluto/trunk/pluto-site/pom.xml
    portals/pluto/trunk/pluto-taglib/pom.xml
    portals/pluto/trunk/pluto-testsuite/pom.xml
    portals/pluto/trunk/pluto-util/pom.xml

Modified: portals/pluto/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/assembly/pom.xml?rev=762773&r1=762772&r2=762773&view=diff
==============================================================================
--- portals/pluto/trunk/assembly/pom.xml (original)
+++ portals/pluto/trunk/assembly/pom.xml Tue Apr  7 13:40:59 2009
@@ -26,7 +26,7 @@
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>assembly</artifactId>
-  <name>Pluto Assembly Project</name>
+  <name>Apache Pluto Assembly Project</name>
   <url>http://portals.apache.org/pluto/</url>
   <inceptionYear>2001</inceptionYear>
 

Modified: portals/pluto/trunk/pluto-ant-tasks/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-ant-tasks/pom.xml?rev=762773&r1=762772&r2=762773&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-ant-tasks/pom.xml (original)
+++ portals/pluto/trunk/pluto-ant-tasks/pom.xml Tue Apr  7 13:40:59 2009
@@ -29,7 +29,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>pluto-ant-tasks</artifactId> 
   <packaging>jar</packaging>
-  <name>Pluto Ant Tasks</name> 
+  <name>Apache Pluto Ant Tasks</name> 
   <description>The Pluto Ant Tasks are used to assemble, deploy, and publish portlets to the Pluto Portal Driver.</description>
   
   <dependencies>

Propchange: portals/pluto/trunk/pluto-container-driver-api/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Apr  7 13:40:59 2009
@@ -0,0 +1 @@
+target

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContainerFactory.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContainerFactory.java?rev=762773&r1=762772&r2=762773&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContainerFactory.java (original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/impl/PortletContainerFactory.java Tue Apr  7 13:40:59 2009
@@ -22,7 +22,6 @@
 import org.apache.pluto.container.PortletContainer;
 import org.apache.pluto.container.PortletContainerException;
 import org.apache.pluto.container.RequiredContainerServices;
-import org.apache.pluto.container.driver.impl.DefaultOptionalContainerServices;
 import org.apache.pluto.container.util.ArgumentUtility;
 
 /**
@@ -73,7 +72,7 @@
         throws PortletContainerException {
         return createContainer(containerName,
                                requiredServices,
-                               new DefaultOptionalContainerServices());
+                               null);
    }
 
     public PortletContainer createContainer(

Modified: portals/pluto/trunk/pluto-portal-driver-impl/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver-impl/pom.xml?rev=762773&r1=762772&r2=762773&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver-impl/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal-driver-impl/pom.xml Tue Apr  7 13:40:59 2009
@@ -29,7 +29,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pluto-portal-driver-impl</artifactId>
     <packaging>jar</packaging>
-    <name>Pluto Portal Driver Implementation Classes</name>
+    <name>Apache Pluto Portal Driver Implementation Classes</name>
 
     <dependencies>
 

Modified: portals/pluto/trunk/pluto-portal-driver/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/pom.xml?rev=762773&r1=762772&r2=762773&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal-driver/pom.xml Tue Apr  7 13:40:59 2009
@@ -29,114 +29,133 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pluto-portal-driver</artifactId>
     <packaging>jar</packaging>
-    <name>Pluto Portal Driver</name>
+    <name>Apache Pluto Portal Driver</name>
 
-    
-    
     <dependencies>
 
-    <dependency>
-      <groupId>org.apache.pluto</groupId>
-      <artifactId>pluto-container</artifactId>
-      <version>${pom.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.pluto</groupId>
-      <artifactId>pluto-taglib</artifactId>
-      <version>${pom.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>commons-digester</groupId>
-      <artifactId>commons-digester</artifactId>
-      <version>${commons-digester.version}</version>
-      <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>${junit.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.portlet</groupId>
-      <artifactId>portlet-api</artifactId>
-      <version>${portlet-api.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
-      <version>${servlet-api.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-		<groupId>javax.servlet</groupId>
-		<artifactId>jsp-api</artifactId>
-		<version>${jsp-api.version}</version>
-		<scope>provided</scope>
-   	</dependency>
-    <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>jstl</artifactId>
-      <version>${jstl.version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>taglibs</groupId>
-      <artifactId>standard</artifactId>
-      <version>${taglibs.standard.version}</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-core</artifactId>
-      <version>${springframework.version}</version>
-      <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-beans</artifactId>
-      <version>${springframework.version}</version>
-      <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-web</artifactId>
-      <version>${springframework.version}</version>
-      <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>commons-logging</groupId>
-          <artifactId>commons-logging</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-      <version>${commons-io.version}</version>
-    </dependency>
-  </dependencies>
+        <dependency>
+            <groupId>org.apache.pluto</groupId>
+            <artifactId>pluto-container</artifactId>
+            <version>${pom.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.pluto</groupId>
+            <artifactId>pluto-taglib</artifactId>
+            <version>${pom.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>commons-digester</groupId>
+            <artifactId>commons-digester</artifactId>
+            <version>${commons-digester.version}</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>javax.portlet</groupId>
+            <artifactId>portlet-api</artifactId>
+            <version>${portlet-api.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>${servlet-api.version}</version>
+            <scope>provided</scope>
+        </dependency>
+      <!--  CCPP Libraries -->
+        <dependency>
+            <groupId>javax.ccpp</groupId>
+            <artifactId>ccpp</artifactId>
+            <version>${ccpp-api.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+		    <groupId>javax.servlet</groupId>
+		    <artifactId>jsp-api</artifactId>
+		    <version>${jsp-api.version}</version>
+		    <scope>provided</scope>
+   	    </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+            <version>${jstl.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>taglibs</groupId>
+            <artifactId>standard</artifactId>
+            <version>${taglibs.standard.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <version>${springframework.version}</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <version>${springframework.version}</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-web</artifactId>
+            <version>${springframework.version}</version>
+            <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>${commons-io.version}</version>
+        </dependency>
+  
+    <!-- Testing Libraries ================================================= -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>jmock</groupId>
+            <artifactId>jmock</artifactId>
+            <version>${jmock.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>jmock</groupId>
+            <artifactId>jmock-cglib</artifactId>
+            <version>${jmock.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 
     <build>
         <plugins>

Copied: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/ApplicationIdResolver.java (from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/ApplicationIdResolver.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/ApplicationIdResolver.java?p2=portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/ApplicationIdResolver.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/ApplicationIdResolver.java&r1=762752&r2=762773&rev=762773&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/ApplicationIdResolver.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/ApplicationIdResolver.java Tue Apr  7 13:40:59 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.driver.impl;
+package org.apache.pluto.driver.container;
 
 import javax.servlet.ServletContext;
 

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

Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/ApplicationIdResolver.java
------------------------------------------------------------------------------
    svn:keywords = Id Author Date Rev

Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/ApplicationIdResolver.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/AttributeApplicationIdResolver.java (from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/AttributeApplicationIdResolver.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/AttributeApplicationIdResolver.java?p2=portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/AttributeApplicationIdResolver.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/AttributeApplicationIdResolver.java&r1=762752&r2=762773&rev=762773&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/AttributeApplicationIdResolver.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/AttributeApplicationIdResolver.java Tue Apr  7 13:40:59 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.driver.impl;
+package org.apache.pluto.driver.container;
 
 import javax.servlet.ServletContext;
 

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

Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/AttributeApplicationIdResolver.java
------------------------------------------------------------------------------
    svn:keywords = Id Author Date Rev

Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/AttributeApplicationIdResolver.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/CombinedPortletResourceBundle.java (from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/CombinedPortletResourceBundle.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/CombinedPortletResourceBundle.java?p2=portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/CombinedPortletResourceBundle.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/CombinedPortletResourceBundle.java&r1=762752&r2=762773&rev=762773&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/CombinedPortletResourceBundle.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/CombinedPortletResourceBundle.java Tue Apr  7 13:40:59 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.driver.impl;
+package org.apache.pluto.driver.container;
 
 import java.util.Collections;
 import java.util.Enumeration;

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

Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/CombinedPortletResourceBundle.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/Configuration.java (from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/Configuration.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/Configuration.java?p2=portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/Configuration.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/Configuration.java&r1=762752&r2=762773&rev=762773&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/Configuration.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/Configuration.java Tue Apr  7 13:40:59 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.driver.impl;
+package org.apache.pluto.driver.container;
 
 import java.util.ArrayList;
 import java.util.List;

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

Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/Configuration.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultApplicationIdResolver.java (from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultApplicationIdResolver.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultApplicationIdResolver.java?p2=portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultApplicationIdResolver.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultApplicationIdResolver.java&r1=762752&r2=762773&rev=762773&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultApplicationIdResolver.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultApplicationIdResolver.java Tue Apr  7 13:40:59 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.driver.impl;
+package org.apache.pluto.driver.container;
 
 import java.net.MalformedURLException;
 import java.net.URL;

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

Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultApplicationIdResolver.java
------------------------------------------------------------------------------
    svn:keywords = Id Author Date Rev

Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultApplicationIdResolver.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultNamespaceMapper.java (from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultNamespaceMapper.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultNamespaceMapper.java?p2=portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultNamespaceMapper.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultNamespaceMapper.java&r1=762752&r2=762773&rev=762773&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultNamespaceMapper.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultNamespaceMapper.java Tue Apr  7 13:40:59 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.driver.impl;
+package org.apache.pluto.driver.container;
 
 import org.apache.pluto.container.NamespaceMapper;
 import org.apache.pluto.container.PortletWindowID;

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

Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultNamespaceMapper.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultOptionalContainerServices.java (from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultOptionalContainerServices.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultOptionalContainerServices.java?p2=portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultOptionalContainerServices.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultOptionalContainerServices.java&r1=762752&r2=762773&rev=762773&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultOptionalContainerServices.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultOptionalContainerServices.java Tue Apr  7 13:40:59 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.driver.impl;
+package org.apache.pluto.driver.container;
 
 import org.apache.pluto.container.CCPPProfileService;
 import org.apache.pluto.container.NamespaceMapper;

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

Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultOptionalContainerServices.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultPortalAdministrationService.java (from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultPortalAdministrationService.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultPortalAdministrationService.java?p2=portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultPortalAdministrationService.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultPortalAdministrationService.java&r1=762752&r2=762773&rev=762773&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultPortalAdministrationService.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultPortalAdministrationService.java Tue Apr  7 13:40:59 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.driver.impl;
+package org.apache.pluto.driver.container;
 
 import java.util.ArrayList;
 import java.util.List;

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

Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultPortalAdministrationService.java
------------------------------------------------------------------------------
    svn:keywords = Id Author Date Rev

Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultPortalAdministrationService.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultPortletInvokerService.java (from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultPortletInvokerService.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultPortletInvokerService.java?p2=portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultPortletInvokerService.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultPortletInvokerService.java&r1=762752&r2=762773&rev=762773&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultPortletInvokerService.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultPortletInvokerService.java Tue Apr  7 13:40:59 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.driver.impl;
+package org.apache.pluto.driver.container;
 
 import java.io.IOException;
 

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

Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultPortletInvokerService.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultPortletPreferencesService.java (from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultPortletPreferencesService.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultPortletPreferencesService.java?p2=portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultPortletPreferencesService.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultPortletPreferencesService.java&r1=762752&r2=762773&rev=762773&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultPortletPreferencesService.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultPortletPreferencesService.java Tue Apr  7 13:40:59 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.driver.impl;
+package org.apache.pluto.driver.container;
 
 import java.util.Collections;
 import java.util.HashMap;

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

Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultPortletPreferencesService.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultUserInfoService.java (from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultUserInfoService.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultUserInfoService.java?p2=portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultUserInfoService.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultUserInfoService.java&r1=762752&r2=762773&rev=762773&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DefaultUserInfoService.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultUserInfoService.java Tue Apr  7 13:40:59 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.driver.impl;
+package org.apache.pluto.driver.container;
 
 import java.util.Collections;
 import java.util.Map;

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

Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultUserInfoService.java
------------------------------------------------------------------------------
    svn:keywords = Id Author Date Rev

Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DefaultUserInfoService.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DriverPortletConfigImpl.java (from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DriverPortletConfigImpl.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DriverPortletConfigImpl.java?p2=portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DriverPortletConfigImpl.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DriverPortletConfigImpl.java&r1=762752&r2=762773&rev=762773&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DriverPortletConfigImpl.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DriverPortletConfigImpl.java Tue Apr  7 13:40:59 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.driver.impl;
+package org.apache.pluto.driver.container;
 
 import java.util.Locale;
 import java.util.ResourceBundle;

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

Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DriverPortletConfigImpl.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DriverPortletContextImpl.java (from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DriverPortletContextImpl.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DriverPortletContextImpl.java?p2=portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DriverPortletContextImpl.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DriverPortletContextImpl.java&r1=762752&r2=762773&rev=762773&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DriverPortletContextImpl.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DriverPortletContextImpl.java Tue Apr  7 13:40:59 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.driver.impl;
+package org.apache.pluto.driver.container;
 
 import javax.servlet.ServletContext;
 

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

Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DriverPortletContextImpl.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DummyCCPPProfileServiceImpl.java (from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DummyCCPPProfileServiceImpl.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DummyCCPPProfileServiceImpl.java?p2=portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DummyCCPPProfileServiceImpl.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DummyCCPPProfileServiceImpl.java&r1=762752&r2=762773&rev=762773&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DummyCCPPProfileServiceImpl.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DummyCCPPProfileServiceImpl.java Tue Apr  7 13:40:59 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.driver.impl;
+package org.apache.pluto.driver.container;
 
 import javax.ccpp.Profile;
 import javax.servlet.http.HttpServletRequest;

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

Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DummyCCPPProfileServiceImpl.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DummyProfile.java (from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DummyProfile.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DummyProfile.java?p2=portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DummyProfile.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DummyProfile.java&r1=762752&r2=762773&rev=762773&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/DummyProfile.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DummyProfile.java Tue Apr  7 13:40:59 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.driver.impl;
+package org.apache.pluto.driver.container;
 
 import java.util.Set;
 

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

Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/DummyProfile.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/Environment.java (from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/Environment.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/Environment.java?p2=portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/Environment.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/Environment.java&r1=762752&r2=762773&rev=762773&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/Environment.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/Environment.java Tue Apr  7 13:40:59 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.driver.impl;
+package org.apache.pluto.driver.container;
 
 import java.util.ResourceBundle;
 

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

Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/Environment.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/InitParameterApplicationIdResolver.java (from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/InitParameterApplicationIdResolver.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/InitParameterApplicationIdResolver.java?p2=portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/InitParameterApplicationIdResolver.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/InitParameterApplicationIdResolver.java&r1=762752&r2=762773&rev=762773&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/InitParameterApplicationIdResolver.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/InitParameterApplicationIdResolver.java Tue Apr  7 13:40:59 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.driver.impl;
+package org.apache.pluto.driver.container;
 
 import javax.servlet.ServletContext;
 

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

Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/InitParameterApplicationIdResolver.java
------------------------------------------------------------------------------
    svn:keywords = Id Author Date Rev

Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/InitParameterApplicationIdResolver.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/InlinePortletResourceBundle.java (from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/InlinePortletResourceBundle.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/InlinePortletResourceBundle.java?p2=portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/InlinePortletResourceBundle.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/InlinePortletResourceBundle.java&r1=762752&r2=762773&rev=762773&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/InlinePortletResourceBundle.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/InlinePortletResourceBundle.java Tue Apr  7 13:40:59 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.driver.impl;
+package org.apache.pluto.driver.container;
 
 import java.util.ArrayList;
 import java.util.ListResourceBundle;

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

Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/InlinePortletResourceBundle.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PlutoContainerInfo.java (from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PlutoContainerInfo.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PlutoContainerInfo.java?p2=portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PlutoContainerInfo.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PlutoContainerInfo.java&r1=762752&r2=762773&rev=762773&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PlutoContainerInfo.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PlutoContainerInfo.java Tue Apr  7 13:40:59 2009
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.pluto.container.driver.impl;
+package org.apache.pluto.driver.container;
 
 import org.apache.pluto.container.ContainerInfo;
 

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

Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PlutoContainerInfo.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PlutoContainerInfo.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PlutoContainerInfo.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PortalDriverServicesImpl.java (from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PortalDriverServicesImpl.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PortalDriverServicesImpl.java?p2=portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PortalDriverServicesImpl.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PortalDriverServicesImpl.java&r1=762752&r2=762773&rev=762773&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PortalDriverServicesImpl.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PortalDriverServicesImpl.java Tue Apr  7 13:40:59 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.driver.impl;
+package org.apache.pluto.driver.container;
 
 import javax.portlet.PortalContext;
 

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

Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PortalDriverServicesImpl.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PortletContextManager.java (from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PortletContextManager.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PortletContextManager.java?p2=portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PortletContextManager.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PortletContextManager.java&r1=762752&r2=762773&rev=762773&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PortletContextManager.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PortletContextManager.java Tue Apr  7 13:40:59 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.driver.impl;
+package org.apache.pluto.driver.container;
 
 import java.io.IOException;
 import java.lang.reflect.Method;

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

Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PortletContextManager.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PortletDescriptorRegistry.java (from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PortletDescriptorRegistry.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PortletDescriptorRegistry.java?p2=portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PortletDescriptorRegistry.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PortletDescriptorRegistry.java&r1=762752&r2=762773&rev=762773&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/PortletDescriptorRegistry.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PortletDescriptorRegistry.java Tue Apr  7 13:40:59 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.driver.impl;
+package org.apache.pluto.driver.container;
 
 import java.io.InputStream;
 import java.util.Map;

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

Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/PortletDescriptorRegistry.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/ResourceBundleFactory.java (from r762752, portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/ResourceBundleFactory.java)
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/ResourceBundleFactory.java?p2=portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/ResourceBundleFactory.java&p1=portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/ResourceBundleFactory.java&r1=762752&r2=762773&rev=762773&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/container/driver/impl/ResourceBundleFactory.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/ResourceBundleFactory.java Tue Apr  7 13:40:59 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.driver.impl;
+package org.apache.pluto.driver.container;
 
 import java.util.HashMap;
 import java.util.Locale;

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

Propchange: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/container/ResourceBundleFactory.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: portals/pluto/trunk/pluto-portal-driver/src/test/java/org/apache/pluto/driver/container/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: portals/pluto/trunk/pluto-portal-driver/src/test/java/org/apache/pluto/driver/container/DefaultNamespaceMapperTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/test/java/org/apache/pluto/driver/container/DefaultNamespaceMapperTest.java?rev=762773&r1=762752&r2=762773&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/test/java/org/apache/pluto/driver/container/DefaultNamespaceMapperTest.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/test/java/org/apache/pluto/driver/container/DefaultNamespaceMapperTest.java Tue Apr  7 13:40:59 2009
@@ -14,12 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.driver.impl;
+package org.apache.pluto.driver.container;
 
 import org.apache.pluto.container.NamespaceMapper;
 import org.apache.pluto.container.PortletWindowID;
-import org.apache.pluto.container.driver.impl.DefaultNamespaceMapper;
-import org.apache.pluto.container.util.PlutoTestCase;
+import org.apache.pluto.driver.container.DefaultNamespaceMapper;
 
 /**
  * Test Class

Added: portals/pluto/trunk/pluto-portal-driver/src/test/java/org/apache/pluto/driver/container/PlutoTestCase.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/test/java/org/apache/pluto/driver/container/PlutoTestCase.java?rev=762773&view=auto
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/test/java/org/apache/pluto/driver/container/PlutoTestCase.java (added)
+++ portals/pluto/trunk/pluto-portal-driver/src/test/java/org/apache/pluto/driver/container/PlutoTestCase.java Tue Apr  7 13:40:59 2009
@@ -0,0 +1,71 @@
+/*
+ * 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.pluto.driver.container;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
+import org.jmock.MockObjectTestCase;
+
+/**
+ * Test Class
+ *
+ * @version 1.0
+ * @since June 1, 2005
+ */
+public abstract class PlutoTestCase extends MockObjectTestCase {
+
+    public void setUp() throws Exception {
+        System.setProperty("org.apache.commons.logging.Log", "org.apache.commons.logging.impl.SimpleLog");
+        System.setProperty("org.apache.commons.logging.simplelog.defaultlog", "ERROR");
+    }
+
+    protected void assertException(Object target, String methodName,
+                                 Object[] parameters, Class exceptionType) {
+            Class[] parameterClasses = new Class[parameters.length];
+            for(int i=0;i<parameters.length;i++) {
+                parameterClasses[i] = parameters[i]==null?Object.class:parameters[i].getClass();
+            }
+        assertException(target, methodName, parameterClasses, parameters, exceptionType);
+    }
+
+    protected void assertException(Object target, String methodName,
+                                 Class[] parameterClasses,
+                                 Object[] parameters, Class exceptionType) {
+        try {
+            Class targetClass = target.getClass();
+            Method method = targetClass.getMethod(methodName, parameterClasses);
+            method.invoke(target, parameters);
+        }
+        catch(InvocationTargetException ite) {
+            Throwable t = ite.getTargetException();
+            if(!t.getClass().equals(exceptionType)) {
+                fail("Incorrect Exception thrown.  Expected: "+exceptionType.getName()+", recieved "+t.getClass().getName());
+            }
+        }
+        catch(Throwable t) {
+            fail("Invalid Test.  Reflection invocation and setup failed.");
+        }
+    }
+
+    protected void assertContains(String message, String expectedSubstring,
+                                  String testString) {
+        if (testString.indexOf(expectedSubstring) < 0) {
+            fail(message);
+        }
+    }
+}

Propchange: portals/pluto/trunk/pluto-portal-driver/src/test/java/org/apache/pluto/driver/container/PlutoTestCase.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/pluto/trunk/pluto-portal-driver/src/test/java/org/apache/pluto/driver/container/PlutoTestCase.java
------------------------------------------------------------------------------
    svn:keywords = author date id revision rev url

Propchange: portals/pluto/trunk/pluto-portal-driver/src/test/java/org/apache/pluto/driver/container/PlutoTestCase.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: portals/pluto/trunk/pluto-portal-driver/src/test/java/org/apache/pluto/driver/container/ResourceBundleFactoryTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/test/java/org/apache/pluto/driver/container/ResourceBundleFactoryTest.java?rev=762773&r1=762752&r2=762773&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/test/java/org/apache/pluto/driver/container/ResourceBundleFactoryTest.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/test/java/org/apache/pluto/driver/container/ResourceBundleFactoryTest.java Tue Apr  7 13:40:59 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.pluto.container.driver.impl;
+package org.apache.pluto.driver.container;
 
 import java.util.ListResourceBundle;
 import java.util.Locale;
@@ -22,11 +22,10 @@
 
 import junit.framework.Assert;
 
-import org.apache.pluto.container.driver.impl.ResourceBundleFactory;
 import org.apache.pluto.container.om.portlet.PortletDefinition;
 import org.apache.pluto.container.om.portlet.PortletInfo;
 import org.apache.pluto.container.om.portlet.impl.PortletType;
-import org.apache.pluto.container.util.PlutoTestCase;
+import org.apache.pluto.driver.container.ResourceBundleFactory;
 
 /**
  * Unit test for the resource bundle factory.

Modified: portals/pluto/trunk/pluto-portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal/pom.xml?rev=762773&r1=762772&r2=762773&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal/pom.xml (original)
+++ portals/pluto/trunk/pluto-portal/pom.xml Tue Apr  7 13:40:59 2009
@@ -30,7 +30,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pluto-portal</artifactId>
     <packaging>war</packaging>
-    <name>Pluto Portal</name>
+    <name>Apache Pluto Portal</name>
 
   <dependencies>
     

Modified: portals/pluto/trunk/pluto-site-skin/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-site-skin/pom.xml?rev=762773&r1=762772&r2=762773&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-site-skin/pom.xml (original)
+++ portals/pluto/trunk/pluto-site-skin/pom.xml Tue Apr  7 13:40:59 2009
@@ -26,9 +26,9 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pluto-site-skin</artifactId>
-    <name>Pluto Website Skin</name>
+    <name>Apache Pluto Website Skin</name>
     <packaging>jar</packaging>
-    <description>Pluto Website Resources (CSS, images)</description>
+    <description>Apache Pluto Website Resources (CSS, images)</description>
 
     <build>
         <plugins>

Modified: portals/pluto/trunk/pluto-site/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-site/pom.xml?rev=762773&r1=762772&r2=762773&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-site/pom.xml (original)
+++ portals/pluto/trunk/pluto-site/pom.xml Tue Apr  7 13:40:59 2009
@@ -26,7 +26,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pluto-site</artifactId>
-    <name>Pluto Website Documentation</name>
+    <name>Apache Pluto Website Documentation</name>
     <url>http://portals.apache.org/pluto/</url>
     <inceptionYear>2001</inceptionYear>
     <packaging>pom</packaging>

Modified: portals/pluto/trunk/pluto-taglib/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-taglib/pom.xml?rev=762773&r1=762772&r2=762773&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-taglib/pom.xml (original)
+++ portals/pluto/trunk/pluto-taglib/pom.xml Tue Apr  7 13:40:59 2009
@@ -29,8 +29,8 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>pluto-taglib</artifactId>
     <packaging>jar</packaging>
-    <name>Pluto Portlet Tag Library</name>
-    <description>Pluto's Java Portlet Specification Tag Library implementation</description>
+    <name>Apache Pluto Portlet Tag Library</name>
+    <description>Apache Pluto's Java Portlet Specification Tag Library implementation</description>
 
     <dependencies>    
         <dependency>

Modified: portals/pluto/trunk/pluto-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-testsuite/pom.xml?rev=762773&r1=762772&r2=762773&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-testsuite/pom.xml (original)
+++ portals/pluto/trunk/pluto-testsuite/pom.xml Tue Apr  7 13:40:59 2009
@@ -29,7 +29,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>pluto-testsuite</artifactId>
   <packaging>war</packaging>
-  <name>Pluto Testsuite Portlet</name>
+  <name>Apache Pluto Testsuite Portlet</name>
   
   <dependencies>
     <dependency>

Modified: portals/pluto/trunk/pluto-util/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/pom.xml?rev=762773&r1=762772&r2=762773&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-util/pom.xml (original)
+++ portals/pluto/trunk/pluto-util/pom.xml Tue Apr  7 13:40:59 2009
@@ -25,7 +25,7 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>pluto-util</artifactId>
-  <name>Pluto Utilities</name>
+  <name>Apache Pluto Utilities</name>
 
   <!-- The dependencies for the ApplicationServerHook project
        are those which need to be installed!



Mime
View raw message