You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by cz...@apache.org on 2007/03/09 10:47:16 UTC
svn commit: r516346 [4/4] - in /portals/pluto/trunk: ./
pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/common/
pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/
pluto-descriptor-api/src/main/java/org/apache/pluto...
Modified: portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/SimpleAttributeTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/SimpleAttributeTest.java?view=diff&rev=516346&r1=516345&r2=516346
==============================================================================
--- portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/SimpleAttributeTest.java (original)
+++ portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/test/SimpleAttributeTest.java Fri Mar 9 01:47:12 2007
@@ -29,17 +29,15 @@
* Tests basic attribute retrieval and storage functions within the portlet
* request, session, and context objects.
*
- * @author <a href="mailto:ddewolf@apache.org">David H. DeWolf</a>
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
*/
public class SimpleAttributeTest extends AbstractReflectivePortletTest {
-
+
private static final String KEY = "org.apache.pluto.testsuite.BOGUS_KEY";
private static final String VAL = "! TEST VAL !";
-
-
+
+
// Test Methods ------------------------------------------------------------
-
+
protected TestResult checkGetNullAttribute(PortletRequest req) {
TestResult result = new TestResult();
result.setDescription("Ensure that if an attribute bound to an invalid "
@@ -76,7 +74,7 @@
TestResult result = new TestResult();
result.setDescription("Ensure that attributes can be removed from "
+ "portlet request.");
-
+
req.setAttribute(KEY, VAL);
req.removeAttribute(KEY);
Object val = req.getAttribute(KEY);
@@ -92,12 +90,12 @@
TestResult result = new TestResult();
result.setDescription("Ensure that all attribute names appear in the "
+ "attribute name enumeration returned by portlet request.");
-
+
int count = 5;
for (int i = 0; i < count; i++) {
req.setAttribute(KEY + "." + i, VAL);
}
-
+
int found = 0;
for (Enumeration en = req.getAttributeNames();
en.hasMoreElements(); ) {
@@ -114,10 +112,10 @@
}
return result;
}
-
-
+
+
// Test Methods for Session Attributes -------------------------------------
-
+
protected TestResult checkGetNullAttribute(PortletSession session) {
TestResult res = new TestResult();
res.setName("Retrieve Missing Session Attribute Test");
@@ -173,10 +171,10 @@
}
protected TestResult checkEnumerateAttributes(PortletSession session) {
-
+
TestResult result = new TestResult();
result.setDescription("Sets session attributes and enumerates over them.");
-
+
int count = 5;
for (int i = 0; i < count; i++) {
session.setAttribute(KEY + "." + i, VAL);
@@ -190,7 +188,7 @@
found++;
}
}
-
+
if (count != found) {
result.setReturnCode(TestResult.FAILED);
result.setResultMessage("Expected " + count + " attributes. "
@@ -264,12 +262,12 @@
TestResult result = new TestResult();
result.setDescription("Sets attributes in portlet context "
+ "and enumerates over them.");
-
+
int count = 5;
for (int i = 0; i < count; i++) {
context.setAttribute(KEY + "." + i, VAL);
}
-
+
int found = 0;
for (Enumeration en = context.getAttributeNames();
en.hasMoreElements(); ) {
@@ -277,7 +275,7 @@
found++;
}
}
-
+
if (count == found) {
result.setReturnCode(TestResult.PASSED);
} else {
Modified: portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/validator/PreferencesValidatorImpl.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/validator/PreferencesValidatorImpl.java?view=diff&rev=516346&r1=516345&r2=516346
==============================================================================
--- portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/validator/PreferencesValidatorImpl.java (original)
+++ portals/pluto/trunk/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/validator/PreferencesValidatorImpl.java Fri Mar 9 01:47:12 2007
@@ -5,9 +5,9 @@
* 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.
@@ -31,23 +31,22 @@
/**
* Implementation of the portlet preferences validator.
- * @author <a href="mailto:zheng@apache.org">ZHENG Zhong</a>
*/
public class PreferencesValidatorImpl implements PreferencesValidator {
-
+
/** Logger. */
private static final Log LOG = LogFactory.getLog(PreferencesValidatorImpl.class);
-
+
public static final String CHECK_VALIDATOR_COUNT = "checkValidatorCount";
-
+
/** Count of instances created. */
private static final Map INSTANCE_COUNTER = new HashMap();
-
+
/** Count of invocation number of method <code>validate()</code>. */
private int validateInvoked = 0;
-
+
// Constructor -------------------------------------------------------------
-
+
/**
* Default no-arg constructor.
*/
@@ -63,10 +62,10 @@
}
INSTANCE_COUNTER.put(getClass().getName(), count);
}
-
-
+
+
// PreferencesValidator Impl -----------------------------------------------
-
+
public void validate(PortletPreferences preferences)
throws ValidatorException {
validateInvoked++;
@@ -74,7 +73,7 @@
if (value != null && value.equalsIgnoreCase("true")) {
checkValidatorCount();
}
-
+
//
// TODO: Determine why we use this - I seem to remember it's a
// spec requirement, and fix it so that we don't have issues
@@ -103,14 +102,14 @@
}
}
}
-
+
if (!failedNames.isEmpty()) {
throw new ValidatorException(
"One or more preferences do not pass the validation.",
failedNames);
}
}
-
+
private void checkValidatorCount() throws ValidatorException {
if (LOG.isDebugEnabled()) {
LOG.debug("Checking validator count...");
@@ -128,5 +127,5 @@
null);
}
}
-
+
}
Modified: portals/pluto/trunk/pluto-util/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/pom.xml?view=diff&rev=516346&r1=516345&r2=516346
==============================================================================
--- portals/pluto/trunk/pluto-util/pom.xml (original)
+++ portals/pluto/trunk/pluto-util/pom.xml Fri Mar 9 01:47:12 2007
@@ -28,12 +28,6 @@
</dependency>
<dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>${plexus.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
<version>${commons-cli.version}</version>
@@ -47,11 +41,6 @@
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
<version>${commons-digester.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- <version>${commons-beanutils.version}</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Modified: portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/FileSystemInstaller.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/FileSystemInstaller.java?view=diff&rev=516346&r1=516345&r2=516346
==============================================================================
--- portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/FileSystemInstaller.java (original)
+++ portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/FileSystemInstaller.java Fri Mar 9 01:47:12 2007
@@ -16,15 +16,15 @@
*/
package org.apache.pluto.util.install.file;
-import org.apache.pluto.util.install.InstallationConfig;
-import org.apache.pluto.util.install.PortalInstaller;
-import org.apache.pluto.util.UtilityException;
-import org.codehaus.plexus.util.FileUtils;
-
import java.io.File;
import java.io.IOException;
-import java.util.Iterator;
import java.util.Collection;
+import java.util.Iterator;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.pluto.util.UtilityException;
+import org.apache.pluto.util.install.InstallationConfig;
+import org.apache.pluto.util.install.PortalInstaller;
/**
* File System based installer. Copies files to the appropriate
Modified: portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/jetty/Jetty5FileSystemInstaller.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/jetty/Jetty5FileSystemInstaller.java?view=diff&rev=516346&r1=516345&r2=516346
==============================================================================
--- portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/jetty/Jetty5FileSystemInstaller.java (original)
+++ portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/jetty/Jetty5FileSystemInstaller.java Fri Mar 9 01:47:12 2007
@@ -16,15 +16,15 @@
*/
package org.apache.pluto.util.install.file.jetty;
-import org.apache.pluto.util.install.InstallationConfig;
-import org.apache.pluto.util.install.file.FileSystemInstaller;
-import org.apache.pluto.util.UtilityException;
-import org.codehaus.plexus.util.FileUtils;
-
import java.io.File;
import java.io.IOException;
import java.util.Iterator;
+import org.apache.commons.io.FileUtils;
+import org.apache.pluto.util.UtilityException;
+import org.apache.pluto.util.install.InstallationConfig;
+import org.apache.pluto.util.install.file.FileSystemInstaller;
+
public class Jetty5FileSystemInstaller extends FileSystemInstaller {
protected File getEndorsedDir(InstallationConfig config) {
@@ -91,7 +91,7 @@
// Jetty Doesn't need 'em
//copyFilesToDirectory(config.getEndorsedDependencies(), endorsedDir);
-
+
copyFilesToDirectory(config.getSharedDependencies(), sharedDir);
Iterator it = config.getPortletApplications().values().iterator();
Modified: portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/file/FileAssemblerTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/file/FileAssemblerTest.java?view=diff&rev=516346&r1=516345&r2=516346
==============================================================================
--- portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/file/FileAssemblerTest.java (original)
+++ portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/file/FileAssemblerTest.java Fri Mar 9 01:47:12 2007
@@ -29,6 +29,7 @@
* @version $Revision$
*/
public class FileAssemblerTest extends XMLTestCase {
+
private File webXmlFile;
private File portletXmlFile;
private File assembledWebXmlFile;
Modified: portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/war/WarAssemblerTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/war/WarAssemblerTest.java?view=diff&rev=516346&r1=516345&r2=516346
==============================================================================
--- portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/war/WarAssemblerTest.java (original)
+++ portals/pluto/trunk/pluto-util/src/test/java/org/apache/pluto/util/assemble/war/WarAssemblerTest.java Fri Mar 9 01:47:12 2007
@@ -29,6 +29,7 @@
* @version $Revision$
*/
public class WarAssemblerTest extends TestCase {
+
private File portletFile;
protected void setUp() throws Exception {
Modified: portals/pluto/trunk/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pom.xml?view=diff&rev=516346&r1=516345&r2=516346
==============================================================================
--- portals/pluto/trunk/pom.xml (original)
+++ portals/pluto/trunk/pom.xml Fri Mar 9 01:47:12 2007
@@ -243,7 +243,7 @@
<plexus.version>1.0.4</plexus.version>
<maven.version>2.0.5</maven.version>
<ant.version>1.6.5</ant.version>
- <junit.version>3.8.1</junit.version>
+ <junit.version>3.8.2</junit.version>
<jmock.version>1.0.1</jmock.version>
<commons-io.version>1.3.1</commons-io.version>
<xmlunit.version>1.0</xmlunit.version>