[fant commit] r93 - in trunk: etc/ant-inc src/main/java/com/google/ant/extensions src/main/java/com/google/ant/...

2 views

Skip to first unread message

codesite...@google.com

unread,

Jul 2, 2008, 8:50:41 AM7/2/08

to fant...@googlegroups.com

Author: maomaode
Date: Wed Jul 2 05:50:30 2008
New Revision: 93

Modified:
trunk/etc/ant-inc/project-common.xml
trunk/etc/ant-inc/project.xml
trunk/src/main/java/com/google/ant/extensions/SourceRepo.java
trunk/src/main/java/com/google/ant/extensions/types/Module.java

Log:
* Use the module project to register the module into the source repo
* Move the xjc out of project-common

--____________--

M src/main/java/com/google/ant/extensions/types/Module.java
M src/main/java/com/google/ant/extensions/SourceRepo.java
M etc/ant-inc/project-common.xml
M etc/ant-inc/project.xml

Modified: trunk/etc/ant-inc/project-common.xml
==============================================================================
--- trunk/etc/ant-inc/project-common.xml (original)
+++ trunk/etc/ant-inc/project-common.xml Wed Jul 2 05:50:30 2008
@@ -6,6 +6,5 @@
<import file="${fant.etc.dir}/ant-inc/test.xml"/>
<import file="${fant.etc.dir}/ant-inc/validate.xml"/>
<import file="${fant.etc.dir}/ant-inc/javadoc.xml"/>
- <import file="${fant.etc.dir}/ant-inc/xjc.xml"/>
<import file="${fant.etc.dir}/ant-inc/package.xml"/>
</project>

Modified: trunk/etc/ant-inc/project.xml
==============================================================================
--- trunk/etc/ant-inc/project.xml (original)
+++ trunk/etc/ant-inc/project.xml Wed Jul 2 05:50:30 2008
@@ -5,5 +5,6 @@
<import file="${fant.etc.dir}/ant-inc/spell.xml"/>
<import file="${fant.etc.dir}/ant-inc/coverage.xml"/>
<import file="${fant.etc.dir}/ant-inc/format.xml"/>
+ <import file="${fant.etc.dir}/ant-inc/xjc.xml"/>
<import file="${fant.etc.dir}/ant-inc/wsdl.xml"/>
</project>

Modified: trunk/src/main/java/com/google/ant/extensions/SourceRepo.java
==============================================================================
--- trunk/src/main/java/com/google/ant/extensions/SourceRepo.java (original)
+++ trunk/src/main/java/com/google/ant/extensions/SourceRepo.java Wed
Jul 2 05:50:30 2008
@@ -26,7 +26,7 @@
public File getSourceRepo() {
String fantBase = System.getProperty("FANT_HOME");
if (fantBase == null && project != null) {
- fantBase = project.getProperty("ant.home") + "/etc/fant";
+ fantBase = project.getProperty("fant.etc.dir");
}
if (fantBase != null) {
System.setProperty("FANT_HOME", fantBase);

Modified: trunk/src/main/java/com/google/ant/extensions/types/Module.java
==============================================================================
--- trunk/src/main/java/com/google/ant/extensions/types/Module.java (original)
+++ trunk/src/main/java/com/google/ant/extensions/types/Module.java Wed
Jul 2 05:50:30 2008
@@ -156,7 +156,7 @@
}

public void selfRegister() {
- new SourceRepo(getProject()).add(this);
+ new SourceRepo(this.moduleProject).add(this);
}