JBossWS SVN: r6414 - container/jboss42/branches/jbossws-jboss-4.2.1/ant.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-14 08:04:26 -0400 (Mon, 14 Apr 2008)
New Revision: 6414
Modified:
container/jboss42/branches/jbossws-jboss-4.2.1/ant/build-install.xml
Log:
mvn deploy, ok
Modified: container/jboss42/branches/jbossws-jboss-4.2.1/ant/build-install.xml
===================================================================
--- container/jboss42/branches/jbossws-jboss-4.2.1/ant/build-install.xml 2008-04-14 12:00:34 UTC (rev 6413)
+++ container/jboss42/branches/jbossws-jboss-4.2.1/ant/build-install.xml 2008-04-14 12:04:26 UTC (rev 6414)
@@ -40,15 +40,15 @@
<target name="install" depends="init" description="Install to jboss.local.repository">
<!-- Check if the target jar is available -->
- <available property="jbossws.jboss.jar.available" file="${project.target.dir}/jbossws-jboss-${version.id}.jar"/>
- <fail message="Cannot find jbossws-jboss-${version.id}.jar. Did you run 'mvn package'?" unless="jbossws.jboss.jar.available"/>
+ <available property="jbossws.jboss42.jar.available" file="${project.target.dir}/jbossws-jboss42-${version.id}.jar"/>
+ <fail message="Cannot find jbossws-jboss42-${version.id}.jar. Did you run 'mvn package'?" unless="jbossws.jboss42.jar.available"/>
<!-- jboss/jbossws-project -->
<property name="jboss.repository.dir" value="${jboss.local.repository}/jboss/jbossws-jboss42/${repository.id}"/>
<mkdir dir="${jboss.repository.dir}/lib"/>
- <copy file="${project.target.dir}/jbossws-jboss-${version.id}.jar" tofile="${jboss.repository.dir}/lib/jbossws-jboss42.jar" overwrite="true"/>
- <copy file="${project.target.dir}/jbossws-jboss-${version.id}-sources.jar" tofile="${jboss.repository.dir}/lib/jbossws-jboss42-src.jar" overwrite="true"/>
- <copy file="${project.target.dir}/jbossws-jboss-${version.id}-resources.zip" tofile="${jboss.repository.dir}/lib/jbossws-jboss42-resources.zip" overwrite="true"/>
+ <copy file="${project.target.dir}/jbossws-jboss42-${version.id}.jar" tofile="${jboss.repository.dir}/lib/jbossws-jboss42.jar" overwrite="true"/>
+ <copy file="${project.target.dir}/jbossws-jboss42-${version.id}-sources.jar" tofile="${jboss.repository.dir}/lib/jbossws-jboss42-src.jar" overwrite="true"/>
+ <copy file="${project.target.dir}/jbossws-jboss42-${version.id}-resources.zip" tofile="${jboss.repository.dir}/lib/jbossws-jboss42-resources.zip" overwrite="true"/>
<copy file="${project.target.dir}/etc/component-info.xml" tofile="${jboss.repository.dir}/component-info.xml" overwrite="true"/>
</target>
16 years, 9 months
JBossWS SVN: r6413 - container/jboss42/branches/jbossws-jboss-4.2.1.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-14 08:00:34 -0400 (Mon, 14 Apr 2008)
New Revision: 6413
Modified:
container/jboss42/branches/jbossws-jboss-4.2.1/pom.xml
Log:
<artifactId>jbossws-jboss42</artifactId>
Modified: container/jboss42/branches/jbossws-jboss-4.2.1/pom.xml
===================================================================
--- container/jboss42/branches/jbossws-jboss-4.2.1/pom.xml 2008-04-14 11:54:56 UTC (rev 6412)
+++ container/jboss42/branches/jbossws-jboss-4.2.1/pom.xml 2008-04-14 12:00:34 UTC (rev 6413)
@@ -4,9 +4,9 @@
<name>JBoss Web Services - Container JBoss-4.2.1</name>
<groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-jboss</artifactId>
+ <artifactId>jbossws-jboss42</artifactId>
- <version>4.2.1.SP1</version>
+ <version>4.2.1-SNAPSHOT</version>
<organization>
<name>JBoss, a division of Red Hat</name>
16 years, 9 months
JBossWS SVN: r6412 - in container/jboss42/branches/jbossws-jboss-4.2.1: ant and 3 other directories.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-14 07:54:56 -0400 (Mon, 14 Apr 2008)
New Revision: 6412
Added:
container/jboss42/branches/jbossws-jboss-4.2.1/ant/
container/jboss42/branches/jbossws-jboss-4.2.1/ant/build-install.xml
container/jboss42/branches/jbossws-jboss-4.2.1/pom.xml
container/jboss42/branches/jbossws-jboss-4.2.1/src/main/assembly/
container/jboss42/branches/jbossws-jboss-4.2.1/src/main/assembly/src.xml
Removed:
container/jboss42/branches/jbossws-jboss-4.2.1/ant-import/
container/jboss42/branches/jbossws-jboss-4.2.1/ant.properties.example
container/jboss42/branches/jbossws-jboss-4.2.1/ant/build-release.xml
container/jboss42/branches/jbossws-jboss-4.2.1/ant/build-setup.xml
container/jboss42/branches/jbossws-jboss-4.2.1/ant/build-thirdparty.xml
container/jboss42/branches/jbossws-jboss-4.2.1/build.xml
container/jboss42/branches/jbossws-jboss-4.2.1/src/main/etc/default.mf
container/jboss42/branches/jbossws-jboss-4.2.1/version.properties
Modified:
container/jboss42/branches/jbossws-jboss-4.2.1/
container/jboss42/branches/jbossws-jboss-4.2.1/.classpath
Log:
,vn install, ok
Property changes on: container/jboss42/branches/jbossws-jboss-4.2.1
___________________________________________________________________
Name: svn:ignore
- ant.properties
output*
thirdparty
version.properties.md5
+ target
Modified: container/jboss42/branches/jbossws-jboss-4.2.1/.classpath
===================================================================
--- container/jboss42/branches/jbossws-jboss-4.2.1/.classpath 2008-04-14 11:02:30 UTC (rev 6411)
+++ container/jboss42/branches/jbossws-jboss-4.2.1/.classpath 2008-04-14 11:54:56 UTC (rev 6412)
@@ -12,5 +12,5 @@
<classpathentry kind="lib" path="thirdparty/jsr181-api.jar"/>
<classpathentry kind="lib" path="thirdparty/saaj-api.jar"/>
<classpathentry kind="lib" path="thirdparty/dom4j.jar"/>
- <classpathentry kind="output" path="output/eclipse"/>
+ <classpathentry kind="output" path="target/eclipse"/>
</classpath>
Copied: container/jboss42/branches/jbossws-jboss-4.2.1/ant (from rev 6410, container/jboss42/branches/jbossws-jboss-4.2.1/ant-import)
Added: container/jboss42/branches/jbossws-jboss-4.2.1/ant/build-install.xml
===================================================================
--- container/jboss42/branches/jbossws-jboss-4.2.1/ant/build-install.xml (rev 0)
+++ container/jboss42/branches/jbossws-jboss-4.2.1/ant/build-install.xml 2008-04-14 11:54:56 UTC (rev 6412)
@@ -0,0 +1,55 @@
+<?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>
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <property name="project.dir" value="${basedir}"/>
+ <property name="project.etc.dir" value="${project.dir}/src/main/etc"/>
+ <property name="project.target.dir" value="${project.dir}/target"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="init">
+ <property name="repository.id" value="${version.id}"/>
+ <echo message="version.id=${version.id}"/>
+ <echo message="repository.id=${repository.id}"/>
+ <echo message="jboss.local.repository=${jboss.local.repository}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Installation -->
+ <!-- ================================================================== -->
+
+ <!-- Install to jboss.local.repository -->
+ <target name="install" depends="init" description="Install to jboss.local.repository">
+
+ <!-- Check if the target jar is available -->
+ <available property="jbossws.jboss.jar.available" file="${project.target.dir}/jbossws-jboss-${version.id}.jar"/>
+ <fail message="Cannot find jbossws-jboss-${version.id}.jar. Did you run 'mvn package'?" unless="jbossws.jboss.jar.available"/>
+
+ <!-- jboss/jbossws-project -->
+ <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss/jbossws-jboss42/${repository.id}"/>
+ <mkdir dir="${jboss.repository.dir}/lib"/>
+ <copy file="${project.target.dir}/jbossws-jboss-${version.id}.jar" tofile="${jboss.repository.dir}/lib/jbossws-jboss42.jar" overwrite="true"/>
+ <copy file="${project.target.dir}/jbossws-jboss-${version.id}-sources.jar" tofile="${jboss.repository.dir}/lib/jbossws-jboss42-src.jar" overwrite="true"/>
+ <copy file="${project.target.dir}/jbossws-jboss-${version.id}-resources.zip" tofile="${jboss.repository.dir}/lib/jbossws-jboss42-resources.zip" overwrite="true"/>
+ <copy file="${project.target.dir}/etc/component-info.xml" tofile="${jboss.repository.dir}/component-info.xml" overwrite="true"/>
+ </target>
+
+</project>
Property changes on: container/jboss42/branches/jbossws-jboss-4.2.1/ant/build-install.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: container/jboss42/branches/jbossws-jboss-4.2.1/ant/build-release.xml
===================================================================
--- container/jboss42/branches/jbossws-jboss-4.2.1/ant-import/build-release.xml 2008-04-14 10:15:59 UTC (rev 6410)
+++ container/jboss42/branches/jbossws-jboss-4.2.1/ant/build-release.xml 2008-04-14 11:54:56 UTC (rev 6412)
@@ -1,38 +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>
-
- <!-- Release to jboss.local.repository -->
- <target name="release" depends="jars"
- description="Release to jboss.local.repository">
-
- <!-- jboss/jbossws-jboss42 -->
- <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/>
- <mkdir dir="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/lib"/>
- <copy todir="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/lib" overwrite="true">
- <fileset dir="${jbws42.dir}/output/lib">
- <include name="jbossws-jboss42.jar"/>
- <include name="jbossws-jboss42-src.zip"/>
- <include name="jbossws-jboss42-resources.zip"/>
- </fileset>
- </copy>
- <copy tofile="${jboss.repository.dir}/jbossws-jboss42/${repository.id}/component-info.xml" file="${jbws42.etc.dir}/component-info.xml" filtering="true" overwrite="true">
- <filterset>
- <filtersfile file="${jbws42.dir}/version.properties"/>
- </filterset>
- </copy>
-
- </target>
-
-</project>
Deleted: container/jboss42/branches/jbossws-jboss-4.2.1/ant/build-setup.xml
===================================================================
--- container/jboss42/branches/jbossws-jboss-4.2.1/ant-import/build-setup.xml 2008-04-14 10:15:59 UTC (rev 6410)
+++ container/jboss42/branches/jbossws-jboss-4.2.1/ant/build-setup.xml 2008-04-14 11:54:56 UTC (rev 6412)
@@ -1,54 +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: build-setup.xml 3576 2007-06-14 09:23:52Z thomas.diesler(a)jboss.com $ -->
-
-<project>
-
- <!-- ================================================================== -->
- <!-- Setup -->
- <!-- ================================================================== -->
-
- <property name="jbws42.dir" value="${basedir}"/>
-
- <!-- Check if ant.properties is available -->
- <available property="ant.properties.available" file="${jbws42.dir}/ant.properties"/>
- <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/>
-
- <property file="${jbws42.dir}/ant.properties"/>
- <property file="${jbws42.dir}/version.properties"/>
-
- <property name="jboss42.lib" value="${jboss42.home}/lib"/>
- <property name="jboss42.client" value="${jboss42.home}/client"/>
- <property name="jboss42.server" value="${jboss42.home}/server/${jboss.server.instance}"/>
- <property name="jboss42.server.lib" value="${jboss42.server}/lib"/>
- <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/>
-
- <property name="jboss42.available.file" value="${jboss42.client}/jboss-ejb3-client.jar"/>
- <available property="jboss42.available" file="${jboss42.available.file}"/>
-
- <!-- JDK Detection -->
- <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/>
- <available classname="java.io.Console" property="HAVE_JDK_1.6"/>
-
- <fail message="JDK1.5 or above is required" unless="HAVE_JDK_1.5"/>
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <target name="prepare">
- <tstamp>
- <format property="build.id" pattern="yyyyMMddHHmm"/>
- </tstamp>
- </target>
-
-</project>
\ No newline at end of file
Deleted: container/jboss42/branches/jbossws-jboss-4.2.1/ant/build-thirdparty.xml
===================================================================
--- container/jboss42/branches/jbossws-jboss-4.2.1/ant-import/build-thirdparty.xml 2008-04-14 10:15:59 UTC (rev 6410)
+++ container/jboss42/branches/jbossws-jboss-4.2.1/ant/build-thirdparty.xml 2008-04-14 11:54:56 UTC (rev 6412)
@@ -1,80 +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>
-
- <!-- ========= -->
- <!-- Libraries -->
- <!-- ========= -->
-
- <target name="thirdparty-init" depends="prepare">
-
- <property name="thirdparty.dir" value="${jbws42.dir}/thirdparty"/>
- <checksum file="${jbws42.dir}/version.properties" fileext=".md5" verifyproperty="checksum.ok"/>
- <condition property="force.thirdparty">
- <or>
- <not>
- <available file="${thirdparty.dir}" type="dir"/>
- </not>
- <isfalse value="${checksum.ok}"/>
- <isset property="force.thirdparty.get"/>
- </or>
- </condition>
- <echo message="checksum.ok = ${checksum.ok}"/>
- </target>
-
- <target name="thirdparty-get" depends="thirdparty-init" if="force.thirdparty" description="Gets the thirdparty libraries">
-
- <mkdir dir="${thirdparty.dir}"/>
- <get src="${jboss.repository}/jboss/jbossws-common/${jbossws-common}/lib/jbossws-common.jar" dest="${thirdparty.dir}/jbossws-common.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws-framework/${jbossws-framework}/lib/jbossws-framework.jar" dest="${thirdparty.dir}/jbossws-framework.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/jboss/jbossws-spi/${jbossws-spi}/lib/jbossws-spi.jar" dest="${thirdparty.dir}/jbossws-spi.jar" usetimestamp="true" verbose="true"/>
-
- <get src="${jboss.repository}/dom4j/${dom4j}/lib/dom4j.jar" dest="${thirdparty.dir}/dom4j.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jaxws-api.jar" dest="${thirdparty.dir}/jaxws-api.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/jsr181-api.jar" dest="${thirdparty.dir}/jsr181-api.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/sun-jaxws/${sun-jaxws}/lib/saaj-api.jar" dest="${thirdparty.dir}/saaj-api.jar" usetimestamp="true" verbose="true"/>
- <get src="${jboss.repository}/sun-jaxrpc/${sun-jaxrpc}/lib/jaxrpc-api.jar" dest="${thirdparty.dir}/jaxrpc-api.jar" usetimestamp="true" verbose="true"/>
- <checksum file="${jbws42.dir}/version.properties" fileext=".md5"/>
- </target>
-
- <target name="thirdparty-classpath" depends="thirdparty-get">
-
- <!-- The compile classpath for jboss42 integration -->
- <path id="jbws42.integration.classpath">
- <pathelement location="${thirdparty.dir}/jbossws-common.jar"/>
- <pathelement location="${thirdparty.dir}/jbossws-spi.jar"/>
- <pathelement location="${thirdparty.dir}/jaxws-api.jar"/>
- <pathelement location="${thirdparty.dir}/jaxrpc-api.jar"/>
- <pathelement location="${thirdparty.dir}/jsr181-api.jar"/>
- <pathelement location="${thirdparty.dir}/saaj-api.jar"/>
- <pathelement location="${jboss42.lib}/jboss-common.jar"/>
- <pathelement location="${jboss42.lib}/jboss-jmx.jar"/>
- <pathelement location="${jboss42.lib}/jboss-system.jar"/>
- <pathelement location="${jboss42.lib}/jboss-xml-binding.jar"/>
- <pathelement location="${jboss42.server.lib}/dom4j.jar"/>
- <pathelement location="${jboss42.server.lib}/jboss.jar"/>
- <pathelement location="${jboss42.server.lib}/jboss-j2ee.jar"/>
- <pathelement location="${jboss42.server.lib}/jboss-ejb3x.jar"/>
- <pathelement location="${jboss42.server.lib}/jbosssx.jar"/>
- <pathelement location="${jboss42.server.lib}/servlet-api.jar"/>
- <pathelement location="${jboss42.server.deploy}/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
- <pathelement location="${jboss42.server.deploy}/jboss-bean.deployer/jboss-dependency.jar"/>
- <pathelement location="${jboss42.server.deploy}/jboss-bean.deployer/jboss-microcontainer.jar"/>
- <pathelement location="${jboss42.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
- <pathelement location="${jboss42.server.deploy}/ejb3.deployer/jboss-ejb3.jar"/>
- </path>
-
- </target>
-
-</project>
Deleted: container/jboss42/branches/jbossws-jboss-4.2.1/ant.properties.example
===================================================================
--- container/jboss42/branches/jbossws-jboss-4.2.1/ant.properties.example 2008-04-14 11:02:30 UTC (rev 6411)
+++ container/jboss42/branches/jbossws-jboss-4.2.1/ant.properties.example 2008-04-14 11:54:56 UTC (rev 6412)
@@ -1,26 +0,0 @@
-#
-# A sample ant properties file
-#
-# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $
-
-# JBoss Home
-#jboss42.home=/home/tdiesler/svn/jbossas/tags/JBoss_4_2_1_GA/build/output/jboss-4.2.1.GA
-
-# The JBoss settings
-jboss.server.instance=default
-
-# JBoss Repository
-#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository
-jboss.repository=http://repository.jboss.org
-
-# JBossWS Release
-jboss.local.repository=/home/tdiesler/svn/jboss.local.repository
-
-# Force thirdparty HTTP get
-#force.thirdparty.get=true
-
-# Java Compiler options
-javac.debug=yes
-javac.deprecation=no
-javac.fail.onerror=yes
-javac.verbose=no
Deleted: container/jboss42/branches/jbossws-jboss-4.2.1/build.xml
===================================================================
--- container/jboss42/branches/jbossws-jboss-4.2.1/build.xml 2008-04-14 11:02:30 UTC (rev 6411)
+++ container/jboss42/branches/jbossws-jboss-4.2.1/build.xml 2008-04-14 11:54:56 UTC (rev 6412)
@@ -1,158 +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 default="main" basedir="." name="JBossWS-JBoss42">
-
- <import file="${basedir}/ant-import/build-setup.xml"/>
- <import file="${basedir}/ant-import/build-release.xml"/>
- <import file="${basedir}/ant-import/build-thirdparty.xml"/>
-
- <!-- ================================================================== -->
- <!-- Setup -->
- <!-- ================================================================== -->
-
- <property name="jbws42.dir" value="${int.jboss42.dir}"/>
- <property name="jbws42.src.dir" value="${jbws42.dir}/src/main"/>
- <property name="jbws42.etc.dir" value="${jbws42.src.dir}/etc"/>
- <property name="jbws42.java.dir" value="${jbws42.src.dir}/java"/>
- <property name="jbws42.resources.dir" value="${jbws42.src.dir}/resources"/>
- <property name="jbws42.output.dir" value="${jbws42.dir}/output"/>
- <property name="jbws42.output.apidocs.dir" value="${jbws42.output.dir}/apidocs"/>
- <property name="jbws42.output.classes.dir" value="${jbws42.output.dir}/classes"/>
- <property name="jbws42.output.etc.dir" value="${jbws42.output.dir}/etc"/>
- <property name="jbws42.output.lib.dir" value="${jbws42.output.dir}/lib"/>
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <target name="init" depends="prepare,thirdparty-get">
- <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Compile -->
- <!-- ================================================================== -->
-
- <!--
- | Compile everything.
- |
- | This target should depend on other compile-* targets for each
- | different type of compile that needs to be performed, short of
- | documentation compiles.
- -->
-
- <target name="compile" depends="init,compile-classes,compile-etc" description="Compile all source files."/>
-
- <!-- Compile integration java sources -->
- <target name="compile-classes" depends="init">
- <mkdir dir="${jbws42.output.classes.dir}"/>
- <javac srcdir="${jbws42.java.dir}" sourcepath="" destdir="${jbws42.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
- deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}">
- <include name="org/jboss/ws/integration/**"/>
- <include name="org/jboss/wsf/container/jboss42/**"/>
- <exclude name="org/jboss/wsf/container/jboss42/jms/**"/>
- <classpath refid="jbws42.integration.classpath"/>
- </javac>
- </target>
-
- <!-- Compile etc files (manifests and such) -->
- <target name="compile-etc" depends="init">
- <mkdir dir="${jbws42.output.etc.dir}"/>
- <copy todir="${jbws42.output.etc.dir}" filtering="yes" overwrite="true">
- <fileset dir="${jbws42.etc.dir}">
- <include name="default.mf"/>
- </fileset>
- <filterset>
- <filter token="java.vm.version" value="${java.vm.version}"/>
- <filter token="java.vm.vendor" value="${java.vm.vendor}"/>
- <filter token="build.id" value="${build.id}"/>
- <filter token="implementation.version" value="jbossws-${version.id}"/>
- <filtersfile file="${jbws42.dir}/version.properties"/>
- </filterset>
- </copy>
- </target>
-
- <!-- ================================================================== -->
- <!-- Archives -->
- <!-- ================================================================== -->
-
- <!--
- | Build all jar files.
- -->
- <target name="jars" depends="compile,module-jars" description="Builds all jar files.">
- </target>
-
- <!--
- | Build all jar files.
- -->
- <target name="module-jars" depends="init">
-
- <!-- Build jbossws-jboss42.jar -->
- <mkdir dir="${jbws42.output.lib.dir}"/>
- <jar jarfile="${jbws42.output.lib.dir}/jbossws-jboss42.jar" manifest="${jbws42.output.etc.dir}/default.mf">
- <fileset dir="${jbws42.output.classes.dir}">
- <include name="org/jboss/ws/integration/**"/>
- <include name="org/jboss/wsf/container/jboss42/**"/>
- </fileset>
- <metainf dir="${jbws42.resources.dir}/jbossws-jboss42.jar/META-INF"/>
- </jar>
-
- <!-- Build jbossws-jboss42-resources.zip -->
- <zip zipfile="${jbws42.output.lib.dir}/jbossws-jboss42-resources.zip" >
- <fileset dir="${jbws42.resources.dir}"/>
- </zip>
-
- <!-- Build jbossws-jboss42-src.zip -->
- <zip zipfile="${jbws42.output.lib.dir}/jbossws-jboss42-src.zip" >
- <fileset dir="${jbws42.java.dir}"/>
- </zip>
-
- </target>
-
- <!-- Generate the JavaDoc -->
- <target name="javadoc" depends="init" description="Generate the Javadoc">
-
- <mkdir dir="${jbws42.output.apidocs.dir}"/>
- <javadoc destdir="${jbws42.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API">
- <classpath>
- <path refid="jbws42.integration.classpath"/>
- </classpath>
- <packageset dir="${jbws42.java.dir}" defaultexcludes="yes">
- <include name="org/jboss/wsf/**"/>
- </packageset>
- <doctitle><![CDATA[<h1>JBoss Web Service Framework - Container integration AS 4.0</h1>]]></doctitle>
- <tag name="todo" scope="all" description="To do:"/>
- </javadoc>
- </target>
-
- <!-- ================================================================== -->
- <!-- Miscellaneous -->
- <!-- ================================================================== -->
-
- <target name="clean" depends="prepare" description="Cleans up most generated files.">
- <delete dir="${jbws42.output.dir}"/>
- </target>
-
- <target name="clobber" depends="clean" description="Cleans up all generated files.">
- <delete dir="${jbws42.dir}/thirdparty"/>
- </target>
-
- <target name="main" description="Executes the default target (most)." depends="most"/>
-
- <target name="most" description="Builds almost everything." depends="jars"/>
-
- <target name="all" description="Create a distribution zip file" depends="main">
- </target>
-
-</project>
Added: container/jboss42/branches/jbossws-jboss-4.2.1/pom.xml
===================================================================
--- container/jboss42/branches/jbossws-jboss-4.2.1/pom.xml (rev 0)
+++ container/jboss42/branches/jbossws-jboss-4.2.1/pom.xml 2008-04-14 11:54:56 UTC (rev 6412)
@@ -0,0 +1,193 @@
+<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>
+
+ <name>JBoss Web Services - Container JBoss-4.2.1</name>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-jboss</artifactId>
+
+ <version>4.2.1.SP1</version>
+
+ <organization>
+ <name>JBoss, a division of Red Hat</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+ <url>http://maven.apache.org</url>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>3</version>
+ </parent>
+
+ <!-- Properties -->
+ <properties>
+ <!-- http://jira.codehaus.org/browse/MANTRUN-88 -->
+ <jboss.local.repository>/home/tdiesler/svn/jboss.local.repository</jboss.local.repository>
+ </properties>
+
+ <!-- Dependencies -->
+ <dependencies>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.jws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ <version>1.0-MR1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ <version>1.0.1B</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml</groupId>
+ <artifactId>jaxrpc-api</artifactId>
+ <version>1.1</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>saaj-api</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss.jboss-aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ <version>1.5.0.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-system</artifactId>
+ <version>4.2.1.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss</artifactId>
+ <version>4.2.1.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-annotations-ejb3</artifactId>
+ <version>4.2.1.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-ejb3</artifactId>
+ <version>4.2.1.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-ejb3x</artifactId>
+ <version>4.2.1.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-jmx</artifactId>
+ <version>4.2.1.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jbosssx</artifactId>
+ <version>4.2.1.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <version>2.0.0.Beta4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-common</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-spi</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
+ <!-- Plugins -->
+ <build>
+ <resources>
+ <resource>
+ <targetPath>../etc</targetPath>
+ <directory>src/main/etc</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>install</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <tasks if="jboss.local.repository">
+ <!-- http://jira.codehaus.org/browse/MANTRUN-87 -->
+ <property name="version.id" value="${project.version}"/>
+ <property name="jboss.local.repository" value="${jboss.local.repository}"/>
+ <echo message="Install to jboss.local.repository=${jboss.local.repository}"/>
+ <ant antfile="ant/build-install.xml" target="install"/>
+ </tasks>
+ <!-- http://jira.codehaus.org/browse/MANTRUN-86
+ <tasks unless="jboss.local.repository">
+ <echo message="Cannot install to jboss.local.repository=${jboss.local.repository}"/>
+ </tasks>
+ -->
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ <showDeprecation>false</showDeprecation>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Property changes on: container/jboss42/branches/jbossws-jboss-4.2.1/pom.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Added: container/jboss42/branches/jbossws-jboss-4.2.1/src/main/assembly/src.xml
===================================================================
--- container/jboss42/branches/jbossws-jboss-4.2.1/src/main/assembly/src.xml (rev 0)
+++ container/jboss42/branches/jbossws-jboss-4.2.1/src/main/assembly/src.xml 2008-04-14 11:54:56 UTC (rev 6412)
@@ -0,0 +1,19 @@
+<assembly 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/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+ <id>resources</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>src/main/resources</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>jbossws-jboss42.jar/**</include>
+ <include>jbossws-jboss42.sar/**</include>
+ <include>jbossws-jboss42-config.xml</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
Property changes on: container/jboss42/branches/jbossws-jboss-4.2.1/src/main/assembly/src.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Deleted: container/jboss42/branches/jbossws-jboss-4.2.1/src/main/etc/default.mf
===================================================================
--- container/jboss42/branches/jbossws-jboss-4.2.1/src/main/etc/default.mf 2008-04-14 11:02:30 UTC (rev 6411)
+++ container/jboss42/branches/jbossws-jboss-4.2.1/src/main/etc/default.mf 2008-04-14 11:54:56 UTC (rev 6412)
@@ -1,10 +0,0 @@
-Manifest-Version: 1.2
-Created-By: @java.vm.version@ (@java.vm.vendor@)
-Specification-Title: @specification.title@
-Specification-Version: @specification.version@
-Specification-Vendor: @specification.vendor@
-Implementation-Title: @implementation.title@
-Implementation-URL: @implementation.url@
-Implementation-Version: @implementation.version@ (build=(a)build.id@)
-Implementation-Vendor: @implementation.vendor@
-Implementation-Vendor-Id: @implementation.vendor.id@
Deleted: container/jboss42/branches/jbossws-jboss-4.2.1/version.properties
===================================================================
--- container/jboss42/branches/jbossws-jboss-4.2.1/version.properties 2008-04-14 11:02:30 UTC (rev 6411)
+++ container/jboss42/branches/jbossws-jboss-4.2.1/version.properties 2008-04-14 11:54:56 UTC (rev 6412)
@@ -1,23 +0,0 @@
-
-# $Id: version.properties 3956 2007-07-19 18:03:54Z thomas.diesler(a)jboss.com $
-
-specification.title=JBossWS
-specification.vendor=JBoss (http://www.jboss.org)
-specification.version=jbossws-2.0
-
-version.id=4.2.1.GA
-repository.id=4.2.1.GA
-
-implementation.title=JBoss Web Services - Integration JBoss42
-implementation.url=http://www.jboss.org/products/jbossws
-implementation.vendor=JBoss Inc.
-implementation.vendor.id=http://www.jboss.org
-
-# Thirdparty library versions
-jbossws-common=1.0.0.GA
-jbossws-spi=1.0.0.GA
-jbossws-framework=2.0.1.GA
-
-dom4j=1.6.1
-sun-jaxrpc=1.1
-sun-jaxws=2.1.1
16 years, 9 months
JBossWS SVN: r6411 - in stack/native/trunk/src/main/java/org/jboss/ws: metadata/builder/jaxws and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: richard.opalka(a)jboss.com
Date: 2008-04-14 07:02:30 -0400 (Mon, 14 Apr 2008)
New Revision: 6411
Modified:
stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/jaxws/AbstractEventSourceEndpoint.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/jaxws/AbstractSubscriptionManagerEndpoint.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/jaxws/EventSourceEndpoint.java
stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/jaxws/SubscriptionManagerEndpoint.java
stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
Log:
[JBWS-2149] always use javax.xml.ws.Action instead of javax.xml.ws.addressing.Action
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/jaxws/AbstractEventSourceEndpoint.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/jaxws/AbstractEventSourceEndpoint.java 2008-04-14 10:15:59 UTC (rev 6410)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/jaxws/AbstractEventSourceEndpoint.java 2008-04-14 11:02:30 UTC (rev 6411)
@@ -29,7 +29,7 @@
import javax.jws.WebResult;
import javax.jws.WebService;
import javax.xml.rpc.soap.SOAPFaultException;
-import javax.xml.ws.addressing.Action;
+import javax.xml.ws.Action;
import javax.xml.ws.addressing.AddressingProperties;
import javax.xml.ws.addressing.AttributedURI;
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/jaxws/AbstractSubscriptionManagerEndpoint.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/jaxws/AbstractSubscriptionManagerEndpoint.java 2008-04-14 10:15:59 UTC (rev 6410)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/jaxws/AbstractSubscriptionManagerEndpoint.java 2008-04-14 11:02:30 UTC (rev 6411)
@@ -31,7 +31,7 @@
import javax.jws.WebService;
import javax.xml.namespace.QName;
import javax.xml.rpc.soap.SOAPFaultException;
-import javax.xml.ws.addressing.Action;
+import javax.xml.ws.Action;
import javax.xml.ws.addressing.AddressingProperties;
import javax.xml.ws.addressing.JAXWSAConstants;
import javax.xml.ws.addressing.ReferenceParameters;
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/jaxws/EventSourceEndpoint.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/jaxws/EventSourceEndpoint.java 2008-04-14 10:15:59 UTC (rev 6410)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/jaxws/EventSourceEndpoint.java 2008-04-14 11:02:30 UTC (rev 6411)
@@ -27,7 +27,7 @@
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
import javax.jws.soap.SOAPBinding.ParameterStyle;
-import javax.xml.ws.addressing.Action;
+import javax.xml.ws.Action;
/**
Modified: stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/jaxws/SubscriptionManagerEndpoint.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/jaxws/SubscriptionManagerEndpoint.java 2008-04-14 10:15:59 UTC (rev 6410)
+++ stack/native/trunk/src/main/java/org/jboss/ws/extensions/eventing/jaxws/SubscriptionManagerEndpoint.java 2008-04-14 11:02:30 UTC (rev 6411)
@@ -27,7 +27,7 @@
import javax.jws.WebService;
import javax.jws.soap.SOAPBinding;
import javax.jws.soap.SOAPBinding.ParameterStyle;
-import javax.xml.ws.addressing.Action;
+import javax.xml.ws.Action;
/**
* This class was generated by the JAXWS SI.
Modified: stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java
===================================================================
--- stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2008-04-14 10:15:59 UTC (rev 6410)
+++ stack/native/trunk/src/main/java/org/jboss/ws/metadata/builder/jaxws/JAXWSMetaDataBuilder.java 2008-04-14 11:02:30 UTC (rev 6411)
@@ -52,7 +52,7 @@
import javax.xml.ws.RequestWrapper;
import javax.xml.ws.ResponseWrapper;
import javax.xml.ws.WebFault;
-import javax.xml.ws.addressing.Action;
+import javax.xml.ws.Action;
import javax.xml.ws.addressing.AddressingProperties;
import org.jboss.logging.Logger;
16 years, 9 months
JBossWS SVN: r6410 - container/jboss42/branches.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-14 06:15:59 -0400 (Mon, 14 Apr 2008)
New Revision: 6410
Added:
container/jboss42/branches/jbossws-jboss-4.2.1/
Log:
Create maven branch for 4.2.1
Copied: container/jboss42/branches/jbossws-jboss-4.2.1 (from rev 6409, container/jboss42/tags/jbossws-jboss-4.2.1.GA)
16 years, 9 months
JBossWS SVN: r6409 - in framework/trunk/framework: ant and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-14 05:11:41 -0400 (Mon, 14 Apr 2008)
New Revision: 6409
Modified:
framework/trunk/framework/ant/build-install.xml
framework/trunk/framework/pom.xml
Log:
Create antrun jira issues
Modified: framework/trunk/framework/ant/build-install.xml
===================================================================
--- framework/trunk/framework/ant/build-install.xml 2008-04-14 08:04:30 UTC (rev 6408)
+++ framework/trunk/framework/ant/build-install.xml 2008-04-14 09:11:41 UTC (rev 6409)
@@ -26,6 +26,7 @@
<!-- ================================================================== -->
<target name="init">
+ <property name="repository.id" value="${version.id}"/>
<echo message="version.id=${version.id}"/>
<echo message="repository.id=${repository.id}"/>
<echo message="jboss.local.repository=${jboss.local.repository}"/>
Modified: framework/trunk/framework/pom.xml
===================================================================
--- framework/trunk/framework/pom.xml 2008-04-14 08:04:30 UTC (rev 6408)
+++ framework/trunk/framework/pom.xml 2008-04-14 09:11:41 UTC (rev 6409)
@@ -16,6 +16,7 @@
<properties>
<jbossws-common>3.0.0-SNAPSHOT</jbossws-common>
<jbossws-spi>3.0.0-SNAPSHOT</jbossws-spi>
+ <!-- http://jira.codehaus.org/browse/MANTRUN-88 -->
<jboss.local.repository>/home/tdiesler/svn/jboss.local.repository</jboss.local.repository>
</properties>
@@ -72,12 +73,18 @@
<goal>run</goal>
</goals>
<configuration>
- <tasks description="Install artifacts to the jboss local repository">
+ <tasks if="jboss.local.repository">
+ <!-- http://jira.codehaus.org/browse/MANTRUN-87 -->
<property name="version.id" value="${project.version}"/>
- <property name="repository.id" value="${project.version}"/>
<property name="jboss.local.repository" value="${jboss.local.repository}"/>
+ <echo message="Install to jboss.local.repository=${jboss.local.repository}"/>
<ant antfile="ant/build-install.xml" target="install"/>
</tasks>
+ <!-- http://jira.codehaus.org/browse/MANTRUN-86
+ <tasks unless="jboss.local.repository">
+ <echo message="Cannot install to jboss.local.repository=${jboss.local.repository}"/>
+ </tasks>
+ -->
</configuration>
</execution>
</executions>
16 years, 9 months