You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2013/03/18 13:59:45 UTC
[1/2] git commit: MARMOTTA-160: some minor updates on ther webapp
artifact
MARMOTTA-160: some minor updates on ther webapp artifact
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/f9e7d1ac
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/f9e7d1ac
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/f9e7d1ac
Branch: refs/heads/master
Commit: f9e7d1ac67d91c76f747f83fe1f06e5368f10799
Parents: 51575c6
Author: Sergio Fernández <wi...@apache.org>
Authored: Mon Mar 18 13:57:02 2013 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Mon Mar 18 13:57:02 2013 +0100
----------------------------------------------------------------------
build/archetypes/marmotta-archetype-webapp/pom.xml | 7 +-
.../src/main/resources/archetype-resources/pom.xml | 103 +++++----------
2 files changed, 35 insertions(+), 75 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f9e7d1ac/build/archetypes/marmotta-archetype-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-webapp/pom.xml b/build/archetypes/marmotta-archetype-webapp/pom.xml
index 1053ad0..c6b9ff0 100644
--- a/build/archetypes/marmotta-archetype-webapp/pom.xml
+++ b/build/archetypes/marmotta-archetype-webapp/pom.xml
@@ -32,13 +32,9 @@
<description>Web Application bundle (WAR file) containing Apache Marmotta</description>
<build>
+
<extensions>
<extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ssh-external</artifactId>
- <version>1.0-beta-6</version>
- </extension>
- <extension>
<groupId>org.apache.maven.archetype</groupId>
<artifactId>archetype-packaging</artifactId>
<version>2.2</version>
@@ -64,6 +60,7 @@
</configuration>
</plugin>
</plugins>
+
</build>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/f9e7d1ac/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/pom.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/pom.xml b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/pom.xml
index 95c4fb6..1358d69 100644
--- a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/pom.xml
+++ b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/pom.xml
@@ -29,19 +29,19 @@
<packaging>war</packaging>
<name>Marmotta Web Application</name>
- <description>Web Application bundle (WAR file) containing Marmotta</description>
+ <description>Marmotta Web Bundle (WAR)</description>
<version>${version}</version>
<properties>
<!-- these are used for the goals tomcat6/7:run or jetty:run -->
- <lmf.home>/tmp/lmf</lmf.home>
- <lmf.context>/</lmf.context>
- <lmf.port>8080</lmf.port>
- <lmf.version>2.6.0</lmf.version>
+ <marmotta.home>/tmp/marmotta</marmotta.home>
+ <marmotta.context>/</marmotta.context>
+ <marmotta.port>8080</marmotta.port>
+ <marmotta.version>3.0.0-incubating-SNAPSHOT</marmotta.version> <!-- TODO: http://stackoverflow.com/questions/7223031/how-to-embed-archetype-project-version-in-maven-archetype -->
</properties>
<build>
- <finalName>LMF</finalName>
+ <finalName>marmotta</finalName>
<pluginManagement>
<plugins>
<plugin>
@@ -77,10 +77,10 @@
<artifactId>tomcat6-maven-plugin</artifactId>
<version>2.0</version>
<configuration>
- <path>${lmf.context}</path>
- <port>${lmf.port}</port>
+ <path>${marmotta.context}</path>
+ <port>${marmotta.port}</port>
<systemProperties>
- <kiwi.home>${lmf.home}</kiwi.home>
+ <marmotta.home>${marmotta.home}</marmotta.home>
</systemProperties>
</configuration>
</plugin>
@@ -89,10 +89,10 @@
<artifactId>tomcat7-maven-plugin</artifactId>
<version>2.0</version>
<configuration>
- <path>${lmf.context}</path>
- <port>${lmf.port}</port>
+ <path>${marmotta.context}</path>
+ <port>${marmotta.port}</port>
<systemProperties>
- <kiwi.home>${lmf.home}</kiwi.home>
+ <marmotta.home>${marmotta.home}</marmotta.home>
</systemProperties>
<!-- <contextReloadable>true</contextReloadable> -->
<!-- <backgroundProcessorDelay>10</backgroundProcessorDelay> -->
@@ -103,17 +103,17 @@
<artifactId>maven-jetty-plugin</artifactId>
<version>6.1.10</version>
<configuration>
- <contextPath>${lmf.context}</contextPath>
+ <contextPath>${marmotta.context}</contextPath>
<connectors>
<connector
implementation="org.mortbay.jetty.nio.SelectChannelConnector">
- <port>${lmf.port}</port>
+ <port>${marmotta.port}</port>
</connector>
</connectors>
<systemProperties>
<systemProperty>
- <name>kiwi.home</name>
- <value>${lmf.home}</value>
+ <name>marmotta.home</name>
+ <value>${marmotta.home}</value>
</systemProperty>
</systemProperties>
<stopKey>foo</stopKey>
@@ -158,7 +158,7 @@
<configuration>
<filesets>
<fileset>
- <directory>${lmf.home}</directory>
+ <directory>${marmotta.home}</directory>
<followSymlinks>true</followSymlinks>
</fileset>
</filesets>
@@ -170,97 +170,60 @@
</profiles>
<dependencies>
- <!-- LMF Modules, include the ones needed by the application -->
+ <!-- Modules, include the ones needed by the application -->
<dependency>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-core</artifactId>
- <version>${lmf.version}</version>
+ <version>${marmotta.version}</version>
</dependency>
<dependency>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-ldpath</artifactId>
- <version>${lmf.version}</version>
+ <version>${marmotta.version}</version>
</dependency>
<dependency>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-ldcache</artifactId>
- <version>${lmf.version}</version>
+ <version>${marmotta.version}</version>
</dependency>
<dependency>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-reasoner</artifactId>
- <version>${lmf.version}</version>
+ <version>${marmotta.version}</version>
</dependency>
<dependency>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-sparql</artifactId>
- <version>${lmf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.marmotta</groupId>
- <artifactId>marmotta-skos</artifactId>
- <version>${lmf.version}</version>
+ <version>${marmotta.version}</version>
</dependency>
<dependency>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-search</artifactId>
- <version>${lmf.version}</version>
+ <version>${marmotta.version}</version>
</dependency>
<dependency>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-security</artifactId>
- <version>${lmf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.marmotta</groupId>
- <artifactId>marmotta-scheduler</artifactId>
- <version>${lmf.version}</version>
+ <version>${marmotta.version}</version>
</dependency>
<dependency>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-versioning</artifactId>
- <version>${lmf.version}</version>
+ <version>${marmotta.version}</version>
</dependency>
<dependency>
<groupId>org.apache.marmotta</groupId>
- <artifactId>marmotta-stanbol</artifactId>
- <version>${lmf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.marmotta</groupId>
- <artifactId>marmotta-enhancer</artifactId>
- <version>${lmf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.marmotta</groupId>
- <artifactId>marmotta-geo</artifactId>
- <version>${lmf.version}</version>
- </dependency>
- <!--
- <dependency>
- <groupId>org.apache.marmotta</groupId>
- <artifactId>marmotta-templating</artifactId>
- <version>${lmf.version}</version>
- </dependency>
- -->
- <dependency>
- <groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-user</artifactId>
- <version>${lmf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.marmotta</groupId>
- <artifactId>marmotta-social</artifactId>
- <version>${lmf.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.marmotta</groupId>
- <artifactId>lmf-demo-books</artifactId>
- <version>${lmf.version}</version>
+ <version>${marmotta.version}</version>
</dependency>
<!-- Servlet / CDI Environment -->
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
<scope>provided</scope>
@@ -278,7 +241,7 @@
<artifactId>h2</artifactId>
</dependency>
<dependency>
- <groupId>postgresql</groupId>
+ <groupId>org.jumpmind.symmetric.jdbc</groupId>
<artifactId>postgresql</artifactId>
</dependency>
<!-- enable for MySQL support; note that the MySQL driver is GPL licensed -->