Author: smarru
Date: Sun Aug 18 04:21:33 2013
New Revision: 1515072
URL: http://svn.apache.org/r1515072
Log:
Migrated to use the maven central version of yfilter
Modified:
airavata/trunk/modules/distribution/airavata-server/pom.xml
airavata/trunk/modules/distribution/airavata-server/src/main/assembly/bin-assembly.xml
airavata/trunk/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml
airavata/trunk/modules/ws-messenger/distribution/pom.xml
airavata/trunk/modules/ws-messenger/distribution/src/main/assembly/bin-assembly.xml
airavata/trunk/modules/ws-messenger/message-monitor/pom.xml
airavata/trunk/modules/ws-messenger/messagebroker/pom.xml
airavata/trunk/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=1515072&r1=1515071&r2=1515072&view=diff
==============================================================================
--- airavata/trunk/modules/distribution/airavata-server/pom.xml (original)
+++ airavata/trunk/modules/distribution/airavata-server/pom.xml Sun Aug 18
04:21:33 2013
@@ -325,6 +325,11 @@
<version>${atomixmiser.version}</version>
</dependency>
<dependency>
+ <groupId>org.ogce</groupId>
+ <artifactId>yfilter</artifactId>
+ <version>${yfilter.version}</version>
+ </dependency>
+ <dependency>
<groupId>commons-configuration</groupId>
<artifactId>commons-configuration</artifactId>
<version>1.6</version>
@@ -345,11 +350,6 @@
<version>0.10</version>
</dependency>
<dependency>
- <groupId>edu.berkeley</groupId>
- <artifactId>yfilter</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>json</artifactId>
<version>${project.version}</version>
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=1515072&r1=1515071&r2=1515072&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
Sun Aug 18 04:21:33 2013
@@ -218,6 +218,7 @@
<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>jython:jython</include>
<include>org.jglobus:jglobus-all</include>
<include>lead-security:puretls</include>
@@ -252,8 +253,6 @@
<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>org.bouncycastle:bcprov-jdk15</include>
<include>org.bouncycastle:bcmail-jdk15</include>
<include>org.apache.tomcat:tomcat-jasper</include>
Modified:
airavata/trunk/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml?rev=1515072&r1=1515071&r2=1515072&view=diff
==============================================================================
---
airavata/trunk/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml
(original)
+++
airavata/trunk/modules/distribution/xbaya-gui/src/main/assembly/bin-assembly.xml
Sun Aug 18 04:21:33 2013
@@ -104,6 +104,7 @@
<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>jython:jython</include>
<include>org.apache.xmlbeans:xmlbeans</include>
<include>com.amazonaws:aws-java-sdk</include>
@@ -130,7 +131,6 @@
<include>com.sun.jersey:jersey-client:jar</include>
<include>com.sun.jersey:jersey-core:jar</include>
<include>com.sun.jersey:jersey-json</include>
- <include>edu.berkeley:yfilter</include>
<include>org.codehaus.jackson:jackson-jaxrs</include>
<include>org.codehaus.jackson:jackson-core-asl</include>
<include>org.codehaus.jackson:jackson-mapper-asl</include>
Modified: airavata/trunk/modules/ws-messenger/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/distribution/pom.xml?rev=1515072&r1=1515071&r2=1515072&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/distribution/pom.xml (original)
+++ airavata/trunk/modules/ws-messenger/distribution/pom.xml Sun Aug 18
04:21:33 2013
@@ -101,9 +101,9 @@
<version>${derby.version}</version>
</dependency>
<dependency>
- <groupId>edu.berkeley</groupId>
+ <groupId>org.ogce</groupId>
<artifactId>yfilter</artifactId>
- <version>1.0</version>
+ <version>${yfilter.version}</version>
</dependency>
<dependency>
<groupId>wsdl4j</groupId>
Modified:
airavata/trunk/modules/ws-messenger/distribution/src/main/assembly/bin-assembly.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/distribution/src/main/assembly/bin-assembly.xml?rev=1515072&r1=1515071&r2=1515072&view=diff
==============================================================================
---
airavata/trunk/modules/ws-messenger/distribution/src/main/assembly/bin-assembly.xml
(original)
+++
airavata/trunk/modules/ws-messenger/distribution/src/main/assembly/bin-assembly.xml
Sun Aug 18 04:21:33 2013
@@ -1,10 +1,10 @@
<!--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. -->
+ 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. -->
<!DOCTYPE assembly [
<!ELEMENT assembly
(id|includeBaseDirectory|baseDirectory|formats|fileSets|dependencySets)*>
@@ -27,15 +27,13 @@
<includeBaseDirectory>true</includeBaseDirectory>
<baseDirectory>${archieve.name}-${version}</baseDirectory>
<formats>
- <!--<format>tar.gz</format> //uncomment,if tar.gz archive needed-->
+ <!--<format>tar.gz</format> //uncomment,if tar.gz archive needed -->
<format>zip</format>
</formats>
<fileSets>
- <!--
- ********************** copy axis2 distribution from messenger
folder **********************
- -->
+ <!-- ********************** copy axis2 distribution from messenger
folder ********************** -->
<fileSet>
<directory>target/axis2-${used.axis2.release}/WEB-INF/lib</directory>
@@ -71,10 +69,7 @@
</includes>
</fileSet>
- <!--
- ********************** copy wsmg.broker and messagebox property
files
- **********************
- -->
+ <!-- ********************** copy wsmg.broker and messagebox property
files ********************** -->
<fileSet>
<directory>resources</directory>
@@ -85,10 +80,7 @@
</fileSet>
- <!--
- ********************** replace bin directory
- **********************
- -->
+ <!-- ********************** replace bin directory
********************** -->
<fileSet>
<directory>resources/bin</directory>
@@ -98,9 +90,7 @@
</includes>
</fileSet>
- <!--
- ********************** copy messenger commons
**********************
- -->
+ <!-- ********************** copy messenger commons
********************** -->
@@ -121,14 +111,10 @@
- <!--
- ********************** copymessagebrokerjar
**********************
- -->
+ <!-- ********************** copymessagebrokerjar
********************** -->
- <!--
- ********************** copy messagebroker+ messagebox samples
**********************
- -->
+ <!-- ********************** copy messagebroker+ messagebox samples
********************** -->
<fileSet>
<directory>../samples</directory>
@@ -139,9 +125,7 @@
</fileSet>
- <!--
- ********************** copy gui start up script
**********************
- -->
+ <!-- ********************** copy gui start up script
********************** -->
<fileSet>
<directory>resources</directory>
@@ -161,9 +145,7 @@
</fileSet>
- <!--
- ********************** copy database scripts
**********************
- -->
+ <!-- ********************** copy database scripts
********************** -->
<fileSet>
<directory>../messagebroker/src/main/resources/database_scripts</directory>
@@ -192,7 +174,7 @@
<include>org.apache.derby:derbytools:jar</include>
<include>org.apache.airavata:messenger-client:jar</include>
<include>org.apache.airavata:messenger-commons:jar</include>
- <include>edu.berkeley:yfilter:jar</include>
+ <include>org.ogce:yfilter:jar</include>
<include>wsdl4j:wsdl4j:jar</include>
</includes>
</dependencySet>
Modified: airavata/trunk/modules/ws-messenger/message-monitor/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/message-monitor/pom.xml?rev=1515072&r1=1515071&r2=1515072&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/message-monitor/pom.xml (original)
+++ airavata/trunk/modules/ws-messenger/message-monitor/pom.xml Sun Aug 18
04:21:33 2013
@@ -40,8 +40,11 @@
<artifactId>atomixmiser</artifactId>
<version>${atomixmiser.version}</version>
</dependency>
- <!--dependency> <groupId>org.apache.airavata</groupId>
<artifactId>airavata-registry-api</artifactId>
<version>${project.version}</version>
- </dependency -->
+ <dependency>
+ <groupId>org.ogce</groupId>
+ <artifactId>yfilter</artifactId>
+ <version>${yfilter.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.airavata</groupId>
<artifactId>airavata-common-utils</artifactId>
@@ -49,11 +52,6 @@
</dependency>
<dependency>
- <groupId>edu.berkeley</groupId>
- <artifactId>yfilter</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
<groupId>wsdl4j</groupId>
<artifactId>wsdl4j</artifactId>
<version>1.5.2</version>
Modified: airavata/trunk/modules/ws-messenger/messagebroker/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/modules/ws-messenger/messagebroker/pom.xml?rev=1515072&r1=1515071&r2=1515072&view=diff
==============================================================================
--- airavata/trunk/modules/ws-messenger/messagebroker/pom.xml (original)
+++ airavata/trunk/modules/ws-messenger/messagebroker/pom.xml Sun Aug 18
04:21:33 2013
@@ -8,7 +8,8 @@
ANY ~ KIND, either express or implied. See the License for the specific
language governing permissions and limitations under
the License. -->
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<parent>
<groupId>org.apache.airavata</groupId>
@@ -22,28 +23,28 @@
<url>http://airavata.apache.org/</url>
<packaging>jar</packaging>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>${antrun.version}</version>
- <executions>
- <execution>
- <id>restore-persistence</id>
- <phase>prepare-package</phase>
- <configuration>
- <tasks>
- <copy
file="${project.build.outputDirectory}/services.xml"
tofile="${project.build.outputDirectory}/META-INF/services.xml" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>${antrun.version}</version>
+ <executions>
+ <execution>
+ <id>restore-persistence</id>
+ <phase>prepare-package</phase>
+ <configuration>
+ <tasks>
+ <copy
file="${project.build.outputDirectory}/services.xml"
tofile="${project.build.outputDirectory}/META-INF/services.xml" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
<dependencies>
@@ -67,11 +68,10 @@
<artifactId>airavata-messenger-client</artifactId>
<version>${project.version}</version>
</dependency>
-
<dependency>
- <groupId>edu.berkeley</groupId>
+ <groupId>org.ogce</groupId>
<artifactId>yfilter</artifactId>
- <version>1.0</version>
+ <version>${yfilter.version}</version>
</dependency>
<dependency>
<groupId>wsdl4j</groupId>
Modified: airavata/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/airavata/trunk/pom.xml?rev=1515072&r1=1515071&r2=1515072&view=diff
==============================================================================
--- airavata/trunk/pom.xml (original)
+++ airavata/trunk/pom.xml Sun Aug 18 04:21:33 2013
@@ -81,6 +81,7 @@
<xsul5.version>1.2.7</xsul5.version>
<gpel.version>1.0.9</gpel.version>
<atomixmiser.version>0.9.4</atomixmiser.version>
+ <yfilter.version>1.0</yfilter.version>
<jersey.version>1.13</jersey.version>
<tomcat.version>7.0.41</tomcat.version>
<cargo.version>1.3.1</cargo.version>
