refs/heads/CONNECTORS-523 - manifoldcf

commit	c49ac98c49cfdf0339c5188e4f0680ae999314a1	[log] [tgz]
author	Karl Wright <kwright@apache.org>	Sun Sep 09 13:02:40 2012 +0000
committer	Karl Wright <kwright@apache.org>	Sun Sep 09 13:02:40 2012 +0000
tree	6f39269bd66218e2583e58265ee39ec9231e8eb9
parent	3a9481ea1bd9164fb63ff82cf1002e9faa750c76 [diff]

Rearrange framework tree to build a combined service war.

git-svn-id: https://svn.apache.org/repos/asf/manifoldcf/branches/CONNECTORS-523@1382487 13f79535-47bb-0310-9956-ffa450edef68

framework/api-service/src/main/java/org/apache/manifoldcf/apiservice/ServletListener.java[Renamed from framework/api-servlet/src/main/java/org/apache/manifoldcf/api/ServletListener.java - diff]
framework/api-service/src/main/webapp/WEB-INF/web.xml[diff]
framework/api-servlet/src/main/java/org/apache/manifoldcf/apiservlet/APIServlet.java[Renamed from framework/api-servlet/src/main/java/org/apache/manifoldcf/api/APIServlet.java - diff]
framework/authority-service/src/main/java/org/apache/manifoldcf/authorityservice/ServletListener.java[Renamed from framework/authority-servlet/src/main/java/org/apache/manifoldcf/authorityservice/ServletListener.java - diff]
framework/authority-service/src/main/webapp/WEB-INF/web.xml[diff]
framework/authority-service/src/main/webapp/WEB-INF/web.xml.external[diff]
framework/authority-servlet/src/main/java/org/apache/manifoldcf/authorityservlet/UserACLServlet.java[Renamed from framework/authority-servlet/src/main/java/org/apache/manifoldcf/authorityservice/servlet/UserACLServlet.java - diff]
framework/build.xml[diff]
framework/combined-service/src/main/java/org/apache/manifoldcf/combinedservice/ServletListener.java[Copied from framework/api-servlet/src/main/java/org/apache/manifoldcf/api/ServletListener.java - diff]
framework/combined-service/src/main/webapp/WEB-INF/web.xml[Added - diff]

10 files changed

tree: 6f39269bd66218e2583e58265ee39ec9231e8eb9