revert-70aa11f8
prabathabey 9 years ago
commit ed8242fc66

@ -44,7 +44,7 @@ public class APIPublisherUtil {
private static List<HTTPMethod> httpMethods; private static List<HTTPMethod> httpMethods;
static { static {
httpMethods = new ArrayList<HTTPMethod>(); httpMethods = new ArrayList<HTTPMethod>(5);
httpMethods.add(HTTPMethod.GET); httpMethods.add(HTTPMethod.GET);
httpMethods.add(HTTPMethod.POST); httpMethods.add(HTTPMethod.POST);
httpMethods.add(HTTPMethod.DELETE); httpMethods.add(HTTPMethod.DELETE);

@ -268,7 +268,7 @@ public class ApplicationManagerProviderServiceImpl implements ApplicationManagem
log.debug("num of apps installed:" + installedAppList.size()); log.debug("num of apps installed:" + installedAppList.size());
} }
List<Application> appsToAdd = new ArrayList<>(); List<Application> appsToAdd = new ArrayList<>();
List<Integer> appIdsToRemove = new ArrayList<>(); List<Integer> appIdsToRemove = new ArrayList<>(installedAppList.size());
for (Application installedApp : installedAppList) { for (Application installedApp : installedAppList) {
if (!applications.contains(installedApp)) { if (!applications.contains(installedApp)) {

@ -1282,11 +1282,6 @@ public class PolicyDAOImpl implements PolicyDAO {
stmt.setInt(1, policyId); stmt.setInt(1, policyId);
stmt.executeUpdate(); stmt.executeUpdate();
String deleteComplianceStatus ="DELETE FROM DM_POLICY_COMPLIANCE_STATUS WHERE POLICY_ID =?";
stmt = conn.prepareStatement(deleteComplianceStatus);
stmt.setInt(1, policyId);
stmt.executeUpdate();
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("Policy (" + policyId + ") related configs deleted from database."); log.debug("Policy (" + policyId + ") related configs deleted from database.");
} }

@ -308,12 +308,7 @@ CREATE TABLE IF NOT EXISTS DM_POLICY_COMPLIANCE_STATUS (
LAST_REQUESTED_TIME TIMESTAMP NULL, LAST_REQUESTED_TIME TIMESTAMP NULL,
LAST_FAILED_TIME TIMESTAMP NULL, LAST_FAILED_TIME TIMESTAMP NULL,
ATTEMPTS INT NULL, ATTEMPTS INT NULL,
PRIMARY KEY (ID), PRIMARY KEY (ID)
CONSTRAINT FK_POLICY_COMPLIANCE_STATUS_POLICY
FOREIGN KEY (POLICY_ID)
REFERENCES DM_POLICY (ID)
ON DELETE NO ACTION
ON UPDATE NO ACTION
); );

@ -311,12 +311,7 @@ CREATE TABLE DM_POLICY_COMPLIANCE_STATUS (
LAST_REQUESTED_TIME DATETIME2(0) NULL, LAST_REQUESTED_TIME DATETIME2(0) NULL,
LAST_FAILED_TIME DATETIME2(0) NULL, LAST_FAILED_TIME DATETIME2(0) NULL,
ATTEMPTS INT NULL, ATTEMPTS INT NULL,
PRIMARY KEY (ID), PRIMARY KEY (ID)
CONSTRAINT FK_POLICY_COMPLIANCE_STATUS_POLICY
FOREIGN KEY (POLICY_ID)
REFERENCES DM_POLICY (ID)
ON DELETE NO ACTION
ON UPDATE NO ACTION
); );

@ -302,12 +302,7 @@ CREATE TABLE IF NOT EXISTS DM_POLICY_COMPLIANCE_STATUS (
LAST_REQUESTED_TIME TIMESTAMP NULL, LAST_REQUESTED_TIME TIMESTAMP NULL,
LAST_FAILED_TIME TIMESTAMP NULL, LAST_FAILED_TIME TIMESTAMP NULL,
ATTEMPTS INT NULL, ATTEMPTS INT NULL,
PRIMARY KEY (ID), PRIMARY KEY (ID)
CONSTRAINT FK_POLICY_COMPLIANCE_STATUS_POLICY
FOREIGN KEY (POLICY_ID)
REFERENCES DM_POLICY (ID)
ON DELETE NO ACTION
ON UPDATE NO ACTION
)ENGINE = InnoDB; )ENGINE = InnoDB;

@ -397,10 +397,7 @@ CREATE TABLE DM_DEVICE_POLICY_APPLIED (
CONSTRAINT PK_DM_POLICY_DEV_APPLIED PRIMARY KEY (ID) , CONSTRAINT PK_DM_POLICY_DEV_APPLIED PRIMARY KEY (ID) ,
CONSTRAINT FK_DM_POLICY_DEV_APPLIED CONSTRAINT FK_DM_POLICY_DEV_APPLIED
FOREIGN KEY (DEVICE_ID ) FOREIGN KEY (DEVICE_ID )
REFERENCES DM_DEVICE (ID ), REFERENCES DM_DEVICE (ID )
CONSTRAINT FK_DM_POLICY_DEV_APPLY_POLICY
FOREIGN KEY (POLICY_ID )
REFERENCES DM_POLICY (ID )
) )
/ /
-- Generate ID using sequence and trigger -- Generate ID using sequence and trigger
@ -503,10 +500,7 @@ CREATE TABLE DM_POLICY_COMPLIANCE_STATUS (
LAST_REQUESTED_TIME TIMESTAMP(0) NULL, LAST_REQUESTED_TIME TIMESTAMP(0) NULL,
LAST_FAILED_TIME TIMESTAMP(0) NULL, LAST_FAILED_TIME TIMESTAMP(0) NULL,
ATTEMPTS NUMBER(10) NULL, ATTEMPTS NUMBER(10) NULL,
CONSTRAINT PK_DM_POLICY_COMP_STATUS PRIMARY KEY (ID), CONSTRAINT PK_DM_POLICY_COMP_STATUS PRIMARY KEY (ID)
CONSTRAINT FK_POLICY_COMP_STATUS_POLICY
FOREIGN KEY (POLICY_ID)
REFERENCES DM_POLICY (ID)
) )
/ /
-- Generate ID using sequence and trigger -- Generate ID using sequence and trigger

