Fix GWT hosted mode in Eclipse
When we started building gerrit-gwtdebug as a submodule, we broke the way the Maven Eclipse plugin generated the project classpath. Instead of the WAR, link to the JAR of each project. Change-Id: Ie8a3723ee26c19710cac67eac79930a1ba992006 Signed-off-by: Shawn O. Pearce <sop@google.com>
This commit is contained in:
@@ -42,14 +42,14 @@ limitations under the License.
|
||||
<groupId>com.google.gerrit</groupId>
|
||||
<artifactId>gerrit-gwtui</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<type>war</type>
|
||||
<classifier>classes</classifier>
|
||||
</dependency>
|
||||
|
||||
<dependency>
|
||||
<groupId>com.google.gerrit</groupId>
|
||||
<artifactId>gerrit-war</artifactId>
|
||||
<version>${project.version}</version>
|
||||
<type>war</type>
|
||||
<classifier>classes</classifier>
|
||||
<exclusions>
|
||||
<exclusion>
|
||||
<groupId>com.google.gerrit</groupId>
|
||||
|
@@ -244,6 +244,7 @@ limitations under the License.
|
||||
<artifactId>maven-war-plugin</artifactId>
|
||||
<configuration>
|
||||
<packagingExcludes>WEB-INF/classes/**,WEB-INF/lib/**</packagingExcludes>
|
||||
<attachClasses>true</attachClasses>
|
||||
<archive>
|
||||
<addMavenDescriptor>false</addMavenDescriptor>
|
||||
</archive>
|
||||
|
@@ -155,6 +155,7 @@ limitations under the License.
|
||||
<configuration>
|
||||
<warName>gerrit-${project.version}</warName>
|
||||
<archiveClasses>true</archiveClasses>
|
||||
<attachClasses>true</attachClasses>
|
||||
<archive>
|
||||
<addMavenDescriptor>false</addMavenDescriptor>
|
||||
<manifestEntries>
|
||||
|
@@ -13,8 +13,8 @@
|
||||
<booleanAttribute key="org.eclipse.jdt.debug.ui.CONSIDER_INHERITED_MAIN" value="true"/>
|
||||
<listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
|
||||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry containerPath="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6" path="1" type="4"/> "/>
|
||||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="gerrit-gwtui" type="1"/> "/>
|
||||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="gerrit-gwtdebug" type="1"/> "/>
|
||||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry path="3" projectName="gerrit-war" type="1"/> "/>
|
||||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/gerrit-prettify/src/main/java" path="3" type="2"/> "/>
|
||||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/gerrit-patch-jgit/src/main/java" path="3" type="2"/> "/>
|
||||
<listEntry value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <runtimeClasspathEntry internalArchive="/gerrit-reviewdb/src/main/java" path="3" type="2"/> "/>
|
||||
|
Reference in New Issue
Block a user