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/10/25 17:30:55 UTC
svn commit: r328387 - in /portals/pluto/branches/pluto-1.1: ./
maven-pluto-plugin/src/main/java/org/apache/pluto/maven/
pluto-site/src/site/apt/ pluto-util/
Author: ddewolf
Date: Tue Oct 25 08:30:48 2005
New Revision: 328387
URL: http://svn.apache.org/viewcvs?rev=328387&view=rev
Log:
Allowing command line arguments to specify the installation directory. Removing default command line args
Modified:
portals/pluto/branches/pluto-1.1/TODO
portals/pluto/branches/pluto-1.1/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/AbstractPlutoMojo.java
portals/pluto/branches/pluto-1.1/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallMojo.java
portals/pluto/branches/pluto-1.1/pluto-site/src/site/apt/getting-started.apt
portals/pluto/branches/pluto-1.1/pluto-util/pom.xml
Modified: portals/pluto/branches/pluto-1.1/TODO
URL: http://svn.apache.org/viewcvs/portals/pluto/branches/pluto-1.1/TODO?rev=328387&r1=328386&r2=328387&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1/TODO (original)
+++ portals/pluto/branches/pluto-1.1/TODO Tue Oct 25 08:30:48 2005
@@ -13,4 +13,12 @@
4) Update NSIS and create installer
plugin for NSIS.
-5)
+5) Refactor Services
+ Combine
+ Dynamic Info Provider,
+ PortalCallback,
+ and PropertyManager into
+
+ Single Portal Callback Service
+
+
Modified: portals/pluto/branches/pluto-1.1/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/AbstractPlutoMojo.java
URL: http://svn.apache.org/viewcvs/portals/pluto/branches/pluto-1.1/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/AbstractPlutoMojo.java?rev=328387&r1=328386&r2=328387&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/AbstractPlutoMojo.java (original)
+++ portals/pluto/branches/pluto-1.1/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/AbstractPlutoMojo.java Tue Oct 25 08:30:48 2005
@@ -27,11 +27,13 @@
* @since Jul 30, 2005
*/
public abstract class AbstractPlutoMojo extends org.apache.maven.plugin.AbstractMojo {
+
/**
- * @parameter expression="${pluto.installation.dir}"
+ * @parameter expression="${installDir}"
* @required
*/
protected File installationDirectory;
+
/**
* @parameter expression="${project}"
* @required
@@ -41,7 +43,12 @@
public void execute() throws MojoExecutionException {
if(!installationDirectory.exists() || !installationDirectory.isDirectory()) {
- throw new MojoExecutionException("Installation Directory "+installationDirectory.getAbsolutePath()+" does not exist.");
+ StringBuffer sb = new StringBuffer();
+ sb.append("Installation directory ")
+ .append(installationDirectory.getAbsolutePath())
+ .append(" does not exist")
+ .append(" Please specify your app server installation directory by using the -Dpluto.installation.dir property.");
+ throw new MojoExecutionException(sb.toString());
}
try {
Modified: portals/pluto/branches/pluto-1.1/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallMojo.java
URL: http://svn.apache.org/viewcvs/portals/pluto/branches/pluto-1.1/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallMojo.java?rev=328387&r1=328386&r2=328387&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallMojo.java (original)
+++ portals/pluto/branches/pluto-1.1/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallMojo.java Tue Oct 25 08:30:48 2005
@@ -29,6 +29,7 @@
/**
* @todo Enhancement. Support installing release from repo
* @goal install
+ * @description the pluto ApplicationServerHook goal installs the pluto portal into the specified application server
* @requiresDependencyResolution runtime
*/
public class InstallMojo extends AbstractInstallationMojo {
@@ -37,7 +38,15 @@
}
- public InstallMojo(MavenProject project,
+ /**
+ * Constructor required by the ReinstallMojo
+ * @param project
+ * @param installationDirectory
+ * @param basedir
+ * @param host
+ * @param engine
+ */
+ protected InstallMojo(MavenProject project,
File installationDirectory,
File basedir,
String host, String engine) {
Modified: portals/pluto/branches/pluto-1.1/pluto-site/src/site/apt/getting-started.apt
URL: http://svn.apache.org/viewcvs/portals/pluto/branches/pluto-1.1/pluto-site/src/site/apt/getting-started.apt?rev=328387&r1=328386&r2=328387&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1/pluto-site/src/site/apt/getting-started.apt (original)
+++ portals/pluto/branches/pluto-1.1/pluto-site/src/site/apt/getting-started.apt Tue Oct 25 08:30:48 2005
@@ -19,7 +19,7 @@
$> cd <PLUTO-1.1-HOME>
$> mvn install
$> cd ../pluto-util
-$> mvn pluto:install
+$> mvn pluto:install -DinstallDir=path/to/appserver
---------------
The mvn install goal is a built in Maven2 lifecycle which
Modified: portals/pluto/branches/pluto-1.1/pluto-util/pom.xml
URL: http://svn.apache.org/viewcvs/portals/pluto/branches/pluto-1.1/pluto-util/pom.xml?rev=328387&r1=328386&r2=328387&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1/pluto-util/pom.xml (original)
+++ portals/pluto/branches/pluto-1.1/pluto-util/pom.xml Tue Oct 25 08:30:48 2005
@@ -11,7 +11,7 @@
<url>http://portals.apache.org/pluto/pluto-1.1</url>
<inceptionYear>2001</inceptionYear>
- <!-- The dependencies for the install project
+ <!-- The dependencies for the ApplicationServerHook project
are those which need to be installed!
-->
<dependencies>
@@ -72,7 +72,6 @@
<artifactId>maven-pluto-plugin</artifactId>
<version>1.1-SNAPSHOT</version>
<configuration>
- <installationDirectory>../../pluto-tomcat</installationDirectory>
</configuration>
</plugin>
</plugins>