Questions about files in SVN + small directory reorganization
Hi everyone, I've started working on a Maven2 build for XWiki. I have some questions/remarks about some files stored in SVN: 1/ trunk/changelog.xml Shouldn't this file be removed? What is it used for? 2/ trunk/build.properties I think this file shouldn't be checked in because it's valid for a user to define a build.properties file in the project's root. If he does this now, this file will be marked as modified. It needs to be added to SVN ignore list. The solution is to rename this file in build.properties.sample 3/ trunk/test and source and test directories in general What's the difference with src/test or src/test-cactus? It seems test/ holds test resource files. As a first step, I'm proposing to move the directories as follows: src/main |_ java |_ resources |_ perl |_ web src/test |_ java |_ cactus |_ resources (this would be the current top level test/ dir) This is required to be able to write a proper Maven/Maven2 build. 4/ What are src/web.xml and src/web-exo.xml. Why are they not under src/web/WEB-INF? That's enough for a first pass. The most important thing is point 3 above. Let me know what you think and what you're ok for me to do. Thanks -Vincent
Vincent Massol a écrit :
Hi everyone,
I've started working on a Maven2 build for XWiki.
I have some questions/remarks about some files stored in SVN:
1/ trunk/changelog.xml
Shouldn't this file be removed? What is it used for?
yes can be removed
2/ trunk/build.properties
I think this file shouldn't be checked in because it's valid for a user to define a build.properties file in the project's root. If he does this now, this file will be marked as modified. It needs to be added to SVN ignore list. The solution is to rename this file in build.properties.sample
Not even sure it is used.. I don't have a build.properties and have no problems building..
3/ trunk/test and source and test directories in general
What's the difference with src/test or src/test-cactus? It seems test/ holds test resource files. As a first step, I'm proposing to move the directories as follows:
src/main |_ java |_ resources |_ perl |_ web src/test |_ java |_ cactus |_ resources (this would be the current top level test/ dir)
This is required to be able to write a proper Maven/Maven2 build.
+1
4/ What are src/web.xml and src/web-exo.xml. Why are they not under src/web/WEB-INF?
Not sure anymore.. Maybe I had some issues building/testing properly with IntelliJ.. It's important to be aware that being able to build/test properly with Eclipse/IntelliJ is important.. We have 2 web.xml file which are used to create the exo and non-exo war.. This file and a parameter in xwiki.cfg and a list of jar files not to have in the exo war are the only difference between the wars. It would be great to have a better process to create the different target war files.. Ludovic
That's enough for a first pass. The most important thing is point 3 above.
Let me know what you think and what you're ok for me to do.
Thanks -Vincent
------------------------------------------------------------------------
-- You receive this message as a subscriber of the [email protected] mailing list. To unsubscribe: mailto:[email protected] For general help: mailto:[email protected]?subject=help ObjectWeb mailing lists service home page: http://www.objectweb.org/wws
-- Ludovic Dubost XPertNet: http://www.xpertnet.fr/ Blog: http://www.ludovic.org/blog/ XWiki: http://www.xwiki.com Skype: ldubost AIM: nvludo Yahoo: ludovic
participants (2)
-
Ludovic Dubost -
Vincent Massol