[xdoclet-scm] [CVS xdoclet] some cleanup before redeployment ( qdox is at 1.6.1 now )

[ko5tik]

Commit in xdoclet on MAIN
pom.xml		-14	1.11 -> 1.12
src/main/java/org/xdoclet/ant/XDocletTask.java	+5	-4	1.8 -> 1.9
	+5	-18

2 modified files

some cleanup before redeployment ( qdox is at 1.6.1 now )

---

xdoclet

pom.xml 1.11 -> 1.12

diff -u -r1.11 -r1.12
--- pom.xml	14 Oct 2006 19:01:16 -0000	1.11
+++ pom.xml	29 Oct 2006 13:16:21 -0000	1.12
@@ -110,20 +110,6 @@

     <build>
         <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
         <testSourceDirectory>${basedir}/src/test/java</testSourceDirectory>

-        <!--
-        <resources>
-            <resource>
-                <directory>${basedir}/src/main/java</directory>
-                <includes>
-                    <include>**/*.jelly</include>
-                    <include>**/*.vm</include>
-                    <include>**/*.xml</include>
-                    <include>**/*.gif</include>
-                    <include>**/*.dtd</include>
-                </includes>
-            </resource>
-        </resources>
-        -->

         <testResources>
             <testResource>
                 <directory>${basedir}/src/test/java</directory>

---

xdoclet/src/main/java/org/xdoclet/ant

XDocletTask.java 1.8 -> 1.9

diff -u -r1.8 -r1.9
--- XDocletTask.java	14 Oct 2006 18:55:57 -0000	1.8
+++ XDocletTask.java	29 Oct 2006 13:16:21 -0000	1.9
@@ -21,7 +21,7 @@

 
 /**
  * @author Aslak Hellesøy

- * @version $Revision: 1.8 $

+ * @version $Revision: 1.9 $

  */
 public class XDocletTask extends AbstractGeneramaTask {
 	Collection filesets = new ArrayList();

@@ -40,9 +40,10 @@

 				pico.registerComponentInstance(getProject());
 				pico.registerComponentInstance(encoding);
 				pico.registerComponentInstance(verbose);

-				pico.registerComponentImplementation(PropertyComposer.class);
-				pico.registerComponentImplementation(SystemQDoxPropertyExpander.class);
-				pico.registerComponentInstance(new MyPropertiesQDoxPropertyExpander());

+				// turn em off, until we discover how to configure them properly
+//				pico.registerComponentImplementation(PropertyComposer.class);
+//				pico.registerComponentImplementation(SystemQDoxPropertyExpander.class);
+//				pico.registerComponentInstance(new MyPropertiesQDoxPropertyExpander());

 			}
 		};
 	}

CVSspam 0.2.12

To unsubscribe from this list please visit:


    http://xircles.codehaus.org/manage_email