Property changes on: /Users/matthias/projects/gsc/jira_checouts/castor_maven_plugin3/maven-plugins
___________________________________________________________________
Name: svn:ignore
   + target


Index: /Users/matthias/projects/gsc/jira_checouts/castor_maven_plugin3/maven-plugins/src/main/java/org/codehaus/castor/maven/xmlctf/AbstractTestSuiteMojo.java
===================================================================
--- /Users/matthias/projects/gsc/jira_checouts/castor_maven_plugin3/maven-plugins/src/main/java/org/codehaus/castor/maven/xmlctf/AbstractTestSuiteMojo.java	(revision 0)
+++ /Users/matthias/projects/gsc/jira_checouts/castor_maven_plugin3/maven-plugins/src/main/java/org/codehaus/castor/maven/xmlctf/AbstractTestSuiteMojo.java	(revision 0)
@@ -0,0 +1,143 @@
+/*
+ * Redistribution and use of this software and associated documentation
+ * ("Software"), with or without modification, are permitted provided
+ * that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain copyright
+ *    statements and notices.  Redistributions must also contain a
+ *    copy of this document.
+ *
+ * 2. Redistributions in binary form must reproduce the
+ *    above copyright notice, this list of conditions and the
+ *    following disclaimer in the documentation and/or other
+ *    materials provided with the distribution.
+ *
+ * 3. The name "Exolab" must not be used to endorse or promote
+ *    products derived from this Software without prior written
+ *    permission of Intalio, Inc.  For written permission,
+ *    please contact info@exolab.org.
+ *
+ * 4. Products derived from this Software may not be called "Exolab"
+ *    nor may "Exolab" appear in their names without prior written
+ *    permission of Intalio, Inc. Exolab is a registered
+ *    trademark of Intalio, Inc.
+ *
+ * 5. Due credit should be given to the Exolab Project
+ *    (http://www.exolab.org/).
+ *
+ * THIS SOFTWARE IS PROVIDED BY INTALIO, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
+ * NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+ * INTALIO, INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Copyright 2001-2002 (C) Intalio, Inc. All Rights Reserved.
+ *
+ */
+package org.codehaus.castor.maven.xmlctf;
+
+import java.io.File;
+import java.util.Iterator;
+
+import junit.framework.Test;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.project.MavenProject;
+import org.castor.xmlctf.TestCaseAggregator;
+
+/**
+ * Abstract Mojo that initialises the junit test cases from xml
+ * Subclasses implement the runJUnit method to provide the Runner (eg. text, swing, ..)
+ *
+ * @requiresProject true
+ * @requiresDependencyResolution runtime
+ */
+public abstract class AbstractTestSuiteMojo extends AbstractMojo{
+
+	private static final String TEST_ROOT_PROPERTY = "castor.xmlctf.root";
+
+    /**
+     * The target dir used for the testclasses.
+     *
+     * @parameter expression="./target/xmlctf"
+     */
+    private  String outputRoot;
+
+    /**
+     * The source dir of the tests.
+     *
+     * @parameter
+     */
+    private String testRoot;
+    /**
+     * The project whose project files to create.
+     *
+     * @parameter expression="${project}"
+     * @required
+     */
+    private MavenProject project;
+
+	public void execute() throws MojoExecutionException, MojoFailureException {
+		getLog().info("Starting Castor Mastertestsuite");
+
+		// testRoot checks
+		String testRootToUse = System.getProperty(TEST_ROOT_PROPERTY);
+		if (testRootToUse ==  null) {
+		    testRootToUse = testRoot;          
+		}
+		
+		if (testRootToUse == null) {
+ 			throw new MojoExecutionException("No testroot found, please specify property -Dcastor.xmlctf.root");
+		}
+
+        if (testRootToUse.equals(".") || testRootToUse.equals("..")) {
+            //-- convert relative directories "." and ".." to a Canonical path
+            File tmp = new File(testRootToUse);
+            try {
+                testRootToUse = tmp.getCanonicalPath();
+            } catch (java.io.IOException iox) {
+
+            }
+        } else if (testRootToUse.startsWith("./") || testRootToUse.startsWith(".\\")) {
+            //-- Remove leading ./ or .\ -- URLClassLoader can't handle such file URLs
+            testRoot = testRoot.substring(2);
+        }
+
+        File testRootFile = new File(testRootToUse);
+        getLog().info("using testRoot: " + testRootFile.getAbsolutePath());
+        
+        if (!testRootFile.exists()) {
+        	throw new MojoExecutionException("Root not found:" + testRoot);
+        }
+
+        // set classpath for testcompiler
+        String classpath = System.getProperty("java.home") + "/lib/tools.jar:";
+        for (Iterator iter = project.getArtifacts().iterator(); iter.hasNext();) {
+            classpath += ((Artifact) iter.next()).getFile().getAbsolutePath() + ":";
+        }
+                   
+        System.setProperty("xmlctf.classpath.override",classpath);
+        if (getLog().isDebugEnabled()) {
+            System.setProperty(TestCaseAggregator.VERBOSE_PROPERTY, "true");
+            System.setProperty(TestCaseAggregator.PRINT_STACK_TRACE, "true");
+        }
+        
+		getLog().debug("classpath for sourcegenerator is:" + classpath);
+
+        // run testCase
+        runJUnit(new TestCaseAggregator(testRootFile, outputRoot).suite());
+	}
+
+	public abstract void runJUnit(Test testSuite )throws MojoExecutionException;
+
+}
Index: /Users/matthias/projects/gsc/jira_checouts/castor_maven_plugin3/maven-plugins/src/main/java/org/codehaus/castor/maven/xmlctf/TextTestSuiteMojo.java
===================================================================
--- /Users/matthias/projects/gsc/jira_checouts/castor_maven_plugin3/maven-plugins/src/main/java/org/codehaus/castor/maven/xmlctf/TextTestSuiteMojo.java	(revision 0)
+++ /Users/matthias/projects/gsc/jira_checouts/castor_maven_plugin3/maven-plugins/src/main/java/org/codehaus/castor/maven/xmlctf/TextTestSuiteMojo.java	(revision 0)
@@ -0,0 +1,72 @@
+/*
+ * Redistribution and use of this software and associated documentation
+ * ("Software"), with or without modification, are permitted provided
+ * that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain copyright
+ *    statements and notices.  Redistributions must also contain a
+ *    copy of this document.
+ *
+ * 2. Redistributions in binary form must reproduce the
+ *    above copyright notice, this list of conditions and the
+ *    following disclaimer in the documentation and/or other
+ *    materials provided with the distribution.
+ *
+ * 3. The name "Exolab" must not be used to endorse or promote
+ *    products derived from this Software without prior written
+ *    permission of Intalio, Inc.  For written permission,
+ *    please contact info@exolab.org.
+ *
+ * 4. Products derived from this Software may not be called "Exolab"
+ *    nor may "Exolab" appear in their names without prior written
+ *    permission of Intalio, Inc. Exolab is a registered
+ *    trademark of Intalio, Inc.
+ *
+ * 5. Due credit should be given to the Exolab Project
+ *    (http://www.exolab.org/).
+ *
+ * THIS SOFTWARE IS PROVIDED BY INTALIO, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
+ * NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+ * INTALIO, INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * Copyright 2001-2002 (C) Intalio, Inc. All Rights Reserved.
+ *
+ */
+package org.codehaus.castor.maven.xmlctf;
+
+import junit.framework.Test;
+import junit.framework.TestResult;
+import junit.textui.TestRunner;
+
+import org.apache.maven.plugin.MojoExecutionException;
+
+/**
+ * Uses a simple TextRunner to run the xmlctf tests
+ *
+ * @goal xmlctf-text
+ */
+
+public class TextTestSuiteMojo extends AbstractTestSuiteMojo{
+
+	@Override
+	public void runJUnit(Test testSuite) throws MojoExecutionException{
+		TestResult result = TestRunner.run(testSuite);
+		if (result.errorCount() > 0 || result.failureCount() > 0) {
+			throw new MojoExecutionException("Errors or Failures occured testing the MasterTestSuite!");
+		}
+	}
+
+
+
+}
+
+
Index: /Users/matthias/projects/gsc/jira_checouts/castor_maven_plugin3/maven-plugins/pom.xml
===================================================================
--- /Users/matthias/projects/gsc/jira_checouts/castor_maven_plugin3/maven-plugins/pom.xml	(revision 0)
+++ /Users/matthias/projects/gsc/jira_checouts/castor_maven_plugin3/maven-plugins/pom.xml	(revision 0)
@@ -0,0 +1,56 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.codehaus.castor</groupId>
+  <artifactId>castor-maven-plugins</artifactId>
+  <packaging>maven-plugin</packaging>
+  <version>1.0-SNAPSHOT</version>
+  <name>castor-xmlctf-plugin Maven Mojo</name>
+  <url>http://maven.apache.org</url>
+  
+  <build>
+    <plugins>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <configuration>
+                <source>1.5</source>
+                <target>1.5</target>
+            </configuration>
+        </plugin>
+    </plugins>
+  </build>
+    
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-plugin-api</artifactId>
+      <version>2.0</version>
+    </dependency>
+     <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-project</artifactId>
+      <version>2.0.1</version>
+    </dependency>
+   	<dependency>
+		<groupId>org.codehaus.castor</groupId>
+		<artifactId>castor-testsuite-xml-framework</artifactId>
+		<version>1.1.3-SNAPSHOT</version>
+	</dependency>
+	<dependency>
+        <groupId>org.codehaus.castor</groupId>
+        <artifactId>castor</artifactId>
+        <version>1.1.3-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+    </dependency>
+    <dependency>
+        <groupId>oro</groupId>
+        <artifactId>oro</artifactId>
+        <version>2.0.8</version>
+    </dependency>
+  </dependencies>
+</project>

