Merge branch 'jamesrcounts-master'

.classpath

@@ -1,11 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="src" output="target/classes" path="src/main/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java">
+		<attributes>
+			<attribute name="optional" value="true"/>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry including="**/*.java" kind="src" path="src/test/resources"/>
+	<classpathentry including="**/*.java" kind="src" path="src/main/resources"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry kind="lib" path="C:/Users/lynnlangit/Documents/GitHub/TKPSource/TeachingKidsProgramming.Source.Java/src/jars/commons-collections-3.1.jar"/>
-	<classpathentry kind="lib" path="C:/Users/lynnlangit/Documents/GitHub/TKPSource/TeachingKidsProgramming.Source.Java/src/jars/log4j-1.2.9.jar"/>
-	<classpathentry kind="lib" path="C:/Users/lynnlangit/Documents/GitHub/TKPSource/TeachingKidsProgramming.Source.Java/src/jars/servlet.jar"/>
-	<classpathentry kind="lib" path="C:/Users/lynnlangit/Documents/GitHub/TKPSource/TeachingKidsProgramming.Source.Java/src/jars/velocity-1.4-p1.jar"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
+		<attributes>
+			<attribute name="maven.pomderived" value="true"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="output" path="target/classes"/>
 </classpath>

.gitignore

@@ -5,3 +5,11 @@
 
 *.war
 *.ear
+/target/
+
+settings.xml
+/.idea
+TeachingKidsProgramming.Source.Java.iml
+
+*.orig
+*.received.*

.project

@@ -10,8 +10,14 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>

.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,6 @@
+eclipse.preferences.version=1
+encoding//src/main/java=ISO-8859-1
+encoding//src/main/resources=ISO-8859-1
+encoding//src/test/java=ISO-8859-1
+encoding//src/test/resources=ISO-8859-1
+encoding/<project>=ISO-8859-1

.settings/org.eclipse.jdt.ui.prefs

@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+formatter_profile=_Spun
+formatter_settings_version=12

.settings/org.eclipse.m2e.core.prefs

@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1

TeachingKidsProgramming.iml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Maven: junit:junit:4.12" level="project" />
+    <orderEntry type="library" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
+    <orderEntry type="library" name="Maven: javax.servlet:javax.servlet-api:3.1.0" level="project" />
+    <orderEntry type="library" name="Maven: velocity:velocity:1.4" level="project" />
+    <orderEntry type="library" scope="RUNTIME" name="Maven: velocity:velocity-dep:1.4" level="project" />
+    <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
+    <orderEntry type="library" name="Maven: log4j:log4j:1.2.14" level="project" />
+  </component>
+</module>

build/build.xml → build.xml

@@ -1,61 +1,67 @@
-<project name="Teaching Kids Programming" basedir="." default="Publish    TeachingKidsProgramming">
-	<target name="compile" depends="cleanUp">
-		<mkdir dir="${build}" />
-		<delete dir="${build}/com/spun" />
-		<echo>${targetJavaClass}</echo>
-		<javac srcdir="${src}:${additonal_java_sources}" destdir="${build}" debug="true" includes="${targetJavaClass}" target="1.7" source="1.7" listfiles="true">
-			<exclude name="**/tests/**" if="excludeTests" />
+<?xml version="1.0"?>
+<project name="Teaching Kids Programming" basedir="." default="Publish    TeachingKidsProgramming" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
 
-			<classpath>
-				<fileset dir="${src}/jars">
-					<include name="**/*.jar" />
-				</fileset>
-				<fileset dir="${additonal_java_sources}/jars">
-					<include name="**/*.jar" />
-				</fileset>
 
-			</classpath>
-		</javac>
+	<property name="home" value="." />
+	<property name="src" value="${home}/src/main/java" />
+	<property name="rsrc" value="${home}/src/main/resources" />
+	<property name="build_home" value="/tmp/builds" />
+	<property name="build" value="${build_home}/build" />
+	<property name="targetJavaClass" value="org/teachingextensions/**,you/**" />
+	<property name="jar" value="${build}/TeachingKidsProgramming.jar" />
+	<property name="tkp_workspace" value="${home}/../TeachingKidsProgramming.Java" />
+	<property name="tkp_project" value="${tkp_workspace}/TeachingKidsProgramming" />
+	<property name="documentation" value="${home}/build/resources/teaching_kids_programming" />
+	<property name="excludeTests" value="true" />
+
+	<!-- maven integration -->
+	<path id="maven-ant-tasks.classpath" path="build/maven-ant-tasks-2.1.3.jar" />
+	<typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="antlib:org.apache.maven.artifact.ant" classpathref="maven-ant-tasks.classpath" />
+	<artifact:pom id="tkppom" file="pom.xml" />
+	<artifact:dependencies filesetId="pomdeps" pomRefId="tkppom" pathId="dependency.classpath" />
+
+	<target name="cleanTeachingKidsProgramming" description="Delete generated files from Eclipse project.">
+		<delete dir="${tkp_project}/bin" failonerror="false" />
+		<delete dir="${tkp_project}/src" failonerror="false" />
+		<delete dir="${tkp_project}/build" failonerror="false" />
 	</target>
