Author: mattmann
Date: Sat Aug 22 19:10:16 2015
New Revision: 1697111
URL: http://svn.apache.org/r1697111
Log:
- services refactored into its own project. WIP OODT-842
Modified:
oodt/trunk/curator/curator-webapp/src/main/webapp/META-INF/context.xml
oodt/trunk/curator/curator-webapp/src/main/webapp/WEB-INF/web.xml
Modified: oodt/trunk/curator/curator-webapp/src/main/webapp/META-INF/context.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/curator-webapp/src/main/webapp/META-INF/context.xml?rev=1697111&r1=1697110&r2=1697111&view=diff
==============================================================================
--- oodt/trunk/curator/curator-webapp/src/main/webapp/META-INF/context.xml
(original)
+++ oodt/trunk/curator/curator-webapp/src/main/webapp/META-INF/context.xml Sat
Aug 22 19:10:16 2015
@@ -19,35 +19,10 @@ the License.
<Parameter name="org.apache.oodt.cas.curator.projectName"
value="OODT"/>
-
- <Parameter
name="org.apache.oodt.cas.curator.metExtractorConf.uploadPath"
- value="[OODT_HOME]/extractors" />
-
- <Parameter name="org.apache.oodt.cas.curator.dataDefinition.uploadPath"
- value="[FILEMGR_HOME]/policy" />
-
- <Parameter name="org.apache.oodt.cas.curator.stagingAreaPath"
- value="[OODT_HOME]/data/staging"/>
-
- <Parameter name="org.apache.oodt.cas.curator.metAreaPath"
- value="[OODT_HOME]/data/met"/>
-
- <Parameter name="org.apache.oodt.cas.curator.fmProps"
- value="[FILEMGR_HOME]/etc/filemgr.properties"/>
-
- <Parameter name="org.apache.oodt.cas.curator.metExtension"
- value=".met"/>
-
- <Parameter name="org.apache.oodt.cas.fm.url"
- value="[FILEMGR_URL]"/>
<Parameter name="org.apache.oodt.security.sso.implClass"
value="org.apache.oodt.security.sso.DummyImpl"/>
- <Parameter name="org.apache.oodt.cas.curator.catalogFactoryClass"
-
value="org.apache.oodt.cas.filemgr.catalog.LuceneCatalogFactory" />
-
-
<Parameter name="curator.homepage"
value="org.apache.oodt.cas.curation.HomePage"/>
</Context>
Modified: oodt/trunk/curator/curator-webapp/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/curator-webapp/src/main/webapp/WEB-INF/web.xml?rev=1697111&r1=1697110&r2=1697111&view=diff
==============================================================================
--- oodt/trunk/curator/curator-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ oodt/trunk/curator/curator-webapp/src/main/webapp/WEB-INF/web.xml Sat Aug
22 19:10:16 2015
@@ -17,32 +17,6 @@ the License.
-->
<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";>
<display-name>curator</display-name>
- <servlet>
- <servlet-name>CXFServlet</servlet-name>
- <servlet-class>
- org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet
- </servlet-class>
- <init-param>
- <param-name>jaxrs.serviceClasses</param-name>
- <param-value>
- org.apache.oodt.cas.curation.service.DirectoryResource
- org.apache.oodt.cas.curation.service.IngestionResource
- org.apache.oodt.cas.curation.service.MetadataResource
- org.apache.oodt.cas.curation.service.PolicyResource
- org.apache.oodt.cas.curation.service.SystemResource
- </param-value>
- </init-param>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet>
- <display-name>Curation Service</display-name>
- <servlet-name>Curation Service</servlet-name>
- <servlet-class>
- org.apache.oodt.cas.curation.service.CurationService
- </servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
<filter>
<filter-name>wicket.browser</filter-name>
@@ -57,15 +31,9 @@ the License.
</init-param>
</filter>
- <filter-mapping>
- <filter-name>wicket.browser</filter-name>
+ <filter-mapping>
+ <filter-name>wicket.browser</filter-name>
<url-pattern>/*</url-pattern>
- </filter-mapping>
-
-
- <servlet-mapping>
- <servlet-name>CXFServlet</servlet-name>
- <url-pattern>/services/*</url-pattern>
- </servlet-mapping>
+ </filter-mapping>
</web-app>
