Author: lahiru
Date: Mon Dec 3 18:36:29 2012
New Revision: 1416631
URL: http://svn.apache.org/viewvc?rev=1416631&view=rev
Log:
changing the build to have embedded tomcat as default server.
Modified:
airavata/trunk/modules/distribution/pom.xml
airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
airavata/trunk/modules/distribution/src/main/resources/bin/airavata-server.sh
airavata/trunk/modules/distribution/src/main/resources/bin/setenv.sh
airavata/trunk/modules/distribution/src/main/resources/conf/airavata-server.properties
Modified: airavata/trunk/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/pom.xml?rev=1416631&r1=1416630&r2=1416631&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/pom.xml (original)
+++ airavata/trunk/modules/distribution/pom.xml Mon Dec 3 18:36:29 2012
@@ -250,11 +250,6 @@
<version>1.0</version>
</dependency>
<dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- </dependency>
- <dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-messenger-client</artifactId>
<version>${project.version}</version>
@@ -364,7 +359,11 @@
<artifactId>airavata-rest-client</artifactId>
<version>${project.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-server</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-registry-service</artifactId>
@@ -390,8 +389,48 @@
<artifactId>jersey-client</artifactId>
<version>${jersey.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.airavata</groupId>
+ <artifactId>airavata-common-utils</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jasper</artifactId>
+ <version>7.0.22</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jasper-el</artifactId>
+ <version>7.0.22</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-jsp-api</artifactId>
+ <version>7.0.22</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-core</artifactId>
+ <version>7.0.22</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-logging-juli</artifactId>
+ <version>7.0.22</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tomcat.embed</groupId>
+ <artifactId>tomcat-embed-jasper</artifactId>
+ <version>7.0.22</version>
+ </dependency>
</dependencies>
-
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<archieve.name>apache-airavata</archieve.name>
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=1416631&r1=1416630&r2=1416631&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
(original)
+++ airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml Mon
Dec 3 18:36:29 2012
@@ -38,7 +38,7 @@
<!-- ********************** copy axis2 distribution
dependencies ********************** -->
<fileSet>
<directory>target/axis2-${used.axis2.release}/WEB-INF/lib</directory>
- <outputDirectory>standalone-server/lib</outputDirectory>
+ <outputDirectory>lib</outputDirectory>
<includes>
<include>*.jar</include>
</includes>
@@ -49,7 +49,7 @@
</fileSet>
<fileSet>
<directory>target/axis2-${used.axis2.release}/WEB-INF/</directory>
-
<outputDirectory>standalone-server/repository</outputDirectory>
+ <outputDirectory>repository</outputDirectory>
<includes>
<include>services/*</include>
<include>modules/*</include>
@@ -80,7 +80,7 @@
<fileSet>
<directory>../ws-messenger/messagebroker/src/main/resources/database_scripts
</directory>
- <outputDirectory>standalone-server/bin/database_scripts
+ <outputDirectory>bin/database_scripts
</outputDirectory>
<includes>
<include>*sql*</include>
@@ -89,7 +89,7 @@
<fileSet>
<directory>../ws-messenger/messagebox/src/main/resources/database_scripts
</directory>
- <outputDirectory>standalone-server/bin/database_scripts
+ <outputDirectory>bin/database_scripts
</outputDirectory>
<includes>
<include>*sql*</include>
@@ -98,7 +98,7 @@
<fileSet>
<directory>../registry/airavata-jpa-registry/src/main/resources
</directory>
- <outputDirectory>standalone-server/bin/database_scripts
+ <outputDirectory>bin/database_scripts
</outputDirectory>
<includes>
<include>*sql*</include>
@@ -117,7 +117,7 @@
</fileSet>
<fileSet>
<directory>../distribution/src/main/resources/conf</directory>
-
<outputDirectory>standalone-server/conf</outputDirectory>
+ <outputDirectory>bin</outputDirectory>
<includes>
<include>airavata-server.properties</include>
<include>registry.properties</include>
@@ -133,7 +133,7 @@
<fileSet>
<directory>../distribution/src/main/resources/axis2-standalone-bin
</directory>
- <outputDirectory>standalone-server/bin</outputDirectory>
+ <outputDirectory>bin</outputDirectory>
<fileMode>777</fileMode>
<includes>
<include>*.sh</include>
@@ -146,7 +146,7 @@
<includes> <include>*.aar</include> </includes>
</fileSet -->
<fileSet>
<directory>../../samples/complex-math-service/target</directory>
- <outputDirectory>standalone-server/repository/services
+ <outputDirectory>repository/services
</outputDirectory>
<includes>
<include>*.aar</include>
@@ -155,8 +155,7 @@
<fileSet>
<directory>../../samples/levenshtein-distance-service/target
</directory>
- <outputDirectory>standalone-server/repository/services
- </outputDirectory>
+ <outputDirectory>repository/services</outputDirectory>
<includes>
<include>*.aar</include>
</includes>
@@ -177,7 +176,7 @@
</fileSet>
<fileSet>
<directory>src/main/resources/conf</directory>
-
<outputDirectory>standalone-server/conf</outputDirectory>
+ <outputDirectory>bin</outputDirectory>
<includes>
<include>**/*</include>
</includes>
@@ -186,9 +185,8 @@
<dependencySets>
<dependencySet>
- <outputDirectory>standalone-server/lib</outputDirectory>
-
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}
- </outputFileNameMapping>
+ <outputDirectory>lib</outputDirectory>
+
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
<includes>
<include>org.apache.derby:derby:jar</include>
<include>org.apache.derby:derbytools:jar</include>
@@ -197,7 +195,7 @@
</includes>
</dependencySet>
<dependencySet>
- <outputDirectory>standalone-server/lib</outputDirectory>
+ <outputDirectory>lib</outputDirectory>
<includes>
<!--<include>org.apache.derby:derby:jar</include> -->
<!--<include>org.apache.derby:derbytools:jar</include> -->
@@ -244,25 +242,30 @@
<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.openjpa:openjpa-all:jar</include>
<include>com.sun.jersey:jersey-client:jar</include>
<include>com.sun.jersey:jersey-core:jar</include>
<include>edu.berkeley:yfilter</include>
<include>edu.berkeley:yfilter</include>
- <include>javax.servlet:servlet-api</include>
<include>org.bouncycastle:bcprov-jdk15</include>
<include>org.bouncycastle:bcmail-jdk15</include>
+ <include>org.apache.tomcat:tomcat-jasper</include>
+ <include>org.apache.tomcat:tomcat-jasper-el</include>
+ <include>org.apache.tomcat:tomcat-jsp-api</include>
+ <include>org.apache.tomcat.embed:tomcat-embed-core</include>
+ <include>org.apache.tomcat.embed:tomcat-embed-jasper</include>
+
<include>org.apache.tomcat.embed:tomcat-embed-logging-juli</include>
+ <include>javax.servlet:javax.servlet-api</include>
</includes>
</dependencySet>
<dependencySet>
- <outputDirectory>standalone-server/repository/services
- </outputDirectory>
+ <outputDirectory>repository/services</outputDirectory>
<includes>
<include>org.apache.airavata:airavata-message-box:jar</include>
<include>org.apache.airavata:airavata-message-broker:jar</include>
<include>org.apache.airavata:airavata-xbaya-gui:jar</include>
-
<include>org.apache.airavata:airavata-gfac-axis2-interface:jar
- </include>
+
<include>org.apache.airavata:airavata-gfac-axis2-interface:jar</include>
<include>org.apache.airavata:airavata-registry-service:jar</include>
</includes>
</dependencySet>
Modified:
airavata/trunk/modules/distribution/src/main/resources/bin/airavata-server.sh
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/src/main/resources/bin/airavata-server.sh?rev=1416631&r1=1416630&r2=1416631&view=diff
==============================================================================
---
airavata/trunk/modules/distribution/src/main/resources/bin/airavata-server.sh
(original)
+++
airavata/trunk/modules/distribution/src/main/resources/bin/airavata-server.sh
Mon Dec 3 18:36:29 2012
@@ -24,6 +24,37 @@ if [ -e $LOGO_FILE ]
then
cat $LOGO_FILE
fi
-cd $AIRAVATA_HOME/standalone-server/bin
-./axis2server.sh $*
+JAVA_OPTS=""
+while [ $# -ge 1 ]; do
+ case $1 in
+ -xdebug)
+ JAVA_OPTS="$JAVA_OPTS -Xdebug -Xnoagent
-Xrunjdwp:transport=dt_socket,server=y,address=8000"
+ shift
+ ;;
+ -security)
+ JAVA_OPTS="$JAVA_OPTS -Djava.security.manager
-Djava.security.policy=$AIRAVATA_HOME/conf/axis2.policy
-Daxis2.home=$AIRAVATA_HOME"
+ shift
+ ;;
+ -h)
+ echo "Usage: airavata-server.sh"
+ echo "commands:"
+ echo " -xdebug Start Airavata Server under JPDA debugger"
+ echo " -security Enable Java 2 security"
+ echo " -h help"
+ shift
+ exit 0
+ ;;
+ *)
+ echo "Error: unknown command:$1"
+ echo "For help: airavata-server.sh -h"
+ shift
+ exit 1
+ esac
+done
+
+java $JAVA_OPTS -classpath "$XBAYA_CLASSPATH" \
+
-Djava.endorsed.dirs="$AIRAVATA_HOME/lib/endorsed":"$JAVA_HOME/jre/lib/endorsed":"$JAVA_HOME/lib/endorsed"
\
+ org.apache.airavata.server.ServerMain \
+ -repo "$AIRAVATA_HOME"/repository/services -conf
"$AIRAVATA_HOME"/conf/axis2.xml $*
+
Modified: airavata/trunk/modules/distribution/src/main/resources/bin/setenv.sh
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/src/main/resources/bin/setenv.sh?rev=1416631&r1=1416630&r2=1416631&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/src/main/resources/bin/setenv.sh
(original)
+++ airavata/trunk/modules/distribution/src/main/resources/bin/setenv.sh Mon
Dec 3 18:36:29 2012
@@ -56,17 +56,17 @@ XBAYA_CLASSPATH=""
-for f in "$AIRAVATA_HOME"/standalone-server/lib/*.jar
+for f in "$AIRAVATA_HOME"/lib/*.jar
do
XBAYA_CLASSPATH="$XBAYA_CLASSPATH":$f
done
-for f in "$AIRAVATA_HOME"/standalone-server/repository/services/*.jar
+for f in "$AIRAVATA_HOME"/repository/services/*.jar
do
XBAYA_CLASSPATH="$XBAYA_CLASSPATH":$f
done
-XBAYA_CLASSPATH="$XBAYA_HOME":"$XBAYA_HOME/conf":"$JAVA_HOME/lib/tools.jar":"$XBAYA_CLASSPATH":"$CLASSPATH"
+XBAYA_CLASSPATH="$XBAYA_HOME":"$XBAYA_HOME/conf":"$XBAYA_CLASSPATH":"$CLASSPATH"
Modified:
airavata/trunk/modules/distribution/src/main/resources/conf/airavata-server.properties
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/src/main/resources/conf/airavata-server.properties?rev=1416631&r1=1416630&r2=1416631&view=diff
==============================================================================
---
airavata/trunk/modules/distribution/src/main/resources/conf/airavata-server.properties
(original)
+++
airavata/trunk/modules/distribution/src/main/resources/conf/airavata-server.properties
Mon Dec 3 18:36:29 2012
@@ -26,13 +26,13 @@
###########################################################################
###########################################################################
-# Airavata Axis2-Tomcat Server Configuration
+# Airavata Embedded-Tomcat Server Configuration
###########################################################################
# By default, tomcat runs on port 80. If the port is changed, it will be
# have to be specified with port properties. This will be picked up by
# the registry service to register the service end-points.
-port=8080
+tomcat.port=8080
# Axis2 server automatically picks up IP address from axis configuration,
# but some DHCP enables machines do not report correct ip addresses,
@@ -56,7 +56,7 @@ system.user=admin
system.password=admin
#for mysql
-#registry.jdbc.driver=com.mysql.jdbc.Driver
+ #registry.jdbc.driver=com.mysql.jdbc.Driver
#registry.jdbc.url=jdbc:mysql://localhost:3306/persistent_data
#for derby
@@ -200,3 +200,5 @@ messagePerservationIntervalDays=0
messagePerservationIntervalHours=1
messagePerservationIntervalMinutes=0
+
+
