[portal-commits] JBoss Portal SVN: r12301 - modules/presentation/trunk/ajax.

Author: chris.laprun(a)jboss.com Date: 2008-11-24 17:49:04 -0500 (Mon, 24 Nov 2008) New Revision: 12301 Modified: modules/presentation/trunk/ajax/pom.xml Log: - Made computing compiler classpath more generic, should work on all platforms now with less code... Modified: modules/presentation/trunk/ajax/pom.xml =================================================================== --- modules/presentation/trunk/ajax/pom.xml 2008-11-19 04:12:38 UTC (rev 12300) +++ modules/presentation/trunk/ajax/pom.xml 2008-11-24 22:49:04 UTC (rev 12301) @@ -97,26 +97,7 @@ </activation> <properties> <gwt.os>mac</gwt.os> - <gwt.compiler.classpath>${maven.dependency.com.google.gwt.gwt-dev.jar.path}</gwt.compiler.classpath> </properties> - <dependencies> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-dev</artifactId> - <version>${version.gwt}</version> - <classifier>mac-libs</classifier> - <type>zip</type> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-dev</artifactId> - <version>${version.gwt}</version> - <classifier>mac</classifier> - <scope>package</scope> - </dependency> - </dependencies> </profile> <profile> <id>gwt-linux</id> @@ -127,26 +108,7 @@ </activation> <properties> <gwt.os>linux</gwt.os> - <gwt.compiler.classpath>~/.m2/repository/com/google/gwt/gwt-dev/${version.gwt}/gwt-dev-${version.gwt}-linux.jar</gwt.compiler.classpath> </properties> - <dependencies> - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-dev</artifactId> - <version>${version.gwt}</version> - <classifier>linux-libs</classifier> - <type>zip</type> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>com.google.gwt</groupId> - <artifactId>gwt-dev</artifactId> - <version>${version.gwt}</version> - <classifier>linux</classifier> - <scope>package</scope> - </dependency> - </dependencies> </profile> </profiles> @@ -162,6 +124,21 @@ <artifactId>gwt-user</artifactId> <version>${version.gwt}</version> </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-dev</artifactId> + <version>${version.gwt}</version> + <classifier>${gwt.os}-libs</classifier> + <type>zip</type> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-dev</artifactId> + <version>${version.gwt}</version> + <classifier>${gwt.os}</classifier> + <scope>provided</scope> + </dependency> </dependencies> <executions> <execution> @@ -170,14 +147,13 @@ <configuration> <tasks> <echo>maven.dependency.com.google.gwt.gwt-user.jar.path: ${maven.dependency.com.google.gwt.gwt-user.jar.path}</echo> - <echo>gwt.compiler.classpath: ${gwt.compiler.classpath}</echo> <java fork="true" classname="com.google.gwt.dev.GWTCompiler"> <classpath> <pathelement path="${basedir}/src/main/java"/> <pathelement location="${maven.dependency.com.google.gwt.gwt-user.jar.path}"/> - <pathelement location="${gwt.compiler.classpath}"/> + <pathelement location="${settings.localRepository}/com/google/gwt/gwt-dev/${version.gwt}/gwt-dev-${version.gwt}-${gwt.os}.jar"/> </classpath> <arg line="-out ${basedir}/target/gwt-client/"/> <arg line="org.jboss.portal.presentation.ajax.Presentation"/>