Further building on the session from ApacheCon NA 2010, see how Apache Archiva revitalised itself by moving to being content-driven, and becoming more modular. The discussion includes moving from a database and ORM solution, how we defined the content model for the application and started migrating the data and the architecture, and the natural benefits we immediately found in the process. We also look at how the application was modularised more effectively, and the possibility at making it more dynamic with other componennt models and OSGi. We will discuss the other technologies such as Apache Jackrabbit and Apache Felix we used and evaluated and what we learned about them on the way.