http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e1160f59/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ReadOnlyAccessControlTest.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ReadOnlyAccessControlTest.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ReadOnlyAccessControlTest.java index 6ac8b47..0ab074f 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ReadOnlyAccessControlTest.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/accesscontrol/ReadOnlyAccessControlTest.java @@ -101,7 +101,7 @@ public class ReadOnlyAccessControlTest { /** * Ensures the admin user can get a groups content. * - * @throws Exception + * @throws Exception ex */ @Test public void testGroupGet() throws Exception { @@ -133,13 +133,12 @@ public class ReadOnlyAccessControlTest { Assert.assertEquals(1, processGroupContentsDTO.getInputPorts().size()); Assert.assertEquals(1, processGroupContentsDTO.getOutputPorts().size()); Assert.assertEquals(1, processGroupContentsDTO.getLabels().size()); -// Assert.assertEquals(1, processGroupContentsDTO.getRemoteProcessGroups().size()); } /** * Verifies the admin user cannot update a group. * - * @throws Exception + * @throws Exception ex */ @Test public void testGroupPut() throws Exception { @@ -163,7 +162,7 @@ public class ReadOnlyAccessControlTest { /** * Verifies the read only user can retrieve the controller configuration. * - * @throws Exception + * @throws Exception ex */ @Test public void testControllerConfigurationGet() throws Exception { @@ -188,7 +187,7 @@ public class ReadOnlyAccessControlTest { /** * Verifies the read only user cannot update the controller configuration. * - * @throws Exception + * @throws Exception ex */ @Test public void testControllerConfigurationPut() throws Exception { @@ -212,7 +211,7 @@ public class ReadOnlyAccessControlTest { /** * Verifies the read only user cannot create a new flow archive. * - * @throws Exception + * @throws Exception ex */ @Test public void testFlowConfigurationArchivePost() throws Exception { @@ -232,7 +231,7 @@ public class ReadOnlyAccessControlTest { /** * Verifies the read only user can retrieve his credentials. * - * @throws Exception + * @throws Exception ex */ @Test public void testAuthoritiesGet() throws Exception { @@ -255,7 +254,7 @@ public class ReadOnlyAccessControlTest { /** * Verifies the read only user can retrieve the banners. * - * @throws Exception + * @throws Exception ex */ @Test public void testBannersGet() throws Exception { @@ -278,7 +277,7 @@ public class ReadOnlyAccessControlTest { /** * Verifies the read only user can retrieve the processor types. * - * @throws Exception + * @throws Exception ex */ @Test public void testProcessorTypesGet() throws Exception { @@ -300,7 +299,7 @@ public class ReadOnlyAccessControlTest { /** * Verifies the read only user can retrieve the prioritizer types. * - * @throws Exception + * @throws Exception ex */ @Test public void testPrioritizerTypesGet() throws Exception { @@ -325,7 +324,7 @@ public class ReadOnlyAccessControlTest { /** * Verifies that the admin user can get process groups. * - * @throws Exception + * @throws Exception ex */ @Test public void testProcessorGroupsGet() throws Exception { @@ -346,7 +345,7 @@ public class ReadOnlyAccessControlTest { /** * Verifies that the operator user cannot create new process groups. * - * @throws Exception + * @throws Exception ex */ @Test public void testProcessGroupPost() throws Exception { @@ -369,10 +368,9 @@ public class ReadOnlyAccessControlTest { } /** - * Verifies that the operator user cannot update process group - * configuration. + * Verifies that the operator user cannot update process group configuration. * - * @throws Exception + * @throws Exception ex */ @Test public void testProcessGroupPut() throws Exception { @@ -397,7 +395,7 @@ public class ReadOnlyAccessControlTest { /** * Verifies that the operator user cannot delete process groups. * - * @throws Exception + * @throws Exception ex */ @Test public void testProcessGroupDelete() throws Exception { @@ -416,7 +414,7 @@ public class ReadOnlyAccessControlTest { /** * Verifies that the admin user can get processors. * - * @throws Exception + * @throws Exception ex */ @Test public void testProcessorsGet() throws Exception { @@ -437,7 +435,7 @@ public class ReadOnlyAccessControlTest { /** * Verifies that the read only user cannot create new processors. * - * @throws Exception + * @throws Exception ex */ @Test public void testProcessorPost() throws Exception { @@ -461,7 +459,7 @@ public class ReadOnlyAccessControlTest { /** * Verifies that the read only user cannot create new processors. * - * @throws Exception + * @throws Exception ex */ @Test public void testProcessorPut() throws Exception { @@ -485,7 +483,7 @@ public class ReadOnlyAccessControlTest { /** * Verifies that the read only user cannot delete processors. * - * @throws Exception + * @throws Exception ex */ @Test public void testProcessorDelete() throws Exception { @@ -504,7 +502,7 @@ public class ReadOnlyAccessControlTest { /** * Verifies that the admin user can get connections. * - * @throws Exception + * @throws Exception ex */ @Test public void testConnectionsGet() throws Exception { @@ -525,7 +523,7 @@ public class ReadOnlyAccessControlTest { /** * Verifies that the read only user cannot create connections. * - * @throws Exception + * @throws Exception ex */ @Test public void testConnectionPost() throws Exception { @@ -549,7 +547,7 @@ public class ReadOnlyAccessControlTest { /** * Verifies that the read only user cannot create connections. * - * @throws Exception + * @throws Exception ex */ @Test public void testConnectionPut() throws Exception { @@ -573,7 +571,7 @@ public class ReadOnlyAccessControlTest { /** * Verifies that the read only user cannot delete connections. * - * @throws Exception + * @throws Exception ex */ @Test public void testConnectionDelete() throws Exception { @@ -592,7 +590,7 @@ public class ReadOnlyAccessControlTest { /** * Verifies that the admin user can get input ports. * - * @throws Exception + * @throws Exception ex */ @Test public void testInputPortsGet() throws Exception { @@ -613,7 +611,7 @@ public class ReadOnlyAccessControlTest { /** * Verifies that the admin user cannot create input ports. * - * @throws Exception + * @throws Exception ex */ @Test public void testInputPortPost() throws Exception { @@ -638,7 +636,7 @@ public class ReadOnlyAccessControlTest { /** * Verifies that the admin user cannot create input ports. * - * @throws Exception + * @throws Exception ex */ @Test public void testInputPortPut() throws Exception { @@ -663,7 +661,7 @@ public class ReadOnlyAccessControlTest { /** * Verifies that the admin user cannot delete input ports. * - * @throws Exception + * @throws Exception ex */ @Test public void testInputPortDelete() throws Exception { @@ -682,7 +680,7 @@ public class ReadOnlyAccessControlTest { /** * Verifies that the admin user can get output ports. * - * @throws Exception + * @throws Exception ex */ @Test public void testOutputPortsGet() throws Exception { @@ -703,7 +701,7 @@ public class ReadOnlyAccessControlTest { /** * Verifies that the admin user cannot create output ports. * - * @throws Exception + * @throws Exception ex */ @Test public void testOutputPortPost() throws Exception { @@ -728,7 +726,7 @@ public class ReadOnlyAccessControlTest { /** * Verifies that the admin user cannot create input ports. * - * @throws Exception + * @throws Exception ex */ @Test public void testOutputPortPut() throws Exception { @@ -753,7 +751,7 @@ public class ReadOnlyAccessControlTest { /** * Verifies that the admin user cannot delete output ports. * - * @throws Exception + * @throws Exception ex */ @Test public void testOutputPortDelete() throws Exception { @@ -772,7 +770,7 @@ public class ReadOnlyAccessControlTest { /** * Verifies that the admin user can get input ports. * - * @throws Exception + * @throws Exception ex */ @Test public void testLabelsGet() throws Exception { @@ -793,7 +791,7 @@ public class ReadOnlyAccessControlTest { /** * Verifies that the read only user cannot create labels. * - * @throws Exception + * @throws Exception ex */ @Test public void testLabelPost() throws Exception { @@ -817,7 +815,7 @@ public class ReadOnlyAccessControlTest { /** * Verifies that the read only user cannot create labels. * - * @throws Exception + * @throws Exception ex */ @Test public void testLabelPut() throws Exception { @@ -841,7 +839,7 @@ public class ReadOnlyAccessControlTest { /** * Verifies that the read only user cannot delete labels. * - * @throws Exception + * @throws Exception ex */ @Test public void testLabelDelete() throws Exception { @@ -854,93 +852,13 @@ public class ReadOnlyAccessControlTest { Assert.assertEquals(403, response.getStatus()); } -// // ---------------------------------------------- -// // REMOTE PROCESS GROUP -// // ---------------------------------------------- -// -// /** -// * Verifies that the admin user can get input ports. -// * -// * @throws Exception -// */ -// @Test -// public void testRemoteProcessGroupsGet() throws Exception { -// String url = BASE_URL + "/controller/process-groups/root/remote-process-groups"; -// -// // perform the request -// ClientResponse response = READ_ONLY_USER.testGet(url); -// -// // get the response -// RemoteProcessGroupsEntity entity = response.getEntity(RemoteProcessGroupsEntity.class); -// -// // ensure the request was successful -// Assert.assertEquals(200, response.getStatus()); -// Assert.assertNotNull(entity.getRemoteProcessGroups()); -// Assert.assertEquals(1, entity.getRemoteProcessGroups().size()); -// } -// -// /** -// * Verifies that the read only user cannot create new remote process groups. -// * -// * @throws Exception -// */ -// @Test -// public void testRemoteProcessGroupPost() throws Exception { -// String url = BASE_URL + "/controller/process-groups/root/remote-process-groups"; -// -// // create the entity body -// RemoteProcessGroupEntity entity = new RemoteProcessGroupEntity(); -// entity.setRevision(NiFiTestUser.REVISION); -// -// // perform the request -// ClientResponse response = READ_ONLY_USER.testPost(url, entity); -// -// // ensure the request is failed with a forbidden status code -// Assert.assertEquals(403, response.getStatus()); -// } -// -// /** -// * Verifies that the read only user cannot update a remote process group. -// * -// * @throws Exception -// */ -// @Test -// public void testRemoteProcessGroupPut() throws Exception { -// String url = BASE_URL + "/controller/process-groups/root/remote-process-groups/1"; -// -// // create the entity body -// RemoteProcessGroupEntity entity = new RemoteProcessGroupEntity(); -// entity.setRevision(NiFiTestUser.REVISION); -// -// // perform the request -// ClientResponse response = READ_ONLY_USER.testPut(url, entity); -// -// // ensure the request is failed with a forbidden status code -// Assert.assertEquals(403, response.getStatus()); -// } -// -// /** -// * Verifies that the read only user cannot delete remote process groups. -// * -// * @throws Exception -// */ -// @Test -// public void testRemoteProcessGroupDelete() throws Exception { -// String url = BASE_URL + "/controller/process-groups/root/remote-process-groups/1"; -// -// // perform the request -// ClientResponse response = READ_ONLY_USER.testDelete(url); -// -// // ensure the request is failed with a forbidden status code -// Assert.assertEquals(403, response.getStatus()); -// } // ---------------------------------------------- // HISTORY // ---------------------------------------------- /** * Tests the ability to retrieve the NiFi history. * - * @throws Exception + * @throws Exception ex */ @Test public void testHistoryGet() throws Exception { @@ -960,7 +878,7 @@ public class ReadOnlyAccessControlTest { /** * Tests the ability to retrieve a specific action. * - * @throws Exception + * @throws Exception ex */ @Test public void testActionGet() throws Exception { @@ -977,7 +895,7 @@ public class ReadOnlyAccessControlTest { /** * Verifies the read only user cannot purge history. * - * @throws Exception + * @throws Exception ex */ @Test public void testHistoryDelete() throws Exception { @@ -996,7 +914,7 @@ public class ReadOnlyAccessControlTest { /** * Tests the ability to retrieve the NiFi users. * - * @throws Exception + * @throws Exception ex */ @Test public void testUsersGet() throws Exception { @@ -1012,7 +930,7 @@ public class ReadOnlyAccessControlTest { /** * Tests the ability to retrieve a specific user. * - * @throws Exception + * @throws Exception ex */ @Test public void testUserGet() throws Exception { @@ -1029,7 +947,7 @@ public class ReadOnlyAccessControlTest { /** * Verifies the admin user can update a person. * - * @throws Exception + * @throws Exception ex */ @Test public void testUserPut() throws Exception {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e1160f59/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestAuthorizationProvider.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestAuthorizationProvider.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestAuthorizationProvider.java index 48f18a9..d51b7df 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestAuthorizationProvider.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestAuthorizationProvider.java @@ -71,7 +71,7 @@ public class NiFiTestAuthorizationProvider implements AuthorityProvider { /** * Determines if the specified dn is known to this authority provider. * - * @param dn + * @param dn dn * @return True if he dn is known, false otherwise */ @Override @@ -87,10 +87,10 @@ public class NiFiTestAuthorizationProvider implements AuthorityProvider { /** * Loads the authorities for the specified user. * - * @param dn - * @return - * @throws UnknownIdentityException - * @throws AuthorityAccessException + * @param dn dn + * @return authorities + * @throws UnknownIdentityException ex + * @throws AuthorityAccessException ex */ @Override public Set<Authority> getAuthorities(String dn) throws UnknownIdentityException, AuthorityAccessException { @@ -101,9 +101,9 @@ public class NiFiTestAuthorizationProvider implements AuthorityProvider { /** * Sets the specified authorities to the specified user. * - * @param dn - * @param authorities - * @throws AuthorityAccessException + * @param dn dn + * @param authorities authorities + * @throws AuthorityAccessException ex */ @Override public void setAuthorities(String dn, Set<Authority> authorities) throws UnknownIdentityException, AuthorityAccessException { @@ -112,10 +112,10 @@ public class NiFiTestAuthorizationProvider implements AuthorityProvider { /** * Adds the specified user. * - * @param dn - * @param authorities - * @throws UnknownIdentityException - * @throws AuthorityAccessException + * @param dn dn + * @param group group + * @throws UnknownIdentityException ex + * @throws AuthorityAccessException ex */ @Override public void addUser(String dn, String group) throws AuthorityAccessException { @@ -124,9 +124,9 @@ public class NiFiTestAuthorizationProvider implements AuthorityProvider { /** * Gets the users for the specified authority. * - * @param authority - * @return - * @throws AuthorityAccessException + * @param authority authority + * @return users + * @throws AuthorityAccessException ex */ @Override public Set<String> getUsers(Authority authority) throws AuthorityAccessException { @@ -142,9 +142,9 @@ public class NiFiTestAuthorizationProvider implements AuthorityProvider { /** * Removes the specified user. * - * @param dn - * @throws UnknownIdentityException - * @throws AuthorityAccessException + * @param dn dn + * @throws UnknownIdentityException ex + * @throws AuthorityAccessException ex */ @Override public void revokeUser(String dn) throws UnknownIdentityException, AuthorityAccessException { http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e1160f59/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestServer.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestServer.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestServer.java index 24dd8be..42b0aab 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestServer.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestServer.java @@ -130,7 +130,6 @@ public class NiFiTestServer { jetty.addConnector(https); } - public void startServer() throws Exception { jetty.start(); @@ -169,16 +168,14 @@ public class NiFiTestServer { } /** - * Convenience method to provide access to Spring beans accessible from the - * web application context. + * Convenience method to provide access to Spring beans accessible from the web application context. * * @param <T> target cast * @param beanName name of the spring bean * @param clazz class of the spring bean * @return Spring bean with given name and class type * - * @throws ClassCastException if the bean found cannot be cast to the given - * class type + * @throws ClassCastException if the bean found cannot be cast to the given class type */ public <T> T getSpringBean(String beanName, Class<T> clazz) { ServletContext servletContext = webappContext.getServletHandler().getServletContext(); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e1160f59/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestUser.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestUser.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestUser.java index 3acef72..52f4522 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestUser.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/java/org/apache/nifi/integration/util/NiFiTestUser.java @@ -32,8 +32,8 @@ public class NiFiTestUser { public static final long REVISION = 0L; - private Client client; - private String proxyDn; + private final Client client; + private final String proxyDn; public NiFiTestUser(Client client, String dn) { this.client = client; @@ -43,10 +43,9 @@ public class NiFiTestUser { /** * Performs a GET using the specified url. * - * @param client - * @param url - * @return - * @throws Exception + * @param url url + * @return response + * @throws Exception ex */ public ClientResponse testGet(String url) throws Exception { return testGet(url, null); @@ -55,10 +54,9 @@ public class NiFiTestUser { /** * Performs a GET using the specified url and query parameters. * - * @param client - * @param url - * @param queryParams - * @return + * @param url url + * @param queryParams params + * @return response */ public ClientResponse testGet(String url, Map<String, String> queryParams) { // get the resource @@ -78,10 +76,9 @@ public class NiFiTestUser { /** * Performs a POST using the specified url. * - * @param client - * @param url - * @return - * @throws Exception + * @param url url + * @return response + * @throws Exception ex */ public ClientResponse testPost(String url) throws Exception { return testPost(url, (Object) null); @@ -90,11 +87,10 @@ public class NiFiTestUser { /** * Performs a POST using the specified url and entity body. * - * @param client - * @param url - * @param entity - * @return - * @throws Exception + * @param url url + * @param entity entity + * @return response + * @throws Exception ex */ public ClientResponse testPost(String url, Object entity) throws Exception { // get the resource @@ -112,11 +108,10 @@ public class NiFiTestUser { /** * Performs a POST using the specified url and entity body. * - * @param client - * @param url - * @param entity - * @return - * @throws Exception + * @param url url + * @param entity entity + * @return repsonse + * @throws Exception ex */ public ClientResponse testPostMultiPart(String url, Object entity) throws Exception { // get the resource @@ -134,9 +129,10 @@ public class NiFiTestUser { /** * Performs a POST using the specified url and form data. * - * @param url - * @param formData - * @return + * @param url url + * @param formData form data + * @return response + * @throws java.lang.Exception ex */ public ClientResponse testPost(String url, Map<String, String> formData) throws Exception { // convert the form data @@ -146,7 +142,8 @@ public class NiFiTestUser { } // get the resource - WebResource.Builder resourceBuilder = client.resource(url).accept(MediaType.APPLICATION_JSON).type(MediaType.APPLICATION_FORM_URLENCODED).header(X509AuthenticationFilter.PROXY_ENTITIES_CHAIN, proxyDn); + WebResource.Builder resourceBuilder + = client.resource(url).accept(MediaType.APPLICATION_JSON).type(MediaType.APPLICATION_FORM_URLENCODED).header(X509AuthenticationFilter.PROXY_ENTITIES_CHAIN, proxyDn); // add the form data if necessary if (!entity.isEmpty()) { @@ -160,9 +157,10 @@ public class NiFiTestUser { /** * Performs a PUT using the specified url and entity body. * - * @param url - * @param entity - * @return + * @param url url + * @param entity entity + * @return response + * @throws java.lang.Exception ex */ public ClientResponse testPut(String url, Object entity) throws Exception { // get the resource @@ -180,9 +178,10 @@ public class NiFiTestUser { /** * Performs a PUT using the specified url and form data. * - * @param url - * @param formData - * @return + * @param url url + * @param formData form data + * @return response + * @throws java.lang.Exception ex */ public ClientResponse testPut(String url, Map<String, String> formData) throws Exception { // convert the form data @@ -192,7 +191,8 @@ public class NiFiTestUser { } // get the resource - WebResource.Builder resourceBuilder = client.resource(url).accept(MediaType.APPLICATION_JSON).type(MediaType.APPLICATION_FORM_URLENCODED).header(X509AuthenticationFilter.PROXY_ENTITIES_CHAIN, proxyDn); + WebResource.Builder resourceBuilder + = client.resource(url).accept(MediaType.APPLICATION_JSON).type(MediaType.APPLICATION_FORM_URLENCODED).header(X509AuthenticationFilter.PROXY_ENTITIES_CHAIN, proxyDn); // add the form data if necessary if (!entity.isEmpty()) { @@ -206,7 +206,9 @@ public class NiFiTestUser { /** * Performs a DELETE using the specified url. * - * @param url + * @param url url + * @return response + * @throws java.lang.Exception ex */ public ClientResponse testDelete(String url) throws Exception { return testDelete(url, (Object) null); @@ -215,9 +217,10 @@ public class NiFiTestUser { /** * Performs a DELETE using the specified url and entity. * - * @param url - * @param entity - * @return + * @param url url + * @param entity entity + * @return repsonse + * @throws java.lang.Exception ex */ public ClientResponse testDelete(String url, Object entity) throws Exception { // get the resource @@ -235,9 +238,10 @@ public class NiFiTestUser { /** * Performs a DELETE using the specified url and query parameters. * - * @param url - * @param queryParams - * @return + * @param url url + * @param queryParams params + * @return response + * @throws java.lang.Exception ex */ public ClientResponse testDelete(String url, Map<String, String> queryParams) throws Exception { // get the resource http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e1160f59/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/src/main/java/org/apache/nifi/web/docs/DocumentationController.java ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/src/main/java/org/apache/nifi/web/docs/DocumentationController.java b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/src/main/java/org/apache/nifi/web/docs/DocumentationController.java index 7d8ec6c..5f9dfdf 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/src/main/java/org/apache/nifi/web/docs/DocumentationController.java +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-docs/src/main/java/org/apache/nifi/web/docs/DocumentationController.java @@ -41,7 +41,7 @@ public class DocumentationController extends HttpServlet { private static final int GENERAL_LINK_COUNT = 4; private static final int DEVELOPER_LINK_COUNT = 2; - + // context for accessing the extension mapping private ServletContext servletContext; http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/e1160f59/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml index bb90ab5..d3af86e 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml @@ -216,23 +216,6 @@ </build> <profiles> <profile> - <id>dev</id> - <activation> - <activeByDefault>false</activeByDefault> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.rat</groupId> - <artifactId>apache-rat-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> <id>minify-and-compress</id> <activation> <activeByDefault>true</activeByDefault>
