You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yoko-commits@incubator.apache.org by pk...@apache.org on 2006/04/18 14:33:28 UTC
svn commit: r394954 - in /incubator/yoko/trunk: api/pom.xml bindings/pom.xml
pom.xml sunjars/ sunjars/build.xml sunjars/pom.xml tools/pom.xml
Author: pkosuru
Date: Tue Apr 18 07:31:50 2006
New Revision: 394954
URL: http://svn.apache.org/viewcvs?rev=394954&view=rev
Log:
This sub project installs jaxb, activation, jaxws, annotation, saaj and jsr181 jars from JAX-WS 2.0 RI EA3 installation, so that dependencies are met for tools, api and bindings modules. This is a temporary workaround until the above jars are up on iblibilio.
Added:
incubator/yoko/trunk/sunjars/
incubator/yoko/trunk/sunjars/build.xml (with props)
incubator/yoko/trunk/sunjars/pom.xml (with props)
Modified:
incubator/yoko/trunk/api/pom.xml
incubator/yoko/trunk/bindings/pom.xml
incubator/yoko/trunk/pom.xml
incubator/yoko/trunk/tools/pom.xml
Modified: incubator/yoko/trunk/api/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/yoko/trunk/api/pom.xml?rev=394954&r1=394953&r2=394954&view=diff
==============================================================================
--- incubator/yoko/trunk/api/pom.xml (original)
+++ incubator/yoko/trunk/api/pom.xml Tue Apr 18 07:31:50 2006
@@ -18,13 +18,6 @@
</properties>
<dependencies>
-
- <dependency>
- <groupId>javax.xml</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>${jaxws.version}</version>
- </dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified: incubator/yoko/trunk/bindings/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/yoko/trunk/bindings/pom.xml?rev=394954&r1=394953&r2=394954&view=diff
==============================================================================
--- incubator/yoko/trunk/bindings/pom.xml (original)
+++ incubator/yoko/trunk/bindings/pom.xml Tue Apr 18 07:31:50 2006
@@ -18,13 +18,6 @@
</properties>
<dependencies>
-
- <dependency>
- <groupId>javax.xml</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>${jaxws.version}</version>
- </dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Modified: incubator/yoko/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/yoko/trunk/pom.xml?rev=394954&r1=394953&r2=394954&view=diff
==============================================================================
--- incubator/yoko/trunk/pom.xml (original)
+++ incubator/yoko/trunk/pom.xml Tue Apr 18 07:31:50 2006
@@ -11,11 +11,12 @@
<packaging>pom</packaging>
<modules>
- <module>orb</module>
+ <module>sunjars</module>
<module>api</module>
<module>tools</module>
<module>bindings</module>
-
+ <module>orb</module>
+
<!-- These are not ready yet
<module>system_tests</module>
<module>distribution</module>
@@ -100,7 +101,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
<configuration>
- <!--<downloadSources>true</downloadSources>-->
+ <downloadSources>true</downloadSources>
<buildcommands>
<java.lang.String>org.eclipse.jdt.core.javabuilder</java.lang.String>
<java.lang.String>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</java.lang.String>
@@ -125,9 +126,9 @@
<plugin>
<artifactId>maven-clover-plugin</artifactId>
</plugin>
- <plugin>
+ <!--plugin>
<artifactId>maven-pmd-plugin</artifactId>
- </plugin>
+ </plugin!-->
<plugin>
<artifactId>maven-project-info-reports-plugin</artifactId>
</plugin>
Added: incubator/yoko/trunk/sunjars/build.xml
URL: http://svn.apache.org/viewcvs/incubator/yoko/trunk/sunjars/build.xml?rev=394954&view=auto
==============================================================================
--- incubator/yoko/trunk/sunjars/build.xml (added)
+++ incubator/yoko/trunk/sunjars/build.xml Tue Apr 18 07:31:50 2006
@@ -0,0 +1,38 @@
+<project name="YokoSunJarsInstaller">
+
+ <target name="checkinstalled">
+ <condition property="already.installed" >
+ <and>
+ <available file="${localRepository}/javax/annotation/jsr250-api/2.0-JAXWS-2.0-EA3/jsr250-api-2.0-JAXWS-2.0-EA3.jar"/>
+ <available file="${localRepository}/javax/jws/jsr181-api/2.0-JAXWS-2.0-EA3/jsr181-api-2.0-JAXWS-2.0-EA3.jar"/>
+ <available file="${localRepository}/javax/xml/jaxws-api/2.0-JAXWS-2.0-EA3/jaxws-api-2.0-JAXWS-2.0-EA3.jar"/>
+ <available file="${localRepository}/com/sun/xml/saaj-impl/1.3/saaj-impl-1.3.jar"/>
+ <available file="${localRepository}/javax/xml/saaj-api/1.3/saaj-api-1.3.jar"/>
+ </and>
+ </condition>
+ <condition property="maven.suffix" value="">
+ <os family="unix"/>
+ </condition>
+ <condition property="maven.suffix" value=".bat">
+ <os family="windows"/>
+ </condition>
+ </target>
+
+ <target name="installJars" depends="checkinstalled" unless="already.installed">
+ <exec executable="mvn${maven.suffix}" dir="${basedir}" failonerror="false">
+ <arg line="install:install-file -DgroupId=javax.annotation -DartifactId=jsr250-api -Dversion=2.0-JAXWS-2.0-EA3 -Dpackaging=jar -DgeneratePom=true -Dfile=${basedir}/target/celtix/lib/jsr250-api-2.0-JAXWS-2.0-EA3.jar"/>
+ </exec>
+ <exec executable="mvn${maven.suffix}" dir="${basedir}" failonerror="false">
+ <arg line="install:install-file -DgroupId=javax.jws -DartifactId=jsr181-api -Dversion=2.0-JAXWS-2.0-EA3 -Dpackaging=jar -DgeneratePom=true -Dfile=${basedir}/target/celtix/lib/jsr181-api-2.0-JAXWS-2.0-EA3.jar"/>
+ </exec>
+ <exec executable="mvn${maven.suffix}" dir="${basedir}" failonerror="false">
+ <arg line="install:install-file -DgroupId=javax.xml -DartifactId=jaxws-api -Dversion=2.0-JAXWS-2.0-EA3 -Dpackaging=jar -DgeneratePom=true -Dfile=${basedir}/target/celtix/lib/jaxws-api-2.0-JAXWS-2.0-EA3.jar"/>
+ </exec>
+ <exec executable="mvn${maven.suffix}" dir="${basedir}" failonerror="false">
+ <arg line="install:install-file -DgroupId=javax.xml -DartifactId=saaj-api -Dversion=1.3 -Dpackaging=jar -DgeneratePom=true -Dfile=${basedir}/target/celtix/lib/saaj-api-1.3.jar"/>
+ </exec>
+ <exec executable="mvn${maven.suffix}" dir="${basedir}" failonerror="false">
+ <arg line="install:install-file -DgroupId=com.sun.xml -DartifactId=saaj-impl -Dversion=1.3 -Dpackaging=jar -DgeneratePom=true -Dfile=${basedir}/target/celtix/lib/saaj-impl-1.3.jar"/>
+ </exec>
+ </target>
+</project>
Propchange: incubator/yoko/trunk/sunjars/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/yoko/trunk/sunjars/build.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added: incubator/yoko/trunk/sunjars/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/yoko/trunk/sunjars/pom.xml?rev=394954&view=auto
==============================================================================
--- incubator/yoko/trunk/sunjars/pom.xml (added)
+++ incubator/yoko/trunk/sunjars/pom.xml Tue Apr 18 07:31:50 2006
@@ -0,0 +1,68 @@
+<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">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.yoko</groupId>
+ <artifactId>yoko-sunjars</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>Yoko Project to install the Sun jars</name>
+
+ <parent>
+ <groupId>org.apache.yoko</groupId>
+ <artifactId>Yoko</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ </parent>
+
+ <properties>
+ <topDirectoryLocation>..</topDirectoryLocation>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>dependency-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>getdeps</id>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.objectweb.celtix</groupId>
+ <artifactId>celtix-distribution</artifactId>
+ <version>${celtix.version}</version>
+ <classifier>bin-epl</classifier>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>install</id>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks>
+ <ant target="installJars">
+ <property name="localRepository" value="${settings.localRepository}"/>
+ </ant>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Propchange: incubator/yoko/trunk/sunjars/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/yoko/trunk/sunjars/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: incubator/yoko/trunk/tools/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/yoko/trunk/tools/pom.xml?rev=394954&r1=394953&r2=394954&view=diff
==============================================================================
--- incubator/yoko/trunk/tools/pom.xml (original)
+++ incubator/yoko/trunk/tools/pom.xml Tue Apr 18 07:31:50 2006
@@ -36,27 +36,6 @@
<version>1.5.2</version>
</dependency>
<dependency>
- <groupId>javax.xml</groupId>
- <artifactId>jaxb-api</artifactId>
- <version>${jaxws.version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml</groupId>
- <artifactId>jaxb-impl</artifactId>
- <version>2.0-JAXWS-2.0-EA3</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml</groupId>
- <artifactId>jsr173-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>javax.xml</groupId>
- <artifactId>jaxws-api</artifactId>
- <version>${jaxws.version}</version>
- </dependency>
- <dependency>
<groupId>org.objectweb.celtix</groupId>
<artifactId>celtix-api</artifactId>
<version>${celtix.version}</version>