You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/09/04 11:46:42 UTC
svn commit: r439998 - in /geronimo/server/trunk/maven-plugins:
car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/
geronimo-deployment-plugin/src/main/java/org/apache/geronimo/plugins/deployment/
geronimo-maven-plugin/src/main/java/org/apach...
Author: jdillon
Date: Mon Sep 4 02:46:40 2006
New Revision: 439998
URL: http://svn.apache.org/viewvc?view=rev&rev=439998
Log:
Update to reflect new package names for some genesis bits
Moved JCL Log adapter to plugin-support
Removed:
geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/MavenPluginLog.java
geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/ObjectHolder.java
geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/resources/commons-logging.properties
Modified:
geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/AbstractCarMojo.java
geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ClasspathElement.java
geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/InstallArtifactsMojo.java
geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageMojo.java
geronimo/server/trunk/maven-plugins/geronimo-deployment-plugin/src/main/java/org/apache/geronimo/plugins/deployment/AbstractModuleMojo.java
geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/AssemblyConfig.java
geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/ServerMojoSupport.java
geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/StartServerMojo.java
geronimo/server/trunk/maven-plugins/selenium-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/selenium/StartServerMojo.java
Modified: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/AbstractCarMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/AbstractCarMojo.java?view=diff&rev=439998&r1=439997&r2=439998
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/AbstractCarMojo.java (original)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/AbstractCarMojo.java Mon Sep 4 02:46:40 2006
@@ -16,7 +16,19 @@
package org.apache.geronimo.plugin.car;
-import org.apache.geronimo.plugin.MojoSupport;
+import java.io.File;
+import java.io.IOException;
+import java.io.FileOutputStream;
+import java.io.BufferedOutputStream;
+
+import java.util.Set;
+import java.util.List;
+import java.util.Iterator;
+import java.util.HashSet;
+import java.util.ArrayList;
+import java.util.Properties;
+
+import org.apache.geronimo.genesis.MojoSupport;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectHelper;
@@ -29,18 +41,6 @@
import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Exclusion;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.FileOutputStream;
-import java.io.BufferedOutputStream;
-
-import java.util.Set;
-import java.util.List;
-import java.util.Iterator;
-import java.util.HashSet;
-import java.util.ArrayList;
-import java.util.Properties;
/**
* Support for <em>packaging</em> Mojos.
Modified: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ClasspathElement.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ClasspathElement.java?view=diff&rev=439998&r1=439997&r2=439998
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ClasspathElement.java (original)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/ClasspathElement.java Mon Sep 4 02:46:40 2006
@@ -16,7 +16,7 @@
package org.apache.geronimo.plugin.car;
-import org.apache.geronimo.plugin.ArtifactItem;
+import org.apache.geronimo.genesis.ArtifactItem;
/**
* Represents a Maven-artifact with additional classparh prefix details to build a jar's Manifest Class-Path.
Modified: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/InstallArtifactsMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/InstallArtifactsMojo.java?view=diff&rev=439998&r1=439997&r2=439998
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/InstallArtifactsMojo.java (original)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/InstallArtifactsMojo.java Mon Sep 4 02:46:40 2006
@@ -18,7 +18,8 @@
import org.apache.geronimo.kernel.repository.WriteableRepository;
import org.apache.geronimo.system.repository.Maven2Repository;
-import org.apache.geronimo.plugin.ArtifactItem;
+
+import org.apache.geronimo.genesis.ArtifactItem;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.artifact.Artifact;
Modified: geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageMojo.java?view=diff&rev=439998&r1=439997&r2=439998
==============================================================================
--- geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageMojo.java (original)
+++ geronimo/server/trunk/maven-plugins/car-maven-plugin/src/main/java/org/apache/geronimo/plugin/car/PackageMojo.java Mon Sep 4 02:46:40 2006
@@ -46,7 +46,8 @@
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.ReferencePatterns;
import org.apache.geronimo.gbean.AbstractNameQuery;
-import org.apache.geronimo.plugin.ArtifactItem;
+
+import org.apache.geronimo.genesis.ArtifactItem;
import org.apache.maven.archiver.MavenArchiveConfiguration;
import org.apache.maven.archiver.MavenArchiver;
Modified: geronimo/server/trunk/maven-plugins/geronimo-deployment-plugin/src/main/java/org/apache/geronimo/plugins/deployment/AbstractModuleMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/geronimo-deployment-plugin/src/main/java/org/apache/geronimo/plugins/deployment/AbstractModuleMojo.java?view=diff&rev=439998&r1=439997&r2=439998
==============================================================================
--- geronimo/server/trunk/maven-plugins/geronimo-deployment-plugin/src/main/java/org/apache/geronimo/plugins/deployment/AbstractModuleMojo.java (original)
+++ geronimo/server/trunk/maven-plugins/geronimo-deployment-plugin/src/main/java/org/apache/geronimo/plugins/deployment/AbstractModuleMojo.java Mon Sep 4 02:46:40 2006
@@ -26,7 +26,8 @@
import javax.enterprise.deploy.spi.exceptions.DeploymentManagerCreationException;
import org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryImpl;
-import org.apache.geronimo.plugin.MojoSupport;
+
+import org.apache.geronimo.genesis.MojoSupport;
//
// TODO: Rename to AbstractDeploymentMojo
Modified: geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/AssemblyConfig.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/AssemblyConfig.java?view=diff&rev=439998&r1=439997&r2=439998
==============================================================================
--- geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/AssemblyConfig.java (original)
+++ geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/AssemblyConfig.java Mon Sep 4 02:46:40 2006
@@ -16,7 +16,7 @@
package org.apache.geronimo.mavenplugins.geronimo;
-import org.apache.geronimo.plugin.ArtifactItem;
+import org.apache.geronimo.genesis.ArtifactItem;
/**
* Assembly artifact configuration.
Modified: geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/ServerMojoSupport.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/ServerMojoSupport.java?view=diff&rev=439998&r1=439997&r2=439998
==============================================================================
--- geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/ServerMojoSupport.java (original)
+++ geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/ServerMojoSupport.java Mon Sep 4 02:46:40 2006
@@ -17,8 +17,6 @@
package org.apache.geronimo.mavenplugins.geronimo;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
import org.apache.geronimo.genesis.AntMojoSupport;
@@ -30,21 +28,6 @@
public abstract class ServerMojoSupport
extends AntMojoSupport
{
- //
- // TODO: Move this to MojoSupport
- //
-
- static {
- //
- // HACK: Since this module needs to pick up some classes from geronimo-kernel, and since
- // that module assumes that you want to use its logging, we have to forcefully
- // configure JCL to use its defaults, and tell the Geronomo logging not to bootstrap iniitalize.
- //
-
- System.setProperty("org.apache.commons.logging.LogFactory", "org.apache.commons.logging.impl.LogFactoryImpl");
- System.setProperty("geronimo.bootstrap.logging.enabled", "false");
- }
-
/**
* The port number to connect to the server..
*
@@ -81,12 +64,5 @@
protected MavenProject getProject() {
return project;
- }
-
- protected void init() throws MojoExecutionException, MojoFailureException {
- super.init();
-
- // Install the bridge from JCL to this plugins Log
- MavenPluginLog.setLog(log);
}
}
Modified: geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/StartServerMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/StartServerMojo.java?view=diff&rev=439998&r1=439997&r2=439998
==============================================================================
--- geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/StartServerMojo.java (original)
+++ geronimo/server/trunk/maven-plugins/geronimo-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/geronimo/StartServerMojo.java Mon Sep 4 02:46:40 2006
@@ -23,6 +23,7 @@
import java.util.TimerTask;
import org.apache.tools.ant.taskdefs.Java;
+import org.apache.geronimo.genesis.ObjectHolder;
/**
* Start the Geronimo server.
Modified: geronimo/server/trunk/maven-plugins/selenium-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/selenium/StartServerMojo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/maven-plugins/selenium-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/selenium/StartServerMojo.java?view=diff&rev=439998&r1=439997&r2=439998
==============================================================================
--- geronimo/server/trunk/maven-plugins/selenium-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/selenium/StartServerMojo.java (original)
+++ geronimo/server/trunk/maven-plugins/selenium-maven-plugin/src/main/java/org/apache/geronimo/mavenplugins/selenium/StartServerMojo.java Mon Sep 4 02:46:40 2006
@@ -16,11 +16,6 @@
package org.apache.geronimo.mavenplugins.selenium;
-import org.apache.maven.project.MavenProject;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugin.MojoExecutionException;
-
import java.io.File;
import java.io.PrintWriter;
import java.io.BufferedWriter;
@@ -30,7 +25,13 @@
import java.net.MalformedURLException;
import java.util.Map;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugin.MojoExecutionException;
+
import org.apache.geronimo.genesis.AntMojoSupport;
+
import org.apache.commons.io.IOUtils;
import org.apache.tools.ant.taskdefs.Java;