[jboss-cvs] JBossAS SVN: r64768 - in branches/tdiesler: tools/etc/buildmagic and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Aug 22 06:26:26 EDT 2007
Author: thomas.diesler at jboss.com
Date: 2007-08-22 06:26:26 -0400 (Wed, 22 Aug 2007)
New Revision: 64768
Removed:
branches/tdiesler/webservices/component-info.xml
branches/tdiesler/webservices/src/main/java/
Modified:
branches/tdiesler/build/build-distr.xml
branches/tdiesler/build/build-thirdparty.xml
branches/tdiesler/build/build.xml
branches/tdiesler/tools/etc/buildmagic/modules.ent
branches/tdiesler/webservices/build.xml
Log:
partial commit
Modified: branches/tdiesler/build/build-distr.xml
===================================================================
--- branches/tdiesler/build/build-distr.xml 2007-08-22 10:21:46 UTC (rev 64767)
+++ branches/tdiesler/build/build-distr.xml 2007-08-22 10:26:26 UTC (rev 64768)
@@ -1616,6 +1616,46 @@
</copy>
</target>
+ <!-- =========== -->
+ <!-- Webservices -->
+ <!-- =========== -->
+
+ <target name="_module-webservices-most">
+ <property name="_module.name" value="webservices" override="true"/>
+ <property name="_module.output" override="true" value="${project.root}/${_module.name}/output"/>
+
+ <!-- Install jbossws.deployer -->
+ <mkdir dir="${install.all.deployers}/jbossws.deployer"/>
+ <unzip dest="${install.all.deployers}/jbossws.deployer" src="${_module.output}/lib/jbossws-jboss50-deployer.zip"/>
+
+ <!-- Copy the generated client libraries -->
+ <mkdir dir="${install.client}"/>
+ <copy todir="${install.client}" filtering="no">
+ <fileset dir="${_module.output}/lib">
+ <include name="jbossws-jboss50.jar"/>
+ </fileset>
+ </copy>
+
+ </target>
+
+ <target name="_module-webservices-all" depends="_module-webservices-most">
+ <!-- Copy the generated javadocs -->
+ <mkdir dir="${install.api}/${_module.name}"/>
+ <copy todir="${install.api}/${_module.name}" filtering="no">
+ <fileset dir="${_module.output}/api">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+
+ <!-- Copy the generated todo docs -->
+ <mkdir dir="${install.todo}/${_module.name}"/>
+ <copy todir="${install.todo}/${_module.name}" filtering="no" failonerror="false">
+ <fileset dir="${_module.output}/todo">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
+ </target>
+
<!-- ============ -->
<!-- Hibernate -->
<!-- ============ -->
@@ -1864,9 +1904,6 @@
<fileset dir="${jboss.jbossws.spi.lib}">
<include name="jbossws-spi.jar"/>
</fileset>
- <fileset dir="${jboss.jbossws.jboss50.lib}">
- <include name="jbossws-jboss50.jar"/>
- </fileset>
<fileset dir="${jboss.jbossws.lib}">
<include name="jbossws-client.jar"/>
<include name="jboss-jaxrpc.jar"/>
@@ -1948,10 +1985,6 @@
</fileset>
</copy>
- <!-- Install jbossws.deployer -->
- <mkdir dir="${install.server}/all/deployers/jbossws.deployer"/>
- <unzip dest="${install.server}/all/deployers/jbossws.deployer" src="${jboss.jbossws.jboss50.lib}/jbossws-jboss50-deployer.zip"/>
-
<!-- Install jbossws.sar -->
<mkdir dir="${install.all.deploy}/jbossws.sar"/>
<unjar dest="${install.all.deploy}/jbossws.sar" src="${jboss.jbossws.native50.lib}/jbossws-native50.sar"/>
Modified: branches/tdiesler/build/build-thirdparty.xml
===================================================================
--- branches/tdiesler/build/build-thirdparty.xml 2007-08-22 10:21:46 UTC (rev 64767)
+++ branches/tdiesler/build/build-thirdparty.xml 2007-08-22 10:26:26 UTC (rev 64768)
@@ -95,7 +95,6 @@
<componentref name="jboss/jboss-jaspi-api" version="1.0-SNAPSHOT"/>
<componentref name="jboss/jbossxb" version="2.0.0.CR4"/>
<componentref name="jboss/jbossws-native50" version="2.0.1.GA"/>
- <componentref name="jboss/jbossws-jboss50" version="2.0.1.GA"/>
<componentref name="jboss/messaging" version="snapshot"/>
<componentref name="jboss/microcontainer" version="snapshot"/>
<componentref name="jboss/jboss-vfs" version="2.0.0.Beta4"/>
Modified: branches/tdiesler/build/build.xml
===================================================================
--- branches/tdiesler/build/build.xml 2007-08-22 10:21:46 UTC (rev 64767)
+++ branches/tdiesler/build/build.xml 2007-08-22 10:26:26 UTC (rev 64768)
@@ -110,9 +110,10 @@
<module name="system"/>
<module name="system-jmx"/>
<module name="testsuite"/>
- <module name="varia"/>
<module name="tomcat"/>
<module name="transaction"/>
+ <module name="varia"/>
+ <module name="webservices"/>
<!-- Module groups -->
@@ -148,8 +149,9 @@
profileservice,
connector,
management,
- ejb3,
+ ejb3,
tomcat,
+ webservices,
hibernate-int,
console
"/>
Modified: branches/tdiesler/tools/etc/buildmagic/modules.ent
===================================================================
--- branches/tdiesler/tools/etc/buildmagic/modules.ent 2007-08-22 10:21:46 UTC (rev 64767)
+++ branches/tdiesler/tools/etc/buildmagic/modules.ent 2007-08-22 10:26:26 UTC (rev 64768)
@@ -206,6 +206,13 @@
<pathelement path="${jboss.varia.root}/classes"/>
</path>
+<!-- Webservices -->
+<property name="jboss.webservices.root" value="${project.root}/webservices/output"/>
+<property name="jboss.webservices.lib" value="${jboss.webservices.root}/lib"/>
+<path id="jboss.webservices.classpath">
+ <pathelement path="${jboss.webservices.root}/classes"/>
+</path>
+
<!-- Hibernate2 integration module -->
<property name="jboss.hibernate.root" value="${project.root}/hibernate-int/output"/>
<property name="jboss.hibernate.lib" value="${jboss.hibernate.root}/lib"/>
Modified: branches/tdiesler/webservices/build.xml
===================================================================
--- branches/tdiesler/webservices/build.xml 2007-08-22 10:21:46 UTC (rev 64767)
+++ branches/tdiesler/webservices/build.xml 2007-08-22 10:26:26 UTC (rev 64768)
@@ -131,21 +131,39 @@
<!-- Archives -->
<!-- ================================================================== -->
-
-
-
<!--
| Build all jar files.
-->
<target name="module-jars" >
+ <!-- Build jbossws-jboss50.jar -->
<jar jarfile="${build.lib}/jbossws-jboss50.jar" manifest="${build.etc}/default.mf">
<fileset dir="${build.classes}" />
- <fileset dir="${build.resources}">
- <include name="dtd/**"/>
- </fileset>
+ <metainf dir="${build.resources}/jbossws-jboss50.jar/META-INF"/>
</jar>
+ <!-- Build jbossws-native50.deployer -->
+ <zip zipfile="${build.lib}/jbossws-jboss50-deployer.zip">
+ <fileset dir="${build.lib}">
+ <include name="jbossws-jboss50.jar"/>
+ </fileset>
+ <fileset dir="${project.thirdparty}/jboss/jbossws-common/lib">
+ <include name="jbossws-common.jar"/>
+ </fileset>
+ <fileset dir="${project.thirdparty}/jboss/jbossws-framework/lib">
+ <include name="jbossws-framework.jar"/>
+ </fileset>
+ <fileset dir="${build.resources}/jbossws-jboss50.deployer">
+ <include name="META-INF/jbossws-deployer-beans.xml"/>
+ </fileset>
+ </zip>
+
+ <!-- Build jbossws50-src.zip
+ <zip zipfile="${build.lib}/jbossws-jboss50-src.zip" >
+ <fileset dir="${jbws50.java.dir}"/>
+ </zip>
+ -->
+
</target>
</project>
Deleted: branches/tdiesler/webservices/component-info.xml
===================================================================
--- branches/tdiesler/webservices/component-info.xml 2007-08-22 10:21:46 UTC (rev 64767)
+++ branches/tdiesler/webservices/component-info.xml 2007-08-22 10:26:26 UTC (rev 64768)
@@ -1,39 +0,0 @@
-<project name="system-component-info">
- <!-- ============================================================ -->
- <!-- System -->
- <!-- ============================================================ -->
-
- <component id="system"
- module="jboss-system"
- version="5.0-SNAPSHOT"
- specTitle="JBoss"
- specVersion="5.0.0"
- specVendor="JBoss (http://www.jboss.org)"
- implTitle="JBoss"
- implURL="http://www.jboss.org"
- implVersion="5.0.0"
- implVendor="JBoss.org"
-
-
- >
- <artifact id="jboss-system.jar"/>
- <artifact id="jboss-system-client.jar"/>
- <artifact id="jboss-boot.jar"/>
- <artifact id="run.jar"/>
- <artifact id="log4j-boot.jar"/>
- <artifact id="testsuite-support.jar"/>
- <artifact id="jboss-service_3_2.dtd" release="docs/dtd"/>
- <artifact id="jboss-service_4_0.dtd" release="docs/dtd"/>
- <artifact id="jboss-subscription.dtd" release="docs/dtd"/>
- <export>
- <include input="jboss-system.jar"/>
- </export>
-
- <artifact id="run.sh"/>
- <artifact id="run.bat"/>
- <artifact id="run.conf"/>
- <artifact id="classpath.sh"/>
-
- </component>
-
-</project>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list