Repository: nifi Updated Branches: refs/heads/master 13488fd9b -> 8c09a5c8d
NIFI-1783: - Addressing mistake in exmample XML. - Ensuring the configured Authorizer is loaded correctly. This closes #363. Signed-off-by: Bryan Bende <bbe...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/8c09a5c8 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/8c09a5c8 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/8c09a5c8 Branch: refs/heads/master Commit: 8c09a5c8d269a0bff7e6635581dc7ed316170f8c Parents: 13488fd Author: Matt Gilman <matt.c.gil...@gmail.com> Authored: Tue Apr 19 09:23:15 2016 -0400 Committer: Bryan Bende <bbe...@apache.org> Committed: Tue Apr 19 09:53:26 2016 -0400 ---------------------------------------------------------------------- .../nifi-framework-bundle/nifi-framework-nar/pom.xml | 4 ++++ .../nifi-framework/nifi-file-authorizer/pom.xml | 5 ++--- .../java/org/apache/nifi/authorization/FileAuthorizer.java | 8 ++++---- .../nifi-resources/src/main/resources/conf/authorizers.xml | 4 ++-- nifi-nar-bundles/nifi-framework-bundle/pom.xml | 5 +++++ 5 files changed, 17 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/8c09a5c8/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/pom.xml index bd8272a..104aa10 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/pom.xml @@ -31,6 +31,10 @@ <groupId>org.apache.nifi</groupId> <artifactId>nifi-jetty</artifactId> </dependency> + <dependency> + <groupId>org.apache.nifi</groupId> + <artifactId>nifi-file-authorizer</artifactId> + </dependency> <!-- mark these nifi artifacts as provided since it is included in the lib --> <dependency> http://git-wip-us.apache.org/repos/asf/nifi/blob/8c09a5c8/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/pom.xml index 53f35f4..0673b97 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/pom.xml @@ -41,7 +41,7 @@ <goal>xjc</goal> </goals> <configuration> - <packageName>org.apache.nifi.authorization.generated</packageName> + <packageName>org.apache.nifi.authorization.file.generated</packageName> </configuration> </execution> </executions> @@ -53,10 +53,9 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> <configuration> - <excludes>**/authorization/generated/*.java</excludes> + <excludes>**/authorization/file/generated/*.java</excludes> </configuration> </plugin> - </plugins> </build> <dependencies> http://git-wip-us.apache.org/repos/asf/nifi/blob/8c09a5c8/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/src/main/java/org/apache/nifi/authorization/FileAuthorizer.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/src/main/java/org/apache/nifi/authorization/FileAuthorizer.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/src/main/java/org/apache/nifi/authorization/FileAuthorizer.java index 8529caf..a9236ff 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/src/main/java/org/apache/nifi/authorization/FileAuthorizer.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-file-authorizer/src/main/java/org/apache/nifi/authorization/FileAuthorizer.java @@ -20,9 +20,9 @@ import org.apache.commons.lang3.StringUtils; import org.apache.nifi.authorization.annotation.AuthorizerContext; import org.apache.nifi.authorization.exception.AuthorizationAccessException; import org.apache.nifi.authorization.exception.AuthorizerCreationException; -import org.apache.nifi.authorization.generated.Authorization; -import org.apache.nifi.authorization.generated.Resource; -import org.apache.nifi.authorization.generated.Resources; +import org.apache.nifi.authorization.file.generated.Authorization; +import org.apache.nifi.authorization.file.generated.Resources; +import org.apache.nifi.authorization.file.generated.Resource; import org.apache.nifi.components.PropertyValue; import org.apache.nifi.util.NiFiProperties; import org.apache.nifi.util.file.FileUtils; @@ -62,7 +62,7 @@ public class FileAuthorizer implements Authorizer { private static final String READ_CODE = "R"; private static final String WRITE_CODE = "W"; private static final String USERS_XSD = "/authorizations.xsd"; - private static final String JAXB_GENERATED_PATH = "org.apache.nifi.authorization.generated"; + private static final String JAXB_GENERATED_PATH = "org.apache.nifi.authorization.file.generated"; private static final JAXBContext JAXB_CONTEXT = initializeJaxbContext(); /** http://git-wip-us.apache.org/repos/asf/nifi/blob/8c09a5c8/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/authorizers.xml ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/authorizers.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/authorizers.xml index 01ccd9c..2332b5e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/authorizers.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/authorizers.xml @@ -19,10 +19,10 @@ must be specified in the nifi.properties file. --> <authorizers> - <provider> + <authorizer> <identifier>file-provider</identifier> <class>org.apache.nifi.authorization.FileAuthorizer</class> <property name="Authorizations File">./conf/authorizations.xml</property> <property name="Reload Interval">30 secs</property> - </provider> + </authorizer> </authorizers> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi/blob/8c09a5c8/nifi-nar-bundles/nifi-framework-bundle/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/pom.xml index 9edf1f6..c1bdb08 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/pom.xml @@ -113,6 +113,11 @@ <artifactId>nifi-documentation</artifactId> <version>1.0.0-SNAPSHOT</version> </dependency> + <dependency> + <groupId>org.apache.nifi</groupId> + <artifactId>nifi-file-authorizer</artifactId> + <version>1.0.0-SNAPSHOT</version> + </dependency> </dependencies> </dependencyManagement> </project>