On 8/14/2013 2:10 PM, Endi Sukma Dewata wrote: > The source files for the new Tomcat-based TPS has been moved from > base/tps to base/tps-tomcat. The new TPS will now be build in pki-core > and packaged in pki-tps-tomcat RPM. The old TPS and RA have been > restored to the previous state before adding the new TPS. Once the new > TPS is complete, the old TPS can be removed, the new TPS can be moved > back to base/tps and the package can be renamed back to pki-tps. > > Ticket #702 > > To verify old TPS restoration: > > git diff b3316c83b2bb1da987ab5cca77a275eacb94036d -- base/tps > > The remaining difference is the renaming of the CS.cfg parameters to > match other Java-based subsystems (which has corresponding changes in > pkicreate as well). New patch attached. Per Ade's feedback: 1. Fixed RPM spec so that pki-tps and pki-tps-tomcat will conflict. 2. Fixed CMake script to make sure the dependencies are built first. 3. Moved TPS Java sources to base/tps-tomcat/src.