Menu
▾
▴
[Td2jira-commits] SF.net SVN: td2jira: [17] trunk/td2jira
|
From: <lac...@us...> - 2007-10-04 08:07:28
|
Revision: 17
http://td2jira.svn.sourceforge.net/td2jira/?rev=17&view=rev
Author: lacostej
Date: 2007-10-04 01:07:31 -0700 (Thu, 04 Oct 2007)
Log Message:
-----------
Reorganize build to leave a cleaner root directory. Move config files into etc/, move all generated files into target/, including compiled & axis geneated ones. Removed use of td2jira.properties as a build.xml customiser
Modified Paths:
--------------
trunk/td2jira/build.xml
Added Paths:
-----------
trunk/td2jira/build.properties
trunk/td2jira/etc/
trunk/td2jira/etc/client-config.wsdd
trunk/td2jira/etc/log4j.properties
Removed Paths:
-------------
trunk/td2jira/bin/
trunk/td2jira/client-config.wsdd
trunk/td2jira/log4j.properties
Added: trunk/td2jira/build.properties
===================================================================
--- trunk/td2jira/build.properties (rev 0)
+++ trunk/td2jira/build.properties 2007-10-04 08:07:31 UTC (rev 17)
@@ -0,0 +1 @@
+# override build properties if needed
Property changes on: trunk/td2jira/build.properties
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: trunk/td2jira/build.xml
===================================================================
--- trunk/td2jira/build.xml 2007-10-04 07:22:47 UTC (rev 16)
+++ trunk/td2jira/build.xml 2007-10-04 08:07:31 UTC (rev 17)
@@ -1,86 +1,104 @@
<project name="td.sync" default="sync" basedir=".">
- <property file="td2jira.properties"/>
- <echo>got to copy ${basedir}/lib/axis-ant.jar into ${ant.home}/lib ... </echo>
+ <property file="${basedir}/build.properties"/>
+
+ <echo>Copying ${basedir}/lib/axis-ant.jar into ${ant.home}/lib ...</echo>
<copy file="${basedir}/lib/axis-ant.jar" todir="${ant.home}/lib"/>
- <mkdir dir="${basedir}/bin"/>
-
<path id="build.path">
- <pathelement location="${basedir}/bin"/>
- <pathelement location="${basedir}/td.classes"/>
+ <pathelement location="${basedir}/etc"/>
+ <pathelement location="${basedir}/target/classes"/>
<fileset dir="${basedir}/lib">
<include name="**/*.jar"/>
</fileset>
</path>
- <target name="sync" depends="clean, compile">
- <echo>Syncing TD to JIRA ... </echo>
- <copy file="td2jira.properties" todir="bin"/>
- <copy file="log4j.properties" todir="bin"/>
- <copy file="client-config.wsdd" todir="bin"/>
- <java dir="${basedir}" classname="td2jira.Sync" failonerror="true" fork="true" maxmemory="1024m">
- <sysproperty key="com.jacob.autogc" value="true"/>
- <classpath refid="build.path"/>
- </java>
+ <path id="test.path">
+ <path refid="build.path"/>
+ <pathelement location="${basedir}/target/test-classes"/>
+ </path>
+
+ <target name="clean_sync" depends="clean, sync"/>
+
+ <target name="run_sync">
+ <echo>Syncing TD to JIRA ...</echo>
+ <java dir="${basedir}" classname="td2jira.Sync" failonerror="true" fork="true" maxmemory="1024m">
+ <sysproperty key="com.jacob.autogc" value="true"/>
+ <classpath refid="build.path"/>
+ </java>
</target>
+ <target name="sync" depends="compile,justsync" />
+
+ <target name="justsync" depends="copy_properties,run_sync"/>
+
+ <target name="copy_properties">
+ <!--
+ <copy file="td2jira.properties" todir="bin"/>
+ <copy file="log4j.properties" todir="bin"/>
+ <copy file="client-config.wsdd" todir="bin"/>
+ -->
+ </target>
+
<target name="compile">
- <delete dir="${basedir}/bin"/>
- <mkdir dir="${basedir}/bin"/>
+ <mkdir dir="${basedir}/target"/>
+ <mkdir dir="${basedir}/target/classes"/>
+ <mkdir dir="${basedir}/target/gensrc/axis"/>
<echo>making SOAP stubs</echo>
- <java classname="org.apache.axis.wsdl.WSDL2Java" fork="true" failonerror="true" dir="bin">
+ <java classname="org.apache.axis.wsdl.WSDL2Java" fork="true" failonerror="true" dir="target/gensrc/axis">
<classpath refid="build.path"/>
<arg value="${basedir}/src/jirasoapservice-v2.wsdl"/>
</java>
<javac
- fork="yes"
- debug="yes"
- srcdir="bin"
- destdir="bin"
- classpathref="build.path">
+ fork="yes"
+ debug="yes"
+ srcdir="target/gensrc/axis"
+ destdir="target/classes"
+ classpathref="build.path">
</javac>
<javac
- fork="yes"
- debug="yes"
- srcdir="src"
- destdir="bin"
- classpathref="build.path">
+ fork="yes"
+ debug="yes"
+ srcdir="src"
+ destdir="target/classes"
+ classpathref="build.path">
</javac>
- <copy todir="${basedir}/bin">
- <fileset dir="src" includes="**/*.properties"/>
+ <copy todir="${basedir}/target/classes">
+ <fileset dir="src" includes="**/*.properties"/>
</copy>
</target>
<target name="test">
<javac
- fork="yes"
- debug="yes"
- srcdir="test"
- destdir="bin"
- classpathref="build.path">
+ fork="yes"
+ debug="yes"
+ srcdir="test"
+ destdir="target/test-classes"
+ classpathref="build.path">
</javac>
- <junit dir="." printsummary="yes" haltonfailure="yes"
- showoutput="true" fork="yes" maxmemory="64m">
- <classpath refid="build.path"/>
- <formatter type="plain" usefile='false'/>
- <formatter type="plain" usefile='true'/>
-
- <batchtest todir=".">
- <fileset dir="test">
- <include name="**/Test*.java"/>
- </fileset>
- </batchtest>
- </junit>
+ <junit dir="." printsummary="yes" haltonfailure="yes"
+ showoutput="true" fork="yes" maxmemory="64m">
+ <classpath refid="test.path"/>
+ <!--formatter type="plain" usefile='false'/-->
+ <formatter type="plain" usefile='true'/>
+
+ <batchtest todir=".">
+ <fileset dir="test">
+ <include name="**/Test*.java"/>
+ </fileset>
+ </batchtest>
+ </junit>
</target>
<target name="clean">
- <delete dir="${basedir}/bin"/>
- <delete file="td2jira.jar"/>
- <delete file="td2jira.log"/>
+ <delete dir="${basedir}/target"/>
<delete file="axis-debug.log"/>
+ <delete file="axis.soap.log"/>
+ <delete>
+ <fileset dir="." includes="hs_err*.log"/>
+ </delete>
</target>
<target name="distclean">
Deleted: trunk/td2jira/client-config.wsdd
===================================================================
--- trunk/td2jira/client-config.wsdd 2007-10-04 07:22:47 UTC (rev 16)
+++ trunk/td2jira/client-config.wsdd 2007-10-04 08:07:31 UTC (rev 17)
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployment name="defaultClientConfig"
- xmlns="http://xml.apache.org/axis/wsdd/"
- xmlns:java="http://xml.apache.org/axis/wsdd/providers/java">
-
- <handler name="log"
- type="java:org.apache.axis.handlers.LogHandler">
- <parameter name="LogHandler.fileName" value="axis.soap.log" />
- </handler>
-
- <globalConfiguration>
- <parameter name="disablePrettyXML" value="false" />
- <requestFlow>
- <handler type="log" />
- </requestFlow>
- <responseFlow>
- <handler type="log" />
- </responseFlow>
- </globalConfiguration>
-
- <transport name="http"
- pivot="java:org.apache.axis.transport.http.HTTPSender" />
- <transport name="local"
- pivot="java:org.apache.axis.transport.local.LocalSender" />
- <transport name="java"
- pivot="java:org.apache.axis.transport.java.JavaSender" />
-</deployment>
\ No newline at end of file
Copied: trunk/td2jira/etc/client-config.wsdd (from rev 14, trunk/td2jira/client-config.wsdd)
===================================================================
--- trunk/td2jira/etc/client-config.wsdd (rev 0)
+++ trunk/td2jira/etc/client-config.wsdd 2007-10-04 08:07:31 UTC (rev 17)
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment name="defaultClientConfig"
+ xmlns="http://xml.apache.org/axis/wsdd/"
+ xmlns:java="http://xml.apache.org/axis/wsdd/providers/java">
+
+ <handler name="log"
+ type="java:org.apache.axis.handlers.LogHandler">
+ <parameter name="LogHandler.fileName" value="axis.soap.log" />
+ </handler>
+
+ <globalConfiguration>
+ <parameter name="disablePrettyXML" value="false" />
+ <requestFlow>
+ <handler type="log" />
+ </requestFlow>
+ <responseFlow>
+ <handler type="log" />
+ </responseFlow>
+ </globalConfiguration>
+
+ <transport name="http"
+ pivot="java:org.apache.axis.transport.http.HTTPSender" />
+ <transport name="local"
+ pivot="java:org.apache.axis.transport.local.LocalSender" />
+ <transport name="java"
+ pivot="java:org.apache.axis.transport.java.JavaSender" />
+</deployment>
\ No newline at end of file
Copied: trunk/td2jira/etc/log4j.properties (from rev 14, trunk/td2jira/log4j.properties)
===================================================================
--- trunk/td2jira/etc/log4j.properties (rev 0)
+++ trunk/td2jira/etc/log4j.properties 2007-10-04 08:07:31 UTC (rev 17)
@@ -0,0 +1,13 @@
+log4j.logger.org.apache=warn, CONSOLE
+log4j.logger.td2jira=debug, TD2JIRA, CONSOLE
+
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} [%c{1}] %p - %m%n
+
+log4j.appender.TD2JIRA=org.apache.log4j.RollingFileAppender
+log4j.appender.TD2JIRA.MaxFileSize=512Kb
+log4j.appender.TD2JIRA.File=td2jira.log
+log4j.appender.TD2JIRA.MaxBackupIndex=3
+log4j.appender.TD2JIRA.layout=org.apache.log4j.PatternLayout
+log4j.appender.TD2JIRA.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} [%c{1}] %p - %m%n
Deleted: trunk/td2jira/log4j.properties
===================================================================
--- trunk/td2jira/log4j.properties 2007-10-04 07:22:47 UTC (rev 16)
+++ trunk/td2jira/log4j.properties 2007-10-04 08:07:31 UTC (rev 17)
@@ -1,13 +0,0 @@
-log4j.logger.org.apache=warn, CONSOLE
-log4j.logger.td2jira=debug, TD2JIRA, CONSOLE
-
-log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
-log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
-log4j.appender.CONSOLE.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} [%c{1}] %p - %m%n
-
-log4j.appender.TD2JIRA=org.apache.log4j.RollingFileAppender
-log4j.appender.TD2JIRA.MaxFileSize=512Kb
-log4j.appender.TD2JIRA.File=td2jira.log
-log4j.appender.TD2JIRA.MaxBackupIndex=3
-log4j.appender.TD2JIRA.layout=org.apache.log4j.PatternLayout
-log4j.appender.TD2JIRA.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} [%c{1}] %p - %m%n
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
