[jbossws-commits] JBossWS SVN: r3504 - in branches/jbossws-2.0: integration/native/src/main/etc and 1 other directories.
jbossws-commits at lists.jboss.org
jbossws-commits at lists.jboss.org
Fri Jun 8 05:31:38 EDT 2007
Author: heiko.braun at jboss.com
Date: 2007-06-08 05:31:38 -0400 (Fri, 08 Jun 2007)
New Revision: 3504
Modified:
branches/jbossws-2.0/integration/native/ant-import/build-bin-dist.xml
branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml
branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml
branches/jbossws-2.0/integration/native/src/main/etc/bin-dist-deploy.xml
branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/WSTools.java
Log:
Include jbossws-core scripts in distribution
Modified: branches/jbossws-2.0/integration/native/ant-import/build-bin-dist.xml
===================================================================
--- branches/jbossws-2.0/integration/native/ant-import/build-bin-dist.xml 2007-06-08 09:25:02 UTC (rev 3503)
+++ branches/jbossws-2.0/integration/native/ant-import/build-bin-dist.xml 2007-06-08 09:31:38 UTC (rev 3504)
@@ -67,6 +67,14 @@
<include name="*.bat"/>
</fileset>
</copy>
+
+ <copy todir="${bindist.bin.dir}">
+ <fileset dir="${core.dir}/src/main/etc">
+ <include name="*.sh"/>
+ <include name="*.bat"/>
+ </fileset>
+ </copy>
+
<chmod dir="${bindist.bin.dir}" perm="+x" includes="**/*.sh"/>
<!-- docs -->
Modified: branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml
===================================================================
--- branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml 2007-06-08 09:25:02 UTC (rev 3503)
+++ branches/jbossws-2.0/integration/native/ant-import/build-deploy.xml 2007-06-08 09:31:38 UTC (rev 3504)
@@ -27,7 +27,8 @@
jbosslibs="${int.jboss50.dir}/output/lib"
corelibs="${core.dir}/output/lib"
stacklibs="${int.native.dir}/output/lib"
- thirdpartylibs="${core.dir}/thirdparty"/>
+ thirdpartylibs="${core.dir}/thirdparty"
+ corescripts="${core.dir}/src/main/etc"/>
<macro-deploy-spi
spilibs="${spi.dir}/output/lib"
@@ -73,7 +74,8 @@
jbosslibs="${int.jboss40.dir}/output/lib"
corelibs="${core.dir}/output/lib"
stacklibs="${int.native.dir}/output/lib"
- thirdpartylibs="${core.dir}/thirdparty"/>
+ thirdpartylibs="${core.dir}/thirdparty"
+ corescripts="${core.dir}/src/main/etc"/>
<macro-deploy-spi
spilibs="${spi.dir}/output/lib"
Modified: branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml
===================================================================
--- branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml 2007-06-08 09:25:02 UTC (rev 3503)
+++ branches/jbossws-2.0/integration/native/ant-import/macros-deploy-native.xml 2007-06-08 09:31:38 UTC (rev 3504)
@@ -23,6 +23,7 @@
<attribute name="corelibs"/>
<attribute name="stacklibs"/>
<attribute name="thirdpartylibs"/>
+ <attribute name="corescripts"/>
<sequential>
<fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/>
@@ -74,6 +75,16 @@
<!-- Deploy juddi-service.sar -->
<mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
<unzip dest="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ <copy todir="${jboss50.home}/bin" overwrite="true">
+ <fileset dir="@{corescripts}">
+ <include name="wspublish.sh"/>
+ <include name="wsrunclient.bat"/>
+ <include name="wsrunclient.sh"/>
+ <include name="wstools.bat"/>
+ <include name="wstools.sh"/>
+ </fileset>
+ </copy>
+ <chmod dir="${jboss50.home}/bin" perm="+x" includes="*.sh"/>
</sequential>
</macrodef>
@@ -113,6 +124,15 @@
<delete file="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"/>
<!-- Undeploy juddi-service.sar -->
<delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <delete>
+ <fileset dir="${jboss50.home}/bin">
+ <include name="wspublish.sh"/>
+ <include name="wsrunclient.bat"/>
+ <include name="wsrunclient.sh"/>
+ <include name="wstools.bat"/>
+ <include name="wstools.sh"/>
+ </fileset>
+ </delete>
</sequential>
</macrodef>
@@ -122,6 +142,7 @@
<attribute name="corelibs"/>
<attribute name="stacklibs"/>
<attribute name="thirdpartylibs"/>
+ <attribute name="corescripts"/>
<sequential>
<fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/>
@@ -164,6 +185,17 @@
<!-- Deploy juddi-service.sar -->
<mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
<unzip dest="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ <copy todir="${jboss42.home}bin" overwrite="true">
+ <fileset dir="@{corescripts}">
+ <include name="wspublish.sh"/>
+ <include name="wsrunclient.bat"/>
+ <include name="wsrunclient.sh"/>
+ <include name="wstools.bat"/>
+ <include name="wstools.sh"/>
+ </fileset>
+ </copy>
+ <chmod dir="${jboss42.home}/bin" perm="+x" includes="*.sh"/>
+
</sequential>
</macrodef>
@@ -205,6 +237,15 @@
<delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/>
<!-- Undeploy juddi-service.sar -->
<delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
+ <delete>
+ <fileset dir="${jboss42.home}/bin">
+ <include name="wspublish.sh"/>
+ <include name="wsrunclient.bat"/>
+ <include name="wsrunclient.sh"/>
+ <include name="wstools.bat"/>
+ <include name="wstools.sh"/>
+ </fileset>
+ </delete>
</sequential>
</macrodef>
@@ -214,6 +255,7 @@
<attribute name="corelibs"/>
<attribute name="stacklibs"/>
<attribute name="thirdpartylibs"/>
+ <attribute name="corescripts"/>
<sequential>
<fail message="Not available: ${jboss40.available.file}" unless="jboss40.available"/>
@@ -257,6 +299,17 @@
<!-- Deploy juddi-service.sar -->
<mkdir dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
<unzip dest="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src="@{thirdpartylibs}/juddi-service.sar"/>
+ <copy todir="${jboss40.home}/bin" overwrite="true">
+ <fileset dir="@{corescripts}">
+ <include name="wspublish.sh"/>
+ <include name="wsrunclient.bat"/>
+ <include name="wsrunclient.sh"/>
+ <include name="wstools.bat"/>
+ <include name="wstools.sh"/>
+ </fileset>
+ </copy>
+ <chmod dir="${jboss40.home}/bin" perm="+x" includes="*.sh"/>
+
</sequential>
</macrodef>
@@ -318,6 +371,15 @@
<delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/>
<!-- Remove only, do not deploy -->
<delete dir="${jboss40.home}/server/${jboss.server.instance}/deploy/jbossws14.sar"/>
+ <delete>
+ <fileset dir="${jboss40.home}/bin">
+ <include name="wspublish.sh"/>
+ <include name="wsrunclient.bat"/>
+ <include name="wsrunclient.sh"/>
+ <include name="wstools.bat"/>
+ <include name="wstools.sh"/>
+ </fileset>
+ </delete>
</sequential>
</macrodef>
Modified: branches/jbossws-2.0/integration/native/src/main/etc/bin-dist-deploy.xml
===================================================================
--- branches/jbossws-2.0/integration/native/src/main/etc/bin-dist-deploy.xml 2007-06-08 09:25:02 UTC (rev 3503)
+++ branches/jbossws-2.0/integration/native/src/main/etc/bin-dist-deploy.xml 2007-06-08 09:31:38 UTC (rev 3504)
@@ -24,7 +24,8 @@
jbosslibs="${lib.dir}"
corelibs="${lib.dir}"
stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}"/>
+ thirdpartylibs="${lib.dir}"
+ corescripts="${bin.dir}"/>
<macro-deploy-spi
spilibs="${lib.dir}"
@@ -46,7 +47,8 @@
jbosslibs="${lib.dir}"
corelibs="${lib.dir}"
stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}"/>
+ thirdpartylibs="${lib.dir}"
+ corescripts="${bin.dir}"/>
<macro-deploy-spi
spilibs="${lib.dir}"
@@ -70,7 +72,8 @@
jbosslibs="${lib.dir}"
corelibs="${lib.dir}"
stacklibs="${lib.dir}"
- thirdpartylibs="${lib.dir}"/>
+ thirdpartylibs="${lib.dir}"
+ corescripts="${bin.dir}"/>
<macro-deploy-spi
spilibs="${lib.dir}"
Modified: branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/WSTools.java
===================================================================
--- branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/WSTools.java 2007-06-08 09:25:02 UTC (rev 3503)
+++ branches/jbossws-2.0/jbossws-core/src/main/java/org/jboss/ws/tools/WSTools.java 2007-06-08 09:31:38 UTC (rev 3504)
@@ -76,6 +76,11 @@
{
String configLocation = null;
String outputDir = null;
+ if(args.length==0)
+ {
+ usage();
+ }
+
for (int i = 0; i < args.length; i++)
{
String arg = args[i];
@@ -111,14 +116,19 @@
}
else
{
- System.out.println("Usage: wstools (-classpath|-cp) <classpath> -config <config> [-dest <destination path>]");
- System.exit(1);
+ usage();
}
}
return generate(configLocation, outputDir);
}
+ private void usage()
+ {
+ System.out.println("Usage: wstools (-classpath|-cp) <classpath> -config <config> [-dest <destination path>]");
+ System.exit(1);
+ }
+
private boolean process(Configuration config, String outputDir) throws IOException
{
if (config == null)
More information about the jbossws-commits
mailing list