jvanzyl 02/01/15 21:17:08
Modified: . build.xml
src/test/org/apache/stratum/xo/datamodel
TestDatamodelMapping.java
src/test/org/apache/stratum/xo/person TestPersonMapper.java
Added: . tdk.jar
notes NOTES.txt
Log:
- adding a target to the build to download the jars necessary for
building stratum. shouldn't affect the way people are doing things
now and it shouldn't affect gump.
- the tdk.jar is required because that's where i put the modified
<get> task for now.
- so 'ant update-jars' should pull everything down you need or bring
down jars that have changed.
Revision Changes Path
1.9 +24 -4 jakarta-turbine-stratum/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/build.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- build.xml 15 Jan 2002 23:01:51 -0000 1.8
+++ build.xml 16 Jan 2002 05:17:08 -0000 1.9
@@ -15,7 +15,6 @@
<pathelement location="${junit.jar}"/>
<pathelement location="${commons-beanutils.jar}"/>
<pathelement location="${commons-util.jar}"/>
-
<pathelement location="${jgl.jar}"/>
<pathelement location="${jetty.jar}"/>
<pathelement location="${microstar.xml.jar}"/>
@@ -26,12 +25,33 @@
<pathelement location="${hsqldb.jar}"/>
<pathelement location="${jisp.jar}"/>
<pathelement location="${javaclass.jar}"/>
-
<pathelement location="${jaf.jar}"/>
-
<pathelement location="${build.dest}"/>
-
+
+ <!-- This is required to bootstrap the build -->
+ <pathelement location="tdk.jar"/>
</path>
+
+ <!-- ================================================================== -->
+ <!-- U P D A T E J A R S -->
+ <!-- ================================================================== -->
+
+ <target
+ name="update-jars">
+
+ <taskdef
+ name="httpget"
+ className="org.apache.tdk.task.Get">
+ <classpath refid="classpath"/>
+ </taskdef>
+
+ <httpget
+ baseUrl="http://jakarta.apache.org/turbine/jars/";
+ dest="${lib.repo}"
+ dependencyFile="deps.list"
+ />
+
+ </target>
<!-- ================================================================== -->
<!-- E N V I R O N M E N T -->
1.1 jakarta-turbine-stratum/tdk.jar
<<Binary file>>
1.1 jakarta-turbine-stratum/notes/NOTES.txt
Index: NOTES.txt
===================================================================
o Get the xo mapper fully working with the resources input streams and
wire up Turbine to use the resources package so that it can locate
resources as required.
o Figure out some way to get id inclusion working for all resource
types
o Cleanup the Mapper class as there is some cruft left over after
making the tests work again.
1.2 +2 -2
jakarta-turbine-stratum/src/test/org/apache/stratum/xo/datamodel/TestDatamodelMapping.java
Index: TestDatamodelMapping.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-stratum/src/test/org/apache/stratum/xo/datamodel/TestDatamodelMapping.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestDatamodelMapping.java 30 Dec 2001 18:00:38 -0000 1.1
+++ TestDatamodelMapping.java 16 Jan 2002 05:17:08 -0000 1.2
@@ -39,8 +39,8 @@
try
{
Mapper m = new Mapper();
- //m.setDebug(true);
- Database d = (Database) m.map(TEST_DOCUMENT, TEST_CLASS);
+ m.setDebug(true);
+ Database d = (Database) m.map(new File(TEST_DOCUMENT), TEST_CLASS);
// Check database properties
assertTrue("bookstore".equals(d.getName()));
1.3 +2 -2
jakarta-turbine-stratum/src/test/org/apache/stratum/xo/person/TestPersonMapper.java
Index: TestPersonMapper.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-stratum/src/test/org/apache/stratum/xo/person/TestPersonMapper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestPersonMapper.java 15 Jan 2002 12:41:01 -0000 1.2
+++ TestPersonMapper.java 16 Jan 2002 05:17:08 -0000 1.3
@@ -39,8 +39,8 @@
try
{
Mapper m = new Mapper();
- //m.setDebug(true);
- Person p = (Person) m.map(TEST_DOCUMENT, TEST_CLASS);
+ m.setDebug(true);
+ Person p = (Person) m.map(new File(TEST_DOCUMENT), TEST_CLASS);
assertEquals("Jason",p.getFirstName());
assertEquals("van Zyl",p.getLastName());
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
