Ok, a bit more feedback.
Looking through the various directories there's still a decent bit of replication.
I may be wrong, but from what I can understand you're using each data_dir as both the static imports to build in to the server (build-war), like in server/data _and_ for the data_dir included.
This can be split up, which is what I was going for with confMin. It's the bare bones that you need to build the war, and includes all the demos stuff. Basically it includes the popup and mapbuilder demos and libraries. This is _all_ that should go in there, the stuff that we can't pull off from just a data_dir.
The rest should _only_ go in the data_dir. Ie the featureType config, the data, the validation config, the service.xml and catalog.xml, ect. Ie please don't include copies of the mapbuilder libraries and demos in the data_dir directories. They can't ever get used in a real data dir, ie one that's not located in the web server. So when you build the war, just use confMin. Or even better put it in its own directory called 'static imports' or something like that. I initially thought that's what you set 'conf' up to be, but it looks to just be yet another data_dir?
I know this may seem to be a bit nit-picky, but it's really out of a practical concern to make this all easier to manage. If we have 5 different mapbuilder libraries distributed throughout the source tree, which is the case now, then we have to update them all whenever there's a minor change. So keep mapbuilder stuff in a static place that we include in the build, and keep shapefiles and config information in just the data dirs.
If we could reflect across datadirs it _might_ make sense to include mapbuilder libs in the datadir, but since that's not the case right now, let's really try not to (even if we could do that I'd right now just include the libs in the geoserver/server stuff).
best regards,
Chris
Brent Owens wrote:
I fixed 'ant-test': it was calling a missing ant task that got renamed.
run-jetty does replace run
'deploy-full' replaces 'debug from ide'
I changed the comments in 'deploy-full', they were ancient and now reflect how things are done. 'deploy-full' does not actually run jetty, it just deploys all of geoserver into the server/geoserver directory. To run, use run-from-ide(not forked) or run-jetty(forked).
Hope that helps,
Brent Owens
(The Open Planning Project)
Chris Holmes wrote:
Ok, some feedback.
'ant test' is broken for me, as 'ant run' is removed. From what I can tell 'run jetty' replaces 'run', and 'deploy - full' seems to replace the first half of 'test'. In the description of 'deploy - full' it indicates that it runs jetty, but for me it definitely did not. I'm fine if 'deploy - full' replaces 'test', but it should actually do what it says and run jetty. And there should be a way to just build it, but I'll assume that's there in some form.
Also naming them 'deploy - full' with spaces is annoying, since when you run from the command line you now have to quote ("ant 'deploy - full'). 'deploy-full' is better, since I can just write 'ant deploy-full'.
There may be more, this is just my initial feedback.
Chris
Brent Owens wrote:
Hello everyone,
I have made some changes to the 1.3 build.xml file to reflect the data_dir structure.
Before we were pulling data from the cite folders (confUserBasic etc...) but now I have ported those folders over to the new data_dir folders, and build the releases from them. The same data is there, but they are structured differently. Each data_dir folder can be used on its own as a data directory and the build file will be able to dig through the folder and grab the appropriate files to make a release.
I have also cleaned up the build.xml by removing deprecated tasks and removing unused variables, renamed several tasks, and moved some tasks around to better group them.
Changes:
* cite folder: deprecated and not used in the build process
* data_dir folder: populated with ported over cite folders, now used for build process
* build.xml:
- now builds from data_dir folders
- can still specify what config to build from (userBasic, min ... using build.properties)
- 'geoserver.move_jar' task renamed to: 'deploy - jar'
- 'debug from ide' task renamed to: 'deploy - all'
- 'deploy - jsp' created
- most scripts that "create" something (a jar or whatever) are now prefixed with 'build -'
- some more comments
(I will remove the cite folders once I am sure that the data_dir folders are sufficient)
Can you guys give it a little run through for me and tell me if anything is broken in the file? Thanks a bunch,
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Geoserver-devel mailing list
Geoserver-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geoserver-devel
--
Chris Holmes
The Open Planning Project
http://topp.openplans.org