-	<target name="cleanUp">
+
+	<target name="cleanUp" description="Delete files from temp build directory.">
 		<delete dir="${build}" />
 	</target>
 
-	<target name="buildJarFile" depends="compile">
+	<target name="compile" depends="cleanUp" description="Compile sources.">
+		<mkdir dir="${build}" />
+		<echo>${targetJavaClass}</echo>
+		<javac includeantruntime="false" srcdir="${src}" destdir="${build}" debug="true" includes="${targetJavaClass}" target="1.7" source="1.7" listfiles="true">
+			<exclude name="**/tests/**" if="excludeTests" />
+			<classpath refid="dependency.classpath" />
+		</javac>
+	</target>
+
+	<target name="stagesrc" description="Copy source files to temp build directory.">
 		<mkdir dir="${build}/src" />
 		<copy todir="${build}/src">
 			<fileset dir="${src}" includes="${targetJavaClass}/*.java">
 				<exclude name="**/tests/**" if="excludeTests" />
 			</fileset>
 		</copy>
 		<copy todir="${build}">
-			<fileset dir="${src}" includes="${targetJavaClass}/*.png" />
+			<fileset dir="${rsrc}" includes="*.png" />
 		</copy>
+		<copy todir="${build}/src/org/teachingextensions/logo">
+			<fileset dir="${rsrc}" includes="*.png" />
+		</copy>
+	</target>
+
+	<target name="buildJarFile" depends="compile, stagesrc" description="Create jar file.">
 		<delete file="${jar}" failonerror="false" />
 		<jar destfile="${jar}" update="false">
 			<fileset dir="${build}" includes="**" />
-
 		</jar>
 	</target>
-	<target name="createDownload" depends="buildJarFile">
-		<zip destfile="${zip}" basedir="${build}" includes="*.jar,*.txt">
-			<fileset dir="${documentation}" includes="**" />
-		</zip>
-	</target>
 
-
-	<target name="Publish    TeachingKidsProgramming">
-		<property file="properties/teaching_kids_programming.properties" />
-		<antcall target="createTeachingKidsProgramming" />
-	</target>
-
-	<target name="cleanTeachingKidsProgramming">
-		<delete dir="${tkp_project}/bin" failonerror="false" />
-		<delete dir="${tkp_project}/src" failonerror="false" />
-		<delete dir="${tkp_project}/build" failonerror="false" />
-	</target>
-
-	<target name="createTeachingKidsProgramming" depends="cleanTeachingKidsProgramming, buildJarFile">
+	<target name="createTeachingKidsProgramming" depends="cleanTeachingKidsProgramming, buildJarFile" description="Copy build files to Eclipse project.">
 		<copy file="${build}/TeachingKidsProgramming.jar" todir="${tkp_project}/src/jars" />
 		<copy file="${documentation}/build.xml" todir="${tkp_project}/build" />
 		<copy todir="${tkp_project}/src" verbose="true">
@@ -71,11 +77,26 @@
 		<zip destfile="${build}/tkp_workspace.v${version}.zip" basedir="${tkp_workspace}" includes="**">
 		</zip>
 	</target>
+
+	<target name="Publish    TeachingKidsProgramming" description="Publish Eclipse Project">
+		<property file="properties/teaching_kids_programming.properties" />
+		<antcall target="createTeachingKidsProgramming" />
+	</target>
+
+
+	<!-- Other targets -->
+	<target name="createDownload" depends="buildJarFile">
+		<zip destfile="${zip}" basedir="${build}" includes="*.jar,*.txt">
+			<fileset dir="${documentation}" includes="**" />
+		</zip>
+	</target>
+
 	<target name="Publish    TKP Launcher">
 		<property file="properties/tkplauncher.properties" />
 		<antcall target="buildExecutableTkpJarFile" />
 
 	</target>
