You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2012/12/05 21:05:45 UTC

svn commit: r1417616 - in /airavata/trunk/modules: distribution/airavata-server/pom.xml distribution/airavata-server/src/main/assembly/bin-assembly.xml server/pom.xml

Author: lahiru
Date: Wed Dec  5 20:05:44 2012
New Revision: 1417616

URL: http://svn.apache.org/viewvc?rev=1417616&view=rev
Log:
Fixing build errof

Modified:
    airavata/trunk/modules/distribution/airavata-server/pom.xml
    airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
    airavata/trunk/modules/server/pom.xml

Modified: airavata/trunk/modules/distribution/airavata-server/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-server/pom.xml?rev=1417616&r1=1417615&r2=1417616&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/airavata-server/pom.xml (original)
+++ airavata/trunk/modules/distribution/airavata-server/pom.xml Wed Dec  5 20:05:44 2012
@@ -367,7 +367,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.airavata</groupId>
-            <artifactId>airavata-server</artifactId>
+            <artifactId>embedded-tomcat</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>

Modified: airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml?rev=1417616&r1=1417615&r2=1417616&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml (original)
+++ airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml Wed Dec  5 20:05:44 2012
@@ -252,7 +252,7 @@
 				<include>org.apache.airavata:airavata-jpa-registry:jar</include>
                 <include>org.apache.airavata:airavata-rest-mappings:jar</include>
                 <include>org.apache.airavata:airavata-rest-client:jar</include>
-                <include>org.apache.airavata:airavata-server:jar</include>
+                <include>org.apache.airavata:embedded-tomcat:jar</include>
                 <include>org.apache.airavata:airavata-rest-mappings</include>
                 <include>org.apache.airavata:airavata-rest-services</include>
                 <include>org.apache.airavata:airavata-security</include>

Modified: airavata/trunk/modules/server/pom.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/server/pom.xml?rev=1417616&r1=1417615&r2=1417616&view=diff
==============================================================================
--- airavata/trunk/modules/server/pom.xml (original)
+++ airavata/trunk/modules/server/pom.xml Wed Dec  5 20:05:44 2012
@@ -18,7 +18,7 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>airavata-server</artifactId>
+    <artifactId>embedded-tomcat</artifactId>
     <name>Airavata Embedded Tomcat Implementation</name>
     <description>Module for starting embedded tomcat</description>
     <dependencies>
@@ -77,6 +77,12 @@
             <artifactId>tomcat-jsp-api</artifactId>
             <version>7.0.22</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.airavata</groupId>
+            <artifactId>airavata-rest-mappings</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
     </dependencies>
     <build>
         <plugins>