portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddew...@apache.org
Subject svn commit: r510373 - in /portals/pluto/trunk: ./ pluto-container/ pluto-container/src/main/java/org/apache/pluto/internal/impl/ pluto-container/src/main/resources/org/apache/pluto/ pluto-container/src/test/java/org/apache/pluto/core/ pluto-container/s...
Date Thu, 22 Feb 2007 03:41:09 GMT
Author: ddewolf
Date: Wed Feb 21 19:41:08 2007
New Revision: 510373

URL: http://svn.apache.org/viewvc?view=rev&rev=510373
Log:
PLUTO-302; PLUTO-309; Test #13 and Upgrade deps

Removed:
    portals/pluto/trunk/pluto-container/src/test/resources/org/apache/pluto/environment.properties
Modified:
    portals/pluto/trunk/pluto-container/pom.xml
    portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/Environment.java
    portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/environment.properties
    portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/core/ContainerInvocationTest.java
    portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/EnvironmentTest.java
    portals/pluto/trunk/pluto-testsuite/src/main/resources/expectedResults.properties
    portals/pluto/trunk/pom.xml

Modified: portals/pluto/trunk/pluto-container/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/pom.xml?view=diff&rev=510373&r1=510372&r2=510373
==============================================================================
--- portals/pluto/trunk/pluto-container/pom.xml (original)
+++ portals/pluto/trunk/pluto-container/pom.xml Wed Feb 21 19:41:08 2007
@@ -29,12 +29,6 @@
             <version>${pom.version}</version>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.pluto</groupId>
-            <artifactId>pluto-portal-driver</artifactId>
-            <version>${pom.version}</version>
-            <scope>test</scope>
-        </dependency>
         <!-- Other Support Libraries =========================================== -->
         <dependency>
             <groupId>commons-logging</groupId>

