[gwt-maven] r1027 committed - Tweaks on the test runs.

[codesite...@google.com]

Revision: 1027
Author: kebernet
Date: Mon Aug 23 11:20:33 2010
Log: Tweaks on the test runs.
http://code.google.com/p/gwt-maven/source/detail?r=1027

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

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

=======================================
--- /dev/null
+++ /trunk/maven-googlewebtoolkit2-plugin/nbactions.xml Mon Aug 23 11:20:33
2010
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actions>
+ <action>
+ <actionName>CUSTOM-deploy</actionName>
+ <displayName>deploy</displayName>
+ <goals>
+ <goal>deploy</goal>
+ </goals>
+ </action>
+ </actions>
=======================================
--- /trunk/maven-googlewebtoolkit2-plugin/pom.xml Wed Jun 3 17:57:19 2009
+++ /trunk/maven-googlewebtoolkit2-plugin/pom.xml Mon Aug 23 11:20:33 2010
@@ -67,11 +67,16 @@
</license>
</licenses>
<distributionManagement>
- <repository>
+ <!--repository>
<id>local.repo</id>
<name>file repository to svn</name>
<url>file://${basedir}/../mavenrepo</url>
- </repository>
+ </repository-->
+ <repository>
+ <id>archiva.internal</id>
+ <name>Internal Release Repository</name>
+
<url>dav:http://cvs.reachcall.com/archiva/repository/internal/</url>
+ </repository>
</distributionManagement>
<dependencies>
<dependency>
=======================================
---
/trunk/maven-googlewebtoolkit2-plugin/src/main/java/com/totsp/mavenplugin/gwt/scripting/ScriptWriterWindows20.java
Thu Aug 5 12:20:28 2010
+++
/trunk/maven-googlewebtoolkit2-plugin/src/main/java/com/totsp/mavenplugin/gwt/scripting/ScriptWriterWindows20.java
Mon Aug 23 11:20:33 2010
@@ -47,7 +47,7 @@

String extra = (mojo.getExtraJvmArgs() != null)
? mojo.getExtraJvmArgs() : "";
- writer.print("\"" + mojo.getJavaCommand() + "\" " + extra + "
-cp %CP% ");
+ writer.print("\"" + mojo.getJavaCommand() + "\" " + extra + "
-cp %CLASSPATH% ");

if (mojo instanceof DebugMojo) {
writer.print(" -Xdebug -Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,address=");
@@ -353,10 +353,11 @@
final AbstractGWTMojo mojo, File file, final DependencyScope
scope)
throws MojoExecutionException {
PrintWriter writer = null;
-
+ File cp = new File("target/cp");
+ cp.mkdirs();
try {
writer = new PrintWriter(new FileWriter(file));
- writer.println("@echo off");
+ //writer.println("@echo off");
} catch (IOException e) {
throw new MojoExecutionException("Error creating script - " +
file,
e);
@@ -367,12 +368,19 @@
Collection<File> classpath =
BuildClasspathUtil.buildClasspathList(mojo,
scope);

- writer.println("mkdir target\\cp");
-
+ StringBuilder dirs = new StringBuilder();
+
for(File f: classpath){
- writer.println("copy "+f.getAbsolutePath()+"
target\\cp\\");
- }
- writer.println("set
CLASSPATH=\"target\\cp\\*;src\\main\\java;src\\main\\resources\"");
+ if(!f.isDirectory()) {
+ writer.println("copy "+f.getAbsolutePath()+"
target\\cp\\");
+ } else {
+ dirs = dirs.append(f.getAbsolutePath()).append(";");
+ }
+ }
+ 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"+counter+"=");
//