Code Review
/
policy
/
pap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
support external configuration of pdp groups
[policy/pap.git]
/
main
/
src
/
main
/
java
/
org
/
onap
/
policy
/
pap
/
main
/
startstop
/
Main.java
diff --git
a/main/src/main/java/org/onap/policy/pap/main/startstop/Main.java
b/main/src/main/java/org/onap/policy/pap/main/startstop/Main.java
index
fe9b736
..
5918ed1
100644
(file)
--- a/
main/src/main/java/org/onap/policy/pap/main/startstop/Main.java
+++ b/
main/src/main/java/org/onap/policy/pap/main/startstop/Main.java
@@
-26,7
+26,6
@@
import java.util.Arrays;
import org.onap.policy.common.utils.resources.MessageConstants;
import org.onap.policy.common.utils.services.Registry;
import org.onap.policy.pap.main.PapConstants;
import org.onap.policy.common.utils.resources.MessageConstants;
import org.onap.policy.common.utils.services.Registry;
import org.onap.policy.pap.main.PapConstants;
-import org.onap.policy.pap.main.PolicyPapException;
import org.onap.policy.pap.main.PolicyPapRuntimeException;
import org.onap.policy.pap.main.parameters.PapParameterGroup;
import org.onap.policy.pap.main.parameters.PapParameterHandler;
import org.onap.policy.pap.main.PolicyPapRuntimeException;
import org.onap.policy.pap.main.parameters.PapParameterGroup;
import org.onap.policy.pap.main.parameters.PapParameterHandler;
@@
-70,7
+69,9
@@
public class Main {
parameterGroup = new PapParameterHandler().getParameters(arguments);
// Initialize database
parameterGroup = new PapParameterHandler().getParameters(arguments);
// Initialize database
- new PapDatabaseInitializer().initializePapDatabase(parameterGroup.getDatabaseProviderParameters());
+ new PapDatabaseInitializer().initializePapDatabase(
+ parameterGroup.getDatabaseProviderParameters(),
+ arguments.getPdpGroupsConfiguration());
// Now, create the activator for the policy pap service
activator = new PapActivator(parameterGroup);
// Now, create the activator for the policy pap service
activator = new PapActivator(parameterGroup);
@@
-110,9
+111,8
@@
public class Main {
/**
* Shut down Execution.
*
/**
* Shut down Execution.
*
- * @throws PolicyPapException on shutdown errors
*/
*/
- public void shutdown()
throws PolicyPapException
{
+ public void shutdown() {
// clear the parameterGroup variable
parameterGroup = null;
// clear the parameterGroup variable
parameterGroup = null;
@@
-141,7
+141,7
@@
public class Main {
// Shutdown the policy pap service and wait for everything to stop
activator.stop();
} catch (final RuntimeException e) {
// Shutdown the policy pap service and wait for everything to stop
activator.stop();
} catch (final RuntimeException e) {
- LOGGER.warn("error occured during shut down of the policy pap service", e);
+ LOGGER.warn("error occur
r
ed during shut down of the policy pap service", e);
}
}
}
}
}
}