Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed regression in projects' deployed name

  • Loading branch information...
commit c199ac48940ae07e62dcb0ea66a1498ae9a6c782 1 parent 2871cf2
@fbricon fbricon authored
View
31 org.maven.ide.eclipse.wtp.tests/projects/deployment-descriptors/J2EE/ear/pom.step2.xml
@@ -15,10 +15,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
- <version>2.3.1</version>
+ <version>2.4.2</version>
<configuration>
<!-- http://maven.apache.org/plugins/maven-ear-plugin/ -->
- <version>5</version>
+ <version>1.4</version>
<modules>
<ejbModule>
<groupId>test.project</groupId>
@@ -58,4 +58,31 @@
<type>ejb</type>
</dependency>
</dependencies>
+ <profiles>
+ <!-- Add a dedicated m2eclipse profile, to prevent the Java Builder to be added to the project in Eclipse (see http://tiny.cc/NoJavaInEar)-->
+ <profile>
+ <id>m2e</id>
+ <activation>
+ <property>
+ <name>m2e.version</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <!-- org.maven.ide.eclipse:lifecycle-mapping is not a real, existing plugin -->
+ <groupId>org.maven.ide.eclipse</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>0.10.0</version>
+ <configuration>
+ <mappingId>customizable</mappingId>
+ <configurators>
+ <configurator id="org.maven.ide.eclipse.configuration.wtp.configurator" />
+ </configurators>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
View
27 org.maven.ide.eclipse.wtp.tests/projects/deployment-descriptors/J2EE/ear/pom.xml
@@ -56,4 +56,31 @@
<type>ejb</type>
</dependency>
</dependencies>
+ <profiles>
+ <!-- Add a dedicated m2eclipse profile, to prevent the Java Builder to be added to the project in Eclipse (see http://tiny.cc/NoJavaInEar)-->
+ <profile>
+ <id>m2e</id>
+ <activation>
+ <property>
+ <name>m2e.version</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <!-- org.maven.ide.eclipse:lifecycle-mapping is not a real, existing plugin -->
+ <groupId>org.maven.ide.eclipse</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>0.10.0</version>
+ <configuration>
+ <mappingId>customizable</mappingId>
+ <configurators>
+ <configurator id="org.maven.ide.eclipse.configuration.wtp.configurator" />
+ </configurators>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
View
27 org.maven.ide.eclipse.wtp.tests/projects/deployment-descriptors/javaEE/ear/pom.step2.xml
@@ -58,4 +58,31 @@
<type>ejb</type>
</dependency>
</dependencies>
+ <profiles>
+ <!-- Add a dedicated m2eclipse profile, to prevent the Java Builder to be added to the project in Eclipse (see http://tiny.cc/NoJavaInEar)-->
+ <profile>
+ <id>m2e</id>
+ <activation>
+ <property>
+ <name>m2e.version</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <!-- org.maven.ide.eclipse:lifecycle-mapping is not a real, existing plugin -->
+ <groupId>org.maven.ide.eclipse</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>0.10.0</version>
+ <configuration>
+ <mappingId>customizable</mappingId>
+ <configurators>
+ <configurator id="org.maven.ide.eclipse.configuration.wtp.configurator" />
+ </configurators>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
View
27 org.maven.ide.eclipse.wtp.tests/projects/deployment-descriptors/javaEE/ear/pom.xml
@@ -56,4 +56,31 @@
<type>ejb</type>
</dependency>
</dependencies>
+ <profiles>
+ <!-- Add a dedicated m2eclipse profile, to prevent the Java Builder to be added to the project in Eclipse (see http://tiny.cc/NoJavaInEar)-->
+ <profile>
+ <id>m2e</id>
+ <activation>
+ <property>
+ <name>m2e.version</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <!-- org.maven.ide.eclipse:lifecycle-mapping is not a real, existing plugin -->
+ <groupId>org.maven.ide.eclipse</groupId>
+ <artifactId>lifecycle-mapping</artifactId>
+ <version>0.10.0</version>
+ <configuration>
+ <mappingId>customizable</mappingId>
+ <configurators>
+ <configurator id="org.maven.ide.eclipse.configuration.wtp.configurator" />
+ </configurators>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
View
2  org.maven.ide.eclipse.wtp.tests/src/org/maven/ide/eclipse/wtp/WTPProjectConfiguratorTest.java
@@ -811,7 +811,7 @@ public void testDeploymentDescriptorsJ2EE() throws Exception {
assertEquals("altdd-ejb.jar",ejbModule.getAltDD());
roles = app.getSecurityRoles();
- assertEquals(3, roles.size());//TODO remove deleted roles
+ assertEquals(3, roles.size());
}
public void testMNGECLIPSE1088_generateApplicationXml() throws Exception {
View
1  org.maven.ide.eclipse.wtp/src/org/maven/ide/eclipse/wtp/EarProjectConfiguratorDelegate.java
@@ -125,6 +125,7 @@ public void setModuleDependencies(IProject project, MavenProject mavenProject, I
IProject depProject = preConfigureDependencyProject(workspaceDependency, monitor);
depComponent = createDependencyComponent(earComponent, depProject);
+ configureDeployedName(depProject, earModule.getBundleFileName());
} else {
//artifact dependency should be added as a JEE module, referenced with M2_REPO variable
depComponent = createDependencyComponent(earComponent, earModule.getArtifact());
View
6 org.maven.ide.eclipse.wtp/src/org/maven/ide/eclipse/wtp/WebProjectConfiguratorDelegate.java
@@ -213,12 +213,6 @@ public void setModuleDependencies(IProject project, MavenProject mavenProject, I
}
}
}
-
- System.err.println(component.getName() + " has " + component.getReferences().length + " refs :");
- for (IVirtualReference r : component.getReferences())
- {
- System.err.println(" - "+r.getArchiveName());
- }
}
/**
Please sign in to comment.
Something went wrong with that request. Please try again.