You are viewing a plain text version of this content. The canonical link for it is here.
Posted to muse-dev@ws.apache.org by sc...@apache.org on 2004/11/23 21:08:04 UTC
svn commit: r106338 - /incubator/muse/trunk/examples/disk /incubator/muse/trunk/examples/disk/build.xml /incubator/muse/trunk/examples/probe/build.xml /incubator/muse/trunk/examples/template/build.xml /incubator/muse/trunk/maven.xml /incubator/muse/trunk/project.properties
Author: scamp
Date: Tue Nov 23 12:08:03 2004
New Revision: 106338
Modified:
incubator/muse/trunk/examples/disk/ (props changed)
incubator/muse/trunk/examples/disk/build.xml
incubator/muse/trunk/examples/probe/build.xml
incubator/muse/trunk/examples/template/build.xml
incubator/muse/trunk/maven.xml
incubator/muse/trunk/project.properties
Log:
update to make the dist webapp name "muse"
Modified: incubator/muse/trunk/examples/disk/build.xml
Url: http://svn.apache.org/viewcvs/incubator/muse/trunk/examples/disk/build.xml?view=diff&rev=106338&p1=incubator/muse/trunk/examples/disk/build.xml&r1=106337&p2=incubator/muse/trunk/examples/disk/build.xml&r2=106338
==============================================================================
--- incubator/muse/trunk/examples/disk/build.xml (original)
+++ incubator/muse/trunk/examples/disk/build.xml Tue Nov 23 12:08:03 2004
@@ -17,21 +17,21 @@
<target name="init">
- <available file="${jmuws.home}/webapps/wsdm" type="dir" property="internal.wsdm.webapp.dir" value="${jmuws.home}/webapps/wsdm" />
- <available file="${jmuws.home}/target/wsdm" type="dir" property="dist.wsdm.webapp.dir" value="${jmuws.home}/target/wsdm" />
- <condition property="wsdm.webapp.dir" value="${internal.wsdm.webapp.dir}">
- <isset property="internal.wsdm.webapp.dir"/>
+ <available file="${jmuws.home}/webapps/muse" type="dir" property="internal.muse.webapp.dir" value="${jmuws.home}/webapps/muse" />
+ <available file="${jmuws.home}/target/muse" type="dir" property="dist.muse.webapp.dir" value="${jmuws.home}/target/muse" />
+ <condition property="muse.webapp.dir" value="${internal.muse.webapp.dir}">
+ <isset property="internal.muse.webapp.dir"/>
</condition>
- <condition property="wsdm.webapp.dir" value="${dist.wsdm.webapp.dir}">
- <isset property="dist.wsdm.webapp.dir"/>
+ <condition property="muse.webapp.dir" value="${dist.muse.webapp.dir}">
+ <isset property="dist.muse.webapp.dir"/>
</condition>
- <fail unless="wsdm.webapp.dir" message="webapp dir ${jmuws.home}/webapps/wsdm does not exist." />
- <echo>Using webapp dir: ${wsdm.webapp.dir}</echo>
+ <fail unless="muse.webapp.dir" message="webapp dir ${jmuws.home}/webapps/muse does not exist." />
+ <echo>Using webapp dir: ${muse.webapp.dir}</echo>
<path id="jmuws.classpath.id">
- <pathelement location="${wsdm.webapp.dir}/WEB-INF/classes" />
- <fileset dir="${wsdm.webapp.dir}/WEB-INF/lib" includes="*.jar" />
+ <pathelement location="${muse.webapp.dir}/WEB-INF/classes" />
+ <fileset dir="${muse.webapp.dir}/WEB-INF/lib" includes="*.jar" />
<pathelement location="${activation.jar}" />
<pathelement location="${mail.jar}" />
</path>
@@ -43,7 +43,7 @@
depends="init"
description="generate Axis service classes and XMLBeans types for the disk WSDL">
- <property name="tmp.dir" location="${wsdm.webapp.dir}/_tmp_" />
+ <property name="tmp.dir" location="${muse.webapp.dir}/_tmp_" />
<mkdir dir="${tmp.dir}" />
<copy file="${disk.wsdl}" todir="${tmp.dir}" overwrite="true" />
<taskdef name="wsdmWsdl2Java" classname="org.apache.ws.tool.taskdef.WsdmWsdl2JavaTask" classpath="${jmuws.classpath}" />
@@ -77,38 +77,38 @@
<target name="deploy"
depends="init"
- description="deploys the disk service to the wsdm webapp">
+ description="deploys the disk service to the muse webapp">
- <copy file="${disk.wsdl}" todir="${wsdm.webapp.dir}/WEB-INF/classes/wsdl" overwrite="true" verbose="true" />
- <echo>Deploying disk service classes to ${wsdm.webapp.dir}/WEB-INF/classes/...</echo>
- <copy todir="${wsdm.webapp.dir}/WEB-INF/classes">
+ <copy file="${disk.wsdl}" todir="${muse.webapp.dir}/WEB-INF/classes/wsdl" overwrite="true" verbose="true" />
+ <echo>Deploying disk service classes to ${muse.webapp.dir}/WEB-INF/classes/...</echo>
+ <copy todir="${muse.webapp.dir}/WEB-INF/classes">
<fileset dir="${generated.classes.dir}" />
</copy>
<antcall target="copy-discovery-agent-xml" />
<taskdef name="wsddUpdater" classname="org.apache.ws.platform.axis.deployment.wsdd.WsddUpdater" classpathref="jmuws.classpath.id" />
- <property name="config.wsdd" location="${wsdm.webapp.dir}/WEB-INF/server-config.wsdd" /> <!-- normalize path -->
- <wsddUpdater configWsdd="${wsdm.webapp.dir}/WEB-INF/server-config.wsdd">
+ <property name="config.wsdd" location="${muse.webapp.dir}/WEB-INF/server-config.wsdd" /> <!-- normalize path -->
+ <wsddUpdater configWsdd="${muse.webapp.dir}/WEB-INF/server-config.wsdd">
<wsddPaths dir="${generated.src.dir}" includes="**/deploy.wsdd" />
</wsddUpdater>
</target>
<target name="copy-discovery-agent-xml">
- <available file="${wsdm.webapp.dir}/WEB-INF/classes/discovery-agent-registry.xml" property="discovery.present"/>
+ <available file="${muse.webapp.dir}/WEB-INF/classes/discovery-agent-registry.xml" property="discovery.present"/>
<antcall target="backupDiscovery"/>
- <copy todir="${wsdm.webapp.dir}/WEB-INF/classes" file="${src.dir}/webapp/discovery-agent-registry.xml"/>
+ <copy todir="${muse.webapp.dir}/WEB-INF/classes" file="${src.dir}/webapp/discovery-agent-registry.xml"/>
</target>
<target name="backupDiscovery" if="discovery.present">
- <property name="webapp.discovery.file" value="${wsdm.webapp.dir}/WEB-INF/classes/discovery-agent-registry.xml" />
+ <property name="webapp.discovery.file" value="${muse.webapp.dir}/WEB-INF/classes/discovery-agent-registry.xml" />
<tstamp>
<format property="timestamp" pattern="dMMMMyyyy" locale="en"/>
</tstamp>
<property name="webapp.timestamp.discovery.file" location="${webapp.discovery.file}${timestamp}" />
- <property name="new.discovery.file" value="${wsdm.webapp.dir}/WEB-INF/classes/discovery-agent-registry.xml" />
+ <property name="new.discovery.file" value="${muse.webapp.dir}/WEB-INF/classes/discovery-agent-registry.xml" />
<move file="${webapp.discovery.file}" toFile="${webapp.timestamp.discovery.file}" />
<echo>Moved file ${webapp.discovery.file} to file ${webapp.timestamp.discovery.file}</echo>
@@ -121,11 +121,11 @@
<junit fork="yes" printsummary="yes" dir="${jmuws.home}">
<classpath>
- <pathelement location="${wsdm.webapp.dir}/WEB-INF" />
+ <pathelement location="${muse.webapp.dir}/WEB-INF" />
<path refid="jmuws.classpath.id" />
</classpath>
<formatter type="plain"/>
- <sysproperty key="log4j.configuration" value="${wsdm.webapp.dir}/WEB-INF/classes/log4j.properties"/>
+ <sysproperty key="log4j.configuration" value="${muse.webapp.dir}/WEB-INF/classes/log4j.properties"/>
<test name="org.apache.ws.test.DiskServiceTestCase" haltonfailure="no" outfile="test-results"/>
</junit>
Modified: incubator/muse/trunk/examples/probe/build.xml
Url: http://svn.apache.org/viewcvs/incubator/muse/trunk/examples/probe/build.xml?view=diff&rev=106338&p1=incubator/muse/trunk/examples/probe/build.xml&r1=106337&p2=incubator/muse/trunk/examples/probe/build.xml&r2=106338
==============================================================================
--- incubator/muse/trunk/examples/probe/build.xml (original)
+++ incubator/muse/trunk/examples/probe/build.xml Tue Nov 23 12:08:03 2004
@@ -16,20 +16,20 @@
<property name="generated.override.dir" location="${src.dir}/generated-override" />
<target name="init">
- <available file="${jmuws.home}/webapps/wsdm" type="dir" property="internal.wsdm.webapp.dir" value="${jmuws.home}/webapps/wsdm" />
- <available file="${jmuws.home}/target/wsdm" type="dir" property="dist.wsdm.webapp.dir" value="${jmuws.home}/target/wsdm" />
- <condition property="wsdm.webapp.dir" value="${internal.wsdm.webapp.dir}">
- <isset property="internal.wsdm.webapp.dir"/>
+ <available file="${jmuws.home}/webapps/muse" type="dir" property="internal.muse.webapp.dir" value="${jmuws.home}/webapps/muse" />
+ <available file="${jmuws.home}/target/muse" type="dir" property="dist.muse.webapp.dir" value="${jmuws.home}/target/muse" />
+ <condition property="muse.webapp.dir" value="${internal.muse.webapp.dir}">
+ <isset property="internal.muse.webapp.dir"/>
</condition>
- <condition property="wsdm.webapp.dir" value="${dist.wsdm.webapp.dir}">
- <isset property="dist.wsdm.webapp.dir"/>
+ <condition property="muse.webapp.dir" value="${dist.muse.webapp.dir}">
+ <isset property="dist.muse.webapp.dir"/>
</condition>
- <fail unless="wsdm.webapp.dir" message="webapp dir ${jmuws.home}/webapps/wsdm does not exist." />
- <echo>Using webapp dir: ${wsdm.webapp.dir}</echo>
+ <fail unless="muse.webapp.dir" message="webapp dir ${jmuws.home}/webapps/muse does not exist." />
+ <echo>Using webapp dir: ${muse.webapp.dir}</echo>
<path id="jmuws.classpath.id">
- <pathelement location="${wsdm.webapp.dir}/WEB-INF/classes" />
- <fileset dir="${wsdm.webapp.dir}/WEB-INF/lib" includes="*.jar" />
+ <pathelement location="${muse.webapp.dir}/WEB-INF/classes" />
+ <fileset dir="${muse.webapp.dir}/WEB-INF/lib" includes="*.jar" />
<pathelement location="${activation.jar}" />
<pathelement location="${mail.jar}" />
</path>
@@ -41,7 +41,7 @@
depends="init"
description="generate Axis service classes and XMLBeans types for the probe example WSDLs">
- <property name="tmp.dir" location="${wsdm.webapp.dir}/_tmp_" />
+ <property name="tmp.dir" location="${muse.webapp.dir}/_tmp_" />
<mkdir dir="${tmp.dir}" />
<copy todir="${tmp.dir}" overwrite="true">
<fileset dir="${src.dir}/wsdl">
@@ -83,40 +83,40 @@
</target>
<target name="deploy" depends="init"
- description="deploys the probe example services to the wsdm webapp">
+ description="deploys the probe example services to the muse webapp">
- <copy todir="${wsdm.webapp.dir}/WEB-INF/classes/wsdl" overwrite="true" verbose="true">
+ <copy todir="${muse.webapp.dir}/WEB-INF/classes/wsdl" overwrite="true" verbose="true">
<fileset dir="${src.dir}/wsdl">
<include name="**/*.wsdl" />
</fileset>
</copy>
- <echo>Deploying probe example services classes to ${wsdm.webapp.dir}/WEB-INF/classes...</echo>
- <copy todir="${wsdm.webapp.dir}/WEB-INF/classes">
+ <echo>Deploying probe example services classes to ${muse.webapp.dir}/WEB-INF/classes...</echo>
+ <copy todir="${muse.webapp.dir}/WEB-INF/classes">
<fileset dir="${generated.classes.dir}" />
</copy>
<antcall target="copy-discovery-agent-xml" />
<taskdef name="wsddUpdater" classname="org.apache.ws.platform.axis.deployment.wsdd.WsddUpdater" classpathref="jmuws.classpath.id" />
- <echo>Deploying probe example services to ${wsdm.webapp.dir}/WEB-INF/server-config.wsdd...</echo>
- <wsddUpdater configWsdd="${wsdm.webapp.dir}/WEB-INF/server-config.wsdd">
+ <echo>Deploying probe example services to ${muse.webapp.dir}/WEB-INF/server-config.wsdd...</echo>
+ <wsddUpdater configWsdd="${muse.webapp.dir}/WEB-INF/server-config.wsdd">
<wsddPaths dir="${generated.src.dir}" includes="**/deploy.wsdd" />
</wsddUpdater>
</target>
<target name="copy-discovery-agent-xml">
- <available file="${wsdm.webapp.dir}/WEB-INF/classes/discovery-agent-registry.xml" property="discovery.present"/>
+ <available file="${muse.webapp.dir}/WEB-INF/classes/discovery-agent-registry.xml" property="discovery.present"/>
<antcall target="backupDiscovery"/>
- <copy todir="${wsdm.webapp.dir}/WEB-INF/classes" file="${src.dir}/webapp/discovery-agent-registry.xml"/>
+ <copy todir="${muse.webapp.dir}/WEB-INF/classes" file="${src.dir}/webapp/discovery-agent-registry.xml"/>
</target>
<target name="backupDiscovery" if="discovery.present">
- <property name="webapp.discovery.file" value="${wsdm.webapp.dir}/WEB-INF/classes/discovery-agent-registry.xml" />
+ <property name="webapp.discovery.file" value="${muse.webapp.dir}/WEB-INF/classes/discovery-agent-registry.xml" />
<tstamp>
<format property="timestamp" pattern="dMMMMyyyy" locale="en"/>
</tstamp>
<property name="webapp.timestamp.discovery.file" location="${webapp.discovery.file}${timestamp}" />
- <property name="new.discovery.file" value="${wsdm.webapp.dir}/WEB-INF/classes/discovery-agent-registry.xml" />
+ <property name="new.discovery.file" value="${muse.webapp.dir}/WEB-INF/classes/discovery-agent-registry.xml" />
<move file="${webapp.discovery.file}" toFile="${webapp.timestamp.discovery.file}" />
<echo>Moved file ${webapp.discovery.file} to file ${webapp.timestamp.discovery.file}</echo>
Modified: incubator/muse/trunk/examples/template/build.xml
Url: http://svn.apache.org/viewcvs/incubator/muse/trunk/examples/template/build.xml?view=diff&rev=106338&p1=incubator/muse/trunk/examples/template/build.xml&r1=106337&p2=incubator/muse/trunk/examples/template/build.xml&r2=106338
==============================================================================
--- incubator/muse/trunk/examples/template/build.xml (original)
+++ incubator/muse/trunk/examples/template/build.xml Tue Nov 23 12:08:03 2004
@@ -18,21 +18,21 @@
<!-- INIT TARGET - set up some properties and classpaths -->
<target name="init">
- <available file="${jmuws.home}/webapps/wsdm" type="dir" property="internal.wsdm.webapp.dir" value="${jmuws.home}/webapps/wsdm" />
- <available file="${jmuws.home}/target/wsdm" type="dir" property="dist.wsdm.webapp.dir" value="${jmuws.home}/target/wsdm" />
- <condition property="wsdm.webapp.dir" value="${internal.wsdm.webapp.dir}">
- <isset property="internal.wsdm.webapp.dir"/>
+ <available file="${jmuws.home}/webapps/muse" type="dir" property="internal.muse.webapp.dir" value="${jmuws.home}/webapps/muse" />
+ <available file="${jmuws.home}/target/muse" type="dir" property="dist.muse.webapp.dir" value="${jmuws.home}/target/muse" />
+ <condition property="muse.webapp.dir" value="${internal.muse.webapp.dir}">
+ <isset property="internal.muse.webapp.dir"/>
</condition>
- <condition property="wsdm.webapp.dir" value="${dist.wsdm.webapp.dir}">
- <isset property="dist.wsdm.webapp.dir"/>
+ <condition property="muse.webapp.dir" value="${dist.muse.webapp.dir}">
+ <isset property="dist.muse.webapp.dir"/>
</condition>
- <fail unless="wsdm.webapp.dir" message="webapp dir ${jmuws.home}/webapps/wsdm does not exist." />
- <echo>Using webapp dir: ${wsdm.webapp.dir}</echo>
+ <fail unless="muse.webapp.dir" message="webapp dir ${jmuws.home}/webapps/muse does not exist." />
+ <echo>Using webapp dir: ${muse.webapp.dir}</echo>
<path id="jmuws.classpath.id">
- <pathelement location="${wsdm.webapp.dir}/WEB-INF/classes" />
- <fileset dir="${wsdm.webapp.dir}/WEB-INF/lib" includes="*.jar" />
+ <pathelement location="${muse.webapp.dir}/WEB-INF/classes" />
+ <fileset dir="${muse.webapp.dir}/WEB-INF/lib" includes="*.jar" />
<pathelement location="${activation.jar}" />
<pathelement location="${mail.jar}" />
</path>
@@ -45,7 +45,7 @@
depends="init"
description="generate Axis service classes and XMLBeans types for the WSDLs">
- <property name="tmp.dir" location="${wsdm.webapp.dir}/_tmp_" />
+ <property name="tmp.dir" location="${muse.webapp.dir}/_tmp_" />
<mkdir dir="${tmp.dir}" />
<copy todir="${tmp.dir}" overwrite="true">
<fileset dir="${src.dir}/wsdl">
@@ -84,28 +84,28 @@
</target>
- <!-- DEPLOY TARGET - deploys all services to the wsdm webapp -->
+ <!-- DEPLOY TARGET - deploys all services to the muse webapp -->
<target name="deploy"
depends="init"
- description="deploys all services to the wsdm webapp">
+ description="deploys all services to the muse webapp">
- <copy todir="${wsdm.webapp.dir}/WEB-INF/classes/wsdl" overwrite="true" verbose="true">
+ <copy todir="${muse.webapp.dir}/WEB-INF/classes/wsdl" overwrite="true" verbose="true">
<fileset dir="${src.dir}/wsdl">
<include name="**/*.wsdl" />
</fileset>
</copy>
- <echo>Deploying services classes to ${wsdm.webapp.dir}/WEB-INF/classes...</echo>
+ <echo>Deploying services classes to ${muse.webapp.dir}/WEB-INF/classes...</echo>
- <copy todir="${wsdm.webapp.dir}/WEB-INF/classes">
+ <copy todir="${muse.webapp.dir}/WEB-INF/classes">
<fileset dir="${generated.classes.dir}" />
</copy>
<antcall target="copy-discovery-agent-xml" />
<taskdef name="wsddUpdater" classname="org.apache.ws.platform.axis.deployment.wsdd.WsddUpdater" classpathref="jmuws.classpath.id" />
- <echo>Deploying services to ${wsdm.webapp.dir}/WEB-INF/server-config.wsdd...</echo>
- <wsddUpdater configWsdd="${wsdm.webapp.dir}/WEB-INF/server-config.wsdd">
+ <echo>Deploying services to ${muse.webapp.dir}/WEB-INF/server-config.wsdd...</echo>
+ <wsddUpdater configWsdd="${muse.webapp.dir}/WEB-INF/server-config.wsdd">
<wsddPaths dir="${generated.src.dir}" includes="**/deploy.wsdd" />
</wsddUpdater>
@@ -113,21 +113,21 @@
<!-- COPY-DISCOVERY-AGENT-XML TARGET - copies any discovery agent registry config file and backs up the old one -->
<target name="copy-discovery-agent-xml">
- <available file="${wsdm.webapp.dir}/WEB-INF/classes/discovery-agent-registry.xml" property="discovery.present"/>
+ <available file="${muse.webapp.dir}/WEB-INF/classes/discovery-agent-registry.xml" property="discovery.present"/>
<antcall target="backup-discovery"/>
- <copy todir="${wsdm.webapp.dir}/WEB-INF/classes" file="${src.dir}/webapp/discovery-agent-registry.xml"/>
+ <copy todir="${muse.webapp.dir}/WEB-INF/classes" file="${src.dir}/webapp/discovery-agent-registry.xml"/>
</target>
<!-- BACKUP-DISCOVERY TARGET - makes a date-stamped copy of an existing discovery agent registry config file -->
<target name="backup-discovery"
if="discovery.present">
- <property name="webapp.discovery.file" value="${wsdm.webapp.dir}/WEB-INF/classes/discovery-agent-registry.xml" />
+ <property name="webapp.discovery.file" value="${muse.webapp.dir}/WEB-INF/classes/discovery-agent-registry.xml" />
<tstamp>
<format property="timestamp" pattern="dMMMMyyyy" locale="en"/>
</tstamp>
<property name="webapp.timestamp.discovery.file" location="${webapp.discovery.file}${timestamp}" />
- <property name="new.discovery.file" value="${wsdm.webapp.dir}/WEB-INF/classes/discovery-agent-registry.xml" />
+ <property name="new.discovery.file" value="${muse.webapp.dir}/WEB-INF/classes/discovery-agent-registry.xml" />
<move file="${webapp.discovery.file}" toFile="${webapp.timestamp.discovery.file}" />
<echo>Moved file ${webapp.discovery.file} to file ${webapp.timestamp.discovery.file}</echo>
Modified: incubator/muse/trunk/maven.xml
Url: http://svn.apache.org/viewcvs/incubator/muse/trunk/maven.xml?view=diff&rev=106338&p1=incubator/muse/trunk/maven.xml&r1=106337&p2=incubator/muse/trunk/maven.xml&r2=106338
==============================================================================
--- incubator/muse/trunk/maven.xml (original)
+++ incubator/muse/trunk/maven.xml Tue Nov 23 12:08:03 2004
@@ -242,7 +242,7 @@
<!-- P O S T - G O A L -->
<!-- ================================================================== -->
<!-- Copy the following into the binary distribution directory: -->
- <!-- webapps/wsdm/, docs/, examples/, readme.htm, and util.xml -->
+ <!-- webapps/muse/, docs/, examples/, readme.htm, and util.xml -->
<!-- ================================================================== -->
<postGoal name="dist:prepare-bin-filesystem">
@@ -251,8 +251,8 @@
<attainGoal name="war:webapp" />
- <mkdir dir="${maven.dist.bin.assembly.dir}/webapps/wsdm" />
- <copy todir="${maven.dist.bin.assembly.dir}/webapps/wsdm">
+ <mkdir dir="${maven.dist.bin.assembly.dir}/webapps/${war.name}" />
+ <copy todir="${maven.dist.bin.assembly.dir}/webapps/${war.name}">
<fileset dir="${maven.war.webapp.dir}" />
</copy>
Modified: incubator/muse/trunk/project.properties
Url: http://svn.apache.org/viewcvs/incubator/muse/trunk/project.properties?view=diff&rev=106338&p1=incubator/muse/trunk/project.properties&r1=106337&p2=incubator/muse/trunk/project.properties&r2=106338
==============================================================================
--- incubator/muse/trunk/project.properties (original)
+++ incubator/muse/trunk/project.properties Tue Nov 23 12:08:03 2004
@@ -23,7 +23,8 @@
##############
# Target dir for our webapp
maven.war.build.dir = ${maven.build.dir}
-maven.war.webapp.dir = ${maven.war.build.dir}/muse
+war.name = muse
+maven.war.webapp.dir = ${maven.war.build.dir}/${war.name}
# JALOPY PLUGIN
#################
---------------------------------------------------------------------
To unsubscribe, e-mail: muse-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-dev-help@ws.apache.org