[Objectlabkit-svn] SF.net SVN: objectlabkit: [126] trunk

[<be...@us...>]

Revision: 126
          http://svn.sourceforge.net/objectlabkit/?rev=126&view=rev
Author:   benoitx
Date:     2006-09-07 10:34:27 -0700 (Thu, 07 Sep 2006)

Log Message:
-----------
Found a "nice" way to include the common classes as a JAR in the JDK and JODA jars.

Modified Paths:
--------------
    trunk/datecalc-jdk/maven.xml
    trunk/datecalc-jdk/project.xml
    trunk/datecalc-joda/maven.xml
    trunk/datecalc-joda/project.xml

Added Paths:
-----------
    trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkCalendarCalculatorFactoryTest.java

Modified: trunk/datecalc-jdk/maven.xml
===================================================================
--- trunk/datecalc-jdk/maven.xml	2006-09-07 17:24:20 UTC (rev 125)
+++ trunk/datecalc-jdk/maven.xml	2006-09-07 17:34:27 UTC (rev 126)
@@ -15,6 +15,7 @@
    <goal name="kit:rebuild" prereqs="clean,kit:build" />
 
    <goal name="kit:build" prereqs="jar:jar">
+   <!--
       <echo>ADD Common to full JAR</echo>
       <ant:jar basedir="target/classes"
          jarfile="${maven.build.dir}/${pom.artifactId}-full-${pom.currentVersion}.jar"
@@ -22,6 +23,6 @@
          <fileset dir="${basedir}/../datecalc-common/target/classes"
             excludes="**/Test.class" includes="**/*.class" />
       </ant:jar>
-
+   -->
    </goal>
 </project>

Modified: trunk/datecalc-jdk/project.xml
===================================================================
--- trunk/datecalc-jdk/project.xml	2006-09-07 17:24:20 UTC (rev 125)
+++ trunk/datecalc-jdk/project.xml	2006-09-07 17:34:27 UTC (rev 126)
@@ -56,6 +56,15 @@
               </resource>
          </resources>
       </unitTest>
+         <resources>
+             <resource>
+                 <directory>../datecalc-common/target/</directory>
+                 <filtering>false</filtering>
+                 <includes>
+                       <include>*.jar</include>
+                  </includes>
+              </resource>
+         </resources>
    </build>
 
 </project>

Added: trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkCalendarCalculatorFactoryTest.java
===================================================================
--- trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkCalendarCalculatorFactoryTest.java	                        (rev 0)
+++ trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkCalendarCalculatorFactoryTest.java	2006-09-07 17:34:27 UTC (rev 126)
@@ -0,0 +1,20 @@
+package net.objectlab.kit.datecalc.jdk;
+
+import java.util.Calendar;
+
+import net.objectlab.kit.datecalc.common.AbstractDateCalculatorFactoryTest;
+import net.objectlab.kit.datecalc.common.DateCalculatorFactory;
+import net.objectlab.kit.datecalc.common.Utils;
+
+public class JdkCalendarCalculatorFactoryTest extends AbstractDateCalculatorFactoryTest<Calendar> {
+
+    @Override
+    protected Calendar newDate(final String date) {
+        return Utils.createCalendar(date);
+    }
+
+    @Override
+    protected DateCalculatorFactory<Calendar> getDateCalculatorFactory() {
+        return DefaultJdkCalendarCalculatorFactory.getDefaultInstance();
+    }
+}

Modified: trunk/datecalc-joda/maven.xml
===================================================================
--- trunk/datecalc-joda/maven.xml	2006-09-07 17:24:20 UTC (rev 125)
+++ trunk/datecalc-joda/maven.xml	2006-09-07 17:34:27 UTC (rev 126)
@@ -15,6 +15,7 @@
    <goal name="kit:rebuild" prereqs="clean,kit:build" />
 
    <goal name="kit:build" prereqs="jar:jar">
+<!--
       <echo>ADD Common classes to full JAR</echo>
 
       <ant:jar basedir="target/classes"
@@ -23,6 +24,6 @@
          <fileset dir="${basedir}/../datecalc-common/target/classes"
             excludes="**/Test.class" includes="**/*.class" />
       </ant:jar>
-
+-->
    </goal>
 </project>

Modified: trunk/datecalc-joda/project.xml
===================================================================
--- trunk/datecalc-joda/project.xml	2006-09-07 17:24:20 UTC (rev 125)
+++ trunk/datecalc-joda/project.xml	2006-09-07 17:34:27 UTC (rev 126)
@@ -57,5 +57,14 @@
                  </resource>
             </resources>           
         </unitTest>
+         <resources>
+             <resource>
+                 <directory>../datecalc-common/target/</directory>
+                 <filtering>false</filtering>
+                 <includes>
+                       <include>*.jar</include>
+                  </includes>
+              </resource>
+         </resources>
     </build>
 </project>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.