Skip to content

Commit

Permalink
Maven build
Browse files Browse the repository at this point in the history
-Added Maven files for a complete build and deploy in Tomcat 7
-Removed Ant files
-Removed all libs. They are now automatically downloaded by Maven
-SOLR properties are now injected by Maven, not by Spring anymore. Thus,
there is no more need for solr.properties file.
  • Loading branch information
guido committed Jan 22, 2013
1 parent 2e13cd1 commit 9fbf29d
Show file tree
Hide file tree
Showing 290 changed files with 784 additions and 767 deletions.
176 changes: 19 additions & 157 deletions .classpath

Large diffs are not rendered by default.

207 changes: 207 additions & 0 deletions .classpath.orig

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion .project
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,17 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
</natures>
</projectDescription>
1 change: 0 additions & 1 deletion .settings/.jsdtscope
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path=""/>
<classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path=""/>
</classpath>
4 changes: 3 additions & 1 deletion .settings/org.eclipse.core.resources.prefs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#Wed Jul 13 11:01:31 CEST 2011
eclipse.preferences.version=1
encoding//src/global_it.properties=ISO-8859-1
encoding/<project>=UTF-8
encoding/solr=UTF-8
encoding/src=UTF-8
8 changes: 4 additions & 4 deletions .settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
#Thu Mar 03 11:05:37 CET 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.compliance=1.7
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
org.eclipse.jdt.core.compiler.source=1.7
5 changes: 5 additions & 0 deletions .settings/org.eclipse.jst.j2ee.ejb.annotations.xdoclet.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
XDOCLETBUILDERACTIVE=true
XDOCLETHOME=
XDOCLETUSEGLOBAL=true
XDOCLETVERSION=1.2.1
eclipse.preferences.version=1
4 changes: 4 additions & 0 deletions .settings/org.eclipse.m2e.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
9 changes: 9 additions & 0 deletions .settings/org.eclipse.wst.common.component
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="locanda">
<wb-resource deploy-path="/" source-path="/webroot" tag="defaultRootSource"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/solr"/>
<property name="context-root" value="locanda"/>
<property name="java-output-path" value="/locanda/build/classes"/>
</wb-module>
</project-modules>
1 change: 0 additions & 1 deletion .settings/org.eclipse.wst.common.project.facet.core.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@
<runtime name="Apache Tomcat v7.0"/>
<installed facet="java" version="1.6"/>
<installed facet="jst.web" version="3.0"/>
<installed facet="wst.jsdt.web" version="1.0"/>
</faceted-project>
4 changes: 0 additions & 4 deletions ant/.gitignore

This file was deleted.

231 changes: 0 additions & 231 deletions ant/build.xml

This file was deleted.

38 changes: 0 additions & 38 deletions ant/buildProperties.xml

This file was deleted.

Loading

0 comments on commit 9fbf29d

Please sign in to comment.