From c1de3ea8a3e7852d0cc5b8306f3106774a5902cb Mon Sep 17 00:00:00 2001
From: eugenp <hanriseldon@gmail.com>
Date: Wed, 6 Aug 2014 20:48:05 +0300
Subject: [PATCH] making non-deployable projects jar type

---
 spring-hibernate3/.classpath                  |  1 -
 spring-hibernate3/pom.xml                     | 30 ++++++-------------
 spring-hibernate4/.classpath                  |  1 -
 spring-hibernate4/pom.xml                     | 16 +---------
 .../src/main/webapp/WEB-INF/web.xml           | 18 -----------
 spring-jpa/.classpath                         |  1 -
 spring-jpa/.springBeans                       |  5 ++--
 spring-jpa/pom.xml                            | 15 +---------
 .../src/main/webapp/WEB-INF/mvc-servlet.xml   |  6 ----
 .../src/main/webapp/WEB-INF/view/sample.jsp   |  7 -----
 spring-jpa/src/main/webapp/WEB-INF/web.xml    | 21 -------------
 11 files changed, 14 insertions(+), 107 deletions(-)
 delete mode 100644 spring-hibernate4/src/main/webapp/WEB-INF/web.xml
 delete mode 100644 spring-jpa/src/main/webapp/WEB-INF/mvc-servlet.xml
 delete mode 100644 spring-jpa/src/main/webapp/WEB-INF/view/sample.jsp
 delete mode 100644 spring-jpa/src/main/webapp/WEB-INF/web.xml

diff --git a/spring-hibernate3/.classpath b/spring-hibernate3/.classpath
index eed10d8a8b..efc51b414b 100644
--- a/spring-hibernate3/.classpath
+++ b/spring-hibernate3/.classpath
@@ -30,7 +30,6 @@
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/spring-hibernate3/pom.xml b/spring-hibernate3/pom.xml
index e426ee4817..fcb39ceee7 100644
--- a/spring-hibernate3/pom.xml
+++ b/spring-hibernate3/pom.xml
@@ -6,22 +6,11 @@
 	<version>0.1-SNAPSHOT</version>
 
 	<name>spring-hibernate3</name>
