X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fconfig%2Fconfig-manager-facade-xml%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Ffacade%2Fxml%2Fstrategy%2FEditStrategyType.java;fp=opendaylight%2Fnetconf%2Fconfig-netconf-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnetconf%2Fconfignetconfconnector%2Foperations%2Feditconfig%2FEditStrategyType.java;h=c5af3ec065f3bb53b1de1a87a0d2954a614bc8ca;hp=25d772f4ac565c5ecd4d1e84c1b98d302b810f52;hb=refs%2Fchanges%2F13%2F23413%2F26;hpb=071a641d7c12c0e6112d5ce0afe806b54f116ed2

diff --git a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/EditStrategyType.java b/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/strategy/EditStrategyType.java
similarity index 72%
rename from opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/EditStrategyType.java
rename to opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/strategy/EditStrategyType.java
index 25d772f4ac..c5af3ec065 100644
--- a/opendaylight/netconf/config-netconf-connector/src/main/java/org/opendaylight/controller/netconf/confignetconfconnector/operations/editconfig/EditStrategyType.java
+++ b/opendaylight/config/config-manager-facade-xml/src/main/java/org/opendaylight/controller/config/facade/xml/strategy/EditStrategyType.java
@@ -1,17 +1,17 @@
 /*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
+ * Copyright (c) 2015 Cisco Systems, Inc. and others.  All rights reserved.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.controller.netconf.confignetconfconnector.operations.editconfig;
+package org.opendaylight.controller.config.facade.xml.strategy;
 
 import java.util.EnumSet;
 import java.util.Set;
-import org.opendaylight.controller.netconf.api.NetconfDocumentedException;
-import org.opendaylight.controller.netconf.confignetconfconnector.exception.OperationNotPermittedException;
+import org.opendaylight.controller.config.facade.xml.exception.OperationNotPermittedException;
+import org.opendaylight.controller.config.util.xml.DocumentedException;
 
 public enum EditStrategyType {
     // can be default
@@ -46,12 +46,10 @@ public enum EditStrategyType {
             if (parsedStrategy != defaultStrategy){
                 throw new OperationNotPermittedException(String.format("With "
                         + defaultStrategy
-                        + " as "
-                        + EditConfigXmlParser.DEFAULT_OPERATION_KEY
-                        + " operations on module elements are not permitted since the default option is restrictive"),
-                        NetconfDocumentedException.ErrorType.application,
-                        NetconfDocumentedException.ErrorTag.operation_failed,
-                        NetconfDocumentedException.ErrorSeverity.error);
+                        + " as default-operation operations on module elements are not permitted since the default option is restrictive"),
+                        DocumentedException.ErrorType.application,
+                        DocumentedException.ErrorTag.operation_failed,
+                        DocumentedException.ErrorSeverity.error);
             }
         }