airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chath...@apache.org
Subject svn commit: r1417214 - in /airavata/trunk/modules: distribution/src/main/assembly/bin-assembly.xml server/src/main/java/org/apache/airavata/server/ServerMain.java
Date Tue, 04 Dec 2012 21:59:28 GMT
Author: chathuri
Date: Tue Dec  4 21:59:27 2012
New Revision: 1417214

URL: http://svn.apache.org/viewvc?rev=1417214&view=rev
Log:
updating distribution

Modified:
    airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
    airavata/trunk/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java

Modified: airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml?rev=1417214&r1=1417213&r2=1417214&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml (original)
+++ airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml Tue Dec  4 21:59:27
2012
@@ -105,7 +105,7 @@
 			</includes>
 		</fileSet>
         <fileSet>
-			<directory>../rest/service/src/main/resources
+			<directory>../rest/webapp/src/main/resources
 			</directory>
 			<outputDirectory>bin
 			</outputDirectory>
@@ -275,6 +275,8 @@
                 <include>com.sun.jersey.contribs:jersey-multipart</include>
                 <include>com.sun.jersey:jersey-server</include>
                 <include>com.sun.jersey:jersey-client</include>
+                <include>org.codehaus.jackson:jackson-jaxrs</include>
+                <include>org.codehaus.jackson:jackson-core-asl</include>
 			</includes>
 		</dependencySet>
 		<dependencySet>

Modified: airavata/trunk/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
URL: http://svn.apache.org/viewvc/airavata/trunk/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java?rev=1417214&r1=1417213&r2=1417214&view=diff
==============================================================================
--- airavata/trunk/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
(original)
+++ airavata/trunk/modules/server/src/main/java/org/apache/airavata/server/ServerMain.java
Tue Dec  4 21:59:27 2012
@@ -58,8 +58,8 @@ public class ServerMain {
                 File.separator + "bin" + File.separator + "axis2.xml");
         axis2Servlet.setLoadOnStartup(1);
 
-        StandardContext context = (StandardContext)tomcat.getTomcat().addContext("/registry",
System.getenv("AIRAVATA_HOME"));
-        Wrapper registryServlet = tomcat.addServlet("/registry", "Airavata Web Application",
"com.sun.jersey.spi.container.servlet.ServletContainer");
+        StandardContext context = (StandardContext)tomcat.getTomcat().addContext("/airavata-registry",
System.getenv("AIRAVATA_HOME"));
+        Wrapper registryServlet = tomcat.addServlet("/airavata-registry", "Airavata Web Application",
"com.sun.jersey.spi.container.servlet.ServletContainer");
         registryServlet.addInitParameter("com.sun.jersey.config.property.packages", "org.apache.airavata.services.registry.rest;org.codehaus.jackson.jaxrs");
         registryServlet.setLoadOnStartup(1);
 



Mime
View raw message