Merge "added custom validators for use with openpojo"

3 files changed, 170 insertions, 188 deletions

diff --git a/adapters/mso-catalog-db-adapter/pom.xml b/adapters/mso-catalog-db-adapter/pom.xml
index 67b1f3124e..67d81dbb49 100644
--- a/adapters/mso-catalog-db-adapter/pom.xml
+++ b/adapters/mso-catalog-db-adapter/pom.xml
@@ -45,7 +45,7 @@
 											jaxws-maven-plugin
 										</artifactId>
 										<versionRange>
-											[2.3,)
+											[2.3.1,)
 										</versionRange>
 										<goals>
 											<goal>wsgen</goal>
@@ -87,12 +87,6 @@
 	<scope>test</scope>
 </dependency>
 <dependency>
-    <groupId>org.hamcrest</groupId>
-    <artifactId>hamcrest-all</artifactId>
-    <version>1.3</version>
-    <scope>test</scope>
-</dependency>
-<dependency>
     <groupId>javax.servlet</groupId>
     <artifactId>javax.servlet-api</artifactId>
     <version>3.1.0</version>
diff --git a/adapters/mso-tenant-adapter/pom.xml b/adapters/mso-tenant-adapter/pom.xml
index 6604e7e664..0b15b0dd6f 100644
--- a/adapters/mso-tenant-adapter/pom.xml
+++ b/adapters/mso-tenant-adapter/pom.xml
@@ -151,11 +151,5 @@
 			<artifactId>status-control</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-                <dependency>
-                    <groupId>org.mockito</groupId>
-                    <artifactId>mockito-all</artifactId>
-                    <version>1.10.19</version>
-                    <scope>test</scope>
-                </dependency>
 	</dependencies>
 </project>
diff --git a/adapters/mso-vnf-adapter/pom.xml b/adapters/mso-vnf-adapter/pom.xml
index 643f42f2ba..c4eb83c879 100644
--- a/adapters/mso-vnf-adapter/pom.xml
+++ b/adapters/mso-vnf-adapter/pom.xml
@@ -1,175 +1,169 @@
-<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">

-	<modelVersion>4.0.0</modelVersion>

-	<parent>

-		<groupId>org.onap.so</groupId>

-		<artifactId>adapters</artifactId>

-		<version>1.2.0-SNAPSHOT</version>

-	</parent>

-	<groupId>org.onap.so.adapters</groupId>

-	<artifactId>mso-vnf-adapter</artifactId>

-	<packaging>war</packaging>

-	<name>mso-vnf-adapter</name>

-	<description>Web Service and REST endpoint for VNF operations</description>

-

-	<build>

-		<finalName>${project.artifactId}-${project.version}</finalName>

-		<plugins>

-			<plugin>

-				<artifactId>maven-war-plugin</artifactId>

-				<version>2.4</version>

-				<configuration>

-					<warSourceDirectory>WebContent</warSourceDirectory>

-					<failOnMissingWebXml>false</failOnMissingWebXml>

-					<attachClasses>true</attachClasses>

-				</configuration>

-			</plugin>

-			<plugin>

-				<groupId>org.jvnet.jax-ws-commons</groupId>

-				<artifactId>jaxws-maven-plugin</artifactId>

-				<version>2.3</version>

-				<executions>

-					<execution>

-						<id>Synch</id>

-						<goals>

-							<goal>wsgen</goal>

-						</goals>

-						<configuration>

-							<verbose>true</verbose>

-							<sei>org.openecomp.mso.adapters.vnf.MsoVnfAdapterImpl</sei>

-							<genWsdl>true</genWsdl>

-							<inlineSchemas>true</inlineSchemas>

-						</configuration>

-					</execution>

-					<execution>

-						<id>Asynch</id>

-						<goals>

-							<goal>wsgen</goal>

-						</goals>

-						<configuration>

-							<verbose>true</verbose>

-							<sei>org.openecomp.mso.adapters.vnf.MsoVnfAdapterAsyncImpl</sei>

-							<genWsdl>true</genWsdl>

-							<inlineSchemas>true</inlineSchemas>

-						</configuration>

-					</execution>

-				</executions>

-				<dependencies>

-					<dependency>

