diff --git a/1.5/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/LibraryView.java b/1.5/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/LibraryView.java
index acf3b38..070acaf 100644
--- a/1.5/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/LibraryView.java
+++ b/1.5/plugins/org.eclipse.epf.authoring.ui/src/org/eclipse/epf/authoring/ui/views/LibraryView.java
@@ -720,9 +720,9 @@
 	/**
 	 * The action bar for the library view
 	 */
-	class LibraryViewActionBarContributor extends LibraryActionBarContributor {
+	protected class LibraryViewActionBarContributor extends LibraryActionBarContributor {
 
-		private IAction newPluginAction = new NewPluginAction(
+		protected IAction newPluginAction = new NewPluginAction(
 				AuthoringUIResources.new_plugin);
 
 		private IAction moveAction = new Action(AuthoringUIResources.move) {
diff --git a/1.5/plugins/org.eclipse.epf.library.edit/src/org/eclipse/epf/library/edit/command/ActionManager.java b/1.5/plugins/org.eclipse.epf.library.edit/src/org/eclipse/epf/library/edit/command/ActionManager.java
index 60a3794..5206b7c 100644
--- a/1.5/plugins/org.eclipse.epf.library.edit/src/org/eclipse/epf/library/edit/command/ActionManager.java
+++ b/1.5/plugins/org.eclipse.epf.library.edit/src/org/eclipse/epf/library/edit/command/ActionManager.java
@@ -42,14 +42,18 @@
 
 	private EditingDomain editingDomain;
 
-	private FullyRevertibleCommandStack commandStack;
+	protected FullyRevertibleCommandStack commandStack;
 
 	public ActionManager() {
 		commandStack = createCommandStack();
-		editingDomain = new AdapterFactoryEditingDomain(
+		editingDomain = createEditingDomain();
+	}
+	
+	protected EditingDomain createEditingDomain() {
+		return new AdapterFactoryEditingDomain(
 				TngAdapterFactory.INSTANCE
-						.getNavigatorView_ComposedAdapterFactory(),
-				commandStack);
+				.getNavigatorView_ComposedAdapterFactory(),
+		commandStack);
 	}
 
 	protected FullyRevertibleCommandStack createCommandStack() {
