From: Robert Varga <rovarga@cisco.com>
Date: Sun, 23 Mar 2014 09:38:55 +0000 (+0100)
Subject: Introduce common directory
X-Git-Tag: release/helium~657^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=61dd54d0ca65bb0f2ad7cd9e1fc2d30856f0e1c1;p=yangtools.git

Introduce common directory

This directory will host code common to the various submodules, some of
which are candidates from moving into an upstream repository.

Populate this directory with concepts and mockito-configuration, thus
making sure the top-level POM has no direct code children.

Change-Id: Id7ac3aa68886841f408f047d05c740a563d8f957
Signed-off-by: Robert Varga <rovarga@cisco.com>
---

diff --git a/concepts/pom.xml b/common/concepts/pom.xml
similarity index 96%
rename from concepts/pom.xml
rename to common/concepts/pom.xml
index 7c9df45b4d..9123d6ae73 100644
--- a/concepts/pom.xml
+++ b/common/concepts/pom.xml
@@ -11,7 +11,7 @@
 
     <parent>
         <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yangtools</artifactId>
+        <artifactId>common-parent</artifactId>
         <version>0.6.2-SNAPSHOT</version>
     </parent>
     <packaging>bundle</packaging>
diff --git a/concepts/src/main/java/org/opendaylight/yangtools/concepts/AbstractListenerRegistration.java b/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/AbstractListenerRegistration.java
similarity index 100%
rename from concepts/src/main/java/org/opendaylight/yangtools/concepts/AbstractListenerRegistration.java
rename to common/concepts/src/main/java/org/opendaylight/yangtools/concepts/AbstractListenerRegistration.java
diff --git a/concepts/src/main/java/org/opendaylight/yangtools/concepts/AbstractObjectRegistration.java b/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/AbstractObjectRegistration.java
similarity index 100%
rename from concepts/src/main/java/org/opendaylight/yangtools/concepts/AbstractObjectRegistration.java
rename to common/concepts/src/main/java/org/opendaylight/yangtools/concepts/AbstractObjectRegistration.java
diff --git a/concepts/src/main/java/org/opendaylight/yangtools/concepts/AbstractRegistration.java b/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/AbstractRegistration.java
similarity index 100%
rename from concepts/src/main/java/org/opendaylight/yangtools/concepts/AbstractRegistration.java
rename to common/concepts/src/main/java/org/opendaylight/yangtools/concepts/AbstractRegistration.java
diff --git a/concepts/src/main/java/org/opendaylight/yangtools/concepts/Builder.java b/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/Builder.java
similarity index 100%
rename from concepts/src/main/java/org/opendaylight/yangtools/concepts/Builder.java
rename to common/concepts/src/main/java/org/opendaylight/yangtools/concepts/Builder.java
diff --git a/concepts/src/main/java/org/opendaylight/yangtools/concepts/ClassBasedPropertyBuilder.java b/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/ClassBasedPropertyBuilder.java
similarity index 100%
rename from concepts/src/main/java/org/opendaylight/yangtools/concepts/ClassBasedPropertyBuilder.java
rename to common/concepts/src/main/java/org/opendaylight/yangtools/concepts/ClassBasedPropertyBuilder.java
diff --git a/concepts/src/main/java/org/opendaylight/yangtools/concepts/Codec.java b/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/Codec.java
similarity index 100%
rename from concepts/src/main/java/org/opendaylight/yangtools/concepts/Codec.java
rename to common/concepts/src/main/java/org/opendaylight/yangtools/concepts/Codec.java
diff --git a/concepts/src/main/java/org/opendaylight/yangtools/concepts/CompositeObjectRegistration.java b/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/CompositeObjectRegistration.java
similarity index 100%
rename from concepts/src/main/java/org/opendaylight/yangtools/concepts/CompositeObjectRegistration.java
rename to common/concepts/src/main/java/org/opendaylight/yangtools/concepts/CompositeObjectRegistration.java
diff --git a/concepts/src/main/java/org/opendaylight/yangtools/concepts/Delegator.java b/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/Delegator.java
similarity index 100%
rename from concepts/src/main/java/org/opendaylight/yangtools/concepts/Delegator.java
rename to common/concepts/src/main/java/org/opendaylight/yangtools/concepts/Delegator.java
diff --git a/concepts/src/main/java/org/opendaylight/yangtools/concepts/Deserializer.java b/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/Deserializer.java
similarity index 100%
rename from concepts/src/main/java/org/opendaylight/yangtools/concepts/Deserializer.java
rename to common/concepts/src/main/java/org/opendaylight/yangtools/concepts/Deserializer.java
diff --git a/concepts/src/main/java/org/opendaylight/yangtools/concepts/Identifiable.java b/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/Identifiable.java
similarity index 100%
rename from concepts/src/main/java/org/opendaylight/yangtools/concepts/Identifiable.java
rename to common/concepts/src/main/java/org/opendaylight/yangtools/concepts/Identifiable.java
diff --git a/concepts/src/main/java/org/opendaylight/yangtools/concepts/Identifier.java b/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/Identifier.java
similarity index 100%
rename from concepts/src/main/java/org/opendaylight/yangtools/concepts/Identifier.java
rename to common/concepts/src/main/java/org/opendaylight/yangtools/concepts/Identifier.java
diff --git a/concepts/src/main/java/org/opendaylight/yangtools/concepts/Immutable.java b/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/Immutable.java
similarity index 100%
rename from concepts/src/main/java/org/opendaylight/yangtools/concepts/Immutable.java
rename to common/concepts/src/main/java/org/opendaylight/yangtools/concepts/Immutable.java
diff --git a/concepts/src/main/java/org/opendaylight/yangtools/concepts/InvertibleTransformator.java b/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/InvertibleTransformator.java
similarity index 100%
rename from concepts/src/main/java/org/opendaylight/yangtools/concepts/InvertibleTransformator.java
rename to common/concepts/src/main/java/org/opendaylight/yangtools/concepts/InvertibleTransformator.java
diff --git a/concepts/src/main/java/org/opendaylight/yangtools/concepts/ListenerRegistration.java b/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/ListenerRegistration.java
similarity index 100%
rename from concepts/src/main/java/org/opendaylight/yangtools/concepts/ListenerRegistration.java
rename to common/concepts/src/main/java/org/opendaylight/yangtools/concepts/ListenerRegistration.java
diff --git a/concepts/src/main/java/org/opendaylight/yangtools/concepts/Mutable.java b/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/Mutable.java
similarity index 100%
rename from concepts/src/main/java/org/opendaylight/yangtools/concepts/Mutable.java
rename to common/concepts/src/main/java/org/opendaylight/yangtools/concepts/Mutable.java
diff --git a/concepts/src/main/java/org/opendaylight/yangtools/concepts/MutationBehaviour.java b/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/MutationBehaviour.java
similarity index 100%
rename from concepts/src/main/java/org/opendaylight/yangtools/concepts/MutationBehaviour.java
rename to common/concepts/src/main/java/org/opendaylight/yangtools/concepts/MutationBehaviour.java
diff --git a/concepts/src/main/java/org/opendaylight/yangtools/concepts/Namespace.java b/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/Namespace.java
similarity index 100%
rename from concepts/src/main/java/org/opendaylight/yangtools/concepts/Namespace.java
rename to common/concepts/src/main/java/org/opendaylight/yangtools/concepts/Namespace.java
diff --git a/concepts/src/main/java/org/opendaylight/yangtools/concepts/ObjectRegistration.java b/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/ObjectRegistration.java
similarity index 100%
rename from concepts/src/main/java/org/opendaylight/yangtools/concepts/ObjectRegistration.java
rename to common/concepts/src/main/java/org/opendaylight/yangtools/concepts/ObjectRegistration.java
diff --git a/concepts/src/main/java/org/opendaylight/yangtools/concepts/OrderedSet.java b/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/OrderedSet.java
similarity index 100%
rename from concepts/src/main/java/org/opendaylight/yangtools/concepts/OrderedSet.java
rename to common/concepts/src/main/java/org/opendaylight/yangtools/concepts/OrderedSet.java
diff --git a/concepts/src/main/java/org/opendaylight/yangtools/concepts/Path.java b/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/Path.java
similarity index 100%
rename from concepts/src/main/java/org/opendaylight/yangtools/concepts/Path.java
rename to common/concepts/src/main/java/org/opendaylight/yangtools/concepts/Path.java
diff --git a/concepts/src/main/java/org/opendaylight/yangtools/concepts/Registration.java b/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/Registration.java
similarity index 100%
rename from concepts/src/main/java/org/opendaylight/yangtools/concepts/Registration.java
rename to common/concepts/src/main/java/org/opendaylight/yangtools/concepts/Registration.java
diff --git a/concepts/src/main/java/org/opendaylight/yangtools/concepts/Serializer.java b/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/Serializer.java
similarity index 100%
rename from concepts/src/main/java/org/opendaylight/yangtools/concepts/Serializer.java
rename to common/concepts/src/main/java/org/opendaylight/yangtools/concepts/Serializer.java
diff --git a/concepts/src/main/java/org/opendaylight/yangtools/concepts/Transformator.java b/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/Transformator.java
similarity index 100%
rename from concepts/src/main/java/org/opendaylight/yangtools/concepts/Transformator.java
rename to common/concepts/src/main/java/org/opendaylight/yangtools/concepts/Transformator.java
diff --git a/concepts/src/main/java/org/opendaylight/yangtools/concepts/ValueWrapper.java b/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/ValueWrapper.java
similarity index 100%
rename from concepts/src/main/java/org/opendaylight/yangtools/concepts/ValueWrapper.java
rename to common/concepts/src/main/java/org/opendaylight/yangtools/concepts/ValueWrapper.java
diff --git a/concepts/src/main/java/org/opendaylight/yangtools/concepts/util/ClassLoaderUtils.java b/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/util/ClassLoaderUtils.java
similarity index 100%
rename from concepts/src/main/java/org/opendaylight/yangtools/concepts/util/ClassLoaderUtils.java
rename to common/concepts/src/main/java/org/opendaylight/yangtools/concepts/util/ClassLoaderUtils.java
diff --git a/concepts/src/main/java/org/opendaylight/yangtools/concepts/util/Immutables.java b/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/util/Immutables.java
similarity index 100%
rename from concepts/src/main/java/org/opendaylight/yangtools/concepts/util/Immutables.java
rename to common/concepts/src/main/java/org/opendaylight/yangtools/concepts/util/Immutables.java
diff --git a/concepts/src/main/java/org/opendaylight/yangtools/concepts/util/ListenerRegistry.java b/common/concepts/src/main/java/org/opendaylight/yangtools/concepts/util/ListenerRegistry.java
similarity index 100%
rename from concepts/src/main/java/org/opendaylight/yangtools/concepts/util/ListenerRegistry.java
rename to common/concepts/src/main/java/org/opendaylight/yangtools/concepts/util/ListenerRegistry.java
diff --git a/mockito-configuration/pom.xml b/common/mockito-configuration/pom.xml
similarity index 96%
rename from mockito-configuration/pom.xml
rename to common/mockito-configuration/pom.xml
index c0d5225e9a..2e896de18b 100644
--- a/mockito-configuration/pom.xml
+++ b/common/mockito-configuration/pom.xml
@@ -11,7 +11,7 @@
 
     <parent>
         <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>yangtools</artifactId>
