Author: bentmann
Date: Sat Oct 11 10:12:23 2008
New Revision: 703687
URL: http://svn.apache.org/viewvc?rev=703687&view=rev
Log:
o Decoupled it0087 from production dependency
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0087/repo/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0087/repo/org/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0087/repo/org/apache/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0087/repo/org/apache/maven/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0087/repo/org/apache/maven/its/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0087/repo/org/apache/maven/its/it0087/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0087/repo/org/apache/maven/its/it0087/dep/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0087/repo/org/apache/maven/its/it0087/dep/1.3/
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0087/repo/org/apache/maven/its/it0087/dep/1.3/dep-1.3.jar
(with props)
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0087/repo/org/apache/maven/its/it0087/dep/1.3/dep-1.3.pom
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0087/repo/org/apache/maven/its/it0087/dep/maven-metadata.xml
(with props)
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087Test.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0087/pom.xml
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087Test.java
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087Test.java?rev=703687&r1=703686&r2=703687&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087Test.java
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087Test.java
Sat Oct 11 10:12:23 2008
@@ -23,13 +23,14 @@
import org.apache.maven.it.util.ResourceExtractor;
import java.io.File;
+import java.util.Properties;
public class MavenIT0087Test
extends AbstractMavenIntegrationTestCase
{
/**
- * Verify that a project-level plugin dependency class can be loaded from
both the plugin classloader
+ * Verify that a project-level plugin dependency class/resource can be
loaded from both the plugin classloader
* and the context classloader available to the plugin.
*/
public void testit0087()
@@ -37,11 +38,21 @@
{
File testDir = ResourceExtractor.simpleExtractResources( getClass(),
"/it0087" );
Verifier verifier = new Verifier( testDir.getAbsolutePath() );
- verifier.deleteArtifact( "org.apache.maven.plugins",
"maven-it-it-plugin", "1.0", "maven-plugin" );
+ verifier.setAutoclean( false );
+ verifier.deleteDirectory( "target" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
+ Properties pclProps = verifier.loadProperties( "target/pcl.properties"
);
+ assertNotNull( pclProps.getProperty(
"org.apache.maven.plugin.coreit.ClassA" ) );
+ assertNotNull( pclProps.getProperty(
"org.apache.maven.plugin.coreit.ClassB" ) );
+ assertNotNull( pclProps.getProperty(
"org.apache.maven.its.it0087.IT0087" ) );
+ assertNotNull( pclProps.getProperty(
"src/main/java/org/apache/maven/its/it0087/IT0087.java" ) );
+ assertEquals( "1", pclProps.getProperty(
"src/main/java/org/apache/maven/its/it0087/IT0087.java.count" ) );
+
+ Properties tcclProps = verifier.loadProperties(
"target/tccl.properties" );
+ assertEquals( pclProps, tcclProps );
}
-}
+}
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0087/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0087/pom.xml?rev=703687&r1=703686&r2=703687&view=diff
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0087/pom.xml
(original)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0087/pom.xml
Sat Oct 11 10:12:23 2008
@@ -1,54 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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>
<modelVersion>4.0.0</modelVersion>
- <name>Maven Integration Test :: it0087</name>
+
<groupId>org.apache.maven.its.it0087</groupId>
- <version>1.0</version>
<artifactId>maven-it-it0087</artifactId>
+ <version>1.0</version>
+
+ <name>Maven Integration Test :: it0087</name>
<description>
Verify that a project-level plugin dependency class can be loaded from
both the plugin classloader
and the context classloader available to the plugin.
</description>
-
+
<repositories>
<repository>
- <id>test-plugins</id>
- <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
- <releases><enabled>false</enabled></releases>
- <snapshots><enabled>true</enabled></snapshots>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ <releases>
+ <checksumPolicy>ignore</checksumPolicy>
+ </releases>
+ <snapshots>
+ <checksumPolicy>ignore</checksumPolicy>
+ </snapshots>
</repository>
</repositories>
- <pluginRepositories>
- <pluginRepository>
- <id>test-plugins</id>
- <url>http://people.apache.org/repo/m2-snapshot-repository/</url>
- <releases><enabled>false</enabled></releases>
- <snapshots><enabled>true</enabled></snapshots>
- </pluginRepository>
- </pluginRepositories>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.its.plugins</groupId>
- <artifactId>maven-it-plugin-loadable</artifactId>
+ <artifactId>maven-it-plugin-class-loader</artifactId>
<version>2.1-SNAPSHOT</version>
<dependencies>
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.0.3</version>
+ <groupId>org.apache.maven.its.it0087</groupId>
+ <artifactId>dep</artifactId>
+ <version>1.3</version>
</dependency>
</dependencies>
<executions>
<execution>
+ <id>load</id>
<phase>validate</phase>
<configuration>
- <className>
- org.apache.commons.logging.LogFactory
- </className>
+
<classNames>org.apache.maven.its.it0087.IT0087,org.apache.maven.plugin.coreit.ClassA,org.apache.maven.plugin.coreit.ClassB</classNames>
+
<resourcePaths>src/main/java/org/apache/maven/its/it0087/IT0087.java</resourcePaths>
+
<pluginClassLoaderOutput>target/pcl.properties</pluginClassLoaderOutput>
+
<contextClassLoaderOutput>target/tccl.properties</contextClassLoaderOutput>
</configuration>
<goals>
- <goal>loadable</goal>
+ <goal>load</goal>
</goals>
</execution>
</executions>
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0087/repo/org/apache/maven/its/it0087/dep/1.3/dep-1.3.jar
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0087/repo/org/apache/maven/its/it0087/dep/1.3/dep-1.3.jar?rev=703687&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0087/repo/org/apache/maven/its/it0087/dep/1.3/dep-1.3.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0087/repo/org/apache/maven/its/it0087/dep/1.3/dep-1.3.pom
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0087/repo/org/apache/maven/its/it0087/dep/1.3/dep-1.3.pom?rev=703687&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0087/repo/org/apache/maven/its/it0087/dep/1.3/dep-1.3.pom
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0087/repo/org/apache/maven/its/it0087/dep/1.3/dep-1.3.pom
Sat Oct 11 10:12:23 2008
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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>
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.apache.maven.its.it0087</groupId>
+ <artifactId>dep</artifactId>
+ <version>1.3</version>
+ <packaging>jar</packaging>
+
+ <distributionManagement>
+ <repository>
+ <id>maven-core-it</id>
+ <url>file:///${basedir}/repo</url>
+ </repository>
+ </distributionManagement>
+
+ <properties>
+ <maven.test.skip>true</maven.test.skip>
+ </properties>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src</directory>
+ <targetPath>src</targetPath>
+ </resource>
+ </resources>
+ </build>
+</project>
Added:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0087/repo/org/apache/maven/its/it0087/dep/maven-metadata.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0087/repo/org/apache/maven/its/it0087/dep/maven-metadata.xml?rev=703687&view=auto
==============================================================================
---
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0087/repo/org/apache/maven/its/it0087/dep/maven-metadata.xml
(added)
+++
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0087/repo/org/apache/maven/its/it0087/dep/maven-metadata.xml
Sat Oct 11 10:12:23 2008
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata>
+ <groupId>org.apache.maven.its.it0087</groupId>
+ <artifactId>dep</artifactId>
+ <version>1.3</version>
+ <versioning>
+ <versions>
+ <version>1.3</version>
+ </versions>
+ <lastUpdated>20081011140503</lastUpdated>
+ </versioning>
+</metadata>
\ No newline at end of file
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0087/repo/org/apache/maven/its/it0087/dep/maven-metadata.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/it0087/repo/org/apache/maven/its/it0087/dep/maven-metadata.xml
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
