I was experimenting with the latest (r919455) revision of the cloud branch and noticed a dependency between CloudSolrServer and ZkController. It looks like CloudSolrServer is still using two constants from ZkController: NODE_NAME and URL_PROP. After moving these two constants to ZkStateReader, I was able to remove the following line from build.xml and successfully rebuild the project:
<pathelement location="${src}/java"/> <!-- temp hack since CloudSolrServer depends on ZkController, etc --> I can submit a patch for this change. However, I am not sure if openning a bug in Jira would be the right way to contribute to the cloud branch. Thank you, Igor