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/08/04 23:22:06 UTC
svn commit: r428888 [8/11] - in /geronimo/trunk: ./ applications/
applications/console/ applications/console/console-core/
applications/console/console-ear/ applications/console/console-framework/
applications/console/console-framework/src/ application...
Added: geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StartModuleMojo.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StartModuleMojo.java?rev=428888&view=auto
==============================================================================
--- geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StartModuleMojo.java (added)
+++ geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StartModuleMojo.java Fri Aug 4 14:21:54 2006
@@ -0,0 +1,67 @@
+/**
+ *
+ * Copyright 2004-2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.geronimo.plugins.deployment;
+
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.enterprise.deploy.spi.Target;
+import javax.enterprise.deploy.spi.TargetModuleID;
+import javax.enterprise.deploy.spi.status.ProgressObject;
+
+import org.apache.geronimo.deployment.plugin.jmx.RemoteDeploymentManager;
+import org.apache.geronimo.plugins.util.DeploymentClient;
+import org.apache.maven.plugin.MojoExecutionException;
+
+/**
+ * ???
+ *
+ * @goal start
+ *
+ * @version $Rev$ $Date$
+ */
+public class StartModuleMojo extends AbstractModuleMojo {
+
+ protected void doExecute() throws Exception {
+ RemoteDeploymentManager manager;
+
+ manager = (RemoteDeploymentManager) getDeploymentManager();
+ manager.setLogConfiguration(true, true);
+
+ Target[] targets = manager.getTargets();
+ TargetModuleID moduleIds[] = manager.getNonRunningModules(null, targets);
+ List toStart = new ArrayList(moduleIds.length);
+
+ for (int i = 0; i < moduleIds.length; i++) {
+ TargetModuleID moduleId = moduleIds[i];
+
+ if (this.id.equals(moduleId.getModuleID())) {
+ toStart.add(moduleId);
+ }
+ }
+
+ if (toStart.size() == 0) {
+ throw new MojoExecutionException("Module is already running or may not be deployed: " + this.id);
+ }
+
+ moduleIds = (TargetModuleID[]) toStart.toArray(new TargetModuleID[toStart.size()]);
+ ProgressObject progress = manager.start(moduleIds);
+ DeploymentClient.waitFor(progress);
+ }
+}
Propchange: geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StartModuleMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StartModuleMojo.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StartModuleMojo.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StartRemoteServerMojo.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StartRemoteServerMojo.java?rev=428888&view=auto
==============================================================================
--- geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StartRemoteServerMojo.java (added)
+++ geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StartRemoteServerMojo.java Fri Aug 4 14:21:54 2006
@@ -0,0 +1,163 @@
+/**
+ *
+ * Copyright 2004-2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.geronimo.plugins.deployment;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.util.StringTokenizer;
+
+import org.apache.geronimo.plugins.util.ServerBehavior;
+
+import org.apache.commons.lang.SystemUtils;
+import org.apache.maven.plugin.MojoExecutionException;
+
+import org.codehaus.plexus.util.cli.Commandline;
+import org.codehaus.plexus.util.cli.CommandLineUtils;
+import org.codehaus.plexus.util.cli.DefaultConsumer;
+import org.codehaus.plexus.util.cli.CommandLineException;
+
+//
+// TODO: Rename to StartRemoteServerMojo
+//
+
+/**
+ * ???
+ *
+ * @goal startRemoteServer
+ *
+ * @version $Rev$ $Date$
+ */
+public class StartRemoteServerMojo extends AbstractModuleMojo {
+
+ /**
+ * @parameter
+ */
+ private File geronimoTarget;
+
+ /**
+ * @parameter expression="${basedir}/target"
+ */
+ private File workingDirectory;
+
+ //
+ // FIXME: Use <args><args>...</args></args> and let M2 handle parsing
+ //
+
+ /**
+ * @parameter default-value=""
+ */
+ private String vmArgs;
+
+ /**
+ * @parameter
+ */
+ private String[] configs;
+
+ /**
+ * @parameter
+ */
+ private String debugPort;
+
+ /**
+ * Get the path of Java depending the OS.
+ *
+ * @return the path of the Java
+ */
+ private String getJavaPath() {
+ String javaCommand = "java" + (SystemUtils.IS_OS_WINDOWS ? ".exe" : "");
+
+ File javaExe;
+
+ // For IBM's JDK 1.2
+ if (SystemUtils.IS_OS_AIX) {
+ javaExe = new File(SystemUtils.JAVA_HOME + "/../sh", javaCommand);
+ }
+ else if (SystemUtils.IS_OS_MAC_OSX ) {
+ javaExe = new File(SystemUtils.JAVA_HOME + "/bin", javaCommand);
+ }
+ else {
+ javaExe = new File(SystemUtils.JAVA_HOME + "/../bin", javaCommand);
+ }
+
+ log.debug("Java executable=[" + javaExe.getAbsolutePath() + "]");
+
+ return javaExe.getAbsolutePath();
+ }
+
+ protected void doExecute() throws Exception {
+ Commandline cmd = new Commandline();
+
+ cmd.setWorkingDirectory(workingDirectory.getAbsolutePath());
+ cmd.setExecutable(getJavaPath());
+
+ if (debugPort != null) {
+ cmd.createArgument().setValue("-Xdebug");
+ cmd.createArgument().setValue("-Xnoagent");
+ cmd.createArgument().setValue("-Djava.compiler=NONE");
+ cmd.createArgument().setValue("-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=" + debugPort);
+ }
+
+ for (StringTokenizer st = new StringTokenizer(this.vmArgs); st.hasMoreTokens();) {
+ cmd.createArgument().setValue(st.nextToken());
+ }
+
+ cmd.createArgument().setValue("-ea");
+ cmd.createArgument().setValue("-jar");
+
+ File serverJar = new File(new File(geronimoTarget, "bin"), "server.jar");
+ if (serverJar.exists()) {
+ cmd.createArgument().setFile(serverJar);
+ }
+ else {
+ throw new FileNotFoundException(serverJar.getAbsolutePath());
+ }
+
+ cmd.createArgument().setValue("--quiet");
+
+ if (this.configs != null && this.configs.length > 0) {
+ cmd.createArgument().setValue("--override");
+
+ for (int i=0; i < this.configs.length; i++) {
+ cmd.createArgument().setValue(this.configs[i]);
+ }
+ }
+
+ if (log.isDebugEnabled()) {
+ log.debug(Commandline.toString(cmd.getCommandline()));
+ }
+
+ CommandLineUtils.StringStreamConsumer err = new CommandLineUtils.StringStreamConsumer();
+ try {
+ int exitCode = CommandLineUtils.executeCommandLine(cmd, new DefaultConsumer(), err);
+
+ if (exitCode != 0) {
+ throw new MojoExecutionException("Exit code: " + exitCode + " - " + err.getOutput());
+ }
+ }
+ catch (CommandLineException e) {
+ throw new MojoExecutionException("Unable to execute java command", e);
+ }
+
+ ServerBehavior sb = new ServerBehavior(getUri(), getMaxTries(), getRetryIntervalMilliseconds());
+ if (!sb.isFullyStarted()) {
+ CommandLineUtils.killProcess(cmd.getPid());
+
+ throw new MojoExecutionException("Server did not start");
+ }
+ }
+}
Propchange: geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StartRemoteServerMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StartRemoteServerMojo.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StartRemoteServerMojo.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StartServerMojo.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StartServerMojo.java?rev=428888&view=auto
==============================================================================
--- geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StartServerMojo.java (added)
+++ geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StartServerMojo.java Fri Aug 4 14:21:54 2006
@@ -0,0 +1,125 @@
+/**
+ *
+ * Copyright 2004-2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.geronimo.plugins.deployment;
+
+import java.io.File;
+import java.io.ObjectInputStream;
+import java.io.PrintStream;
+import java.net.URI;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.StringTokenizer;
+
+import javax.management.ObjectName;
+
+import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.gbean.GBeanData;
+import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.KernelFactory;
+import org.apache.geronimo.kernel.config.Configuration;
+import org.apache.geronimo.kernel.config.ConfigurationManager;
+import org.apache.geronimo.kernel.config.ConfigurationUtil;
+import org.apache.geronimo.kernel.config.ManageableAttributeStore;
+import org.apache.geronimo.kernel.log.GeronimoLogging;
+import org.apache.geronimo.kernel.repository.Artifact;
+import org.apache.maven.plugin.MojoExecutionException;
+
+/**
+ * This starts a geronimo server in vm. It might not have ever been used.
+ *
+ * @goal startServer
+ *
+ * @version $Rev$ $Date$
+ */
+public class StartServerMojo extends AbstractModuleMojo {
+
+ static {
+ // This MUST be done before the first log is acquired
+ GeronimoLogging.initialize(GeronimoLogging.INFO);
+ }
+
+ /**
+ * @parameter expression="${basedir}/target"
+ */
+ private File geronimoHome;
+
+ /**
+ * @parameter
+ */
+ private String domainName;
+
+ /**
+ * @parameter
+ */
+ private String[] configs;
+
+ private String kernelName;
+
+ protected void doExecute() throws Exception {
+ if (!geronimoHome.exists()) {
+ throw new RuntimeException("No such directory: " + geronimoHome);
+ }
+ System.setProperty("org.apache.geronimo.base.dir", this.geronimoHome.getAbsolutePath());
+
+ List configList = new ArrayList();
+ if (this.configs != null && this.configs.length > 0) {
+ for (int i=0; i < this.configs.length; i++) {
+ configList.add(Artifact.create(this.configs[i]));
+ }
+ }
+
+ URL systemURL = new File(geronimoHome, "bin/server.jar").toURL();
+ URL configURL = new URL("jar:" + systemURL.toString() + "!/META-INF/config.ser");
+
+ GBeanData configuration = new GBeanData();
+ ObjectInputStream ois = new ObjectInputStream(configURL.openStream());
+ configuration.readExternal(ois);
+
+ URI configurationId = (URI) configuration.getAttribute("id");
+ AbstractName abstractName = new AbstractName(configurationId);
+
+ configuration.setAbstractName(abstractName);
+ configuration.setAttribute("baseURL", systemURL);
+
+ // build a basic kernel without a configuration-store, our configuration store is
+ Kernel kernel = KernelFactory.newInstance().createKernel(this.kernelName);
+ kernel.boot();
+
+ kernel.loadGBean(configuration, this.getClass().getClassLoader());
+ kernel.startGBean(abstractName);
+ kernel.invoke(abstractName, "loadGBeans", new Object[] { null }, new String[] { ManageableAttributeStore.class.getName() });
+ kernel.invoke(abstractName, "startRecursiveGBeans");
+
+ // load the rest of the configuration listed on the command line
+ ConfigurationManager configurationManager = ConfigurationUtil.getConfigurationManager(kernel);
+ try {
+ for (Iterator i = configList.iterator(); i.hasNext();) {
+ Artifact configID = (Artifact) i.next();
+ configurationManager.loadConfiguration(configID);
+ configurationManager.startConfiguration(configID);
+
+ log.info("Started GBean: " + configID);
+ }
+ }
+ finally {
+ ConfigurationUtil.releaseConfigurationManager(kernel, configurationManager);
+ }
+ }
+}
Propchange: geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StartServerMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StartServerMojo.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StartServerMojo.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StopModuleMojo.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StopModuleMojo.java?rev=428888&view=auto
==============================================================================
--- geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StopModuleMojo.java (added)
+++ geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StopModuleMojo.java Fri Aug 4 14:21:54 2006
@@ -0,0 +1,68 @@
+/**
+ *
+ * Copyright 2004-2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.geronimo.plugins.deployment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.enterprise.deploy.spi.Target;
+import javax.enterprise.deploy.spi.TargetModuleID;
+import javax.enterprise.deploy.spi.status.ProgressObject;
+
+import org.apache.geronimo.deployment.plugin.jmx.RemoteDeploymentManager;
+import org.apache.geronimo.plugins.util.DeploymentClient;
+import org.apache.maven.plugin.MojoExecutionException;
+
+//
+// TODO: Rename to StopMojo
+//
+
+/**
+ * ???
+ *
+ * @goal stop
+ *
+ * @version $Rev$ $Date$
+ */
+public class StopModuleMojo extends AbstractModuleMojo {
+
+ protected void doExecute() throws Exception {
+ RemoteDeploymentManager manager = (RemoteDeploymentManager) getDeploymentManager();
+ manager.setLogConfiguration(true, true);
+
+ Target[] targets = manager.getTargets();
+ TargetModuleID moduleIds[] = manager.getRunningModules(null, targets);
+ List toStop = new ArrayList(moduleIds.length);
+
+ for (int i = 0; i < moduleIds.length; i++) {
+ TargetModuleID moduleId = moduleIds[i];
+
+ if (this.id.equals(moduleId.getModuleID())) {
+ toStop.add(moduleId);
+ }
+ }
+
+ if (toStop.size() == 0) {
+ throw new MojoExecutionException("Module is not deployed: " + this.id);
+ }
+
+ moduleIds = (TargetModuleID[]) toStop.toArray(new TargetModuleID[toStop.size()]);
+ ProgressObject progress = manager.stop(moduleIds);
+ DeploymentClient.waitFor(progress);
+ }
+}
Propchange: geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StopModuleMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StopModuleMojo.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StopModuleMojo.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StopRemoteServerMojo.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StopRemoteServerMojo.java?rev=428888&view=auto
==============================================================================
--- geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StopRemoteServerMojo.java (added)
+++ geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StopRemoteServerMojo.java Fri Aug 4 14:21:54 2006
@@ -0,0 +1,71 @@
+/**
+ *
+ * Copyright 2004-2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.geronimo.plugins.deployment;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.management.MBeanServerConnection;
+import javax.management.remote.JMXConnector;
+import javax.management.remote.JMXConnectorFactory;
+import javax.management.remote.JMXServiceURL;
+
+import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.system.jmx.KernelDelegate;
+import org.apache.maven.plugin.MojoExecutionException;
+
+/**
+ * ???
+ *
+ * @goal stopRemoteServer
+ *
+ * @version $Rev$ $Date$
+ */
+public class StopRemoteServerMojo extends AbstractModuleMojo {
+
+ protected void doExecute() throws Exception {
+ stopRemoteServer();
+ }
+
+ private void stopRemoteServer() throws Exception {
+ String uri = getUri();
+ if (!uri.startsWith("jmx")) {
+ throw new MojoExecutionException("Bad JMX URI: " + uri);
+ }
+
+ Map environment = new HashMap();
+ String[] credentials = new String[]{getUsername(), getPassword()};
+ environment.put(JMXConnector.CREDENTIALS, credentials);
+
+ JMXServiceURL address = new JMXServiceURL("service:" + uri);
+
+ ClassLoader oldcl = Thread.currentThread().getContextClassLoader();
+ try {
+ Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
+
+ JMXConnector jmxConnector = JMXConnectorFactory.connect(address, environment);
+ MBeanServerConnection mbServerConnection = jmxConnector.getMBeanServerConnection();
+ Kernel kernel = new KernelDelegate(mbServerConnection);
+
+ kernel.shutdown();
+ }
+ finally {
+ Thread.currentThread().setContextClassLoader(oldcl);
+ }
+ }
+}
Propchange: geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StopRemoteServerMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StopRemoteServerMojo.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StopRemoteServerMojo.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StopServerMojo.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StopServerMojo.java?rev=428888&view=auto
==============================================================================
--- geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StopServerMojo.java (added)
+++ geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StopServerMojo.java Fri Aug 4 14:21:54 2006
@@ -0,0 +1,38 @@
+/**
+ *
+ * Copyright 2004-2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.geronimo.plugins.deployment;
+
+import org.apache.geronimo.kernel.KernelRegistry;
+import org.apache.geronimo.kernel.Kernel;
+
+/**
+ * In vm server stop. May not have been tested.
+
+ * @goal stopServer
+ *
+ * @version $Rev$ $Date$
+ */
+public class StopServerMojo extends AbstractModuleMojo {
+
+ private String kernelName;
+
+ protected void doExecute() throws Exception {
+ Kernel kernel = KernelRegistry.getKernel(this.kernelName);
+ kernel.shutdown();
+ }
+}
Propchange: geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StopServerMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StopServerMojo.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/StopServerMojo.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/UndeployModuleMojo.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/UndeployModuleMojo.java?rev=428888&view=auto
==============================================================================
--- geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/UndeployModuleMojo.java (added)
+++ geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/UndeployModuleMojo.java Fri Aug 4 14:21:54 2006
@@ -0,0 +1,66 @@
+/**
+ *
+ * Copyright 2004-2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.geronimo.plugins.deployment;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.enterprise.deploy.spi.DeploymentManager;
+import javax.enterprise.deploy.spi.Target;
+import javax.enterprise.deploy.spi.TargetModuleID;
+import javax.enterprise.deploy.spi.status.ProgressObject;
+
+import org.apache.geronimo.plugins.util.DeploymentClient;
+import org.apache.maven.plugin.MojoExecutionException;
+
+//
+// TODO: Rename to UndeployMojo
+//
+
+/**
+ * ???
+ *
+ * @goal undeploy
+ *
+ * @version $Rev$ $Date$
+ */
+public class UndeployModuleMojo extends AbstractModuleMojo {
+
+ protected void doExecute() throws Exception {
+ DeploymentManager manager = getDeploymentManager();
+
+ Target[] targets = manager.getTargets();
+ TargetModuleID moduleIds[] = manager.getNonRunningModules(null, targets);
+ List toUndeploy = new ArrayList(moduleIds.length);
+
+ for (int i = 0; i < moduleIds.length; i++) {
+ TargetModuleID moduleId = moduleIds[i];
+ if (this.id.equals(moduleId.getModuleID())) {
+ toUndeploy.add(moduleId);
+ }
+ }
+
+ if (toUndeploy.size() == 0) {
+ throw new MojoExecutionException("Module is running or not deployed: " + this.id);
+ }
+
+ moduleIds = (TargetModuleID[]) toUndeploy.toArray(new TargetModuleID[toUndeploy.size()]);
+ ProgressObject progress = manager.undeploy(moduleIds);
+ DeploymentClient.waitFor(progress);
+ }
+}
Propchange: geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/UndeployModuleMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/UndeployModuleMojo.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/deployment/UndeployModuleMojo.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/util/DeploymentClient.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/util/DeploymentClient.java?rev=428888&view=auto
==============================================================================
--- geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/util/DeploymentClient.java (added)
+++ geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/util/DeploymentClient.java Fri Aug 4 14:21:54 2006
@@ -0,0 +1,111 @@
+/**
+ *
+ * Copyright 2004-2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.geronimo.plugins.util;
+
+import java.io.IOException;
+import java.net.JarURLConnection;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.StringTokenizer;
+import java.util.jar.Attributes;
+
+import javax.enterprise.deploy.shared.factories.DeploymentFactoryManager;
+import javax.enterprise.deploy.spi.factories.DeploymentFactory;
+import javax.enterprise.deploy.spi.status.ProgressObject;
+import javax.enterprise.deploy.spi.status.ProgressListener;
+import javax.enterprise.deploy.spi.status.ProgressEvent;
+import javax.enterprise.deploy.spi.status.DeploymentStatus;
+
+/**
+ * ???
+ *
+ * @version $Rev$ $Date$
+ */
+public class DeploymentClient {
+ private static final DeploymentFactoryManager FACTORY_MANAGER = DeploymentFactoryManager.getInstance();
+
+ private URL provider;
+
+ public URL getProvider() {
+ return provider;
+ }
+
+ public void setProvider(URL provider) {
+ this.provider = provider;
+ }
+
+ public void doIt() throws IOException {
+ registerProvider(provider, null);
+ }
+
+ public static void registerProvider(URL provider, ClassLoader parent) throws IOException {
+ if (parent == null) {
+ parent = Thread.currentThread().getContextClassLoader();
+ }
+
+ //
+ // FIXME: parent will never be null at this point...
+ //
+ if (parent == null) {
+ parent = DeploymentClient.class.getClassLoader();
+ }
+
+ // read manifest entry from provider
+ URL url = new URL("jar:" + provider.toString() + "!/");
+ JarURLConnection jarConnection = (JarURLConnection) url.openConnection();
+ Attributes attrs = jarConnection.getMainAttributes();
+ String factoryNames = attrs.getValue("J2EE-DeploymentFactory-Implementation-Class");
+ if (factoryNames == null) {
+ throw new IOException("No DeploymentFactory found in jar");
+ }
+
+ // register listed DeploymentFactories
+ ClassLoader cl = new URLClassLoader(new URL[]{provider}, parent);
+ for (StringTokenizer tokenizer = new StringTokenizer(factoryNames); tokenizer.hasMoreTokens();) {
+ String className = tokenizer.nextToken();
+ try {
+ DeploymentFactory factory = (DeploymentFactory) cl.loadClass(className).newInstance();
+ FACTORY_MANAGER.registerDeploymentFactory(factory);
+ } catch (Exception e) {
+ throw (IOException) new IOException("Unable to instantiate DeploymentFactory: " + className).initCause(e);
+ }
+ }
+ }
+
+ public static void waitFor(final ProgressObject progress) throws InterruptedException {
+ ProgressListener listener = new ProgressListener() {
+ public void handleProgressEvent(ProgressEvent event) {
+ DeploymentStatus status = event.getDeploymentStatus();
+ if (status.getMessage() != null) {
+ System.out.println(status.getMessage());
+ }
+ if (!status.isRunning()) {
+ synchronized (progress) {
+ progress.notify();
+ }
+ }
+ }
+ };
+ progress.addProgressListener(listener);
+ synchronized (progress) {
+ while (progress.getDeploymentStatus().isRunning()) {
+ progress.wait();
+ }
+ }
+ }
+}
Propchange: geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/util/DeploymentClient.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/util/DeploymentClient.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/util/DeploymentClient.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/util/ServerBehavior.java
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/util/ServerBehavior.java?rev=428888&view=auto
==============================================================================
--- geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/util/ServerBehavior.java (added)
+++ geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/util/ServerBehavior.java Fri Aug 4 14:21:54 2006
@@ -0,0 +1,176 @@
+/**
+ *
+ * Copyright 2006 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.geronimo.plugins.util;
+
+import java.io.PrintStream;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.List;
+
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+import javax.management.remote.JMXConnector;
+import javax.management.remote.JMXConnectorFactory;
+import javax.management.remote.JMXServiceURL;
+
+import org.apache.geronimo.kernel.config.ConfigurationUtil;
+import org.apache.geronimo.kernel.config.ConfigurationManager;
+import org.apache.geronimo.kernel.GBeanNotFoundException;
+import org.apache.geronimo.kernel.InternalKernelException;
+import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.NoSuchAttributeException;
+import org.apache.geronimo.system.jmx.KernelDelegate;
+
+/**
+ * ???
+ *
+ * @version $Rev$ $Date$
+ */
+public class ServerBehavior {
+
+ private int maxTries = 100;
+
+ private int retryIntervalMilliseconds = 1000;
+
+ private String uri = "jmx:rmi://localhost/jndi/rmi:/JMXConnector";
+
+ private String username = "system";
+
+ private String password = "manager";
+
+ private PrintStream logStream = System.out;
+
+ protected final String lineSep = "===========================================";
+
+ /**
+ * @param uri
+ * specify null for default
+ * @param maxTries
+ * specify -1 for default. default-value=40
+ * @param retryIntervalMilliseconds
+ * specify -1 for default. default-value=1000
+ */
+ public ServerBehavior(String uri, int maxTries, int retryIntervalMilliseconds) {
+ if (uri != null)
+ this.uri = uri;
+ if (maxTries > -1)
+ this.maxTries = maxTries;
+ if (retryIntervalMilliseconds > -1)
+ this.retryIntervalMilliseconds = retryIntervalMilliseconds;
+ }
+
+ public ServerBehavior(String uri) {
+ this(uri, -1, -1);
+ }
+
+ public ServerBehavior() {
+ this(null, -1, -1);
+ }
+
+ public boolean isFullyStarted() {
+ Kernel kernel = null;
+
+ if (!uri.startsWith("jmx")) {
+ logStream.println("Bad JMX URI (" + uri + ")");
+ logStream.println(lineSep);
+ return false;
+ }
+
+ // Get the kernel first
+ Map environment = new HashMap();
+ String[] credentials = new String[] { username, password };
+ environment.put(JMXConnector.CREDENTIALS, credentials);
+ ClassLoader oldcl = Thread.currentThread().getContextClassLoader();
+ try {
+ JMXServiceURL address = new JMXServiceURL("service:" + uri);
+ Thread.currentThread().setContextClassLoader(this.getClass().getClassLoader());
+ for (int tries = maxTries; true; tries--) {
+ try {
+ JMXConnector jmxConnector = JMXConnectorFactory.connect(address, environment);
+ MBeanServerConnection mbServerConnection = jmxConnector.getMBeanServerConnection();
+ kernel = new KernelDelegate(mbServerConnection);
+ break;
+ }
+ catch (Exception e) {
+ if (tries == 0) {
+ e.printStackTrace(logStream);
+ logStream.println("Could not connect");
+ logStream.println(lineSep);
+ return false;
+ }
+ Thread.sleep(retryIntervalMilliseconds);
+ }
+ }
+ }
+ catch (Exception e1) {
+ e1.printStackTrace(logStream);
+ logStream.println(lineSep);
+ return false;
+ }
+ finally {
+ Thread.currentThread().setContextClassLoader(oldcl);
+ }
+
+ // Now check to see if all configurations have started
+ ConfigurationManager mgr = ConfigurationUtil.getConfigurationManager(kernel);
+ List configLists = mgr.listConfigurations();
+ ObjectName on = null;
+ if (!configLists.isEmpty())
+ on = (ObjectName) configLists.toArray()[0];
+
+ for (int tries = maxTries; tries > 0; tries--) {
+ try {
+ Thread.sleep(retryIntervalMilliseconds);
+ Boolean b = (Boolean) kernel.getAttribute(on, "kernelFullyStarted");
+ //System.out.println("attempt.. " + (maxTries - tries));
+ if (b.booleanValue())
+ return true;
+ }
+ catch (InternalKernelException e) {
+ //hasn't been loaded yet, keep trying
+ }
+ catch (GBeanNotFoundException e) {
+ //hasn't been loaded yet, keep trying
+ }
+ catch (InterruptedException e) {
+ e.printStackTrace(logStream);
+ logStream.println(lineSep);
+ return false;
+ }
+ catch (NoSuchAttributeException e) {
+ e.printStackTrace(logStream);
+ logStream.println(lineSep);
+ return false;
+ }
+ catch (Exception e) {
+ e.printStackTrace(logStream);
+ logStream.println(lineSep);
+ return false;
+ }
+ }
+ return false;
+ }
+
+ public void setLogStream(PrintStream logStream) {
+ if (logStream != null)
+ this.logStream = logStream;
+ }
+
+ public void destroy() {
+ logStream.close();
+ }
+}
Propchange: geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/util/ServerBehavior.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/util/ServerBehavior.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: geronimo/trunk/m2-plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/plugins/util/ServerBehavior.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/trunk/m2-plugins/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/m2-plugins/pom.xml?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/m2-plugins/pom.xml (original)
+++ geronimo/trunk/m2-plugins/pom.xml Fri Aug 4 14:21:54 2006
@@ -17,53 +17,147 @@
<!-- $Rev$ $Date$ -->
-<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">
+<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>
<groupId>org.apache.geronimo</groupId>
- <artifactId>geronimo-parent</artifactId>
+ <artifactId>geronimo</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>plugins-parent</artifactId>
- <name>Geronimo Plugins</name>
- <description>Geronimo :: Plugins</description>
+ <artifactId>plugins</artifactId>
+ <name>Geronimo :: Maven2 Plugins</name>
<packaging>pom</packaging>
- <properties>
- <maven.version>2.0</maven.version>
- </properties>
+ <!--
+
+ HACK: Need to explicitly configure SCM for this module since its artifactId
+ does not match the directory it lives in.
+
+ FIXME: Rename module directory.
+
+ -->
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/m2-plugins</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/m2-plugins</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/m2-plugins</url>
+ </scm>
<dependencies>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>${maven.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>${maven.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>${maven.version}</version>
+ <groupId>org.apache.geronimo.genesis.plugins</groupId>
+ <artifactId>plugin-support</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
</dependencies>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+
<modules>
- <module>geronimo-packaging-plugin</module>
+ <module>car-maven-plugin</module>
+ <module>geronimo-deployment-plugin</module>
</modules>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.0</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.0</version>
+ <configuration>
+ <minmemory>128m</minmemory>
+ <maxmemory>512</maxmemory>
+ <breakiterator>true</breakiterator>
+ <quiet>true</quiet>
+ <verbose>false</verbose>
+ <source>1.4</source>
+ <!--
+ FIXME: This worked in m1, but m2 complains about it being an invalid flag
+
+ <additionalparam>-J-Djava.awt.headless=true</additionalparam>
+ -->
+ <linksource>true</linksource>
+ <links>
+ <!-- JSE -->
+ <link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
+ <link>http://java.sun.com/j2se/1.4.2/docs/api/</link>
+ <link>http://java.sun.com/j2se/1.3/docs/api/</link>
+
+ <!-- JEE -->
+ <link>http://java.sun.com/j2ee/1.4/docs/api/</link>
+ <link>http://java.sun.com/j2ee/sdk_1.3/techdocs/api/</link>
+
+ <!-- Libraries -->
+ <link>http://jakarta.apache.org/commons/collections/apidocs</link>
+ <link>http://jakarta.apache.org/commons/logging/apidocs/</link>
+ <link>http://www.junit.org/junit/javadoc/</link>
+ <link>http://logging.apache.org/log4j/docs/api/</link>
+ <link>http://jakarta.apache.org/regexp/apidocs/</link>
+ <link>http://jakarta.apache.org/velocity/api/</link>
+ </links>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jxr-plugin</artifactId>
+ <version>2.0</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-pmd-plugin</artifactId>
+ <version>2.0</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ <version>2.0.1</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clover-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <!-- Pulled as resource from checkstyle-config plugin -->
+ <configLocation>org/apache/geronimo/checkstyle.xml</configLocation>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
</project>
Propchange: geronimo/trunk/m2-plugins/pom.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Fri Aug 4 14:21:54 2006
@@ -1 +1 @@
-Date Revision
+Date Author Id Revision HeadURL
Modified: geronimo/trunk/modules/activation/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/activation/pom.xml?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/activation/pom.xml (original)
+++ geronimo/trunk/modules/activation/pom.xml Fri Aug 4 14:21:54 2006
@@ -17,34 +17,72 @@
<!-- $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>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-activation</artifactId>
<name>Geronimo :: Activation</name>
- <description>Geronimo Activation implements Content Handlers for use in conjuction with the Java Activation Framework.</description>
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
-
+ <description>
+ Geronimo Activation implements Content Handlers for use in
+ conjuction with the Java Activation Framework.
+ </description>
+
+ <!--
+
+ HACK: Need to explicitly configure SCM for this module since its artifactId
+ does not match the directory it lives in.
+
+ FIXME: Rename module directory or artifactId.
+
+ -->
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/activation</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/activation</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/activation</url>
+ </scm>
+
<dependencies>
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-activation_1.0.2_spec</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.3.1_spec</artifactId>
</dependency>
+
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/Abstract*.java</exclude>
+
+ <!--
+ FIXME: This test fails on JDK 1.5, works on 1.4:
+
+ https://issues.apache.org/jira/browse/GERONIMO-2209
+ -->
+ <exclude>**/MailcapTest.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: geronimo/trunk/modules/activemq-embedded-rar/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/activemq-embedded-rar/pom.xml?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/activemq-embedded-rar/pom.xml (original)
+++ geronimo/trunk/modules/activemq-embedded-rar/pom.xml Fri Aug 4 14:21:54 2006
@@ -17,12 +17,13 @@
<!-- $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>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -32,11 +33,24 @@
<description>Resource Adapter configuration for using ActiveMQ as a bundled JMS provider.</description>
<packaging>rar</packaging>
+ <!--
+
+ HACK: Need to explicitly configure SCM for this module since its artifactId
+ does not match the directory it lives in.
+
+ FIXME: Rename module directory or artifactId.
+
+ -->
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/activemq-embedded-rar</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/activemq-embedded-rar</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/activemq-embedded-rar</url>
+ </scm>
+
<build>
<plugins>
<plugin>
<artifactId>maven-rar-plugin</artifactId>
- <version>${mavenRarPluginVersion}</version>
<configuration>
<raXmlFile>${basedir}/src/rar/META-INF/ra.xml</raXmlFile>
<includeJar>false</includeJar>
Modified: geronimo/trunk/modules/activemq-gbean-management/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/activemq-gbean-management/pom.xml?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/activemq-gbean-management/pom.xml (original)
+++ geronimo/trunk/modules/activemq-gbean-management/pom.xml Fri Aug 4 14:21:54 2006
@@ -17,24 +17,38 @@
<!-- $Rev: 411333 $ $Date: 2006-06-02 18:35:57 -0500 (Fri, 02 Jun 2006) $ -->
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0">
-
+<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>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-activemq-gbean-management</artifactId>
- <name>Geronimo :: ActiveMQ :: GBean Interfaces</name>
- <description>ActiveMQ Management Interfaces used by Geronimo</description>
-
+ <name>Geronimo :: ActiveMQ GBean Management Interfaces</name>
+
+ <description>
+ ActiveMQ Management Interfaces used by Geronimo
+ </description>
+
+ <!--
+
+ HACK: Need to explicitly configure SCM for this module since its artifactId
+ does not match the directory it lives in.
+
+ FIXME: Rename module directory or artifactId.
+
+ -->
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/activemq-gbean-management</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/activemq-gbean-management</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/activemq-gbean-management</url>
+ </scm>
+
<dependencies>
<dependency>
@@ -42,16 +56,13 @@
<artifactId>geronimo-management</artifactId>
<version>${pom.version}</version>
</dependency>
-
- <dependency>
- <groupId>backport-util-concurrent</groupId>
- <artifactId>backport-util-concurrent</artifactId>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
</dependencies>
+
+ <build>
+ <!-- FIXME: Remove when the default is to use the m2 standard layout -->
+ <sourceDirectory>${pom.basedir}/src/main/java</sourceDirectory>
+ <testSourceDirectory>${pom.basedir}/src/test/java</testSourceDirectory>
+ </build>
+
</project>
Modified: geronimo/trunk/modules/activemq-gbean/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/activemq-gbean/pom.xml?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/activemq-gbean/pom.xml (original)
+++ geronimo/trunk/modules/activemq-gbean/pom.xml Fri Aug 4 14:21:54 2006
@@ -17,39 +17,41 @@
<!-- $Rev: 411333 $ $Date: 2006-06-02 18:35:57 -0500 (Fri, 02 Jun 2006) $ -->
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0">
+<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>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-activemq-gbean</artifactId>
- <name>ActiveMQ :: GBeans</name>
- <description>Geronimo ActiveMQ Integration</description>
-
+ <name>Geronimo :: ActiveMQ GBeans</name>
+
+ <description>
+ Geronimo ActiveMQ Integration
+ </description>
+
+ <!--
+
+ HACK: Need to explicitly configure SCM for this module since its artifactId
+ does not match the directory it lives in.
+
+ FIXME: Rename module directory or artifactId.
+
+ -->
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/activemq-gbean</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/activemq-gbean</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/activemq-gbean</url>
+ </scm>
+
<dependencies>
<dependency>
- <groupId>incubator-activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>4.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>incubator-activemq</groupId>
- <artifactId>activeio-core</artifactId>
- <version>3.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-activemq-gbean-management</artifactId>
<version>${pom.version}</version>
@@ -78,17 +80,41 @@
<artifactId>geronimo-j2ee</artifactId>
<version>${pom.version}</version>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-connector</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>incubator-activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ <version>4.0.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>incubator-activemq</groupId>
+ <artifactId>activeio-core</artifactId>
+ <version>3.0-beta3</version>
+ </dependency>
+
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
-
+
<dependency>
<groupId>mx4j</groupId>
<artifactId>mx4j</artifactId>
</dependency>
-
+
</dependencies>
-
+
+ <build>
+ <!-- FIXME: Remove when the default is to use the m2 standard layout -->
+ <sourceDirectory>${pom.basedir}/src/main/java</sourceDirectory>
+ <testSourceDirectory>${pom.basedir}/src/test/java</testSourceDirectory>
+ </build>
+
</project>
Modified: geronimo/trunk/modules/axis-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/axis-builder/pom.xml?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/axis-builder/pom.xml (original)
+++ geronimo/trunk/modules/axis-builder/pom.xml Fri Aug 4 14:21:54 2006
@@ -14,13 +14,16 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
+
<!-- $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>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -28,6 +31,20 @@
<artifactId>geronimo-axis-builder</artifactId>
<name>Geronimo :: Axis :: Builder</name>
+ <!--
+
+ HACK: Need to explicitly configure SCM for this module since its artifactId
+ does not match the directory it lives in.
+
+ FIXME: Rename module directory or artifactId.
+
+ -->
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/axis-builder</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/axis-builder</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/axis-builder</url>
+ </scm>
+
<dependencies>
<!-- Module Dependencies -->
@@ -116,6 +133,15 @@
<build>
<resources>
+ <resource>
+ <directory>${pom.basedir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+
<!-- This schema is NOT compiled to xmlobjects. Do not remove! Used by SchemaInfoBuilder -->
<resource>
<directory>src/schema</directory>
@@ -128,23 +154,37 @@
<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>
+
+ <!--
+ HACK: Copy the generated XmlBeans bits for clover
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <mkdir dir="${pom.basedir}/target/clover/classes"/>
+ <copy todir="${pom.basedir}/target/clover/classes">
+ <fileset dir="${pom.basedir}/target/classes">
+ <include name="schemaorg_apache_xmlbeans/**"/>
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Propchange: geronimo/trunk/modules/axis-builder/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Fri Aug 4 14:21:54 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/axis-builder/src:423551
Propchange: geronimo/trunk/modules/axis-builder/src/java/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Fri Aug 4 14:21:54 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/axis-builder/src/java:423551
Modified: geronimo/trunk/modules/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/axis/pom.xml?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/axis/pom.xml (original)
+++ geronimo/trunk/modules/axis/pom.xml Fri Aug 4 14:21:54 2006
@@ -17,16 +17,13 @@
<!-- $Rev$ $Date$ -->
-<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">
-
+<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>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -36,6 +33,20 @@
<name>Geronimo :: Axis</name>
<description>Geronimo Axis Integration</description>
+ <!--
+
+ HACK: Need to explicitly configure SCM for this module since its artifactId
+ does not match the directory it lives in.
+
+ FIXME: Rename module directory or artifactId.
+
+ -->
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/axis</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/axis</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/axis</url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
@@ -115,6 +126,15 @@
<build>
<resources>
+ <resource>
+ <directory>${pom.basedir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+
<resource>
<directory>src/resources2</directory>
</resource>
Modified: geronimo/trunk/modules/client-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/client-builder/pom.xml?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/client-builder/pom.xml (original)
+++ geronimo/trunk/modules/client-builder/pom.xml Fri Aug 4 14:21:54 2006
@@ -17,12 +17,13 @@
<!-- $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>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -30,6 +31,20 @@
<artifactId>geronimo-client-builder</artifactId>
<name>Geronimo :: Client Builder</name>
+ <!--
+
+ HACK: Need to explicitly configure SCM for this module since its artifactId
+ does not match the directory it lives in.
+
+ FIXME: Rename module directory or artifactId.
+
+ -->
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/client-builder</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/client-builder</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/client-builder</url>
+ </scm>
+
<dependencies>
<!-- Module Dependencies -->
@@ -59,6 +74,15 @@
<build>
<resources>
<resource>
+ <directory>${pom.basedir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+
+ <resource>
<directory>${pom.basedir}/src/resources2</directory>
</resource>
</resources>
@@ -70,6 +94,32 @@
<configuration>
<sourceSchemas>geronimo-application-client-1.1.xsd</sourceSchemas>
</configuration>
+ </plugin>
+
+ <!--
+ HACK: Copy the generated XmlBeans bits for clover
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <mkdir dir="${pom.basedir}/target/clover/classes"/>
+ <copy todir="${pom.basedir}/target/clover/classes">
+ <fileset dir="${pom.basedir}/target/classes">
+ <include name="schemaorg_apache_xmlbeans/**"/>
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified: geronimo/trunk/modules/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/client/pom.xml?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/client/pom.xml (original)
+++ geronimo/trunk/modules/client/pom.xml Fri Aug 4 14:21:54 2006
@@ -17,23 +17,33 @@
<!-- $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>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-client</artifactId>
- <packaging>jar</packaging>
<name>Geronimo :: Client</name>
-
- <!-- ============ -->
- <!-- Dependencies -->
- <!-- ============ -->
+
+ <!--
+
+ HACK: Need to explicitly configure SCM for this module since its artifactId
+ does not match the directory it lives in.
+
+ FIXME: Rename module directory or artifactId.
+
+ -->
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/client</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/client</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/client</url>
+ </scm>
<dependencies>
Modified: geronimo/trunk/modules/common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/common/pom.xml?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/common/pom.xml (original)
+++ geronimo/trunk/modules/common/pom.xml Fri Aug 4 14:21:54 2006
@@ -17,20 +17,34 @@
<!-- $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>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-common</artifactId>
<name>Geronimo :: Common</name>
- <description>Geronimo Common</description>
-
+
+ <!--
+
+ HACK: Need to explicitly configure SCM for this module since its artifactId
+ does not match the directory it lives in.
+
+ FIXME: Rename module directory or artifactId.
+
+ -->
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/common</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/common</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/common</url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
@@ -38,5 +52,6 @@
<version>${pom.version}</version>
</dependency>
</dependencies>
+
</project>
Propchange: geronimo/trunk/modules/common/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Fri Aug 4 14:21:54 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/common/src:427996
Propchange: geronimo/trunk/modules/connector-builder/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Fri Aug 4 14:21:54 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/connector-builder:421368
Modified: geronimo/trunk/modules/connector-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/connector-builder/pom.xml?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/pom.xml (original)
+++ geronimo/trunk/modules/connector-builder/pom.xml Fri Aug 4 14:21:54 2006
@@ -17,23 +17,33 @@
<!-- $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>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-connector-builder</artifactId>
<name>Geronimo :: Connector :: Builder</name>
-
- <properties>
- <!-- FIXME: Should never need to default to skip!!! -->
- <maven.test.skip>true</maven.test.skip>
- </properties>
+
+ <!--
+
+ HACK: Need to explicitly configure SCM for this module since its artifactId
+ does not match the directory it lives in.
+
+ FIXME: Rename module directory or artifactId.
+
+ -->
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/connector-builder</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/connector-builder</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/connector-builder</url>
+ </scm>
<dependencies>
@@ -89,9 +99,17 @@
</dependencies>
<build>
- <!-- move this to parent pom -->
<resources>
<resource>
+ <directory>${pom.basedir}</directory>
+ <targetPath>META-INF</targetPath>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ </resource>
+
+ <resource>
<directory>${pom.basedir}/src/schema</directory>
<targetPath>META-INF</targetPath>
<includes>
@@ -102,6 +120,15 @@
<plugins>
<plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xmlbeans-maven-plugin</artifactId>
+ <configuration>
+ <sourceSchemas>geronimo-connector-1.1.xsd</sourceSchemas>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
@@ -116,25 +143,49 @@
<goal>run</goal>
</goals>
</execution>
+
+ <!--
+ HACK: Copy the generated XmlBeans bits for clover
+ -->
+ <execution>
+ <id>generate-resources</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <mkdir dir="${pom.basedir}/target/clover/classes"/>
+ <copy todir="${pom.basedir}/target/clover/classes">
+ <fileset dir="${pom.basedir}/target/classes">
+ <include name="schemaorg_apache_xmlbeans/**"/>
+ </fileset>
+ </copy>
+ </tasks>
+ </configuration>
+ </execution>
</executions>
</plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>xmlbeans-maven-plugin</artifactId>
- <configuration>
- <sourceSchemas>geronimo-connector-1.1.xsd</sourceSchemas>
- </configuration>
- </plugin>
-
+
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemProperties>
- <java.security.auth.login.config>${basedir}/src/test-data/data/login.config</java.security.auth.login.config>
- <user.dir>${basedir}</user.dir>
+ <property>
+ <name>java.security.auth.login.config</name>
+ <value>${basedir}/src/test-data/data/login.config</value>
+ </property>
</systemProperties>
- <forkMode>once</forkMode>
+
+ <excludes>
+ <exclude>**/Abstract*.java</exclude>
+
+ <!--
+ FIXME: This test was disabled because it is failing in non-obvious ways
+ and requires someone with more insight to resolve
+ -->
+ <exclude>**/Connector15DCBTest.java</exclude>
+ </excludes>
</configuration>
</plugin>
</plugins>
Modified: geronimo/trunk/modules/connector/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/connector/pom.xml?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/connector/pom.xml (original)
+++ geronimo/trunk/modules/connector/pom.xml Fri Aug 4 14:21:54 2006
@@ -17,25 +17,36 @@
<!-- $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>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-connector</artifactId>
<name>Geronimo :: Connector</name>
- <description>Geronimo Connector</description>
-
- <properties>
- <maven.test.skip>true</maven.test.skip>
- </properties>
+ <!--
+
+ HACK: Need to explicitly configure SCM for this module since its artifactId
+ does not match the directory it lives in.
+
+ FIXME: Rename module directory or artifactId.
+
+ -->
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/connector</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/connector</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/connector</url>
+ </scm>
+
<dependencies>
+
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-naming</artifactId>
@@ -119,6 +130,8 @@
<groupId>regexp</groupId>
<artifactId>regexp</artifactId>
</dependency>
+
</dependencies>
+
</project>
Propchange: geronimo/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Fri Aug 4 14:21:54 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/connector/src/java/org/apache/geronimo/connector/outbound:421368
Propchange: geronimo/trunk/modules/console-web/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Fri Aug 4 14:21:54 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/console-web/src:424119
Modified: geronimo/trunk/modules/converter/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/trunk/modules/converter/pom.xml?rev=428888&r1=428887&r2=428888&view=diff
==============================================================================
--- geronimo/trunk/modules/converter/pom.xml (original)
+++ geronimo/trunk/modules/converter/pom.xml Fri Aug 4 14:21:54 2006
@@ -17,19 +17,34 @@
<!-- $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>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>modules-parent</artifactId>
+ <artifactId>modules</artifactId>
<version>1.2-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>geronimo-converter</artifactId>
<name>Geronimo :: Configuration Converter</name>
-
+
+ <!--
+
+ HACK: Need to explicitly configure SCM for this module since its artifactId
+ does not match the directory it lives in.
+
+ FIXME: Rename module directory or artifactId.
+
+ -->
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/converter</connection>
+ <developerConnection>scm:svn:https://${maven.username}@svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/converter</developerConnection>
+ <url>http://svn.apache.org/repos/asf/geronimo/sandbox/svkmerge/m2migration/modules/converter</url>
+ </scm>
+
<dependencies>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>