@ -266,12 +266,7 @@ CREATE TABLE IF NOT EXISTS DM_POLICY_COMPLIANCE_STATUS (
LAST_SUCCESS_TIME TIMESTAMP NULL, LAST_SUCCESS_TIME TIMESTAMP NULL,
LAST_REQUESTED_TIME TIMESTAMP NULL, LAST_REQUESTED_TIME TIMESTAMP NULL,
LAST_FAILED_TIME TIMESTAMP NULL, LAST_FAILED_TIME TIMESTAMP NULL,
ATTEMPTS INTEGER NULL, ATTEMPTS INTEGER NULL
CONSTRAINT FK_POLICY_COMPLIANCE_STATUS_POLICY
FOREIGN KEY (POLICY_ID)
REFERENCES DM_POLICY (ID)
ON DELETE NO ACTION
ON UPDATE NO ACTION
); );
CREATE TABLE IF NOT EXISTS DM_POLICY_CHANGE_MGT ( CREATE TABLE IF NOT EXISTS DM_POLICY_CHANGE_MGT (

@ -1519,7 +1519,7 @@
<carbon.deployment.version>4.6.0</carbon.deployment.version> <carbon.deployment.version>4.6.0</carbon.deployment.version>
<!-- Carbon Identity --> <!-- Carbon Identity -->
<carbon.identity.version>5.0.5</carbon.identity.version> <carbon.identity.version>5.0.7</carbon.identity.version>
<!-- Carbon Multi-tenancy --> <!-- Carbon Multi-tenancy -->
<carbon.multitenancy.version>4.5.0</carbon.multitenancy.version> <carbon.multitenancy.version>4.5.0</carbon.multitenancy.version>

Loading…
Cancel
Save