Author: fbricon Date: 2012-10-02 13:13:46 -0400 (Tue, 02 Oct 2012) New Revision: 44224 Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/.classpath trunk/maven/tests/org.jboss.tools.maven.conversion.test/.project trunk/maven/tests/org.jboss.tools.maven.conversion.test/.settings/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/.settings/org.eclipse.jdt.core.prefs trunk/maven/tests/org.jboss.tools.maven.conversion.test/.settings/org.eclipse.m2e.core.prefs trunk/maven/tests/org.jboss.tools.maven.conversion.test/META-INF/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/META-INF/MANIFEST.MF trunk/maven/tests/org.jboss.tools.maven.conversion.test/build.properties trunk/maven/tests/org.jboss.tools.maven.conversion.test/plugin_customization.ini trunk/maven/tests/org.jboss.tools.maven.conversion.test/pom.xml trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/.project trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/.settings/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/.settings/org.eclipse.m2e.core.prefs trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/.settings/org.eclipse.wst.common.component trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/EarContent/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/EarContent/ant-1.8.4.jar trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/EarContent/lib/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/EarContent/lib/commons-cli-1.2.jar trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/otherlib/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/otherlib/commons-logging-1.1.1.jar trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/.classpath trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/.project trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/.settings/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/.settings/org.eclipse.jdt.core.prefs trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/.settings/org.eclipse.m2e.core.prefs trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/pom.xml trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/src/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/src/main/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/src/main/java/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/src/main/resources/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/src/test/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/src/test/java/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/src/test/resources/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/target/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/target/classes/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/target/classes/META-INF/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/target/classes/META-INF/MANIFEST.MF trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/target/classes/META-INF/maven/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/target/classes/META-INF/maven/util/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/target/classes/META-INF/maven/util/util/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/target/classes/META-INF/maven/util/util/pom.properties trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/target/classes/META-INF/maven/util/util/pom.xml trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/target/test-classes/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.classpath trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.project trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/.jsdtscope trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/org.eclipse.jdt.core.prefs trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/org.eclipse.wst.common.component trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/org.eclipse.wst.jsdt.ui.superType.container trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/org.eclipse.wst.jsdt.ui.superType.name trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/WebContent/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/WebContent/META-INF/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/WebContent/META-INF/MANIFEST.MF trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/WebContent/WEB-INF/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/WebContent/WEB-INF/lib/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/WebContent/WEB-INF/lib/ant-1.8.4.jar trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/WebContent/WEB-INF/lib/ant-antlr-1.8.4.jar trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/WebContent/WEB-INF/lib/ant-junit-1.8.4.jar trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/build/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/build/classes/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/src/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.classpath trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.project trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/.jsdtscope trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.jdt.core.prefs trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.m2e.core.prefs trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.wst.common.component trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.wst.common.project.facet.core.xml trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.wst.jsdt.ui.superType.container trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.wst.jsdt.ui.superType.name trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/WebContent/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/WebContent/META-INF/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/WebContent/META-INF/MANIFEST.MF trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/WebContent/WEB-INF/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/WebContent/WEB-INF/lib/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/pom.xml trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/src/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/classes/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/m2e-wtp/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/m2e-wtp/web-resources/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/m2e-wtp/web-resources/META-INF/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/m2e-wtp/web-resources/META-INF/maven/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/m2e-wtp/web-resources/META-INF/maven/web/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/m2e-wtp/web-resources/META-INF/maven/web/web/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/m2e-wtp/web-resources/META-INF/maven/web/web/pom.properties trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/m2e-wtp/web-resources/META-INF/maven/web/web/pom.xml trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/test-classes/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/src/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/src/org/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/src/org/jboss/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/src/org/jboss/tools/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/src/org/jboss/tools/maven/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/src/org/jboss/tools/maven/conversion/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/src/org/jboss/tools/maven/conversion/tests/ trunk/maven/tests/org.jboss.tools.maven.conversion.test/src/org/jboss/tools/maven/conversion/tests/AbstractMavenConversionTest.java trunk/maven/tests/org.jboss.tools.maven.conversion.test/src/org/jboss/tools/maven/conversion/tests/ProjectDependencyCollectorTest.java Modified: trunk/maven/tests/pom.xml Log: JBIDE-12527 : test convert War/EAR references Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/.classpath =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/.classpath (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/.classpath 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> + <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> + <classpathentry kind="src" path="src/"/> + <classpathentry kind="output" path="target/classes"/> +</classpath> Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/.project =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/.project (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/.project 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>org.jboss.tools.maven.conversion.test</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.ManifestBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.pde.SchemaBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> + <nature>org.eclipse.pde.PluginNature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/.settings/org.eclipse.jdt.core.prefs 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/.settings/org.eclipse.m2e.core.prefs =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/.settings/org.eclipse.m2e.core.prefs (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/.settings/org.eclipse.m2e.core.prefs 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,5 @@ +#Mon Nov 28 08:59:23 CET 2011 +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/META-INF/MANIFEST.MF (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/META-INF/MANIFEST.MF 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,19 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: JBoss Maven Conversion Tests +Bundle-SymbolicName: org.jboss.tools.maven.conversion.test;singleton:=true +Bundle-Version: 1.4.0.qualifier +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.eclipse.core.resources, + org.junit;bundle-version="4.8.0", + org.jboss.tools.maven.core, + org.jboss.tools.maven.conversion.ui, + org.jboss.tools.common, + org.jboss.tools.tests, + org.eclipse.m2e.tests.common;bundle-version="1.0.0", + org.eclipse.ui.ide, + org.eclipse.m2e.wtp;bundle-version="0.16.0" +Bundle-ActivationPolicy: lazy +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 + Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/build.properties =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/build.properties (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/build.properties 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,4 @@ +source.. = src/ +output.. = bin/ +bin.includes = META-INF/,\ + . Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/plugin_customization.ini =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/plugin_customization.ini (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/plugin_customization.ini 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,2 @@ +org.eclipse.m2e.core/eclipse.m2.updateIndexes=false +org.jboss.tools.central/showJBossCentralOnStartup=false \ No newline at end of file Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/pom.xml =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/pom.xml (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/pom.xml 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,31 @@ +<?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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.jboss.tools.maven</groupId> + <artifactId>tests</artifactId> + <version>1.4.0-SNAPSHOT</version> + </parent> + <groupId>org.jboss.tools.maven.tests</groupId> + <artifactId>org.jboss.tools.maven.conversion.test</artifactId> + + <packaging>eclipse-test-plugin</packaging> + + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-surefire-plugin</artifactId> + <version>${tychoVersion}</version> + <configuration> + <useUIThread>false</useUIThread> + <useUIHarness>true</useUIHarness> + <includes> + <include>**/*Test.java</include> + </includes> + </configuration> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/.project =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/.project (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/.project 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>ear</name> + <comment></comment> + <projects> + <project>z</project> + <project>web</project> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.validation.validationbuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> + </natures> +</projectDescription> Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/.settings/org.eclipse.m2e.core.prefs =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/.settings/org.eclipse.m2e.core.prefs (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/.settings/org.eclipse.m2e.core.prefs 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/.settings/org.eclipse.wst.common.component (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/.settings/org.eclipse.wst.common.component 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0"> + <wb-module deploy-name="ear-0.0.1-SNAPSHOT"> + <wb-resource deploy-path="/" source-path="/EarContent" tag="defaultRootSource"/> + <dependent-module archiveName="commons-logging-1.1.1.jar" deploy-path="/lib" handle="module:/classpath/lib/ear/otherlib/commons-logging-1.1.1.jar"> + <dependency-type>uses</dependency-type> + </dependent-module> + <dependent-module archiveName="web.war" deploy-path="/" handle="module:/resource/web/web"> + <dependent-object/> + <dependency-type>uses</dependency-type> + </dependent-module> + <dependent-module archiveName="junit-4.10.jar" deploy-path="/" handle="module:/classpath/var/M2_REPO/junit/junit/4.10/junit-4.10.jar"> + <dependency-type>uses</dependency-type> + </dependent-module> + </wb-module> +</project-modules> Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/.settings/org.eclipse.wst.common.project.facet.core.xml 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <fixed facet="jst.ear"/> + <installed facet="jst.ear" version="6.0"/> +</faceted-project> Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/EarContent/ant-1.8.4.jar =================================================================== (Binary files differ) Property changes on: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/EarContent/ant-1.8.4.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/EarContent/lib/commons-cli-1.2.jar =================================================================== (Binary files differ) Property changes on: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/EarContent/lib/commons-cli-1.2.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/otherlib/commons-logging-1.1.1.jar =================================================================== (Binary files differ) Property changes on: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/ear/otherlib/commons-logging-1.1.1.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/.classpath =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/.classpath (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/.classpath 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" output="target/classes" path="src/main/java"> + <attributes> + <attribute name="optional" value="true"/> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"> + <attributes> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="src" output="target/test-classes" path="src/test/java"> + <attributes> + <attribute name="optional" value="true"/> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"> + <attributes> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.6"> + <attributes> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> + <attributes> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="output" path="target/classes"/> +</classpath> Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/.project =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/.project (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/.project 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>util</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.m2e.core.maven2Nature</nature> + </natures> +</projectDescription> Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/.settings/org.eclipse.jdt.core.prefs 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.6 Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/.settings/org.eclipse.m2e.core.prefs =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/.settings/org.eclipse.m2e.core.prefs (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/.settings/org.eclipse.m2e.core.prefs 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/pom.xml =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/pom.xml (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/pom.xml 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,20 @@ +<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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>util</groupId> + <artifactId>util</artifactId> + <version>0.0.1-SNAPSHOT</version> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.5.1</version> + <configuration> + <!-- http://maven.apache.org/plugins/maven-compiler-plugin/ --> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/target/classes/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/target/classes/META-INF/MANIFEST.MF (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/target/classes/META-INF/MANIFEST.MF 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,5 @@ +Manifest-Version: 1.0 +Built-By: Fred Bricon +Build-Jdk: 1.7.0_05 +Created-By: Maven Integration for Eclipse + Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/target/classes/META-INF/maven/util/util/pom.properties =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/target/classes/META-INF/maven/util/util/pom.properties (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/target/classes/META-INF/maven/util/util/pom.properties 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,7 @@ +#Generated by Maven Integration for Eclipse +#Tue Oct 02 18:02:04 CEST 2012 +version=0.0.1-SNAPSHOT +groupId=util +m2e.projectName=util +m2e.projectLocation=D\:\\workspaces\\runtime-jbt-hostedmode3\\util +artifactId=util Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/target/classes/META-INF/maven/util/util/pom.xml =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/target/classes/META-INF/maven/util/util/pom.xml (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/util/target/classes/META-INF/maven/util/util/pom.xml 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,6 @@ +<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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>util</groupId> + <artifactId>util</artifactId> + <version>0.0.1-SNAPSHOT</version> +</project> \ No newline at end of file Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.classpath =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.classpath (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.classpath 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"> + <attributes> + <attribute name="owner.project.facets" value="java"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/> + <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> + <classpathentry combineaccessrules="false" kind="src" path="/util"/> + <classpathentry kind="output" path="build/classes"/> +</classpath> Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.project =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.project (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.project 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>war</name> + <comment></comment> + <projects> + <project>util</project> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.wst.jsdt.core.javascriptValidator</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.validation.validationbuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> + <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.wst.jsdt.core.jsNature</nature> + </natures> +</projectDescription> Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/.jsdtscope =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/.jsdtscope (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/.jsdtscope 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="WebContent"/> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject"> + <attributes> + <attribute name="hide" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/> + <classpathentry kind="output" path=""/> +</classpath> Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/org.eclipse.jdt.core.prefs 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,7 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/org.eclipse.wst.common.component (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/org.eclipse.wst.common.component 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0"> + <wb-module deploy-name="war"> + <wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/> + <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/> + <dependent-module archiveName="util.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/util/util"> + <dependency-type>uses</dependency-type> + </dependent-module> + <property name="context-root" value="war"/> + <property name="java-output-path" value="/war/build/classes"/> + </wb-module> +</project-modules> Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/org.eclipse.wst.common.project.facet.core.xml 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <fixed facet="jst.web"/> + <fixed facet="java"/> + <fixed facet="wst.jsdt.web"/> + <installed facet="java" version="1.6"/> + <installed facet="jst.web" version="3.0"/> + <installed facet="wst.jsdt.web" version="1.0"/> +</faceted-project> Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/org.eclipse.wst.jsdt.ui.superType.container =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/org.eclipse.wst.jsdt.ui.superType.container 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/org.eclipse.wst.jsdt.ui.superType.name =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/.settings/org.eclipse.wst.jsdt.ui.superType.name 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1 @@ +Window \ No newline at end of file Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/WebContent/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/WebContent/META-INF/MANIFEST.MF (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/WebContent/META-INF/MANIFEST.MF 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/WebContent/WEB-INF/lib/ant-1.8.4.jar =================================================================== (Binary files differ) Property changes on: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/WebContent/WEB-INF/lib/ant-1.8.4.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/WebContent/WEB-INF/lib/ant-antlr-1.8.4.jar =================================================================== (Binary files differ) Property changes on: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/WebContent/WEB-INF/lib/ant-antlr-1.8.4.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/WebContent/WEB-INF/lib/ant-junit-1.8.4.jar =================================================================== (Binary files differ) Property changes on: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/war/WebContent/WEB-INF/lib/ant-junit-1.8.4.jar ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.classpath =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.classpath (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.classpath 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" output="target/classes" path="src"> + <attributes> + <attribute name="optional" value="true"/> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"> + <attributes> + <attribute name="maven.pomderived" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> + <attributes> + <attribute name="maven.pomderived" value="true"/> + <attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/> + </attributes> + </classpathentry> + <classpathentry kind="output" path="target/classes"/> +</classpath> Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.project =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.project (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.project 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>web</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.wst.jsdt.core.javascriptValidator</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.validation.validationbuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.m2e.core.maven2Nature</nature> + <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> + <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.wst.jsdt.core.jsNature</nature> + </natures> +</projectDescription> Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/.jsdtscope =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/.jsdtscope (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/.jsdtscope 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="WebContent"/> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject"> + <attributes> + <attribute name="hide" value="true"/> + </attributes> + </classpathentry> + <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/> + <classpathentry kind="output" path=""/> +</classpath> Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.jdt.core.prefs 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,8 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.6 Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.m2e.core.prefs =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.m2e.core.prefs (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.m2e.core.prefs 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.wst.common.component (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.wst.common.component 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0"> + <wb-module deploy-name="web"> + <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/> + <wb-resource deploy-path="/" source-path="/WebContent" tag="defaultRootSource"/> + <wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/> + <property name="context-root" value="web"/> + <property name="java-output-path" value="/web/build/classes"/> + </wb-module> +</project-modules> Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.wst.common.project.facet.core.xml =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.wst.common.project.facet.core.xml 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <fixed facet="jst.web"/> + <fixed facet="java"/> + <fixed facet="wst.jsdt.web"/> + <installed facet="java" version="1.6"/> + <installed facet="wst.jsdt.web" version="1.0"/> + <installed facet="jst.web" version="2.5"/> +</faceted-project> Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.wst.jsdt.ui.superType.container =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.wst.jsdt.ui.superType.container 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1 @@ +org.eclipse.wst.jsdt.launching.baseBrowserLibrary \ No newline at end of file Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.wst.jsdt.ui.superType.name =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/.settings/org.eclipse.wst.jsdt.ui.superType.name 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1 @@ +Window \ No newline at end of file Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/WebContent/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/WebContent/META-INF/MANIFEST.MF (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/WebContent/META-INF/MANIFEST.MF 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,3 @@ +Manifest-Version: 1.0 +Class-Path: + Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/pom.xml =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/pom.xml (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/pom.xml 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,35 @@ +<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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>web</groupId> + <artifactId>web</artifactId> + <version>0.0.1-SNAPSHOT</version> + <packaging>war</packaging> + <build> + <sourceDirectory>src</sourceDirectory> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.3.2</version> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <version>2.2</version> + <configuration> + <warSourceDirectory>WebContent</warSourceDirectory> + <failOnMissingWebXml>false</failOnMissingWebXml> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.10</version> + </dependency> + </dependencies> +</project> \ No newline at end of file Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,5 @@ +Manifest-Version: 1.0 +Build-Jdk: 1.7.0_05 +Built-By: Fred Bricon +Created-By: Maven Integration for Eclipse + Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/m2e-wtp/web-resources/META-INF/maven/web/web/pom.properties =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/m2e-wtp/web-resources/META-INF/maven/web/web/pom.properties (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/m2e-wtp/web-resources/META-INF/maven/web/web/pom.properties 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,7 @@ +#Generated by Maven Integration for Eclipse +#Tue Oct 02 17:06:17 CEST 2012 +version=0.0.1-SNAPSHOT +groupId=web +m2e.projectName=web +m2e.projectLocation=D\:\\workspaces\\runtime-jbt-hostedmode3\\web +artifactId=web Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/m2e-wtp/web-resources/META-INF/maven/web/web/pom.xml =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/m2e-wtp/web-resources/META-INF/maven/web/web/pom.xml (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/projects/conversion/web/target/m2e-wtp/web-resources/META-INF/maven/web/web/pom.xml 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,28 @@ +<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/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>web</groupId> + <artifactId>web</artifactId> + <version>0.0.1-SNAPSHOT</version> + <packaging>war</packaging> + <build> + <sourceDirectory>src</sourceDirectory> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.3.2</version> + <configuration> + <source>1.7</source> + <target>1.7</target> + </configuration> + </plugin> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <version>2.2</version> + <configuration> + <warSourceDirectory>WebContent</warSourceDirectory> + <failOnMissingWebXml>false</failOnMissingWebXml> + </configuration> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/src/org/jboss/tools/maven/conversion/tests/AbstractMavenConversionTest.java =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/src/org/jboss/tools/maven/conversion/tests/AbstractMavenConversionTest.java (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/src/org/jboss/tools/maven/conversion/tests/AbstractMavenConversionTest.java 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,51 @@ +/************************************************************************************* + * Copyright (c) 2008-2011 Red Hat, Inc. and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * JBoss by Red Hat - Initial implementation. + ************************************************************************************/ +package org.jboss.tools.maven.conversion.tests; + +import java.io.File; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IMarker; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.m2e.tests.common.AbstractMavenProjectTestCase; +import org.jboss.tools.common.util.FileUtil; + +public abstract class AbstractMavenConversionTest extends + AbstractMavenProjectTestCase { + + protected String toString(File file) { + return FileUtil.readFile(file); + } + + protected String toString(IFile file) { + return FileUtil.getContentFromEditorOrFile(file); + } + + protected void assertHasError(IProject project, String errorMessage) { + try { + for (IMarker m : findErrorMarkers(project)) { + String message = (String)m.getAttribute(IMarker.MESSAGE); + if (errorMessage.equals(message)){ + return; + } + } + } catch (CoreException e) { + fail(e.getMessage()); + } + fail("Error Message '"+ errorMessage +"' was not found on "+project.getName()); + } + + protected static String getMessage(IMarker marker) throws CoreException { + return (String)marker.getAttribute(IMarker.MESSAGE); + } + +} Added: trunk/maven/tests/org.jboss.tools.maven.conversion.test/src/org/jboss/tools/maven/conversion/tests/ProjectDependencyCollectorTest.java =================================================================== --- trunk/maven/tests/org.jboss.tools.maven.conversion.test/src/org/jboss/tools/maven/conversion/tests/ProjectDependencyCollectorTest.java (rev 0) +++ trunk/maven/tests/org.jboss.tools.maven.conversion.test/src/org/jboss/tools/maven/conversion/tests/ProjectDependencyCollectorTest.java 2012-10-02 17:13:46 UTC (rev 44224) @@ -0,0 +1,63 @@ +package org.jboss.tools.maven.conversion.tests; + +import java.io.File; +import java.util.List; + +import org.eclipse.core.resources.IProject; +import org.eclipse.m2e.core.MavenPlugin; +import org.jboss.tools.maven.conversion.core.DependencyCollector; +import org.jboss.tools.maven.conversion.core.DependencyCollectorFactory; +import org.jboss.tools.maven.conversion.core.ProjectDependency; +import org.junit.Test; + +@SuppressWarnings("restriction") +public class ProjectDependencyCollectorTest extends AbstractMavenConversionTest { + + @Test + public void testCollectEarDependencies() throws Exception { + IProject web = createExisting("web", "projects/conversion/web"); + IProject ear = createExisting("ear", "projects/conversion/ear"); + waitForJobsToComplete(); + + DependencyCollector collector = DependencyCollectorFactory.INSTANCE.getDependencyCollector(ear); + assertNotNull(collector); + List<ProjectDependency> deps = collector.collectDependencies(ear); + assertEquals(5, deps.size()); + //archive reference + assertEquals("/ear/otherlib/commons-logging-1.1.1.jar", deps.get(0).getPath().toPortableString()); + //project reference + assertEquals(web.getFullPath() , deps.get(1).getPath()); + + //library reference + File localRepo = MavenPlugin.getRepositoryRegistry().getLocalRepository().getBasedir(); + String junitLocation = localRepo.getAbsolutePath().replace('\\', '/')+"/junit/junit/4.10/junit-4.10.jar"; + assertEquals(junitLocation, deps.get(2).getPath().toPortableString()); + + //jar not in lib + assertEquals("/ear/EarContent/ant-1.8.4.jar" , deps.get(3).getPath().toPortableString()); + //jar in lib + assertEquals("/ear/EarContent/lib/commons-cli-1.2.jar", deps.get(4).getPath().toPortableString()); + + } + + + @Test + public void testCollectWarDependencies() throws Exception { + IProject util = createExisting("util", "projects/conversion/util"); + IProject war = createExisting("war", "projects/conversion/war"); + waitForJobsToComplete(); + + DependencyCollector collector = DependencyCollectorFactory.INSTANCE.getDependencyCollector(war); + assertNotNull(collector); + List<ProjectDependency> deps = collector.collectDependencies(war); + assertEquals(4, deps.size()); + + String baseDir = war.getLocation().toPortableString(); + + assertEquals(baseDir+"/WebContent/WEB-INF/lib/ant-1.8.4.jar", deps.get(0).getPath().toPortableString()); + assertEquals(baseDir+"/WebContent/WEB-INF/lib/ant-antlr-1.8.4.jar", deps.get(1).getPath().toPortableString()); + assertEquals(baseDir+"/WebContent/WEB-INF/lib/ant-junit-1.8.4.jar", deps.get(2).getPath().toPortableString()); + assertEquals(util.getFullPath(), deps.get(3).getPath()); + } + +} Modified: trunk/maven/tests/pom.xml =================================================================== --- trunk/maven/tests/pom.xml 2012-10-02 17:10:35 UTC (rev 44223) +++ trunk/maven/tests/pom.xml 2012-10-02 17:13:46 UTC (rev 44224) @@ -14,6 +14,7 @@ <packaging>pom</packaging> <modules> <module>org.jboss.tools.maven.configurators.tests</module> + <module>org.jboss.tools.maven.conversion.test</module> <module>org.jboss.tools.maven.common.test</module> <module>org.jboss.tools.maven.profiles.test</module> <module>org.jboss.tools.maven.ui.bot.test</module>