Author: scamp
Date: Thu Apr 14 12:07:28 2005
New Revision: 161341
URL: http://svn.apache.org/viewcvs?view=rev&rev=161341
Log:
HERMES-12
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java
incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/velocity/ServiceProperties.java
incubator/apollo/trunk/src/templates/build.properties.vm
incubator/apollo/trunk/src/templates/build.xml.vm
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java?view=diff&r1=161340&r2=161341
==============================================================================
--- incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java
(original)
+++ incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java
Thu Apr 14 12:07:28 2005
@@ -84,6 +84,7 @@
private File m_outputDir;
private File[] m_classpath;
private File m_xmlbeansDir;
+ protected String WEBAPP_NAME = "wsrf";
/**
* Creates a new [EMAIL PROTECTED] Wsdl2Java} object.
@@ -368,6 +369,7 @@
props.setPrefix( GenerationUtils.getPrefix( targetNamespace ) );
props.setCustomMappings( GenerationUtils.getOperationInfoMap(
resourceDef ) );
props.setHasProperties( resourceDef.hasProperties() );
+ props.setWebappName(getWebbappName());
if (resourceDef.hasProperties())
{
@@ -456,6 +458,11 @@
QName serviceQname = new QName(targetNamespace,serviceName);
props.setServiceQName(serviceQname);
return props;
+ }
+
+ protected String getWebbappName()
+ {
+ return WEBAPP_NAME;
}
private boolean isDraft05Specific(ResourceDefinition resourceDef)
Modified:
incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/velocity/ServiceProperties.java
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/velocity/ServiceProperties.java?view=diff&r1=161340&r2=161341
==============================================================================
---
incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/velocity/ServiceProperties.java
(original)
+++
incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/velocity/ServiceProperties.java
Thu Apr 14 12:07:28 2005
@@ -45,6 +45,7 @@
private String m_portName;
private QName m_portTypeQName;
private List m_implementedProps = new ArrayList();
+ private String m_webbAppName;
public ServiceProperties(ResourceDefinition resourceDef)
{
@@ -369,5 +370,15 @@
}
return implementableMap;
+ }
+
+ public void setWebappName(String name)
+ {
+ m_webbAppName = name;
+ }
+
+ public String getWebappName()
+ {
+ return m_webbAppName;
}
}
Modified: incubator/apollo/trunk/src/templates/build.properties.vm
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/build.properties.vm?view=diff&r1=161340&r2=161341
==============================================================================
--- incubator/apollo/trunk/src/templates/build.properties.vm (original)
+++ incubator/apollo/trunk/src/templates/build.properties.vm Thu Apr 14
12:07:28 2005
@@ -3,9 +3,9 @@
endpoint.url=${endpointURL}
# Uncomment and modify the below lines if you would like to deploy to a
-# wsrf webapp located somewhere other than the default location of
-# ../webapps/wsrf (e.g. ${env.CATALINA_HOME}/webapps/wsrf)
-#wsrf.webapp.dir=
+# webapp located somewhere other than the default location of
+# ../webapps/${generated.WebappName} (e.g.
${env.CATALINA_HOME}/webapps/${generated.WebappName} )
+#${generated.WebappName}.webapp.dir=
# Uncomment and modify the below lines if you require a proxy to connect to
external web sites
#http.proxyHost=proxy.xyz.com
Modified: incubator/apollo/trunk/src/templates/build.xml.vm
URL:
http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/templates/build.xml.vm?view=diff&r1=161340&r2=161341
==============================================================================
--- incubator/apollo/trunk/src/templates/build.xml.vm (original)
+++ incubator/apollo/trunk/src/templates/build.xml.vm Thu Apr 14 12:07:28 2005
@@ -22,18 +22,18 @@
<property name="src.dir" location="${srcDir}" />
<property name="wsdl.file" location="${srcDir}/../wsdl/${wsdlName}" />
- <target name="init" unless="apollo.classpath">
+ <target name="init" unless="${serviceName}.classpath">
- <fail message="Please set the location of the wsrf.webapp.dir in
build.properties" unless="wsrf.webapp.dir" />
- <echo>Using webapp dir: ${wsrf.webapp.dir}</echo>
- <path id="apollo.classpath.id">
- <pathelement location="${wsrf.webapp.dir}/WEB-INF/classes" />
- <fileset dir="${wsrf.webapp.dir}/WEB-INF/lib" includes="*.jar" />
+ <fail message="Please set the location of the
${generated.WebappName}.webapp.dir in build.properties"
unless="${generated.WebappName}.webapp.dir" />
+ <echo>Using webapp dir: ${${generated.WebappName}.webapp.dir}</echo>
+ <path id="${serviceName}.classpath.id">
+ <pathelement
location="${${generated.WebappName}.webapp.dir}/WEB-INF/classes" />
+ <fileset dir="${${generated.WebappName}.webapp.dir}/WEB-INF/lib"
includes="*.jar" />
<fileset dir="${jar.dir}" />
<pathelement location="${activation.jar}" />
<pathelement location="${mail.jar}" />
</path>
- <property name="apollo.classpath" refid="apollo.classpath.id" />
+ <property name="${serviceName}.classpath"
refid="${serviceName}.classpath.id" />
</target>
@@ -43,7 +43,7 @@
<mkdir dir="${classes.dir}" />
<javac srcdir="${src.dir}"
destdir="${classes.dir}"
- classpathref="apollo.classpath.id"
+ classpathref="${serviceName}.classpath.id"
debug="on"
excludes="xmlbeans/**"/>
<copy todir="${classes.dir}">
@@ -53,25 +53,25 @@
<target name="deploy"
depends="init"
- description="deploys the ${endpointServiceName} service to the wsrf
webapp">
+ description="deploys the ${endpointServiceName} service to the
${${generated.WebappName}.webapp.dir} webapp">
- <copy file="${wsdl.file}"
todir="${wsrf.webapp.dir}/WEB-INF/classes/wsdl" overwrite="true" verbose="true"
/>
- <echo>Deploying ${endpointServiceName} classes to
${wsrf.webapp.dir}/WEB-INF/classes/...</echo>
- <copy todir="${wsrf.webapp.dir}/WEB-INF/classes">
+ <copy file="${wsdl.file}"
todir="${${generated.WebappName}.webapp.dir}/WEB-INF/classes/wsdl"
overwrite="true" verbose="true" />
+ <echo>Deploying ${endpointServiceName} classes to
${${generated.WebappName}.webapp.dir}/WEB-INF/classes/...</echo>
+ <copy todir="${${generated.WebappName}.webapp.dir}/WEB-INF/classes">
<fileset dir="${classes.dir}" />
</copy>
- <copy file="${jar.dir}/${jarFile}"
todir="${wsrf.webapp.dir}/WEB-INF/lib" />
+ <copy file="${jar.dir}/${jarFile}"
todir="${${generated.WebappName}.webapp.dir}/WEB-INF/lib" />
<!-- update server-config.wsdd using WsddUpdater -->
- <taskdef name="wsddUpdater"
classname="org.apache.ws.util.platform.axis.tool.WsddUpdater"
classpathref="apollo.classpath.id" />
- <property name="config.wsdd"
location="${wsrf.webapp.dir}/WEB-INF/server-config.wsdd" /> <!-- normalize
path -->
+ <taskdef name="wsddUpdater"
classname="org.apache.ws.util.platform.axis.tool.WsddUpdater"
classpathref="${serviceName}.classpath.id" />
+ <property name="config.wsdd"
location="${${generated.WebappName}.webapp.dir}/WEB-INF/server-config.wsdd" />
<!-- normalize path -->
<wsddUpdater configWsdd="${config.wsdd}">
<wsddPaths dir="${src.dir}" includes="**/${serviceName}_deploy.wsdd"
/>
</wsddUpdater>
<!-- update jndi-config.wsdd using JndiConfigUpdater -->
- <taskdef name="jndiUpdater"
classname="org.apache.ws.util.jndi.tools.JndiConfigUpdater"
classpathref="apollo.classpath.id" />
- <property name="jndi.config"
location="${wsrf.webapp.dir}/WEB-INF/classes/jndi-config.xml" /> <!--
normalize path -->
+ <taskdef name="jndiUpdater"
classname="org.apache.ws.util.jndi.tools.JndiConfigUpdater"
classpathref="${serviceName}.classpath.id" />
+ <property name="jndi.config"
location="${${generated.WebappName}.webapp.dir}/WEB-INF/classes/jndi-config.xml"
/> <!-- normalize path -->
<jndiUpdater jndiConfig="${jndi.config}">
<jndiConfigPaths dir="${src.dir}"
includes="**/${serviceName}_jndi-config.xml" />
</jndiUpdater>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
