Author: aheritier
Date: Thu Nov 22 15:19:18 2007
New Revision: 597509
URL: http://svn.apache.org/viewvc?rev=597509&view=rev
Log:
MECLIPSE-352 : RAD application.xml is not generated with good parameters
Fix + test case
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-6/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-6/expected/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-6/expected/.j2ee
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-6/expected/.project
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-6/expected/META-INF/
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-6/expected/META-INF/application.xml
(with props)
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-6/pom.xml
(with props)
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadApplicationXMLWriter.java
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadApplicationXMLWriter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadApplicationXMLWriter.java?rev=597509&r1=597508&r2=597509&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadApplicationXMLWriter.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/eclipse/writers/rad/RadApplicationXMLWriter.java
Thu Nov 22 15:19:18 2007
@@ -106,7 +106,7 @@
private static final String XMLNS_MODULEMAP = "xmlns:modulemap";
- private static final String XMLNS_SCHEMA_LOCATION = "xmlns:schemaLocation";
+ private static final String XMLNS_SCHEMA_LOCATION = "xsi:schemaLocation";
private static final String XMLNS_XMI = "xmlns:xmi";
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java?rev=597509&r1=597508&r2=597509&view=diff
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java
(original)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/java/org/apache/maven/plugin/eclipse/RadPluginTest.java
Thu Nov 22 15:19:18 2007
@@ -256,4 +256,10 @@
assertTrue( ejbVerified );
}
+ public void testProject6()
+ throws Exception
+ {
+ testProject( "project-rad-6", new Properties(), "rad-clean", "rad" );
+ }
+
}
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-6/expected/.j2ee
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-6/expected/.j2ee?rev=597509&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-6/expected/.j2ee
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-6/expected/.j2ee
Thu Nov 22 15:19:18 2007
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<j2eesettings version="600">
+ <moduleversion>14</moduleversion>
+</j2eesettings>
\ No newline at end of file
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-6/expected/.project
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-6/expected/.project?rev=597509&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-6/expected/.project
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-6/expected/.project
Thu Nov 22 15:19:18 2007
@@ -0,0 +1,16 @@
+<projectDescription>
+ <name>project-rad-6</name>
+ <comment/>
+ <projects/>
+ <buildSpec>
+ <buildCommand>
+ <name>com.ibm.etools.validation.validationbuilder</name>
+ </buildCommand>
+ <buildCommand>
+ <name>com.ibm.sse.model.structuredbuilder</name>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>com.ibm.wtp.j2ee.EARNature</nature>
+ </natures>
+</projectDescription>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-6/expected/.project
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-6/expected/.project
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-6/expected/META-INF/application.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-6/expected/META-INF/application.xml?rev=597509&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-6/expected/META-INF/application.xml
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-6/expected/META-INF/application.xml
Thu Nov 22 15:19:18 2007
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/application_1_4.xsd";
xmlns="http://java.sun.com/xml/ns/j2ee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; id="Application_ID"
version="1.4">
+ <description/>
+ <display-name>project-rad-6</display-name>
+</application>
\ No newline at end of file
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-6/expected/META-INF/application.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-6/expected/META-INF/application.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Added:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-6/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-6/pom.xml?rev=597509&view=auto
==============================================================================
---
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-6/pom.xml
(added)
+++
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-6/pom.xml
Thu Nov 22 15:19:18 2007
@@ -0,0 +1,26 @@
+<?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>
+ <groupId>eclipse.test</groupId>
+ <artifactId>project-rad-6</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <packaging>ear</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>test</version>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.8</version>
+ </dependency>
+ </dependencies>
+</project>
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-6/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-eclipse-plugin/src/test/resources/projects/project-rad-6/pom.xml
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