-	<packaging>war</packaging>
 
 	<dependencies>
 
 		<!-- Spring -->
 
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-web</artifactId>
-			<version>${org.springframework.version}</version>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-orm</artifactId>
-			<version>${org.springframework.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
@@ -29,7 +18,13 @@
 		</dependency>
 
 		<!-- persistence -->
-
+		
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-orm</artifactId>
+			<version>${org.springframework.version}</version>
+		</dependency>
+		
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-core</artifactId>
@@ -46,13 +41,13 @@
 			<version>${mysql-connector-java.version}</version>
 			<scope>runtime</scope>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.apache.tomcat</groupId>
 			<artifactId>tomcat-dbcp</artifactId>
 			<version>${tomcat-dbcp.version}</version>
 		</dependency>
-		
+
 		<!-- utils -->
 
 		<dependency>
@@ -127,12 +122,6 @@
 				</configuration>
 			</plugin>
 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-war-plugin</artifactId>
-				<version>${maven-war-plugin.version}</version>
-			</plugin>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
@@ -206,7 +195,6 @@
 
 		<!-- maven plugins -->
 		<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
-		<maven-war-plugin.version>2.4</maven-war-plugin.version>
 		<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
 		<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
 		<cargo-maven2-plugin.version>1.4.8</cargo-maven2-plugin.version>
diff --git a/spring-hibernate4/.classpath b/spring-hibernate4/.classpath
index ca257cf1f9..15b58ba46e 100644
--- a/spring-hibernate4/.classpath
+++ b/spring-hibernate4/.classpath
@@ -30,7 +30,6 @@
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/spring-hibernate4/pom.xml b/spring-hibernate4/pom.xml
index 847b0b5b79..94632e2225 100644
--- a/spring-hibernate4/pom.xml
+++ b/spring-hibernate4/pom.xml
@@ -4,19 +4,13 @@
 	<groupId>org.baeldung</groupId>
 	<artifactId>spring-hibernate4</artifactId>
 	<version>0.1-SNAPSHOT</version>
-
+	
 	<name>spring-hibernate4</name>
-	<packaging>war</packaging>
 
 	<dependencies>
 
 		<!-- Spring -->
 
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-web</artifactId>
-			<version>${org.springframework.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
@@ -135,12 +129,6 @@
 				</configuration>
 			</plugin>
 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-war-plugin</artifactId>
-				<version>${maven-war-plugin.version}</version>
-			</plugin>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
@@ -212,10 +200,8 @@
 
 		<rest-assured.version>2.3.1</rest-assured.version>
 
-		
 		<!-- maven plugins -->
 		<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
-		<maven-war-plugin.version>2.4</maven-war-plugin.version>
 		<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
 		<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
 		<cargo-maven2-plugin.version>1.4.8</cargo-maven2-plugin.version>
diff --git a/spring-hibernate4/src/main/webapp/WEB-INF/web.xml b/spring-hibernate4/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 64b5f6826d..0000000000
--- a/spring-hibernate4/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0">
-    <display-name>Spring Hibernate 4 Application</display-name>
-    <context-param>
-        <param-name>contextClass</param-name>
-        <param-value>
-            org.springframework.web.context.support.AnnotationConfigWebApplicationContext
-      	</param-value>
-    </context-param>
-    <context-param>
-        <param-name>contextConfigLocation</param-name>
-        <param-value>org.baeldung.spring</param-value>
-    </context-param>
-    <listener>
-        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-    </listener>
-</web-app>
\ No newline at end of file
diff --git a/spring-jpa/.classpath b/spring-jpa/.classpath
index 6cb510b80c..1210cf3d11 100644
--- a/spring-jpa/.classpath
+++ b/spring-jpa/.classpath
@@ -25,7 +25,6 @@
 	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
 		<attributes>
 			<attribute name="maven.pomderived" value="true"/>
-			<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
diff --git a/spring-jpa/.springBeans b/spring-jpa/.springBeans
index 7623a7e888..fc808d21d4 100644
--- a/spring-jpa/.springBeans
+++ b/spring-jpa/.springBeans
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beansProjectDescription>
 	<version>1</version>
-	<pluginVersion><![CDATA[3.2.0.201303060654-RELEASE]]></pluginVersion>
+	<pluginVersion><![CDATA[3.6.0.201407080615-RELEASE]]></pluginVersion>
 	<configSuffixes>
 		<configSuffix><![CDATA[xml]]></configSuffix>
 	</configSuffixes>
 	<enableImports><![CDATA[false]]></enableImports>
 	<configs>
-		<config>src/main/webapp/WEB-INF/mvc-servlet.xml</config>
 	</configs>
+	<autoconfigs>
+	</autoconfigs>
 	<configSets>
 	</configSets>
 </beansProjectDescription>
diff --git a/spring-jpa/pom.xml b/spring-jpa/pom.xml
index 6eb0155a58..71887c0eee 100644
--- a/spring-jpa/pom.xml
+++ b/spring-jpa/pom.xml
@@ -6,18 +6,12 @@
 	<artifactId>spring-jpa</artifactId>
 	<version>0.1-SNAPSHOT</version>
 
-	<packaging>war</packaging>
 	<name>spring-jpa</name>
 
 	<dependencies>
 
 		<!-- Spring -->
 
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-web</artifactId>
-			<version>${org.springframework.version}</version>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-orm</artifactId>
@@ -130,12 +124,6 @@
 				</configuration>
 			</plugin>
 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-war-plugin</artifactId>
-				<version>${maven-war-plugin.version}</version>
-			</plugin>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
@@ -205,13 +193,12 @@
 
 		<rest-assured.version>2.3.1</rest-assured.version>
 
-		
 		<!-- maven plugins -->
 		<maven-compiler-plugin.version>3.1</maven-compiler-plugin.version>
-		<maven-war-plugin.version>2.4</maven-war-plugin.version>
 		<maven-surefire-plugin.version>2.17</maven-surefire-plugin.version>
 		<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
 		<cargo-maven2-plugin.version>1.4.8</cargo-maven2-plugin.version>
+		<!-- <maven-war-plugin.version>2.4</maven-war-plugin.version> -->
 
 	</properties>
 
diff --git a/spring-jpa/src/main/webapp/WEB-INF/mvc-servlet.xml b/spring-jpa/src/main/webapp/WEB-INF/mvc-servlet.xml
deleted file mode 100644
index a675fc6d95..0000000000
--- a/spring-jpa/src/main/webapp/WEB-INF/mvc-servlet.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd" >
-
-</beans>
\ No newline at end of file
diff --git a/spring-jpa/src/main/webapp/WEB-INF/view/sample.jsp b/spring-jpa/src/main/webapp/WEB-INF/view/sample.jsp
deleted file mode 100644
index 7cc14b5dcd..0000000000
--- a/spring-jpa/src/main/webapp/WEB-INF/view/sample.jsp
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<head></head>
-
-<body>
-	<h1>This is the body of the sample view</h1>
-</body>
-</html>
\ No newline at end of file
diff --git a/spring-jpa/src/main/webapp/WEB-INF/web.xml b/spring-jpa/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 881018134e..0000000000
--- a/spring-jpa/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0">
-    
-    <display-name>Spring JPA Application</display-name>
-    
-    <context-param>
-        <param-name>contextClass</param-name>
-        <param-value>
-            org.springframework.web.context.support.AnnotationConfigWebApplicationContext
-      	</param-value>
-    </context-param>
-    <context-param>
-        <param-name>contextConfigLocation</param-name>
-        <param-value>org.baeldung.config</param-value>
-    </context-param>
-    <listener>
-        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-    </listener>
-    
-</web-app>