Permalink
Browse files

merging with pull request #1

1 parent bab286b commit 084189ae327f1a5c28f6ab47e1f8cfd73aa12131 Mic committed Feb 8, 2013
Showing with 73 additions and 27 deletions.
  1. +1 −1 .gitignore
  2. +47 −21 .project
  3. +15 −1 README
  4. +10 −4 pom.xml
View
@@ -1,4 +1,4 @@
target/*
.settings/*
.classpath
-
+.project
View
@@ -1,22 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>mvc-layout-samples</name>
- <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
- <projects/>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.wst.validation.validationbuilder</name>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- </natures>
-</projectDescription>
+ <name>mvc-layout-samples</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.m2e.core.maven2Builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.springframework.ide.eclipse.core.springbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.springframework.ide.eclipse.core.springnature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.m2e.core.maven2Nature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+ </natures>
+</projectDescription>
View
16 README
@@ -2,9 +2,23 @@ Before installing those samples please make sure that Maven and git have been in
You can do:
+Option A) All in Eclipse
+
+Make sure that Eclipse Maven Integration (m2e) is installed. http://www.eclipse.org/m2e/
+(You should have m2 icon in Help -> About dialog)
+
+Import -> Maven \ Check out Maven project from SCM
+Select git (For the first time click 'Add more SCM connectors from m2e marketspace' link )
+Enter Git repository URL into next field: git@github.com:michaelisvy/mvc-layout-samples.git
+
+Option B) Using Git console
git clone git@github.com:michaelisvy/mvc-layout-samples.git
cd mvc-layout-samples
mvn eclipse:eclipse
+NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.
+
Your project is now ready to be imported into Eclipse.
-File -> Import -> Existing project into Eclipse
+File -> Import -> Existing project into Eclipse
+
+
View
14 pom.xml
@@ -13,14 +13,13 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<spring.framework.version>3.2.0.RELEASE</spring.framework.version>
- <!-- 3.2.0.RC1 3.1.2.RELEASE -->
-
<tiles.version>3.0.1</tiles.version>
<slf4j.version>1.7.0</slf4j.version>
<log4j.version>1.2.17</log4j.version>
- <thymeleaf.version>2.0.13</thymeleaf.version>
+ <thymeleaf.version>2.0.15</thymeleaf.version>
</properties>
+
<build>
<plugins>
<plugin>
@@ -53,7 +52,14 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
- <version>${spring.framework.version}</version>
+ <version>${spring.framework.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+
</dependency>
<dependency>

0 comments on commit 084189a

Please sign in to comment.