Menu
▾
▴
antworks-cvs — CVS notifications for Antworks
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
(132) |
Apr
(319) |
May
(116) |
Jun
(8) |
Jul
(25) |
Aug
(40) |
Sep
(2) |
Oct
(2) |
Nov
(1) |
Dec
(2) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(1) |
Nov
|
Dec
(1) |
|
From: Nick C. <ch...@us...> - 2004-07-31 23:04:13
|
Update of /cvsroot/antworks/antlets/makeantlet In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8480/makeantlet Modified Files: build.xml Log Message: Jarred andlet are now called name-version-antlet.jar. Index: build.xml =================================================================== RCS file: /cvsroot/antworks/antlets/makeantlet/build.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** build.xml 2 May 2004 03:26:28 -0000 1.6 --- build.xml 31 Jul 2004 23:04:04 -0000 1.7 *************** *** 20,24 **** <property name="project.name" value="makeantlet" /> ! <property name="project.version" value="0.2" /> --- 20,24 ---- <property name="project.name" value="makeantlet" /> ! <property name="project.version" value="0.3" /> |
|
From: Nick C. <ch...@us...> - 2004-07-28 16:39:56
|
Update of /cvsroot/antworks/importer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11496 Modified Files: build.xml Log Message: Added gump target. Index: build.xml =================================================================== RCS file: /cvsroot/antworks/importer/build.xml,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** build.xml 2 Jul 2004 06:27:05 -0000 1.20 --- build.xml 28 Jul 2004 16:39:47 -0000 1.21 *************** *** 68,72 **** <target name="all" depends="compile" /> ! </project> \ No newline at end of file --- 68,72 ---- <target name="all" depends="compile" /> ! <target name="gump" depends="dist-jar" /> </project> \ No newline at end of file |
|
From: Michael H. <hom...@us...> - 2004-07-19 10:16:06
|
Update of /cvsroot/antworks/antlets/tomcat5/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv360/tomcat5/src Modified Files: xbuild.xml Log Message: -war attribute in deploy tasks starts with file:/ - necessary to deploy to a remote server -checks if the war file exists Index: xbuild.xml =================================================================== RCS file: /cvsroot/antworks/antlets/tomcat5/src/xbuild.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** xbuild.xml 4 Jun 2004 14:21:36 -0000 1.8 --- xbuild.xml 19 Jul 2004 10:15:56 -0000 1.9 *************** *** 69,75 **** <target name="-tomcat5-antlet.init"> <!-- default archive to deploy --> ! <property name="tomcat5-antlet.deploy.archive" value="${dist.dir}/${project.name}-${project.version}.war"/> ! <available file="${tomcat5-antlet.deploy.archive" property="tomcat5-antlet.archive.available"/> <fail unless="tomcat5-antlet.archive.available"> --- 69,76 ---- <target name="-tomcat5-antlet.init"> <!-- default archive to deploy --> ! <property name="tomcat5-antlet.deploy.archive" ! value="${project.build.dir}/${project.name}-${project.version}.war"/> ! <available file="${tomcat5-antlet.deploy.archive}" property="tomcat5-antlet.archive.available"/> <fail unless="tomcat5-antlet.archive.available"> *************** *** 97,101 **** password="${deploy-tomcat.password}" path="${deploy-tomcat.path}" ! war="${tomcat5-antlet.deploy.archive}" /> --- 98,103 ---- password="${deploy-tomcat.password}" path="${deploy-tomcat.path}" ! url="${deploy-tomcat.url}" ! war="file:${tomcat5-antlet.deploy.archive}" /> *************** *** 114,117 **** --- 116,120 ---- password="${deploy-tomcat.password}" path="${deploy-tomcat.path}" + url="${deploy-tomcat.url}" /> <DeployTask *************** *** 119,123 **** password="${deploy-tomcat.password}" path="${deploy-tomcat.path}" ! war="${tomcat5-antlet.deploy.archive}" /> </target> --- 122,127 ---- password="${deploy-tomcat.password}" path="${deploy-tomcat.path}" ! war="file:${tomcat5-antlet.deploy.archive}" ! url="${deploy-tomcat.url}" /> </target> |
|
From: Nick C. <ch...@us...> - 2004-07-16 07:12:19
|
Update of /cvsroot/antworks/importer/src/java/org/krysalis/antworks/importer/depot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16809/src/java/org/krysalis/antworks/importer/depot Modified Files: DepotAntletFinder.java Log Message: Format, better logging. Index: DepotAntletFinder.java =================================================================== RCS file: /cvsroot/antworks/importer/src/java/org/krysalis/antworks/importer/depot/DepotAntletFinder.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DepotAntletFinder.java 16 Jul 2004 06:59:18 -0000 1.5 --- DepotAntletFinder.java 16 Jul 2004 07:12:09 -0000 1.6 *************** *** 20,23 **** --- 20,24 ---- import java.io.File; import java.net.URL; + import java.util.List; import org.apache.depot.update.Artifact; *************** *** 25,29 **** --- 26,34 ---- import org.apache.depot.update.ArtifactUpdater; import org.apache.depot.update.ArtifactUpdaterFactory; + import org.apache.depot.update.Repository; import org.apache.depot.update.UpdateException; + import org.apache.depot.update.query.ArtifactQuery; + import org.apache.depot.update.query.ArtifactQueryHelper; + import org.apache.depot.update.repository.RepositorySet; import org.apache.depot.version.Version; import org.apache.depot.version.VersionManager; *************** *** 32,35 **** --- 37,42 ---- import org.krysalis.antworks.importer.FinderHelper; + import sun.security.action.GetLongAction; + /** * Import an antlet the easy depot way. *************** *** 60,69 **** try { Version version = versionManager.createVersion(versionString); ! antlet = findLocal(name,version); if (antlet == null) { ! antlet = findRemote(name, repositoryURL, version); } } catch (Exception e) { ! helper.log(e.toString(), Project.MSG_VERBOSE); } return antlet; --- 67,76 ---- try { Version version = versionManager.createVersion(versionString); ! antlet = findLocal(name, version); if (antlet == null) { ! antlet = findRemote(name, repositoryURL, version); } } catch (Exception e) { ! helper.log(e.toString(), Project.MSG_WARN); } return antlet; *************** *** 73,79 **** * @param name * @param version * @return */ ! private File findLocal(String name, Version version) { // TODO Auto-generated method stub return null; --- 80,106 ---- * @param name * @param version + * @return @throws + * UpdateException + */ + private File findLocal(String name, Version version) throws UpdateException { + File dir; + Repository local = getLocalRepo(); + + Artifact antletArtifact = new Artifact("antlets", name, "dir", version); + + ArtifactQuery artifactQuery = ArtifactQueryHelper.getArtifactQuery( + antletArtifact, new RepositorySet(local)); + + List localInstances = updater.get(artifactQuery); + + return ((ArtifactInstance) localInstances.get(0)).getLocator() + .getLocation().getFile(); + + } + + /** * @return */ ! private Repository getLocalRepo() { // TODO Auto-generated method stub return null; |
|
From: Nick C. <ch...@us...> - 2004-07-16 06:59:27
|
Update of /cvsroot/antworks/importer/src/java/org/krysalis/antworks/importer/depot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14919/src/java/org/krysalis/antworks/importer/depot Modified Files: DepotAntletFinder.java Log Message: Refoactered out the small methods. still doesnt do anything. Index: DepotAntletFinder.java =================================================================== RCS file: /cvsroot/antworks/importer/src/java/org/krysalis/antworks/importer/depot/DepotAntletFinder.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** DepotAntletFinder.java 2 Jul 2004 08:11:46 -0000 1.4 --- DepotAntletFinder.java 16 Jul 2004 06:59:18 -0000 1.5 *************** *** 60,69 **** try { Version version = versionManager.createVersion(versionString); ! // TODO find local if (antlet == null) { ! File jar = findAntletJar(name, repositoryURL, version); ! if (jar != null) { ! antlet = extractAntletJar(jar); ! } } } catch (Exception e) { --- 60,66 ---- try { Version version = versionManager.createVersion(versionString); ! antlet = findLocal(name,version); if (antlet == null) { ! antlet = findRemote(name, repositoryURL, version); } } catch (Exception e) { *************** *** 74,77 **** --- 71,102 ---- /** + * @param name + * @param version + * @return + */ + private File findLocal(String name, Version version) { + // TODO Auto-generated method stub + return null; + } + + /** + * @param name + * @param repositoryURL + * @param antlet + * @param version + * @return @throws + * UpdateException + * @throws Exception + */ + private File findRemote(String name, URL repositoryURL, Version version) + throws UpdateException, Exception { + File jar = findAntletJar(name, repositoryURL, version); + if (jar != null) { + return extractAntletJar(jar); + } + return null; + } + + /** * @param jar * @return |
|
From: Nick C. <ch...@us...> - 2004-07-15 20:05:22
|
Update of /cvsroot/antworks/antlets/java/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13633/java/src Modified Files: xbuild.xml Log Message: Added java.antlet:javdocs.packagenames Index: xbuild.xml =================================================================== RCS file: /cvsroot/antworks/antlets/java/src/xbuild.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** xbuild.xml 15 Jul 2004 01:06:54 -0000 1.11 --- xbuild.xml 15 Jul 2004 20:05:12 -0000 1.12 *************** *** 431,437 **** </style> <mkdir dir="${java.antlet:javadocs.dir}" /> ! <javadoc packagenames="${project.package}.*" sourcepathref="${java.antlet:javadocs.source.path}" destdir="${java.antlet:javadocs.dir}" --- 431,439 ---- </style> + <!--Override when using multiple sourcedirs --> + <property name="java.antlet:javdocs.packagenames" value="${project.package}.*" /> <mkdir dir="${java.antlet:javadocs.dir}" /> ! <javadoc packagenames="${java.antlet:javdocs.packagenames}" sourcepathref="${java.antlet:javadocs.source.path}" destdir="${java.antlet:javadocs.dir}" |
|
From: Nick C. <ch...@us...> - 2004-07-15 01:07:07
|
Update of /cvsroot/antworks/antlets/java/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20151/java/src Modified Files: xbuild.xml Log Message: Setup for multiple src dir in Javadocs. Index: xbuild.xml =================================================================== RCS file: /cvsroot/antworks/antlets/java/src/xbuild.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** xbuild.xml 12 Jul 2004 22:37:32 -0000 1.10 --- xbuild.xml 15 Jul 2004 01:06:54 -0000 1.11 *************** *** 46,49 **** --- 46,54 ---- <!-- default to select all --> </selector> + + <!-- overriding this should allow for multiple src dirs --> + <path id="java.antlet:javadocs.source.path"> + <dirset dir="${project.src.dir}" /> + </path> <target name="-java.init"> <xmlproperty file="${java.antlet.dir}/conf/properties.xml" *************** *** 349,353 **** target: dist-sign ================================= --> ! <target name="dist-sign" description="Sign all files in the dist dir"> <checksum> <fileset dir="${dist.dir}"> --- 354,358 ---- target: dist-sign ================================= --> ! <target name="dist-sign" description="Sign all files in the dist dir"> <checksum> <fileset dir="${dist.dir}"> *************** *** 426,432 **** </style> <mkdir dir="${java.antlet:javadocs.dir}" /> <javadoc packagenames="${project.package}.*" ! sourcepath="${project.src.dir}" destdir="${java.antlet:javadocs.dir}" author="true" --- 431,438 ---- </style> + <mkdir dir="${java.antlet:javadocs.dir}" /> <javadoc packagenames="${project.package}.*" ! sourcepathref="${java.antlet:javadocs.source.path}" destdir="${java.antlet:javadocs.dir}" author="true" |
|
From: Nick C. <ch...@us...> - 2004-07-14 20:49:56
|
Update of /cvsroot/antworks/antlets/init/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2764/init/src Modified Files: xbuild.xml Log Message: Conditionall set tools.jar Index: xbuild.xml =================================================================== RCS file: /cvsroot/antworks/antlets/init/src/xbuild.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** xbuild.xml 14 May 2004 07:40:26 -0000 1.7 --- xbuild.xml 14 Jul 2004 20:49:47 -0000 1.8 *************** *** 69,75 **** includeSemanticAttribute="true" /> ! <!-- The location of tools.jar, relative to the JAVA_HOME home. --> ! <property name="tools.jar" value="${java.home}/../lib/tools.jar"/> ! <available file="${tools.jar}" property="tools.jar.present"/> <property name="dist.dir" value="./dist"/> --- 69,79 ---- includeSemanticAttribute="true" /> ! <!-- The location of tools.jar, relative to the JAVA_HOME home. --> ! <condition property="tools.jar" value="${java.home}/../lib/tools.jar"> ! <available file="${java.home}/../lib/tools.jar" /> ! </condition> ! <condition property="tools.jar" value="${java.home}/lib/tools.jar"> ! <available file="${java.home}/lib/tools.jar" /> ! </condition> <property name="dist.dir" value="./dist"/> |
|
From: Nick C. <ch...@us...> - 2004-07-12 22:37:42
|
Update of /cvsroot/antworks/antlets/java/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1902/java/src Modified Files: xbuild.xml Log Message: No need for an init. Index: xbuild.xml =================================================================== RCS file: /cvsroot/antworks/antlets/java/src/xbuild.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** xbuild.xml 12 Jul 2004 17:27:21 -0000 1.9 --- xbuild.xml 12 Jul 2004 22:37:32 -0000 1.10 *************** *** 349,353 **** target: dist-sign ================================= --> ! <target name="dist-sign" depends="init" description="Sign all files in the dist dir"> <checksum> <fileset dir="${dist.dir}"> --- 349,353 ---- target: dist-sign ================================= --> ! <target name="dist-sign" description="Sign all files in the dist dir"> <checksum> <fileset dir="${dist.dir}"> |
|
From: Nick C. <ch...@us...> - 2004-07-12 18:57:10
|
Update of /cvsroot/antworks/antlets/apache/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20324/apache/src Removed Files: antletdoc.xml Log Message: Donct check in generated file. --- antletdoc.xml DELETED --- |
|
From: Nick C. <ch...@us...> - 2004-07-12 17:27:29
|
Update of /cvsroot/antworks/antlets/java/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2026/java/src Modified Files: xbuild.xml Log Message: Add md5 signing to the dist. Index: xbuild.xml =================================================================== RCS file: /cvsroot/antworks/antlets/java/src/xbuild.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** xbuild.xml 14 May 2004 01:52:18 -0000 1.8 --- xbuild.xml 12 Jul 2004 17:27:21 -0000 1.9 *************** *** 17,45 **** --> <project default="compile" name="java.antlet"> ! <import file="usage.xml" /> ! <!-- Antlet Specific Properties --> ! <dirname property="java.antlet.dir" file="${ant.file.java.antlet}" /> ! <!-- TODO Packagelist for javadoc should be obtained from module.xml with jxpath --> ! <property name="project.package" value="*" /> ! <property name="java.antlet:javadocs.dir" [...1062 lines suppressed...] ! </xslt> ! <!-- build.xml --> ! <xslt basedir="." ! destdir="${java.antlet:xdocs.dir}" ! extension=".xml" ! force="true" ! style="${java.antlet:dir}/resources/stylesheets/build2document.xsl"> ! <include name="build.xml" /> ! </xslt> ! <copy todir="${java.antlet:xdocs.dir}"> ! <fileset dir="${java.antlet:dir}/resources/content"> ! <include name="*.xml" /> ! </fileset> ! </copy> </target> |
|
From: Nick C. <ch...@us...> - 2004-07-02 08:11:55
|
Update of /cvsroot/antworks/importer/src/java/org/krysalis/antworks/importer/depot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2140/src/java/org/krysalis/antworks/importer/depot Modified Files: DepotAntletFinder.java Log Message: Organize Imports. Index: DepotAntletFinder.java =================================================================== RCS file: /cvsroot/antworks/importer/src/java/org/krysalis/antworks/importer/depot/DepotAntletFinder.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** DepotAntletFinder.java 2 Jul 2004 08:07:56 -0000 1.3 --- DepotAntletFinder.java 2 Jul 2004 08:11:46 -0000 1.4 *************** *** 25,35 **** import org.apache.depot.update.ArtifactUpdater; import org.apache.depot.update.ArtifactUpdaterFactory; - import org.apache.depot.update.Repository; import org.apache.depot.update.UpdateException; - import org.apache.depot.update.repository.RepositorySet; import org.apache.depot.version.Version; - import org.apache.depot.version.VersionException; import org.apache.depot.version.VersionManager; - import org.apache.depot.version.VersionMarker; import org.apache.tools.ant.Project; import org.krysalis.antworks.importer.AntletFinder; --- 25,31 ---- |
|
From: Nick C. <ch...@us...> - 2004-07-02 08:08:06
|
Update of /cvsroot/antworks/importer/src/java/org/krysalis/antworks/importer/depot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1093/src/java/org/krysalis/antworks/importer/depot Modified Files: DepotAntletFinder.java Log Message: Addied first guess at stug. Index: DepotAntletFinder.java =================================================================== RCS file: /cvsroot/antworks/importer/src/java/org/krysalis/antworks/importer/depot/DepotAntletFinder.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DepotAntletFinder.java 1 Jul 2004 08:32:25 -0000 1.2 --- DepotAntletFinder.java 2 Jul 2004 08:07:56 -0000 1.3 *************** *** 21,27 **** --- 21,36 ---- import java.net.URL; + import org.apache.depot.update.Artifact; + import org.apache.depot.update.ArtifactInstance; import org.apache.depot.update.ArtifactUpdater; import org.apache.depot.update.ArtifactUpdaterFactory; + import org.apache.depot.update.Repository; import org.apache.depot.update.UpdateException; + import org.apache.depot.update.repository.RepositorySet; + import org.apache.depot.version.Version; + import org.apache.depot.version.VersionException; + import org.apache.depot.version.VersionManager; + import org.apache.depot.version.VersionMarker; + import org.apache.tools.ant.Project; import org.krysalis.antworks.importer.AntletFinder; import org.krysalis.antworks.importer.FinderHelper; *************** *** 36,53 **** public class DepotAntletFinder implements AntletFinder { private final FinderHelper helper; private final ArtifactUpdater updater; public DepotAntletFinder(FinderHelper helper) throws UpdateException { this.helper = helper; updater = ArtifactUpdaterFactory.getDefaultUpdater(); } ! public File findAntlet(String name, String version, URL repositoryURL, ! File antletsDir) { // TODO Auto-generated method stub return null; } ! } \ No newline at end of file --- 45,106 ---- public class DepotAntletFinder implements AntletFinder { private final FinderHelper helper; + private final ArtifactUpdater updater; + private final VersionManager versionManager; + public DepotAntletFinder(FinderHelper helper) throws UpdateException { this.helper = helper; updater = ArtifactUpdaterFactory.getDefaultUpdater(); + versionManager = VersionManager.getManager(); } ! public File findAntlet(String name, String versionString, ! URL repositoryURL, File antletsDir) { ! File antlet = null; ! if (versionString == null) { ! versionString = "0"; ! } ! try { ! Version version = versionManager.createVersion(versionString); ! // TODO find local ! if (antlet == null) { ! File jar = findAntletJar(name, repositoryURL, version); ! if (jar != null) { ! antlet = extractAntletJar(jar); ! } ! } ! } catch (Exception e) { ! helper.log(e.toString(), Project.MSG_VERBOSE); ! } ! return antlet; ! } ! ! /** ! * @param jar ! * @return ! */ ! private File extractAntletJar(File jar) { // TODO Auto-generated method stub return null; } ! /** ! * @param name ! * @param repositoryURL ! * @param version ! * @return @throws ! * UpdateException ! * @throws Exception ! */ ! private File findAntletJar(String name, URL repositoryURL, Version version) ! throws UpdateException, Exception { ! File jar; ! updater.addRepositryFromURL(repositoryURL); ! Artifact antletArtifact = new Artifact("antlets", name, "jar", version); ! ArtifactInstance ai = updater.getInstance(antletArtifact); ! jar = ai.getLocator().getLocation().getFile(); ! return jar; ! } } \ No newline at end of file |
|
From: Nick C. <ch...@us...> - 2004-07-02 06:27:13
|
Update of /cvsroot/antworks/importer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16757 Modified Files: build.xml Log Message: Conditional compile is working. Index: build.xml =================================================================== RCS file: /cvsroot/antworks/importer/build.xml,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** build.xml 1 Jul 2004 08:34:42 -0000 1.19 --- build.xml 2 Jul 2004 06:27:05 -0000 1.20 *************** *** 32,35 **** --- 32,41 ---- + <selector id="needs.depot"> + <filename name="org/krysalis/antworks/importer/depot/*.java" casesensitive="false" /> + </selector> + <available property="depot.present" classname="org.apache.depot.updater.Artifact" /> + + <!-- for forrest --> <property name="forrest.antlet.site.hostname" value="antworks.sourceforge.net" /> *************** *** 45,55 **** - <path id="antworks-importer.classpath"> ! <fileset dir="lib"> ! <include name="*.jar" /> </fileset> </path> <target name="all" depends="compile" /> --- 51,69 ---- <path id="antworks-importer.classpath"> ! ! <fileset dir="."> ! <include name="lib/*.jar" /> </fileset> </path> + <!-- note this must be after the java antlet--> + <selector id="conditional.compile"> + <not> + <or> + <selector refid="needs.depot" unless="depot.present" /> + </or> + </not> + </selector> <target name="all" depends="compile" /> |
|
From: Nick C. <ch...@us...> - 2004-07-02 06:20:26
|
Update of /cvsroot/antworks/importer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15951 Modified Files: build-bootstrap.xml Log Message: Don't compile depot for now. Index: build-bootstrap.xml =================================================================== RCS file: /cvsroot/antworks/importer/build-bootstrap.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** build-bootstrap.xml 25 Apr 2004 04:58:16 -0000 1.13 --- build-bootstrap.xml 2 Jul 2004 06:20:16 -0000 1.14 *************** *** 37,47 **** </target> <target name="gump" description="Default Gump target" depends="build" /> ! <target name="gump-package" ! description="Default Gump target for packaged Importer" ! depends="build, install-ant, gump" /> <target name="build"> <!-- NEEDED? delete file="${lib.dir}/antworks-importer.jar" failonerror="false" / --> <mkdir dir="${classes.dir}" /> <javac srcdir="${src.dir}" destdir="${classes.dir}" debug="true" target="1.2"> <classpath> <path> --- 37,46 ---- </target> <target name="gump" description="Default Gump target" depends="build" /> ! <target name="gump-package" description="Default Gump target for packaged Importer" depends="build, install-ant, gump" /> <target name="build"> <!-- NEEDED? delete file="${lib.dir}/antworks-importer.jar" failonerror="false" / --> <mkdir dir="${classes.dir}" /> <javac srcdir="${src.dir}" destdir="${classes.dir}" debug="true" target="1.2"> + <exclude name="org/krysalis/antworks/importer/depot/**" /> <classpath> <path> |
|
From: Nick C. <ch...@us...> - 2004-07-01 08:34:51
|
Update of /cvsroot/antworks/importer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4411 Modified Files: build.xml Log Message: Format. Index: build.xml =================================================================== RCS file: /cvsroot/antworks/importer/build.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** build.xml 6 May 2004 07:17:26 -0000 1.18 --- build.xml 1 Jul 2004 08:34:42 -0000 1.19 *************** *** 26,62 **** <property name="project.version" value="0.2" /> <property name="project.src.dir" value="src/java" /> ! ! <!-- Pickup the ability to importAntlets --> ! <typedef resource="org/krysalis/antworks/importer/antlib.xml" ! classpath="build/antworks-importer/classes" ! /> <!-- for forrest --> ! <property name="forrest.antlet.site.hostname" ! value="antworks.sourceforge.net" ! /> ! <property name="forrest.antlet.site.remotedir" ! value="/home/groups/a/an/antworks/htdocs/importer" ! /> <property name="forrest.antlet.site.group" value="antworks" /> ! <property name="importer.repository" value="http://antworks.sourceforge.net/library/antlets/" /> ! <importer name="init-0.1" ! href="${importer.repository}" ! /> ! <importer name="java-0.1" ! href="${importer.repository}" ! /> ! <importer name="junit-0.1" ! href="${importer.repository}" ! /> ! <importer name="forrest-0.1" ! href="${importer.repository}" ! /> ! <importer name="sourceforge-0.1" ! href="${importer.repository}" ! /> --- 26,46 ---- <property name="project.version" value="0.2" /> <property name="project.src.dir" value="src/java" /> ! ! <!-- Pickup the ability to importAntlets --> ! <typedef resource="org/krysalis/antworks/importer/antlib.xml" classpath="build/antworks-importer/classes" /> <!-- for forrest --> ! <property name="forrest.antlet.site.hostname" value="antworks.sourceforge.net" /> ! <property name="forrest.antlet.site.remotedir" value="/home/groups/a/an/antworks/htdocs/importer" /> <property name="forrest.antlet.site.group" value="antworks" /> ! <property name="importer.repository" value="http://antworks.sourceforge.net/library/antlets/" /> ! <importer name="init-0.1" href="${importer.repository}" /> ! <importer name="java-0.1" href="${importer.repository}" /> ! <importer name="junit-0.1" href="${importer.repository}" /> ! <importer name="forrest_0_6-0.1" href="${importer.repository}" /> ! <importer name="sourceforge-0.1" href="${importer.repository}" /> |
|
From: Nick C. <ch...@us...> - 2004-07-01 08:32:35
|
Update of /cvsroot/antworks/importer/src/java/org/krysalis/antworks/importer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3873/src/java/org/krysalis/antworks/importer Modified Files: ImportAntletTask.java Log Message: Use the depot finder if it initializes, otherwise use the standard finder. Need to deal with this in gump. Index: ImportAntletTask.java =================================================================== RCS file: /cvsroot/antworks/importer/src/java/org/krysalis/antworks/importer/ImportAntletTask.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ImportAntletTask.java 1 Jul 2004 07:40:17 -0000 1.11 --- ImportAntletTask.java 1 Jul 2004 08:32:25 -0000 1.12 *************** *** 20,23 **** --- 20,24 ---- import java.io.File; import java.io.IOException; + import java.lang.reflect.Constructor; import java.net.URL; *************** *** 95,100 **** */ private AntletFinder getFinder() { ! return new SimpleAntletFinder(new FinderHelper(this)); } --- 96,132 ---- */ private AntletFinder getFinder() { + String clazz = "org.krysalis.antworks.importer.depot.DepotAntletFinder"; + AntletFinder finder = null; ! final FinderHelper finderHelper = new FinderHelper(this); ! finder = initializeFinderClass(clazz, finderHelper); ! if (finder == null) { ! finder = new SimpleAntletFinder(finderHelper); ! } ! return finder; ! } ! ! /** ! * @param clazz ! * @param finderHelper ! * @return ! */ ! private AntletFinder initializeFinderClass(String clazz, ! final FinderHelper finderHelper) { ! AntletFinder finder; ! try { ! Class depotFinderClass = Class.forName(clazz); ! Constructor c = depotFinderClass ! .getConstructor(new Class[] { FinderHelper.class }); ! finder = (AntletFinder) c ! .newInstance(new Object[] { finderHelper }); ! // AntletFinder should throw an exception if it can not find needed ! // classes. ! } catch (Exception e) { ! log("Unable to load " + clazz, Project.MSG_INFO); ! log(e.toString(), Project.MSG_DEBUG); ! finder = null; ! } ! return finder; } |
|
From: Nick C. <ch...@us...> - 2004-07-01 08:32:35
|
Update of /cvsroot/antworks/importer/src/java/org/krysalis/antworks/importer/depot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3873/src/java/org/krysalis/antworks/importer/depot Modified Files: DepotAntletFinder.java Log Message: Use the depot finder if it initializes, otherwise use the standard finder. Need to deal with this in gump. Index: DepotAntletFinder.java =================================================================== RCS file: /cvsroot/antworks/importer/src/java/org/krysalis/antworks/importer/depot/DepotAntletFinder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** DepotAntletFinder.java 1 Jul 2004 08:07:02 -0000 1.1 --- DepotAntletFinder.java 1 Jul 2004 08:32:25 -0000 1.2 *************** *** 21,24 **** --- 21,27 ---- import java.net.URL; + import org.apache.depot.update.ArtifactUpdater; + import org.apache.depot.update.ArtifactUpdaterFactory; + import org.apache.depot.update.UpdateException; import org.krysalis.antworks.importer.AntletFinder; import org.krysalis.antworks.importer.FinderHelper; *************** *** 33,39 **** public class DepotAntletFinder implements AntletFinder { private final FinderHelper helper; ! public DepotAntletFinder(FinderHelper helper) { this.helper = helper; } --- 36,44 ---- public class DepotAntletFinder implements AntletFinder { private final FinderHelper helper; + private final ArtifactUpdater updater; ! public DepotAntletFinder(FinderHelper helper) throws UpdateException { this.helper = helper; + updater = ArtifactUpdaterFactory.getDefaultUpdater(); } *************** *** 44,46 **** --- 49,53 ---- } + + } \ No newline at end of file |
|
From: Nick C. <ch...@us...> - 2004-07-01 08:07:11
|
Update of /cvsroot/antworks/importer/src/java/org/krysalis/antworks/importer/depot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31618/src/java/org/krysalis/antworks/importer/depot Added Files: DepotAntletFinder.java Log Message: Stub version. --- NEW FILE: DepotAntletFinder.java --- /* * ======================================================================== * Copyright 2004 Nick Chalko * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of * the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the * License for the specific language governing permissions and limitations under * the License. * ======================================================================== */ package org.krysalis.antworks.importer.depot; import java.io.File; import java.net.URL; import org.krysalis.antworks.importer.AntletFinder; import org.krysalis.antworks.importer.FinderHelper; /** * Import an antlet the easy depot way. * * @author Nick Chalko <ni...@ch...> * @author $Author: chalko $ * @version $Revision: 1.1 $ */ public class DepotAntletFinder implements AntletFinder { private final FinderHelper helper; public DepotAntletFinder(FinderHelper helper) { this.helper = helper; } public File findAntlet(String name, String version, URL repositoryURL, File antletsDir) { // TODO Auto-generated method stub return null; } } |
|
From: Nick C. <ch...@us...> - 2004-07-01 08:06:57
|
Update of /cvsroot/antworks/importer/src/java/org/krysalis/antworks/importer/depot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31558/src/java/org/krysalis/antworks/importer/depot Log Message: Directory /cvsroot/antworks/importer/src/java/org/krysalis/antworks/importer/depot added to the repository |
|
From: Nick C. <ch...@us...> - 2004-07-01 07:40:26
|
Update of /cvsroot/antworks/importer/src/java/org/krysalis/antworks/importer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27457/src/java/org/krysalis/antworks/importer Modified Files: FinderHelper.java AntletFinder.java SimpleAntletFinder.java ImportAntletTask.java Log Message: Format. Index: FinderHelper.java =================================================================== RCS file: /cvsroot/antworks/importer/src/java/org/krysalis/antworks/importer/FinderHelper.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FinderHelper.java 1 Jul 2004 07:39:36 -0000 1.1 --- FinderHelper.java 1 Jul 2004 07:40:17 -0000 1.2 *************** *** 19,23 **** import java.io.File; - import java.io.IOException; import org.apache.tools.ant.BuildException; --- 19,22 ---- *************** *** 28,32 **** /** ! * Delegated access to key ImportAntletTasks * * @author Nick Chalko <ni...@ch...> --- 27,31 ---- /** ! * Delegated access to key ImportAntletTasks * * @author Nick Chalko <ni...@ch...> Index: SimpleAntletFinder.java =================================================================== RCS file: /cvsroot/antworks/importer/src/java/org/krysalis/antworks/importer/SimpleAntletFinder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** SimpleAntletFinder.java 1 Jul 2004 07:39:36 -0000 1.1 --- SimpleAntletFinder.java 1 Jul 2004 07:40:17 -0000 1.2 *************** *** 25,29 **** import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; - import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.Copy; import org.apache.tools.ant.taskdefs.Expand; --- 25,28 ---- *************** *** 92,96 **** unjarAntlet(temp, antletsDir, name); if (!temp.delete()) { ! helper.log("Unable to delete temp file " + temp, Project.MSG_WARN); } } --- 91,96 ---- unjarAntlet(temp, antletsDir, name); if (!temp.delete()) { ! helper.log("Unable to delete temp file " + temp, ! Project.MSG_WARN); } } Index: AntletFinder.java =================================================================== RCS file: /cvsroot/antworks/importer/src/java/org/krysalis/antworks/importer/AntletFinder.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AntletFinder.java 1 Jul 2004 07:39:36 -0000 1.1 --- AntletFinder.java 1 Jul 2004 07:40:17 -0000 1.2 *************** *** 1,3 **** - /* * ======================================================================== --- 1,2 ---- *************** *** 30,45 **** */ public interface AntletFinder { ! /** ! * Find the name-version antlet build.xml file downloading from the repository if needed. ! * * @param name * @param version * @param repositoryURL * @param antletsDir ! * @return File to the xbuild.xml, null if not found. */ - - File findAntlet(String name, String version, URL repositoryURL, File antletsDir); ! } --- 29,46 ---- */ public interface AntletFinder { ! /** ! * Find the name-version antlet build.xml file downloading from the ! * repository if needed. ! * * @param name * @param version * @param repositoryURL * @param antletsDir ! * @return File to the xbuild.xml, null if not found. */ ! File findAntlet(String name, String version, URL repositoryURL, ! File antletsDir); ! ! } \ No newline at end of file Index: ImportAntletTask.java =================================================================== RCS file: /cvsroot/antworks/importer/src/java/org/krysalis/antworks/importer/ImportAntletTask.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ImportAntletTask.java 1 Jul 2004 07:39:36 -0000 1.10 --- ImportAntletTask.java 1 Jul 2004 07:40:17 -0000 1.11 *************** *** 20,24 **** import java.io.File; import java.io.IOException; - import java.net.MalformedURLException; import java.net.URL; --- 20,23 ---- *************** *** 26,31 **** import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; - import org.apache.tools.ant.taskdefs.Expand; - import org.apache.tools.ant.taskdefs.Get; import org.apache.tools.ant.taskdefs.ImportTask; --- 25,28 ---- |
|
From: Nick C. <ch...@us...> - 2004-07-01 07:39:46
|
Update of /cvsroot/antworks/importer/src/java/org/krysalis/antworks/importer In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27243/src/java/org/krysalis/antworks/importer Modified Files: ImportAntletTask.java Added Files: FinderHelper.java AntletFinder.java SimpleAntletFinder.java Log Message: Added a AntletFinder Strategy, preparing for use with depot. --- NEW FILE: FinderHelper.java --- /* * ======================================================================== * Copyright 2004 Nick Chalko * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of * the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the * License for the specific language governing permissions and limitations under * the License. * ======================================================================== */ package org.krysalis.antworks.importer; import java.io.File; import java.io.IOException; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Location; import org.apache.tools.ant.Project; import org.apache.tools.ant.Target; import org.apache.tools.ant.Task; /** * Delegated access to key ImportAntletTasks * * @author Nick Chalko <ni...@ch...> * @author $Author: chalko $ * @version $Revision: 1.1 $ */ public class FinderHelper { private final ImportAntletTask importAntletTask; FinderHelper(ImportAntletTask importAntletTask) { this.importAntletTask = importAntletTask; } /** * ${antlet.dir}/antlet.name/ * * @return @throws * IOException */ File getTargetDir(File antletDir, String name) throws BuildException { File targetDir = new File(antletDir, name); if (targetDir.exists() && !targetDir.isDirectory()) throw new BuildException("Antlet directory [" + targetDir.getAbsolutePath() + "] not a workable directory."); if (!targetDir.exists()) { targetDir.mkdirs(); } return targetDir; } /** * @return */ public Location getLocation() { return importAntletTask.getLocation(); } /** * @return */ public Project getProject() { return importAntletTask.getProject(); } /** * @param msg */ public void log(String msg) { importAntletTask.log(msg); } /** * @param msg * @param msgLevel */ public void log(String msg, int msgLevel) { importAntletTask.log(msg, msgLevel); } /** * Set the task details so ant reports things correctly. Sets : * <ul> * <li>location</li> * <li>OwntingTarget</li> * <li>Project</li> * <li>TaskName</li> * </ul> */ public void setTaskInfo(Task task) { task.setLocation(getLocation()); task.setOwningTarget(getOwningTarget()); task.setProject(getProject()); task.setTaskName(getTaskName()); } /** * @return */ public Target getOwningTarget() { return importAntletTask.getOwningTarget(); } /** * @return */ public String getTaskName() { return importAntletTask.getTaskName(); } } --- NEW FILE: SimpleAntletFinder.java --- /* * ======================================================================== * Copyright 2004 Nick Chalko * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of * the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the * License for the specific language governing permissions and limitations under * the License. * ======================================================================== */ package org.krysalis.antworks.importer; import java.io.File; import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; import org.apache.tools.ant.BuildException; import org.apache.tools.ant.Project; import org.apache.tools.ant.Task; import org.apache.tools.ant.taskdefs.Copy; import org.apache.tools.ant.taskdefs.Expand; import org.apache.tools.ant.taskdefs.Get; /** * Import an antlet the easy way. * * @author Nick Chalko <ni...@ch...> * @author $Author: chalko $ * @version $Revision: 1.1 $ */ public class SimpleAntletFinder implements AntletFinder { private final Get getTask; private final Copy copyTask; private final FinderHelper helper; /** * */ public SimpleAntletFinder(FinderHelper helper) { this.helper = helper; getTask = new Get(); copyTask = new Copy(); } /* * (non-Javadoc) * * @see org.krysalis.antworks.importer.AntletFinder#findAntlet(java.lang.String, * java.lang.String, java.net.URL, java.io.File) */ public File findAntlet(String name, String version, URL repositoryURL, File antletsDir) { StringBuffer buffer = new StringBuffer(name); if (version != null && version.length() > 0) { buffer.append("-").append(version); } String fullName = buffer.toString(); File antlet = getLocalAntletFile(antletsDir, fullName); if (!antlet.exists()) { downloadAntlet(repositoryURL, fullName, antletsDir); } antlet = getLocalAntletFile(antletsDir, fullName); if (!antlet.exists()) { antlet = null; } return antlet; } /** * @param href * @param name * @param antletsDir * @throws BuildException */ private void downloadAntlet(URL href, String name, File antletsDir) throws BuildException { if (null != href) { File temp = downloadAntletJar(href, name); if (temp.exists()) { unjarAntlet(temp, antletsDir, name); if (!temp.delete()) { helper.log("Unable to delete temp file " + temp, Project.MSG_WARN); } } } } /** * @param temp * @param antletDir * @param fullName */ private void unjarAntlet(File temp, File antletDir, String fullName) { Expand exp = new Expand(); helper.setTaskInfo(exp); exp.setSrc(temp); exp.setDest(helper.getTargetDir(antletDir, fullName)); exp.execute(); } /** * Download the antlet jar to a temp location. * * @param href * @param name * @param anletsDir * * @return the antletJar as a File in a temp location */ private File downloadAntletJar(URL href, String fullName) throws BuildException { try { File temp = this.getTempFile(fullName); if (temp == null) { return null; } URL fullURL = new URL(href.toExternalForm() + "/" + fullName + ".jar"); helper.log("Trying to download " + fullURL, Project.MSG_VERBOSE); helper.setTaskInfo(getTask); getTask.setSrc(fullURL); getTask.setDest(temp); getTask.setUseTimestamp(false); getTask.setVerbose(true); // Assume just temporarily offline ... getTask.setIgnoreErrors(true); getTask.execute(); return temp; } catch (MalformedURLException e) { throw new BuildException(e, helper.getLocation()); } } /** * @param fileName * @return */ private File getTempFile(String fileName) { File tmpFile = null; try { tmpFile = File.createTempFile(fileName, ".jar"); } catch (IOException e) { e.printStackTrace(); } return tmpFile; } /** * @param antletsDir * @param fullName * @return */ private File getLocalAntletFile(File antletsDir, String fullName) throws BuildException { File targetDir = helper.getTargetDir(antletsDir, fullName); File target = new File(targetDir, "xbuild.xml"); helper.log("Looking for " + target, Project.MSG_VERBOSE); return target; } } --- NEW FILE: AntletFinder.java --- /* * ======================================================================== * Copyright 2004 Nick Chalko * * Licensed under the Apache License, Version 2.0 (the "License"); you may not * use this file except in compliance with the License. You may obtain a copy of * the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the * License for the specific language governing permissions and limitations under * the License. * ======================================================================== */ package org.krysalis.antworks.importer; import java.io.File; import java.net.URL; /** * Import an antlet the easy way. * * @author Nick Chalko <ni...@ch...> * @author $Author: chalko $ * @version $Revision: 1.1 $ */ public interface AntletFinder { /** * Find the name-version antlet build.xml file downloading from the repository if needed. * * @param name * @param version * @param repositoryURL * @param antletsDir * @return File to the xbuild.xml, null if not found. */ File findAntlet(String name, String version, URL repositoryURL, File antletsDir); } Index: ImportAntletTask.java =================================================================== RCS file: /cvsroot/antworks/importer/src/java/org/krysalis/antworks/importer/ImportAntletTask.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ImportAntletTask.java 13 May 2004 19:05:12 -0000 1.9 --- ImportAntletTask.java 1 Jul 2004 07:39:36 -0000 1.10 *************** *** 17,20 **** --- 17,21 ---- */ package org.krysalis.antworks.importer; + import java.io.File; import java.io.IOException; *************** *** 28,31 **** --- 29,33 ---- import org.apache.tools.ant.taskdefs.Get; import org.apache.tools.ant.taskdefs.ImportTask; + /** * Import an antlet the easy way. *************** *** 37,43 **** public class ImportAntletTask extends Task { private final ImportTask importTask; ! private final Get getTask; private String name; private URL href; /** * --- 39,49 ---- public class ImportAntletTask extends Task { private final ImportTask importTask; ! private String name; + + private String version; + private URL href; + /** * *************** *** 46,51 **** super(); importTask = new ImportTask(); ! getTask = new Get(); } /* * (non-Javadoc) --- 52,58 ---- super(); importTask = new ImportTask(); ! } + /* * (non-Javadoc) *************** *** 67,199 **** importTask.execute(); } /** * @return */ private File getAntletFile() throws IOException, BuildException { // Look for it locally ! File localAntlet = getLocalAntletFile(); ! if (!localAntlet.exists()) { ! downloadAntlet(); ! } ! if (!localAntlet.exists()) { throw new BuildException("Failed to locate (or download) antlet: [" + name + "] it is suppose to be at " ! + localAntlet.getAbsolutePath()); } return localAntlet; } ! /** ! * @throws BuildException ! */ ! private void downloadAntlet() throws BuildException { ! if (null != href) { ! File temp = downloadAntletJar(); ! if (temp.exists()) { ! unjarAntlet(temp); ! if (!temp.delete()) { ! log("Unable to delete temp file " + temp, Project.MSG_WARN); ! } ! } ! } ! } ! /** ! * @param temp ! */ ! private void unjarAntlet(File temp) { ! Expand exp = new Expand(); ! setTaskInfo(exp); ! exp.setSrc(temp); ! exp.setDest(getTargetDir()); ! exp.execute(); ! } ! /** ! * Download the antlet jar to a temp location. ! * ! * @return the antletJar as a File in a temp location ! */ ! private File downloadAntletJar() throws BuildException { ! try { ! File temp = this.getTempFile(); ! if (temp == null) { ! return null; ! } ! URL fullURL = new URL(href.toExternalForm() + "/" + getName() ! + ".jar"); ! log("Trying to download " + fullURL, Project.MSG_VERBOSE); ! setTaskInfo(getTask); ! getTask.setSrc(fullURL); ! getTask.setDest(temp); ! getTask.setUseTimestamp(false); ! getTask.setVerbose(true); ! // Assume just temporarily offline ... ! getTask.setIgnoreErrors(true); ! getTask.execute(); ! return temp; ! } catch (MalformedURLException e) { ! throw new BuildException(e, getLocation()); ! } ! } ! /** ! * @return ! */ ! private File getTempFile() { ! File tmpFile = null; ! try { ! tmpFile = File.createTempFile(getName(), ".jar"); ! } catch (IOException e) { ! e.printStackTrace(); ! } ! return tmpFile; ! } ! /** ! * Set the task details so ant reports things correctly. Sets : ! * <ul> ! * <li>location</li> ! * <li>OwntingTarget</li> ! * <li>Project</li> ! * <li>TaskName</li> ! * </ul> ! */ ! private void setTaskInfo(Task task) { ! // Transfer to download the antlet.. ! task.setLocation(getLocation()); ! task.setOwningTarget(getOwningTarget()); ! task.setProject(getProject()); ! task.setTaskName(getTaskName()); ! } /** * @return */ ! private File getLocalAntletFile() throws BuildException { ! File targetDir = getTargetDir(); ! File target = new File(targetDir, "xbuild.xml"); ! log("Looking for " + target, Project.MSG_VERBOSE); ! return target; ! } ! /** ! * ${antlet.dir}/antlet.name/ ! * ! * @return @throws ! * IOException ! */ ! private File getTargetDir() throws BuildException { ! try { ! // Where local antlets are stored... ! File antletDir = getAntletsDir(); ! // Go looking for this one. ! File targetDir = new File(antletDir, getName()); ! if (targetDir.exists() && !targetDir.isDirectory()) ! throw new BuildException("Antlet directory [" ! + targetDir.getAbsolutePath() ! + "] not a workable directory."); ! if (!targetDir.exists()) { ! targetDir.mkdirs(); ! } ! return targetDir; ! } catch (IOException e) { ! throw new BuildException("Error creating antlet dir for " ! + getName(), e, getLocation()); ! } } /** * Where antlets are stored (locally) --- 74,105 ---- importTask.execute(); } + /** * @return */ private File getAntletFile() throws IOException, BuildException { + + AntletFinder finder = getFinder(); + File antletsDir = getAntletsDir(); + // Look for it locally ! File localAntlet = finder.findAntlet(name, version, href, antletsDir); ! ! if (localAntlet == null) { throw new BuildException("Failed to locate (or download) antlet: [" + name + "] it is suppose to be at " ! + antletsDir.getAbsolutePath()); } return localAntlet; } ! /** * @return */ ! private AntletFinder getFinder() { ! ! return new SimpleAntletFinder(new FinderHelper(this)); } + /** * Where antlets are stored (locally) *************** *** 217,220 **** --- 123,127 ---- return antletsDir; } + /** * @param dirProperty *************** *** 243,246 **** --- 150,154 ---- return antletsDir; } + /** * @param aDir *************** *** 257,261 **** Project.MSG_WARN); antletsDir = null; ! }; } else if (!antletsDir.isDirectory()) { log(antletsDir.getAbsolutePath() + " is not a directory", --- 165,170 ---- Project.MSG_WARN); antletsDir = null; ! } ! ; } else if (!antletsDir.isDirectory()) { log(antletsDir.getAbsolutePath() + " is not a directory", *************** *** 266,269 **** --- 175,179 ---- return antletsDir; } + /** * @return *************** *** 293,296 **** --- 203,207 ---- return tempDir; } + /** * @return *************** *** 315,318 **** --- 226,230 ---- return antWorksHome; } + /** * @return *************** *** 321,324 **** --- 233,237 ---- return href; } + /** * @param href *************** *** 327,330 **** --- 240,244 ---- this.href = href; } + /** * @return *************** *** 333,336 **** --- 247,251 ---- return name; } + /** * @param name |
|
From: Michael H. <hom...@us...> - 2004-06-04 14:21:47
|
Update of /cvsroot/antworks/antlets/makeantlet/src/resources/stylesheets In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23141/makeantlet/src/resources/stylesheets Modified Files: xbuild2xdoc.xsl Log Message: debugging / version problems Index: xbuild2xdoc.xsl =================================================================== RCS file: /cvsroot/antworks/antlets/makeantlet/src/resources/stylesheets/xbuild2xdoc.xsl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** xbuild2xdoc.xsl 29 Apr 2004 13:04:09 -0000 1.3 --- xbuild2xdoc.xsl 4 Jun 2004 14:21:36 -0000 1.4 *************** *** 50,54 **** <section> <title>Internal Properties</title> ! <xsl:apply-templates select="property"/> </section> </body> --- 50,54 ---- <section> <title>Internal Properties</title> ! <xsl:apply-templates select="//property"/> </section> </body> |
|
From: Michael H. <hom...@us...> - 2004-06-04 14:21:47
|
Update of /cvsroot/antworks/antlets/src/documentation/content/xdocs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23141/src/documentation/content/xdocs Modified Files: site.xml Log Message: debugging / version problems Index: site.xml =================================================================== RCS file: /cvsroot/antworks/antlets/src/documentation/content/xdocs/site.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** site.xml 9 Apr 2004 13:35:30 -0000 1.2 --- site.xml 4 Jun 2004 14:21:36 -0000 1.3 *************** *** 46,49 **** --- 46,54 ---- </antletcvsbuild> + <antletenterpriseapp label="enterpriseapp" href="enterpriseapp/" tab=""> + <antletTargetsenterpriseapp label="Antlet targets" href="xbuild-doc.html" description="Antlet targets" /> + <antletPropertiesenterpriseapp label="Antlet properties" href="properties-doc.html" description="Antlet properties" /> + </antletenterpriseapp> + <antletforrest label="forrest" href="forrest/" tab=""> <antletTargetsforrest label="Antlet targets" href="xbuild-doc.html" description="Antlet targets" /> *************** *** 76,79 **** --- 81,89 ---- </antletjaxb> + <antletjboss label="jboss" href="jboss/" tab=""> + <antletTargetsjboss label="Antlet targets" href="xbuild-doc.html" description="Antlet targets" /> + <antletPropertiesjboss label="Antlet properties" href="properties-doc.html" description="Antlet properties" /> + </antletjboss> + <antletjdepend label="jdepend" href="jdepend/" tab=""> <antletTargetsjdepend label="Antlet targets" href="xbuild-doc.html" description="Antlet targets" /> *************** *** 105,108 **** --- 115,128 ---- <antletPropertiesscripts label="Antlet properties" href="properties-doc.html" description="Antlet properties" /> </antletscripts> + + <antletseed label="seed" href="seed/" tab=""> + <antletTargetsseed label="Antlet targets" href="xbuild-doc.html" description="Antlet targets" /> + <antletPropertiesseed label="Antlet properties" href="properties-doc.html" description="Antlet properties" /> + </antletseed> + + <antlettomcat5 label="tomcat5" href="tomcat5/" tab=""> + <antletTargetstomcat5 label="Antlet targets" href="xbuild-doc.html" description="Antlet targets" /> + <antletPropertiestomcat5 label="Antlet properties" href="properties-doc.html" description="Antlet properties" /> + </antlettomcat5> <antletversion label="version" href="version/" tab=""> |
|
From: Michael H. <hom...@us...> - 2004-06-04 14:21:46
|
Update of /cvsroot/antworks/antlets/junit/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23141/junit/src Modified Files: xbuild.xml Log Message: debugging / version problems Index: xbuild.xml =================================================================== RCS file: /cvsroot/antworks/antlets/junit/src/xbuild.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** xbuild.xml 29 Apr 2004 15:25:18 -0000 1.6 --- xbuild.xml 4 Jun 2004 14:21:36 -0000 1.7 *************** *** 45,49 **** <get src="${junit-antlet:repository}${junit-antlet:junitjar}" ! dest="${user.home}/.ant/lib/${junit-antlet:junitjar}" ignoreerrors="true" verbose="true" --- 45,49 ---- <get src="${junit-antlet:repository}${junit-antlet:junitjar}" ! dest="${ant.home}/lib/${junit-antlet:junitjar}" ignoreerrors="true" verbose="true" *************** *** 56,60 **** ******************************************************************************* * ! * ${junit-antlet:junitjar} was downloaded to ${user.home}/.ant/lib/ * ******************************************************************************* --- 56,60 ---- ******************************************************************************* * ! * ${junit-antlet:junitjar} was downloaded to ${ant.home}/lib/ * ******************************************************************************* |
2 messages has been excluded from this view by a project administrator.