-						<groupId>org.onap.so.adapters</groupId>

-						<artifactId>mso-adapter-utils</artifactId>

-						<version>${project.version}</version>

-					</dependency>

-					<dependency>

-						<groupId>com.sun.xml.ws</groupId>

-						<artifactId>jaxws-tools</artifactId>

-						<version>2.2.7</version>

-					</dependency>

-				</dependencies>

-			</plugin>

-		</plugins>

-		<pluginManagement>

-			<plugins>

-				<!--This plugin's configuration is used to store Eclipse m2e settings 

-					only. It has no influence on the Maven build itself. -->

-				<plugin>

-					<groupId>org.eclipse.m2e</groupId>

-					<artifactId>lifecycle-mapping</artifactId>

-					<version>1.0.0</version>

-					<configuration>

-						<lifecycleMappingMetadata>

-							<pluginExecutions>

-								<pluginExecution>

-									<pluginExecutionFilter>

-										<groupId>

-											org.jvnet.jax-ws-commons

-										</groupId>

-										<artifactId>

-											jaxws-maven-plugin

-										</artifactId>

-										<versionRange>

-											[2.3,)

-										</versionRange>

-										<goals>

-											<goal>wsgen</goal>

-										</goals>

-									</pluginExecutionFilter>

-									<action>

-										<ignore></ignore>

-									</action>

-								</pluginExecution>

-							</pluginExecutions>

-						</lifecycleMappingMetadata>

-					</configuration>

-				</plugin>

-			</plugins>

-		</pluginManagement>

-	</build>

-	<dependencies>

-		<dependency>

-			<groupId>org.onap.so.adapters</groupId>

-			<artifactId>mso-adapter-utils</artifactId>

-			<version>${project.version}</version>

-		</dependency>

-		<dependency>

-			<groupId>org.onap.so.adapters</groupId>

-			<artifactId>mso-adapters-rest-interface</artifactId>

-			<version>${project.version}</version>

-		</dependency>

-		<dependency>

-			<groupId>org.onap.so.adapters</groupId>

-			<artifactId>mso-vnf-adapter-async-client</artifactId>

-			<version>${project.version}</version>

-		</dependency>

-		<dependency>

-			<groupId>javax</groupId>

-			<artifactId>javaee-web-api</artifactId>

-			<version>6.0</version>

-			<scope>provided</scope>

-		</dependency>

-		<dependency>

-			<groupId>org.jboss.spec.javax.ejb</groupId>

-			<artifactId>jboss-ejb-api_3.2_spec</artifactId>

-			<version>1.0.0.Final</version>

-			<scope>provided</scope>

-		</dependency>

-		<dependency>

-			<groupId>org.jboss.ejb3</groupId>

-			<artifactId>jboss-ejb3-ext-api</artifactId>

-			<version>2.2.0.Final</version>

-			<scope>provided</scope>

-		</dependency>

-		<dependency>

-			<groupId>org.onap.so</groupId>

-			<artifactId>status-control</artifactId>

-			<version>${project.version}</version>

-		</dependency>

-		<dependency>

-			<groupId>org.onap.so</groupId>

-			<artifactId>aria-client</artifactId>

-			<version>1.2.0</version>

-		</dependency>

-		<dependency>

-			<groupId>org.jmockit</groupId>

-			<artifactId>jmockit</artifactId>

-			<version>1.8</version>

-			<scope>test</scope>

-		</dependency>

-		<dependency>

-			<groupId>junit</groupId>

-			<artifactId>junit</artifactId>

-			<version>4.12</version>

-			<scope>test</scope>

-		</dependency>

-		<!-- <dependency> -->

-		<!-- <groupId>org.onap.so</groupId> -->

-		<!-- <artifactId>mso-catalog-db</artifactId> -->

-		<!-- <version>${project.version}</version> -->

-		<!-- </dependency> -->

-		<!-- <dependency> -->

-		<!-- <groupId>log4j</groupId> -->

-		<!-- <artifactId>log4j</artifactId> -->

-		<!-- <version>1.2.17</version> -->

-		<!-- </dependency> -->

-	</dependencies>

-</project>

