JBossWS SVN: r3438 - trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-06-05 05:27:51 -0400 (Tue, 05 Jun 2007)
New Revision: 3438
Modified:
trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java
Log:
Remove dependecy upon EJB3
Modified: trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java
===================================================================
--- trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2007-06-05 09:13:04 UTC (rev 3437)
+++ trunk/jbossws-core/src/main/java/org/jboss/ws/tools/jaxws/impl/JBossWSProviderImpl.java 2007-06-05 09:27:51 UTC (rev 3438)
@@ -21,18 +21,15 @@
*/
package org.jboss.ws.tools.jaxws.impl;
-import org.jboss.ws.WSException;
-import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
-import org.jboss.wsf.spi.deployment.BasicDeployment;
-import org.jboss.wsf.spi.deployment.Deployment.DeploymentType;
-import static org.jboss.wsf.spi.deployment.Deployment.DeploymentType.JAXWS_EJB3;
-import static org.jboss.wsf.spi.deployment.Deployment.DeploymentType.JAXWS_JSE;
+import org.jboss.ws.WSException;
import org.jboss.ws.integration.ResourceLoaderAdapter;
-import org.jboss.wsf.spi.tools.WSContractProvider;
import org.jboss.ws.metadata.builder.jaxws.JAXWSWebServiceMetaDataBuilder;
import org.jboss.ws.metadata.umdm.UnifiedMetaData;
+import org.jboss.wsf.spi.deployment.BasicDeployment;
+import static org.jboss.wsf.spi.deployment.Deployment.DeploymentType.JAXWS_JSE;
+import org.jboss.wsf.spi.deployment.UnifiedDeploymentInfo;
+import org.jboss.wsf.spi.tools.WSContractProvider;
-import javax.ejb.Stateless;
import java.io.File;
import java.io.IOException;
import java.io.PrintStream;
@@ -71,8 +68,8 @@
private UnifiedDeploymentInfo createUDI(Class<?> endpointClass, ClassLoader loader)
{
- DeploymentType type = (endpointClass.isAnnotationPresent(Stateless.class)) ? JAXWS_EJB3 : JAXWS_JSE;
- UnifiedDeploymentInfo udi = new UnifiedDeploymentInfo(type)
+ //DeploymentType type = (endpointClass.isAnnotationPresent(Stateless.class)) ? JAXWS_EJB3 : JAXWS_JSE;
+ UnifiedDeploymentInfo udi = new UnifiedDeploymentInfo(JAXWS_JSE)
{
@Override
public URL getMetaDataFileURL(String resourcePath) throws IOException
18 years, 5 months
JBossWS SVN: r3437 - branches/jbossws-2.0/build/hudson/hudson-home.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-05 05:13:04 -0400 (Tue, 05 Jun 2007)
New Revision: 3437
Modified:
branches/jbossws-2.0/build/hudson/hudson-home/hudson.tasks.Mailer.xml
Log:
defaultSuffix=(a)jboss.com
Modified: branches/jbossws-2.0/build/hudson/hudson-home/hudson.tasks.Mailer.xml
===================================================================
--- branches/jbossws-2.0/build/hudson/hudson-home/hudson.tasks.Mailer.xml 2007-06-05 09:10:15 UTC (rev 3436)
+++ branches/jbossws-2.0/build/hudson/hudson-home/hudson.tasks.Mailer.xml 2007-06-05 09:13:04 UTC (rev 3437)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<hudson.tasks.Mailer-DescriptorImpl>
- <defaultSuffix>jboss.com</defaultSuffix>
+ <defaultSuffix>@jboss.com</defaultSuffix>
<hudsonUrl>http://@hudson.host@:@hudson.http.port@/hudson/</hudsonUrl>
<adminAddress>thomas.diesler(a)jboss.com</adminAddress>
<smtpHost>@hudson.smtp.host@</smtpHost>
18 years, 5 months
JBossWS SVN: r3436 - trunk/build/hudson/hudson-home.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-05 05:10:15 -0400 (Tue, 05 Jun 2007)
New Revision: 3436
Modified:
trunk/build/hudson/hudson-home/hudson.tasks.Mailer.xml
Log:
defaultSuffix=(a)jboss.com
Modified: trunk/build/hudson/hudson-home/hudson.tasks.Mailer.xml
===================================================================
--- trunk/build/hudson/hudson-home/hudson.tasks.Mailer.xml 2007-06-04 21:49:58 UTC (rev 3435)
+++ trunk/build/hudson/hudson-home/hudson.tasks.Mailer.xml 2007-06-05 09:10:15 UTC (rev 3436)
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<hudson.tasks.Mailer-DescriptorImpl>
- <defaultSuffix>jboss.com</defaultSuffix>
+ <defaultSuffix>@jboss.com</defaultSuffix>
<hudsonUrl>http://@hudson.host@:@hudson.http.port@/hudson/</hudsonUrl>
<adminAddress>thomas.diesler(a)jboss.com</adminAddress>
<smtpHost>@hudson.smtp.host@</smtpHost>
18 years, 5 months
JBossWS SVN: r3435 - branches/jbossws-2.0/build/ant-import.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-06-04 17:49:58 -0400 (Mon, 04 Jun 2007)
New Revision: 3435
Modified:
branches/jbossws-2.0/build/ant-import/build-release.xml
Log:
Remove sunri and xfire release targets
Modified: branches/jbossws-2.0/build/ant-import/build-release.xml
===================================================================
--- branches/jbossws-2.0/build/ant-import/build-release.xml 2007-06-04 21:05:38 UTC (rev 3434)
+++ branches/jbossws-2.0/build/ant-import/build-release.xml 2007-06-04 21:49:58 UTC (rev 3435)
@@ -42,9 +42,7 @@
<ant antfile="${int.jboss42.dir}/build.xml" target="release" inheritall="false"/>
<ant antfile="${int.jboss40.dir}/build.xml" target="release" inheritall="false"/>
<ant antfile="${int.native.dir}/build.xml" target="release" inheritall="false"/>
- <ant antfile="${int.sunri.dir}/build.xml" target="release" inheritall="false"/>
- <ant antfile="${int.xfire.dir}/build.xml" target="release" inheritall="false"/>
- </target>
+</target>
<!-- Release to portal content -->
<target name="check-portal-content" depends="prepare" unless="jbossws.portal.content.available">
18 years, 5 months
JBossWS SVN: r3434 - trunk/integration/spi/ant-import.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-06-04 17:05:38 -0400 (Mon, 04 Jun 2007)
New Revision: 3434
Modified:
trunk/integration/spi/ant-import/build-thirdparty.xml
Log:
Cleanup
Modified: trunk/integration/spi/ant-import/build-thirdparty.xml
===================================================================
--- trunk/integration/spi/ant-import/build-thirdparty.xml 2007-06-04 20:57:13 UTC (rev 3433)
+++ trunk/integration/spi/ant-import/build-thirdparty.xml 2007-06-04 21:05:38 UTC (rev 3434)
@@ -71,26 +71,6 @@
<target name="thirdparty-classpath" depends="thirdparty-get">
- <echo>SPI thirdparty-classpath</echo>
-
- <fileset id="spi.thirdparty.fileset">
- <include name="ant.jar"/>
- <include name="activation.jar"/>
- <include name="dom4j.jar"/>
- <include name="getopt.jar"/>
- <include name="jboss-common-core.jar"/>
- <include name="jboss-dependency.jar"/>
- <include name="jboss-logging-spi.jar"/>
- <include name="jboss-javaee.jar"/>
- <include name="jboss-microcontainer.jar"/>
- <include name="jboss-xml-binding.jar"/>
- <include name="jaxws-api.jar"/>
- <include name="jaxrpc-api.jar"/>
- <include name="jsr181-api.jar"/>
- <include name="junit.jar"/>
- <include name="servlet-api.jar"/>
- </fileset>
-
<!-- The compile classpath for jbossws spi -->
<path id="spi.thirdparty.classpath">
<pathelement location="${thirdparty.dir}/ant.jar"/>
18 years, 5 months
JBossWS SVN: r3433 - in trunk: integration/jboss42 and 8 other directories.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-06-04 16:57:13 -0400 (Mon, 04 Jun 2007)
New Revision: 3433
Modified:
trunk/integration/jboss40/build.xml
trunk/integration/jboss42/build.xml
trunk/integration/jboss50/build.xml
trunk/integration/native/build.xml
trunk/integration/spi/ant-import/build-thirdparty.xml
trunk/integration/spi/build.xml
trunk/integration/sunri/build.xml
trunk/integration/xfire/build.xml
trunk/jbossws-core/ant-import/build-thirdparty.xml
trunk/jbossws-core/build.xml
Log:
Build module local API docs
Modified: trunk/integration/jboss40/build.xml
===================================================================
--- trunk/integration/jboss40/build.xml 2007-06-04 19:36:24 UTC (rev 3432)
+++ trunk/integration/jboss40/build.xml 2007-06-04 20:57:13 UTC (rev 3433)
@@ -28,6 +28,7 @@
<property name="jbws40.java.dir" value="${jbws40.src.dir}/java"/>
<property name="jbws40.resources.dir" value="${jbws40.src.dir}/resources"/>
<property name="jbws40.output.dir" value="${jbws40.dir}/output"/>
+ <property name="jbws40.output.apidocs.dir" value="${jbws40.output.dir}/apidocs"/>
<property name="jbws40.output.classes.dir" value="${jbws40.output.dir}/classes"/>
<property name="jbws40.output.etc.dir" value="${jbws40.output.dir}/etc"/>
<property name="jbws40.output.lib.dir" value="${jbws40.output.dir}/lib"/>
@@ -126,7 +127,23 @@
</zip>
</target>
-
+
+ <!-- Generate the JavaDoc -->
+ <target name="javadoc" depends="init" description="Generate the Javadoc">
+
+ <mkdir dir="${jbws40.output.apidocs.dir}"/>
+ <javadoc destdir="${jbws40.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API">
+ <classpath>
+ <path refid="jbws40.integration.classpath"/>
+ </classpath>
+ <packageset dir="${jbws40.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 -->
<!-- ================================================================== -->
Modified: trunk/integration/jboss42/build.xml
===================================================================
--- trunk/integration/jboss42/build.xml 2007-06-04 19:36:24 UTC (rev 3432)
+++ trunk/integration/jboss42/build.xml 2007-06-04 20:57:13 UTC (rev 3433)
@@ -28,6 +28,7 @@
<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"/>
@@ -113,7 +114,23 @@
</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 -->
<!-- ================================================================== -->
Modified: trunk/integration/jboss50/build.xml
===================================================================
--- trunk/integration/jboss50/build.xml 2007-06-04 19:36:24 UTC (rev 3432)
+++ trunk/integration/jboss50/build.xml 2007-06-04 20:57:13 UTC (rev 3433)
@@ -28,6 +28,7 @@
<property name="jbws50.java.dir" value="${jbws50.src.dir}/java"/>
<property name="jbws50.resources.dir" value="${jbws50.src.dir}/resources"/>
<property name="jbws50.output.dir" value="${jbws50.dir}/output"/>
+ <property name="jbws50.output.apidocs.dir" value="${jbws50.output.dir}/apidocs"/>
<property name="jbws50.output.classes.dir" value="${jbws50.output.dir}/classes"/>
<property name="jbws50.output.etc.dir" value="${jbws50.output.dir}/etc"/>
<property name="jbws50.output.lib.dir" value="${jbws50.output.dir}/lib"/>
@@ -112,7 +113,21 @@
</zip>
</target>
-
+
+ <!-- Generate the JavaDoc -->
+ <target name="javadoc" depends="init" description="Generate the Javadoc">
+
+ <mkdir dir="${jbws50.output.apidocs.dir}"/>
+ <javadoc destdir="${jbws50.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API">
+ <classpath refid="jbws50.integration.classpath"/>
+ <packageset dir="${jbws50.java.dir}" defaultexcludes="yes">
+ <include name="org/jboss/wsf/**"/>
+ </packageset>
+ <doctitle><![CDATA[<h1>JBoss Web Service Framework - Container integration AS 5.0</h1>]]></doctitle>
+ <tag name="todo" scope="all" description="To do:"/>
+ </javadoc>
+ </target>
+
<!-- ================================================================== -->
<!-- Miscellaneous -->
<!-- ================================================================== -->
Modified: trunk/integration/native/build.xml
===================================================================
--- trunk/integration/native/build.xml 2007-06-04 19:36:24 UTC (rev 3432)
+++ trunk/integration/native/build.xml 2007-06-04 20:57:13 UTC (rev 3433)
@@ -34,6 +34,7 @@
<property name="native.output.classes.dir" value="${native.output.dir}/classes"/>
<property name="native.output.etc.dir" value="${native.output.dir}/etc"/>
<property name="native.output.lib.dir" value="${native.output.dir}/lib"/>
+ <property name="native.output.apidocs.dir" value="${native.output.dir}/apidocs"/>
<!-- ================================================================== -->
<!-- Initialization -->
@@ -238,7 +239,30 @@
<metainf dir="${native.resources.dir}/jbossws-native40.sar/META-INF"/>
</jar>
</target>
-
+
+ <target name="javadoc" description="Generate the Javadoc">
+
+ <mkdir dir="${native.output.apidocs.dir}"/>
+ <javadoc destdir="${native.output.apidocs.dir}"
+ author="true"
+ version="true"
+ use="true"
+ windowtitle="JBossWS API"
+ excludepackagenames="javax.*"
+ defaultexcludes="yes">
+ <classpath refid="native.integration.classpath"/>
+ <!--packageset dir="${native.java.dir}">
+ <include name="org/jboss/wsf/**"/>
+ <include name="org/jboss/ws/**"/>
+ </packageset-->
+ <packageset dir="${core.dir}/src/main/java">
+ <include name="org/jboss/ws/**"/>
+ </packageset>
+ <doctitle><![CDATA[<h1>JBoss Web Service Framework - Stack integration Native </h1>]]></doctitle>
+
+ </javadoc>
+ </target>
+
<!-- ================================================================== -->
<!-- Miscellaneous -->
<!-- ================================================================== -->
@@ -254,6 +278,6 @@
<target name="most" description="Builds almost everything." depends="jars,tests-main"/>
- <target name="all" description="Create a distribution zip file" depends="most,build-bin-dist"/>
+ <target name="all" description="Create a distribution zip file" depends="most, build-bin-dist"/>
</project>
Modified: trunk/integration/spi/ant-import/build-thirdparty.xml
===================================================================
--- trunk/integration/spi/ant-import/build-thirdparty.xml 2007-06-04 19:36:24 UTC (rev 3432)
+++ trunk/integration/spi/ant-import/build-thirdparty.xml 2007-06-04 20:57:13 UTC (rev 3433)
@@ -70,10 +70,31 @@
</target>
<target name="thirdparty-classpath" depends="thirdparty-get">
-
- <!-- The compile classpath for jbossws spi -->
- <path id="thirdparty.classpath">
- <pathelement location="${thirdparty.dir}/activation.jar"/>
+
+ <echo>SPI thirdparty-classpath</echo>
+
+ <fileset id="spi.thirdparty.fileset">
+ <include name="ant.jar"/>
+ <include name="activation.jar"/>
+ <include name="dom4j.jar"/>
+ <include name="getopt.jar"/>
+ <include name="jboss-common-core.jar"/>
+ <include name="jboss-dependency.jar"/>
+ <include name="jboss-logging-spi.jar"/>
+ <include name="jboss-javaee.jar"/>
+ <include name="jboss-microcontainer.jar"/>
+ <include name="jboss-xml-binding.jar"/>
+ <include name="jaxws-api.jar"/>
+ <include name="jaxrpc-api.jar"/>
+ <include name="jsr181-api.jar"/>
+ <include name="junit.jar"/>
+ <include name="servlet-api.jar"/>
+ </fileset>
+
+ <!-- The compile classpath for jbossws spi -->
+ <path id="spi.thirdparty.classpath">
+ <pathelement location="${thirdparty.dir}/ant.jar"/>
+ <pathelement location="${thirdparty.dir}/activation.jar"/>
<pathelement location="${thirdparty.dir}/dom4j.jar"/>
<pathelement location="${thirdparty.dir}/getopt.jar"/>
<pathelement location="${thirdparty.dir}/jboss-common-core.jar"/>
@@ -85,7 +106,8 @@
<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}/servlet-api.jar"/>
+ <pathelement location="${thirdparty.dir}/junit.jar"/>
+ <pathelement location="${thirdparty.dir}/servlet-api.jar"/>
</path>
</target>
Modified: trunk/integration/spi/build.xml
===================================================================
--- trunk/integration/spi/build.xml 2007-06-04 19:36:24 UTC (rev 3432)
+++ trunk/integration/spi/build.xml 2007-06-04 20:57:13 UTC (rev 3433)
@@ -63,7 +63,7 @@
deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}" source="1.5" target="1.5">
<include name="org/jboss/wsf/spi/**"/>
<include name="org/jboss/ws/integration/**"/>
- <classpath refid="thirdparty.classpath"/>
+ <classpath refid="spi.thirdparty.classpath"/>
</javac>
</target>
@@ -127,21 +127,13 @@
<mkdir dir="${spi.output.apidocs.dir}"/>
<javadoc destdir="${spi.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API">
- <classpath refid="thirdparty.classpath"/>
+ <classpath refid="spi.thirdparty.classpath"/>
<packageset dir="${spi.java.dir}" defaultexcludes="yes">
<include name="org/jboss/ws/**"/>
<include name="org/jboss/wsf/**"/>
</packageset>
<doctitle><![CDATA[<h1>JBoss Web Service Framework - SPI</h1>]]></doctitle>
- <tag name="todo" scope="all" description="To do:"/>
- <group title="Integration (AS 4.2 backwards compatibility)" packages="org.jboss.ws.integration*"/>
- <group title="Annotations" packages="org.jboss.wsf.spi.annotation*"/>
- <group title="Deployment" packages="org.jboss.wsf.spi.deployment*"/>
- <group title="Invocation" packages="org.jboss.wsf.spi.invocation*"/>
- <group title="Management" packages="org.jboss.wsf.spi.management*"/>
- <group title="Handler" packages="org.jboss.wsf.spi.handler*"/>
- <group title="MetaData" packages="org.jboss.wsf.spi.metadata*"/>
- <group title="Tools" packages="org.jboss.wsf.spi.tools*"/>
+ <tag name="todo" scope="all" description="To do:"/>
</javadoc>
</target>
Modified: trunk/integration/sunri/build.xml
===================================================================
--- trunk/integration/sunri/build.xml 2007-06-04 19:36:24 UTC (rev 3432)
+++ trunk/integration/sunri/build.xml 2007-06-04 20:57:13 UTC (rev 3433)
@@ -31,6 +31,7 @@
<property name="sunri.java.dir" value="${sunri.src.dir}/java"/>
<property name="sunri.resources.dir" value="${sunri.src.dir}/resources"/>
<property name="sunri.output.dir" value="${sunri.dir}/output"/>
+ <property name="sunri.output.apidocs.dir" value="${sunri.output.dir}/apidocs"/>
<property name="sunri.output.classes.dir" value="${sunri.output.dir}/classes"/>
<property name="sunri.output.etc.dir" value="${sunri.output.dir}/etc"/>
<property name="sunri.output.lib.dir" value="${sunri.output.dir}/lib"/>
@@ -237,7 +238,24 @@
</metainf>
</jar>
</target>
-
+
+ <!-- Generate the JavaDoc -->
+ <target name="javadoc" depends="init" description="Generate the Javadoc">
+
+ <mkdir dir="${sunri.output.apidocs.dir}"/>
+ <javadoc destdir="${sunri.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API">
+ <classpath>
+ <path refid="sunri50.integration.classpath"/>
+ <path refid="sunri.integration.classpath"/>
+ </classpath>
+ <packageset dir="${sunri.java.dir}" defaultexcludes="yes">
+ <include name="org/jboss/wsf/**"/>
+ </packageset>
+ <doctitle><![CDATA[<h1>JBoss Web Service Framework - Stack integration Sun-RI</h1>]]></doctitle>
+ <tag name="todo" scope="all" description="To do:"/>
+ </javadoc>
+ </target>
+
<!-- ================================================================== -->
<!-- Miscellaneous -->
<!-- ================================================================== -->
Modified: trunk/integration/xfire/build.xml
===================================================================
--- trunk/integration/xfire/build.xml 2007-06-04 19:36:24 UTC (rev 3432)
+++ trunk/integration/xfire/build.xml 2007-06-04 20:57:13 UTC (rev 3433)
@@ -31,6 +31,7 @@
<property name="xfire.java.dir" value="${xfire.src.dir}/java"/>
<property name="xfire.resources.dir" value="${xfire.src.dir}/resources"/>
<property name="xfire.output.dir" value="${xfire.dir}/output"/>
+ <property name="xfire.output.apidocs.dir" value="${xfire.output.dir}/apidocs"/>
<property name="xfire.output.classes.dir" value="${xfire.output.dir}/classes"/>
<property name="xfire.output.etc.dir" value="${xfire.output.dir}/etc"/>
<property name="xfire.output.lib.dir" value="${xfire.output.dir}/lib"/>
@@ -223,7 +224,24 @@
</metainf>
</jar>
</target>
-
+
+ <!-- Generate the JavaDoc -->
+ <target name="javadoc" depends="init" description="Generate the Javadoc">
+
+ <mkdir dir="${xfire.output.apidocs.dir}"/>
+ <javadoc destdir="${xfire.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API">
+ <classpath>
+ <path refid="xfire.integration.classpath"/>
+ <path refid="xfire50.integration.classpath"/>
+ </classpath>
+ <packageset dir="${xfire.java.dir}" defaultexcludes="yes">
+ <include name="org/jboss/wsf/**"/>
+ </packageset>
+ <doctitle><![CDATA[<h1>JBoss Web Service Framework - Stack integration XFire</h1>]]></doctitle>
+ <tag name="todo" scope="all" description="To do:"/>
+ </javadoc>
+ </target>
+
<!-- ================================================================== -->
<!-- Miscellaneous -->
<!-- ================================================================== -->
Modified: trunk/jbossws-core/ant-import/build-thirdparty.xml
===================================================================
--- trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-06-04 19:36:24 UTC (rev 3432)
+++ trunk/jbossws-core/ant-import/build-thirdparty.xml 2007-06-04 20:57:13 UTC (rev 3433)
@@ -113,7 +113,8 @@
<pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/>
<pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-annotations-ejb3.jar"/>
<pathelement location="${thirdparty.dir}/ejb3.deployer/jboss-ejb3x.jar"/>
- <pathelement location="${thirdparty.dir}/activation.jar"/>
+ <pathelement location="${thirdparty.dir}/ant.jar"/>
+ <pathelement location="${thirdparty.dir}/activation.jar"/>
<pathelement location="${thirdparty.dir}/dom4j.jar"/>
<pathelement location="${thirdparty.dir}/getopt.jar"/>
<pathelement location="${thirdparty.dir}/javassist.jar"/>
Modified: trunk/jbossws-core/build.xml
===================================================================
--- trunk/jbossws-core/build.xml 2007-06-04 19:36:24 UTC (rev 3432)
+++ trunk/jbossws-core/build.xml 2007-06-04 20:57:13 UTC (rev 3433)
@@ -92,7 +92,7 @@
</filterset>
</copy>
</target>
-
+
<!-- ================================================================== -->
<!-- Archives -->
<!-- ================================================================== -->
@@ -205,11 +205,11 @@
<mkdir dir="${core.output.apidocs.dir}"/>
<javadoc destdir="${core.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API">
- <classpath refid="core.classpath"/>
+ <classpath refid="thirdparty.classpath"/>
<packageset dir="${core.java.dir}" defaultexcludes="yes">
<include name="org/jboss/ws/**"/>
</packageset>
- <doctitle><![CDATA[<h1>JBossWS</h1>]]></doctitle>
+ <doctitle><![CDATA[<h1>JBossWS Native</h1>]]></doctitle>
<tag name="todo" scope="all" description="To do:"/>
<group title="Core" packages="org.jboss.ws.core*"/>
<group title="Metadata" packages="org.jboss.ws.metadata*"/>
18 years, 5 months
JBossWS SVN: r3432 - trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant.
by jbossws-commits@lists.jboss.org
Author: heiko.braun(a)jboss.com
Date: 2007-06-04 15:36:24 -0400 (Mon, 04 Jun 2007)
New Revision: 3432
Modified:
trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/WSProvideTask.java
Log:
Pass ant classpath through URLClassLoader (required for SunRI tools integration)
Modified: trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/WSProvideTask.java
===================================================================
--- trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/WSProvideTask.java 2007-06-04 13:38:29 UTC (rev 3431)
+++ trunk/integration/spi/src/main/java/org/jboss/wsf/spi/tools/ant/WSProvideTask.java 2007-06-04 19:36:24 UTC (rev 3432)
@@ -35,6 +35,12 @@
import java.io.File;
import java.io.PrintStream;
+import java.net.URLClassLoader;
+import java.net.URL;
+import java.net.MalformedURLException;
+import java.util.StringTokenizer;
+import java.util.List;
+import java.util.ArrayList;
/**
* Ant task which invokes provides a Web Service contract and portable JAX-WS wrapper classes.
@@ -161,8 +167,28 @@
private ClassLoader getClasspathLoader(ClassLoader parent)
{
- AntClassLoader loader = new AntClassLoader(parent, getProject(), classpath, false);
- return loader;
+ AntClassLoader antLoader = new AntClassLoader(parent, getProject(), classpath, false);
+
+ // It's necessary to wrap it into an URLLoader in order to extract that information
+ // within the actual provider impl.
+ // See SunRIProviderImpl for instance
+ List<URL> urls = new ArrayList<URL>();
+ StringTokenizer tok = new StringTokenizer(antLoader.getClasspath(), File.separator);
+ while(tok.hasMoreTokens())
+ {
+ try
+ {
+ urls.add(new URL(tok.nextToken()));
+ }
+ catch (MalformedURLException e)
+ {
+ throw new IllegalArgumentException("Failed to wrap classloader", e);
+ }
+
+ }
+
+ ClassLoader wrapper = new URLClassLoader(urls.toArray(new URL[0]), antLoader);
+ return wrapper;
}
public void executeNonForked()
18 years, 5 months
JBossWS SVN: r3431 - in trunk/build: hudson/hudson-home/jobs/AS-Tests-AS-4.0 and 1 other directory.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-04 09:38:29 -0400 (Mon, 04 Jun 2007)
New Revision: 3431
Modified:
trunk/build/ant.properties.example
trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml
Log:
hudson.smtp.host=localhost
Modified: trunk/build/ant.properties.example
===================================================================
--- trunk/build/ant.properties.example 2007-06-04 13:33:01 UTC (rev 3430)
+++ trunk/build/ant.properties.example 2007-06-04 13:38:29 UTC (rev 3431)
@@ -41,7 +41,7 @@
hudson.jboss40.rev=HEAD
hudson.mail.recipients=thomas.diesler(a)jboss.com, heiko.braun(a)jboss.com
-hudson.smtp.host=mail.navisite.com
+hudson.smtp.host=localhost
# JBossWS Release
jbossws.portal.content=/home/tdiesler/svn/jbossws/portal-content
Modified: trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml
===================================================================
--- trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml 2007-06-04 13:33:01 UTC (rev 3430)
+++ trunk/build/hudson/hudson-home/jobs/AS-Tests-AS-4.0/config.xml 2007-06-04 13:38:29 UTC (rev 3431)
@@ -30,7 +30,7 @@
# build/deploy jbossws-native
#
cd $JBWSDIR/integration/native
-ant $ENVIRONMENT -Djboss40.home=$JBOSS_INSTANCE-ejb3 main
+ant $ENVIRONMENT -Djboss40.home=$JBOSS_INSTANCE-ejb3 jars
ant $ENVIRONMENT -Djboss40.home=$JBOSS_INSTANCE deploy-jboss40
#
18 years, 5 months
JBossWS SVN: r3430 - branches/jbossws-2.0/build.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-04 09:33:01 -0400 (Mon, 04 Jun 2007)
New Revision: 3430
Modified:
branches/jbossws-2.0/build/ant.properties.example
Log:
hudson.smtp.host=localhost
Modified: branches/jbossws-2.0/build/ant.properties.example
===================================================================
--- branches/jbossws-2.0/build/ant.properties.example 2007-06-04 13:31:16 UTC (rev 3429)
+++ branches/jbossws-2.0/build/ant.properties.example 2007-06-04 13:33:01 UTC (rev 3430)
@@ -41,7 +41,7 @@
hudson.jboss40.rev=HEAD
hudson.mail.recipients=thomas.diesler(a)jboss.com, heiko.braun(a)jboss.com
-hudson.smtp.host=mail.navisite.com
+hudson.smtp.host=localhost
# JBossWS Release
jbossws.portal.content=/home/tdiesler/svn/jbossws/portal-content
18 years, 5 months
JBossWS SVN: r3429 - trunk/build/hudson/hudson-home.
by jbossws-commits@lists.jboss.org
Author: thomas.diesler(a)jboss.com
Date: 2007-06-04 09:31:16 -0400 (Mon, 04 Jun 2007)
New Revision: 3429
Modified:
trunk/build/hudson/hudson-home/hudson.tasks.Mailer.xml
Log:
Use hudson.http.port
Modified: trunk/build/hudson/hudson-home/hudson.tasks.Mailer.xml
===================================================================
--- trunk/build/hudson/hudson-home/hudson.tasks.Mailer.xml 2007-06-04 13:28:42 UTC (rev 3428)
+++ trunk/build/hudson/hudson-home/hudson.tasks.Mailer.xml 2007-06-04 13:31:16 UTC (rev 3429)
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<hudson.tasks.Mailer-DescriptorImpl>
<defaultSuffix>jboss.com</defaultSuffix>
- <hudsonUrl>http://@hudson.host@:@hudson.port@/hudson/</hudsonUrl>
+ <hudsonUrl>http://@hudson.host@:@hudson.http.port@/hudson/</hudsonUrl>
<adminAddress>thomas.diesler(a)jboss.com</adminAddress>
<smtpHost>@hudson.smtp.host@</smtpHost>
-</hudson.tasks.Mailer-DescriptorImpl>
\ No newline at end of file
+</hudson.tasks.Mailer-DescriptorImpl>
18 years, 5 months