You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ek...@apache.org on 2006/05/29 21:40:06 UTC
svn commit: r410142 - in /beehive/trunk: ./ samples/
samples/wsm-addressbook-enhanced/ samples/wsm-addressbook-fromWSDL/
samples/wsm-addressbook/ samples/wsm-blank/ samples/wsm-employee/
samples/wsm-samples/ wsm/samples/ wsm/samples/wsm-addressbook-enh...
Author: ekoneil
Date: Mon May 29 12:40:05 2006
New Revision: 410142
URL: http://svn.apache.org/viewvc?rev=410142&view=rev
Log:
Move the WSM samples from samples/wsm-* to wsm/samples.
BB: self
Test: none
Added:
beehive/trunk/wsm/samples/
beehive/trunk/wsm/samples/wsm-addressbook/
- copied from r408568, beehive/trunk/samples/wsm-addressbook/
beehive/trunk/wsm/samples/wsm-addressbook-enhanced/
- copied from r408568, beehive/trunk/samples/wsm-addressbook-enhanced/
beehive/trunk/wsm/samples/wsm-addressbook-fromWSDL/
- copied from r408568, beehive/trunk/samples/wsm-addressbook-fromWSDL/
beehive/trunk/wsm/samples/wsm-blank/
- copied from r408568, beehive/trunk/samples/wsm-blank/
beehive/trunk/wsm/samples/wsm-employee/
- copied from r408568, beehive/trunk/samples/wsm-employee/
beehive/trunk/wsm/samples/wsm-samples/
- copied from r408568, beehive/trunk/samples/wsm-samples/
Removed:
beehive/trunk/samples/wsm-addressbook/
beehive/trunk/samples/wsm-addressbook-enhanced/
beehive/trunk/samples/wsm-addressbook-fromWSDL/
beehive/trunk/samples/wsm-blank/
beehive/trunk/samples/wsm-employee/
beehive/trunk/samples/wsm-samples/
Modified:
beehive/trunk/distribution.xml
beehive/trunk/samples/build.xml
Modified: beehive/trunk/distribution.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/distribution.xml?rev=410142&r1=410141&r2=410142&view=diff
==============================================================================
--- beehive/trunk/distribution.xml (original)
+++ beehive/trunk/distribution.xml Mon May 29 12:40:05 2006
@@ -56,7 +56,7 @@
<property name="release.docs.build.dir" location="${beehive.home}/build/release-docs"/>
<!-- Properties used by the "build.dist*.{tgz,zip}" targets for translating end-of-line characters in text files -->
- <property name="text.file.includes.unix" value="**/*.beaninfo,**/*.css,**/*.dtd,**/*.html,**/*.inc,**/*.java,**/*.jcs,**/*.jcx,**/*.jj,**/*.jpf,**/*.jpfs,**/*.js,**/*.jsfb,**/*.jsp,**/*.jspf,**/*.jspx,**/*.jws,**/*.log,**/*.properties,**/*.sql,**/*.tag,**/*.tld,**/*.txt,**/*.TXT,**/*.wsdd,**/*.wsdl,**/*.xml,**/*.xsd,**/*.xsdconfig,**/*.xsl,**/*.xslt,**/Global.app"/>
+ <property name="text.file.includes.unix" value="**/*.beaninfo,**/*.css,**/*.dtd,**/*.html,**/*.inc,**/*.java,**/*.jcs,**/*.jcx,**/*.jj,**/*.jpf,**/*.jpfs,**/*.js,**/*.jsfb,**/*.jsp,**/*.jspf,**/*.jspx,**/*.log,**/*.properties,**/*.sql,**/*.tag,**/*.tld,**/*.txt,**/*.TXT,**/*.wsdd,**/*.wsdl,**/*.xml,**/*.xsd,**/*.xsdconfig,**/*.xsl,**/*.xslt,**/Global.app"/>
<property name="text.file.includes.dos" value="**/*.bat,**/*.cmd,${text.file.includes.unix}"/>
<!-- ============================================= -->
Modified: beehive/trunk/samples/build.xml
URL: http://svn.apache.org/viewvc/beehive/trunk/samples/build.xml?rev=410142&r1=410141&r2=410142&view=diff
==============================================================================
--- beehive/trunk/samples/build.xml (original)
+++ beehive/trunk/samples/build.xml Mon May 29 12:40:05 2006
@@ -1,5 +1,4 @@
<?xml version="1.0" ?>
-
<!--
Copyright 2005 The Apache Software Foundation
@@ -28,25 +27,14 @@
<echo>Cleaning distribution samples</echo>
<echo>---------------------------------------------------------</echo>
- <ant dir="petstoreWeb" antfile="build.xml" target="scrub" inheritAll="false"/>
-
- <ant dir="controls-blank" antfile="build.xml" target="clean" inheritAll="false"/>
- <ant dir="wsm-blank" antfile="build.xml" target="clean" inheritAll="false"/>
-
- <ant dir="wsm-addressbook-enhanced" antfile="build.xml" target="clean" inheritAll="false"/>
-<!--
- <ant dir="wsm-addressbook-fromWSDL/WEB-INF/src" antfile="build.xml" target="clean" inheritAll="false"/>
- -->
-
- <ant dir="wsm-addressbook" antfile="build.xml" target="clean" inheritAll="false"/>
- <ant dir="wsm-employee" antfile="build.xml" target="clean" inheritAll="false"/>
-
<ant dir="netui-samples" antfile="build.xml" target="clean" inheritAll="false"/>
<ant dir="netui-jsf" antfile="build.xml" target="clean" inheritAll="false"/>
+ <ant dir="controls-blank" antfile="build.xml" target="clean" inheritAll="false"/>
<ant dir="controls-spring" antfile="build.xml" target="clean" inheritAll="false"/>
-
<ant dir="controls-webservices-blank" antfile="build.xml" target="clean" inheritAll="false"/>
+
+ <ant dir="petstoreWeb" antfile="build.xml" target="scrub" inheritAll="false"/>
</target>
<target name="build" description="Build the Beehive samples">
@@ -54,35 +42,16 @@
<echo>Building distribution samples</echo>
<echo>---------------------------------------------------------</echo>
- <ant dir="petstoreWeb" antfile="build.xml" target="build" inheritAll="false"/>
-
- <ant dir="controls-blank" antfile="build.xml" target="build" inheritAll="false"/>
- <ant dir="wsm-blank" antfile="build.xml" target="build" inheritAll="false"/>
-
- <ant dir="wsm-addressbook-enhanced" antfile="build.xml" target="build" inheritAll="false"/>
-
- <!-- NOTE: The wsm-addressbook-fromWSDL build can't be wired into this build file. The distribution build runs
- "clean build clean" target on this ant file. The problem is that for the "build" target would need axis-ant.jar
- from the lib directory of the project, then when clean is called, it fails since the jar (in the WEB-INF/lib) is
- in use by ant. It can be re-enabled if distribution.xml exectues the builds on different VM, or if the WSM is cleaned
- up so that the ant targets are not included in the run-time distribution. See
- http://issues.apache.org/jira/browse/BEEHIVE-751
-
- <ant dir="wsm-addressbook-fromWSDL" antfile="build.xml" target="all" inheritAll="false"/>
- -->
-
- <ant dir="wsm-employee" antfile="build.xml" target="build" inheritAll="false"/>
-
- <ant dir="wsm-addressbook" antfile="build.xml" target="build" inheritAll="false"/>
-
<ant dir="netui-samples" antfile="build.xml" target="build" inheritAll="false"/>
<ant dir="netui-jsf" antfile="build.xml" target="build-myfaces" inheritAll="false">
<property name="myfaces.dir" value="${myfaces.dir}"/>
</ant>
+ <ant dir="controls-blank" antfile="build.xml" target="build" inheritAll="false"/>
<ant dir="controls-spring" antfile="build.xml" target="build" inheritAll="false"/>
<ant dir="controls-webservices-blank" antfile="build-svn.xml" target="build" inheritAll="false"/>
+ <ant dir="petstoreWeb" antfile="build.xml" target="build" inheritAll="false"/>
</target>
</project>