Modified: portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/Environment.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/Environment.java?view=diff&rev=510373&r1=510372&r2=510373
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/Environment.java
(original)
+++ portals/pluto/trunk/pluto-container/src/main/java/org/apache/pluto/internal/impl/Environment.java
Wed Feb 21 19:41:08 2007
@@ -1,9 +1,9 @@
 /*
- * 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
+ * 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
@@ -46,17 +46,30 @@
     /**
      * Retrieve the major version number.
      * @return the major version number.
+     * @deprecated
      */
     public static final String getPortletContainerMajorVersion() {
-        return PROPS.getString("pluto.container.version.major");
+        String version = getPortletContainerVersion();
+        return version.substring(0, version.indexOf("."));
     }
 
     /**
      * Retrieve the minor version number.
      * @return the minor version number.
+     * @deprecated
      */
     public static final String getPortletContainerMinorVersion() {
-        return PROPS.getString("pluto.container.version.minor");
+        String version = getPortletContainerVersion();
+        return version.substring(version.indexOf("."));
+    }
+
+    /**
+     * Retrieve the portlet container version.
+     *
+     * @return container version
+     */
+    public static final String getPortletContainerVersion() {
+        return PROPS.getString("pluto.container.version");
     }
 
     /**
@@ -85,9 +98,7 @@
     public static final String getServerInfo() {
         StringBuffer sb = new StringBuffer(getPortletContainerName())
             .append("/")
-            .append(getPortletContainerMajorVersion())
-            .append(".")
-            .append(getPortletContainerMinorVersion());
+            .append(getPortletContainerVersion());
         return sb.toString();
     }
 

Modified: portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/environment.properties
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/environment.properties?view=diff&rev=510373&r1=510372&r2=510373
==============================================================================
--- portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/environment.properties
(original)
+++ portals/pluto/trunk/pluto-container/src/main/resources/org/apache/pluto/environment.properties
Wed Feb 21 19:41:08 2007
@@ -1,9 +1,9 @@
 #
-# 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
+# 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
@@ -19,8 +19,7 @@
 ######################################################################
 
 pluto.container.name=${pluto.container.name}
-pluto.container.version.major=${pluto.container.version.major}
-pluto.container.version.minor=${pluto.container.version.minor}
+pluto.container.version=${pom.version}
 
 javax.portlet.version.major=${javax.portlet.version.major}
 javax.portlet.version.minor=${javax.portlet.version.minor}

Modified: portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/core/ContainerInvocationTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/core/ContainerInvocationTest.java?view=diff&rev=510373&r1=510372&r2=510373
==============================================================================
--- portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/core/ContainerInvocationTest.java
(original)
+++ portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/core/ContainerInvocationTest.java
Wed Feb 21 19:41:08 2007
@@ -1,19 +1,43 @@
 package org.apache.pluto.core;
 
 import junit.framework.TestCase;
+import org.apache.pluto.PortletWindow;
+import org.apache.pluto.PortletWindowID;
+
+import javax.portlet.WindowState;
+import javax.portlet.PortletMode;
 
-import org.apache.pluto.driver.core.PortletWindowImpl;
 
 public class ContainerInvocationTest extends TestCase
 {
     private static PortletContainerImpl container = 
         new PortletContainerImpl("test", null, null);
-    private static PortletWindowImpl window = 
-        new PortletWindowImpl(null, null);
 
     public void testSetInvocation()
     {
-        ContainerInvocation.setInvocation(container, window);
+        ContainerInvocation.setInvocation(container, new PortletWindow() {
+
+            public PortletWindowID getId() {
+                return null;  //To change body of implemented methods use File | Settings
| File Templates.
+            }
+
+            public String getContextPath() {
+                return null;  //To change body of implemented methods use File | Settings
| File Templates.
+            }
+
+            public String getPortletName() {
+                return null;  //To change body of implemented methods use File | Settings
| File Templates.
+            }
+
+            public WindowState getWindowState() {
+                return null;  //To change body of implemented methods use File | Settings
| File Templates.
+            }
+
+            public PortletMode getPortletMode() {
+                return null;  //To change body of implemented methods use File | Settings
| File Templates.
+            }
+        });
+
     }
 
     public void testClearInvocation()

Modified: portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/EnvironmentTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/EnvironmentTest.java?view=diff&rev=510373&r1=510372&r2=510373
==============================================================================
--- portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/EnvironmentTest.java
(original)
+++ portals/pluto/trunk/pluto-container/src/test/java/org/apache/pluto/internal/impl/EnvironmentTest.java
Wed Feb 21 19:41:08 2007
@@ -1,9 +1,9 @@
 /*
- * 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
+ * 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
@@ -37,11 +37,15 @@
     }
 
     public void testContainerMajorVersion() {
-        assertEquals(props.getProperty("pluto.container.version.major"), Environment.getPortletContainerMajorVersion());
+        assertEquals("1", Environment.getPortletContainerMajorVersion());
     }
 
     public void testContainerMinorVersion() {
-        assertEquals(props.getProperty("pluto.container.version.minor"), Environment.getPortletContainerMinorVersion());
+        assertTrue(Environment.getPortletContainerVersion().endsWith(Environment.getPortletContainerMinorVersion()));
+    }
+
+    public void testContainerVersion() {
+        assertEquals(props.getProperty("pluto.container.version"), Environment.getPortletContainerVersion());
     }
 
     public void testContainerName() {
@@ -58,7 +62,6 @@
 
     public void testServerInfo() {
         assertContains("Server Info does not contain container name.", props.getProperty("pluto.container.name"),
Environment.getServerInfo());
-        assertContains("Server Info does not contain container name.", props.getProperty("pluto.container.version.major"),
Environment.getServerInfo());
-        assertContains("Server Info does not contain container name.", props.getProperty("pluto.container.version.minor"),
Environment.getServerInfo());
+        assertContains("Server Info does not contain container name.", props.getProperty("pluto.container.version"),
Environment.getServerInfo());
     }
 }

Modified: portals/pluto/trunk/pluto-testsuite/src/main/resources/expectedResults.properties
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-testsuite/src/main/resources/expectedResults.properties?view=diff&rev=510373&r1=510372&r2=510373
==============================================================================
--- portals/pluto/trunk/pluto-testsuite/src/main/resources/expectedResults.properties (original)
+++ portals/pluto/trunk/pluto-testsuite/src/main/resources/expectedResults.properties Wed
Feb 21 19:41:08 2007
@@ -1,9 +1,9 @@
 #
-# 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
+# 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
@@ -26,11 +26,11 @@
 
 # The value we expect to return from renderRequest.getPortalContext().getPortalInfo();
 
-expected.serverInfo = ${pluto.container.name}/${pom.parent.version}
+expected.serverInfo = ${pluto.container.name}/${pom.version}
 expected.version.major = ${javax.portlet.version.major}
 expected.version.minor = ${javax.portlet.version.minor}
 
-expected.portalInfo = pluto-portal-driver/${pom.parent.version}
+expected.portalInfo = pluto-portal-driver/${pom.version}
 
 expected.security.role=tomcat
 expected.security.role.mapped=plutoTestRole

Modified: portals/pluto/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pom.xml?view=diff&rev=510373&r1=510372&r2=510373
==============================================================================
--- portals/pluto/trunk/pom.xml (original)
+++ portals/pluto/trunk/pom.xml Wed Feb 21 19:41:08 2007
@@ -223,8 +223,6 @@
     -->
     <properties>
         <pluto.container.name>Pluto</pluto.container.name>
-        <pluto.container.version.major>1</pluto.container.version.major>
-        <pluto.container.version.minor>1.0-SNAPSHOT</pluto.container.version.minor>
         <javax.portlet.version.major>1</javax.portlet.version.major>
         <javax.portlet.version.minor>0</javax.portlet.version.minor>
         <portlet-api.version>1.0</portlet-api.version>
@@ -234,18 +232,18 @@
         <taglibs.standard.version>1.0.4</taglibs.standard.version>
         <xerces.version>2.6.2</xerces.version>
         <castor.version>1.0</castor.version>
-        <commons-digester.version>1.7</commons-digester.version>
+        <commons-digester.version>1.8</commons-digester.version>
         <commons-collections.version>3.2</commons-collections.version>
         <commons-cli.version>1.0</commons-cli.version>
-        <commons-httpclient.version>3.0</commons-httpclient.version>
+        <commons-httpclient.version>3.0.1</commons-httpclient.version>
         <commons-beanutils.version>1.7.0</commons-beanutils.version>
         <commons-logging.version>1.0.4</commons-logging.version>
         <log4j.version>1.2.14</log4j.version>
         <springframework.version>2.0.2</springframework.version>
         <plexus.version>1.0.4</plexus.version>
-        <maven.version>2.0</maven.version>
+        <maven.version>2.0.5</maven.version>
         <ant.version>1.6.5</ant.version>
-        <junit.version>3.8</junit.version>
+        <junit.version>3.8.1</junit.version>
         <jmock.version>1.0.1</jmock.version>
     </properties>
 



Mime
View raw message