Fixed template POM for web tools and removed not used Maven nature
Change-Id: I09e4dba41b97ab990d7c2047a542b328f3639468
Signed-off-by: Vincenzo Caselli <vincenzo.caselli@rcp-vision.com>
diff --git a/plugins/org.eclipse.emf.parsley.web.servlets/.classpath b/plugins/org.eclipse.emf.parsley.web.servlets/.classpath
index ae126b0..ad32c83 100644
--- a/plugins/org.eclipse.emf.parsley.web.servlets/.classpath
+++ b/plugins/org.eclipse.emf.parsley.web.servlets/.classpath
@@ -1,21 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry including="**/*.java" kind="src" output="target/classes" path="src">
- <attributes>
- <attribute name="optional" value="true"/>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.eclipse.emf.parsley.web.servlets/.project b/plugins/org.eclipse.emf.parsley.web.servlets/.project
index b698462..523aa5e 100644
--- a/plugins/org.eclipse.emf.parsley.web.servlets/.project
+++ b/plugins/org.eclipse.emf.parsley.web.servlets/.project
@@ -6,16 +6,6 @@
</projects>
<buildSpec>
<buildCommand>
- <name>org.eclipse.wst.common.project.facet.core.builder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
@@ -30,24 +20,10 @@
<arguments>
</arguments>
</buildCommand>
- <buildCommand>
- <name>org.eclipse.m2e.core.maven2Builder</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.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
- <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
</natures>
</projectDescription>
diff --git a/plugins/org.eclipse.emf.parsley.web.servlets/.settings/org.eclipse.core.resources.prefs b/plugins/org.eclipse.emf.parsley.web.servlets/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/plugins/org.eclipse.emf.parsley.web.servlets/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/plugins/org.eclipse.emf.parsley.web.servlets/.settings/org.eclipse.wst.common.component b/plugins/org.eclipse.emf.parsley.web.servlets/.settings/org.eclipse.wst.common.component
deleted file mode 100644
index 071d828..0000000
--- a/plugins/org.eclipse.emf.parsley.web.servlets/.settings/org.eclipse.wst.common.component
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
- <wb-module deploy-name="org.eclipse.emf.parsley.web.servlets">
- <wb-resource deploy-path="/" source-path="/src"/>
- </wb-module>
-</project-modules>
diff --git a/plugins/org.eclipse.emf.parsley.web.servlets/.settings/org.eclipse.wst.common.project.facet.core.xml b/plugins/org.eclipse.emf.parsley.web.servlets/.settings/org.eclipse.wst.common.project.facet.core.xml
deleted file mode 100644
index 88ceb05..0000000
--- a/plugins/org.eclipse.emf.parsley.web.servlets/.settings/org.eclipse.wst.common.project.facet.core.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-</faceted-project>
diff --git a/plugins/org.eclipse.emf.parsley.web.servlets/pom.xml b/plugins/org.eclipse.emf.parsley.web.servlets/pom.xml
index ff5b61a..e8e04a0 100644
--- a/plugins/org.eclipse.emf.parsley.web.servlets/pom.xml
+++ b/plugins/org.eclipse.emf.parsley.web.servlets/pom.xml
@@ -11,17 +11,5 @@
<artifactId>org.eclipse.emf.parsley.web.servlets</artifactId>
<packaging>eclipse-plugin</packaging>
- <dependencies>
- <dependency>
- <groupId>com.google.inject.extensions</groupId>
- <artifactId>guice-servlet</artifactId>
- <version>4.0</version>
- </dependency>
- <dependency>
- <groupId>com.googlecode.json-simple</groupId>
- <artifactId>json-simple</artifactId>
- <version>1.1.1</version>
- </dependency>
- </dependencies>
</project>
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.parsley.web.tools/templates/pom.xml b/plugins/org.eclipse.emf.parsley.web.tools/templates/pom.xml
index 48e33f2..aa7e161 100644
--- a/plugins/org.eclipse.emf.parsley.web.tools/templates/pom.xml
+++ b/plugins/org.eclipse.emf.parsley.web.tools/templates/pom.xml
@@ -1,21 +1,22 @@
-<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>
+<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>
- <groupId>org.eclipse.emf.parsley</groupId>
- <artifactId>org.eclipse.emf.parsley.web.servlets.dependencies</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>com.google.inject.extensions</groupId>
- <artifactId>guice-servlet</artifactId>
- <version>0.6.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>com.googlecode.json-simple</groupId>
- <artifactId>json-simple</artifactId>
- <version>1.1.1</version>
- </dependency>
- </dependencies>
-
- <version>1.0.0</version>
+ <groupId>org.eclipse.emf.parsley</groupId>
+ <artifactId>org.eclipse.emf.parsley.web.servlets.dependencies</artifactId>
+ <version>0.6.0-SNAPSHOT</version>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.google.inject.extensions</groupId>
+ <artifactId>guice-servlet</artifactId>
+ <version>4.0</version>
+ </dependency>
+ <dependency>
+ <groupId>com.googlecode.json-simple</groupId>
+ <artifactId>json-simple</artifactId>
+ <version>1.1.1</version>
+ </dependency>
+ </dependencies>
+
</project>
\ No newline at end of file
