[
https://issues.apache.org/jira/browse/ATLAS-2665?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16493192#comment-16493192
]
Nigel Jones commented on ATLAS-2665:
------------------------------------
Patch does not apply on top of master+2523+1773
8:36 $ git am < ~/src/patches/ATLAS-2665-Add-OMAG-API-in-Atlas-v7.patch
Applying: ATLAS-2665 Add OMAG-API in Atlas
error: patch failed: omrs/pom.xml:39
error: omrs/pom.xml: patch does not apply
Patch failed at 0001 ATLAS-2665 Add OMAG-API in Atlas
Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Applying with intellij just shows the errant patch hunk is
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
</dependency>
It just looks as if the patch can't find the right place to slot it in,
probably due to other pom changes. Easy to merge manually, so could be useful
to rebase the patch in the context of 2523+1773 (as base before applying any
other patches?)
> Add OMAG API and OMAS APIs in Atlas
> -----------------------------------
>
> Key: ATLAS-2665
> URL: https://issues.apache.org/jira/browse/ATLAS-2665
> Project: Atlas
> Issue Type: Improvement
> Affects Versions: 1.0.0
> Reporter: Bogdan Sava
> Assignee: Bogdan Sava
> Priority: Major
> Attachments: 0001-ATLAS-2665-Add-OMAG-API-in-Atlas.patch,
> ATLAS-2665-Add-OMAG-API-in-Atlas-v2.patch,
> ATLAS-2665-Add-OMAG-API-in-Atlas-v3.patch,
> ATLAS-2665-Add-OMAG-API-in-Atlas-v4.patch,
> ATLAS-2665-Add-OMAG-API-in-Atlas-v5.patch,
> ATLAS-2665-Add-OMAG-API-in-Atlas-v6.patch,
> ATLAS-2665-Add-OMAG-API-in-Atlas-v7.patch
>
>
> Create configuration for OMAG API in Atlas using Spring MVC Dispatcher
> servlet.
> Change base URL for the API to "/open-metadata"
>
> Add Spring mvc Dispatcher servlet to Atlas API in order to initialize rest
> resources annotated with.
> Spring mvc has contextConfigLocation init param pointing to
> /WEB-INF/openMetadataContext.xml which scans the packages:
> {code:java}
> <context:component-scan base-package="org.apache.atlas.omag,
> org.apache.atlas.omrs,
> org.apache.atlas.omas,
> org.apache.atlas.ocf" />
> {code}
> The base URIs will be:
> - for OMAS: /open-metadata/access-services/
> - for OMAG: /open-metadata/admin/
> The omag server spring boot application will have /open-metadata as context
> path also
>
> As result:
> /api/* paths will be handled bu jersey-servlet (
> com.sun.jersey.spi.spring.container.servlet.SpringServlet )
> /openmetadata/* will be handled by openmetadata-servlet (
> org.springframework.web.servlet.DispatcherServlet )
>
> {code:java}
> <servlet>
> <servlet-name>jersey-servlet</servlet-name>
> <servlet-class >
> com.sun.jersey.spi.spring.container.servlet.SpringServlet
> </servlet-class >
> <init-param>
> <param-name>com.sun.jersey.api.json.POJOMappingFeature</param-name>
> <param-value>true</param-value>
> </init-param>
> <load-on-startup>1</load-on-startup>
> </servlet>
> <servlet-mapping>
> <servlet-name>jersey-servlet</servlet-name>
> <url-pattern>/api/atlas/*</url-pattern>
> </servlet-mapping>
> <servlet>
> <servlet-name>open-metadata</servlet-name>
> <servlet-class >
> org.springframework.web.servlet.DispatcherServlet
> </servlet-class >
> <init-param>
> <param-name>contextConfigLocation</param-name>
> <param-value>/WEB-INF/openMetadataContext.xml</param-value>
> </init-param>
> <load-on-startup>2</load-on-startup>
> </servlet>
> <servlet-mapping>
> <servlet-name>open-metadata</servlet-name>
> <url-pattern>/open-metadata/*</url-pattern>
> </servlet-mapping>
> {code}
>
> The review board is: [https://reviews.apache.org/r/67083/]
>
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