Property changes on: /Users/matthias/projects/gsc/jira_checouts/castor_maven_plugin3/xmlctf-framework
___________________________________________________________________
Name: svn:ignore
   - build
eclipse

   + build
eclipse
target


Index: /Users/matthias/projects/gsc/jira_checouts/castor_maven_plugin3/xmlctf-framework/src/main/java/org/castor/xmlctf/compiler/SunJavaCompiler.java
===================================================================
--- /Users/matthias/projects/gsc/jira_checouts/castor_maven_plugin3/xmlctf-framework/src/main/java/org/castor/xmlctf/compiler/SunJavaCompiler.java	(revision 7236)
+++ /Users/matthias/projects/gsc/jira_checouts/castor_maven_plugin3/xmlctf-framework/src/main/java/org/castor/xmlctf/compiler/SunJavaCompiler.java	(working copy)
@@ -161,12 +161,15 @@
             args.add(_javaVersion);
         }
         args.add("-classpath");
-        args.add(System.getProperty("java.class.path") + ";" + destDir.getAbsolutePath());
+        if (System.getProperty("xmlctf.classpath.override") != null) {
+            args.add(System.getProperty("xmlctf.classpath.override") + ";" + destDir.getAbsolutePath());
+        } else {
+            args.add(System.getProperty("java.class.path") + ";" + destDir.getAbsolutePath());            
+        }
         args.add("-d");
         args.add(destDir.getAbsolutePath());
         args.add("-sourcepath");
         args.add(srcDir.getAbsolutePath());
