Author: mwringe
Date: 2008-07-03 16:17:10 -0500 (Thu, 03 Jul 2008)
New Revision: 1673
Added:
extensions/tags/cargo-extensions-1.0-alpha-5/
extensions/tags/cargo-extensions-1.0-alpha-5/ant/pom.xml
extensions/tags/cargo-extensions-1.0-alpha-5/ant/src/main/java/org/codehaus/cargo/ant/ConfigurationElement.java
extensions/tags/cargo-extensions-1.0-alpha-5/maven/pom.xml
extensions/tags/cargo-extensions-1.0-alpha-5/maven2/archetypes/pom.xml
extensions/tags/cargo-extensions-1.0-alpha-5/maven2/archetypes/webapp-functional-tests-module/pom.xml
extensions/tags/cargo-extensions-1.0-alpha-5/maven2/archetypes/webapp-single-module/pom.xml
extensions/tags/cargo-extensions-1.0-alpha-5/maven2/plugin/pom.xml
extensions/tags/cargo-extensions-1.0-alpha-5/maven2/plugin/src/main/java/org/codehaus/cargo/maven2/AbstractCargoMojo.java
extensions/tags/cargo-extensions-1.0-alpha-5/maven2/plugin/src/projects/pom.xml
extensions/tags/cargo-extensions-1.0-alpha-5/maven2/pom.xml
extensions/tags/cargo-extensions-1.0-alpha-5/pom.xml
Removed:
extensions/tags/cargo-extensions-1.0-alpha-5/ant/pom.xml
extensions/tags/cargo-extensions-1.0-alpha-5/ant/src/main/java/org/codehaus/cargo/ant/ConfigurationElement.java
extensions/tags/cargo-extensions-1.0-alpha-5/maven/pom.xml
extensions/tags/cargo-extensions-1.0-alpha-5/maven2/archetypes/pom.xml
extensions/tags/cargo-extensions-1.0-alpha-5/maven2/archetypes/webapp-functional-tests-module/pom.xml
extensions/tags/cargo-extensions-1.0-alpha-5/maven2/archetypes/webapp-single-module/pom.xml
extensions/tags/cargo-extensions-1.0-alpha-5/maven2/plugin/pom.xml
extensions/tags/cargo-extensions-1.0-alpha-5/maven2/plugin/src/main/java/org/codehaus/cargo/maven2/AbstractCargoMojo.java
extensions/tags/cargo-extensions-1.0-alpha-5/maven2/plugin/src/projects/pom.xml
extensions/tags/cargo-extensions-1.0-alpha-5/maven2/pom.xml
extensions/tags/cargo-extensions-1.0-alpha-5/pom.xml
Log:
[maven-release-plugin] copy for tag cargo-extensions-1.0-alpha-5
Copied: extensions/tags/cargo-extensions-1.0-alpha-5 (from rev 1574, extensions/trunk)
Deleted: extensions/tags/cargo-extensions-1.0-alpha-5/ant/pom.xml
===================================================================
--- extensions/trunk/ant/pom.xml 2008-05-01 21:15:15 UTC (rev 1574)
+++ extensions/tags/cargo-extensions-1.0-alpha-5/ant/pom.xml 2008-07-03 21:17:10 UTC (rev 1673)
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- ~ Copyright 2005-2007 Vincent Massol.
- ~
- ~ 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.
- -->
-
-<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.codehaus.cargo</groupId>
- <artifactId>cargo-extensions</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <artifactId>cargo-ant</artifactId>
- <version>1.0-SNAPSHOT</version>
- <name>Cargo Ant tasks</name>
- <packaging>jar</packaging>
- <description>Ant tasks for Cargo</description>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-core-api-container</artifactId>
- <version>${cargo.core.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-build-tools</artifactId>
- <version>0.9.1</version>
- </dependency>
- </dependencies>
- </plugin>
- </plugins>
- </build>
- <!-- We need this for now because Maven is not able to build from the top level without
- querying the remote repository. This is probably a Maven bug. Remove this when it
- is fixed -->
- <repositories>
- <repository>
- <id>codehaus.snapshots</id>
- <name>Codehaus Snapshots</name>
- <url>
http://snapshots.repository.codehaus.org</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>codehaus</id>
- <name>Codehaus</name>
- <url>
http://repository.codehaus.org</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-</project>
Copied: extensions/tags/cargo-extensions-1.0-alpha-5/ant/pom.xml (from rev 1672, extensions/trunk/ant/pom.xml)
===================================================================
--- extensions/tags/cargo-extensions-1.0-alpha-5/ant/pom.xml (rev 0)
+++ extensions/tags/cargo-extensions-1.0-alpha-5/ant/pom.xml 2008-07-03 21:17:10 UTC (rev 1673)
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright 2005-2007 Vincent Massol.
+ ~
+ ~ 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.
+ -->
+
+<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.codehaus.cargo</groupId>
+ <artifactId>cargo-extensions</artifactId>
+ <version>1.0-alpha-5</version>
+ </parent>
+ <artifactId>cargo-ant</artifactId>
+ <version>1.0-alpha-5</version>
+ <name>Cargo Ant tasks</name>
+ <packaging>jar</packaging>
+ <description>Ant tasks for Cargo</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-api-container</artifactId>
+ <version>${cargo.core.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-build-tools</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </build>
+ <!-- We need this for now because Maven is not able to build from the top level without
+ querying the remote repository. This is probably a Maven bug. Remove this when it
+ is fixed -->
+ <repositories>
+ <repository>
+ <id>codehaus.snapshots</id>
+ <name>Codehaus Snapshots</name>
+ <url>
http://snapshots.repository.codehaus.org</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>codehaus</id>
+ <name>Codehaus</name>
+ <url>
http://repository.codehaus.org</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+</project>
Deleted: extensions/tags/cargo-extensions-1.0-alpha-5/ant/src/main/java/org/codehaus/cargo/ant/ConfigurationElement.java
===================================================================
--- extensions/trunk/ant/src/main/java/org/codehaus/cargo/ant/ConfigurationElement.java 2008-05-01 21:15:15 UTC (rev 1574)
+++ extensions/tags/cargo-extensions-1.0-alpha-5/ant/src/main/java/org/codehaus/cargo/ant/ConfigurationElement.java 2008-07-03 21:17:10 UTC (rev 1673)
@@ -1,253 +0,0 @@
-/*
- * ========================================================================
- *
- * Copyright 2004-2006 Vincent Massol.
- *
- * 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.codehaus.cargo.ant;
-
-import org.codehaus.cargo.container.configuration.Configfile;
-import org.codehaus.cargo.container.configuration.Configuration;
-import org.codehaus.cargo.container.configuration.ConfigurationType;
-import org.codehaus.cargo.container.configuration.LocalConfiguration;
-import org.codehaus.cargo.container.configuration.StandaloneLocalConfiguration;
-import org.codehaus.cargo.container.ContainerType;
-import org.codehaus.cargo.generic.configuration.ConfigurationFactory;
-import org.codehaus.cargo.generic.configuration.DefaultConfigurationFactory;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-/**
- * Nested Ant element to wrap the
- * {@link org.codehaus.cargo.generic.configuration.DefaultConfigurationFactory} class.
- *
- * @version $Id$
- */
-public class ConfigurationElement
-{
- /**
- * The default configuration type is standalone.
- * @see #setType(String)
- */
- private ConfigurationType type = ConfigurationType.STANDALONE;
-
- /**
- * @see #setHome(String)
- */
- private String home;
-
- /**
- * Configuration properties.
- */
- private List properties = new ArrayList();
-
- /**
- * Custom configuration class to associate to the containing container.
- */
- private Class configurationClass;
-
- /**
- * List of deployables to deploy.
- */
- private List deployables = new ArrayList();
-
- /**
- *List of configuration files
- */
- private List configfiles = new ArrayList();
-
- /**
- * @param configurationClass the configuration class to associate to the containing container
- */
- public final void setClass(Class configurationClass)
- {
- this.configurationClass = configurationClass;
- }
-
- /**
- * {@inheritDoc}
- * @see #setClass(Class)
- */
- protected final Class getConfigurationClass()
- {
- return this.configurationClass;
- }
-
- /**
- * @param deployableElement the nested deployable element to deploy
- */
- public void addConfiguredDeployable(DeployableElement deployableElement)
- {
- this.deployables.add(deployableElement);
- }
-
- /**
- * {@inheritDoc}
- * @see #addConfiguredDeployable(DeployableElement)
- */
- protected final List getDeployables()
- {
- return this.deployables;
- }
-
- /**
- * @param deployableElement the nested deployable element to deploy
- */
- public void addConfiguredConfigfile(Configfile configfileElement)
- {
- this.configfiles.add(configfileElement);
- }
-
- /**
- * {@inheritDoc}
- * @see #addConfiguredDeployable(DeployableElement)
- */
- protected final List getConfigfiles()
- {
- return this.configfiles;
- }
-
- /**
- * {@inheritDoc}
- * @see #addConfiguredProperty(Property)
- */
- protected final List getProperties()
- {
- return this.properties;
- }
-
- /**
- * Add a container property.
- *
- * @param property the container property to add
- */
- public void addConfiguredProperty(Property property)
- {
- this.properties.add(property);
- }
-
- /**
- * Defaults to the standalone configuration if type is not specified by the user.
- *
- * @param typeAsString the configuration type as a string
- * @see org.codehaus.cargo.generic.configuration.ConfigurationFactory
- */
- public final void setType(String typeAsString)
- {
- this.type = ConfigurationType.toType(typeAsString);
- }
-
- /**
- * {@inheritDoc}
- * @see org.codehaus.cargo.container.configuration.LocalConfiguration#getHome()
- */
- public final void setHome(String home)
- {
- this.home = home;
- }
-
- /**
- * {@inheritDoc}
- * @see #setType(String)
- */
- public final ConfigurationType getType()
- {
- return this.type;
- }
-
- /**
- * {@inheritDoc}
- * @see #setHome(String)
- */
- public final String getHome()
- {
- return this.home;
- }
-
- /**
- * @param containerId the container id associated with this configuration
- * @param containerType the container type associated with this configuration
- * @return a configuration instance matching this container and the defined type
- */
- public Configuration createConfiguration(String containerId, ContainerType containerType)
- {
- ConfigurationFactory factory = new DefaultConfigurationFactory();
-
- if (getConfigurationClass() != null)
- {
- factory.registerConfiguration(containerId, containerType, getType(),
- getConfigurationClass());
- }
-
- // Only use the dir if specified
- Configuration configuration;
- if (getHome() == null)
- {
- configuration = factory.createConfiguration(containerId, containerType, getType());
- }
- else
- {
- configuration = factory.createConfiguration(containerId, containerType, getType(),
- getHome());
- }
-
- // Set all container properties
- Iterator itProperties = getProperties().iterator();
- while (itProperties.hasNext())
- {
- Property property = (Property) itProperties.next();
- configuration.setProperty(property.getName(), property.getValue());
- }
-
- // Add static deployables for local configurations
- if (configuration instanceof LocalConfiguration)
- {
- addStaticDeployables(containerId, (LocalConfiguration) configuration);
- }
-
- if (configuration instanceof StandaloneLocalConfiguration)
- {
- if (getConfigfiles() != null)
- {
- for (int i = 0; i < getConfigfiles().size(); i ++)
- {
- Configfile configfile = (Configfile)getConfigfiles().get(i);
- ((StandaloneLocalConfiguration)configuration).setFileProperty(configfile.getFile(), configfile.getToFile(), configfile.getToDir());
- }
- }
- }
-
- return configuration;
- }
-
- /**
- * Add static deployables to the configuration.
- *
- * @param containerId the container id to which to deploy to
- * @param configuration the local configuration to which to add Deployables to
- */
- private void addStaticDeployables(String containerId, LocalConfiguration configuration)
- {
- Iterator deps = getDeployables().iterator();
- while (deps.hasNext())
- {
- DeployableElement deployableElement = (DeployableElement) deps.next();
- configuration.addDeployable(deployableElement.createDeployable(containerId));
- }
- }
-}
Copied: extensions/tags/cargo-extensions-1.0-alpha-5/ant/src/main/java/org/codehaus/cargo/ant/ConfigurationElement.java (from rev 1575, extensions/trunk/ant/src/main/java/org/codehaus/cargo/ant/ConfigurationElement.java)
===================================================================
--- extensions/tags/cargo-extensions-1.0-alpha-5/ant/src/main/java/org/codehaus/cargo/ant/ConfigurationElement.java (rev 0)
+++ extensions/tags/cargo-extensions-1.0-alpha-5/ant/src/main/java/org/codehaus/cargo/ant/ConfigurationElement.java 2008-07-03 21:17:10 UTC (rev 1673)
@@ -0,0 +1,254 @@
+/*
+ * ========================================================================
+ *
+ * Copyright 2004-2006 Vincent Massol.
+ *
+ * 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.codehaus.cargo.ant;
+
+import org.codehaus.cargo.container.configuration.Configfile;
+import org.codehaus.cargo.container.configuration.Configuration;
+import org.codehaus.cargo.container.configuration.ConfigurationType;
+import org.codehaus.cargo.container.configuration.LocalConfiguration;
+import org.codehaus.cargo.container.configuration.StandaloneLocalConfiguration;
+import org.codehaus.cargo.container.ContainerType;
+import org.codehaus.cargo.generic.configuration.ConfigurationFactory;
+import org.codehaus.cargo.generic.configuration.DefaultConfigurationFactory;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * Nested Ant element to wrap the
+ * {@link org.codehaus.cargo.generic.configuration.DefaultConfigurationFactory} class.
+ *
+ * @version $Id$
+ */
+public class ConfigurationElement
+{
+ /**
+ * The default configuration type is standalone.
+ * @see #setType(String)
+ */
+ private ConfigurationType type = ConfigurationType.STANDALONE;
+
+ /**
+ * @see #setHome(String)
+ */
+ private String home;
+
+ /**
+ * Configuration properties.
+ */
+ private List properties = new ArrayList();
+
+ /**
+ * Custom configuration class to associate to the containing container.
+ */
+ private Class configurationClass;
+
+ /**
+ * List of deployables to deploy.
+ */
+ private List deployables = new ArrayList();
+
+ /**
+ *List of configuration files
+ */
+ private List configfiles = new ArrayList();
+
+ /**
+ * @param configurationClass the configuration class to associate to the containing container
+ */
+ public final void setClass(Class configurationClass)
+ {
+ this.configurationClass = configurationClass;
+ }
+
+ /**
+ * {@inheritDoc}
+ * @see #setClass(Class)
+ */
+ protected final Class getConfigurationClass()
+ {
+ return this.configurationClass;
+ }
+
+ /**
+ * @param deployableElement the nested deployable element to deploy
+ */
+ public void addConfiguredDeployable(DeployableElement deployableElement)
+ {
+ this.deployables.add(deployableElement);
+ }
+
+ /**
+ * {@inheritDoc}
+ * @see #addConfiguredDeployable(DeployableElement)
+ */
+ protected final List getDeployables()
+ {
+ return this.deployables;
+ }
+
+ /**
+ * @param configfileElement the nested deployable element to deploy
+ */
+ public void addConfiguredConfigfile(Configfile configfileElement)
+ {
+ this.configfiles.add(configfileElement);
+ }
+
+ /**
+ * {@inheritDoc}
+ * @see #addConfiguredDeployable(DeployableElement)
+ */
+ protected final List getConfigfiles()
+ {
+ return this.configfiles;
+ }
+
+ /**
+ * {@inheritDoc}
+ * @see #addConfiguredProperty(Property)
+ */
+ protected final List getProperties()
+ {
+ return this.properties;
+ }
+
+ /**
+ * Add a container property.
+ *
+ * @param property the container property to add
+ */
+ public void addConfiguredProperty(Property property)
+ {
+ this.properties.add(property);
+ }
+
+ /**
+ * Defaults to the standalone configuration if type is not specified by the user.
+ *
+ * @param typeAsString the configuration type as a string
+ * @see org.codehaus.cargo.generic.configuration.ConfigurationFactory
+ */
+ public final void setType(String typeAsString)
+ {
+ this.type = ConfigurationType.toType(typeAsString);
+ }
+
+ /**
+ * {@inheritDoc}
+ * @see org.codehaus.cargo.container.configuration.LocalConfiguration#getHome()
+ */
+ public final void setHome(String home)
+ {
+ this.home = home;
+ }
+
+ /**
+ * {@inheritDoc}
+ * @see #setType(String)
+ */
+ public final ConfigurationType getType()
+ {
+ return this.type;
+ }
+
+ /**
+ * {@inheritDoc}
+ * @see #setHome(String)
+ */
+ public final String getHome()
+ {
+ return this.home;
+ }
+
+ /**
+ * @param containerId the container id associated with this configuration
+ * @param containerType the container type associated with this configuration
+ * @return a configuration instance matching this container and the defined type
+ */
+ public Configuration createConfiguration(String containerId, ContainerType containerType)
+ {
+ ConfigurationFactory factory = new DefaultConfigurationFactory();
+
+ if (getConfigurationClass() != null)
+ {
+ factory.registerConfiguration(containerId, containerType, getType(),
+ getConfigurationClass());
+ }
+
+ // Only use the dir if specified
+ Configuration configuration;
+ if (getHome() == null)
+ {
+ configuration = factory.createConfiguration(containerId, containerType, getType());
+ }
+ else
+ {
+ configuration = factory.createConfiguration(containerId, containerType, getType(),
+ getHome());
+ }
+
+ // Set all container properties
+ Iterator itProperties = getProperties().iterator();
+ while (itProperties.hasNext())
+ {
+ Property property = (Property) itProperties.next();
+ configuration.setProperty(property.getName(), property.getValue());
+ }
+
+ // Add static deployables for local configurations
+ if (configuration instanceof LocalConfiguration)
+ {
+ addStaticDeployables(containerId, (LocalConfiguration) configuration);
+ }
+
+ if (configuration instanceof StandaloneLocalConfiguration)
+ {
+ if (getConfigfiles() != null)
+ {
+ for (int i = 0; i < getConfigfiles().size(); i++)
+ {
+ Configfile configfile = (Configfile) getConfigfiles().get(i);
+ ((StandaloneLocalConfiguration) configuration).setFileProperty(configfile
+ .getFile(), configfile.getToFile(), configfile.getToDir());
+ }
+ }
+ }
+
+ return configuration;
+ }
+
+ /**
+ * Add static deployables to the configuration.
+ *
+ * @param containerId the container id to which to deploy to
+ * @param configuration the local configuration to which to add Deployables to
+ */
+ private void addStaticDeployables(String containerId, LocalConfiguration configuration)
+ {
+ Iterator deps = getDeployables().iterator();
+ while (deps.hasNext())
+ {
+ DeployableElement deployableElement = (DeployableElement) deps.next();
+ configuration.addDeployable(deployableElement.createDeployable(containerId));
+ }
+ }
+}
Deleted: extensions/tags/cargo-extensions-1.0-alpha-5/maven/pom.xml
===================================================================
--- extensions/trunk/maven/pom.xml 2008-05-01 21:15:15 UTC (rev 1574)
+++ extensions/tags/cargo-extensions-1.0-alpha-5/maven/pom.xml 2008-07-03 21:17:10 UTC (rev 1673)
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- ~ Copyright 2005-2007 Vincent Massol.
- ~
- ~ 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.
- -->
-
-<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.codehaus.cargo</groupId>
- <artifactId>cargo-extensions</artifactId>
- <version>0.9</version>
- </parent>
- <version>1.0-SNAPSHOT</version>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-maven-plugin</artifactId>
- <name>Cargo Maven 1 plugin</name>
- <packaging>maven-one-plugin</packaging>
- <description>Cargo Maven 1 plugin</description>
- <dependencies>
- <dependency>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-ant</artifactId>
- <version>0.9</version>
- </dependency>
- <dependency>
- <groupId>ant</groupId>
- <artifactId>ant</artifactId>
- <version>1.6.5</version>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-one-plugin</artifactId>
- <extensions>true</extensions>
- <executions>
- <execution>
- <goals>
- <goal>install-maven-one-repository</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
Copied: extensions/tags/cargo-extensions-1.0-alpha-5/maven/pom.xml (from rev 1672, extensions/trunk/maven/pom.xml)
===================================================================
--- extensions/tags/cargo-extensions-1.0-alpha-5/maven/pom.xml (rev 0)
+++ extensions/tags/cargo-extensions-1.0-alpha-5/maven/pom.xml 2008-07-03 21:17:10 UTC (rev 1673)
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright 2005-2007 Vincent Massol.
+ ~
+ ~ 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.
+ -->
+
+<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.codehaus.cargo</groupId>
+ <artifactId>cargo-extensions</artifactId>
+ <version>1.0-alpha-5</version>
+ </parent>
+ <version>1.0-alpha-5</version>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven-plugin</artifactId>
+ <name>Cargo Maven 1 plugin</name>
+ <packaging>maven-one-plugin</packaging>
+ <description>Cargo Maven 1 plugin</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-ant</artifactId>
+ <version>0.9</version>
+ </dependency>
+ <dependency>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>1.6.5</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-one-plugin</artifactId>
+ <extensions>true</extensions>
+ <executions>
+ <execution>
+ <goals>
+ <goal>install-maven-one-repository</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Deleted: extensions/tags/cargo-extensions-1.0-alpha-5/maven2/archetypes/pom.xml
===================================================================
--- extensions/trunk/maven2/archetypes/pom.xml 2008-05-01 21:15:15 UTC (rev 1574)
+++ extensions/tags/cargo-extensions-1.0-alpha-5/maven2/archetypes/pom.xml 2008-07-03 21:17:10 UTC (rev 1673)
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- ~ Copyright 2007 Vincent Massol.
- ~
- ~ 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.
- -->
-
-<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.codehaus.cargo</groupId>
- <artifactId>cargo-extensions-maven2</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <artifactId>cargo-maven2-archetypes</artifactId>
- <name>Cargo Maven 2 Archetypes</name>
- <packaging>pom</packaging>
- <description>Sample Maven 2 Archetypes for using Cargo</description>
- <modules>
- <module>webapp-single-module</module>
- <module>webapp-functional-tests-module</module>
- </modules>
-</project>
Copied: extensions/tags/cargo-extensions-1.0-alpha-5/maven2/archetypes/pom.xml (from rev 1672, extensions/trunk/maven2/archetypes/pom.xml)
===================================================================
--- extensions/tags/cargo-extensions-1.0-alpha-5/maven2/archetypes/pom.xml (rev 0)
+++ extensions/tags/cargo-extensions-1.0-alpha-5/maven2/archetypes/pom.xml 2008-07-03 21:17:10 UTC (rev 1673)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright 2007 Vincent Massol.
+ ~
+ ~ 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.
+ -->
+
+<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.codehaus.cargo</groupId>
+ <artifactId>cargo-extensions-maven2</artifactId>
+ <version>1.0-alpha-5</version>
+ </parent>
+ <artifactId>cargo-maven2-archetypes</artifactId>
+ <name>Cargo Maven 2 Archetypes</name>
+ <packaging>pom</packaging>
+ <description>Sample Maven 2 Archetypes for using Cargo</description>
+ <modules>
+ <module>webapp-single-module</module>
+ <module>webapp-functional-tests-module</module>
+ </modules>
+</project>
Deleted: extensions/tags/cargo-extensions-1.0-alpha-5/maven2/archetypes/webapp-functional-tests-module/pom.xml
===================================================================
--- extensions/trunk/maven2/archetypes/webapp-functional-tests-module/pom.xml 2008-05-01 21:15:15 UTC (rev 1574)
+++ extensions/tags/cargo-extensions-1.0-alpha-5/maven2/archetypes/webapp-functional-tests-module/pom.xml 2008-07-03 21:17:10 UTC (rev 1673)
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- ~ Copyright 2007 Vincent Massol.
- ~
- ~ 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.
- -->
-
-<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.codehaus.cargo</groupId>
- <artifactId>cargo-maven2-archetypes</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <artifactId>cargo-archetype-webapp-functional-tests-module</artifactId>
- <name>Cargo Maven 2 Archetype Webapp Functional Tests Module</name>
- <packaging>maven-plugin</packaging>
- <description>
- Sample Maven 2 Archetypes showing how to configure Cargo and Maven to run functional tests
- for a webapp by creating a functional-tests module.
- </description>
-</project>
Copied: extensions/tags/cargo-extensions-1.0-alpha-5/maven2/archetypes/webapp-functional-tests-module/pom.xml (from rev 1672, extensions/trunk/maven2/archetypes/webapp-functional-tests-module/pom.xml)
===================================================================
--- extensions/tags/cargo-extensions-1.0-alpha-5/maven2/archetypes/webapp-functional-tests-module/pom.xml (rev 0)
+++ extensions/tags/cargo-extensions-1.0-alpha-5/maven2/archetypes/webapp-functional-tests-module/pom.xml 2008-07-03 21:17:10 UTC (rev 1673)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright 2007 Vincent Massol.
+ ~
+ ~ 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.
+ -->
+
+<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.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-archetypes</artifactId>
+ <version>1.0-alpha-5</version>
+ </parent>
+ <artifactId>cargo-archetype-webapp-functional-tests-module</artifactId>
+ <name>Cargo Maven 2 Archetype Webapp Functional Tests Module</name>
+ <packaging>maven-plugin</packaging>
+ <description>
+ Sample Maven 2 Archetypes showing how to configure Cargo and Maven to run functional tests
+ for a webapp by creating a functional-tests module.
+ </description>
+</project>
Deleted: extensions/tags/cargo-extensions-1.0-alpha-5/maven2/archetypes/webapp-single-module/pom.xml
===================================================================
--- extensions/trunk/maven2/archetypes/webapp-single-module/pom.xml 2008-05-01 21:15:15 UTC (rev 1574)
+++ extensions/tags/cargo-extensions-1.0-alpha-5/maven2/archetypes/webapp-single-module/pom.xml 2008-07-03 21:17:10 UTC (rev 1673)
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- ~ Copyright 2007 Vincent Massol.
- ~
- ~ 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.
- -->
-
-<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.codehaus.cargo</groupId>
- <artifactId>cargo-maven2-archetypes</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <artifactId>cargo-archetype-webapp-single-module</artifactId>
- <name>Cargo Maven 2 Archetype Single Webapp Module</name>
- <packaging>maven-plugin</packaging>
- <description>
- Sample Maven 2 Archetypes showing how to configure Cargo and Maven to run functional tests
- directly from a single webapp module.
- </description>
-</project>
Copied: extensions/tags/cargo-extensions-1.0-alpha-5/maven2/archetypes/webapp-single-module/pom.xml (from rev 1672, extensions/trunk/maven2/archetypes/webapp-single-module/pom.xml)
===================================================================
--- extensions/tags/cargo-extensions-1.0-alpha-5/maven2/archetypes/webapp-single-module/pom.xml (rev 0)
+++ extensions/tags/cargo-extensions-1.0-alpha-5/maven2/archetypes/webapp-single-module/pom.xml 2008-07-03 21:17:10 UTC (rev 1673)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright 2007 Vincent Massol.
+ ~
+ ~ 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.
+ -->
+
+<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.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-archetypes</artifactId>
+ <version>1.0-alpha-5</version>
+ </parent>
+ <artifactId>cargo-archetype-webapp-single-module</artifactId>
+ <name>Cargo Maven 2 Archetype Single Webapp Module</name>
+ <packaging>maven-plugin</packaging>
+ <description>
+ Sample Maven 2 Archetypes showing how to configure Cargo and Maven to run functional tests
+ directly from a single webapp module.
+ </description>
+</project>
Deleted: extensions/tags/cargo-extensions-1.0-alpha-5/maven2/plugin/pom.xml
===================================================================
--- extensions/trunk/maven2/plugin/pom.xml 2008-05-01 21:15:15 UTC (rev 1574)
+++ extensions/tags/cargo-extensions-1.0-alpha-5/maven2/plugin/pom.xml 2008-07-03 21:17:10 UTC (rev 1673)
@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- ~ Copyright 2005-2007 Vincent Massol.
- ~
- ~ 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.
- -->
-
-<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.codehaus.cargo</groupId>
- <artifactId>cargo-extensions-maven2</artifactId>
- <version>1.0-SNAPSHOT</version>
- </parent>
- <artifactId>cargo-maven2-plugin</artifactId>
- <name>Cargo Maven 2 Plugin</name>
- <packaging>maven-plugin</packaging>
- <description>Cargo Maven 2 Plugin</description>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>2.0</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>1.4.7</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.cargo</groupId>
- <artifactId>cargo-core-api-container</artifactId>
- <version>${cargo.core.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>jmock</groupId>
- <artifactId>jmock</artifactId>
- <version>1.0.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>commons-vfs</groupId>
- <artifactId>commons-vfs</artifactId>
- <version>1.0</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <build>
- <plugins>
- <!--plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- </plugin-->
- <plugin>
- <groupId>org.codehaus.modello</groupId>
- <artifactId>modello-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>xpp3-writer</goal>
- <goal>java</goal>
- <goal>xpp3-reader</goal>
- </goals>
- <configuration>
- <version>1.0.0</version>
- <model>src/main/mdo/mergeinfo.mdo</model>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-plugin-plugin</artifactId>
- <configuration>
- <!-- Note: This is to allow typing "mvn cargo:[goalname]" without having to type the
- fully qualified name on the command line -->
- <goalPrefix>cargo</goalPrefix>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <profiles>
- <profile>
- <id>integration-test</id>
- <pluginRepositories>
- <!-- added for maven-plugin-management-plugin -->
- <pluginRepository>
- <id>apache.snapshots</id>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <url>
http://people.apache.org/maven-snapshot-repository</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- </pluginRepository>
- </pluginRepositories>
- <build>
- <plugins>
- <!-- stages the plugin so it can be used in integration-tests by the invoker plugin -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-plugin-management-plugin</artifactId>
- <version>1.0-SNAPSHOT</version>
- <executions>
- <execution>
- <goals>
- <goal>stage</goal>
- <goal>unstage</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-invoker-plugin</artifactId>
- <executions>
- <execution>
- <id>default</id>
- <phase>integration-test</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <goals>
- <goal>clean</goal>
- <goal>integration-test</goal>
- </goals>
- <pomIncludes>
- <pomInclude>*/pom.xml</pomInclude>
- </pomIncludes>
- <pomExcludes>
- <!-- these tests needs fixing -->
- <pomExclude>testStartAndAutoDeploy/pom.xml</pomExclude>
- <!-- will have to run on container with ear support -->
- <pomExclude>testStartWithOneWarOneEarDeployed/pom.xml</pomExclude>
- <!-- disable these for now as these tests need some javacode and to be
- executed by the embedder plugin instead -->
- <pomExclude>testRemoteDeploy/pom.xml</pomExclude>
- <pomExclude>testStartInplaceDevelopment/pom.xml</pomExclude>
- <pomExclude>testStartMultipleContainers/pom.xml</pomExclude>
- <pomExclude>testStartUsingAlreadyInstalledContainer/pom.xml</pomExclude>
- <pomExclude>testStartWithNoDeployableAndInBlockingMode/pom.xml</pomExclude>
- <pomExclude>testStopEmbeddedContainerInAnotherExecution/pom.xml</pomExclude>
- </pomExcludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
Copied: extensions/tags/cargo-extensions-1.0-alpha-5/maven2/plugin/pom.xml (from rev 1672, extensions/trunk/maven2/plugin/pom.xml)
===================================================================
--- extensions/tags/cargo-extensions-1.0-alpha-5/maven2/plugin/pom.xml (rev 0)
+++ extensions/tags/cargo-extensions-1.0-alpha-5/maven2/plugin/pom.xml 2008-07-03 21:17:10 UTC (rev 1673)
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Copyright 2005-2007 Vincent Massol.
+ ~
+ ~ 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.
+ -->
+
+<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.codehaus.cargo</groupId>
+ <artifactId>cargo-extensions-maven2</artifactId>
+ <version>1.0-alpha-5</version>
+ </parent>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ <name>Cargo Maven 2 Plugin</name>
+ <packaging>maven-plugin</packaging>
+ <description>Cargo Maven 2 Plugin</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.4.7</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-api-container</artifactId>
+ <version>${cargo.core.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jmock</groupId>
+ <artifactId>jmock</artifactId>
+ <version>1.0.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-vfs</groupId>
+ <artifactId>commons-vfs</artifactId>
+ <version>1.0</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <!--plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin-->
+ <plugin>
+ <groupId>org.codehaus.modello</groupId>
+ <artifactId>modello-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>xpp3-writer</goal>
+ <goal>java</goal>
+ <goal>xpp3-reader</goal>
+ </goals>
+ <configuration>
+ <version>1.0.0</version>
+ <model>src/main/mdo/mergeinfo.mdo</model>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-plugin-plugin</artifactId>
+ <configuration>
+ <!-- Note: This is to allow typing "mvn cargo:[goalname]" without having to type the
+ fully qualified name on the command line -->
+ <goalPrefix>cargo</goalPrefix>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <profiles>
+ <profile>
+ <id>integration-test</id>
+ <pluginRepositories>
+ <!-- added for maven-plugin-management-plugin -->
+ <pluginRepository>
+ <id>apache.snapshots</id>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <url>
http://people.apache.org/maven-snapshot-repository</url>
+ <releases>
+ <enabled>false</enabled>
+ </releases>
+ </pluginRepository>
+ </pluginRepositories>
+ <build>
+ <plugins>
+ <!-- stages the plugin so it can be used in integration-tests by the invoker plugin -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-management-plugin</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>stage</goal>
+ <goal>unstage</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-invoker-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>default</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <goals>
+ <goal>clean</goal>
+ <goal>integration-test</goal>
+ </goals>
+ <pomIncludes>
+ <pomInclude>*/pom.xml</pomInclude>
+ </pomIncludes>
+ <pomExcludes>
+ <!-- these tests needs fixing -->
+ <pomExclude>testStartAndAutoDeploy/pom.xml</pomExclude>
+ <!-- will have to run on container with ear support -->
+ <pomExclude>testStartWithOneWarOneEarDeployed/pom.xml</pomExclude>
+ <!-- disable these for now as these tests need some javacode and to be
+ executed by the embedder plugin instead -->
+ <pomExclude>testRemoteDeploy/pom.xml</pomExclude>
+ <pomExclude>testStartInplaceDevelopment/pom.xml</pomExclude>
+ <pomExclude>testStartMultipleContainers/pom.xml</pomExclude>
+ <pomExclude>testStartUsingAlreadyInstalledContainer/pom.xml</pomExclude>
+ <pomExclude>testStartWithNoDeployableAndInBlockingMode/pom.xml</pomExclude>
+ <pomExclude>testStopEmbeddedContainerInAnotherExecution/pom.xml</pomExclude>
+ </pomExcludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
Deleted: extensions/tags/cargo-extensions-1.0-alpha-5/maven2/plugin/src/main/java/org/codehaus/cargo/maven2/AbstractCargoMojo.java
===================================================================
--- extensions/trunk/maven2/plugin/src/main/java/org/codehaus/cargo/maven2/AbstractCargoMojo.java 2008-05-01 21:15:15 UTC (rev 1574)
+++ extensions/tags/cargo-extensions-1.0-alpha-5/maven2/plugin/src/main/java/org/codehaus/cargo/maven2/AbstractCargoMojo.java 2008-07-03 21:17:10 UTC (rev 1673)
@@ -1,471 +0,0 @@
-/*
- * ========================================================================
- *
- * Copyright 2005-2006 Vincent Massol.
- *
- * 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.codehaus.cargo.maven2;
-
-import java.io.File;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.artifact.resolver.ArtifactResolver;
-import org.apache.maven.artifact.factory.ArtifactFactory;
-import org.apache.maven.artifact.repository.ArtifactRepository;
-import org.codehaus.cargo.container.configuration.ConfigurationType;
-import org.codehaus.cargo.container.ContainerType;
-import org.codehaus.cargo.maven2.log.MavenLogger;
-import org.codehaus.cargo.maven2.util.CargoProject;
-import org.codehaus.cargo.maven2.jetty.JettyArtifactResolver;
-import org.codehaus.cargo.maven2.configuration.Deployer;
-import org.codehaus.cargo.maven2.configuration.Configuration;
-import org.codehaus.cargo.maven2.configuration.Container;
-import org.codehaus.cargo.maven2.configuration.Deployable;
-import org.codehaus.cargo.util.log.FileLogger;
-import org.codehaus.cargo.util.log.Logger;
-import org.codehaus.cargo.util.FileHandler;
-import org.codehaus.cargo.util.DefaultFileHandler;
-
-/**
- * Common code used by Cargo MOJOs requiring <code><container></code> and
- * <code><configuration></code> elements and supportig the notion of Auto-deployable.
- *
- * @version $Id$
- */
-public abstract class AbstractCargoMojo extends AbstractCommonMojo
-{
- /**
- * The key under which the container instance is stored in the plugin context. We store it so
- * that it's possible to get back the same container instance even if this mojo is called in
- * a different Maven execution context. This is required for stopping embedded containers for
- * example as we need to use the same instance that was started in order to stop them.
- */
- public static final String CONTEXT_KEY_CONTAINER =
- AbstractCargoMojo.class.getName() + "-Container";
-
- /**
- * File utility class.
- */
- private FileHandler fileHandler = new DefaultFileHandler();
-
- /**
- * @parameter
- * @see #getConfigurationElement()
- */
- private Configuration configuration;
-
- /**
- * Configures a Cargo {@link org.codehaus.cargo.container.Container}.
- * See the <a href="
http://cargo.codehaus.org/Maven2+Plugin+Reference+Guide">Cargo Maven2 plugin
- * reference guide</a> for more details.
- *
- * @parameter
- */
- private Container container;
-
- /**
- * @parameter
- * @see #getDeployerElement()
- */
- private Deployer deployer;
-
- /**
- * The artifact resolver is used to dynamically resolve JARs that have to be in the embedded
- * container's classpaths. Another solution would have been to statitically define them a
- * dependencies in the plugin's POM. Resolving them in a dynamic manner is much better as only
- * the required JARs for the defined embedded container are downloaded.
- *
- * @component
- */
- private ArtifactResolver artifactResolver;
-
- /**
- * The local Maven repository. This is used by the artifact resolver to download resolved
- * JARs and put them in the local repository so that they won't have to be fetched again next
- * time the plugin is executed.
- *
- * @parameter expression="${localRepository}"
- */
- private ArtifactRepository localRepository;
-
- /**
- * The remote Maven repositories used by the artifact resolver to look for JARs.
- *
- * @parameter expression="${project.remoteArtifactRepositories}"
- */
- private List repositories;
-
- /**
- * The artifact factory is used to create valid Maven
- * {@link org.apache.maven.artifact.Artifact} objects. This is used to pass Maven artifacts to
- * the artifact resolver so that it can download the required JARs to put in the embedded
- * container's classpaths.
- *
- * @component
- */
- private ArtifactFactory artifactFactory;
-
- /**
- * @see org.codehaus.cargo.maven2.util.CargoProject
- */
- private CargoProject cargoProject;
-
- /**
- * @return the Cargo file utility class
- */
- protected FileHandler getFileHandler()
- {
- return this.fileHandler;
- }
-
- /**
- * @param fileHandler the Cargo file utility class to use. This method is useful for unit
- * testing with Mock objects as it can be passed a test file handler that doesn't perform
- * any real file action.
- */
- protected void setFileHandler(FileHandler fileHandler)
- {
- this.fileHandler = fileHandler;
- }
-
- /**
- * @return the user configuration of a Cargo
- * {@link org.codehaus.cargo.container.deployer.Deployer}. See the
- * <a href="
http://cargo.codehaus.org/Maven2+Plugin+Reference+Guide">Cargo Maven2
- * plugin reference guide</a> and
- * {@link org.codehaus.cargo.maven2.configuration.Deployer} for more details.
- */
- protected Deployer getDeployerElement()
- {
- return this.deployer;
- }
-
- /**
- * @param deployerElement the {@link org.codehaus.cargo.container.deployer.Deployer}
- * configuration defined by the user
- * @see #getDeployerElement()
- */
- protected void setDeployerElement(Deployer deployerElement)
- {
- this.deployer = deployerElement;
- }
-
- /**
- * @return the user configuration of a Cargo
- * {@link org.codehaus.cargo.container.configuration.Configuration}. See the
- * <a href="
http://cargo.codehaus.org/Maven2+Plugin+Reference+Guide">Cargo Maven2
- * plugin reference guide</a> and
- * {@link org.codehaus.cargo.maven2.configuration.Configuration} for more details.
- */
- protected Configuration getConfigurationElement()
- {
- return this.configuration;
- }
-
- /**
- * @param configurationElement the
- {@link org.codehaus.cargo.container.configuration.Configuration} configuration
- defined by the user
- * @see #getConfigurationElement()
- */
- protected void setConfigurationElement(Configuration configurationElement)
- {
- this.configuration = configurationElement;
- }
-
- /**
- * @return the user configuration of a Cargo
- * {@link org.codehaus.cargo.container.Container}. See the
- * <a href="
http://cargo.codehaus.org/Maven2+Plugin+Reference+Guide">Cargo Maven2
- * plugin reference guide</a> and
- * {@link org.codehaus.cargo.maven2.configuration.Container} for more details.
- */
- protected Container getContainerElement()
- {
- return this.container;
- }
-
- /**
- * @param containerElement the {@link org.codehaus.cargo.container.Container} configuration
- * defined by the user
- * @see #getContainerElement()
- */
- protected void setContainerElement(Container containerElement)
- {
- this.container = containerElement;
- }
-
- /**
- * @see org.codehaus.cargo.maven2.util.CargoProject
- */
- protected void setCargoProject(CargoProject cargoProject)
- {
- this.cargoProject = cargoProject;
- }
-
- /**
- * @see org.codehaus.cargo.maven2.util.CargoProject
- */
- protected CargoProject getCargoProject()
- {
- return this.cargoProject;
- }
-
- /**
- * {@inheritDoc}
- *
- * <p>Note: This method is final so that extending classes cannot extend it. Instead they should
- * implement the {@link #doExecute()} method.</p>
- *
- * @see org.apache.maven.plugin.Mojo#execute()
- */
- public final void execute() throws MojoExecutionException
- {
- if (this.cargoProject == null)
- {
- this.cargoProject = new CargoProject(getProject(), getLog());
- }
- doExecute();
- }
-
- /**
- * Executes the plugin.
- *
- * <p>This method must be implemented by all Mojos extending this class. The
- * reason for this pattern is because we want the {@link #execute()} method to always be called
- * so that necessary plugin initialization can be performed. Without this pattern Mojos
- * extending this class could "forget" to call <code>super.execute()</code> thus leading to
- * unpredictible results.</p>
- *
- * @throws MojoExecutionException in case of error
- */
- protected abstract void doExecute() throws MojoExecutionException;
-
- /**
- * Creates a {@link org.codehaus.cargo.container.configuration.Configuration} instance. If the
- * user has not specified a configuration element in the POM file then automatically create
- * a standalone configuration if the container's type is local or otherwise create a runtime
- * configuration.
- *
- * @return a valid {@link org.codehaus.cargo.container.configuration.Configuration} instance
- * @throws MojoExecutionException in case of error
- */
- protected org.codehaus.cargo.container.configuration.Configuration createConfiguration()
- throws MojoExecutionException
- {
- org.codehaus.cargo.container.configuration.Configuration configuration;
-
- // If no configuration element has been specified create one with default values.
- if (getConfigurationElement() == null)
- {
- Configuration configurationElement = new Configuration();
-
- if (getContainerElement().getType().isLocal())
- {
- configurationElement.setType(ConfigurationType.STANDALONE);
- configurationElement.setHome(new File(getCargoProject().getBuildDirectory(),
- getContainerElement().getContainerId()).getPath());
- }
- else
- {
- configurationElement.setType(ConfigurationType.RUNTIME);
- }
-
- setConfigurationElement(configurationElement);
- }
-
- configuration = getConfigurationElement().createConfiguration(
- getContainerElement().getContainerId(), getContainerElement().getType(),
- getCargoProject());
-
- return configuration;
- }
-
- /**
- * @return a {@link org.codehaus.cargo.container.Container} instance if no container object
- * was stored in the Maven Plugin Context or returns the saved instance otherwise. If
- * a new container instance is created it's also saved in the Maven Plugin Context for
- * later retrieval.
- * @throws MojoExecutionException in case of error
- */
- protected org.codehaus.cargo.container.Container createContainer()
- throws MojoExecutionException
- {
- org.codehaus.cargo.container.Container container = null;
-
- // Try to find the container in the Maven Plugin Context first.
- Map context = get
