You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@airavata.apache.org by Lahiru Gunathilake <gl...@gmail.com> on 2011/10/13 16:25:41 UTC
Re: svn commit: r1182595 - in /incubator/airavata/trunk/modules:
commons/gfac-schema/pom.xml gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImplTest.java
Hi Patnacha,
When you add a new dependency to existing module or for a new module, please
make sure you add them to distribution(pom.xml and bin-assembly.xml),
otherwise the distribution will fail.. if it will be used in XBaya please
make sure you add those jars in to AIRAVATA_HOME/lib and if its used in
axis2 add them to AIRAVATA_HOME/standalone-server/lib directory by changing
bin-assembly.xml and pom.xml.
Thanks
Lahiru
On Wed, Oct 12, 2011 at 6:01 PM, <pa...@apache.org> wrote:
> Author: patanachai
> Date: Wed Oct 12 22:01:40 2011
> New Revision: 1182595
>
> URL: http://svn.apache.org/viewvc?rev=1182595&view=rev
> Log:
> New DataType System
>
> Modified:
> incubator/airavata/trunk/modules/commons/gfac-schema/pom.xml
>
> incubator/airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImplTest.java
>
> Modified: incubator/airavata/trunk/modules/commons/gfac-schema/pom.xml
> URL:
> http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/commons/gfac-schema/pom.xml?rev=1182595&r1=1182594&r2=1182595&view=diff
>
> ==============================================================================
> --- incubator/airavata/trunk/modules/commons/gfac-schema/pom.xml (original)
> +++ incubator/airavata/trunk/modules/commons/gfac-schema/pom.xml Wed Oct 12
> 22:01:40 2011
> @@ -1,132 +1,128 @@
> <?xml version="1.0" encoding="UTF-8"?>
>
> <!--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.
> -->
> + 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. -->
>
> <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>
> - <artifactId>airavata-commons</artifactId>
> - <groupId>airavata</groupId>
> - <version>0.0.1-SNAPSHOT</version>
> - <relativePath>../pom.xml</relativePath>
> - </parent>
> - <modelVersion>4.0.0</modelVersion>
> - <groupId>airavata</groupId>
> - <artifactId>airavata-gfac-schema-utils</artifactId>
> - <packaging>jar</packaging>
> - <name>Airavata GFac Schema Utilities</name>
> - <url>http://incubator.apache.org/airavata/</url>
> -
> - <dependencies>
> - <dependency>
> - <groupId>javax.jcr</groupId>
> - <artifactId>jcr</artifactId>
> - </dependency>
> - <dependency>
> - <groupId>xmlbeans</groupId>
> - <artifactId>xbean</artifactId>
> - </dependency>
> - <dependency>
> - <groupId>junit</groupId>
> - <artifactId>junit</artifactId>
> - </dependency>
> - <dependency>
> - <groupId>xerces</groupId>
> - <artifactId>xercesImpl</artifactId>
> - </dependency>
> - <dependency>
> - <groupId>xpp3</groupId>
> - <artifactId>xpp3</artifactId>
> - </dependency>
> - <dependency>
> - <groupId>xsul</groupId>
> - <artifactId>xsul</artifactId>
> - </dependency>
> - <dependency>
> - <groupId>wsdl4j</groupId>
> - <artifactId>wsdl4j</artifactId>
> - <version>1.5.2</version>
> - <type>jar</type>
> - </dependency>
> -
> - <!-- Testing -->
> - <dependency>
> - <groupId>org.apache.jackrabbit</groupId>
> - <artifactId>jackrabbit-core</artifactId>
> - </dependency>
> - <dependency>
> - <groupId>org.slf4j</groupId>
> - <artifactId>slf4j-simple</artifactId>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.jackrabbit</groupId>
> - <artifactId>jackrabbit-jcr-rmi</artifactId>
> - </dependency>
> - </dependencies>
> - <build>
> - <pluginManagement>
> - <plugins>
> - <plugin>
> -
> <groupId>org.apache.maven.plugins</groupId>
> -
> <artifactId>maven-compiler-plugin</artifactId>
> - <version>2.3.2</version>
> - <configuration>
> - <source>1.5</source>
> - <target>1.5</target>
> - </configuration>
> - </plugin>
> -
> -
> - </plugins>
> - </pluginManagement>
> - <plugins>
> - <plugin>
> - <groupId>org.codehaus.mojo</groupId>
> -
> <artifactId>build-helper-maven-plugin</artifactId>
> - <executions>
> - <execution>
> - <id>add-source</id>
> -
> <phase>generate-sources</phase>
> - <goals>
> -
> <goal>add-source</goal>
> - </goals>
> - <configuration>
> - <sources>
> -
> <source>${basedir}/target/generated-sources/xmlbeans</source>
> - </sources>
> - </configuration>
> - </execution>
> - </executions>
> - </plugin>
> - <plugin>
> - <groupId>org.codehaus.mojo</groupId>
> -
> <artifactId>xmlbeans-maven-plugin</artifactId>
> - <version>2.3.3</version>
> - <executions>
> - <execution>
> - <goals>
> -
> <goal>xmlbeans</goal>
> - </goals>
> - </execution>
> - </executions>
> - <inherited>true</inherited>
> - <configuration>
> -
> <schemaDirectory>schemas</schemaDirectory>
> - <xmlConfigs>
> - <xmlConfig
> implementation="java.io.File">schemas/gfac-schemas.xsdconfig</xmlConfig>
> - </xmlConfigs>
> -
> <outputJar>target/generated/${artifactId}-${version}.jar</outputJar>
> - </configuration>
> - </plugin>
> - </plugins>
> - </build>
> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
> http://maven.apache.org/maven-v4_0_0.xsd">
> + <parent>
> + <artifactId>airavata-commons</artifactId>
> + <groupId>airavata</groupId>
> + <version>0.0.1-SNAPSHOT</version>
> + <relativePath>../pom.xml</relativePath>
> + </parent>
> + <modelVersion>4.0.0</modelVersion>
> + <groupId>airavata</groupId>
> + <artifactId>airavata-gfac-schema-utils</artifactId>
> + <packaging>jar</packaging>
> + <name>Airavata GFac Schema Utilities</name>
> + <url>http://incubator.apache.org/airavata/</url>
> +
> + <dependencies>
> + <dependency>
> + <groupId>javax.jcr</groupId>
> + <artifactId>jcr</artifactId>
> + </dependency>
> + <dependency>
> + <groupId>xmlbeans</groupId>
> + <artifactId>xbean</artifactId>
> + </dependency>
> + <dependency>
> + <groupId>xerces</groupId>
> + <artifactId>xercesImpl</artifactId>
> + </dependency>
> + <dependency>
> + <groupId>wsdl4j</groupId>
> + <artifactId>wsdl4j</artifactId>
> + <version>1.6.2</version>
> + </dependency>
> + <dependency>
> + <groupId>commons-configuration</groupId>
> + <artifactId>commons-configuration</artifactId>
> + <version>1.6</version>
> + </dependency>
> +
> + <!-- Testing -->
> + <dependency>
> + <groupId>junit</groupId>
> + <artifactId>junit</artifactId>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.jackrabbit</groupId>
> + <artifactId>jackrabbit-core</artifactId>
> + </dependency>
> + <dependency>
> + <groupId>org.slf4j</groupId>
> + <artifactId>slf4j-simple</artifactId>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.jackrabbit</groupId>
> + <artifactId>jackrabbit-jcr-rmi</artifactId>
> + </dependency>
> + </dependencies>
> + <build>
> + <pluginManagement>
> + <plugins>
> + <plugin>
> + <groupId>org.apache.maven.plugins</groupId>
> + <artifactId>maven-compiler-plugin</artifactId>
> + <version>2.3.2</version>
> + <configuration>
> + <source>1.5</source>
> + <target>1.5</target>
> + </configuration>
> + </plugin>
> +
> +
> + </plugins>
> + </pluginManagement>
> + <plugins>
> + <plugin>
> + <groupId>org.codehaus.mojo</groupId>
> + <artifactId>build-helper-maven-plugin</artifactId>
> + <executions>
> + <execution>
> + <id>add-source</id>
> + <phase>generate-sources</phase>
> + <goals>
> + <goal>add-source</goal>
> + </goals>
> + <configuration>
> + <sources>
> +
> <source>${basedir}/target/generated-sources/xmlbeans</source>
> + </sources>
> + </configuration>
> + </execution>
> + </executions>
> + </plugin>
> + <plugin>
> + <groupId>org.codehaus.mojo</groupId>
> + <artifactId>xmlbeans-maven-plugin</artifactId>
> + <version>2.3.3</version>
> + <executions>
> + <execution>
> + <goals>
> + <goal>xmlbeans</goal>
> + </goals>
> + </execution>
> + </executions>
> + <inherited>true</inherited>
> + <configuration>
> + <schemaDirectory>schemas</schemaDirectory>
> + <xmlConfigs>
> + <xmlConfig
> implementation="java.io.File">schemas/gfac-schemas.xsdconfig</xmlConfig>
> + </xmlConfigs>
> +
> <outputJar>target/generated/${artifactId}-${version}.jar</outputJar>
> + </configuration>
> + </plugin>
> + </plugins>
> + </build>
> </project>
>
> Modified:
> incubator/airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImplTest.java
> URL:
> http://svn.apache.org/viewvc/incubator/airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImplTest.java?rev=1182595&r1=1182594&r2=1182595&view=diff
>
> ==============================================================================
> ---
> incubator/airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImplTest.java
> (original)
> +++
> incubator/airavata/trunk/modules/gfac-core/src/test/java/org/apache/airavata/core/gfac/services/impl/PropertiesBasedServiceImplTest.java
> Wed Oct 12 22:01:40 2011
> @@ -27,18 +27,18 @@ import java.util.ArrayList;
> import java.util.HashMap;
> import java.util.List;
>
> -import org.apache.airavata.registry.api.impl.JCRRegistry;
> -import org.apache.airavata.commons.gfac.type.DataType;
> import org.apache.airavata.commons.gfac.type.HostDescription;
> import org.apache.airavata.commons.gfac.type.Parameter;
> import org.apache.airavata.commons.gfac.type.ServiceDescription;
> import
> org.apache.airavata.commons.gfac.type.app.ShellApplicationDeployment;
> import org.apache.airavata.commons.gfac.type.parameter.AbstractParameter;
> +import org.apache.airavata.commons.gfac.type.parameter.ParameterFactory;
> import org.apache.airavata.commons.gfac.type.parameter.StringParameter;
> import
> org.apache.airavata.core.gfac.context.invocation.impl.DefaultExecutionContext;
> import
> org.apache.airavata.core.gfac.context.invocation.impl.DefaultInvocationContext;
> import
> org.apache.airavata.core.gfac.context.message.impl.ParameterContextImpl;
> import
> org.apache.airavata.core.gfac.notification.impl.LoggingNotification;
> +import org.apache.airavata.registry.api.impl.JCRRegistry;
> import org.junit.Assert;
> import org.junit.Before;
> import org.junit.Test;
> @@ -82,13 +82,13 @@ public class PropertiesBasedServiceImplT
>
> Parameter input = new Parameter();
> input.setName("echo_input");
> - input.setType(DataType.String);
> +
> input.setType(ParameterFactory.getInstance().getType("String"));
> List<Parameter> inputList = new ArrayList<Parameter>();
> inputList.add(input);
>
> Parameter output = new Parameter();
> output.setName("echo_output");
> - output.setType(DataType.String);
> +
> output.setType(ParameterFactory.getInstance().getType("String"));
> List<Parameter> outputList = new ArrayList<Parameter>();
> outputList.add(output);
>
>
>
>
--
System Analyst Programmer
PTI Lab
Indiana University