+        <artifactId>common-parent</artifactId>
         <version>0.6.2-SNAPSHOT</version>
     </parent>
 
diff --git a/mockito-configuration/src/main/java/org/mockito/configuration/ArgumentsExtractorVerifier.java b/common/mockito-configuration/src/main/java/org/mockito/configuration/ArgumentsExtractorVerifier.java
similarity index 100%
rename from mockito-configuration/src/main/java/org/mockito/configuration/ArgumentsExtractorVerifier.java
rename to common/mockito-configuration/src/main/java/org/mockito/configuration/ArgumentsExtractorVerifier.java
diff --git a/mockito-configuration/src/main/java/org/mockito/configuration/MockitoConfiguration.java b/common/mockito-configuration/src/main/java/org/mockito/configuration/MockitoConfiguration.java
similarity index 100%
rename from mockito-configuration/src/main/java/org/mockito/configuration/MockitoConfiguration.java
rename to common/mockito-configuration/src/main/java/org/mockito/configuration/MockitoConfiguration.java
diff --git a/mockito-configuration/src/main/java/org/mockito/configuration/ThrowsUnstubbedMethodException.java b/common/mockito-configuration/src/main/java/org/mockito/configuration/ThrowsUnstubbedMethodException.java
similarity index 100%
rename from mockito-configuration/src/main/java/org/mockito/configuration/ThrowsUnstubbedMethodException.java
rename to common/mockito-configuration/src/main/java/org/mockito/configuration/ThrowsUnstubbedMethodException.java
diff --git a/mockito-configuration/src/main/java/org/mockito/configuration/UnstubbedMethodException.java b/common/mockito-configuration/src/main/java/org/mockito/configuration/UnstubbedMethodException.java
similarity index 100%
rename from mockito-configuration/src/main/java/org/mockito/configuration/UnstubbedMethodException.java
rename to common/mockito-configuration/src/main/java/org/mockito/configuration/UnstubbedMethodException.java
diff --git a/mockito-configuration/src/main/resources/logback-test.xml b/common/mockito-configuration/src/main/resources/logback-test.xml
similarity index 100%
rename from mockito-configuration/src/main/resources/logback-test.xml
rename to common/mockito-configuration/src/main/resources/logback-test.xml
diff --git a/mockito-configuration/src/test/java/org/mockito/configuration/ArgumentsExtractorVerifierTest.java b/common/mockito-configuration/src/test/java/org/mockito/configuration/ArgumentsExtractorVerifierTest.java
similarity index 100%
rename from mockito-configuration/src/test/java/org/mockito/configuration/ArgumentsExtractorVerifierTest.java
rename to common/mockito-configuration/src/test/java/org/mockito/configuration/ArgumentsExtractorVerifierTest.java
diff --git a/mockito-configuration/src/test/java/org/mockito/configuration/DefaultAnswerTest.java b/common/mockito-configuration/src/test/java/org/mockito/configuration/DefaultAnswerTest.java
similarity index 100%
rename from mockito-configuration/src/test/java/org/mockito/configuration/DefaultAnswerTest.java
rename to common/mockito-configuration/src/test/java/org/mockito/configuration/DefaultAnswerTest.java
diff --git a/common/pom.xml b/common/pom.xml
new file mode 100644
index 0000000000..10db456f55
--- /dev/null
+++ b/common/pom.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ Copyright (c) 2014 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
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <parent>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yangtools</artifactId>
+        <version>0.6.2-SNAPSHOT</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>common-parent</artifactId>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>concepts</module>
+        <module>mockito-configuration</module>
+    </modules>
+
+</project>
diff --git a/pom.xml b/pom.xml
index 68cc427b04..2d39835831 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,14 +54,13 @@
     </scm>
 
     <modules>
-        <module>concepts</module>
-        <module>yang</module>
         <module>code-generator</module>
+        <module>common</module>
+        <module>integration-test</module>
         <module>model</module>
         <module>restconf</module>
-        <module>integration-test</module>
-        <module>mockito-configuration</module>
         <module>websocket</module>
+        <module>yang</module>
         <!-- module>third-party</module -->
     </modules>