+<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">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.onap.so</groupId>
+		<artifactId>adapters</artifactId>
+		<version>1.2.0-SNAPSHOT</version>
+	</parent>
+	<groupId>org.onap.so.adapters</groupId>
+	<artifactId>mso-vnf-adapter</artifactId>
+	<packaging>war</packaging>
+	<name>mso-vnf-adapter</name>
+	<description>Web Service and REST endpoint for VNF operations</description>
+
+	<build>
+		<finalName>${project.artifactId}-${project.version}</finalName>
+		<plugins>
+			<plugin>
+				<artifactId>maven-war-plugin</artifactId>
+				<version>2.4</version>
+				<configuration>
+					<warSourceDirectory>WebContent</warSourceDirectory>
+					<failOnMissingWebXml>false</failOnMissingWebXml>
+					<attachClasses>true</attachClasses>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>jaxws-maven-plugin</artifactId>
+				<version>2.4.1</version>
+				<executions>
+					<execution>
+						<id>Synch</id>
+						<goals>
+							<goal>wsgen</goal>
+						</goals>
+						<configuration>
+							<verbose>true</verbose>
+							<sei>org.openecomp.mso.adapters.vnf.MsoVnfAdapterImpl</sei>
+							<genWsdl>true</genWsdl>
+							<inlineSchemas>true</inlineSchemas>
+						</configuration>
+					</execution>
+					<execution>
+						<id>Asynch</id>
+						<goals>
+							<goal>wsgen</goal>
+						</goals>
+						<configuration>
+							<verbose>true</verbose>
+							<sei>org.openecomp.mso.adapters.vnf.MsoVnfAdapterAsyncImpl</sei>
+							<genWsdl>true</genWsdl>
+							<inlineSchemas>true</inlineSchemas>
+						</configuration>
+					</execution>
+				</executions>
+				<dependencies>
+					<dependency>
+						<groupId>org.onap.so.adapters</groupId>
+						<artifactId>mso-adapter-utils</artifactId>
+						<version>${project.version}</version>
+					</dependency>
+					<dependency>
+						<groupId>com.sun.xml.ws</groupId>
+						<artifactId>jaxws-tools</artifactId>
+						<version>2.2.7</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+		</plugins>
+		<pluginManagement>
+			<plugins>
+				<!--This plugin's configuration is used to store Eclipse m2e settings 
+					only. It has no influence on the Maven build itself. -->
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>
+											org.codehaus.mojo
+										</groupId>
+										<artifactId>
+											jaxws-maven-plugin
+										</artifactId>
+										<versionRange>
+											[2.4.1,)
+										</versionRange>
+										<goals>
+											<goal>wsgen</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore></ignore>
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
+	<dependencies>
+		<dependency>
+			<groupId>org.onap.so.adapters</groupId>
+			<artifactId>mso-adapter-utils</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.onap.so.adapters</groupId>
+			<artifactId>mso-adapters-rest-interface</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.onap.so.adapters</groupId>
+			<artifactId>mso-vnf-adapter-async-client</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>javax</groupId>
+			<artifactId>javaee-web-api</artifactId>
+			<version>6.0</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.spec.javax.ejb</groupId>
+			<artifactId>jboss-ejb-api_3.2_spec</artifactId>
+			<version>1.0.0.Final</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.ejb3</groupId>
+			<artifactId>jboss-ejb3-ext-api</artifactId>
+			<version>2.2.0.Final</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.onap.so</groupId>
+			<artifactId>status-control</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.onap.so</groupId>
+			<artifactId>aria-client</artifactId>
+			<version>1.2.0</version>
+		</dependency>
+		<dependency>
+			<groupId>org.jmockit</groupId>
+			<artifactId>jmockit</artifactId>
+			<version>1.8</version>
+			<scope>test</scope>
+		</dependency>
+		<!-- <dependency> -->
+		<!-- <groupId>org.onap.so</groupId> -->
+		<!-- <artifactId>mso-catalog-db</artifactId> -->
+		<!-- <version>${project.version}</version> -->
+		<!-- </dependency> -->
+		<!-- <dependency> -->
+		<!-- <groupId>log4j</groupId> -->
+		<!-- <artifactId>log4j</artifactId> -->
+		<!-- <version>1.2.17</version> -->
+		<!-- </dependency> -->
+	</dependencies>
+</project>