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:40:46 UTC
svn commit: r516343 - in /portals/pluto/branches/pluto-1.1.x: ./ pluto-util/
pluto-util/src/main/java/org/apache/pluto/util/install/file/
pluto-util/src/main/java/org/apache/pluto/util/install/file/jetty/
pluto-util/src/test/java/org/apache/pluto/util/...
Author: cziegeler
Date: Fri Mar 9 01:40:45 2007
New Revision: 516343
URL: http://svn.apache.org/viewvc?view=rev&rev=516343
Log:
Remove dependency to plexus utils: use commons-io
Modified:
portals/pluto/branches/pluto-1.1.x/pluto-util/pom.xml
portals/pluto/branches/pluto-1.1.x/pluto-util/src/main/java/org/apache/pluto/util/install/file/FileSystemInstaller.java
portals/pluto/branches/pluto-1.1.x/pluto-util/src/main/java/org/apache/pluto/util/install/file/jetty/Jetty5FileSystemInstaller.java
portals/pluto/branches/pluto-1.1.x/pluto-util/src/test/java/org/apache/pluto/util/assemble/war/WarAssemblerTest.java
portals/pluto/branches/pluto-1.1.x/pom.xml
Modified: portals/pluto/branches/pluto-1.1.x/pluto-util/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-util/pom.xml?view=diff&rev=516343&r1=516342&r2=516343
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-util/pom.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-util/pom.xml Fri Mar 9 01:40:45 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/branches/pluto-1.1.x/pluto-util/src/main/java/org/apache/pluto/util/install/file/FileSystemInstaller.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-util/src/main/java/org/apache/pluto/util/install/file/FileSystemInstaller.java?view=diff&rev=516343&r1=516342&r2=516343
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-util/src/main/java/org/apache/pluto/util/install/file/FileSystemInstaller.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-util/src/main/java/org/apache/pluto/util/install/file/FileSystemInstaller.java Fri Mar 9 01:40:45 2007
@@ -16,10 +16,10 @@
*/
package org.apache.pluto.util.install.file;
+import org.apache.commons.io.FileUtils;
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;
Modified: portals/pluto/branches/pluto-1.1.x/pluto-util/src/main/java/org/apache/pluto/util/install/file/jetty/Jetty5FileSystemInstaller.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-util/src/main/java/org/apache/pluto/util/install/file/jetty/Jetty5FileSystemInstaller.java?view=diff&rev=516343&r1=516342&r2=516343
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-util/src/main/java/org/apache/pluto/util/install/file/jetty/Jetty5FileSystemInstaller.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-util/src/main/java/org/apache/pluto/util/install/file/jetty/Jetty5FileSystemInstaller.java Fri Mar 9 01:40:45 2007
@@ -16,10 +16,10 @@
*/
package org.apache.pluto.util.install.file.jetty;
+import org.apache.commons.io.FileUtils;
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;
@@ -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/branches/pluto-1.1.x/pluto-util/src/test/java/org/apache/pluto/util/assemble/war/WarAssemblerTest.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-util/src/test/java/org/apache/pluto/util/assemble/war/WarAssemblerTest.java?view=diff&rev=516343&r1=516342&r2=516343
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-util/src/test/java/org/apache/pluto/util/assemble/war/WarAssemblerTest.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-util/src/test/java/org/apache/pluto/util/assemble/war/WarAssemblerTest.java Fri Mar 9 01:40:45 2007
@@ -29,7 +29,7 @@
* @version $Revision$
*/
public class WarAssemblerTest extends TestCase {
- private File portletFile = null;
+ private File portletFile;
protected void setUp() throws Exception {
final URL portletUrl = this.getClass().getResource("/org/apache/pluto/util/assemble/war/WarDeployerTestPortlet.war");
Modified: portals/pluto/branches/pluto-1.1.x/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pom.xml?view=diff&rev=516343&r1=516342&r2=516343
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pom.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pom.xml Fri Mar 9 01:40:45 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>