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/02/28 18:02:47 UTC

[3/5] git commit: fixed old naming

fixed old naming


Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/3efca16d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/3efca16d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/3efca16d

Branch: refs/heads/master
Commit: 3efca16def8f0a4905e88058c01dc45c27760d8a
Parents: 5286945
Author: Sergio Fernández <wi...@apache.org>
Authored: Thu Feb 28 17:44:42 2013 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Thu Feb 28 17:44:42 2013 +0100

----------------------------------------------------------------------
 launchers/marmotta-webapp/pom.xml |   38 ++++++++++++++++----------------
 1 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/3efca16d/launchers/marmotta-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/pom.xml b/launchers/marmotta-webapp/pom.xml
index 7325f82..7773469 100644
--- a/launchers/marmotta-webapp/pom.xml
+++ b/launchers/marmotta-webapp/pom.xml
@@ -30,17 +30,17 @@
     <packaging>war</packaging>
 
     <name>Apache Marmotta Web Application</name>
-    <description>Web Application bundle (WAR file) containing the complete Linked Media Framework</description>
+    <description>Web Application bundle (WAR file) containing Apache Marmotta</description>
 
     <properties>
         <!-- these are used for the goals tomcat6/7:run or jetty:run -->
-        <lmf.home>/tmp/marmotta</lmf.home>
-        <lmf.context>/</lmf.context>
-        <lmf.port>8080</lmf.port>
+        <marmotta.home>/tmp/marmotta</marmotta.home>
+        <marmotta.context>/</marmotta.context>
+        <marmotta.port>8080</marmotta.port>
     </properties>
 
     <build>
-        <finalName>Marmotta</finalName>
+        <finalName>marmotta</finalName>
         <pluginManagement>
             <plugins>
                 <plugin>
@@ -76,10 +76,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>
-                            <marmotta.home>${lmf.home}</marmotta.home>
+                            <marmotta.home>${marmotta.home}</marmotta.home>
                         </systemProperties>
                     </configuration>
                 </plugin>
@@ -88,13 +88,13 @@
                     <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>
-                            <marmotta.home>${lmf.home}</marmotta.home>
+                            <marmotta.home>${marmotta.home}</marmotta.home>
                         </systemProperties>
-                        <!--                         <contextReloadable>true</contextReloadable> -->
-                        <!--                         <backgroundProcessorDelay>10</backgroundProcessorDelay> -->
+                        <!-- <contextReloadable>true</contextReloadable> -->
+                        <!-- <backgroundProcessorDelay>10</backgroundProcessorDelay> -->
                     </configuration>
                 </plugin>
                 <plugin>
@@ -102,19 +102,19 @@
                     <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>marmotta.home</name>
-                                <value>${lmf.home}</value>
+                                <value>${marmotta.home}</value>
                             </systemProperty>
                         </systemProperties>
-                        <stopKey>foo</stopKey>
+                        <stopKey>marmotta</stopKey>
                         <stopPort>9999</stopPort>
                     </configuration>
                 </plugin>
@@ -156,7 +156,7 @@
                         <configuration>
                             <filesets>
                                 <fileset>
-                                    <directory>${lmf.home}</directory>
+                                    <directory>${marmotta.home}</directory>
                                     <followSymlinks>true</followSymlinks>
                                 </fileset>
                             </filesets>
@@ -168,7 +168,7 @@
     </profiles>
 
     <dependencies>
-        <!-- LMF Modules, include the ones needed by the application -->
+        <!-- Marmotta Modules, include the ones needed by the application -->
         <dependency>
             <groupId>org.apache.marmotta</groupId>
             <artifactId>marmotta-core</artifactId>