You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by bl...@apache.org on 2003/06/12 19:49:51 UTC
cvs commit: avalon/fortress/container project.xml
bloritsch 2003/06/12 10:49:51
Modified: buildsystem/gump-integration/project
avalon-fortress-container.xml
fortress/container project.xml
Log:
hopefully fix the problem with instrument management
Revision Changes Path
1.4 +35 -27 avalon/buildsystem/gump-integration/project/avalon-fortress-container.xml
Index: avalon-fortress-container.xml
===================================================================
RCS file: /home/cvs/avalon/buildsystem/gump-integration/project/avalon-fortress-container.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- avalon-fortress-container.xml 10 Jun 2003 18:44:43 -0000 1.3
+++ avalon-fortress-container.xml 12 Jun 2003 17:49:51 -0000 1.4
@@ -2,55 +2,63 @@
<project name="avalon-fortress-container">
<package>org.apache.avalon</package>
- <ant target="dist" basedir="fortress/container">
+ <ant target="dist">
<property name="project.version" value="@@DATE@@"></property>
</ant>
-
+
<depend inherit="runtime" project="ant"></depend>
<depend project="xml-xalan2"></depend>
<depend project="xml-xerces"></depend>
-
-
+
+
<depend runtime="true" project="ant"></depend>
-
- <depend runtime="true" project="jakarta-bcel"></depend>
-
+
+ <depend runtime="true" project="avalon-fortress"></depend>
+
+ <depend runtime="true" project="bcel"></depend>
+
<depend runtime="true" project="commons-collections"></depend>
-
+
<depend runtime="true" project="concurrent"></depend>
-
+
<depend runtime="true" project="excalibur-event"></depend>
-
+
<depend runtime="true" project="excalibur-i18n"></depend>
-
+
<depend runtime="true" project="excalibur-instrument"></depend>
-
+
+ <depend runtime="true" project="excalibur-instrument-manager"></depend>
+
<depend runtime="true" project="excalibur-lifecycle"></depend>
-
+
<depend runtime="true" project="excalibur-logger"></depend>
-
+
<depend runtime="true" project="excalibur-sourceresolve"></depend>
-
- <depend runtime="true" project="avalon-framework"></depend>
-
+
+ <depend runtime="true" project="framework"></depend>
+
<depend runtime="true" project="junit"></depend>
-
- <depend runtime="true" project="avalon-logkit"></depend>
-
+
+ <depend runtime="true" project="logkit"></depend>
+
<depend runtime="true" project="qdox"></depend>
+
+ <depend runtime="true" project="xalan"></depend>
+
+
+ <work nested="/target/classes"></work>
+ <work nested="/target/api-classes"></work>
+ <work nested="/target/impl-classes"></work>
+ <work nested="/target/test-classes"></work>
- <work nested="fortress/container/target/classes"></work>
- <work nested="fortress/container/target/api-classes"></work>
- <work nested="fortress/container/target/impl-classes"></work>
- <work nested="fortress/container/target/test-classes"></work>
-
- <home nested="fortress/container"></home>
+ <home></home>
<jar name="target/avalon-fortress-container-@@DATE@@.jar"></jar>
<jar name="target/avalon-fortress-container-@@DATE@@-api.jar"></jar>
<jar name="target/avalon-fortress-container-@@DATE@@-impl.jar"></jar>
- <javadoc nested="fortress/container/target/docs/apidocs"></javadoc>
+ <javadoc nested="/target/docs/apidocs"></javadoc>
<nag to="dev@avalon.apache.org" from="Gump Integration Build <dev@avalon.apache.org>"></nag>
</project>
+
\ No newline at end of file
1.2 +2 -2 avalon/fortress/container/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/fortress/container/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 9 Jun 2003 15:27:41 -0000 1.1
+++ project.xml 12 Jun 2003 17:49:51 -0000 1.2
@@ -41,12 +41,12 @@
<dependency>
<id>excalibur-instrument-manager</id>
<version>1.0</version>
- <groupId>excalibur-instrument</groupId>
+ <groupId>excalibur-instrument-manager</groupId>
</dependency>
<dependency>
<id>excalibur-instrument-manager-interfaces</id>
<version>1.0</version>
- <groupId>excalibur-instrument</groupId>
+ <groupId>excalibur-instrument-manager</groupId>
</dependency>
<dependency>
<id>excalibur-event</id>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org
Re: notice: cvs moves
Posted by Leo Simons <le...@apache.org>.
Leo Simons wrote:
> somewhere around 14:00 GMT on saturday (I think, depends on how long the
> party stays fun tonite), avalon-excalibur/fortress contents are going to
> be restructured and moved to avalon/fortress. Also, current contents of
> avalon/ will be moved to avalon/framework. CVS history will be kept.
done, I think. Everthing seems fine on my end...
- Leo
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@avalon.apache.org
For additional commands, e-mail: dev-help@avalon.apache.org
Re: notice: cvs moves
Posted by Berin Loritsch <bl...@apache.org>.
Leo Simons wrote:
> Berin Loritsch wrote:
> > we might want to just go ahead and get this show on the road.
>
> I concur :D
>
> Hi gang,
>
> somewhere around 14:00 GMT on saturday (I think, depends on how long the
> party stays fun tonite), avalon-excalibur/fortress contents are going to
> be restructured and moved to avalon/fortress. Also, current contents of
> avalon/ will be moved to avalon/framework. CVS history will be kept.
> Brace for impact: perhaps some annoyances (in case you were planning to
> work on saturday ;) and a gump failure or two. Oh, and you'll be needing
> maven-beta-9.
This is Phase I of the whole process. We will be toying with the GUMP
integration to get it to work seemlessly, so that hopefully we can can
do something like this:
$ maven avalon:update-gump
to ensure that the gump descriptor is at the latest and greatest.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@avalon.apache.org
For additional commands, e-mail: dev-help@avalon.apache.org
notice: cvs moves (was: Re: cvs commit: avalon/fortress)
Posted by Leo Simons <le...@apache.org>.
Berin Loritsch wrote:
> we might want to just go ahead and get this show on the road.
I concur :D
Hi gang,
somewhere around 14:00 GMT on saturday (I think, depends on how long the
party stays fun tonite), avalon-excalibur/fortress contents are going to
be restructured and moved to avalon/fortress. Also, current contents of
avalon/ will be moved to avalon/framework. CVS history will be kept.
Brace for impact: perhaps some annoyances (in case you were planning to
work on saturday ;) and a gump failure or two. Oh, and you'll be needing
maven-beta-9.
- Leo
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@avalon.apache.org
For additional commands, e-mail: dev-help@avalon.apache.org
Re: cvs commit: avalon/fortress
Posted by Berin Loritsch <bl...@apache.org>.
Leo Simons wrote:
> well, that didnt work :D
>
<snip/>
> and this is bad as well. I think the problem might be that one needs to
> provide '-Dcomponent.dir=fortress/container'. There should be a check
> for its existence I guess.
>
> What should we do? Find time to invest in fixing the gump plugin so
> autogeneration becomes more dependable, and not move forward, or just
> move forward with moving things over (which I can do tomorrow) and deal
> with this trial-and-error-style?
:/
Considering the long trial and error problems that are happening, we
might want to just go ahead and get this show on the road. Building
is very easy with Maven, and dependency resolution is pretty good.
There is no sense in holding up the progress while we try to get GUMP
integration to work.
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@avalon.apache.org
For additional commands, e-mail: dev-help@avalon.apache.org
Re: cvs commit: avalon/fortress
Posted by Leo Simons <le...@apache.org>.
well, that didnt work :D
bloritsch@apache.org wrote:
> Modified: buildsystem/gump-integration/project
> avalon-fortress-container.xml
>
> hopefully fix the problem with instrument management
> -
> - <depend runtime="true" project="jakarta-bcel"></depend>
> -
> +
> + <depend runtime="true" project="avalon-fortress"></depend>
> +
> + <depend runtime="true" project="bcel"></depend>
> - <depend runtime="true" project="avalon-framework"></depend>
> -
> + <depend runtime="true" project="framework"></depend>
> +
> - <depend runtime="true" project="avalon-logkit"></depend>
> -
> +
> + <depend runtime="true" project="logkit"></depend>
> + <depend runtime="true" project="xalan"></depend>
This causes problems (since there's no project named "bcel", nor one
named "framework", nor one named "avalon-logkit", nor one named xalan).
I'm guessing you regenerated the file using the maven targets, which
overwrote the manual changes I made. This isn't working very well at all!
> + <work nested="/target/classes"></work>
> + <work nested="/target/api-classes"></work>
> + <work nested="/target/impl-classes"></work>
> + <work nested="/target/test-classes"></work>
>
> - <work nested="fortress/container/target/classes"></work>
> - <work nested="fortress/container/target/api-classes"></work>
> - <work nested="fortress/container/target/impl-classes"></work>
> - <work nested="fortress/container/target/test-classes"></work>
> - <home nested="fortress/container"></home>
> + <home></home>
> - <javadoc
nested="fortress/container/target/docs/apidocs"></javadoc>
> + <javadoc nested="/target/docs/apidocs"></javadoc>
and this is bad as well. I think the problem might be that one needs to
provide '-Dcomponent.dir=fortress/container'. There should be a check
for its existence I guess.
What should we do? Find time to invest in fixing the gump plugin so
autogeneration becomes more dependable, and not move forward, or just
move forward with moving things over (which I can do tomorrow) and deal
with this trial-and-error-style?
- Leo
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@avalon.apache.org
For additional commands, e-mail: dev-help@avalon.apache.org