geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r419353 [4/6] - in /geronimo/sandbox/svkmerge/m2migration: ./ applications/ applications/console/ applications/console/console-core/ applications/console/console-ear/ applications/console/console-framework/ applications/console/console-stan...
Date Wed, 05 Jul 2006 21:58:52 GMT
Modified: geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilderShellMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilderShellMojo.java?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilderShellMojo.java (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilderShellMojo.java Wed Jul  5 14:58:47 2006
@@ -14,247 +14,254 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+
 package org.apache.geronimo.plugin.packaging;
 
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLClassLoader;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
-import java.util.Set;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.deployment.PluginBootstrap2;
 import org.apache.geronimo.system.configuration.RepositoryConfigurationStore;
 import org.apache.geronimo.system.repository.Maven2Repository;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.plugin.MojoExecutionException;
+
+import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.project.MavenProject;
 
+//
+// TODO: Rename to PackageMojo
+//
 
 /**
  * Build a Geronimo Configuration using the local Maven infrastructure.
- * 
+ *
  * @goal package
  * @phase package
+ *
  * @version $Rev$ $Date$
  */
+public class PackageBuilderShellMojo
+    extends AbstractPackagingMojo
+{
+    private List artifacts;
+
+    private static ClassLoader classLoader;
+
+    /**
+     * @parameter expression="${project}"
+     */
+    private MavenProject project;
+
+    /**
+     * @parameter expression="${settings.localRepository}"
+     */
+    private File repository;
+
+    /**
+     * @parameter expression="${project.build.directory}/repository"
+     */
+    private File targetRepository;
+
+    /**
+     * @parameter expression="org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car"
+     */
+    private String deploymentConfig;
+
+    private Collection deploymentConfigList;
+
+    /**
+     * @parameter expression="org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer"
+     */
+    private String deployerName;
+
+    /**
+     * @parameter expression="${project.build.directory}/plan/plan.xml"
+     */
+    private File planFile;
+
+    /**
+     * @parameter
+     */
+    private File moduleFile;
+
+    /**
+     * @parameter expression="${project.build.directory}/${project.artifactId}-${project.version}.car"
+     */
+    private File packageFile;
+
+    /**
+     * @parameter expression="${project.build.directory}"
+     */
+    private File buildDir;
+
+    /**
+     * @parameter
+     */
+    private String mainClass;
 
-public class PackageBuilderShellMojo extends AbstractPackagingMojo {
-	private static Log log = LogFactory.getLog(PlanProcessorMojo.class);
-	private List artifacts;
-
-	private static ClassLoader classLoader;
-
-	/**
-	 * @parameter expression="${project}"
-	 */
-	private MavenProject project;
-
-	/**
-	 * @parameter expression="${plugin.artifacts}"
-	 */
-	private List pluginArtifacts;
-
-	/**
-	 * @parameter expression="${settings.localRepository}"
-	 */
-	private File repository;
-	/**
-	 * @parameter expression="${project.build.directory}/repository"
-	 */
-	private File targetRepository;
-
-	/**
-	 * @parameter expression="org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car"
-	 */
-	private String deploymentConfig;
-	private Collection deploymentConfigList;
-
-	/**
-	 * @parameter expression="org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car?j2eeType=Deployer,name=Deployer"
-	 */
-	private String deployerName;
-
-	/**
-	 * @parameter expression="${project.build.directory}/plan/plan.xml"
-	 */
-	private File planFile;
-
-	/**
-	 * @parameter
-	 */
-	private File moduleFile;
-
-	/**
-	 * @parameter expression="${project.build.directory}/${project.artifactId}-${project.version}.car"
-	 */
-	private File packageFile;
-	/**
-	 * @parameter expression="${project.build.directory}"
-	 */
-	private File buildDir;
-	/**
-	 * @parameter
-	 */
-	private String mainClass;
     /**
      * @parameter
      */
     private String mainMethod;
+
     /**
      * @parameter
      */
     private String mainGBean;
+
     /**
      * @parameter
      */
     private String configurations;
 
-	/**
-	 * @parameter
-	 */
-	private String classPath;
-
-	/**
-	 * @parameter expression="lib/endorsed"
-	 */
-	private String endorsedDirs;
-
-	/**
-	 * @parameter expression="lib/ext"
-	 */
-	private String extensionDirs;
+    /**
+     * @parameter
+     */
+    private String classPath;
+
+    /**
+     * @parameter expression="lib/endorsed"
+     */
+    private String endorsedDirs;
+
+    /**
+     * @parameter expression="lib/ext"
+     */
+    private String extensionDirs;
+
     /**
      * @parameter expression="${basedir}/../../etc/explicit_versions.properties"
-     */ 
+     */
     private String explicitResolutionLocation;
+
     /**
      * @parameter expression="WARN"
      */
     private String logLevel;
 
-	//private static final String PACKAGING_CLASSPATH_PROPERTY = "packaging.classpath";
-	
-	/**
-	 * @parameter
-	 */
-	private boolean boot = false;
-	
-
-	public void execute() throws MojoExecutionException {
-		try {
-			// create target/repository, delete old contents 
-            //targetRepository.delete();
-			targetRepository.mkdir();
-			if (boot)
-				executeBootShell();
-			else
-				executePackageBuilderShell();
-		} catch (Exception e) {
-			handleError(e);
-		}
-		// copy configuration from target/repository to maven repo
-		project.getArtifact().setFile(packageFile);
-	}
-
-	public void executeBootShell() throws Exception {
-		PluginBootstrap2 boot = new PluginBootstrap2();
-		boot.setBuildDir(buildDir);
-		boot.setCarFile(packageFile);
-		boot.setLocalRepo(repository);
-		boot.setPlan(planFile);
-		System.out.println("******build dir = " + buildDir);
-		System.out.println("******car file = " + packageFile);
-		System.out.println("******repo = " + repository);
-		System.out.println("******plan file = " + planFile);
-		boot.bootstrap();
-	}
-	public void setDeploymentConfigList(String deploymentConfigs) {
-		Collection values = new ArrayList();
-		String[] configList = deploymentConfigs.split(",");
-		for (int i = 0; i < configList.length; i++) {
-			values.add(configList[i]);
-		}
-/*
-	      this.artifacts = artifacts; for (Iterator iterator = artifacts.iterator();
-		  iterator.hasNext();) { Artifact artifact = (Artifact) iterator.next();
-		  //Dependency dependency = artifact.getDependency(); //if
-		  (dependency.getProperty(PACKAGING_CONFIG_PROPERTY) != null) { if
-		  ("car".equals(artifact.getType()) && "provided".equals(artifact.getScope())) {
-		  //String orderString = dependency.getProperty(PACKAGING_CONFIG_PROPERTY);
-		  String orderString = getOrderString(artifact); try { Integer order =
-		  Integer.decode(orderString); String artifactString = artifact.getGroupId() +
-		  "/" + artifact.getArtifactId() + "/" + dependency.getVersion() + "/" +
-		  dependency.getType(); tree.put(order, artifactString); }
-		  catch(NumberFormatException e) { System.out.println("Could not interpret
-		  order for " + dependency); } } }
- */
+    /**
+     * @parameter
+     */
+    private boolean boot = false;
+
+    protected void doExecute() throws Exception {
+        targetRepository.mkdir();
+
+        if (boot) {
+            executeBootShell();
+        }
+        else {
+            executePackageBuilderShell();
+        }
+
+        // copy configuration from target/repository to maven repo
+        project.getArtifact().setFile(packageFile);
+    }
+
+    public void executeBootShell() throws Exception {
+        if (log.isDebugEnabled()) {
+            log.debug("Build dir: " + buildDir);
+            log.debug("Package file: " + packageFile);
+            log.debug("Repository: " + repository);
+            log.debug("Plan file: " + planFile);
+        }
+
+        PluginBootstrap2 boot = new PluginBootstrap2();
+
+        boot.setBuildDir(buildDir);
+        boot.setCarFile(packageFile);
+        boot.setLocalRepo(repository);
+        boot.setPlan(planFile);
+
+        boot.bootstrap();
+    }
+
+    public void setDeploymentConfigList(String deploymentConfigs) {
+        Collection values = new ArrayList();
+        String[] configList = deploymentConfigs.split(",");
+
+        for (int i = 0; i < configList.length; i++) {
+            values.add(configList[i]);
+        }
 
         deploymentConfigList = values;
     }
-	
-	public void executePackageBuilderShell() throws Exception {
-		try {
-			setDeploymentConfigList(deploymentConfig);			
-			Object packageBuilder = getPackageBuilder();
-			set("setClassPath", classPath, String.class, packageBuilder);
-			set("setDeployerName", deployerName, String.class, packageBuilder);
-			set("setDeploymentConfig", deploymentConfigList, Collection.class,
-					packageBuilder);
-			set("setEndorsedDirs", endorsedDirs, String.class, packageBuilder);
-			set("setExtensionDirs", extensionDirs, String.class, packageBuilder);
-			set("setMainClass", mainClass, String.class, packageBuilder);
-            set("setMainMethod", mainMethod, String.class, packageBuilder);
-            set("setMainGBean", mainGBean, String.class, packageBuilder);
-            set("setConfigurations", configurations, String.class, packageBuilder);
-			set("setModuleFile", moduleFile, File.class, packageBuilder);
-			set("setPackageFile", packageFile, File.class, packageBuilder);
-			set("setPlanFile", planFile, File.class, packageBuilder);
-			set("setRepository", repository, File.class, packageBuilder);
-			set("setRepositoryClass", Maven2Repository.class.getName(), //was maven1
-					String.class, packageBuilder);
-			set("setConfigurationStoreClass", MavenConfigStore.class.getName(),
-					String.class, packageBuilder);
-			set("setTargetRepository", targetRepository, File.class,
-					packageBuilder);
-			set("setTargetRepositoryClass", Maven2Repository.class.getName(),
-					String.class, packageBuilder);
-			set("setTargetConfigurationStoreClass",
-					RepositoryConfigurationStore.class.getName(), String.class,
-					packageBuilder);
-			set("setExplicitResolutionLocation", explicitResolutionLocation,
-					String.class, packageBuilder);
-            set("setLogLevel", logLevel, String.class, packageBuilder);
-
-			Method m = packageBuilder.getClass().getMethod("execute",
-					new Class[] {});
-			m.invoke(packageBuilder, new Object[] {});
-		} catch (Exception e) {
-			log.error(e.getClass().getName() + ": " + e.getMessage(), e);
-			throw e;
-		}
-	}
-
-	private void set(String methodName, Object value, Class type,
-			Object packageBuilder) throws NoSuchMethodException,
-			IllegalAccessException, InvocationTargetException {
-		Method m = packageBuilder.getClass().getMethod(methodName,
-				new Class[] { type });
-		System.out.println("-----------" + value);
-		m.invoke(packageBuilder, new Object[] { value });
-	}
-
-	private Object getPackageBuilder() throws ClassNotFoundException,
-			IllegalAccessException, InstantiationException,
-			MalformedURLException {
-		//System.out.println("plugin artifacts = " + pluginArtifacts);
-		return new PackageBuilder();
-		}
-	}
+
+    public void executePackageBuilderShell() throws Exception {
+        setDeploymentConfigList(deploymentConfig);
+        Object packageBuilder = getPackageBuilder();
+
+        set("setClassPath", classPath, String.class, packageBuilder);
+        set("setDeployerName", deployerName, String.class, packageBuilder);
+        set("setDeploymentConfig", deploymentConfigList, Collection.class, packageBuilder);
+        set("setEndorsedDirs", endorsedDirs, String.class, packageBuilder);
+        set("setExtensionDirs", extensionDirs, String.class, packageBuilder);
+        set("setMainClass", mainClass, String.class, packageBuilder);
+        set("setMainMethod", mainMethod, String.class, packageBuilder);
+        set("setMainGBean", mainGBean, String.class, packageBuilder);
+        set("setConfigurations", configurations, String.class, packageBuilder);
+        set("setModuleFile", moduleFile, File.class, packageBuilder);
+        set("setPackageFile", packageFile, File.class, packageBuilder);
+        set("setPlanFile", planFile, File.class, packageBuilder);
+        set("setRepository", repository, File.class, packageBuilder);
+        set("setRepositoryClass", Maven2Repository.class.getName(), String.class, packageBuilder);
+        set("setConfigurationStoreClass", MavenConfigStore.class.getName(), String.class, packageBuilder);
+        set("setTargetRepository", targetRepository, File.class, packageBuilder);
+        set("setTargetRepositoryClass", Maven2Repository.class.getName(), String.class, packageBuilder);
+        set("setTargetConfigurationStoreClass", RepositoryConfigurationStore.class.getName(), String.class, packageBuilder);
+        set("setExplicitResolutionLocation", explicitResolutionLocation, String.class, packageBuilder);
+        set("setLogLevel", logLevel, String.class, packageBuilder);
+        
+        try {
+            Method m = packageBuilder.getClass().getMethod("execute", new Class[0]);
+            m.invoke(packageBuilder, new Object[0]);
+        }
+        catch (InvocationTargetException e) {
+            log.debug("Decoding ITE", e);
+            
+            Throwable t = e.getTargetException();
+            
+            if (t instanceof Exception) {
+                throw (Exception)t;
+            }
+            if (t instanceof Error) {
+                throw (Error)t;
+            }
+            
+            throw new Error(t);
+        }
+    }
+
+    private void set(String methodName, Object value, Class type, Object packageBuilder) throws Exception {
+        Log log = getLog();
+        
+        log.debug("Setting (" + methodName + "): " + value);
+
+        try {
+            Method m = packageBuilder.getClass().getMethod(methodName, new Class[]{type});
+            m.invoke(packageBuilder, new Object[]{value});
+        }
+        catch (InvocationTargetException e) {
+            log.debug("Decoding ITE", e);
+            
+            // Decode ITE
+            Throwable t = e.getTargetException();
+            
+            if (t instanceof Exception) {
+                throw (Exception)t;
+            }
+            if (t instanceof Error) {
+                throw (Error)t;
+            }
+            
+            throw new Error(t);
+        }
+    }
+
+    private Object getPackageBuilder() {
+        return new PackageBuilder();
+    }
+}

Modified: geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackagingCommandLine.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackagingCommandLine.java?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackagingCommandLine.java (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackagingCommandLine.java Wed Jul  5 14:58:47 2006
@@ -14,6 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+
 package org.apache.geronimo.plugin.packaging;
 
 import java.io.File;
@@ -28,7 +29,6 @@
  */
 public class PackagingCommandLine {
 
-
     public static void Main(String[] args) throws Exception {
         File configFile = new File("packaging.properties");
         Properties config = new Properties();
@@ -41,20 +41,21 @@
         mergeArgs(config, args);
 
         new PackagingCommandLine(config).execute();
-
     }
 
-
     private static void mergeArgs(Properties config, String[] args) throws Exception {
         if (args.length % 2 != 0) {
             throw new Exception("There must be an even number of args, --<name> followed by value");
         }
+
         for (int i = 0; i < args.length; i++) {
             String key = args[i++];
             String value = args[i];
+
             if (!key.startsWith("--")) {
                 throw new Exception("Keys must be preceded by '--'");
             }
+
             key = key.substring(2);
             config.put(key, value);
         }
@@ -91,6 +92,4 @@
         }
         return new File(fileName);
     }
-
-
 }

Modified: geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PlanProcessorMojo.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PlanProcessorMojo.java?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PlanProcessorMojo.java (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PlanProcessorMojo.java Wed Jul  5 14:58:47 2006
@@ -14,190 +14,183 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+
 package org.apache.geronimo.plugin.packaging;
 
 import java.io.File;
 import java.io.StringWriter;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
-import java.util.HashSet;
 import java.util.Properties;
 
 import javax.xml.namespace.QName;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.deployment.service.EnvironmentBuilder;
 import org.apache.geronimo.deployment.xbeans.ArtifactType;
 import org.apache.geronimo.deployment.xbeans.EnvironmentType;
 import org.apache.geronimo.kernel.repository.Environment;
-import org.apache.maven.artifact.Artifact;
-import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.geronimo.kernel.repository.Artifact;
+import org.apache.geronimo.kernel.repository.ImportType;
+
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.model.Dependency;
+
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
 import org.apache.velocity.app.VelocityEngine;
+
 import org.apache.xmlbeans.XmlCursor;
-import org.apache.xmlbeans.XmlException;
 import org.apache.xmlbeans.XmlObject;
 import org.apache.xmlbeans.XmlOptions;
 
+//
+// TODO: Rename to DependenciesMojo
+//
+
 /**
- * Add dependencies to a plan and process with velocity 
+ * Add dependencies to a plan and process with velocity
  * 
  * @goal dependencies
- * 
+ *
  * @version $Rev$ $Date$
  */
-public class PlanProcessorMojo extends AbstractPackagingMojo {
-	private static Log log = LogFactory.getLog(PlanProcessorMojo.class);
-
-	private static final String IMPORT_PROPERTY = "geronimo.import";
-	//private static final String INCLUDE_PROPERTY = "geronimo.include";
-	private static final String DEPENDENCY_PROPERTY = "geronimo.dependency";
-	private static final String KEEP_VERSION_PROPERTY = "geronimo.keep.version";
-    private static final String REFERENCE_PROPERTY = "geronimo.reference";
+public class PlanProcessorMojo
+    extends AbstractPackagingMojo
+{
     private static final String ENVIRONMENT_LOCAL_NAME = "environment";
 
-	private static final QName ENVIRONMENT_QNAME = new QName(
-			"http://geronimo.apache.org/xml/ns/deployment-1.1", "environment");
-	/**
-	 * POM
-	 * @parameter expression="${project}"
-	 * @readonly
-	 * @required
+    private static final QName ENVIRONMENT_QNAME = new QName("http://geronimo.apache.org/xml/ns/deployment-1.1", "environment");
+
+    /**
+     * @parameter expression="${project}"
+     * @readonly
+     * @required
      */
-	private MavenProject project;
-	/**
+    private MavenProject project;
+
+    /**
      * @parameter expression="${basedir}/src/plan"
      */
-	private String sourceDir;
-	/**
+    private String sourceDir;
+
+    /**
      * @parameter expression="${project.build.directory}/plan"
      */
-	private String targetDir;
-	/**
+    private String targetDir;
+
+    /**
      * @parameter expression="plan.xml"
      */
-	private String planFile;
-	/**
+    private String planFile;
+
+    /**
      * @parameter expression="${project.build.directory}/plan/plan.xml"
      */
-	private String targetFile;
-    
-	private VelocityContext context;
-	
-	//private List artifacts;
-	
-	// This is needed for ${pom.currentVersion} and will be removed when 
-	// we move to a full m2 build
-	private VelocityContext createContext() {
-		VelocityContext context = new VelocityContext();
-		Map pom = new HashMap();
-		pom.put("groupId", project.getGroupId());
-		pom.put( "artifactId", project.getArtifactId());
-		pom.put("currentVersion", project.getVersion());
-		context.put("pom", pom);
+    private String targetFile;
+
+    //
+    // FIXME: Resolve what to do about this comment...
+    //
+    // This is needed for ${pom.currentVersion} and will be removed when
+    // we move to a full m2 build
+    //
+
+    private VelocityContext createContext() {
+        VelocityContext context = new VelocityContext();
+        Map pom = new HashMap();
+        pom.put("groupId", project.getGroupId());
+        pom.put("artifactId", project.getArtifactId());
+        pom.put("currentVersion", project.getVersion());
+        context.put("pom", pom);
+
         // Load properties, It inherits them all!
-        Properties props = project.getProperties();        
+        Properties props = project.getProperties();
         for (Iterator iter = props.keySet().iterator(); iter.hasNext();) {
-            String key = (String)iter.next();
-            //System.out.println("**** key = " + key + "value = " + props.getProperty(key));
-            context.put(key, props.getProperty(key));
-        }
-        
-		return context;
-	}
-
-	public void execute() throws MojoExecutionException {
-
-		context = createContext();
-		try {
-			executePlanProcessor();
-		} catch (Exception e) {
-			handleError(e);
-		}
-	}
-
-	public void executePlanProcessor() throws Exception, XmlException {
-		try {
-			if (project == null) {
-				throw new RuntimeException("project not supplied");
-			}
-			if (targetDir == null) {
-				throw new RuntimeException("No target directory supplied");
-			}
-			if (planFile == null) {
-				throw new RuntimeException("No source plan supplied");
-			}
-			if (targetFile == null) {
-				throw new RuntimeException("No target plan supplied");
-			}
-
-			File sourceD = new File(sourceDir);
-			VelocityEngine velocity = new VelocityEngine();
-			velocity.setProperty(VelocityEngine.FILE_RESOURCE_LOADER_PATH,
-					sourceD.getAbsolutePath());
-			velocity.init();
-			Template template = velocity.getTemplate(planFile);
-			StringWriter writer = new StringWriter();
-			template.merge(context, writer);
-			
-			String plan = writer.toString();
-			
-			XmlObject doc = XmlObject.Factory.parse(plan);
-			XmlCursor xmlCursor = doc.newCursor();
-			LinkedHashSet dependencies = toDependencies();
-            org.apache.geronimo.kernel.repository.Artifact configId = new org.apache.geronimo.kernel.repository.Artifact(
-					project.getGroupId(), project.getArtifactId(), project.getVersion(), "car");
-            try {
-
-                mergeEnvironment(xmlCursor, configId, dependencies);
-				File targetDir = new File(this.targetDir);
-				if (targetDir.exists()) {
-					if (!targetDir.isDirectory()) {
-						throw new RuntimeException("TargetDir: "
-								+ this.targetDir
-								+ " exists and is not a directory");
-					}
-				} else {
-					targetDir.mkdirs();
-				}
-				File output = new File(targetFile);
-				XmlOptions xmlOptions = new XmlOptions();
-				xmlOptions.setSavePrettyPrint();
-				doc.save(output, xmlOptions);
-			} finally {
-				xmlCursor.dispose();
-			}
-		} catch (Exception e) {
-			log.error(e.getClass().getName() + ": " + e.getMessage(), e);
-			throw e;
-		}
-	}
+            String key = (String) iter.next();
+            String value = props.getProperty(key);
+
+            log.debug("Setting " + key + "=" + value);
+            context.put(key, value);
+        }
+
+        return context;
+    }
+
+    protected void doExecute() throws Exception {
+        if (project == null) {
+            throw new RuntimeException("project not supplied");
+        }
+        if (targetDir == null) {
+            throw new RuntimeException("No target directory supplied");
+        }
+        if (planFile == null) {
+            throw new RuntimeException("No source plan supplied");
+        }
+        if (targetFile == null) {
+            throw new RuntimeException("No target plan supplied");
+        }
+
+        VelocityContext context = createContext();
+
+        File sourceD = new File(sourceDir);
+        VelocityEngine velocity = new VelocityEngine();
+        velocity.setProperty(VelocityEngine.FILE_RESOURCE_LOADER_PATH, sourceD.getAbsolutePath());
+        velocity.init();
+
+        Template template = velocity.getTemplate(planFile);
+        StringWriter writer = new StringWriter();
+        template.merge(context, writer);
+
+        String plan = writer.toString();
+
+        XmlObject doc = XmlObject.Factory.parse(plan);
+        XmlCursor xmlCursor = doc.newCursor();
+        LinkedHashSet dependencies = toDependencies();
+        Artifact configId = new Artifact(project.getGroupId(), project.getArtifactId(), project.getVersion(), "car");
+
+        try {
+            mergeEnvironment(xmlCursor, configId, dependencies);
+            File targetDir = new File(this.targetDir);
+
+            if (targetDir.exists()) {
+                if (!targetDir.isDirectory()) {
+                    throw new RuntimeException("TargetDir: " + this.targetDir + " exists and is not a directory");
+                }
+            }
+            else {
+                targetDir.mkdirs();
+            }
+
+            File output = new File(targetFile);
+            XmlOptions xmlOptions = new XmlOptions();
+            xmlOptions.setSavePrettyPrint();
+            doc.save(output, xmlOptions);
+        }
+        finally {
+            xmlCursor.dispose();
+        }
+    }
 
-    void mergeEnvironment(XmlCursor xmlCursor, org.apache.geronimo.kernel.repository.Artifact configId, LinkedHashSet dependencies) {
+    void mergeEnvironment(final XmlCursor xmlCursor, final Artifact configId, final LinkedHashSet dependencies) {
         xmlCursor.toFirstContentToken();
         xmlCursor.toFirstChild();
         QName childName = xmlCursor.getName();
         Environment oldEnvironment;
+
         if (childName != null && childName.getLocalPart().equals(ENVIRONMENT_LOCAL_NAME)) {
             convertElement(xmlCursor, ENVIRONMENT_QNAME.getNamespaceURI());
             XmlObject xmlObject = xmlCursor.getObject();
             EnvironmentType environmentType = (EnvironmentType) xmlObject.copy().changeType(EnvironmentType.type);
             oldEnvironment = EnvironmentBuilder.buildEnvironment(environmentType);
             xmlCursor.removeXml();
-        } else {
+        }
+        else {
             oldEnvironment = new Environment();
         }
 
-
         Environment newEnvironment = new Environment();
         newEnvironment.setConfigId(configId);
         newEnvironment.setDependencies(dependencies);
@@ -207,84 +200,98 @@
 
         xmlCursor.beginElement(ENVIRONMENT_QNAME);
         XmlCursor element = environmentType.newCursor();
+
         try {
             element.copyXmlContents(xmlCursor);
-        } finally {
+        }
+        finally {
             element.dispose();
         }
     }
 
-    private void convertElement(XmlCursor cursor, String namespace) {
+    private void convertElement(final XmlCursor cursor, final String namespace) {
         cursor.push();
         XmlCursor end = cursor.newCursor();
+
         try {
             end.toCursor(cursor);
             end.toEndToken();
+
             while (cursor.hasNextToken() && cursor.isLeftOf(end)) {
                 if (cursor.isStart()) {
                     if (!namespace.equals(cursor.getName().getNamespaceURI())) {
                         cursor.setName(new QName(namespace, cursor.getName().getLocalPart()));
                     }
                 }
+
                 cursor.toNextToken();
             }
+
             cursor.pop();
-        } finally {
+        }
+        finally {
             end.dispose();
         }
     }
 
     private LinkedHashSet toDependencies() {
-    	List artifacts = project.getDependencies();
+        List artifacts = project.getDependencies();
         LinkedHashSet dependencies = new LinkedHashSet();
-        for (Iterator iterator = artifacts.iterator(); iterator.hasNext();) {
+
+        Iterator iterator = artifacts.iterator();
+        while (iterator.hasNext()) {
             //Artifact artifact = (Artifact) iterator.next();
             Dependency dependency = (Dependency) iterator.next();
             //Dependency dependency = artifact.getDependency();
             org.apache.geronimo.kernel.repository.Dependency geronimoDependency = toGeronimoDependency(dependency);
+
             if (geronimoDependency != null) {
                 dependencies.add(geronimoDependency);
             }
         }
+
         return dependencies;
     }
 
-    private static org.apache.geronimo.kernel.repository.Dependency toGeronimoDependency(Dependency dependency) {    	
-        org.apache.geronimo.kernel.repository.Artifact artifact = toGeronimoArtifact(dependency);
+    private static org.apache.geronimo.kernel.repository.Dependency toGeronimoDependency(final Dependency dependency) {
+        Artifact artifact = toGeronimoArtifact(dependency);
         String type = dependency.getType();
         String scope = dependency.getScope();
         String groupId = dependency.getGroupId();
+
         //!"org.apache.geronimo.specs".equals(groupId) jacc spec needed in plan.xml
-        if ("jar".equalsIgnoreCase(type)&& !"junit".equals(groupId)) {
+        if ("jar".equalsIgnoreCase(type) && !"junit".equals(groupId)) {
             if (dependency.getVersion() != null) {
-                artifact = new org.apache.geronimo.kernel.repository.Artifact(artifact.getGroupId(), artifact.getArtifactId(), dependency.getVersion(), artifact.getType());
+                artifact = new Artifact(artifact.getGroupId(), artifact.getArtifactId(), dependency.getVersion(), artifact.getType());
             }
-            return new org.apache.geronimo.kernel.repository.Dependency(artifact, org.apache.geronimo.kernel.repository.ImportType.CLASSES);
-//        } else if ("true".equals(dependency.getProperty(REFERENCE_PROPERTY))) {
-        } else if ("car".equalsIgnoreCase(type)&& ("runtime").equalsIgnoreCase(type)) {    
-           return new org.apache.geronimo.kernel.repository.Dependency(artifact, org.apache.geronimo.kernel.repository.ImportType.SERVICES);
-        } else if ("car".equalsIgnoreCase(type)&& ("compile".equalsIgnoreCase(scope))) {
-            return new org.apache.geronimo.kernel.repository.Dependency(artifact, org.apache.geronimo.kernel.repository.ImportType.CLASSES);  
-        } else if ("car".equalsIgnoreCase(type)&& (scope == null)) { //parent
-            return new org.apache.geronimo.kernel.repository.Dependency(artifact, org.apache.geronimo.kernel.repository.ImportType.ALL);
-        
-        } else {
+            return new org.apache.geronimo.kernel.repository.Dependency(artifact, ImportType.CLASSES);
+        // } else if ("true".equals(dependency.getProperty(REFERENCE_PROPERTY))) {
+        }
+        else if ("car".equalsIgnoreCase(type) && ("runtime").equalsIgnoreCase(type)) {
+            return new org.apache.geronimo.kernel.repository.Dependency(artifact, ImportType.SERVICES);
+        }
+        else if ("car".equalsIgnoreCase(type) && ("compile".equalsIgnoreCase(scope))) {
+            return new org.apache.geronimo.kernel.repository.Dependency(artifact, ImportType.CLASSES);
+        }
+        else if ("car".equalsIgnoreCase(type) && (scope == null)) { //parent
+            return new org.apache.geronimo.kernel.repository.Dependency(artifact, ImportType.ALL);
+        }
+        else {
             // not one of ours
             return null;
         }
     }
 
-    private static org.apache.geronimo.kernel.repository.Artifact toGeronimoArtifact(Dependency dependency) {
+    private static Artifact toGeronimoArtifact(final Dependency dependency) {
         String groupId = dependency.getGroupId();
         String artifactId = dependency.getArtifactId();
         String version = null;
         String type = dependency.getType();
-        return new org.apache.geronimo.kernel.repository.Artifact(groupId, artifactId, version, type);
+
+        return new Artifact(groupId, artifactId, version, type);
     }
 
     interface Inserter {
         ArtifactType insert(EnvironmentType environmentType);
     }
-
-
 }

Modified: geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/resources/META-INF/plexus/components.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/resources/META-INF/plexus/components.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/geronimo-packaging-plugin/src/resources/META-INF/plexus/components.xml Wed Jul  5 14:58:47 2006
@@ -1,24 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Rev$ $Date$ -->
+
 <component-set>
-  <components>
-    <component>
-      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
-      <role-hint>car</role-hint>
-      <implementation>
-      org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
-      <configuration>
-        <phases>
-          <process-resources>
-org.apache.geronimo.plugins:geronimo-packaging-plugin:dependencies
-</process-resources>
-          <compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
-          <package>org.apache.geronimo.plugins:geronimo-packaging-plugin:package</package>
-          <install>org.apache.maven.plugins:maven-install-plugin:install</install>
-<!--          <install>org.apache.geronimo.plugins:geronimo-packaging-plugin:install</install>
--->
-<!--      <deploy>org.apache.maven.plugins:geronimo-packaging-plugin:distribute
-</deploy> -->
-        </phases>
-      </configuration>
-    </component>
-  </components>
+    <components>
+        <component>
+            <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+            <role-hint>car</role-hint>
+            <implementation>
+                org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
+            <configuration>
+                <phases>
+                    <process-resources>org.apache.geronimo.plugins:geronimo-packaging-plugin:dependencies</process-resources>
+                    <compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
+                    <package>org.apache.geronimo.plugins:geronimo-packaging-plugin:package</package>
+                    <install>org.apache.maven.plugins:maven-install-plugin:install</install>
+                </phases>
+            </configuration>
+        </component>
+    </components>
 </component-set> 

Modified: geronimo/sandbox/svkmerge/m2migration/m2-plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/m2-plugins/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/m2-plugins/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/m2-plugins/pom.xml Wed Jul  5 14:58:47 2006
@@ -17,7 +17,11 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    
     <modelVersion>4.0.0</modelVersion>
     
     <parent>
@@ -29,32 +33,37 @@
 
     <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>plugins-parent</artifactId>
-    <packaging>pom</packaging>
     <name>Geronimo Plugins</name>
-    <description>Geronimo Plugins</description>
+    <description>Geronimo :: Plugins</description>
+    <packaging>pom</packaging>
+    
+    <properties>
+        <maven.version>2.0</maven.version>
+    </properties>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-plugin-api</artifactId>
+            <version>${maven.version}</version>
+        </dependency>
 
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>geronimo-packaging-plugin</module>
-            </modules>
-        </profile>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-project</artifactId>
+            <version>${maven.version}</version>
+        </dependency>
 
-        <profile>
-            <id>singleplugin</id>
-            <activation>
-                <property>
-                    <name>plugin</name>
-                </property>
-            </activation>
-            <modules>
-                <module>${plugin}</module>
-            </modules>
-        </profile>
-    </profiles>
+        <dependency>
+            <groupId>org.apache.maven</groupId>
+            <artifactId>maven-artifact</artifactId>
+            <version>${maven.version}</version>
+        </dependency>
+    </dependencies>
+    
+    <modules>
+        <module>geronimo-packaging-plugin</module>
+    </modules>
+    
 </project>
 

Modified: geronimo/sandbox/svkmerge/m2migration/modules/activemq-embedded-rar/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/activemq-embedded-rar/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/activemq-embedded-rar/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/activemq-embedded-rar/pom.xml Wed Jul  5 14:58:47 2006
@@ -28,10 +28,10 @@
     </parent>
 
     <artifactId>ge-activemq-rar</artifactId>
-    <packaging>rar</packaging>
     <name>Geronimo :: ActiveMQ Embedded RAR</name>
     <description>Resource Adapter configuration for using ActiveMQ as a bundled JMS provider.</description>
-
+    <packaging>rar</packaging>
+    
     <build>
         <plugins>
             <plugin>
@@ -49,21 +49,11 @@
         <dependency>
             <groupId>activemq</groupId>
             <artifactId>activemq-core</artifactId>
-            <version>${activeMqVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>activemq</groupId>
             <artifactId>activemq-ra</artifactId>
-            <version>${activeMqVersion}</version>
-            
-            <!--  Can't be found anywhere -->
-            <exclusions>
-                <exclusion>
-                    <groupId>incubator-derby</groupId>
-                    <artifactId>derby</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
     </dependencies>
 </project>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/activemq-gbean-management/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/activemq-gbean-management/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/activemq-gbean-management/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/activemq-gbean-management/pom.xml Wed Jul  5 14:58:47 2006
@@ -40,6 +40,7 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-management</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         
         <dependency>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/activemq-gbean/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/activemq-gbean/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/activemq-gbean/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/activemq-gbean/pom.xml Wed Jul  5 14:58:47 2006
@@ -52,22 +52,31 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-activemq-gbean-management</artifactId>
+            <version>${pom.version}</version>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
+            <version>${pom.version}</version>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-system</artifactId>
+            <version>${pom.version}</version>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-management</artifactId>
+            <version>${pom.version}</version>
         </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/axis-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/axis-builder/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/axis-builder/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/axis-builder/pom.xml Wed Jul  5 14:58:47 2006
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!--
-
     Copyright 2005 The Apache Software Foundation
 
     Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,112 +27,74 @@
 
     <artifactId>geronimo-axis-builder</artifactId>
     <name>Geronimo :: Axis :: Builder</name>
-    <description>Geronimo Axis Builder</description>
-
-    <build>
-        <resources>
-            <!-- This schema is NOT compiled to xmlobjects.  Do not remove!  Used by SchemaInfoBuilder -->
-            <resource>
-                <directory>src/schema</directory>
-                <includes>
-                    <include>soap_encoding_1_1.xsd</include>
-                </includes>
-                <targetPath>META-INF/schema</targetPath>
-            </resource>
-        </resources>
-
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <systemProperties>
-                    <!--<geronimo.run.external.webservicetest>true</geronimo.run.external.webservicetest> -->
-                    </systemProperties>
-
-                    <forkMode>once</forkMode>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>xmlbeans-maven-plugin</artifactId>
-                <version>${xmlbeansMavenPluginVersion}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>xmlbeans</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <schemaDirectory>src/schema</schemaDirectory>
-                    <sourceSchemas>wsdl.xsd</sourceSchemas>
-                    <xmlConfigs>
-                        <xmlConfig implementation="java.io.File">src/schema/xmlconfig.xml</xmlConfig>
-                    </xmlConfigs>
-                    <!-- <download>true</download> -->
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
+    
     <dependencies>
+        
+        <!-- Module Dependencies -->
+        
         <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-axis</artifactId>
+            <version>${pom.version}</version>
         </dependency>
-
+        
         <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
-        <!-- Module Dependencies -->
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-common</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-saaj_1.1_spec</artifactId>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-j2ee</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-qname_1.1_spec</artifactId>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-j2ee-schema</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-axis</artifactId>
-            <version>${geronimoVersion}</version>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-naming-builder</artifactId>
+            <version>${pom.version}</version>
         </dependency>
-        <!-- commons-logging from kernel --> 
+        
+        <!-- Spec Dependencies -->
+        
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-kernel</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-common</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-saaj_1.1_spec</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-j2ee</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-qname_1.1_spec</artifactId>
         </dependency>
-
+        
+        <!-- Thirdparty Dependencies -->
+        
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-j2ee-schema</artifactId>
+            <groupId>xmlbeans</groupId>
+            <artifactId>xbean</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-naming-builder</artifactId>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
         </dependency>
 
         <dependency>
@@ -144,14 +105,49 @@
         <dependency>
             <groupId>axis</groupId>
             <artifactId>axis</artifactId>
-            <version>${axisVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>wsdl4j</groupId>
             <artifactId>wsdl4j</artifactId>
-            <version>${wsdl4jVersion}</version>
         </dependency>
+        
     </dependencies>
+    
+    <build>
+        <resources>
+            <!-- This schema is NOT compiled to xmlobjects.  Do not remove!  Used by SchemaInfoBuilder -->
+            <resource>
+                <directory>src/schema</directory>
+                <includes>
+                    <include>soap_encoding_1_1.xsd</include>
+                </includes>
+                <targetPath>META-INF/schema</targetPath>
+            </resource>
+        </resources>
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <systemProperties>
+                    <!--<geronimo.run.external.webservicetest>true</geronimo.run.external.webservicetest> -->
+                    </systemProperties>
+
+                    <forkMode>once</forkMode>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>xmlbeans-maven-plugin</artifactId>
+                <configuration>
+                    <sourceSchemas>wsdl.xsd</sourceSchemas>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
 

Modified: geronimo/sandbox/svkmerge/m2migration/modules/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/axis/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/axis/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/axis/pom.xml Wed Jul  5 14:58:47 2006
@@ -17,7 +17,11 @@
 
 <!-- $Rev$ $Date$ -->
 
-<project>
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -32,50 +36,29 @@
     <name>Geronimo :: Axis</name>
     <description>Geronimo Axis Integration</description>
     
-    <build>
-        <resources>
-            <resource>
-                <directory>src/resources2</directory>
-            </resource>
-        </resources>
-    </build>
-    
-    <!-- ============ -->
-    <!-- Dependencies -->
-    <!-- ============ -->
     <dependencies>
-<!--
-Need to check in a manual -service.xml file before removing this.
-        <dependency>
-            <groupId>geronimo</groupId>
-            <artifactId>geronimo-dependency-plugin</artifactId>
-            <type>plugin</type>
-        </dependency>
--->
-        <!-- cglib, mx4j, commons-logging -->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
+            <version>${pom.version}</version>
         </dependency>
         
         <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-naming</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-security</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-webservices</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
@@ -102,30 +85,41 @@
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_2.4_spec</artifactId>
         </dependency>
-
+        
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+        
         <dependency>
             <groupId>asm</groupId>
             <artifactId>asm</artifactId>
-            <version>${asmVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>axis</groupId>
             <artifactId>axis</artifactId>
-            <version>${axisVersion}</version>
         </dependency>
+        
         <!-- this uses commons-logging 1.0.3 -->
         <dependency>
             <groupId>commons-discovery</groupId>
             <artifactId>commons-discovery</artifactId>
-            <version>${commonsDiscoveryVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>wsdl4j</groupId>
             <artifactId>wsdl4j</artifactId>
-            <version>${wsdl4jVersion}</version>
         </dependency>
     </dependencies>
+    
+    <build>
+        <resources>
+            <resource>
+                <directory>src/resources2</directory>
+            </resource>
+        </resources>
+    </build>
+    
 </project>
 

Modified: geronimo/sandbox/svkmerge/m2migration/modules/client-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/client-builder/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/client-builder/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/client-builder/pom.xml Wed Jul  5 14:58:47 2006
@@ -29,12 +29,37 @@
     
     <artifactId>geronimo-client-builder</artifactId>
     <name>Geronimo :: Client Builder</name>
-    <description>Geronimo :: Client Builder</description>
+    
+    <dependencies>
+        
+        <!-- Module Dependencies -->
+        
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-client</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
 
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-connector-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <!-- Thirdparty Dependencies -->
+        
+        <!-- tranql uses 1.0.3 -->
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+        
+    </dependencies>
+    
     <build>
         <resources>
             <resource>
-                <directory>src/resources2</directory>
+                <directory>${pom.basedir}/src/resources2</directory>
             </resource>
         </resources>
         
@@ -42,47 +67,12 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
-                <version>${xmlbeansMavenPluginVersion}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>xmlbeans</goal>
-                        </goals>
-                    </execution>
-                </executions>
                 <configuration>
-                    <download>true</download>
                     <sourceSchemas>geronimo-application-client-1.1.xsd</sourceSchemas>
-                    <schemaDirectory>src/schema</schemaDirectory>
-                    <xmlConfigs>
-                        <xmlConfig implementation="java.io.File">src/schema/xmlconfig.xml</xmlConfig>
-                    </xmlConfigs>
-                    <debug>true</debug>
-                    <verbose>true</verbose>
-                    <quiet>false</quiet>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-client</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-connector-builder</artifactId>
-        </dependency>
-
-        <!-- tranql uses 1.0.3 -->
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
-        
-    </dependencies>
 </project>
 

Modified: geronimo/sandbox/svkmerge/m2migration/modules/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/client/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/client/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/client/pom.xml Wed Jul  5 14:58:47 2006
@@ -36,35 +36,41 @@
     <!-- ============ -->
     
     <dependencies>
-        <!--for GeronimoSecurityException-->
+    
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-common</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-naming</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-security</artifactId>
+            <version>${pom.version}</version>
         </dependency>
-        <!-- kernel, cglib, commons-logging, log4j from system -->
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-system</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-transaction</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/common/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/common/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/common/pom.xml Wed Jul  5 14:58:47 2006
@@ -35,6 +35,7 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
+            <version>${pom.version}</version>
         </dependency>
     </dependencies>
 </project>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/connector-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/connector-builder/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/connector-builder/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/connector-builder/pom.xml Wed Jul  5 14:58:47 2006
@@ -31,14 +31,68 @@
     <name>Geronimo :: Connector :: Builder</name>
 
     <properties>
+        <!-- FIXME: Should never need to default to skip!!! -->
         <maven.test.skip>true</maven.test.skip>
     </properties>
     
+    <dependencies>
+        
+        <!-- Module Dependencies -->
+        
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-connector</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-deploy-config</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-naming-builder</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>geronimo-test-ddbean</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        
+        <!-- Thirdparty Dependencies -->
+        
+        <dependency>
+            <groupId>xmlbeans</groupId>
+            <artifactId>xbean</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>stax</groupId>
+            <artifactId>stax-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>tranql</groupId>
+            <artifactId>tranql</artifactId>
+        </dependency>
+
+        <!-- tranql uses 1.0.3, force 1.0.4  -->
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+        </dependency>
+        
+    </dependencies>
+    
     <build>
         <!-- move this to parent pom -->
         <resources>
             <resource>
-                <directory>src/schema</directory>
+                <directory>${pom.basedir}/src/schema</directory>
                 <targetPath>META-INF</targetPath>
                 <includes>
                     <include>geronimo-connector-1.1.xsd</include>
@@ -55,7 +109,7 @@
                         <phase>process-test-resources</phase>
                         <configuration>
                             <tasks>
-                                <ant antfile="${basedir}/src/test/test-setup.xml" />
+                                <ant antfile="${pom.basedir}/src/test/test-setup.xml"/>
                             </tasks>
                         </configuration>
                         <goals>
@@ -68,20 +122,8 @@
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>xmlbeans-maven-plugin</artifactId>
-                <version>${xmlbeansMavenPluginVersion}</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>xmlbeans</goal>
-                        </goals>
-                    </execution>
-                </executions>
                 <configuration>
                     <sourceSchemas>geronimo-connector-1.1.xsd</sourceSchemas>
-                    <schemaDirectory>src/schema</schemaDirectory>
-                    <xmlConfigs>
-                        <xmlConfig implementation="java.io.File">src/schema/xmlconfig.xml</xmlConfig>
-                    </xmlConfigs>
                 </configuration>
             </plugin>
 
@@ -98,51 +140,5 @@
         </plugins>
     </build>
 
-    <!-- ============ -->
-    <!-- Dependencies -->
-    <!-- ============ -->
-    
-    <dependencies>
-        <dependency>
-            <groupId>xmlbeans</groupId>
-            <artifactId>xbean</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>stax</groupId>
-            <artifactId>stax-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-connector</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-deploy-config</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-naming-builder</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-test-ddbean</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>tranql</groupId>
-            <artifactId>tranql</artifactId>
-        </dependency>
-
-        <!-- tranql uses 1.0.3, force 1.0.4  -->
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-        </dependency>
-    </dependencies>
 </project>
 

Modified: geronimo/sandbox/svkmerge/m2migration/modules/connector/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/connector/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/connector/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/connector/pom.xml Wed Jul  5 14:58:47 2006
@@ -39,42 +39,50 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-naming</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <!-- Needed only for DeploymentException in a test, from NameFactory which probably shouldn't be throwing it in the first place-->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-deployment</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-management</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-common</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-security</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-transaction</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <!--  test only -->

Modified: geronimo/sandbox/svkmerge/m2migration/modules/converter/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/converter/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/converter/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/converter/pom.xml Wed Jul  5 14:58:47 2006
@@ -34,11 +34,13 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-common</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/core/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/core/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/core/pom.xml Wed Jul  5 14:58:47 2006
@@ -46,16 +46,19 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-system</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-management</artifactId>
+            <version>${pom.version}</version>
         </dependency>
     </dependencies>
 </project>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/deploy-jsr88/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/deploy-jsr88/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/deploy-jsr88/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/deploy-jsr88/pom.xml Wed Jul  5 14:58:47 2006
@@ -57,40 +57,48 @@
         </dependency>
 
         <!-- Module Dependencies -->
+        
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-common</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-system</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-deployment</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <!-- only until we move out various DConfigBean trees -->
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-deploy-config</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-connector-builder</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-web-builder</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/deploy-tool/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/deploy-tool/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/deploy-tool/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/deploy-tool/pom.xml Wed Jul  5 14:58:47 2006
@@ -31,7 +31,6 @@
     <name>Geronimo :: Deploy :: CLI Tool</name>
 
     <dependencies>
-        <!-- Module Dependencies -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-j2ee-deployment_1.1_spec</artifactId>
@@ -40,26 +39,31 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-common</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-util</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-system</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-deployment</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-deploy-jsr88</artifactId>
+            <version>${pom.version}</version>
         </dependency>
     </dependencies>
 </project>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/deployment/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/deployment/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/deployment/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/deployment/pom.xml Wed Jul  5 14:58:47 2006
@@ -40,16 +40,19 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-common</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-system</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/derby/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/derby/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/derby/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/derby/pom.xml Wed Jul  5 14:58:47 2006
@@ -37,14 +37,15 @@
 
     <dependencies>
         <dependency>
-            <!-- this gets kernel, commons-logging -->
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-system</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-management</artifactId>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/directory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/directory/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/directory/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/directory/pom.xml Wed Jul  5 14:58:47 2006
@@ -29,71 +29,22 @@
 
     <artifactId>geronimo-directory</artifactId>
     <name>Geronimo :: Directory</name>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>src/resources2</directory>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>xmlbeans-maven-plugin</artifactId>
-                <version>${xmlbeansMavenPluginVersion}</version>
-                <executions>
-                    <execution>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>xmlbeans</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>target/classes/schemaorg_apache_xmlbeans</outputDirectory>
-                            <defaultXmlConfigDir>src/schema/xmlconfig.xml</defaultXmlConfigDir>
-                            <verbose>true</verbose>
-                            <sourceSchemas>directory.xsd</sourceSchemas>
-                            <!-- <classGenerationDirectory>target/xmlbeans-classes</classGenerationDirectory> -->
-                            <schemaDirectory>src/schema</schemaDirectory>
-                            <!-- <sourceGenerationDirectory>target/xmlbeans-classes/schemaorg_apache_xmlbeans</sourceGenerationDirectory> -->
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>process-test-resources</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <tstamp />
-                                <copy todir="target/var/" file="src/test-resources/directory.xml" />
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
+    
     <dependencies>
-        <!-- kernel, common, cglib, commons-logging, mx4j, concurrent -->
+        
+        <!-- Module Dependencies -->
+        
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
+            <groupId>${pom.groupId}</groupId>
             <artifactId>geronimo-system</artifactId>
+            <version>${pom.version}</version>
         </dependency>
-
-        <!-- Third Party Jars -->
-
+        
+        <!-- Thirdparty Dependencies -->
+        
         <dependency>
             <groupId>regexp</groupId>
             <artifactId>regexp</artifactId>
-            <version>${regexpVersion}</version>
         </dependency>
 
         <dependency>
@@ -165,49 +116,42 @@
         <dependency>
             <groupId>jdbm</groupId>
             <artifactId>jdbm</artifactId>
-            <version>${jdbmVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>oro</groupId>
             <artifactId>oro</artifactId>
-            <version>${oroVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
-            <version>${commonsLangVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>commons-collections</groupId>
             <artifactId>commons-collections</artifactId>
-            <version>${commonsCollectionsVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>${commonsIoVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>commons-primitives</groupId>
             <artifactId>commons-primitives</artifactId>
-            <version>${commonsPrimitivesVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>antlr</groupId>
             <artifactId>antlr</artifactId>
-            <version>${antlrVersion}</version>
         </dependency>
 
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
-            <version>${slf4jVersion}</version>
+            <version>1.0-beta7</version>
         </dependency>
 
         <dependency>
@@ -221,5 +165,45 @@
         </dependency>
 
     </dependencies>
+    
+    <build>
+        <resources>
+            <resource>
+                <directory>src/resources2</directory>
+            </resource>
+        </resources>
+        
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>xmlbeans-maven-plugin</artifactId>
+                <configuration>
+                    <sourceSchemas>directory.xsd</sourceSchemas>
+                    <outputDirectory>${pom.basedir}/target/classes/schemaorg_apache_xmlbeans</outputDirectory>
+                    <defaultXmlConfigDir>${pom.basedir}/src/schema/xmlconfig.xml</defaultXmlConfigDir>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>process-test-resources</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <tstamp/>
+                                <copy todir="target/var/" file="src/test-resources/directory.xml"/>
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
 

Modified: geronimo/sandbox/svkmerge/m2migration/modules/hot-deploy/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/hot-deploy/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/hot-deploy/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/hot-deploy/pom.xml Wed Jul  5 14:58:47 2006
@@ -40,31 +40,31 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-deploy-tool</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-deploy-jsr88</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-common</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-system</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${pom.version}</version>
         </dependency>
 
         <dependency>

Modified: geronimo/sandbox/svkmerge/m2migration/modules/installer-support/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/installer-support/pom.xml?rev=419353&r1=419352&r2=419353&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/installer-support/pom.xml (original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/installer-support/pom.xml Wed Jul  5 14:58:47 2006
@@ -33,7 +33,21 @@
     <properties>
         <izpack_version>3.8.0</izpack_version>
     </properties>
+    
+    <dependencies>
+        <dependency>
+            <groupId>izpack</groupId>
+            <artifactId>installer</artifactId>
+            <version>${izpack_version}</version>
+        </dependency>
 
+        <dependency>
+            <groupId>izpack</groupId>
+            <artifactId>standalone-compiler</artifactId>
+            <version>${izpack_version}</version>
+        </dependency>
+    </dependencies>
+    
     <build>
         <plugins>
             <plugin>
@@ -60,18 +74,5 @@
         </plugins>
     </build>
 
-    <dependencies>
-        <dependency>
-            <groupId>izpack</groupId>
-            <artifactId>installer</artifactId>
-            <version>${izpack_version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>izpack</groupId>
-            <artifactId>standalone-compiler</artifactId>
-            <version>${izpack_version}</version>
-        </dependency>
-    </dependencies>
 </project>
 



Mime
View raw message