-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi
First attempt to replace the script by a maven plugin to update Daisy with the cocoon.sitemap.* annotations when generating the docs. How to build and test: 1. Apply the attached patch to cocoon src trunk. 2. If you recently build the trunk a rebuild of the trunk/parent should be sufficient, otherwise rebuild the whole project. This is needed because of plugin/artifact management. 3. Do a checkout of http://svn.apache.org/repos/asf/cocoon/whiteboard/cocoon-sitemaptags2daisy-plugin and build it (mvn install) 4. Follow http://cocoon.apache.org/1256_1_1.html "Configure settings.xml" and "Build all modules ..." (you'll need daisy admin rights to do this). 5. Follow the daisy update checks maven is doing (or at least should do ;-) ), looking equal to the ones shown by the script. Some notes: - - Username and password are taken from the settings.xml (see 4.) - - Default values are set by the plugin itself (simulateInput=false, daisyServerId=cocoon-daisy, repoUrl=http://cocoon.zones.apache.org:9263 If you think it's useful please report any suggestions or bugs so I (we) can fix them and replace the script (which seems to be very rarely run). If nothing works as expected blame the author ;-) Felix PS: At 4. I needed to run skipping tests (mvn install -P daisy -Dmaven.test.skip=true) because surefire threw some NPE, not knowing yet why ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iEYEARECAAYFAkiXEIIACgkQ2lZVCB08qHH+zQCfZnt1rwY0z1qWkntp7W4CbIml jaYAn1zutYGrWDcIbkFZCI6IzPfbsm2U =+bhn -----END PGP SIGNATURE-----
Index: parent/pom.xml =================================================================== --- parent/pom.xml (revision 680992) +++ parent/pom.xml (working copy) @@ -1873,6 +1873,11 @@ <version>2.0.1</version> </dependency> <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-settings</artifactId> + <version>2.0.5</version> + </dependency> + <dependency> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> <version>2.0.2</version> @@ -3639,6 +3644,18 @@ </execution> </executions> </plugin> + <plugin> + <groupId>org.apache.cocoon</groupId> + <artifactId>cocoon-sitemaptags2daisy-plugin</artifactId> + <version>1.0.0-SNAPSHOT</version> + <!-- the plugins default configuration + <configuration> + <simulateInput>false</simulateInput> + <daisyServerId>cocoon-daisy</daisyServerId> + <repoUrl>http://cocoon.zones.apache.org:9263</repoUrl> + </configuration> + --> + </plugin> </plugins> </pluginManagement> </build> Index: pom.xml =================================================================== --- pom.xml (revision 680992) +++ pom.xml (working copy) @@ -61,4 +61,26 @@ </plugins> </build> + <profiles> + <profile> + <id>daisy</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.cocoon</groupId> + <artifactId>cocoon-sitemaptags2daisy-plugin</artifactId> + <executions> + <execution> + <phase>install</phase> + <goals> + <goal>sitemaptags2daisy</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + </project>