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 dd...@apache.org on 2005/11/22 20:32:19 UTC
svn commit: r348223 - in /portals/pluto/trunk: ./ maven-pluto-plugin/
maven-pluto-plugin/src/main/java/org/apache/pluto/maven/
pluto-deploy/src/bin/ pluto-deploy/src/main/java/org/apache/pluto/deploy/
pluto-deploy/src/main/java/org/apache/pluto/util/ p...
Author: ddewolf
Date: Tue Nov 22 11:31:57 2005
New Revision: 348223
URL: http://svn.apache.org/viewcvs?rev=348223&view=rev
Log:
Refactor pluto-deploy module into pluto-util. All utilities now have a single home. Preparing to enhance Assemble, Deploy, and Publish Mojos so to all act consistently and be usable within a portlet war project and have an archetype.
Added:
portals/pluto/trunk/pluto-deploy/src/main/java/org/apache/pluto/util/
portals/pluto/trunk/pluto-deploy/src/main/java/org/apache/pluto/util/deploy/
- copied from r348194, portals/pluto/trunk/pluto-deploy/src/main/java/org/apache/pluto/deploy/
portals/pluto/trunk/pluto-deploy/src/main/java/org/apache/pluto/util/deploy/file/
portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/UtilityException.java
- copied, changed from r348194, portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/ManagementException.java
portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/cli/AssemblerCLI.java
portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/deploy/Deployer.java
portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/deploy/DeployerFactory.java
portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/deploy/DeploymentConfig.java
portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/deploy/DeploymentException.java
portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/deploy/file/
portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/deploy/file/FileSystemDeployer.java
portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/deploy/file/Tomcat4FileSystemDeployer.java
portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/deploy/file/Tomcat5FileSystemDeployer.java
portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/
- copied from r348194, portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/impl/
portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/jetty/Jetty5FileSystemInstaller.java
- copied, changed from r348194, portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/impl/Jetty5FileSystemInstaller.java
portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/tomcat5/
portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/tomcat5/Tomcat5FileSystemInstaller.java
- copied, changed from r348194, portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/impl/Tomcat5FileSystemInstaller.java
portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/publish/
Removed:
portals/pluto/trunk/pluto-deploy/src/main/java/org/apache/pluto/deploy/
portals/pluto/trunk/pluto-deploy/src/main/java/org/apache/pluto/util/deploy/Assembler.java
portals/pluto/trunk/pluto-deploy/src/main/java/org/apache/pluto/util/deploy/AssemblerFactory.java
portals/pluto/trunk/pluto-deploy/src/main/java/org/apache/pluto/util/deploy/Deployer.java
portals/pluto/trunk/pluto-deploy/src/main/java/org/apache/pluto/util/deploy/DeployerFactory.java
portals/pluto/trunk/pluto-deploy/src/main/java/org/apache/pluto/util/deploy/DeploymentConfig.java
portals/pluto/trunk/pluto-deploy/src/main/java/org/apache/pluto/util/deploy/DeploymentException.java
portals/pluto/trunk/pluto-deploy/src/main/java/org/apache/pluto/util/deploy/ant/
portals/pluto/trunk/pluto-deploy/src/main/java/org/apache/pluto/util/deploy/cli/
portals/pluto/trunk/pluto-deploy/src/main/java/org/apache/pluto/util/deploy/impl/
portals/pluto/trunk/pluto-deploy/src/main/java/org/apache/pluto/util/deploy/maven/
portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/ManagementException.java
portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/assemble/
portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/Jetty5FileSystemInstaller.java
portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/Tomcat5FileSystemInstaller.java
portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/impl/
Modified:
portals/pluto/trunk/maven-pluto-plugin/pom.xml
portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/AssembleMojo.java
portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/DeployMojo.java
portals/pluto/trunk/pluto-deploy/src/bin/assemble.bat
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/DriverConfiguration.java
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/impl/DriverConfigurationImpl.java
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/container/MemoryPreferencesService.java
portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/container/db/DBPortletPreferencesService.java
portals/pluto/trunk/pluto-site/src/site/site.xml
portals/pluto/trunk/pluto-util/pom.xml
portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/PortalInstaller.java
portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/PortalInstallerFactory.java
portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/FileSystemInstaller.java
portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/jetty/Call.java
portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/jetty/Configure.java
portals/pluto/trunk/pom.xml
Modified: portals/pluto/trunk/maven-pluto-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/maven-pluto-plugin/pom.xml?rev=348223&r1=348222&r2=348223&view=diff
==============================================================================
--- portals/pluto/trunk/maven-pluto-plugin/pom.xml (original)
+++ portals/pluto/trunk/maven-pluto-plugin/pom.xml Tue Nov 22 11:31:57 2005
@@ -21,13 +21,7 @@
<version>1.1-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.apache.pluto</groupId>
- <artifactId>pluto-deploy</artifactId>
- <version>1.1-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
<version>2.0</version>
Modified: portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/AssembleMojo.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/AssembleMojo.java?rev=348223&r1=348222&r2=348223&view=diff
==============================================================================
--- portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/AssembleMojo.java (original)
+++ portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/AssembleMojo.java Tue Nov 22 11:31:57 2005
@@ -16,8 +16,8 @@
package org.apache.pluto.maven;
-import org.apache.pluto.deploy.Assembler;
-import org.apache.pluto.deploy.impl.ArchivedFileAssembler;
+import org.apache.pluto.util.assemble.Assembler;
+import org.apache.pluto.util.assemble.file.ArchivedFileAssembler;
import java.io.IOException;
import java.io.File;
Modified: portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/DeployMojo.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/DeployMojo.java?rev=348223&r1=348222&r2=348223&view=diff
==============================================================================
--- portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/DeployMojo.java (original)
+++ portals/pluto/trunk/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/DeployMojo.java Tue Nov 22 11:31:57 2005
@@ -17,9 +17,9 @@
package org.apache.pluto.maven;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.pluto.deploy.Deployer;
-import org.apache.pluto.deploy.DeploymentConfig;
-import org.apache.pluto.deploy.impl.Tomcat5FileSystemDeployer;
+import org.apache.pluto.util.deploy.Deployer;
+import org.apache.pluto.util.deploy.DeploymentConfig;
+import org.apache.pluto.util.deploy.file.Tomcat5FileSystemDeployer;
import java.util.Properties;
@@ -35,7 +35,7 @@
public class DeployMojo extends AbstractPortletMojo {
/**
- * @parameter expression="${pluto.deploy.impl}"
+ * @parameter expression="${pluto.deploy.file}"
*/
private String deployerClass = Tomcat5FileSystemDeployer.class.getName();
Modified: portals/pluto/trunk/pluto-deploy/src/bin/assemble.bat
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-deploy/src/bin/assemble.bat?rev=348223&r1=348222&r2=348223&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-deploy/src/bin/assemble.bat (original)
+++ portals/pluto/trunk/pluto-deploy/src/bin/assemble.bat Tue Nov 22 11:31:57 2005
@@ -24,4 +24,4 @@
set CLASSPATH=%CLASSPATH%../lib/commons-beanutils-1.7.0.jar;
set CLASSPATH=%CLASSPATH%../lib/commons-logging-1.0.4.jar;
-java -classpath %CLASSPATH% org.apache.pluto.deploy.cli.AssemblerCLI %1
+java -classpath %CLASSPATH% org.apache.pluto.util.cli.AssemblerCLI %1
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/DriverConfiguration.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/DriverConfiguration.java?rev=348223&r1=348222&r2=348223&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/DriverConfiguration.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/DriverConfiguration.java Tue Nov 22 11:31:57 2005
@@ -19,12 +19,9 @@
import org.apache.pluto.driver.services.impl.resource.PortletWindowConfig;
import org.apache.pluto.driver.services.impl.resource.PageConfig;
import org.apache.pluto.services.PortalCallbackService;
-import org.apache.pluto.services.PortletPreferencesService;
-import org.apache.pluto.services.OptionalPortletContainerServices;
-import org.apache.pluto.PortletContainerServices;
+import org.apache.pluto.services.optional.PortletPreferencesService;
import javax.servlet.ServletContext;
-import javax.portlet.PortalContext;
import java.util.Collection;
/**
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/impl/DriverConfigurationImpl.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/impl/DriverConfigurationImpl.java?rev=348223&r1=348222&r2=348223&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/impl/DriverConfigurationImpl.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/config/impl/DriverConfigurationImpl.java Tue Nov 22 11:31:57 2005
@@ -20,10 +20,9 @@
import org.apache.pluto.driver.services.impl.resource.PageConfig;
import org.apache.pluto.driver.config.DriverConfiguration;
import org.apache.pluto.services.PortalCallbackService;
-import org.apache.pluto.services.PortletPreferencesService;
+import org.apache.pluto.services.optional.PortletPreferencesService;
import javax.servlet.ServletContext;
-import javax.portlet.PortalContext;
import java.util.Collection;
/**
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java?rev=348223&r1=348222&r2=348223&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/container/ContainerServicesImpl.java Tue Nov 22 11:31:57 2005
@@ -18,8 +18,11 @@
import org.apache.pluto.OptionalPortletContainerServices;
import org.apache.pluto.services.PortalCallbackService;
import org.apache.pluto.PortletContainerServices;
+import org.apache.pluto.core.InternalPortletWindow;
import org.apache.pluto.driver.config.DriverConfiguration;
-import org.apache.pluto.services.PortletPreferencesService;
+import org.apache.pluto.services.optional.PortletPreferencesService;
+import org.apache.pluto.services.optional.PortletEnvironmentService;
+import org.apache.pluto.services.optional.PortletInvokerService;
import javax.portlet.PortalContext;
@@ -74,5 +77,12 @@
return driverConfig.getPortalCallbackService();
}
+ public PortletEnvironmentService getPortletEnvironmentService() {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
+
+ public PortletInvokerService getPortletInvokerService(InternalPortletWindow window) {
+ return null; //To change body of implemented methods use File | Settings | File Templates.
+ }
}
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/container/MemoryPreferencesService.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/container/MemoryPreferencesService.java?rev=348223&r1=348222&r2=348223&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/container/MemoryPreferencesService.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/container/MemoryPreferencesService.java Tue Nov 22 11:31:57 2005
@@ -15,26 +15,17 @@
*/
package org.apache.pluto.driver.services.container;
-import java.util.Collection;
-import java.util.ArrayList;
import java.util.Map;
import java.util.HashMap;
-import java.io.File;
-import java.io.IOException;
-import java.io.FileWriter;
-import java.io.PrintWriter;
import javax.portlet.PortletRequest;
import org.apache.pluto.PortletWindow;
import org.apache.pluto.PortletContainerException;
-import org.apache.pluto.driver.services.container.PortletPreferenceImpl;
import org.apache.pluto.core.PortletPreference;
-import org.apache.pluto.services.PortletPreferencesService;
-import org.apache.commons.digester.Digester;
+import org.apache.pluto.services.optional.PortletPreferencesService;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.Log;
-import org.xml.sax.SAXException;
/**
* The Portal Driver's simple PortletPreferencesService implementation. This
Modified: portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/container/db/DBPortletPreferencesService.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/container/db/DBPortletPreferencesService.java?rev=348223&r1=348222&r2=348223&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/container/db/DBPortletPreferencesService.java (original)
+++ portals/pluto/trunk/pluto-portal-driver/src/main/java/org/apache/pluto/driver/services/container/db/DBPortletPreferencesService.java Tue Nov 22 11:31:57 2005
@@ -23,7 +23,7 @@
import org.apache.pluto.PortletWindow;
import org.apache.pluto.PortletContainerException;
import org.apache.pluto.core.PortletPreference;
-import org.apache.pluto.services.PortletPreferencesService;
+import org.apache.pluto.services.optional.PortletPreferencesService;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.Log;
Modified: portals/pluto/trunk/pluto-site/src/site/site.xml
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-site/src/site/site.xml?rev=348223&r1=348222&r2=348223&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-site/src/site/site.xml (original)
+++ portals/pluto/trunk/pluto-site/src/site/site.xml Tue Nov 22 11:31:57 2005
@@ -50,7 +50,6 @@
<item name="Descriptor API" href="/pluto-descriptor-api/index.html"/>
<item name="Descriptor Impl" href="/pluto-descriptor-impl/index.html"/>
- <item name="Deploy" href="/pluto-deploy/index.html"/>
<item name="Util" href="/pluto-container/index.html"/>
</menu>
</menu>
Modified: portals/pluto/trunk/pluto-util/pom.xml
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-util/pom.xml?rev=348223&r1=348222&r2=348223&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-util/pom.xml (original)
+++ portals/pluto/trunk/pluto-util/pom.xml Tue Nov 22 11:31:57 2005
@@ -21,6 +21,47 @@
<version>1.0.4</version>
<scope>compile</scope>
</dependency>
+
+
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-descriptor-api</artifactId>
+ <version>${pom.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.pluto</groupId>
+ <artifactId>pluto-descriptor-impl</artifactId>
+ <version>${pom.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>1.6</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.0.4</version>
+ </dependency>
+
+
</dependencies>
<distributionManagement>
Copied: portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/UtilityException.java (from r348194, portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/ManagementException.java)
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/UtilityException.java?p2=portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/UtilityException.java&p1=portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/ManagementException.java&r1=348194&r2=348223&rev=348223&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/ManagementException.java (original)
+++ portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/UtilityException.java Tue Nov 22 11:31:57 2005
@@ -22,11 +22,11 @@
* Exception thrown if an error occurs while managing
* a portal instance.
*/
-public class ManagementException extends Exception {
+public class UtilityException extends Exception {
private File installDir;
- public ManagementException(String message, Throwable cause, File installDir) {
+ public UtilityException(String message, Throwable cause, File installDir) {
super(message, cause);
this.installDir = installDir;
}
Added: portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/cli/AssemblerCLI.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/cli/AssemblerCLI.java?rev=348223&view=auto
==============================================================================
--- portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/cli/AssemblerCLI.java (added)
+++ portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/cli/AssemblerCLI.java Tue Nov 22 11:31:57 2005
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed 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.util.cli;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.PosixParser;
+import org.apache.commons.cli.ParseException;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.pluto.util.assemble.Assembler;
+import org.apache.pluto.util.assemble.AssemblerFactory;
+
+/**
+ * Command Line Interface to the Pluto Assembler.
+ *
+ * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
+ * @version 1.0
+ * @since Oct 15, 2004
+ */
+public class AssemblerCLI {
+
+ private Options options;
+ private String[] args;
+
+ public AssemblerCLI(String[] args) {
+ this.args = args;
+ options = new Options();
+ Option destination =
+ new Option("d" , "destination", true,
+ "specify where the resulting webapp should be written ");
+ destination.setArgName("file");
+
+ Option debug =
+ new Option("debug", false, "print debug information.");
+ options.addOption(destination);
+ options.addOption(debug);
+ }
+
+ public void run() throws ParseException, IOException {
+ CommandLineParser parser = new PosixParser();
+ CommandLine line = parser.parse(options, args);
+
+ String[] args = line.getArgs();
+ if(args.length != 1) {
+ abort();
+ return;
+ }
+
+ String dest = line.getOptionValue("file");
+ if(dest == null) {
+ dest = args[0];
+ }
+
+ File source = new File(args[0]);
+ File result = new File(dest);
+ result.getParentFile().mkdirs();
+
+ if(!source.exists()) {
+ System.out.println("File does not exist: "+source.getCanonicalPath());
+ }
+
+
+ System.out.println("-----------------------------------------------");
+ System.out.println("Assembling: "+source.getCanonicalPath());
+ System.out.println(" to: "+result.getCanonicalPath());
+
+ Assembler assembler = AssemblerFactory.getFactory()
+ .createAssembler(new File(args[0]), new File(dest));
+ assembler.assemble();
+
+ System.out.println("Complete!");
+ }
+
+ public void abort() {
+ HelpFormatter help = new HelpFormatter();
+ help.defaultArgName = "webapp";
+ help.defaultWidth = 60;
+ help.printHelp("assemble", options);
+ }
+
+ public static void main(String[] args)
+ throws ParseException, IOException{
+ new AssemblerCLI(args).run();
+ }
+}
+
Added: portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/deploy/Deployer.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/deploy/Deployer.java?rev=348223&view=auto
==============================================================================
--- portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/deploy/Deployer.java (added)
+++ portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/deploy/Deployer.java Tue Nov 22 11:31:57 2005
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed 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.util.deploy;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * Interface defining the methods necessary to deploy a portlet
+ * application to a servlet container.
+ *
+ * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
+ * @version 1.0
+ * @since Oct 15, 2004
+ */
+public interface Deployer {
+
+ /**
+ * Deploy the specified web application
+ * @param config
+ * @param webapp
+ * @throws IOException
+ */
+ void deploy(DeploymentConfig config, InputStream webapp)
+ throws IOException, DeploymentException;
+
+}
+
Added: portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/deploy/DeployerFactory.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/deploy/DeployerFactory.java?rev=348223&view=auto
==============================================================================
--- portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/deploy/DeployerFactory.java (added)
+++ portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/deploy/DeployerFactory.java Tue Nov 22 11:31:57 2005
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed 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.util.deploy;
+
+/**
+ * <B>TODO</B>: Document
+ * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
+ * @version 1.0
+ * @since Oct 28, 2004
+ */
+public class DeployerFactory {
+
+ private static DeployerFactory factory;
+
+ public static DeployerFactory getFactory() {
+ if(factory == null) {
+ factory = new DeployerFactory();
+ }
+ return factory;
+ }
+
+ public Deployer createFactory() {
+ String className = System.getProperty(
+ "org.apache.pluto.deploy.Deployer",
+ "org.apache.pluto.util.deploy.impl.FileSystemDeployer"
+ );
+
+ try {
+ Class cl = Class.forName(className);
+ return (Deployer)cl.newInstance();
+ }
+ catch(Throwable t) {
+ t.printStackTrace();
+ return null;
+ }
+ }
+
+}
+
Added: portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/deploy/DeploymentConfig.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/deploy/DeploymentConfig.java?rev=348223&view=auto
==============================================================================
--- portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/deploy/DeploymentConfig.java (added)
+++ portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/deploy/DeploymentConfig.java Tue Nov 22 11:31:57 2005
@@ -0,0 +1,63 @@
+/*
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed 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.util.deploy;
+
+/**
+ * Encapsulation of deployment configuration info.
+ * Implementations must provide a way to retrieved
+ * context specific deployment properties.
+ *
+ * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
+ * @version 1.0
+ * @since Oct 15, 2004
+ */
+public abstract class DeploymentConfig {
+
+ /** The deployment name. */
+ private String deploymentName;
+
+ /**
+ * Default Constructor.
+ * @param deploymentName the name of the deployment.
+ */
+ public DeploymentConfig(String deploymentName) {
+ this.deploymentName = deploymentName;
+ }
+
+ /**
+ * Standard Getter.
+ * @return the name of the deployment.
+ */
+ public String getDeploymentName() {
+ return deploymentName;
+ }
+
+ /**
+ * Standard Setter
+ * @param deploymentName the name of the deployment.
+ */
+ public void setDeploymentName(String deploymentName) {
+ this.deploymentName = deploymentName;
+ }
+
+ /**
+ * Retrieve the named deployment property.
+ * @param key
+ * @return
+ */
+ public abstract String getDeploymentProperty(String key);
+
+}
Added: portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/deploy/DeploymentException.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/deploy/DeploymentException.java?rev=348223&view=auto
==============================================================================
--- portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/deploy/DeploymentException.java (added)
+++ portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/deploy/DeploymentException.java Tue Nov 22 11:31:57 2005
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed 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.util.deploy;
+
+/**
+ * Exception thrown if deployment fails due to a configuration
+ * or internal error.
+ *
+ * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
+ * @version 1.0
+ * @since Oct 28, 2004
+ */
+public class DeploymentException extends Exception {
+
+ public DeploymentException(String message) {
+ super(message);
+ }
+
+}
+
Added: portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/deploy/file/FileSystemDeployer.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/deploy/file/FileSystemDeployer.java?rev=348223&view=auto
==============================================================================
--- portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/deploy/file/FileSystemDeployer.java (added)
+++ portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/deploy/file/FileSystemDeployer.java Tue Nov 22 11:31:57 2005
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed 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.util.deploy.file;
+
+import org.apache.pluto.util.deploy.Deployer;
+import org.apache.pluto.util.deploy.DeploymentConfig;
+import org.apache.pluto.util.deploy.DeploymentException;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
+ * @version 1.0
+ * @since Oct 15, 2004
+ */
+public abstract class FileSystemDeployer implements Deployer {
+
+ public FileSystemDeployer() {
+
+ }
+
+ public void deploy(DeploymentConfig config, InputStream webapp)
+ throws IOException, DeploymentException {
+
+ File dir = getWebApplicationDirectory(config);
+ File file = new File(dir, config.getDeploymentName()+".war");
+
+ FileOutputStream out = new FileOutputStream(file);
+
+ int read = -1;
+ byte[] bits = new byte[256];
+ while( (read = webapp.read(bits)) != -1) {
+ out.write(bits, 0, read);
+ }
+
+ out.flush();
+ out.close();
+
+ configure(config);
+
+ }
+
+
+ /**
+ * Retrieve the directory to which the webapp
+ * should be deployed.
+ * @return
+ */
+ protected abstract File getWebApplicationDirectory(DeploymentConfig config)
+ throws DeploymentException;
+
+ /**
+ * Configure the deployment.
+ * @param config
+ */
+ protected abstract void configure(DeploymentConfig config)
+ throws DeploymentException, IOException;
+
+}
+
Added: portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/deploy/file/Tomcat4FileSystemDeployer.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/deploy/file/Tomcat4FileSystemDeployer.java?rev=348223&view=auto
==============================================================================
--- portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/deploy/file/Tomcat4FileSystemDeployer.java (added)
+++ portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/deploy/file/Tomcat4FileSystemDeployer.java Tue Nov 22 11:31:57 2005
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed 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.util.deploy.file;
+
+import org.apache.pluto.util.deploy.DeploymentConfig;
+import org.apache.pluto.util.deploy.DeploymentException;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+/**
+ *
+ * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
+ * @version 1.0
+ * @since Oct 28, 2004
+ */
+public class Tomcat4FileSystemDeployer extends FileSystemDeployer {
+
+ private File tomcatHome = null;
+
+ public Tomcat4FileSystemDeployer() {
+
+ }
+
+ protected File getWebApplicationDirectory(DeploymentConfig config)
+ throws DeploymentException {
+ File dir = new File(getTomcatHome(config), "webapps");
+ dir.mkdirs();
+ return dir;
+ }
+
+ protected void configure(DeploymentConfig config)
+ throws DeploymentException, IOException {
+ File conf = new File(getConfigDir(config), config.getDeploymentName()+".xml");
+ PrintWriter out = new PrintWriter(new FileWriter(conf));
+ out.print("<Context path=\"/");
+ out.print(config.getDeploymentName());
+ out.print("\" docBase=\"");
+ out.print(config.getDeploymentName()+".war");
+ out.println("\" crossContext=\"true\">");
+ out.println("</Context>");
+
+ out.flush();
+ out.close();
+ }
+
+ protected File getTomcatHome(DeploymentConfig config) throws DeploymentException {
+ if(tomcatHome == null) {
+ String file = config.getDeploymentProperty("tomcat.home");
+ if(file == null) {
+ throw new DeploymentException("tomcat.home not defined");
+ }
+ tomcatHome = new File(file);
+ tomcatHome.mkdirs();
+ }
+ return tomcatHome;
+ }
+
+ protected File getConfigDir(DeploymentConfig config)
+ throws DeploymentException {
+ File dir = new File(getTomcatHome(config), "conf");
+ return dir;
+ }
+
+}
+
Added: portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/deploy/file/Tomcat5FileSystemDeployer.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/deploy/file/Tomcat5FileSystemDeployer.java?rev=348223&view=auto
==============================================================================
--- portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/deploy/file/Tomcat5FileSystemDeployer.java (added)
+++ portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/deploy/file/Tomcat5FileSystemDeployer.java Tue Nov 22 11:31:57 2005
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed 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.util.deploy.file;
+
+import org.apache.pluto.util.deploy.DeploymentConfig;
+import org.apache.pluto.util.deploy.DeploymentException;
+
+import java.io.File;
+
+/**
+ * Deployer used to deploy portlet applications to a Tomcat 5
+ * installation via the file system. This deployer performs
+ * a simple copy of the assembled application into the webapps
+ * directory and creates a context configuration file under
+ * the ${tomcat.home}/conf/${tomcat.service}/${tomcat.host}
+ * directory.
+ *
+ * @author <a href="ddewolf@apache.org">David H. DeWolf</a>
+ * @version 1.0
+ * @since Oct 28, 2004
+ */
+public class Tomcat5FileSystemDeployer extends Tomcat4FileSystemDeployer {
+
+ /**
+ * Retrieve the configuration directory for the deployment.
+ *
+ * @param config
+ * @return
+ * @throws DeploymentException
+ */
+ protected File getConfigDir(DeploymentConfig config) throws DeploymentException {
+ File dir = super.getConfigDir(config);
+ String serv = config.getDeploymentProperty("tomcat.service");
+ if(serv == null) {
+ throw new DeploymentException("tomcat.service is not defined");
+ }
+ dir = new File(dir, serv);
+ String host = config.getDeploymentProperty("tomcat.host");
+ if(host == null) {
+ throw new DeploymentException("tomcat.host is not defined");
+ }
+ dir = new File(dir, host);
+ dir.mkdirs();
+ return dir;
+ }
+}
+
Modified: portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/PortalInstaller.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/PortalInstaller.java?rev=348223&r1=348222&r2=348223&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/PortalInstaller.java (original)
+++ portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/PortalInstaller.java Tue Nov 22 11:31:57 2005
@@ -15,15 +15,15 @@
*/
package org.apache.pluto.util.install;
-import org.apache.pluto.util.ManagementException;
+import org.apache.pluto.util.UtilityException;
import java.io.File;
public interface PortalInstaller {
- void install(InstallationConfig config) throws ManagementException, ManagementException;
+ void install(InstallationConfig config) throws UtilityException, UtilityException;
- void uninstall(InstallationConfig config) throws ManagementException;
+ void uninstall(InstallationConfig config) throws UtilityException;
boolean isValidInstallationDirectory(File installDir);
}
Modified: portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/PortalInstallerFactory.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/PortalInstallerFactory.java?rev=348223&r1=348222&r2=348223&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/PortalInstallerFactory.java (original)
+++ portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/PortalInstallerFactory.java Tue Nov 22 11:31:57 2005
@@ -15,8 +15,8 @@
*/
package org.apache.pluto.util.install;
-import org.apache.pluto.util.install.impl.Tomcat5FileSystemInstaller;
-import org.apache.pluto.util.install.impl.Jetty5FileSystemInstaller;
+import org.apache.pluto.util.install.file.tomcat5.Tomcat5FileSystemInstaller;
+import org.apache.pluto.util.install.file.jetty.Jetty5FileSystemInstaller;
import java.io.File;
import java.util.ArrayList;
Modified: portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/FileSystemInstaller.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/FileSystemInstaller.java?rev=348223&r1=348194&r2=348223&view=diff
==============================================================================
--- 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 Tue Nov 22 11:31:57 2005
@@ -13,11 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.util.install.impl;
+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.ManagementException;
+import org.apache.pluto.util.UtilityException;
import org.codehaus.plexus.util.FileUtils;
import java.io.File;
@@ -69,9 +69,9 @@
* 6) Install the Portal Application
* 7) Finally, install the configs
* @param config
- * @throws org.apache.pluto.util.ManagementException
+ * @throws org.apache.pluto.util.UtilityException
*/
- public void install(InstallationConfig config) throws ManagementException {
+ public void install(InstallationConfig config) throws UtilityException {
File endorsedDir = getEndorsedDir(config);
File sharedDir = getSharedDir(config);
File domainDir = getWebAppDir(config);
@@ -90,7 +90,7 @@
writeConfiguration(config);
}
catch(IOException io) {
- throw new ManagementException(
+ throw new UtilityException(
"Unable to install portal to Tomcat",
io,
config.getInstallationDirectory()
@@ -108,7 +108,7 @@
protected abstract File getWebAppDir(InstallationConfig config);
public void uninstall(InstallationConfig config)
- throws ManagementException {
+ throws UtilityException {
File endorsedDir = getEndorsedDir(config);
File sharedDir = getSharedDir(config);
File domainDir = getWebAppDir(config);
@@ -126,7 +126,7 @@
delete.delete();
}
catch(IOException io) {
- throw new ManagementException("Unable to remove files. ", io, config.getInstallationDirectory());
+ throw new UtilityException("Unable to remove files. ", io, config.getInstallationDirectory());
}
}
Modified: portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/jetty/Call.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/jetty/Call.java?rev=348223&r1=348194&r2=348223&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/jetty/Call.java (original)
+++ portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/jetty/Call.java Tue Nov 22 11:31:57 2005
@@ -1,4 +1,4 @@
-package org.apache.pluto.util.install.impl.jetty;
+package org.apache.pluto.util.install.file.jetty;
/**
* Created by IntelliJ IDEA.
Modified: portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/jetty/Configure.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/jetty/Configure.java?rev=348223&r1=348194&r2=348223&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/jetty/Configure.java (original)
+++ portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/jetty/Configure.java Tue Nov 22 11:31:57 2005
@@ -1,4 +1,4 @@
-package org.apache.pluto.util.install.impl.jetty;
+package org.apache.pluto.util.install.file.jetty;
/**
* Created by IntelliJ IDEA.
Copied: portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/jetty/Jetty5FileSystemInstaller.java (from r348194, portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/impl/Jetty5FileSystemInstaller.java)
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/jetty/Jetty5FileSystemInstaller.java?p2=portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/jetty/Jetty5FileSystemInstaller.java&p1=portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/impl/Jetty5FileSystemInstaller.java&r1=348194&r2=348223&rev=348223&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/impl/Jetty5FileSystemInstaller.java (original)
+++ portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/jetty/Jetty5FileSystemInstaller.java Tue Nov 22 11:31:57 2005
@@ -13,17 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.util.install.impl;
+package org.apache.pluto.util.install.file.jetty;
import org.apache.pluto.util.install.InstallationConfig;
-import org.apache.pluto.util.install.impl.FileSystemInstaller;
-import org.apache.pluto.util.ManagementException;
-import org.codehaus.plexus.util.FileUtils;
+import org.apache.pluto.util.install.file.FileSystemInstaller;
+import org.apache.pluto.util.UtilityException;
import java.io.File;
-import java.io.FileWriter;
-import java.util.Iterator;
-import java.util.Map;
public class Jetty5FileSystemInstaller extends FileSystemInstaller {
@@ -76,9 +72,9 @@
* 6) Install the Portal Application
* 7) Finally, install the configs
* @param config
- * @throws org.apache.pluto.util.ManagementException
+ * @throws org.apache.pluto.util.UtilityException
*/
- public void install(InstallationConfig config) throws ManagementException {
+ public void install(InstallationConfig config) throws UtilityException {
File endorsedDir = getEndorsedDir(config);
File sharedDir = getSharedDir(config);
File domainDir = getWebAppDir(config);
Copied: portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/tomcat5/Tomcat5FileSystemInstaller.java (from r348194, portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/impl/Tomcat5FileSystemInstaller.java)
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/tomcat5/Tomcat5FileSystemInstaller.java?p2=portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/tomcat5/Tomcat5FileSystemInstaller.java&p1=portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/impl/Tomcat5FileSystemInstaller.java&r1=348194&r2=348223&rev=348223&view=diff
==============================================================================
--- portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/impl/Tomcat5FileSystemInstaller.java (original)
+++ portals/pluto/trunk/pluto-util/src/main/java/org/apache/pluto/util/install/file/tomcat5/Tomcat5FileSystemInstaller.java Tue Nov 22 11:31:57 2005
@@ -13,10 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pluto.util.install.impl;
+package org.apache.pluto.util.install.file.tomcat5;
import org.apache.pluto.util.install.InstallationConfig;
-import org.apache.pluto.util.ManagementException;
+import org.apache.pluto.util.install.file.FileSystemInstaller;
import java.io.File;
import java.io.FileWriter;
Modified: portals/pluto/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/pom.xml?rev=348223&r1=348222&r2=348223&view=diff
==============================================================================
--- portals/pluto/trunk/pom.xml (original)
+++ portals/pluto/trunk/pom.xml Tue Nov 22 11:31:57 2005
@@ -182,7 +182,6 @@
<module>maven-pluto-plugin</module>
<module>pluto-descriptor-api</module>
<module>pluto-descriptor-impl</module>
- <module>pluto-deploy</module>
<module>pluto-container</module>
<module>pluto-taglib</module>
<module>pluto-util</module>