[gwt-maven] r1024 committed - Added OOPHM support

[codesite...@google.com]

Revision: 1024
Author: kebernet
Date: Wed Aug 19 04:03:45 2009
Log: Added OOPHM support
http://code.google.com/p/gwt-maven/source/detail?r=1024

Modified:

/trunk/maven-googlewebtoolkit2-plugin/src/main/java/com/totsp/mavenplugin/gwt/AbstractGWTMojo.java

/trunk/maven-googlewebtoolkit2-plugin/src/main/java/com/totsp/mavenplugin/gwt/util/BuildClasspathUtil.java

=======================================
---
/trunk/maven-googlewebtoolkit2-plugin/src/main/java/com/totsp/mavenplugin/gwt/AbstractGWTMojo.java
Mon Mar 30 08:30:19 2009
+++
/trunk/maven-googlewebtoolkit2-plugin/src/main/java/com/totsp/mavenplugin/gwt/AbstractGWTMojo.java
Wed Aug 19 04:03:45 2009
@@ -67,6 +67,14 @@
* @readonly
*/
private MavenProject project;
+
+ /**
+ * Project instance, used to add new source directory to the build.
+ *
+ * @parameter default-value="false"
+ */
+ private boolean useOophm;
+
/**
* <i>Maven Internal</i>: List of artifacts for the plugin.
*
@@ -856,5 +864,19 @@
*/
public void setExtraDir(File extraDir) {
this.extraDir = extraDir;
- }
-}
+ }
+
+ /**
+ * @return the useOophm
+ */
+ public boolean isUseOophm() {
+ return useOophm;
+ }
+
+ /**
+ * @param useOophm the useOophm to set
+ */
+ public void setUseOophm(boolean useOophm) {
+ this.useOophm = useOophm;
+ }
+}
=======================================
---
/trunk/maven-googlewebtoolkit2-plugin/src/main/java/com/totsp/mavenplugin/gwt/util/BuildClasspathUtil.java
Tue Mar 31 12:45:40 2009
+++
/trunk/maven-googlewebtoolkit2-plugin/src/main/java/com/totsp/mavenplugin/gwt/util/BuildClasspathUtil.java
Wed Aug 19 04:03:45 2009
@@ -154,6 +154,10 @@
"injecting gwt-user and gwt-dev for script classpath from
google.webtoolkit.home (and expecting relative native libs)");

Collection<File> items = new LinkedHashSet<File>();
+ if(mojo.isUseOophm()){
+ File oophmJar = new File(gwtHome, "gwt-dev-oophm.jar");
+ items.add(oophmJar);
+ }
File userJar = new File(gwtHome, "gwt-user.jar");
File devJar = new File(gwtHome,
ArtifactNameUtil.guessDevJarName());
items.add(userJar);
@@ -181,12 +185,20 @@
mojo.getGwtVersion(), "jar", null);
Artifact gwtDev =
mojo.getArtifactFactory().createArtifactWithClassifier("com.google.gwt", "gwt-dev",
mojo.getGwtVersion(), "jar",
ArtifactNameUtil.getPlatformName());
-
+ Artifact oophm = null;
+ if(mojo.isUseOophm() ){
+ oophm =
mojo.getArtifactFactory().createArtifactWithClassifier("com.google.gwt", "gwt-dev-oophm",
+ mojo.getGwtVersion(), "jar",
ArtifactNameUtil.getPlatformName());
+ }
List<ArtifactRepository> remoteRepositories =
mojo.getRemoteRepositories();

try {
mojo.getResolver().resolve(gwtUser, remoteRepositories,
mojo.getLocalRepository());
mojo.getResolver().resolve(gwtDev, remoteRepositories,
mojo.getLocalRepository());
+ if(oophm !=null ){
+ mojo.getResolver().resolve(oophm, remoteRepositories,
mojo.getLocalRepository());
+ items.add(oophm.getFile());
+ }
items.add(gwtUser.getFile());
items.add(gwtDev.getFile());
} catch (ArtifactNotFoundException e) {