[jbossws-commits] JBossWS SVN: r6415 - in stack/cxf/branches/tdiesler/trunk: ant-import and 1 other directory.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Mon Apr 14 08:13:40 EDT 2008
Author: thomas.diesler at jboss.com
Date: 2008-04-14 08:13:40 -0400 (Mon, 14 Apr 2008)
New Revision: 6415
Removed:
stack/cxf/branches/tdiesler/trunk/ant-import/build-thirdparty.xml
Modified:
stack/cxf/branches/tdiesler/trunk/build.xml
stack/cxf/branches/tdiesler/trunk/pom.xml
stack/cxf/branches/tdiesler/trunk/version.properties
Log:
REmove dependency on thirdparty downloads
Deleted: stack/cxf/branches/tdiesler/trunk/ant-import/build-thirdparty.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/ant-import/build-thirdparty.xml 2008-04-14 12:04:26 UTC (rev 6414)
+++ stack/cxf/branches/tdiesler/trunk/ant-import/build-thirdparty.xml 2008-04-14 12:13:40 UTC (rev 6415)
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ====================================================================== -->
-<!-- -->
-<!-- JBoss, the OpenSource J2EE webOS -->
-<!-- -->
-<!-- Distributable under LGPL license. -->
-<!-- See terms of license at http://www.gnu.org. -->
-<!-- -->
-<!-- ====================================================================== -->
-
-<!-- $Id$ -->
-
-<project>
-
- <property file="${cxf.dir}/version.properties"/>
-
- <!-- ========= -->
- <!-- Libraries -->
- <!-- ========= -->
-
- <target name="thirdparty" depends="thirdparty-classpath">
- </target>
-
- <target name="thirdparty-init" depends="prepare">
-
- <checksum file="${cxf.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/>
- <property name="checksum.ok.${checksum.ok}" value="true"/>
-
- <property name="thirdparty.dir" value="${cxf.dir}/thirdparty"/>
- <condition property="force.thirdparty.get">
- <or>
- <not>
- <available file="${thirdparty.dir}" type="dir"/>
- </not>
- <isfalse value="${checksum.ok}"/>
- </or>
- </condition>
- <echo message="checksum.ok=${checksum.ok}"/>
- </target>
-
- <target name="thirdparty-delete" depends="thirdparty-init" unless="checksum.ok.true">
- <delete dir="${thirdparty.dir}"/>
- </target>
-
- <!--
- thirdpartry-get
- -->
- <target name="thirdparty-get" depends="thirdparty-delete" if="force.thirdparty.get"
- description="Gets the thirdparty libraries">
-
- <mkdir dir="${thirdparty.dir}"/>
- <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework-scripts.zip" dest="${thirdparty.dir}/jbossws-framework-scripts.zip" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws-jboss42/${jbossws-jboss42}/lib/jbossws-jboss42-resources.zip" dest="${thirdparty.dir}/jbossws-jboss42-resources.zip" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jaxr/${jboss-jaxr}/lib/juddi-service.sar" dest="${thirdparty.dir}/juddi-service.sar" usetimestamp="true" verbose="true"/>
-
- <checksum file="${cxf.dir}/version.properties" fileext=".md5"/>
- </target>
-
- <target name="thirdparty-classpath" depends="thirdparty-get">
- <path id="cxf.integration.classpath">
- <!--
- A stack MUST NOT have a compile time dependency on framework
- http://www.jboss.org/index.html?module=bb&op=viewtopic&t=133071
- -->
- <pathelement location="${thirdparty.dir}/jbossws-common.jar"/>
- <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
-
- <pathelement location="${thirdparty.dir}/cxf-${cxf.version}.jar"/>
- <pathelement location="${thirdparty.dir}/geronimo-ws-metadata_${cxf.geronimo.ws.metadata}.jar"/>
- <pathelement location="${thirdparty.dir}/jaxws-api-${cxf.jaxws.api}.jar"/>
- <pathelement location="${thirdparty.dir}/spring-beans-${cxf.spring}.jar"/>
- <pathelement location="${thirdparty.dir}/spring-context-${cxf.spring}.jar"/>
- <pathelement location="${thirdparty.dir}/spring-core-${cxf.spring}.jar"/>
-
- <pathelement location="${thirdparty.dir}/jaxb-api.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-common-core.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-javaee.jar"/>
- <pathelement location="${thirdparty.dir}/jboss-logging-spi.jar"/>
- <pathelement location="${thirdparty.dir}/servlet-api.jar"/>
- </path>
- </target>
-
-</project>
Modified: stack/cxf/branches/tdiesler/trunk/build.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-14 12:04:26 UTC (rev 6414)
+++ stack/cxf/branches/tdiesler/trunk/build.xml 2008-04-14 12:13:40 UTC (rev 6415)
@@ -20,7 +20,6 @@
<import file="${basedir}/ant-import/build-prepare-deploy.xml"/>
<import file="${basedir}/ant-import/build-deploy.xml"/>
<import file="${basedir}/ant-import/build-release.xml"/>
- <import file="${basedir}/ant-import/build-thirdparty.xml"/>
<import file="${basedir}/ant-import/jbossws-deploy-macros.xml"/>
<!-- ================================================================== -->
@@ -55,7 +54,7 @@
<!-- Initialization -->
<!-- ================================================================== -->
- <target name="init" depends="prepare,thirdparty">
+ <target name="init" depends="prepare">
<xmlproperty file="${cxf.dir}/pom.xml"/>
<property name="version.id" value="${project.version}"/>
<echo message="version.id=${version.id}"/>
Modified: stack/cxf/branches/tdiesler/trunk/pom.xml
===================================================================
--- stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-14 12:04:26 UTC (rev 6414)
+++ stack/cxf/branches/tdiesler/trunk/pom.xml 2008-04-14 12:13:40 UTC (rev 6415)
@@ -32,6 +32,12 @@
<version>1.1</version>
</dependency>
<dependency>
+ <groupId>jboss.jaxr</groupId>
+ <artifactId>juddi-service</artifactId>
+ <version>1.2.0.GA</version>
+ <type>sar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
<version>${cxf-version}</version>
@@ -86,6 +92,20 @@
</dependency>
<dependency>
<groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ <version>3.0.2-SNAPSHOT</version>
+ <classifier>scripts</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss42</artifactId>
+ <version>4.2.1-SNAPSHOT</version>
+ <classifier>resources</classifier>
+ <type>zip</type>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
<artifactId>jbossws-spi</artifactId>
<version>3.0.0-SNAPSHOT</version>
</dependency>
Modified: stack/cxf/branches/tdiesler/trunk/version.properties
===================================================================
--- stack/cxf/branches/tdiesler/trunk/version.properties 2008-04-14 12:04:26 UTC (rev 6414)
+++ stack/cxf/branches/tdiesler/trunk/version.properties 2008-04-14 12:13:40 UTC (rev 6415)
@@ -6,6 +6,4 @@
cxf.geronimo.ws.metadata=2.0_spec
# Thirdparty library versions
-jbossws-framework=snapshot
jbossws-jboss42=4.2.1.GA
-jboss-jaxr=1.2.0.GA
More information about the jbossws-commits
mailing list