airavata-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Raminder Singh <raminderjsi...@gmail.com>
Subject Re: airavata git commit: Removed extra files and added server jar.AIRAVATA-1471
Date Thu, 12 Feb 2015 19:00:06 GMT
We can add jars to exclude in assembly plugin if we want any jar to be excluded in distribution.
Its easy to do that than reverting to the old model of adding every jar manually. New model
provide a flexibly to add/remove gfac provider easily and was don’t to make it possible
or we need to find a better solution than assembly plugin. 

Thanks
Raminder

On Feb 12, 2015, at 1:42 PM, Suresh Marru <smarru@apache.org> wrote:

> We need to revert this commit as it has adverse effects of shipping every jar in the
dependency irrespective of the scope of it. Explicit packaging is always good since we control
which dependencies needs to go into releases. A wild card inclusion has a chance of bundling
unintended jars. 
> 
> This is a trade off with convenience vs getting releases right. I vote for the explicit
inclusion even though it is time consuming (in favor of legal compliance). 
> 
> Suresh
> 
> 
>> On Nov 17, 2014, at 4:51 PM, raminder@apache.org wrote:
>> 
>> Repository: airavata
>> Updated Branches:
>> refs/heads/master be21587b6 -> eec20007b
>> 
>> 
>> Removed extra files and added server jar.AIRAVATA-1471
>> 
>> Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
>> Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/eec20007
>> Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/eec20007
>> Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/eec20007
>> 
>> Branch: refs/heads/master
>> Commit: eec20007bda6f0e8b07e8d597caf95c51753b027
>> Parents: be21587
>> Author: raminder <ramifnu@indiana.edu>
>> Authored: Mon Nov 17 16:51:32 2014 -0500
>> Committer: raminder <ramifnu@indiana.edu>
>> Committed: Mon Nov 17 16:51:32 2014 -0500
>> 
>> ----------------------------------------------------------------------
>> .../src/main/assembly/bin-assembly.xml          |   1 -
>> modules/distribution/gfac-server/pom.xml        |   5 +
>> .../src/main/assembly/bin-assembly.xml          |   4 -
>> .../distribution/orchestrator-server/pom.xml    |   5 +
>> .../src/main/assembly/bin-assembly.xml          |  34 ----
>> .../server/src/main/assembly/bin-assembly.xml   | 157 +------------------
>> 6 files changed, 12 insertions(+), 194 deletions(-)
>> ----------------------------------------------------------------------
>> 
>> 
>> http://git-wip-us.apache.org/repos/asf/airavata/blob/eec20007/modules/distribution/api-server/src/main/assembly/bin-assembly.xml
>> ----------------------------------------------------------------------
>> diff --git a/modules/distribution/api-server/src/main/assembly/bin-assembly.xml b/modules/distribution/api-server/src/main/assembly/bin-assembly.xml
>> index 6f5c233..b362420 100644
>> --- a/modules/distribution/api-server/src/main/assembly/bin-assembly.xml
>> +++ b/modules/distribution/api-server/src/main/assembly/bin-assembly.xml
>> @@ -93,7 +93,6 @@
>> 				<include>airavata-server.properties</include>
>> 				<include>zoo.cfg</include>
>> 				<include>log4j.properties</include>
>> -				<include>host.xml</include>
>> 				<include>persistence.xml</include>
>> 				<include>provenance.sql</include>
>> 			</includes>
>> 
>> http://git-wip-us.apache.org/repos/asf/airavata/blob/eec20007/modules/distribution/gfac-server/pom.xml
>> ----------------------------------------------------------------------
>> diff --git a/modules/distribution/gfac-server/pom.xml b/modules/distribution/gfac-server/pom.xml
>> index c649630..86bd362 100644
>> --- a/modules/distribution/gfac-server/pom.xml
>> +++ b/modules/distribution/gfac-server/pom.xml
>> @@ -128,6 +128,11 @@
>>    </build>
>> 
>>    <dependencies>
>> +   	   <dependency>
>> +			<groupId>org.apache.airavata</groupId>
>> +			<artifactId>airavata-standalone-server</artifactId>
>> +			<version>${project.version}</version>
>> +	   </dependency>
>>      <dependency>
>>            <groupId>org.apache.airavata</groupId>
>>            <artifactId>airavata-gfac-gram</artifactId>
>> 
>> http://git-wip-us.apache.org/repos/asf/airavata/blob/eec20007/modules/distribution/gfac-server/src/main/assembly/bin-assembly.xml
>> ----------------------------------------------------------------------
>> diff --git a/modules/distribution/gfac-server/src/main/assembly/bin-assembly.xml
b/modules/distribution/gfac-server/src/main/assembly/bin-assembly.xml
>> index 3fe54cb..4aab99d 100644
>> --- a/modules/distribution/gfac-server/src/main/assembly/bin-assembly.xml
>> +++ b/modules/distribution/gfac-server/src/main/assembly/bin-assembly.xml
>> @@ -109,12 +109,8 @@
>> 			<outputDirectory>bin</outputDirectory>
>> 			<includes>
>> 				<include>airavata-server.properties</include>
>> -				<include>zoo.cfg</include>
>> 				<include>registry.properties</include>
>> 				<include>log4j.properties</include>
>> -				<include>host.xml</include>
>> -				<include>persistence.xml</include>
>> -				<include>provenance.sql</include>
>> 				<include>gfac-config.xml</include>
>> 				<include>PBSTemplate.xslt</include>
>> 				<include>SLURMTemplate.xslt</include>
>> 
>> http://git-wip-us.apache.org/repos/asf/airavata/blob/eec20007/modules/distribution/orchestrator-server/pom.xml
>> ----------------------------------------------------------------------
>> diff --git a/modules/distribution/orchestrator-server/pom.xml b/modules/distribution/orchestrator-server/pom.xml
>> index 3870f79..fdadaa3 100644
>> --- a/modules/distribution/orchestrator-server/pom.xml
>> +++ b/modules/distribution/orchestrator-server/pom.xml
>> @@ -134,6 +134,11 @@
>> 	<dependencies>
>> 		<dependency>
>> 			<groupId>org.apache.airavata</groupId>
>> +			<artifactId>airavata-standalone-server</artifactId>
>> +			<version>${project.version}</version>
>> +		</dependency>
>> +		<dependency>
>> +			<groupId>org.apache.airavata</groupId>
>> 			<artifactId>airavata-orchestrator-service</artifactId>
>> 			<version>${project.version}</version>
>> 		</dependency>
>> 
>> http://git-wip-us.apache.org/repos/asf/airavata/blob/eec20007/modules/distribution/orchestrator-server/src/main/assembly/bin-assembly.xml
>> ----------------------------------------------------------------------
>> diff --git a/modules/distribution/orchestrator-server/src/main/assembly/bin-assembly.xml
b/modules/distribution/orchestrator-server/src/main/assembly/bin-assembly.xml
>> index 3fe54cb..219f412 100644
>> --- a/modules/distribution/orchestrator-server/src/main/assembly/bin-assembly.xml
>> +++ b/modules/distribution/orchestrator-server/src/main/assembly/bin-assembly.xml
>> @@ -109,32 +109,9 @@
>> 			<outputDirectory>bin</outputDirectory>
>> 			<includes>
>> 				<include>airavata-server.properties</include>
>> -				<include>zoo.cfg</include>
>> -				<include>registry.properties</include>
>> 				<include>log4j.properties</include>
>> -				<include>host.xml</include>
>> -				<include>persistence.xml</include>
>> -				<include>provenance.sql</include>
>> -				<include>gfac-config.xml</include>
>> -				<include>PBSTemplate.xslt</include>
>> -				<include>SLURMTemplate.xslt</include>
>> -				<include>SGETemplate.xslt</include>
>> -				<include>gsissh.properties</include>
>> 			</includes>
>> 		</fileSet>
>> -
>> -		<!-- ********************** Copy Axis2 startup scripts to stand alone server