-
         return args;
     }
 
Index: /Users/matthias/projects/gsc/jira_checouts/castor_maven_plugin3/xmlctf-framework/pom.xml
===================================================================
--- /Users/matthias/projects/gsc/jira_checouts/castor_maven_plugin3/xmlctf-framework/pom.xml	(revision 7236)
+++ /Users/matthias/projects/gsc/jira_checouts/castor_maven_plugin3/xmlctf-framework/pom.xml	(working copy)
@@ -30,7 +30,7 @@
 					<source>1.4</source>
 					<target>1.4</target>
 					<includes>
-						<include implementation="java.lang.String">org/exolab/castor/tests/framework/**</include>
+						<include implementation="java.lang.String">org/**</include>
 					</includes>
 				</configuration>
 			</plugin>
Index: /Users/matthias/projects/gsc/jira_checouts/castor_maven_plugin3/xmlctf/pom.xml
===================================================================
--- /Users/matthias/projects/gsc/jira_checouts/castor_maven_plugin3/xmlctf/pom.xml	(revision 7236)
+++ /Users/matthias/projects/gsc/jira_checouts/castor_maven_plugin3/xmlctf/pom.xml	(working copy)
@@ -21,87 +21,40 @@
 	<description></description>
 
 	<build>
-		<plugins>
-		
+		<plugins>
 			<plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.4</source>
-					<target>1.4</target>
-					<includes>
-						<include implementation="java.lang.String">org/exolab/castor/tests/framework/**</include>
-					</includes>
-				</configuration>
-			</plugin>
-			
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
-					</archive>
-				</configuration>
-			</plugin>
-			
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
- 				<configuration>
-					<attach>true</attach>
-				</configuration>
-			</plugin>
-			
-			<!--  redundant; will be removed once we switch to parent structure -->
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
+				<groupId>org.codehaus.castor</groupId>
+				<artifactId>castor-maven-plugins</artifactId>
 				<executions>
 					<execution>
+						<phase>test</phase>
 						<goals>
-							<goal>jar</goal>
+							<goal>xmlctf-text</goal>
 						</goals>
 					</execution>
-				</executions>
+				</executions>
+				<configuration>
+                    <testRoot>tests/MasterTestSuite/</testRoot>
+                </configuration>
 			</plugin>
-			
-
 		</plugins>
-		
-		<!--  redundant; will be removed once we switch to parent structure -->
-		<extensions>
-			<extension>
-				<groupId>org.apache.maven.wagon</groupId>
-				<artifactId>wagon-webdav</artifactId>
-				<version>1.0-beta-1</version>
-			</extension>
-		</extensions>
-
 	</build>
 
-	<dependencies>
-
-		<dependency>
-			<groupId>org.codehaus.castor</groupId>
-			<artifactId>castor-codegen</artifactId>
-			<version>1.1.1-SNAPSHOT</version>
-		</dependency>
-
-        <dependency>
-            <groupId>ant</groupId>
-            <artifactId>ant</artifactId>
-            <version>1.6</version>
-        </dependency>
-
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>3.8.2</version>
-		</dependency>
-
-	</dependencies>
-
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>3.8.1</version>
+		</dependency>
+		<dependency>
+            <groupId>org.codehaus.castor</groupId>
+            <artifactId>castor-testsuite-xml-framework</artifactId>
+            <version>1.1.3-SNAPSHOT</version>
+        </dependency>
+	</dependencies>
+
+
+
 	<!--  redundant; will be removed once we switch to parent structure -->
     <distributionManagement>
         <repository>
Index: /Users/matthias/projects/gsc/jira_checouts/castor_maven_plugin3/bin/CTFRun.sh
===================================================================
--- /Users/matthias/projects/gsc/jira_checouts/castor_maven_plugin3/bin/CTFRun.sh	(revision 7236)
+++ /Users/matthias/projects/gsc/jira_checouts/castor_maven_plugin3/bin/CTFRun.sh	(working copy)
@@ -20,7 +20,7 @@
 LIB_D=$CASTOR_HOME/lib
 
 CLASSPATH=$CASTOR_HOME/xmlctf/build
-CLASSPATH=$CLASSPATH:$CASTOR_HOME/xmlctf/build/classes
+CLASSPATH=$CLASSPATH:$CASTOR_HOME/xmlctf-framework/build/classes
 CLASSPATH=$CLASSPATH:$CASTOR_HOME/build/classes
 CLASSPATH=$CLASSPATH:$CASTOR_HOME/codegen/build/classes
 CLASSPATH=$CLASSPATH:$BUILD_D/tests