[gwt-maven] r1029 committed - pishing local

[codesite...@google.com]

Revision: 1029
Author: kebe...@gmail.com
Date: Sun Jul 1 07:48:34 2012
Log: pishing local
http://code.google.com/p/gwt-maven/source/detail?r=1029

Added:
/trunk/maven-googlewebtoolkit2-plugin/nb-configuration.xml
Modified:
/trunk/maven-googlewebtoolkit2-plugin/pom.xml

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

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

=======================================
--- /dev/null
+++ /trunk/maven-googlewebtoolkit2-plugin/nb-configuration.xml Sun Jul 1
07:48:34 2012
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-shared-configuration>
+ <!--
+This file contains additional configuration written by modules in the
NetBeans IDE.
+The configuration is intended to be shared among all the users of project
and
+therefore it is assumed to be part of version control checkout.
+Without this configuration present, some functionality in the IDE may be
limited or fail altogether.
+-->
+ <properties xmlns="http://www.netbeans.org/ns/maven-properties-data/1">
+ <!--
+Properties that influence various parts of the IDE, especially code
formatting and the like.
+You can copy and paste the single properties, into the pom.xml file and
the IDE will pick them up.
+That way multiple projects can share the same settings (useful for
formatting rules for example).
+Any value defined here will override the pom.xml file value but is only
applicable to the current project.
+-->
+ <netbeans.hint.jdkPlatform>JDK_1.6</netbeans.hint.jdkPlatform>
+ </properties>
+</project-shared-configuration>
=======================================
--- /trunk/maven-googlewebtoolkit2-plugin/pom.xml Mon Aug 23 11:20:33 2010
+++ /trunk/maven-googlewebtoolkit2-plugin/pom.xml Sun Jul 1 07:48:34 2012
@@ -5,7 +5,7 @@
<groupId>com.totsp.gwt</groupId>
<artifactId>maven-googlewebtoolkit2-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>2.0-SNAPSHOT</version>
+ <version>2.0-b2</version>
<description>Maven 2 Plugin for the Google Web Toolkit</description>
<name>Maven 2 Plugin for the Google Web Toolkit</name>
<url>http://code.google.com/p/gwt-maven</url>
=======================================
---
/trunk/maven-googlewebtoolkit2-plugin/src/main/java/com/totsp/mavenplugin/gwt/scripting/ScriptWriterWindows20.java
Tue Nov 2 19:42:01 2010
+++
/trunk/maven-googlewebtoolkit2-plugin/src/main/java/com/totsp/mavenplugin/gwt/scripting/ScriptWriterWindows20.java
Sun Jul 1 07:48:34 2012
@@ -385,7 +385,12 @@
if(scope == DependencyScope.TEST){
dirs =
dirs.append("src\\test\\java;src\\test\\resources;");
}
- writer.println("set
CLASSPATH=\"src\\main\\java;src\\main\\resources\";"+dirs.toString()+"target\\classes;target\\cp\\*;");
+ writer.print("set
CLASSPATH=\"src\\main\\java;src\\main\\resources\";"+dirs.toString()+"target\\classes;target\\cp\\*;");
+ for(File f: BuildClasspathUtil.getSystemPaths(mojo)){
+ writer.print(f.getAbsolutePath());
+ writer.print(";");
+ }
+ writer.println();
//
// writer.print("set CLASSPATH"+counter+"=");
//
=======================================
---
/trunk/maven-googlewebtoolkit2-plugin/src/main/java/com/totsp/mavenplugin/gwt/util/BuildClasspathUtil.java
Wed Dec 16 13:41:57 2009
+++
/trunk/maven-googlewebtoolkit2-plugin/src/main/java/com/totsp/mavenplugin/gwt/util/BuildClasspathUtil.java
Sun Jul 1 07:48:34 2012
@@ -37,6 +37,17 @@
* @author ccollins
*/
public class BuildClasspathUtil {
+
+
+ public static Set<File> getSystemPaths(final AbstractGWTMojo mojo){
+ MavenProject project = mojo.getProject();
+ Set<File> items = new LinkedHashSet<File>();
+ // add system
+ for (Artifact a : (Collection<Artifact>)
project.getSystemArtifacts()) {
+ items.add(a.getFile());
+ }
+ return items;
+ }

// TODO all over this class we have methods that manipulate input
parameters, remove that
// we should return values and/or let the object keep state, not
manipulate params
@@ -125,11 +136,6 @@
items.add(a.getFile());
}
}
-
- // add system
- for (Artifact a : (Collection<Artifact>)
project.getSystemArtifacts()) {
- items.add(a.getFile());
- }

mojo.getLog().debug("SCRIPT INJECTION CLASSPATH LIST");