>> -			********************** -->
>> -		<fileSet>
>> -			<directory>src/main/resources/axis2-standalone-bin</directory>
>> -			<outputDirectory>bin</outputDirectory>
>> -			<fileMode>777</fileMode>
>> -			<includes>
>> -				<include>*.sh</include>
>> -				<include>*.bat</include>
>> -			</includes>
>> -		</fileSet>
>> -
>> 		<fileSet>
>> 			<directory>src/main/resources/conf</directory>
>> 			<outputDirectory>bin</outputDirectory>
>> @@ -143,17 +120,6 @@
>> 			</includes>
>> 		</fileSet>
>> 
>> -		<!-- ********************** Copy samples ********************** -->
>> -		<fileSet>
>> -			<directory>${project.build.directory}/samples/applications
>> -			</directory>
>> -			<outputDirectory>samples</outputDirectory>
>> -			<includes>
>> -				<include>*.sh</include>
>> -				<include>*.bat</include>
>> -			</includes>
>> -		</fileSet>
>> -
>> 	</fileSets>
>> 
>> 	<dependencySets>
>> 
>> http://git-wip-us.apache.org/repos/asf/airavata/blob/eec20007/modules/distribution/server/src/main/assembly/bin-assembly.xml
>> ----------------------------------------------------------------------
>> diff --git a/modules/distribution/server/src/main/assembly/bin-assembly.xml b/modules/distribution/server/src/main/assembly/bin-assembly.xml
>> index 26884c8..c5fc9b8 100644
>> --- a/modules/distribution/server/src/main/assembly/bin-assembly.xml
>> +++ b/modules/distribution/server/src/main/assembly/bin-assembly.xml
>> @@ -170,161 +170,8 @@
>> 		<dependencySet>
>> 			<outputDirectory>lib</outputDirectory>
>> 			<includes>
>> -				<include>org.slf4j:slf4j-api:jar</include>
>> -				<include>org.slf4j:slf4j-jcl:jar</include>
>> -				<include>org.slf4j:slf4j-log4j12:jar</include>
>> -				<include>log4j:log4j:jar</include>
>> -				<include>javax.jcr:jcr:jar</include>
>> -				<include>commons-collections:commons-collections</include>
>> -				<include>commons-configuration:commons-configuration</include>
>> -				<include>commons-lang:commons-lang</include>
>> -				<include>commons-io:commons-io</include>
>> -				<include>org.ogce:xpp3:jar</include>
>> -				<include>org.ogce:xpp5:jar</include>
>> -				<include>org.ogce:xsul:jar</include>
>> -				<include>org.ogce:xsul5:jar</include>
>> -				<include>org.ogce:gpel-client:jar</include>
>> -				<include>org.ogce:atomixmiser:jar</include>
>> -				<include>org.ogce:yfilter:jar</include>
>> -				<include>org.python:jython:jar</include>
>> -				<include>org.jglobus:gss</include>
>> -				<include>org.jglobus:gram</include>
>> -				<include>org.jglobus:myproxy</include>
>> -				<include>org.jglobus:gridftp</include>
>> -				<include>org.jglobus:ssl-proxies</include>
>> -				<include>org.jglobus:jsse</include>
>> -				<include>org.jglobus:io</include>
>> -				<include>org.jglobus:axis</include>
>> -				<include>org.apache.xmlbeans:xmlbeans</include>
>> -				<include>com.amazonaws:aws-java-sdk</include>
>> -				<include>net.java.dev.jets3t:jets3t</include>
>> -				<include>org.apache.airavata:airavata-standalone-server:jar
>> -				</include>
>> -				<include>org.apache.airavata:airavata-common-utils:jar</include>
>> -				<include>org.apache.airavata:airavata-orchestrator-service:jar
>> -				</include>
>> -				<include>org.apache.airavata:airavata-orchestrator-stubs:jar
>> -				</include>
>> -				<include>org.apache.airavata:airavata-orchestrator-core:jar
>> -				</include>
>> -				<!--<include>org.apache.airavata:airavata-gfac-schema-utils:jar-->
>> -				<!--</include>-->
>> -				<include>org.apache.airavata:airavata-workflow-execution-context:jar
>> -				</include>
>> -				<include>org.apache.airavata:airavata-registry-cpi:jar</include>
>> -				<include>org.apache.airavata:airavata-jpa-registry:jar</include>
>> -				<include>org.apache.airavata:app-catalog-cpi:jar</include>
>> -				<include>org.apache.airavata:app-catalog-data:jar</include>
>> -				<include>org.apache.airavata:airavata-data-models:jar</include>
>> -				<include>org.apache.airavata:airavata-credential-store:jar</include>
>> -				<include>org.apache.airavata:airavata-gfac-core:jar</include>
>> -				<include>org.apache.airavata:airavata-gfac-stubs:jar</include>
>> -				<include>org.apache.airavata:airavata-gfac-service:jar</include>
>> -				<include>org.apache.airavata:airavata-gfac-ssh:jar</include>
>> -				<include>org.apache.airavata:airavata-gfac-local:jar</include>
>> -				<include>org.apache.airavata:airavata-gfac-gsissh:jar</include>
>> -				<include>org.apache.airavata:airavata-gfac-hpc-monitor:jar</include>
>> -				<include>org.apache.airavata:airavata-gfac-hadoop:jar</include>
>> -				<include>org.apache.airavata:airavata-gfac-bes:jar</include>
>> -				<include>org.apache.airavata:airavata-gfac-gram:jar</include>
>> -				<include>org.apache.airavata:airavata-message-monitor:jar</include>
>> -				<include>org.apache.airavata:airavata-workflow-model-core:jar
>> -				</include>
>> -				<include>org.apache.airavata:airavata-messenger-commons:jar
>> -				</include>
>> -				<include>org.apache.airavata:airavata-messenger-client:jar</include>
>> -				<include>org.apache.airavata:airavata-workflow-tracking:jar
>> -				</include>
>> -				<include>org.apache.airavata:airavata-workflow-engine:jar</include>
>> -				<include>org.apache.airavata:airavata-messaging-core:jar</include>
>> -				<include>org.apache.airavata:gsissh:jar</include>
>> -				<include>org.apache.airavata:airavata-model-utils:jar</include>
>> -				<include>org.apache.airavata:airavata-api-server:jar</include>
>> -				<include>org.apache.airavata:airavata-api-stubs:jar</include>
>> -				<include>org.apache.openjpa:openjpa-all:jar</include>
>> -				<include>org.bouncycastle:bcprov-jdk15on</include>
>> -				<include>javax.servlet:javax.servlet-api</include>
>> -				<include>xerces:xercesImpl:jar:2.9.1</include>
>> -				<include>com.ibm.icu:icu4j</include>
>> -				<include>com.google.guava:guava</include>
>> -				<include>org.apache.hadoop:hadoop-core</include>
>> -				<include>org.apache.hadoop:hadoop-client</include>
>> -				<include>org.apache.whirr:whirr-hadoop</include>
>> -				<include>org.hamcrest:hamcrest-all</include>
>> -				<include>org.mockito:mockito-all</include>
>> -				<include>com.jcraft:jsch</include>
>> -				<include>net.sf.jopt-simple:jopt-simple</include>
>> -				<include>net.schmizz:sshj</include>
>> -				<include>j2ssh:j2ssh-core</include>
>> -				<include>j2ssh:j2ssh-common</include>
>> -				<include>org.apache.httpcomponents:httpcore:jar:4.2.4</include>
>> -				<include>org.apache.httpcomponents:httpclient:jar:4.2.4</include>
>> -				<include>de.odysseus.staxon:staxon:jar:1.2</include>
>> -				<include>de.odysseus.staxon:staxon-jackson:jar:1.2</include>
>> -				<include>org.ebaysf.web:cors-filter:jar:1.0.0</include>
>> -				<include>org.ogce:bcgss</include>
>> -				<include>org.apache.xmlbeans:xmlbeans</include>
>> -				<include>org.apache.thrift:libthrift:jar:0.9.1</include>
>> -				<include>commons-cli:commons-cli</include>
>> -				<include>commons-codec:commons-codec</include>
>> -				<include>com.rabbitmq:amqp-client</include>
>> -				<include>com.fasterxml.jackson.core:jackson-databind</include>
>> -				<include>com.fasterxml.jackson.core:jackson-core</include>
>> -				<include>com.fasterxml.jackson.core:jackson-annotations</include>
>> -				<include>org.apache.zookeeper:zookeeper</include>
>> -
>> -				<!-- UNICORE Dependencies Start -->
>> -				<include>eu.unicore:unicore-client-wrapper</include>
>> -				<include>org.apache.xmlbeans:xmlbeans-xpath</include>
>> -				<include>log4j:apache-log4j-extras</include>
>> -				<include>eu.eu-emi.security:canl</include>
>> -				<include>org.bouncycastle:bcpkix-jdk15on</include>
>> -				<include>pl.edu.icm.saml:samly2</include>
>> -				<include>org.apache.ws.security:wss4j</include>
>> -				<include>org.json:json</include>
>> -				<!-- CXF deps start -->
>> -				<include>org.codehaus.woodstox:woodstox-core-asl</include>
>> -				<include>org.codehaus.woodstox:stax2-api</include>
>> -				<include>org.apache.cxf:cxf-rt-databinding-xmlbeans</include>
>> -				<include>org.apache.cxf:cxf-api</include>
>> -				<include>org.apache.ws.xmlschema:xmlschema-core</include>
>> -				<include>org.apache.cxf:cxf-api</include>
>> -				<include>org.apache.cxf:cxf-rt-databinding-xmlbeans</include>
>> -				<include>org.apache.cxf:cxf-rt-core</include>
>> -				<include>org.apache.cxf:cxf-rt-frontend-jaxws</include>
>> -				<include>org.apache.cxf:cxf-rt-frontend-simple</include>
>> -				<include>org.apache.cxf:cxf-rt-bindings-soap</include>
>> -				<include>org.apache.cxf:cxf-rt-databinding-jaxb</include>
>> -				<include>org.apache.cxf:cxf-rt-bindings-xml</include>
>> -				<include>org.apache.cxf:cxf-rt-frontend-simple</include>
>> -				<include>org.apache.cxf:cxf-rt-ws-addr</include>
>> -				<include>org.apache.cxf:cxf-rt-ws-policy</include>
>> -				<include>org.apache.cxf:cxf-rt-transports-http</include>
>> -				<include>org.apache.cxf:cxf-rt-features-clustering</include>
>> -				<include>org.apache.cxf:cxf-rt-frontend-jaxws</include>
>> -				<include>org.apache.cxf:cxf-bundle</include>
>> -				<!-- // CXF deps end -->
>> -				<include>com.sun.xml.bind:jaxb-impl</include>
>> -				<include>org.apache.neethi:neethi:3.0.2</include>
>> -				<include>xml-resolver:xml-resolver</include>
>> -				<include>asm:asm</include>
>> -				<include>xml-resolver:xml-resolver</include>
>> -				<include>org.eclipse.jetty:jetty-servlet</include>
>> -				<include>org.eclipse.jetty:jetty-security</include>
>> -				<include>org.eclipse.jetty:jetty-server</include>
>> -				<include>org.eclipse.jetty.orbit:javax.servlet</include>
>> -				<include>org.eclipse.jetty:jetty-servlets</include>
>> -				<include>org.eclipse.jetty:jetty-continuation</include>
>> -				<include>org.eclipse.jetty:jetty-client</include>
>> -				<include>org.eclipse.jetty:jetty-http</include>
>> -				<include>org.eclipse.jetty:jetty-io</include>
>> -				<include>org.eclipse.jetty:jetty-util</include>
>> -				<include>wsdl4j:wsdl4j</include>
>> -				<include>org.apache.santuario:xmlsec</include>
>> -				<include>commons-httpclient:commons-httpclient</include>
>> -				<include>commons-codec:commons-codec</include>
>> -                <include>com.google.code.gson:gson</include>
>> -			</includes>
>> +				<include>*:*:jar</include>
>> +            </includes>
>> 		</dependencySet>
>> 
>> 	</dependencySets>
>> 
> 


Mime
View raw message