You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by do...@apache.org on 2003/04/11 02:44:29 UTC
cvs commit: avalon-apps/enterprise/tools/util checkstyle.xml
donaldp 2003/04/10 17:44:29
Modified: enterprise/corbaloc build.xml
enterprise/ins build.xml
enterprise/orb build.xml
enterprise/pss build.xml
enterprise/time build.xml
enterprise/tools/util checkstyle.xml
Added: enterprise/tools/lib avalon-framework-4.1.3.jar
logkit-1.1.jar
Log:
Decouple from commons dir
Revision Changes Path
1.6 +2 -4 avalon-apps/enterprise/corbaloc/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-apps/enterprise/corbaloc/build.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- build.xml 11 Apr 2003 00:26:18 -0000 1.5
+++ build.xml 11 Apr 2003 00:44:28 -0000 1.6
@@ -3,12 +3,10 @@
<property file="build.properties"/>
- <!-- common target wrappers -->
-
<property name="enterprise.path" value=".."/>
<property name="apps.path" value="../.."/>
<property name="orb.path" value="${enterprise.path}/orb"/>
- <property name="common.path" value="${apps.path}/common"/>
+ <property name="tools.path" value="${enterprise.path}/tools"/>
<target name="checkstyle">
<ant antfile="${enterprise.path}/tools/util/checkstyle.xml">
@@ -63,7 +61,7 @@
<property name="idl.class" value="org.openorb.compiler.IdlCompiler" />
<path id="project.classpath">
- <fileset dir="${common.path}/lib">
+ <fileset dir="${tools.path}/lib">
<include name="logkit*.jar" />
<include name="avalon-framework*.jar" />
</fileset>
1.11 +9 -14 avalon-apps/enterprise/ins/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-apps/enterprise/ins/build.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build.xml 20 Feb 2003 15:30:01 -0000 1.10
+++ build.xml 11 Apr 2003 00:44:28 -0000 1.11
@@ -4,10 +4,7 @@
<property file="local.properties"/>
<property file="build.properties"/>
- <!-- common target wrappers -->
-
<property name="enterprise.path" value=".."/>
- <property name="common.path" value="${enterprise.path}/../common"/>
<property name="tools.path" value="${enterprise.path}/tools"/>
<target name="checkstyle">
<ant antfile="${tools.path}/util/checkstyle.xml">
@@ -40,7 +37,7 @@
build - invokes the general build target
dist - executes build, javadoc and support file creation
demo - run the server though it's full lifecycle
-
+
</echo>
</target>
@@ -48,9 +45,7 @@
<property name="enterprise" value=".." />
<property name="apps.path" value="${enterprise}/.." />
- <property name="common.path" value="${apps}/common" />
- <property name="common.tools.path" value="${common.path}/tools" />
- <property name="common.lib.path" value="${common.path}/lib" />
+ <property name="tools.path" value="${enterprise}/tools" />
<property name="orb.path" value="${enterprise}/orb" />
<property name="orb.lib.path" value="${orb.path}/lib" />
<property name="orb.dist.path" value="${orb.path}/build" />
@@ -84,7 +79,7 @@
<fileset dir="${orb.dist.path}">
<include name="*.jar" />
</fileset>
- <fileset dir="${common.lib.path}">
+ <fileset dir="${tools.path}/lib">
<include name="logkit-1.1.jar" />
<include name="avalon-framework*.jar" />
</fileset>
@@ -247,7 +242,7 @@
</fileset>
</copy>
- <jar jarfile="${dist}/${project.jar}" basedir="${build}/lib"
+ <jar jarfile="${dist}/${project.jar}" basedir="${build}/lib"
manifest="${etc}/${ant.project.name}.mf" />
</target>
@@ -271,15 +266,15 @@
<include name="license.css"/>
</fileset>
</copy>
- <javadoc destdir="${javadoc.root.path}/${ant.project.name}"
- doctitle="<h1>${project.title} ${VERSION}</h1>"
- noindex="false" author="false"
+ <javadoc destdir="${javadoc.root.path}/${ant.project.name}"
+ doctitle="<h1>${project.title} ${VERSION}</h1>"
+ noindex="false" author="false"
use="true"
overview="${overview.html}"
- windowtitle="${project.title}"
+ windowtitle="${project.title}"
bottom="<a href='{@docRoot}/LICENSE.HTML'/>License, Disclaimer and due credits.</a>"
additionalparam="-breakiterator -J-Xmx128m"
- packagenames="org.*"
+ packagenames="org.*"
>
<sourcepath path="${src}/java"/>
<sourcepath path="${build}/ins/src"/>
1.23 +2 -4 avalon-apps/enterprise/orb/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-apps/enterprise/orb/build.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- build.xml 11 Apr 2003 00:26:18 -0000 1.22
+++ build.xml 11 Apr 2003 00:44:28 -0000 1.23
@@ -4,12 +4,10 @@
<property file="local.properties"/>
<property file="build.properties"/>
- <!-- common target wrappers -->
-
<property name="enterprise.path" value=".."/>
<property name="excalibur.path" value="${enterprise.path}/../../avalon-excalibur"/>
<property name="assembly.path" value="${excalibur.path}/assembly"/>
- <property name="common.path" value="${enterprise.path}/../common"/>
+ <property name="tools.path" value="${enterprise.path}/tools"/>
<target name="checkstyle">
<ant antfile="${enterprise.path}/tools/util/checkstyle.xml">
@@ -81,7 +79,7 @@
<property name="idl.class" value="org.openorb.compiler.IdlCompiler" />
<path id="project.classpath">
- <fileset dir="${common.path}/lib">
+ <fileset dir="${tools.path}/lib">
<include name="logkit*.jar" />
<include name="avalon-framework*.jar" />
</fileset>
1.13 +9 -12 avalon-apps/enterprise/pss/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-apps/enterprise/pss/build.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.xml 4 Jan 2003 02:03:27 -0000 1.12
+++ build.xml 11 Apr 2003 00:44:29 -0000 1.13
@@ -5,11 +5,8 @@
<property file="local.properties"/>
<property file="build.properties"/>
- <!-- common target wrappers -->
-
<property name="enterprise.path" value=".."/>
<property name="tools.path" value="${enterprise.path}/tools"/>
- <property name="common.path" value="${enterprise.path}/../common"/>
<target name="checkstyle">
<ant antfile="checkstyle.xml">
<property name="checkstyle.failOnViolation" value="true"/>
@@ -42,9 +39,9 @@
javadoc and handles replication of supporting
files under the dist directory
- install - copies distribution jar files to the
+ install - copies distribution jar files to the
'${install.path}' directory
-
+
</echo>
</target>
@@ -97,7 +94,7 @@
<fileset dir="${ots.lib.path}">
<include name="*.jar" />
</fileset>
- <fileset dir="${common.path}/lib">
+ <fileset dir="${tools.path}/lib">
<include name="logkit-1.1.jar" />
<include name="avalon-framework*.jar" />
</fileset>
@@ -161,7 +158,7 @@
<target name="pss.idl" depends="pss.idl.context,compiler" if="pss.idl.modified">
<echo message="Building PSS IDL."/>
- <java classname="org.apache.pss.compiler.PsdlCompiler"
+ <java classname="org.apache.pss.compiler.PsdlCompiler"
fork="true" failonerror="true">
<arg line="-silence"/>
<arg line="-I ${idl}"/>
@@ -210,7 +207,7 @@
<include name="**/*.xinfo"/>
</fileset>
</copy>
- <jar jarfile="${dist}/${pss.jar}" basedir="${build}/pss/lib"
+ <jar jarfile="${dist}/${pss.jar}" basedir="${build}/pss/lib"
manifest="${etc}/${ant.project.name}.mf"/>
</target>
@@ -304,12 +301,12 @@
<include name="EXOLAB.TXT"/>
</fileset>
</copy>
- <javadoc destdir="${javadoc.root.path}"
- doctitle="<h1>${project.title} ${VERSION}</h1>"
- noindex="false" author="false"
+ <javadoc destdir="${javadoc.root.path}"
+ doctitle="<h1>${project.title} ${VERSION}</h1>"
+ noindex="false" author="false"
use="true"
overview="${overview.html}"
- windowtitle="${project.title}"
+ windowtitle="${project.title}"
bottom="<a href='{@docRoot}/LICENSE.HTML'/>License, Disclaimer and due credits.</a>"
additionalparam="-breakiterator -J-Xmx128m"
packagenames="org.*" >
1.13 +8 -9 avalon-apps/enterprise/time/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-apps/enterprise/time/build.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- build.xml 4 Jan 2003 02:03:27 -0000 1.12
+++ build.xml 11 Apr 2003 00:44:29 -0000 1.13
@@ -1,5 +1,5 @@
-<!--
+<!--
Time Service.
-->
@@ -11,7 +11,6 @@
<!-- common target wrappers -->
<property name="enterprise.path" value=".."/>
- <property name="common.path" value="${enterprise.path}/../common"/>
<property name="tools.path" value="${enterprise.path}/tools" />
<target name="checkstyle">
@@ -43,7 +42,7 @@
clean - destroy the build directory
build - invokes the general build target
dist - executes build, javadoc and support file creation
-
+
</echo>
</target>
@@ -84,7 +83,7 @@
<fileset dir="${orb.path}/build">
<include name="*.jar" />
</fileset>
- <fileset dir="${common.path}/lib">
+ <fileset dir="${tools.path}/lib">
<include name="logkit-1.1.jar" />
<include name="avalon-framework*.jar" />
</fileset>
@@ -220,15 +219,15 @@
<include name="license.css"/>
</fileset>
</copy>
- <javadoc destdir="${javadoc.root.path}/${ant.project.name}"
- doctitle="<h1>${project.title} ${VERSION}</h1>"
- noindex="false" author="false"
+ <javadoc destdir="${javadoc.root.path}/${ant.project.name}"
+ doctitle="<h1>${project.title} ${VERSION}</h1>"
+ noindex="false" author="false"
use="true"
overview="${overview.html}"
- windowtitle="${project.title}"
+ windowtitle="${project.title}"
bottom="<a href='{@docRoot}/LICENSE.HTML'/>License, Disclaimer and due credits.</a>"
additionalparam="-breakiterator -J-Xmx128m"
- packagenames="org.*"
+ packagenames="org.*"
>
<sourcepath path="${src}/java"/>
<sourcepath path="${build}/time/src"/>
1.1 avalon-apps/enterprise/tools/lib/avalon-framework-4.1.3.jar
<<Binary file>>
1.1 avalon-apps/enterprise/tools/lib/logkit-1.1.jar
<<Binary file>>
1.2 +2 -13 avalon-apps/enterprise/tools/util/checkstyle.xml
Index: checkstyle.xml
===================================================================
RCS file: /home/cvs/avalon-apps/enterprise/tools/util/checkstyle.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- checkstyle.xml 18 May 2002 14:59:28 -0000 1.1
+++ checkstyle.xml 11 Apr 2003 00:44:29 -0000 1.2
@@ -43,24 +43,13 @@
<!-- common diorectories -->
<property name="apps.dir" value="../.."/>
- <property name="common.dir" value="${apps.dir}/common"/>
- <property name="common.lib.dir" value="${common.dir}/lib"/>
- <property name="common.tools.dir" value="${common.dir}/tools"/>
-
- <!-- common jar files -->
- <property name="logkit.jar" value="${common.lib.dir}/logkit.jar"/>
- <property name="avalon-framework.jar" value="${common.lib.dir}/avalon-framework.jar"/>
- <property name="phoenix-client.jar" value="${common.lib.dir}/phoenix-client.jar"/>
- <property name="checkstyle.jar" value="${common.tools.dir}/checkstyle-all.jar"/>
+ <property name="tools.dir" value="${enterprise.dir}/tools"/>
<!-- declaration of validation defaults -->
<property name="checkstyle.failOnViolation" value="false"/>
<!-- Classpath for tools -->
<path id="tools.class.path">
- <pathelement location="${logkit.jar}"/>
- <pathelement location="${avalon-framework.jar}"/>
- <pathelement location="${checkstyle.jar}"/>
<pathelement path="${java.class.path}"/>
</path>
@@ -89,7 +78,7 @@
classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
<classpath refid="tools.class.path"/>
</taskdef>
- <checkstyle
+ <checkstyle
lcurlyType="nl"
lcurlyMethod="nl"
lcurlyOther="nl"
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org
Re: single lib/ dir vs many lib dirs (cvs commit: avalon-apps/enterprise/tools/util checkstyle.xml...)
Posted by Peter Donald <pe...@realityforge.org>.
On Fri, 11 Apr 2003 21:04, Leo Simons wrote:
> > I just use a minimalist build file for
> >
> > gump and do the full build with maven. A little extra work but I have
> > about 4 trees set up this way and it is relatively easy to do.
>
> I know :D (for others, example at
> http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/spice/spice/components/class
>man/).
bad example. I haven't really had time to setup sspice like I run some
internal/personal projects. WIll see if I can convert to show how easy it can
be ;)
> It is just that from experience we suck badly at maintaining multiple
> files, so it makes sense to pursue the goal of having only one file per
> "something".
perhaps but it gets it done in about 5% of the time it would take to do it
"right". Especially when others are already working on it ;)
> ooh, btw, the text on http://spice.sourceforge.net/ should be darker. My
> eyes hurt :D
aww. Looks fine in my setup. Feel free to send me a screenshot offlist so I
can see what you see.
--
Cheers,
Peter Donald
----------------------------------------
"Liberty means responsibility. That is
why most men dread it." - Locke
----------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@avalon.apache.org
For additional commands, e-mail: dev-help@avalon.apache.org
Re: single lib/ dir vs many lib dirs (cvs commit: avalon-apps/enterprise/tools/util
checkstyle.xml...)
Posted by Leo Simons <le...@apache.org>.
Peter Donald wrote:
> On Fri, 11 Apr 2003 20:51, Leo Simons wrote:
>
>>I'm either going to get gump to know how to talk to maven (ie a <maven/>
>>tag) or I'm going to see if I'm smart enough (doubt it tho ;) to help
>>out with the continuous integration tool Jason has been talking about
>>(Continuum or something). However my current opinion is that you should
>>not do the integration using a java tool but using a tool built for the
>>commandline which can talk to java.
>
> Just FYI I don't think either of those are "easy" alternatives and it may be
> best to aim for low hanging fruit.
what's the fun in that? :P
> I just use a minimalist build file for
> gump and do the full build with maven. A little extra work but I have about 4
> trees set up this way and it is relatively easy to do.
I know :D (for others, example at
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/spice/spice/components/classman/).
It is just that from experience we suck badly at maintaining multiple
files, so it makes sense to pursue the goal of having only one file per
"something".
Anyway, getting gump to build excalibur is also an exercise in figuring
out the true dependencies, which should make setting up maven POMs even
easier. The gump definition coupled with the **/default.properties now
contain all the information needed to build a full POM, so anyone who
feels like doing it should have a walk in the park.
ooh, btw, the text on http://spice.sourceforge.net/ should be darker. My
eyes hurt :D
cheers,
- Leo
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@avalon.apache.org
For additional commands, e-mail: dev-help@avalon.apache.org
Re: single lib/ dir vs many lib dirs (cvs commit: avalon-apps/enterprise/tools/util checkstyle.xml...)
Posted by Peter Donald <pe...@realityforge.org>.
On Fri, 11 Apr 2003 20:51, Leo Simons wrote:
> I'm either going to get gump to know how to talk to maven (ie a <maven/>
> tag) or I'm going to see if I'm smart enough (doubt it tho ;) to help
> out with the continuous integration tool Jason has been talking about
> (Continuum or something). However my current opinion is that you should
> not do the integration using a java tool but using a tool built for the
> commandline which can talk to java.
Just FYI I don't think either of those are "easy" alternatives and it may be
best to aim for low hanging fruit. I just use a minimalist build file for
gump and do the full build with maven. A little extra work but I have about 4
trees set up this way and it is relatively easy to do.
--
Cheers,
Peter Donald
A right is not what someone gives you; it's what no one can take from you.
-- Ramsey Clark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@avalon.apache.org
For additional commands, e-mail: dev-help@avalon.apache.org
Re: single lib/ dir vs many lib dirs (cvs commit: avalon-apps/enterprise/tools/util
checkstyle.xml...)
Posted by Leo Simons <le...@apache.org>.
Peter Donald wrote:
>>why? Life is a lot easier when you have a single jar repo (re: maven).
>
> Consider it a
> temporary step until someone steps up to do maintainence on them.
ok.
>>I'm trying to do the opposite for excalibur: only have one jar in cvs
>>for each product (as an intermediate step to no jars in cvs but
>>downloaded as needed).
>
> Sounds good but I think you would save yourself a lot of work if you moved to
> maven now - I can help but not going to do all the work. Maven may be a bit
> buggy and raw in places but it is far better than the current setup.
What I want to do first is get things running completely in GUMP -- we
*really* need the continous integration. Otherwise we're never going to
get KISS and TDD fully adopted :D
All part of a (silent & slow) quality control offensive. I have
experimented with generating ant from the POM but I found that it
doesn't work too well. I know the excalibur setup pretty well now, so it
is rather easy to maintain until we move to maven. In the meantime I'm
learning GUMP.
I'm either going to get gump to know how to talk to maven (ie a <maven/>
tag) or I'm going to see if I'm smart enough (doubt it tho ;) to help
out with the continuous integration tool Jason has been talking about
(Continuum or something). However my current opinion is that you should
not do the integration using a java tool but using a tool built for the
commandline which can talk to java.
cheers,
- LSD
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@avalon.apache.org
For additional commands, e-mail: dev-help@avalon.apache.org
Re: single lib/ dir vs many lib dirs (cvs commit: avalon-apps/enterprise/tools/util checkstyle.xml...)
Posted by Peter Donald <pe...@realityforge.org>.
On Fri, 11 Apr 2003 20:14, Leo Simons wrote:
> donaldp@apache.org wrote several times:
> > Log:
> > Decouple from commons dir
>
> why? Life is a lot easier when you have a single jar repo (re: maven).
because most of the jars were not needed or were incompatible with each other.
avalon-apps is mostly unmaintained. Not one of the projects built and deployed
out of the box this morning.
I think we are seeing the decomissioning of that CVS so moving all artefacts
needed for product helps in migration. The only two products left are sevak
and enterprise and I expect them to be migrated out soon. Consider it a
temporary step until someone steps up to do maintainence on them.
> I'm trying to do the opposite for excalibur: only have one jar in cvs
> for each product (as an intermediate step to no jars in cvs but
> downloaded as needed).
Sounds good but I think you would save yourself a lot of work if you moved to
maven now - I can help but not going to do all the work. Maven may be a bit
buggy and raw in places but it is far better than the current setup.
--
Cheers,
Peter Donald
-------------------------------------------------------------
| Egoism is the drug that soothes the pain of stupidity. |
-------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@avalon.apache.org
For additional commands, e-mail: dev-help@avalon.apache.org
single lib/ dir vs many lib dirs (cvs commit: avalon-apps/enterprise/tools/util
checkstyle.xml...)
Posted by Leo Simons <le...@apache.org>.
donaldp@apache.org wrote several times:
> Log:
> Decouple from commons dir
why? Life is a lot easier when you have a single jar repo (re: maven).
I'm trying to do the opposite for excalibur: only have one jar in cvs
for each product (as an intermediate step to no jars in cvs but
downloaded as needed).
cheers,
- Leo
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@avalon.apache.org
For additional commands, e-mail: dev-help@avalon.apache.org