+
 	<target name="buildExecutableTkpJarFile" depends="compile">
 		<jar destfile="${jar}/TKP_Launcher.jar" update="false">
 			<fileset dir="${build}" includes="**" />
@@ -84,6 +105,7 @@
 			</manifest>
 		</jar>
 	</target>
+
 	<target name="Publish    TKP ThumbDriveInstaller">
 		<property file="properties/tkplauncher.properties" />
 		<antcall target="buildThumbDriveInstaller" />

build/properties/teaching_kids_programming.properties

@@ -1,13 +1,9 @@
-home=C:/Users/lynnlangit/Documents/GitHub/TKPSource/TeachingKidsProgramming.Source.Java
-src=${home}/src
-tkp_workspace=C:/Users/lynnlangit/Documents/GitHub/TeachingKidsProgramming.Java
-tkp_project=${tkp_workspace}/TeachingKidsProgramming
-build_home=/temp/builds
-build=${build_home}/build
-targetJavaClass=org/teachingextensions/**,you/**
-additonal_java_sources=C:/Users/lynnlangit/Documents/GitHub/ApprovalTests.Java/java
+
+
+
+additonal_java_sources=${home}/../ApprovalTests.Java/java
 jars=${src}/jars
-jar=${build}/TeachingKidsProgramming.jar
 
-documentation=${home}/build/resources/teaching_kids_programming
-excludeTests=true
+
+
+

pom.xml

@@ -0,0 +1,121 @@
+<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/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.teachingkidsprogramming</groupId>
+    <artifactId>TeachingKidsProgramming</artifactId>
+    <version>0.0.3-SNAPSHOT</version>
+    <packaging>jar</packaging>
+    <name>${project.groupId}:${project.artifactId}</name>
+    <description>A proven library of high-quality programming courseware for kids. TKP is a designated project of the US
+        non-profit (501c3) the MONA Foundation. The mission of the MONA Foundation is to &quot;support grassroots
+        educational initiatives that educate everyone—including girls.&quot;</description>
+    <url>http://teachingkidsprogramming.org/</url>
+    <licenses>
+        <license>
+            <name>The Apache License, Version 2.0</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
+    </licenses>
+    <developers>
+        <developer>
+            <name>Jim Counts</name>
+            <email>[email protected]</email>
+            <organization>Teaching Kids Programming</organization>
+            <organizationUrl>http://teachingkidsprogramming.org/</organizationUrl>
+        </developer>
+        <developer>
+            <name>Lynn Langit</name>
+            <email>[email protected]</email>
+            <organization>Teaching Kids Programming</organization>
+            <organizationUrl>http://teachingkidsprogramming.org/</organizationUrl>
+        </developer>
+    </developers>
+    <scm>
+        <connection>scm:git:[email protected]:TeachingKidsProgramming/TeachingKidsProgramming.Source.Java.git</connection>
+        <developerConnection>scm:git:[email protected]:TeachingKidsProgramming/TeachingKidsProgramming.Source.Java.git
+        </developerConnection>
+        <url>[email protected]:TeachingKidsProgramming/TeachingKidsProgramming.Source.Java.git</url>
+    </scm>
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>velocity</groupId>
+            <artifactId>velocity</artifactId>
+            <version>1.4</version>
+        </dependency>
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>3.2.1</version>
+        </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.14</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.10.1</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.2</version>
+                <configuration>
+                    <source>1.7</source>
+                    <target>1.7</target>
+                    <encoding>ISO-8859-1</encoding>
+                    <compilerArgument>-Xlint:unchecked</compilerArgument>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-repository-plugin</artifactId>
+                <version>2.4</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-gpg-plugin</artifactId>
+                <version>1.6</version>
+                <executions>
+                    <execution>
+                        <id>sign-artifacts</id>
+                        <phase>verify</phase>
+                        <goals>
+                            <goal>sign</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <organization>
+        <url>http://teachingkidsprogramming.org/</url>
+        <name>Teaching Kids Programming</name>
+    </organization>
+    <properties>
+        <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
+    </properties>
+    <distributionManagement>
+        <repository>
+            <id>sonatype</id>
+            <!-- <url>https://oss.sonatype.org/content/repositories/snapshots</url> -->
+            <url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
+        </repository>
+    </distributionManagement>
+</project>