Issue FUML14-9 - Removed code for package merge in repository model.

- Also corrected name of RepositorylException to RepositoryException.

Author: seidewitz

org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/repository/MissingRequiredPropertyException.java

@@ -11,7 +11,7 @@
 package org.modeldriven.fuml.repository;
 
 
-public class MissingRequiredPropertyException extends RepositorylException {
+public class MissingRequiredPropertyException extends RepositoryException {
 
     private static final long serialVersionUID = 1L;
 

org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/repository/NameCollisionException.java

@@ -1,7 +1,7 @@
 package org.modeldriven.fuml.repository;
 
 
-public class NameCollisionException extends RepositorylException {
+public class NameCollisionException extends RepositoryException {
 
     private static final long serialVersionUID = 1L;
 

…uml/repository/RepositorylException.java …fuml/repository/RepositoryException.javaorg.modeldriven.fuml/src/main/java/org/modeldriven/fuml/repository/RepositorylException.java renamed to org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/repository/RepositoryException.java org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/repository/RepositorylException.java renamed to org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/repository/RepositoryException.java

@@ -12,13 +12,13 @@
 
 import org.modeldriven.fuml.FumlException;
 
-public class RepositorylException extends FumlException {
+public class RepositoryException extends FumlException {
 
-    public RepositorylException(Throwable t) {
+    public RepositoryException(Throwable t) {
         super(t);
     }
 
-    public RepositorylException(String msg) {
+    public RepositoryException(String msg) {
         super(msg);
     }
 

org.modeldriven.fuml/src/main/java/org/modeldriven/fuml/repository/RepositoryMapping.java

@@ -19,7 +19,6 @@ public interface RepositoryMapping {
 	public void mapElementById(Element element, RepositoryArtifact artifact);
 	public void mapElementByName(NamedElement element, RepositoryArtifact artifact);
 	public void mapPackage(Package pkg, String currentPackageName, RepositoryArtifact artifact);
-	public void mapPackageMerge(Package pkg, String sourcePackageXmiId);
 	public void mapClassifier(Classifier classifier, String currentPackageName, RepositoryArtifact artifact);
 	public void mapClass(Class_ clss, String currentPackageName, RepositoryArtifact artifact);
 	public void mapStereotype(Stereotype stereotype, String currentPackageName, RepositoryArtifact artifact);