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 2011/09/01 21:50:58 UTC
svn commit: r1164236 - in /incubator/airavata/trunk: ./
modules/distribution/ modules/distribution/resources/bin/
modules/distribution/resources/conf/ modules/distribution/src/main/assembly/
modules/gfac-axis2/src/main/resources/ modules/gfac-core/src/...
Author: lahiru
Date: Thu Sep 1 19:50:57 2011
New Revision: 1164236
URL: http://svn.apache.org/viewvc?rev=1164236&view=rev
Log:
adding gfac axis2 service and jackrabbit dependency in to distribution build.
Added:
incubator/airavata/trunk/modules/distribution/resources/bin/jackrabbit-server.sh (with props)
Modified:
incubator/airavata/trunk/modules/distribution/pom.xml
incubator/airavata/trunk/modules/distribution/resources/conf/axis2.xml
incubator/airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
incubator/airavata/trunk/modules/gfac-axis2/src/main/resources/repository.properties
incubator/airavata/trunk/modules/gfac-core/src/main/resources/service.properties
incubator/airavata/trunk/pom.xml
Modified: incubator/airavata/trunk/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/distribution/pom.xml?rev=1164236&r1=1164235&r2=1164236&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/distribution/pom.xml (original)
+++ incubator/airavata/trunk/modules/distribution/pom.xml Thu Sep 1 19:50:57 2011
@@ -46,6 +46,82 @@
<artifactId>derbytools</artifactId>
<version>${derby.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-api</artifactId>
+ <version>${jackrabbit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-core</artifactId>
+ <version>${jackrabbit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr-commons</artifactId>
+ <version>${jackrabbit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr-rmi</artifactId>
+ <version>${jackrabbit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr-server</artifactId>
+ <version>${jackrabbit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-jcr-servlet</artifactId>
+ <version>${jackrabbit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-spi</artifactId>
+ <version>${jackrabbit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-spi-commons</artifactId>
+ <version>${jackrabbit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-webdav</artifactId>
+ <version>${jackrabbit.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>jackrabbit-standalone</artifactId>
+ <version>${jackrabbitstandalone.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>${logback.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ <version>${logback.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.jcr</groupId>
+ <artifactId>jcr</artifactId>
+ <version>2.0</version>
+ </dependency>
+
</dependencies>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
Added: incubator/airavata/trunk/modules/distribution/resources/bin/jackrabbit-server.sh
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/distribution/resources/bin/jackrabbit-server.sh?rev=1164236&view=auto
==============================================================================
--- incubator/airavata/trunk/modules/distribution/resources/bin/jackrabbit-server.sh (added)
+++ incubator/airavata/trunk/modules/distribution/resources/bin/jackrabbit-server.sh Thu Sep 1 19:50:57 2011
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+. `dirname $0`/setenv.sh
+
+java -jar $AIRAVATA_HOME/lib/jackrabbit-standalone-1.6.4.jar -p 8081
Propchange: incubator/airavata/trunk/modules/distribution/resources/bin/jackrabbit-server.sh
------------------------------------------------------------------------------
svn:executable = *
Modified: incubator/airavata/trunk/modules/distribution/resources/conf/axis2.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/distribution/resources/conf/axis2.xml?rev=1164236&r1=1164235&r2=1164236&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/distribution/resources/conf/axis2.xml (original)
+++ incubator/airavata/trunk/modules/distribution/resources/conf/axis2.xml Thu Sep 1 19:50:57 2011
@@ -175,7 +175,7 @@
<!-- ================================================= -->
<transportReceiver name="http"
class="org.apache.axis2.transport.http.SimpleHTTPServer">
- <parameter name="port">8081</parameter>
+ <parameter name="port">8080</parameter>
<!-- Here is the complete list of supported parameters (see example settings further below):
port: the port to listen on (default 6060)
hostname: if non-null, url prefix used in reply-to endpoint references (default null)
Modified: incubator/airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml?rev=1164236&r1=1164235&r2=1164236&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml (original)
+++ incubator/airavata/trunk/modules/distribution/src/main/assembly/bin-assembly.xml Thu Sep 1 19:50:57 2011
@@ -55,15 +55,7 @@
</includes>
</fileSet>
- <fileSet>
- <directory>../ws-messenger/messenger/axis2-${used.axis2.release}/WEB-INF/conf</directory>
- <outputDirectory>standalone-server/conf</outputDirectory>
- <includes>
- <include>axis2.xml</include>
- </includes>
- </fileSet>
-
-
+
<!--
********************** copymessagebrokeraar **********************
-->
@@ -126,7 +118,7 @@
<fileSet>
<directory>../ws-messenger/messagebroker/target</directory>
- <outputDirectory>client-api/lib</outputDirectory>
+ <outputDirectory>lib</outputDirectory>
<includes>
<include>airavata-messagebroker*.jar</include>
</includes>
@@ -138,7 +130,7 @@
<fileSet>
<directory>../ws-messenger/messagebox/target</directory>
- <outputDirectory>client-api/lib</outputDirectory>
+ <outputDirectory>lib</outputDirectory>
<includes>
<include>airavata-messagebox*.jar</include>
</includes>
@@ -150,7 +142,7 @@
<fileSet>
<directory>../ws-messenger/samples</directory>
- <outputDirectory>client-api/samples</outputDirectory>
+ <outputDirectory>samples</outputDirectory>
<includes>
<include>**/*</include>
</includes>
@@ -277,6 +269,21 @@
<include>service.properties</include>
</includes>
</fileSet>
+ <fileSet>
+ <directory>../../samples</directory>
+ <outputDirectory>samples</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>resources/conf</directory>
+ <outputDirectory>standalone-server/conf</outputDirectory>
+ <includes>
+ <include>axis2.xml</include>
+ </includes>
+ </fileSet>
+
@@ -290,7 +297,27 @@
<includes>
<include>org.apache.derby:derby:jar</include>
<include>org.apache.derby:derbytools:jar</include>
- <include>mysql:mysql-connector-java</include>
+ <include>org.apache.jackrabbit:jackrabbit-api:jar</include>
+ <include>org.apache.jackrabbit:jackrabbit-core:jar</include>
+ <include>org.apache.jackrabbit:jackrabbit-jcr-commons:jar</include>
+ <include>org.apache.jackrabbit:jackrabbit-jcr-rmi:jar</include>
+ <include>org.apache.jackrabbit:jackrabbit-jcr-server:jar</include>
+ <include>org.apache.jackrabbit:jackrabbit-jcr-servlet:jar</include>
+ <include>org.apache.jackrabbit:jackrabbit-spi:jar</include>
+ <include>org.apache.jackrabbit:jackrabbit-spi-commons:jar</include>
+ <include>org.apache.jackrabbit:jackrabbit-webdav:jar</include>
+ <include>org.slf4j:log4j-over-slf4j:jar</include>
+ <include>org.slf4j:slf4j-api:jar</include>
+ <include>ch.qos.logback:logback-classic:jar</include>
+ <include>ch.qos.logback:logback-core:jar</include>
+ <include>javax.jcr:jcr:jar</include>
+ </includes>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>lib</outputDirectory>
+ <includes>
+ <include>org.apache.jackrabbit:jackrabbit-standalone:jar</include>
</includes>
</dependencySet>
</dependencySets>
Modified: incubator/airavata/trunk/modules/gfac-axis2/src/main/resources/repository.properties
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-axis2/src/main/resources/repository.properties?rev=1164236&r1=1164235&r2=1164236&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-axis2/src/main/resources/repository.properties (original)
+++ incubator/airavata/trunk/modules/gfac-axis2/src/main/resources/repository.properties Thu Sep 1 19:50:57 2011
@@ -27,4 +27,4 @@
userName=admin
password=admin
repository.factory=org.apache.jackrabbit.rmi.repository.RmiRepositoryFactory
-org.apache.jackrabbit.repository.uri=http://localhost:8080/rmi
+org.apache.jackrabbit.repository.uri=http://localhost:8081/rmi
Modified: incubator/airavata/trunk/modules/gfac-core/src/main/resources/service.properties
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/main/resources/service.properties?rev=1164236&r1=1164235&r2=1164236&view=diff
==============================================================================
--- incubator/airavata/trunk/modules/gfac-core/src/main/resources/service.properties (original)
+++ incubator/airavata/trunk/modules/gfac-core/src/main/resources/service.properties Thu Sep 1 19:50:57 2011
@@ -21,7 +21,7 @@
jcr.class=org.apache.jackrabbit.core.RepositoryFactoryImpl
#jcr.class=org.apache.jackrabbit.rmi.repository.RmiRepositoryFactory
-#org.apache.jackrabbit.repository.uri=http://localhost:8080/rmi
+org.apache.jackrabbit.repository.uri=http://localhost:8080/rmi
jcr.user=admin
jcr.pass=admin
Modified: incubator/airavata/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/airavata/trunk/pom.xml?rev=1164236&r1=1164235&r2=1164236&view=diff
==============================================================================
--- incubator/airavata/trunk/pom.xml (original)
+++ incubator/airavata/trunk/pom.xml Thu Sep 1 19:50:57 2011
@@ -26,6 +26,10 @@
<airavata.version>0.0.1-SNAPSHOT</airavata.version>
<axis2.version>1.5.1</axis2.version>
<derby.version>10.7.1.1</derby.version>
+ <jackrabbit.version>2.2.7</jackrabbit.version>
+ <jackrabbitstandalone.version>1.6.4</jackrabbitstandalone.version>
+ <slf4j.version>1.5.11</slf4j.version>
+ <logback.version>0.9.20</logback.version>
</properties>
<repositories>
<repository>