JBossWS SVN: r6382 - framework/trunk/ant-import.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-12 08:20:55 -0400 (Sat, 12 Apr 2008)
New Revision: 6382
Modified:
framework/trunk/ant-import/build-hudson.xml
Log:
Remove dependency on output
Modified: framework/trunk/ant-import/build-hudson.xml
===================================================================
--- framework/trunk/ant-import/build-hudson.xml 2008-04-12 12:17:56 UTC (rev 6381)
+++ framework/trunk/ant-import/build-hudson.xml 2008-04-12 12:20:55 UTC (rev 6382)
@@ -31,8 +31,7 @@
<property name="hudson.password.${hudson.password}" value="true"/>
<fail message="Cannot use default hudson password: ${hudson.password}" if="hudson.password.changeme"/>
- <property name="thirdparty.dir" value="${framework.dir}/thirdparty"/>
- <mkdir dir="${framework.dir}/output"/>
+ <property name="thirdparty.dir" value="${framework.target.dir}/thirdparty"/>
<mkdir dir="${thirdparty.dir}"/>
</target>
@@ -85,11 +84,11 @@
description="Setup the Hudson QA environment">
<!-- get the svn url -->
- <exec dir="${framework.dir}" executable="svn" failonerror="true" output="${framework.dir}/output/svn-info.xml">
+ <exec dir="${framework.dir}" executable="svn" failonerror="true" output="${framework.target.dir}/svn-info.xml">
<arg line="info"/>
<arg line="--xml"/>
</exec>
- <xmlproperty file="${framework.dir}/output/svn-info.xml"/>
+ <xmlproperty file="${framework.target.dir}/svn-info.xml"/>
<property name="hudson.framework.url" value="${info.entry.url}"/>
<!-- Configure Hudson -->
@@ -149,8 +148,7 @@
</exec>
-->
- <mkdir dir="${framework.dir}/output"/>
- <exec executable="${hudson.tomcat}/bin/catalina.sh" failonerror="true" output="${framework.dir}/output/hudson.log">
+ <exec executable="${hudson.tomcat}/bin/catalina.sh" failonerror="true" output="${framework.target.dir}/hudson.log">
<env key="CATALINA_OPTS" value="-Xmx512m -Djava.awt.headless=true"/>
<arg line="start"/>
</exec>
16 years, 9 months
JBossWS SVN: r6381 - in framework/trunk: ant-import and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-12 08:17:56 -0400 (Sat, 12 Apr 2008)
New Revision: 6381
Added:
framework/trunk/ant-import/
framework/trunk/ant-import/build-hudson.xml
Removed:
framework/trunk/version.properties
Modified:
framework/trunk/.classpath
framework/trunk/ant.properties.example
framework/trunk/build.xml
Log:
Resurect hudson setup
Modified: framework/trunk/.classpath
===================================================================
--- framework/trunk/.classpath 2008-04-12 12:13:33 UTC (rev 6380)
+++ framework/trunk/.classpath 2008-04-12 12:17:56 UTC (rev 6381)
@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>
<classpathentry kind="var" path="M2_REPO/javax/xml/soap/saaj-api/1.3/saaj-api-1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/xml/jaxrpc-api/1.1/jaxrpc-api-1.1.jar"/>
+ <classpathentry combineaccessrules="false" exported="true" kind="src" path="/common"/>
+ <classpathentry combineaccessrules="false" exported="true" kind="src" path="/spi"/>
<classpathentry kind="output" path="target/eclipse"/>
</classpath>
Added: framework/trunk/ant-import/build-hudson.xml
===================================================================
--- framework/trunk/ant-import/build-hudson.xml (rev 0)
+++ framework/trunk/ant-import/build-hudson.xml 2008-04-12 12:17:56 UTC (rev 6381)
@@ -0,0 +1,172 @@
+<?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>
+
+ <target name="init-hudson" depends="init">
+
+ <property name="hudson.tomcat" value="${hudson.root}/jbossws-hudson-${version.id}/apache-tomcat"/>
+ <property name="hudson.home" value="${hudson.root}/jbossws-hudson-${version.id}/hudson-home"/>
+ <echo/>
+ <echo message="hudson.root = ${hudson.root}"/>
+ <echo message="hudson.home = ${hudson.home}"/>
+ <echo/>
+
+ <available file="${hudson.root}" property="hudson.root.available"/>
+ <available file="${hudson.tomcat}" property="hudson.tomcat.available"/>
+ <fail message="Hudson root not available" unless="hudson.root.available"/>
+
+ <property name="hudson.username.${hudson.username}" value="true"/>
+ <fail message="Cannot use default hudson username: ${hudson.username}" if="hudson.username.changeme"/>
+ <property name="hudson.password.${hudson.password}" value="true"/>
+ <fail message="Cannot use default hudson password: ${hudson.password}" if="hudson.password.changeme"/>
+
+ <property name="thirdparty.dir" value="${framework.dir}/thirdparty"/>
+ <mkdir dir="${framework.dir}/output"/>
+ <mkdir dir="${thirdparty.dir}"/>
+
+ </target>
+
+ <!--
+ Setup the Hudson Tomcat instance
+ -->
+ <target name="hudson-tomcat-setup" depends="init-hudson" unless="hudson.tomcat.available">
+
+ <get src="${jboss.repository}/apache-tomcat/${apache-tomcat}/lib/apache-tomcat.zip" dest="${thirdparty.dir}/apache-tomcat.zip" usetimestamp="true" verbose="true"/>
+ <get src="${jboss.repository}/sun-hudson/${sun-hudson}/lib/hudson.war" dest="${thirdparty.dir}/hudson.war" usetimestamp="true" verbose="true"/>
+
+ <mkdir dir="${hudson.root}"/>
+ <unzip src="${thirdparty.dir}/apache-tomcat.zip" dest="${hudson.root}"/>
+ <move file="${hudson.root}/apache-tomcat-${apache-tomcat}" tofile="${hudson.tomcat}"/>
+ <chmod perm="+x">
+ <fileset dir="${hudson.tomcat}/bin">
+ <include name="*.sh"/>
+ </fileset>
+ </chmod>
+
+ <!-- Configure Tomcat -->
+ <copy todir="${hudson.tomcat}/webapps" file="${thirdparty.dir}/hudson.war"/>
+ <copy todir="${hudson.tomcat}" overwrite="true">
+ <fileset dir="${framework.dir}/hudson/apache-tomcat">
+ <include name="**/*.xml"/>
+ </fileset>
+ <filterset>
+ <filtersfile file="${framework.dir}/ant.properties"/>
+ <filter token="hudson.home" value="${hudson.home}"/>
+ </filterset>
+ </copy>
+ </target>
+
+ <!--
+ Update the Hudson version
+ -->
+ <target name="hudson-update" depends="init-hudson">
+
+ <get src="${jboss.repository}/sun-hudson/${sun-hudson}/lib/hudson.war" dest="${thirdparty.dir}/hudson.war" usetimestamp="false" verbose="true"/>
+
+ <delete dir="${hudson.tomcat}/webapps/hudson"/>
+ <copy todir="${hudson.tomcat}/webapps" file="${thirdparty.dir}/hudson.war"/>
+ </target>
+
+ <!--
+ Setup the Hudson QA environment
+ -->
+ <target name="hudson-setup" depends="init-hudson,hudson-tomcat-setup"
+ description="Setup the Hudson QA environment">
+
+ <!-- get the svn url -->
+ <exec dir="${framework.dir}" executable="svn" failonerror="true" output="${framework.dir}/output/svn-info.xml">
+ <arg line="info"/>
+ <arg line="--xml"/>
+ </exec>
+ <xmlproperty file="${framework.dir}/output/svn-info.xml"/>
+ <property name="hudson.framework.url" value="${info.entry.url}"/>
+
+ <!-- Configure Hudson -->
+ <copy todir="${hudson.home}" overwrite="true">
+ <fileset dir="${framework.dir}/hudson/hudson-home">
+ <include name="jobs/*/config.xml"/>
+ <include name="users/*/config.xml"/>
+ <include name="*.xml"/>
+ </fileset>
+ <filterset>
+ <filter token="hudson.framework.url" value="${hudson.framework.url}"/>
+ <filter token="hudson.home" value="${hudson.home}"/>
+ <filter token="version.id" value="${version.id}"/>
+ <filtersfile file="${framework.dir}/ant.properties"/>
+ </filterset>
+ </copy>
+ <chmod perm="g+w">
+ <fileset dir="${hudson.home}">
+ <include name="jobs/*/config.xml"/>
+ <include name="users/*/config.xml"/>
+ <include name="*.xml"/>
+ </fileset>
+ </chmod>
+
+ <echo/>
+ <echo message="*************************************"/>
+ <echo message="* Hudson setup successfully *"/>
+ <echo message="* ant hudson-start *"/>
+ <echo message="*************************************"/>
+ <echo/>
+
+ </target>
+
+ <target name="hudson-stop" depends="init-hudson" description="Stops the Hudson QA environment">
+
+ <exec executable="${hudson.tomcat}/bin/catalina.sh" failonerror="true">
+ <arg line="stop"/>
+ </exec>
+
+ <echo/>
+ <echo message="*************************************"/>
+ <echo message="* Hudson stopped successfully *"/>
+ <echo message="* ant hudson-start *"/>
+ <echo message="*************************************"/>
+ <echo/>
+
+ </target>
+
+ <target name="hudson-start" depends="init-hudson" description="Start the Hudson QA environment">
+
+ <property environment="env"/>
+ <fail message="unset JBOSS_REPOSITORY=${env.JBOSS_REPOSITORY}" if="env.JBOSS_REPOSITORY"/>
+
+ <!-- When working with group-access files and directories, it is common to use 'umask 2'
+ <exec executable="umask">
+ <arg value="2"/>
+ </exec>
+ -->
+
+ <mkdir dir="${framework.dir}/output"/>
+ <exec executable="${hudson.tomcat}/bin/catalina.sh" failonerror="true" output="${framework.dir}/output/hudson.log">
+ <env key="CATALINA_OPTS" value="-Xmx512m -Djava.awt.headless=true"/>
+ <arg line="start"/>
+ </exec>
+ <chmod perm="g+w">
+ <fileset dir="${hudson.tomcat}">
+ <include name="logs/**"/>
+ </fileset>
+ </chmod>
+
+ <echo/>
+ <echo message="*************************************"/>
+ <echo message="* Hudson started successfully *"/>
+ <echo message="* http://localhost:${hudson.http.port}/hudson *"/>
+ <echo message="*************************************"/>
+ <echo/>
+
+ </target>
+
+</project>
Property changes on: framework/trunk/ant-import/build-hudson.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: framework/trunk/ant.properties.example
===================================================================
--- framework/trunk/ant.properties.example 2008-04-12 12:13:33 UTC (rev 6380)
+++ framework/trunk/ant.properties.example 2008-04-12 12:17:56 UTC (rev 6381)
@@ -4,4 +4,54 @@
# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $
# JBossWS local repository
-jboss.local.repository=/home/tdiesler/svn/jboss.local.repository
\ No newline at end of file
+jboss.local.repository=/home/tdiesler/svn/jboss.local.repository
+
+# JBoss remote repository
+jboss.repository=http://repository.jboss.org
+
+# The JBoss settings
+jboss.server.instance=default
+jboss.bind.address=localhost
+
+# JDK settings
+#java.home.jdk16=/usr/java/jdk1.6
+
+# Hudson QA Environment
+hudson.username=changeme
+hudson.password=changeme
+
+hudson.root=/usr/share/java/workspace
+hudson.host=jbws.dyndns.org
+hudson.admin.port=8150
+hudson.http.port=8180
+
+hudson.native.url=https://svn.jboss.org/repos/jbossws/stack/native/trunk
+hudson.metro.url=https://svn.jboss.org/repos/jbossws/stack/metro/trunk
+hudson.cxf.url=https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
+
+hudson.jboss421.url=https://svn.jboss.org/repos/jbossas/tags/JBoss_4_2_1_GA
+hudson.jboss421.build=jboss-4.2.1.GA
+hudson.jboss421.rev=HEAD
+
+hudson.jboss422.url=https://svn.jboss.org/repos/jbossas/tags/JBoss_4_2_2_GA
+hudson.jboss422.build=jboss-4.2.2.GA
+hudson.jboss422.rev=HEAD
+
+hudson.jboss423.url=https://svn.jboss.org/repos/jbossas/branches/Branch_4_2
+hudson.jboss423.build=jboss-4.2.3.GA
+hudson.jboss423.rev=HEAD
+
+hudson.jboss500.url=https://svn.jboss.org/repos/jbossas/tags/JBoss_5_0_0_Beta4
+hudson.jboss500.build=jboss-5.0.0.Beta4
+hudson.jboss500.rev=HEAD
+
+hudson.jboss501.url=https://svn.jboss.org/repos/jbossas/trunk
+hudson.jboss501.build=jboss-5.0.0.CR1
+hudson.jboss501.rev=HEAD
+
+hudson.mail.recipients=
+hudson.smtp.host=localhost
+
+# Hudson setup
+apache-tomcat=5.5.20
+sun-hudson=1.160
\ No newline at end of file
Modified: framework/trunk/build.xml
===================================================================
--- framework/trunk/build.xml 2008-04-12 12:13:33 UTC (rev 6380)
+++ framework/trunk/build.xml 2008-04-12 12:17:56 UTC (rev 6381)
@@ -12,42 +12,44 @@
<!-- $Id$ -->
<project name="JBossWS-Framework" default="main" basedir=".">
-
- <!-- ================================================================== -->
- <!-- Setup -->
- <!-- ================================================================== -->
-
- <property name="framework.dir" value="${basedir}"/>
- <property name="framework.etc.dir" value="${framework.dir}/src/main/etc"/>
- <property name="framework.target.dir" value="${framework.dir}/target"/>
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <target name="init">
-
- <!-- Check if ant.properties is available -->
- <available property="ant.properties.available" file="${basedir}/ant.properties"/>
- <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/>
-
- <property file="${framework.dir}/ant.properties"/>
-
- <xmlproperty file="${framework.dir}/pom.xml"/>
- <property name="version.id" value="${project.version}"/>
- <property name="repository.id" value="${project.version}"/>
-
- <echo message="version.id=${version.id}"/>
- <echo message="repository.id=${repository.id}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Installation -->
- <!-- ================================================================== -->
+ <import file="${basedir}/ant-import/build-hudson.xml"/>
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <property name="framework.dir" value="${basedir}"/>
+ <property name="framework.etc.dir" value="${framework.dir}/src/main/etc"/>
+ <property name="framework.target.dir" value="${framework.dir}/target"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="init">
+
+ <!-- Check if ant.properties is available -->
+ <available property="ant.properties.available" file="${basedir}/ant.properties"/>
+ <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/>
+
+ <property file="${framework.dir}/ant.properties"/>
+
+ <xmlproperty file="${framework.dir}/pom.xml"/>
+ <property name="version.id" value="${project.version}"/>
+ <property name="repository.id" value="${project.version}"/>
+
+ <echo message="version.id=${version.id}"/>
+ <echo message="repository.id=${repository.id}"/>
+ </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.framework.jar.available" file="${framework.target.dir}/jbossws-framework-${version.id}.jar"/>
<fail message="Cannot find jbossws-framework-${version.id}.jar. Did you run 'mvn package'?" unless="jbossws.framework.jar.available"/>
@@ -59,19 +61,21 @@
<!-- jboss/jbossws-framework -->
<property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/>
<mkdir dir="${jboss.repository.dir}/jbossws-framework/${repository.id}/lib"/>
- <copy file="${framework.target.dir}/jbossws-framework-${version.id}.jar" tofile="${jboss.repository.dir}/jbossws-framework/${repository.id}/lib/jbossws-framework.jar" overwrite="true"/>
- <copy file="${framework.target.dir}/jbossws-framework-${version.id}-sources.jar" tofile="${jboss.repository.dir}/jbossws-framework/${repository.id}/lib/jbossws-framework-src.jar" overwrite="true"/>
+ <copy file="${framework.target.dir}/jbossws-framework-${version.id}.jar" tofile="${jboss.repository.dir}/jbossws-framework/${repository.id}/lib/jbossws-framework.jar"
+ overwrite="true"/>
+ <copy file="${framework.target.dir}/jbossws-framework-${version.id}-sources.jar"
+ tofile="${jboss.repository.dir}/jbossws-framework/${repository.id}/lib/jbossws-framework-src.jar" overwrite="true"/>
<copy file="${framework.target.dir}/etc/component-info.xml" tofile="${jboss.repository.dir}/jbossws-framework/${repository.id}/component-info.xml" overwrite="true"/>
- </target>
+ </target>
<!-- ================================================================== -->
<!-- Miscellaneous -->
<!-- ================================================================== -->
-
+
<target name="clean" depends="init" description="Cleans up most generated files.">
<delete dir="${framework.target.dir}"/>
</target>
-
- <target name="main" description="Executes the default target (install)." depends="install"/>
-
+
+ <target name="main" description="Executes the default target (install)." depends="install"/>
+
</project>
Deleted: framework/trunk/version.properties
===================================================================
--- framework/trunk/version.properties 2008-04-12 12:13:33 UTC (rev 6380)
+++ framework/trunk/version.properties 2008-04-12 12:17:56 UTC (rev 6381)
@@ -1,35 +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-3.0
-
-version.id=3.0.2.DEV
-repository.id=snapshot
-
-implementation.title=JBoss Web Services - Framework
-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.4.GA
-jbossws-spi=1.0.2.GA
-
-junit=3.8.1
-dom4j=1.6.1
-ibm-wsdl4j=1.6.2
-jboss-common-core=2.0.2.GA
-jboss-common-logging-spi=2.0.2.GA
-jboss-javaee=5.0.0.Beta3Update1
-jboss-microcontainer=2.0.0.Beta3
-jboss-jbossxb=1.0.0.GA
-sun-jaf=1.1
-sun-jaxb=2.1.4
-sun-jaxrpc=1.1
-sun-jaxws=2.1.1
-
-# Hudson setup
-apache-tomcat=5.5.20
-sun-hudson=1.160
16 years, 9 months
JBossWS SVN: r6380 - framework/trunk.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-12 08:13:33 -0400 (Sat, 12 Apr 2008)
New Revision: 6380
Added:
framework/trunk/externals/
Removed:
framework/trunk/external/
Log:
Use framework externals
Copied: framework/trunk/externals (from rev 6379, framework/trunk/external)
16 years, 9 months
JBossWS SVN: r6377 - in common/trunk: src/main/etc and 1 other directory.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-12 07:36:55 -0400 (Sat, 12 Apr 2008)
New Revision: 6377
Modified:
common/trunk/build.xml
common/trunk/src/main/etc/component-info.xml
Log:
Switch to maven build
Modified: common/trunk/build.xml
===================================================================
--- common/trunk/build.xml 2008-04-12 11:35:26 UTC (rev 6376)
+++ common/trunk/build.xml 2008-04-12 11:36:55 UTC (rev 6377)
@@ -61,11 +61,7 @@
<mkdir dir="${jboss.repository.dir}/jbossws-common/${repository.id}/lib"/>
<copy file="${common.target.dir}/jbossws-common-${version.id}.jar" tofile="${jboss.repository.dir}/jbossws-common/${repository.id}/lib/jbossws-common.jar" overwrite="true"/>
<copy file="${common.target.dir}/jbossws-common-${version.id}-sources.jar" tofile="${jboss.repository.dir}/jbossws-common/${repository.id}/lib/jbossws-common-src.jar" overwrite="true"/>
- <copy tofile="${jboss.repository.dir}/jbossws-common/${repository.id}/component-info.xml" file="${common.etc.dir}/component-info.xml" filtering="true" overwrite="true">
- <filterset>
- <filtersfile file="${common.dir}/version.properties"/>
- </filterset>
- </copy>
+ <copy file="${common.target.dir}/etc/component-info.xml" tofile="${jboss.repository.dir}/jbossws-common/${repository.id}/component-info.xml" overwrite="true"/>
</target>
<!-- ================================================================== -->
Modified: common/trunk/src/main/etc/component-info.xml
===================================================================
--- common/trunk/src/main/etc/component-info.xml 2008-04-12 11:35:26 UTC (rev 6376)
+++ common/trunk/src/main/etc/component-info.xml 2008-04-12 11:36:55 UTC (rev 6377)
@@ -6,7 +6,7 @@
licenseType="lgpl">
<artifact id="jbossws-common.jar"/>
- <artifact id="jbossws-common-src.zip"/>
+ <artifact id="jbossws-common-sources.jar"/>
<import componentref="jboss/jbossws-spi">
<compatible version="${jbossws-spi}"/>
16 years, 9 months
JBossWS SVN: r6376 - in framework/trunk: external and 2 other directories.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-12 07:35:26 -0400 (Sat, 12 Apr 2008)
New Revision: 6376
Added:
framework/trunk/external/
framework/trunk/external/test/
framework/trunk/pom.xml
Removed:
framework/trunk/ant-import/
framework/trunk/distro/
framework/trunk/src/main/etc/default.mf
framework/trunk/src/test/
Modified:
framework/trunk/
framework/trunk/.classpath
framework/trunk/ant.properties.example
framework/trunk/build.xml
framework/trunk/src/main/etc/component-info.xml
Log:
Switch to maven build
Property changes on: framework/trunk
___________________________________________________________________
Name: svn:ignore
- output*
thirdparty
version.properties.md5
ant.properties
+ output*
thirdparty
version.properties.md5
ant.properties
target
Modified: framework/trunk/.classpath
===================================================================
--- framework/trunk/.classpath 2008-04-12 11:27:26 UTC (rev 6375)
+++ framework/trunk/.classpath 2008-04-12 11:35:26 UTC (rev 6376)
@@ -4,19 +4,6 @@
<classpathentry kind="src" path="src/test/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3.8.1"/>
- <classpathentry kind="lib" path="thirdparty/jboss-common-core.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss-logging-spi.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss-xml-binding.jar"/>
- <classpathentry kind="lib" path="thirdparty/jaxws-api.jar"/>
- <classpathentry kind="lib" path="thirdparty/jsr181-api.jar"/>
- <classpathentry kind="lib" path="thirdparty/jboss-javaee.jar"/>
- <classpathentry kind="lib" path="thirdparty/jaxrpc-api.jar"/>
- <classpathentry kind="lib" path="thirdparty/dom4j.jar"/>
- <classpathentry kind="lib" path="thirdparty/saaj-api.jar"/>
- <classpathentry kind="lib" path="thirdparty/activation.jar"/>
- <classpathentry kind="lib" path="thirdparty/jaxb-api.jar"/>
- <classpathentry kind="lib" path="thirdparty/jbossws-common.jar"/>
- <classpathentry kind="lib" path="thirdparty/jbossws-spi.jar" sourcepath="thirdparty/jbossws-spi-src.zip"/>
- <classpathentry kind="lib" path="thirdparty/wsdl4j.jar" sourcepath="thirdparty/wsdl4j-src.jar"/>
- <classpathentry kind="output" path="output/eclipse"/>
+ <classpathentry kind="var" path="M2_REPO/javax/xml/soap/saaj-api/1.3/saaj-api-1.3.jar"/>
+ <classpathentry kind="output" path="target/eclipse"/>
</classpath>
Modified: framework/trunk/ant.properties.example
===================================================================
--- framework/trunk/ant.properties.example 2008-04-12 11:27:26 UTC (rev 6375)
+++ framework/trunk/ant.properties.example 2008-04-12 11:35:26 UTC (rev 6376)
@@ -3,62 +3,5 @@
#
# $Id: ant.properties.example 3995 2007-07-26 08:52:45Z thomas.diesler(a)jboss.com $
-# The JBoss settings
-jboss.server.instance=default
-jboss.bind.address=localhost
-
-# JBoss Repository
-#jboss.repository=file:/home/tdiesler/svn/jboss.local.repository
-jboss.repository=http://repository.jboss.org
-
-# JDK settings
-#java.home.jdk16=/usr/java/jdk1.6
-
-# Hudson QA Environment
-hudson.username=changeme
-hudson.password=changeme
-
-hudson.root=/usr/share/java/workspace
-hudson.host=jbws.dyndns.org
-hudson.admin.port=8150
-hudson.http.port=8180
-
-hudson.native.url=https://svn.jboss.org/repos/jbossws/stack/native/trunk
-hudson.metro.url=https://svn.jboss.org/repos/jbossws/stack/metro/trunk
-hudson.cxf.url=https://svn.jboss.org/repos/jbossws/stack/cxf/trunk
-
-hudson.jboss421.url=https://svn.jboss.org/repos/jbossas/tags/JBoss_4_2_1_GA
-hudson.jboss421.build=jboss-4.2.1.GA
-hudson.jboss421.rev=HEAD
-
-hudson.jboss422.url=https://svn.jboss.org/repos/jbossas/tags/JBoss_4_2_2_GA
-hudson.jboss422.build=jboss-4.2.2.GA
-hudson.jboss422.rev=HEAD
-
-hudson.jboss423.url=https://svn.jboss.org/repos/jbossas/branches/Branch_4_2
-hudson.jboss423.build=jboss-4.2.3.GA
-hudson.jboss423.rev=HEAD
-
-hudson.jboss500.url=https://svn.jboss.org/repos/jbossas/tags/JBoss_5_0_0_Beta4
-hudson.jboss500.build=jboss-5.0.0.Beta4
-hudson.jboss500.rev=HEAD
-
-hudson.jboss501.url=https://svn.jboss.org/repos/jbossas/trunk
-hudson.jboss501.build=jboss-5.0.0.CR1
-hudson.jboss501.rev=HEAD
-
-hudson.mail.recipients=
-hudson.smtp.host=localhost
-
-# JBossWS Release
-jbossws.portal.content=/home/tdiesler/svn/jbossws/portal-content
-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
+# JBossWS local repository
+jboss.local.repository=/home/tdiesler/svn/jboss.local.repository
\ No newline at end of file
Modified: framework/trunk/build.xml
===================================================================
--- framework/trunk/build.xml 2008-04-12 11:27:26 UTC (rev 6375)
+++ framework/trunk/build.xml 2008-04-12 11:35:26 UTC (rev 6376)
@@ -11,147 +11,67 @@
<!-- $Id$ -->
-<project default="main" basedir="." name="JBossWS-Framework">
+<project name="JBossWS-Framework" default="main" basedir=".">
+
+ <!-- ================================================================== -->
+ <!-- Setup -->
+ <!-- ================================================================== -->
+
+ <property name="framework.dir" value="${basedir}"/>
+ <property name="framework.etc.dir" value="${framework.dir}/src/main/etc"/>
+ <property name="framework.target.dir" value="${framework.dir}/target"/>
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <target name="init">
+
+ <!-- Check if ant.properties is available -->
+ <available property="ant.properties.available" file="${basedir}/ant.properties"/>
+ <fail message="Cannot find ant.properties. Did you copy/edit ant.properties.example?" unless="ant.properties.available"/>
+
+ <property file="${framework.dir}/ant.properties"/>
+
+ <xmlproperty file="${framework.dir}/pom.xml"/>
+ <property name="version.id" value="${project.version}"/>
+ <property name="repository.id" value="${project.version}"/>
+
+ <echo message="version.id=${version.id}"/>
+ <echo message="repository.id=${repository.id}"/>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Installation -->
+ <!-- ================================================================== -->
- <import file="${basedir}/ant-import/build-setup.xml"/>
- <import file="${basedir}/ant-import/build-hudson.xml"/>
- <import file="${basedir}/ant-import/build-release.xml"/>
- <import file="${basedir}/ant-import/build-thirdparty.xml"/>
-
- <!-- ================================================================== -->
- <!-- Setup -->
- <!-- ================================================================== -->
-
- <property name="framework.src.dir" value="${framework.dir}/src/main"/>
- <property name="framework.etc.dir" value="${framework.src.dir}/etc"/>
- <property name="framework.java.dir" value="${framework.src.dir}/java"/>
- <property name="framework.resources.dir" value="${framework.src.dir}/resources"/>
- <property name="framework.output.dir" value="${framework.dir}/output"/>
- <property name="framework.output.apidocs.dir" value="${framework.output.dir}/apidocs"/>
- <property name="framework.output.etc.dir" value="${framework.output.dir}/etc"/>
- <property name="framework.output.classes.dir" value="${framework.output.dir}/classes"/>
- <property name="framework.output.lib.dir" value="${framework.output.dir}/lib"/>
-
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
-
- <target name="init" depends="prepare,thirdparty-classpath">
- </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 java sources -->
- <target name="compile-classes" depends="init">
-
- <!-- Compile spi classes with jdk1.5 -->
- <mkdir dir="${framework.output.classes.dir}"/>
- <javac srcdir="${framework.java.dir}" sourcepath="" destdir="${framework.output.classes.dir}" encoding="utf-8" debug="${javac.debug}" verbose="${javac.verbose}"
- deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" source="1.5" target="1.5">
- <include name="org/jboss/wsf/**"/>
- <classpath refid="spi.thirdparty.classpath"/>
- </javac>
- </target>
-
- <!-- Compile etc files (manifests and such) -->
- <target name="compile-etc" depends="init">
- <mkdir dir="${framework.output.etc.dir}"/>
- <copy todir="${framework.output.etc.dir}" filtering="yes" overwrite="true">
- <fileset dir="${framework.etc.dir}"/>
- <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="${framework.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">
+ <!-- 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.framework.jar.available" file="${framework.target.dir}/jbossws-framework-${version.id}.jar"/>
+ <fail message="Cannot find jbossws-framework-${version.id}.jar. Did you run 'mvn package'?" unless="jbossws.framework.jar.available"/>
- <!-- Build jbossws-framework.jar -->
- <mkdir dir="${framework.output.lib.dir}"/>
- <jar jarfile="${framework.output.lib.dir}/jbossws-framework.jar" manifest="${framework.output.etc.dir}/default.mf">
- <fileset dir="${framework.output.classes.dir}">
- <include name="org/jboss/wsf/framework/**"/>
- </fileset>
- </jar>
+ <!-- Check if the source jar is available -->
+ <available property="jbossws.framework.sources.jar.available" file="${framework.target.dir}/jbossws-framework-${version.id}-sources.jar"/>
+ <fail message="Cannot find jbossws-framework-${version.id}-sources.jar. Did you run 'mvn source:jar'?" unless="jbossws.framework.sources.jar.available"/>
- <!-- Build jbossws-spi-scripts.zip -->
- <zip zipfile="${framework.output.lib.dir}/jbossws-framework-scripts.zip" >
- <fileset dir="${framework.output.etc.dir}">
- <include name="wsconsume.bat"/>
- <include name="wsconsume.sh"/>
- <include name="wsprovide.bat"/>
- <include name="wsprovide.sh"/>
- </fileset>
- </zip>
-
- <!-- Build jbossws-spi-src.zip -->
- <zip zipfile="${framework.output.lib.dir}/jbossws-framework-src.zip" >
- <fileset dir="${framework.java.dir}"/>
- </zip>
-
- </target>
+ <!-- jboss/jbossws-framework -->
+ <property name="jboss.repository.dir" value="${jboss.local.repository}/jboss"/>
+ <mkdir dir="${jboss.repository.dir}/jbossws-framework/${repository.id}/lib"/>
+ <copy file="${framework.target.dir}/jbossws-framework-${version.id}.jar" tofile="${jboss.repository.dir}/jbossws-framework/${repository.id}/lib/jbossws-framework.jar" overwrite="true"/>
+ <copy file="${framework.target.dir}/jbossws-framework-${version.id}-sources.jar" tofile="${jboss.repository.dir}/jbossws-framework/${repository.id}/lib/jbossws-framework-src.jar" overwrite="true"/>
+ <copy file="${framework.target.dir}/etc/component-info.xml" tofile="${jboss.repository.dir}/jbossws-framework/${repository.id}/component-info.xml" overwrite="true"/>
+ </target>
<!-- ================================================================== -->
- <!-- Documentation -->
+ <!-- Miscellaneous -->
<!-- ================================================================== -->
- <!-- Generate the JavaDoc -->
- <target name="javadoc" depends="init" description="Generate the Javadoc">
-
- <mkdir dir="${framework.output.apidocs.dir}"/>
- <javadoc destdir="${framework.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API">
- <classpath refid="spi.thirdparty.classpath"/>
- <packageset dir="${framework.java.dir}" defaultexcludes="yes">
- <include name="org/jboss/wsf/**"/>
- </packageset>
- <doctitle><![CDATA[<h1>JBoss Web Service Framework - SPI</h1>]]></doctitle>
- <tag name="todo" scope="all" description="To do:"/>
- </javadoc>
- </target>
-
- <target name="clean" depends="prepare" description="Cleans up most generated files.">
- <delete dir="${framework.output.dir}"/>
+ <target name="clean" depends="init" description="Cleans up most generated files.">
+ <delete dir="${framework.target.dir}"/>
</target>
-
- <target name="clobber" depends="clean" description="Cleans up all generated files.">
- <delete dir="${framework.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>
-
+
+ <target name="main" description="Executes the default target (install)." depends="install"/>
+
</project>
Copied: framework/trunk/external/test (from rev 6373, framework/trunk/src/test)
Added: framework/trunk/pom.xml
===================================================================
--- framework/trunk/pom.xml (rev 0)
+++ framework/trunk/pom.xml 2008-04-12 11:35:26 UTC (rev 6376)
@@ -0,0 +1,84 @@
+<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.jboss.ws</groupId>
+ <artifactId>jbossws-framework</artifactId>
+ <packaging>jar</packaging>
+ <version>3.0.2-SNAPSHOT</version>
+ <name>JBoss Web Services - Framework</name>
+ <organization>
+ <name>JBoss, a division of Red Hat</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+ <url>http://maven.apache.org</url>
+
+ <!-- Properties -->
+ <properties>
+ <jbossws-common>3.0.0-SNAPSHOT</jbossws-common>
+ <jbossws-spi>3.0.0-SNAPSHOT</jbossws-spi>
+ </properties>
+
+ <!-- Dependencies -->
+ <dependencies>
+ <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>org.jboss.ws</groupId>
+ <artifactId>jbossws-common</artifactId>
+ <version>${jbossws-common}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-spi</artifactId>
+ <version>${jbossws-spi}</version>
+ </dependency>
+ </dependencies>
+
+ <!-- Parent -->
+ <parent>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-parent</artifactId>
+ <version>3</version>
+ </parent>
+
+ <!-- Plugins -->
+ <build>
+ <resources>
+ <resource>
+ <targetPath>../etc</targetPath>
+ <directory>src/main/etc</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </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: framework/trunk/pom.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ LF
Modified: framework/trunk/src/main/etc/component-info.xml
===================================================================
--- framework/trunk/src/main/etc/component-info.xml 2008-04-12 11:27:26 UTC (rev 6375)
+++ framework/trunk/src/main/etc/component-info.xml 2008-04-12 11:35:26 UTC (rev 6376)
@@ -2,7 +2,7 @@
<component id="jboss/jbossws-framework"
description="JBossWS Framework"
- version="@repository.id@"
+ version="${version}"
licenseType="lgpl">
<artifact id="jbossws-framework.jar"/>
@@ -13,10 +13,10 @@
<artifact id="wsprovide.sh"/>
<import componentref="jboss/jbossws-common">
- <compatible version="@jbossws-common@"/>
+ <compatible version="${jbossws-common}"/>
</import>
<import componentref="jboss/jbossws-spi">
- <compatible version="@jbossws-spi@"/>
+ <compatible version="${jbossws-spi}"/>
</import>
<export>
Deleted: framework/trunk/src/main/etc/default.mf
===================================================================
--- framework/trunk/src/main/etc/default.mf 2008-04-12 11:27:26 UTC (rev 6375)
+++ framework/trunk/src/main/etc/default.mf 2008-04-12 11:35:26 UTC (rev 6376)
@@ -1,11 +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@
-Class-Path: getopt.jar
\ No newline at end of file
16 years, 9 months
JBossWS SVN: r6375 - common/trunk.
by jbossws-commits＠lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2008-04-12 07:27:26 -0400 (Sat, 12 Apr 2008)
New Revision: 6375
Modified:
common/trunk/pom.xml
Log:
Remove explicit dependency on microcontainer
Modified: common/trunk/pom.xml
===================================================================
--- common/trunk/pom.xml 2008-04-12 11:09:18 UTC (rev 6374)
+++ common/trunk/pom.xml 2008-04-12 11:27:26 UTC (rev 6375)
@@ -20,11 +20,6 @@
<!-- Dependencies -->
<dependencies>
<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-spi</artifactId>
<version>${jbossws-spi}</version>
16 years, 9 months