epugh 2003/11/21 11:05:33
Modified: . project.xml
xdocs changes.xml
conf/test/merlin/BLOCK-INF block.xml
Log:
Fixed IntakeTool test!
Revision Changes Path
1.150 +3 -0 jakarta-turbine-2/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/project.xml,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -r1.149 -r1.150
--- project.xml 18 Nov 2003 11:54:01 -0000 1.149
+++ project.xml 21 Nov 2003 19:05:32 -0000 1.150
@@ -734,6 +734,9 @@
<includes>
<include>**/*Test.java</include>
</includes>
+ <excludes>
+ <exclude>**/*Intake*Test*.java</exclude>
+ </excludes>
</unitTest>
<integrationUnitTestSourceDirectory/>
<integrationUnitTest/>
1.77 +5 -3 jakarta-turbine-2/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/xdocs/changes.xml,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- changes.xml 2 Nov 2003 21:51:28 -0000 1.76
+++ changes.xml 21 Nov 2003 19:05:33 -0000 1.77
@@ -67,9 +67,11 @@
container. Merlin has many many features to help with dealing with
components. Thanks to Peter for this!
</li>
<li>
- The cache, crypto, mimetype services have now been deprecated in favor
- of the Fulcrum versions as well. Turbine security now uses the Fulcrum
- crypto component.
+ The cache, crypto, localization, intake, factory, and mimetype services
have now been deprecated in favor
+ of the Fulcrum versions as well.
+ </li>
+ <li>
+ Turbine security now uses the Fulcrum crypto component.
</li>
<li>
The intake service within Turbine has been deprecated in favor
1.6 +2 -2 jakarta-turbine-2/conf/test/merlin/BLOCK-INF/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/conf/test/merlin/BLOCK-INF/block.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- block.xml 19 Nov 2003 14:05:39 -0000 1.5
+++ block.xml 21 Nov 2003 19:05:33 -0000 1.6
@@ -33,9 +33,9 @@
class="org.apache.fulcrum.intake.IntakeServiceImpl"
activation="lazy">
<configuration>
- <serialDataPath>./target/appData.ser</serialDataPath>
+ <serialDataPath>../../target/appData.ser</serialDataPath>
<xmlPaths>
- <xmlPath>conf/test/intake.xml</xmlPath>
+ <xmlPath>../../conf/test/intake.xml</xmlPath>
</xmlPaths>
</configuration>
</component>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
