-patchset 2: increment version
Change-Id: Ib2f61ed903b95e4c218aaae0850d86f6f30c31af
Signed-off-by: dglFromAtt <dgl@research.att.com>
Issue-ID: DMAAP-647
Signed-off-by: dglFromAtt <dgl@research.att.com>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jettyVersion>9.3.9.v20160517</jettyVersion>
<eelf.version>0.0.1</eelf.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jettyVersion>9.3.9.v20160517</jettyVersion>
<eelf.version>0.0.1</eelf.version>
- <artifact.version>1.0.12-SNAPSHOT</artifact.version>
+ <artifact.version>1.0.13-SNAPSHOT</artifact.version>
<!-- SONAR -->
<jacoco.version>0.7.7.201606060606</jacoco.version>
<sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
<!-- SONAR -->
<jacoco.version>0.7.7.201606060606</jacoco.version>
<sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
import java.util.UUID;
import org.onap.dmaap.dbcapi.authentication.ApiPerms;
import java.util.UUID;
import org.onap.dmaap.dbcapi.authentication.ApiPerms;
+import org.onap.dmaap.dbcapi.authentication.ApiPolicy;
import org.onap.dmaap.dbcapi.database.DatabaseClass;
import org.onap.dmaap.dbcapi.logging.*;
import org.onap.dmaap.dbcapi.model.Dmaap;
import org.onap.dmaap.dbcapi.database.DatabaseClass;
import org.onap.dmaap.dbcapi.logging.*;
import org.onap.dmaap.dbcapi.model.Dmaap;
// for fresh installs, we may come up with no dmaap name so need to have a way for Controller to talk to us
Singleton<Dmaap> dmaapholder = DatabaseClass.getDmaap();
String name = dmaapholder.get().getDmaapName();
// for fresh installs, we may come up with no dmaap name so need to have a way for Controller to talk to us
Singleton<Dmaap> dmaapholder = DatabaseClass.getDmaap();
String name = dmaapholder.get().getDmaapName();
- if ( name == null || name.isEmpty()) {
+ ApiPolicy apiPolicy = new ApiPolicy();
+ if ( apiPolicy.getUseAuthClass() && (name == null || name.isEmpty())) {
ApiPerms p = new ApiPerms();
p.setBootMap();
}
ApiPerms p = new ApiPerms();
p.setBootMap();
}
import org.onap.dmaap.dbcapi.aaf.DmaapPerm;
import org.onap.dmaap.dbcapi.aaf.AafService.ServiceType;
import org.onap.dmaap.dbcapi.authentication.ApiPerms;
import org.onap.dmaap.dbcapi.aaf.DmaapPerm;
import org.onap.dmaap.dbcapi.aaf.AafService.ServiceType;
import org.onap.dmaap.dbcapi.authentication.ApiPerms;
+import org.onap.dmaap.dbcapi.authentication.ApiPolicy;
import org.onap.dmaap.dbcapi.database.DatabaseClass;
import org.onap.dmaap.dbcapi.logging.BaseLoggingClass;
import org.onap.dmaap.dbcapi.logging.DmaapbcLogMessageEnum;
import org.onap.dmaap.dbcapi.database.DatabaseClass;
import org.onap.dmaap.dbcapi.logging.BaseLoggingClass;
import org.onap.dmaap.dbcapi.logging.DmaapbcLogMessageEnum;
dmaapholder.update(nd);
AafService aaf = new AafService( ServiceType.AAF_Admin);
dmaapholder.update(nd);
AafService aaf = new AafService( ServiceType.AAF_Admin);
- ApiPerms p = new ApiPerms();
- p.setEnvMap();
+ ApiPolicy apiPolicy = new ApiPolicy();
+ if ( apiPolicy.getUseAuthClass() ) {
+ ApiPerms p = new ApiPerms();
+ p.setEnvMap();
+ }
boolean anythingWrong = false;
if ( multiSite ) {
boolean anythingWrong = false;
if ( multiSite ) {
if ( ! dmaap.isStatusValid() || ! nd.getDmaapName().equals(dmaap.getDmaapName()) || dmaap.getVersion().equals( "0") ) {
nd.setLastMod();
dmaapholder.update(nd); //need to set this so the following perms will pick up any new vals.
if ( ! dmaap.isStatusValid() || ! nd.getDmaapName().equals(dmaap.getDmaapName()) || dmaap.getVersion().equals( "0") ) {
nd.setLastMod();
dmaapholder.update(nd); //need to set this so the following perms will pick up any new vals.
- ApiPerms p = new ApiPerms();
- p.setEnvMap();
+ ApiPolicy apiPolicy = new ApiPolicy();
+ if ( apiPolicy.getUseAuthClass()) {
+ ApiPerms p = new ApiPerms();
+ p.setEnvMap();
+ }
AafService aaf = new AafService( ServiceType.AAF_Admin);
if ( multiSite ) {
anythingWrong = setTopicMgtPerms( nd, aaf ) || createMmaTopic();
AafService aaf = new AafService( ServiceType.AAF_Admin);
if ( multiSite ) {
anythingWrong = setTopicMgtPerms( nd, aaf ) || createMmaTopic();
base_version=${major}.${minor}.${patch}
# Release must be completed with git revision # in Jenkins
base_version=${major}.${minor}.${patch}
# Release must be completed with git revision # in Jenkins