You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ah...@apache.org on 2007/11/02 03:17:02 UTC
svn commit: r591192 [4/4] - in /maven/plugins/branches/MECLIPSE-333/src:
main/java/org/apache/maven/plugin/eclipse/
main/java/org/apache/maven/plugin/eclipse/writers/
main/java/org/apache/maven/plugin/eclipse/writers/rad/
main/java/org/apache/maven/plu...
Modified: maven/plugins/branches/MECLIPSE-333/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-333/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java?rev=591192&r1=591191&r2=591192&view=diff
==============================================================================
--- maven/plugins/branches/MECLIPSE-333/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java (original)
+++ maven/plugins/branches/MECLIPSE-333/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java Thu Nov 1 19:16:57 2007
@@ -46,18 +46,13 @@
testProject( "project-rad-1", new Properties(), "rad-clean", "rad" );
}
-/* TODO: fix failing test
- public void testProject2()
- throws Exception
- {
- testProject( "project-rad-2", new Properties(), "rad-clean", "rad" );
- File generatedManifest = getTestFile( PROJECTS_BASEDIR + "/project-rad-2/src/main/webapp/META-INF/MANIFEST.MF" );
- File expectedManifest =
- getTestFile( PROJECTS_BASEDIR + "/project-rad-2/src/main/webapp/META-INF/expected_MANIFEST.MF" );
- assertFileEquals( localRepositoryDirectory.getCanonicalPath(), expectedManifest, generatedManifest );
-
- }
-*/
+ /*
+ * TODO: fix failing test public void testProject2() throws Exception { testProject( "project-rad-2", new
+ * Properties(), "rad-clean", "rad" ); File generatedManifest = getTestFile( PROJECTS_BASEDIR +
+ * "/project-rad-2/src/main/webapp/META-INF/MANIFEST.MF" ); File expectedManifest = getTestFile( PROJECTS_BASEDIR +
+ * "/project-rad-2/src/main/webapp/META-INF/expected_MANIFEST.MF" ); assertFileEquals(
+ * localRepositoryDirectory.getCanonicalPath(), expectedManifest, generatedManifest ); }
+ */
public void testProject3()
throws Exception
@@ -87,7 +82,8 @@
MavenProject project = readProject( pom0 );
- String outputDirPath = IdeUtils.getPluginSetting( project, "maven-eclipse-plugin", "outputDir", null );
+ String outputDirPath =
+ IdeUtils.getPluginSetting( project, "org.apache.maven.plugins:maven-eclipse-plugin", "outputDir", null );
File outputDir;
if ( outputDirPath == null )
@@ -131,10 +127,18 @@
new File( basedir, "project-rad-1/maven-core-98.0.jar" ).exists() );
Xpp3Dom applicationXml =
- Xpp3DomBuilder.build( new InputStreamReader( new FileInputStream( new File( basedir, "project-rad-1/META-INF/application.xml" ) ), "UTF-8" ) );
+ Xpp3DomBuilder.build( new InputStreamReader(
+ new FileInputStream(
+ new File( basedir,
+ "project-rad-1/META-INF/application.xml" ) ),
+ "UTF-8" ) );
Xpp3Dom modulesmapsXml =
- Xpp3DomBuilder.build( new InputStreamReader( new FileInputStream( new File( basedir, "project-rad-1/META-INF/.modulemaps" ) ), "UTF-8" ) );
+ Xpp3DomBuilder.build( new InputStreamReader(
+ new FileInputStream(
+ new File( basedir,
+ "project-rad-1/META-INF/.modulemaps" ) ),
+ "UTF-8" ) );
assertNotNull( modulesmapsXml );
@@ -148,10 +152,13 @@
assertEquals( "project-rad-5_2.war", webappModule.getChild( "web" ).getChild( "web-uri" ).getValue() );
assertEquals( "project-rad-5_2", webappModule.getChild( "web" ).getChild( "context-root" ).getValue() );
- assertEquals( "project-rad-5_3.jar", ejbModule.getChild( "ejb" ).getValue() );
+ assertEquals( "project-rad-5_3.jar", ejbModule.getChild( Constants.PROJECT_PACKAGING_EJB ).getValue() );
Xpp3Dom websettings =
- Xpp3DomBuilder.build( new InputStreamReader( new FileInputStream( new File( basedir, "project-rad-2/.websettings" ) ), "UTF-8" ) );
+ Xpp3DomBuilder.build( new InputStreamReader(
+ new FileInputStream( new File( basedir,
+ "project-rad-2/.websettings" ) ),
+ "UTF-8" ) );
assertEquals( "project-rad-5_4.jar",
websettings.getChild( "lib-modules" ).getChild( "lib-module" ).getChild( "jar" ).getValue() );
@@ -170,7 +177,8 @@
MavenProject project = readProject( pom0 );
- String outputDirPath = IdeUtils.getPluginSetting( project, "maven-eclipse-plugin", "outputDir", null );
+ String outputDirPath =
+ IdeUtils.getPluginSetting( project, "org.apache.maven.plugins:maven-eclipse-plugin", "outputDir", null );
File outputDir;
if ( outputDirPath == null )
@@ -218,7 +226,8 @@
File application = new File( basedir, "project-rad-1/META-INF/application.xml" );
- Xpp3Dom applicationXml = Xpp3DomBuilder.build( new InputStreamReader( new FileInputStream( application ), "UTF-8" ) );
+ Xpp3Dom applicationXml =
+ Xpp3DomBuilder.build( new InputStreamReader( new FileInputStream( application ), "UTF-8" ) );
Xpp3Dom[] children = applicationXml.getChildren( "module" );
@@ -238,7 +247,7 @@
}
else if ( child.getAttribute( "id" ).startsWith( "EjbModule_" ) )
{
- assertEquals( "project-rad-5_3.jar", child.getChild( "ejb" ).getValue() );
+ assertEquals( "project-rad-5_3.jar", child.getChild( Constants.PROJECT_PACKAGING_EJB ).getValue() );
ejbVerified = true;
}
}
Added: maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/eclipsetest/multymodule-war/1.0/multymodule-war-1.0.pom
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/eclipsetest/multymodule-war/1.0/multymodule-war-1.0.pom?rev=591192&view=auto
==============================================================================
--- maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/eclipsetest/multymodule-war/1.0/multymodule-war-1.0.pom (added)
+++ maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/eclipsetest/multymodule-war/1.0/multymodule-war-1.0.pom Thu Nov 1 19:16:57 2007
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>eclipsetest</groupId>
+ <artifactId>master-test</artifactId>
+ <version>1.0</version>
+ </parent>
+ <packaging>war</packaging>
+ <groupId>eclipsetest</groupId>
+ <artifactId>multymodule-war</artifactId>
+ <version>1.0</version>
+ <name>multymodule-war</name>
+ <dependencies>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>direct-compile</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+</project>
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/eclipsetest/multymodule-war/1.0/multymodule-war-1.0.pom
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/eclipsetest/multymodule-war/1.0/multymodule-war-1.0.pom
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/eclipsetest/multymodule-war/1.0/multymodule-war-1.0.war
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/eclipsetest/multymodule-war/1.0/multymodule-war-1.0.war?rev=591192&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/eclipsetest/multymodule-war/1.0/multymodule-war-1.0.war
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/1.0/project-1.0.pom
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/1.0/project-1.0.pom?rev=591192&view=auto
==============================================================================
--- maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/1.0/project-1.0.pom (added)
+++ maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/1.0/project-1.0.pom Thu Nov 1 19:16:57 2007
@@ -0,0 +1,76 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>root</groupId>
+ <version>1.0</version>
+ <artifactId>project</artifactId>
+ <packaging>pom</packaging>
+ <name>project</name>
+ <modules>
+ <module>projects</module>
+ <module>primary-source</module>
+ <module>servlets</module>
+ <module>ejbs</module>
+ <module>ear</module>
+ </modules>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <unzipCommand>/usr/bin/unzip -o > err.txt</unzipCommand>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <configuration>
+ <projectNameTemplate>[artifactId]-[version]</projectNameTemplate>
+ <wtpmanifest>true</wtpmanifest>
+ <wtpapplicationxml>true</wtpapplicationxml>
+ <wtpversion>2.0</wtpversion>
+ <manifest>${basedir}/src/main/resources/META-INF/MANIFEST.MF</manifest>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>root.project.projects</groupId>
+ <artifactId>logging</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>root.project</groupId>
+ <artifactId>primary-source</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>root.project.servlets</groupId>
+ <artifactId>servlet</artifactId>
+ <version>1.0</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>root.project</groupId>
+ <artifactId>ejbs</artifactId>
+ <version>1.0</version>
+ <type>ejb</type>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <distributionManagement>
+ <site>
+ <id>site</id>
+ <name>project website</name>
+ <url>scp://local.company.com/websites/project.company.com/</url>
+ </site>
+ </distributionManagement>
+</project>
+
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/1.0/project-1.0.pom
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/1.0/project-1.0.pom
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/ejbs/1.0/ejbs-1.0.jar
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/ejbs/1.0/ejbs-1.0.jar?rev=591192&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/ejbs/1.0/ejbs-1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/ejbs/1.0/ejbs-1.0.pom
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/ejbs/1.0/ejbs-1.0.pom?rev=591192&view=auto
==============================================================================
--- maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/ejbs/1.0/ejbs-1.0.pom (added)
+++ maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/ejbs/1.0/ejbs-1.0.pom Thu Nov 1 19:16:57 2007
@@ -0,0 +1,43 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>root.project</groupId>
+ <artifactId>ejbs</artifactId>
+ <packaging>ejb</packaging>
+ <version>1.0</version>
+ <name>enterprise java beans</name>
+ <parent>
+ <groupId>root</groupId>
+ <artifactId>project</artifactId>
+ <version>1.0</version>
+ </parent>
+ <dependencies>
+ <dependency>
+ <groupId>root.project</groupId>
+ <artifactId>primary-source</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>root.project.projects</groupId>
+ <artifactId>logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>direct-provided</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-ejb-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/ejbs/1.0/ejbs-1.0.pom
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/ejbs/1.0/ejbs-1.0.pom
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/primary-source/1.0/primary-source-1.0.jar
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/primary-source/1.0/primary-source-1.0.jar?rev=591192&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/primary-source/1.0/primary-source-1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/primary-source/1.0/primary-source-1.0.pom
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/primary-source/1.0/primary-source-1.0.pom?rev=591192&view=auto
==============================================================================
--- maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/primary-source/1.0/primary-source-1.0.pom (added)
+++ maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/primary-source/1.0/primary-source-1.0.pom Thu Nov 1 19:16:57 2007
@@ -0,0 +1,42 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>root.project</groupId>
+ <artifactId>primary-source</artifactId>
+ <packaging>jar</packaging>
+ <name>core project classes</name>
+ <parent>
+ <groupId>root</groupId>
+ <artifactId>project</artifactId>
+ <version>1.0</version>
+ </parent>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <encoding>iso-8859-1</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <minmemory>128m</minmemory>
+ <maxmemory>512m</maxmemory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>direct-provided</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>root.project.projects</groupId>
+ <artifactId>logging</artifactId>
+ </dependency>
+ </dependencies>
+</project>
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/primary-source/1.0/primary-source-1.0.pom
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/primary-source/1.0/primary-source-1.0.pom
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/projects/1.0/projects-1.0.pom
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/projects/1.0/projects-1.0.pom?rev=591192&view=auto
==============================================================================
--- maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/projects/1.0/projects-1.0.pom (added)
+++ maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/projects/1.0/projects-1.0.pom Thu Nov 1 19:16:57 2007
@@ -0,0 +1,16 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>root.project</groupId>
+ <version>1.0</version>
+ <artifactId>projects</artifactId>
+ <packaging>pom</packaging>
+ <name>sub projects</name>
+ <parent>
+ <groupId>root</groupId>
+ <artifactId>project</artifactId>
+ <version>1.0</version>
+ </parent>
+ <modules>
+ <module>logging</module>
+ </modules>
+</project>
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/projects/1.0/projects-1.0.pom
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/projects/1.0/projects-1.0.pom
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/projects/logging/1.0/logging-1.0.jar
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/projects/logging/1.0/logging-1.0.jar?rev=591192&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/projects/logging/1.0/logging-1.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/projects/logging/1.0/logging-1.0.pom
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/projects/logging/1.0/logging-1.0.pom?rev=591192&view=auto
==============================================================================
--- maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/projects/logging/1.0/logging-1.0.pom (added)
+++ maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/projects/logging/1.0/logging-1.0.pom Thu Nov 1 19:16:57 2007
@@ -0,0 +1,12 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>root.project.projects</groupId>
+ <artifactId>logging</artifactId>
+ <packaging>jar</packaging>
+ <name>logging</name>
+ <parent>
+ <groupId>root.project</groupId>
+ <artifactId>projects</artifactId>
+ <version>1.0</version>
+ </parent>
+</project>
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/projects/logging/1.0/logging-1.0.pom
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/projects/logging/1.0/logging-1.0.pom
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/servlets/1.0/servlets-1.0.pom
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/servlets/1.0/servlets-1.0.pom?rev=591192&view=auto
==============================================================================
--- maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/servlets/1.0/servlets-1.0.pom (added)
+++ maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/servlets/1.0/servlets-1.0.pom Thu Nov 1 19:16:57 2007
@@ -0,0 +1,17 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>root.project</groupId>
+ <artifactId>servlets</artifactId>
+ <packaging>pom</packaging>
+ <name>servlets</name>
+ <version>1.0</version>
+ <parent>
+ <groupId>root</groupId>
+ <artifactId>project</artifactId>
+ <version>1.0</version>
+ </parent>
+ <modules>
+ <module>servlet</module>
+ </modules>
+</project>
+
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/servlets/1.0/servlets-1.0.pom
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/servlets/1.0/servlets-1.0.pom
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/servlets/servlet/1.0/servlet-1.0.pom
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/servlets/servlet/1.0/servlet-1.0.pom?rev=591192&view=auto
==============================================================================
--- maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/servlets/servlet/1.0/servlet-1.0.pom (added)
+++ maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/servlets/servlet/1.0/servlet-1.0.pom Thu Nov 1 19:16:57 2007
@@ -0,0 +1,19 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>root.project.servlets</groupId>
+ <artifactId>servlet</artifactId>
+ <packaging>war</packaging>
+ <name>servlet</name>
+ <parent>
+ <groupId>root.project</groupId>
+ <artifactId>servlets</artifactId>
+ <version>1.0</version>
+ </parent>
+ <dependencies>
+ <dependency>
+ <groupId>root.project</groupId>
+ <artifactId>primary-source</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/servlets/servlet/1.0/servlet-1.0.pom
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/servlets/servlet/1.0/servlet-1.0.pom
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/servlets/servlet/1.0/servlet-1.0.war
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/servlets/servlet/1.0/servlet-1.0.war?rev=591192&view=auto
==============================================================================
Binary file - no diff available.
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/m2repo/root/project/servlets/servlet/1.0/servlet-1.0.war
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/.project
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/.project?rev=591192&view=auto
==============================================================================
--- maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/.project (added)
+++ maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/.project Thu Nov 1 19:16:57 2007
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>j2ee-simple</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ </buildSpec>
+ <natures>
+ </natures>
+</projectDescription>
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/.project
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/.project
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/ear/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/ear/pom.xml?rev=591192&view=auto
==============================================================================
--- maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/ear/pom.xml (added)
+++ maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/ear/pom.xml Thu Nov 1 19:16:57 2007
@@ -0,0 +1,47 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>root.project</groupId>
+ <artifactId>ear</artifactId>
+ <packaging>ear</packaging>
+ <version>1.0</version>
+ <name>ear assembly</name>
+ <parent>
+ <groupId>root</groupId>
+ <artifactId>project</artifactId>
+ <version>1.0</version>
+ </parent>
+ <dependencies>
+ <dependency>
+ <groupId>root.project</groupId>
+ <artifactId>ejbs</artifactId>
+ <type>ejb</type>
+ </dependency>
+ <dependency>
+ <groupId>root.project.servlets</groupId>
+ <artifactId>servlet</artifactId>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>root.project</groupId>
+ <artifactId>primary-source</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>root.project.projects</groupId>
+ <artifactId>logging</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-ear-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/ear/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/ear/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/ejbs/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/ejbs/pom.xml?rev=591192&view=auto
==============================================================================
--- maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/ejbs/pom.xml (added)
+++ maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/ejbs/pom.xml Thu Nov 1 19:16:57 2007
@@ -0,0 +1,43 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>root.project</groupId>
+ <artifactId>ejbs</artifactId>
+ <packaging>ejb</packaging>
+ <version>1.0</version>
+ <name>enterprise java beans</name>
+ <parent>
+ <groupId>root</groupId>
+ <artifactId>project</artifactId>
+ <version>1.0</version>
+ </parent>
+ <dependencies>
+ <dependency>
+ <groupId>root.project</groupId>
+ <artifactId>primary-source</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>root.project.projects</groupId>
+ <artifactId>logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>direct-provided</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-ejb-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/ejbs/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/ejbs/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/ejbs/src/main/resources/META-INF/ejb-jar.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/ejbs/src/main/resources/META-INF/ejb-jar.xml?rev=591192&view=auto
==============================================================================
--- maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/ejbs/src/main/resources/META-INF/ejb-jar.xml (added)
+++ maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/ejbs/src/main/resources/META-INF/ejb-jar.xml Thu Nov 1 19:16:57 2007
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ejb-jar id="ejb-jar_ID" version="2.1"
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
+ <display-name>ejbs-1.0</display-name>
+ <enterprise-beans>
+ <session>
+ <ejb-name>Hello</ejb-name>
+ <home>hello.HelloHome</home>
+ <remote>hello.Hello</remote>
+ <ejb-class>hello.HelloBean</ejb-class>
+ <session-type>Stateless</session-type>
+ <transaction-type>Container</transaction-type>
+ </session>
+ </enterprise-beans>
+</ejb-jar>
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/ejbs/src/main/resources/META-INF/ejb-jar.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/ejbs/src/main/resources/META-INF/ejb-jar.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/pom.xml?rev=591192&view=auto
==============================================================================
--- maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/pom.xml (added)
+++ maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/pom.xml Thu Nov 1 19:16:57 2007
@@ -0,0 +1,77 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>root</groupId>
+ <version>1.0</version>
+ <artifactId>project</artifactId>
+ <packaging>pom</packaging>
+ <name>project</name>
+ <modules>
+ <module>projects</module>
+ <module>primary-source</module>
+ <module>servlets</module>
+ <module>ejbs</module>
+ <module>ear</module>
+ </modules>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <unzipCommand>/usr/bin/unzip -o > err.txt</unzipCommand>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>test</version>
+ <configuration>
+ <projectNameTemplate>[artifactId]-[version]</projectNameTemplate>
+ <wtpmanifest>true</wtpmanifest>
+ <wtpapplicationxml>true</wtpapplicationxml>
+ <wtpversion>2.0</wtpversion>
+ <manifest>${basedir}/src/main/resources/META-INF/MANIFEST.MF</manifest>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>root.project.projects</groupId>
+ <artifactId>logging</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>root.project</groupId>
+ <artifactId>primary-source</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>root.project.servlets</groupId>
+ <artifactId>servlet</artifactId>
+ <version>1.0</version>
+ <type>war</type>
+ </dependency>
+ <dependency>
+ <groupId>root.project</groupId>
+ <artifactId>ejbs</artifactId>
+ <version>1.0</version>
+ <type>ejb</type>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <distributionManagement>
+ <site>
+ <id>site</id>
+ <name>project website</name>
+ <url>scp://local.company.com/websites/project.company.com/</url>
+ </site>
+ </distributionManagement>
+</project>
+
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/primary-source/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/primary-source/pom.xml?rev=591192&view=auto
==============================================================================
--- maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/primary-source/pom.xml (added)
+++ maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/primary-source/pom.xml Thu Nov 1 19:16:57 2007
@@ -0,0 +1,42 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>root.project</groupId>
+ <artifactId>primary-source</artifactId>
+ <packaging>jar</packaging>
+ <name>core project classes</name>
+ <parent>
+ <groupId>root</groupId>
+ <artifactId>project</artifactId>
+ <version>1.0</version>
+ </parent>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <encoding>iso-8859-1</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <minmemory>128m</minmemory>
+ <maxmemory>512m</maxmemory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>direct-provided</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>root.project.projects</groupId>
+ <artifactId>logging</artifactId>
+ </dependency>
+ </dependencies>
+</project>
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/primary-source/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/primary-source/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/projects/logging/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/projects/logging/pom.xml?rev=591192&view=auto
==============================================================================
--- maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/projects/logging/pom.xml (added)
+++ maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/projects/logging/pom.xml Thu Nov 1 19:16:57 2007
@@ -0,0 +1,12 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>root.project.projects</groupId>
+ <artifactId>logging</artifactId>
+ <packaging>jar</packaging>
+ <name>logging</name>
+ <parent>
+ <groupId>root.project</groupId>
+ <artifactId>projects</artifactId>
+ <version>1.0</version>
+ </parent>
+</project>
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/projects/logging/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/projects/logging/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/projects/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/projects/pom.xml?rev=591192&view=auto
==============================================================================
--- maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/projects/pom.xml (added)
+++ maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/projects/pom.xml Thu Nov 1 19:16:57 2007
@@ -0,0 +1,16 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>root.project</groupId>
+ <version>1.0</version>
+ <artifactId>projects</artifactId>
+ <packaging>pom</packaging>
+ <name>sub projects</name>
+ <parent>
+ <groupId>root</groupId>
+ <artifactId>project</artifactId>
+ <version>1.0</version>
+ </parent>
+ <modules>
+ <module>logging</module>
+ </modules>
+</project>
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/projects/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/projects/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/servlets/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/servlets/pom.xml?rev=591192&view=auto
==============================================================================
--- maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/servlets/pom.xml (added)
+++ maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/servlets/pom.xml Thu Nov 1 19:16:57 2007
@@ -0,0 +1,17 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>root.project</groupId>
+ <artifactId>servlets</artifactId>
+ <packaging>pom</packaging>
+ <name>servlets</name>
+ <version>1.0</version>
+ <parent>
+ <groupId>root</groupId>
+ <artifactId>project</artifactId>
+ <version>1.0</version>
+ </parent>
+ <modules>
+ <module>servlet</module>
+ </modules>
+</project>
+
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/servlets/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/servlets/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/servlets/servlet/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/servlets/servlet/pom.xml?rev=591192&view=auto
==============================================================================
--- maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/servlets/servlet/pom.xml (added)
+++ maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/servlets/servlet/pom.xml Thu Nov 1 19:16:57 2007
@@ -0,0 +1,19 @@
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>root.project.servlets</groupId>
+ <artifactId>servlet</artifactId>
+ <packaging>war</packaging>
+ <name>servlet</name>
+ <parent>
+ <groupId>root.project</groupId>
+ <artifactId>servlets</artifactId>
+ <version>1.0</version>
+ </parent>
+ <dependencies>
+ <dependency>
+ <groupId>root.project</groupId>
+ <artifactId>primary-source</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+</project>
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/servlets/servlet/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/servlets/servlet/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/servlets/servlet/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/servlets/servlet/src/main/webapp/WEB-INF/web.xml?rev=591192&view=auto
==============================================================================
--- maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/servlets/servlet/src/main/webapp/WEB-INF/web.xml (added)
+++ maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/servlets/servlet/src/main/webapp/WEB-INF/web.xml Thu Nov 1 19:16:57 2007
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app id="WebApp_ID" version="2.4"
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+ <display-name>servlet-1.0</display-name>
+ <servlet>
+ <servlet-name>halloWorld</servlet-name>
+ <servlet-class>TestServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>halloWorld</servlet-name>
+ <url-pattern>/hello</url-pattern>
+ </servlet-mapping>
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.htm</welcome-file>
+ <welcome-file>index.jsp</welcome-file>
+ <welcome-file>default.html</welcome-file>
+ <welcome-file>default.htm</welcome-file>
+ <welcome-file>default.jsp</welcome-file>
+ </welcome-file-list>
+</web-app>
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/servlets/servlet/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/servlets/servlet/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/servlets/servlet/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/servlets/servlet/src/main/webapp/index.jsp?rev=591192&view=auto
==============================================================================
--- maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/servlets/servlet/src/main/webapp/index.jsp (added)
+++ maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/servlets/servlet/src/main/webapp/index.jsp Thu Nov 1 19:16:57 2007
@@ -0,0 +1,5 @@
+<html>
+<body>
+<h2>Hello World!</h2>
+</body>
+</html>
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/servlets/servlet/src/main/webapp/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/j2ee-simple/servlets/servlet/src/main/webapp/index.jsp
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Modified: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/project-34/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/project-34/pom.xml?rev=591192&r1=591191&r2=591192&view=diff
==============================================================================
--- maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/project-34/pom.xml (original)
+++ maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/project-34/pom.xml Thu Nov 1 19:16:57 2007
@@ -16,9 +16,9 @@
<configuration>
<workspace>${basedir}</workspace>
<projectNameTemplate>[artifactId]-[version]</projectNameTemplate>
- <wtpContextName>${artifactId}-${version}</wtpContextName>
<wtpmanifest>true</wtpmanifest>
<wtpapplicationxml>true</wtpapplicationxml>
+ <wtpversion>2.0</wtpversion>
</configuration>
</plugin>
</plugins>
Added: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/project-35/multymodule-ear/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/project-35/multymodule-ear/pom.xml?rev=591192&view=auto
==============================================================================
--- maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/project-35/multymodule-ear/pom.xml (added)
+++ maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/project-35/multymodule-ear/pom.xml Thu Nov 1 19:16:57 2007
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>eclipsetest</groupId>
+ <artifactId>master-test</artifactId>
+ <version>1.0</version>
+ </parent>
+ <packaging>ear</packaging>
+ <groupId>eclipsetest</groupId>
+ <artifactId>multymodule-ear</artifactId>
+ <version>1.0</version>
+ <name>multymodule-ear</name>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-ear-plugin</artifactId>
+ <configuration>
+ <defaultLibBundleDir>lib</defaultLibBundleDir>
+ <modules>
+ <webModule>
+ <groupId>${groupId}</groupId>
+ <artifactId>multymodule-war</artifactId>
+ <contextRoot>/somethingVeryDifferent</contextRoot>
+ </webModule>
+ </modules>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>${groupId}</groupId>
+ <artifactId>multymodule-war</artifactId>
+ <version>1.0</version>
+ <type>war</type>
+ </dependency>
+ </dependencies>
+</project>
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/project-35/multymodule-ear/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/project-35/multymodule-ear/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/project-35/multymodule-war/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/project-35/multymodule-war/pom.xml?rev=591192&view=auto
==============================================================================
--- maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/project-35/multymodule-war/pom.xml (added)
+++ maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/project-35/multymodule-war/pom.xml Thu Nov 1 19:16:57 2007
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>eclipsetest</groupId>
+ <artifactId>master-test</artifactId>
+ <version>1.0</version>
+ </parent>
+ <packaging>war</packaging>
+ <groupId>eclipsetest</groupId>
+ <artifactId>multymodule-war</artifactId>
+ <version>1.0</version>
+ <name>multymodule-war</name>
+ <dependencies>
+ <dependency>
+ <groupId>eclipsetest</groupId>
+ <artifactId>direct-compile</artifactId>
+ <version>1.0</version>
+ </dependency>
+ </dependencies>
+</project>
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/project-35/multymodule-war/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/project-35/multymodule-war/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/project-35/multymodule-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/project-35/multymodule-war/src/main/webapp/WEB-INF/web.xml?rev=591192&view=auto
==============================================================================
--- maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/project-35/multymodule-war/src/main/webapp/WEB-INF/web.xml (added)
+++ maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/project-35/multymodule-war/src/main/webapp/WEB-INF/web.xml Thu Nov 1 19:16:57 2007
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app id="WebApp_ID" version="2.4"
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
+ <display-name>multymodule-war</display-name>
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ </welcome-file-list>
+</web-app>
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/project-35/multymodule-war/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/project-35/multymodule-war/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/project-35/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/project-35/pom.xml?rev=591192&view=auto
==============================================================================
--- maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/project-35/pom.xml (added)
+++ maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/project-35/pom.xml Thu Nov 1 19:16:57 2007
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+ <packaging>pom</packaging>
+ <groupId>eclipsetest</groupId>
+ <artifactId>master-test</artifactId>
+ <version>1.0</version>
+ <name>master</name>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>test</version>
+ <configuration>
+ <workspace>${basedir}</workspace>
+ <projectNameTemplate>[artifactId]-[version]</projectNameTemplate>
+ <wtpmanifest>true</wtpmanifest>
+ <wtpapplicationxml>true</wtpapplicationxml>
+ <wtpversion>2.0</wtpversion>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <modules>
+ <module>multymodule-ear</module>
+ <module>multymodule-war</module>
+ </modules>
+</project>
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/project-35/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/branches/MECLIPSE-333/src/test/resources/projects/project-35/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"