You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wsrf-dev@ws.apache.org by sc...@apache.org on 2005/01/07 18:59:36 UTC
svn commit: r124553 - in incubator/apollo/trunk: . src/java/org/apache/ws/resource/tool src/java/org/apache/ws/util/jndi/tools src/java/org/apache/ws/util/platform src/java/org/apache/ws/util/platform/axis src/java/org/apache/ws/util/platform/axis/tool src/site/content/tutorial src/templates src/webapp/WEB-INF
Author: scamp
Date: Fri Jan 7 09:59:34 2005
New Revision: 124553
URL: http://svn.apache.org/viewcvs?view=rev&rev=124553
Log:
updated for changes to templates/dirs and added wsddupdater and jndiconfigupdater
Added:
incubator/apollo/trunk/src/java/org/apache/ws/util/jndi/tools/JndiConfigUpdater.java
incubator/apollo/trunk/src/java/org/apache/ws/util/platform/
incubator/apollo/trunk/src/java/org/apache/ws/util/platform/axis/
incubator/apollo/trunk/src/java/org/apache/ws/util/platform/axis/tool/
incubator/apollo/trunk/src/java/org/apache/ws/util/platform/axis/tool/WsddUpdater.java
Modified:
incubator/apollo/trunk/project.xml
incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java
incubator/apollo/trunk/src/site/content/tutorial/build.xml
incubator/apollo/trunk/src/templates/build.properties.vm
incubator/apollo/trunk/src/templates/build.xml.vm
incubator/apollo/trunk/src/webapp/WEB-INF/server-config.wsdd
Modified: incubator/apollo/trunk/project.xml
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/project.xml?view=diff&rev=124553&p1=incubator/apollo/trunk/project.xml&r1=124552&p2=incubator/apollo/trunk/project.xml&r2=124553
==============================================================================
--- incubator/apollo/trunk/project.xml (original)
+++ incubator/apollo/trunk/project.xml Fri Jan 7 09:59:34 2005
@@ -348,6 +348,7 @@
<properties>
<license>ApacheLicense-2.0.txt</license>
<usage>Templating engine used by Wsdl2Java,</usage>
+ <war.bundle>true</war.bundle>
</properties>
</dependency>
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&rev=124553&p1=incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java&r1=124552&p2=incubator/apollo/trunk/src/java/org/apache/ws/resource/tool/Wsdl2Java.java&r2=124553
==============================================================================
--- 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 Fri Jan 7 09:59:34 2005
@@ -349,7 +349,7 @@
String capitalizedServiceName = StringUtils.capitalize( serviceName );
props.setServiceName( capitalizedServiceName );
props.setSrcDir( new File( serviceDir, "src/java" ).getAbsolutePath() );
- props.setJarDir( new File( serviceDir, "lib" ).getAbsolutePath() );
+ props.setJarDir( new File(m_xmlbeansDir,"lib").getAbsolutePath() );
props.setJarFileName( getJarFileName( wsdlFile ) );
props.setClassesDir( new File( serviceDir, "classes" ).getAbsolutePath() );
props.setEndpointURL( resourceDef.getEndpointURL() );
Added: incubator/apollo/trunk/src/java/org/apache/ws/util/jndi/tools/JndiConfigUpdater.java
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/util/jndi/tools/JndiConfigUpdater.java?view=auto&rev=124553
==============================================================================
--- (empty file)
+++ incubator/apollo/trunk/src/java/org/apache/ws/util/jndi/tools/JndiConfigUpdater.java Fri Jan 7 09:59:34 2005
@@ -0,0 +1,221 @@
+/*=============================================================================*
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *=============================================================================*/
+package org.apache.ws.util.jndi.tools;
+
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.DirectoryScanner;
+import org.apache.tools.ant.types.FileSet;
+import org.apache.tools.ant.taskdefs.MatchingTask;
+import org.apache.wsfx.wsrf.jndi.config.JndiConfigDocument;
+import org.apache.wsfx.wsrf.jndi.config.ServiceDocument;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.ArrayList;
+
+/**
+ * @author Sal Campana
+ */
+public class JndiConfigUpdater
+ extends MatchingTask
+{
+ /**
+ * Below default can be overridden by setting the below sysprop.
+ */
+ public static final String SYSPROP_JNDI_CONFIG = "wsdd";
+
+ /**
+ * Default to looking for jndi-config.xml in current dir or classpath.
+ */
+ private static final String DEFAULT_JNDI_CONFIG = "jndi-config.xml";
+ private String m_jndiConfig;
+ private List m_jndiConfigFiles = new ArrayList();
+
+ /**
+ * Creates a new {@link JndiConfigUpdater} object.
+ */
+ public JndiConfigUpdater( )
+ {
+ this( (String) null );
+ }
+
+ /**
+ * Creates a new {@link JndiConfigUpdater} object for updating the specified WSDD file.
+ *
+ * @param jndiConfig DOCUMENT_ME
+ */
+ public JndiConfigUpdater( File jndiConfig )
+ {
+ this( jndiConfig.getPath( ) );
+ }
+
+ /**
+ * Creates a new {@link JndiConfigUpdater} object for updating the specified jndi-config.xml, which may be a a file path or a location in
+ * the classpath.
+ *
+ * @param jndiConfig DOCUMENT_ME
+ */
+ public JndiConfigUpdater( String jndiConfig )
+ {
+ initContextClassLoader( );
+ if ( jndiConfig != null )
+ {
+ m_jndiConfig = jndiConfig;
+ }
+ else
+ {
+ m_jndiConfig =
+ ( System.getProperty( SYSPROP_JNDI_CONFIG ) != null ) ? System.getProperty( SYSPROP_JNDI_CONFIG )
+ : DEFAULT_JNDI_CONFIG;
+ }
+ }
+
+ /**
+ * Sets the JndiConfig fragment to be added to the JNDIonfig file.
+ *
+ * @param deployJndiConfig the JNDIConfigfragment to be added to the JndiConfig file.
+ */
+ public void setDeployJndiConfig( File deployJndiConfig )
+ {
+ m_jndiConfigFiles.add( deployJndiConfig );
+ }
+ public void addConfiguredJndiConfigPaths( FileSet jndiConfigPaths )
+ {
+ File baseDir = jndiConfigPaths.getDir( getProject() );
+ DirectoryScanner dirScanner = jndiConfigPaths.getDirectoryScanner( getProject() );
+ String[] includedFiles = dirScanner.getIncludedFiles();
+ for ( int i = 0; i < includedFiles.length; i++ )
+ {
+ m_jndiConfigFiles.add( new File( baseDir, includedFiles[i] ) );
+ }
+ }
+ /**
+ * Sets the WSDD to be updated.
+ *
+ * @param jndiConfig the Jndi-config.xml to be updated
+ */
+ public void setJndiConfig( String jndiConfig )
+ {
+ m_jndiConfig = jndiConfig;
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @param deployJndiConfig DOCUMENT_ME
+ * @throws Exception DOCUMENT_ME
+ */
+ public void deploy( File deployJndiConfig )
+ throws Exception
+ {
+ setDeployJndiConfig( deployJndiConfig );
+ execute( );
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @throws BuildException DOCUMENT_ME
+ */
+ public void execute( )
+ throws BuildException
+ {
+ if ( m_jndiConfigFiles.isEmpty( ) )
+ {
+ throw new BuildException( "No deploy jndi-config's were specified!" );
+ }
+
+ try
+ {
+ for ( int i = 0; i < m_jndiConfigFiles.size( ); i++ )
+ {
+ deployJndiConfig( (File) m_jndiConfigFiles.get( i ) );
+ }
+ }
+ catch ( Exception e )
+ {
+ throw new BuildException( e );
+ }
+ }
+
+ /**
+ * Command-line invocation entry point.
+ *
+ * @param args command-line arguments
+ * @throws Exception on fatal error
+ */
+ public static void main( String[] args )
+ throws Exception
+ {
+ //System.setProperty( SYSPROP_JNDI_CONFIG, "C:/jndi-config.xml" );
+ if ( args.length != 1 )
+ {
+ System.err.println( "Usage: " + JndiConfigUpdater.class.getName( ) + " deployJndiConfigFile" );
+ System.exit( 1 );
+ }
+
+ new JndiConfigUpdater( ).deploy( new File( args[0] ) );
+ }
+
+ private void deployJndiConfig( File deployJndiConfig )
+ throws Exception
+ {
+ log( "Deploying Jndi-Config " + deployJndiConfig + " to configuration Jndi-Config " + m_jndiConfig + "..." );
+ File jndiConfigFile = new File(m_jndiConfig);
+ JndiConfigDocument sourceConfig = JndiConfigDocument.Factory.parse(new File(m_jndiConfig));
+ JndiConfigDocument.JndiConfig jndiConfig = sourceConfig.getJndiConfig();
+ Map services = new HashMap();
+ ServiceDocument.Service[] serviceArray = jndiConfig.getServiceArray();
+ for (int i = 0; i < serviceArray.length; i++)
+ {
+ ServiceDocument.Service service = serviceArray[i];
+ services.put(service.getName(), service);
+ }
+
+ for (int i = 0; i < m_jndiConfigFiles.size(); i++)
+ {
+ File config = (File) m_jndiConfigFiles.get(i);
+ JndiConfigDocument newConfig = JndiConfigDocument.Factory.parse(config);
+ ServiceDocument.Service[] newServices = newConfig.getJndiConfig().getServiceArray();
+ for (int j = 0; j < newServices.length; j++)
+ {
+ ServiceDocument.Service newService = newServices[j];
+ String name = newService.getName();
+ if(services.containsKey(name))
+ {
+ System.out.println("The service named: " + name + "is being updated in the jndi-config file: " + m_jndiConfig);
+ }
+ services.put(newService.getName(), newService );
+ }
+ }
+
+ ServiceDocument.Service[] updatedServiceArray = (ServiceDocument.Service[]) services.values().toArray(new ServiceDocument.Service[0]);
+ jndiConfig.setServiceArray(updatedServiceArray);
+ sourceConfig.save(jndiConfigFile);
+ }
+
+ private void initContextClassLoader( )
+ {
+ // this is done because for some reason, when run using Maven,
+ // the ContextClassloader is null, which causes an issue with Axis.
+ if ( Thread.currentThread( ).getContextClassLoader( ) == null )
+ {
+ Thread.currentThread( ).setContextClassLoader( MatchingTask.class.getClassLoader( ) );
+ }
+ }
+}
\ No newline at end of file
Added: incubator/apollo/trunk/src/java/org/apache/ws/util/platform/axis/tool/WsddUpdater.java
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/java/org/apache/ws/util/platform/axis/tool/WsddUpdater.java?view=auto&rev=124553
==============================================================================
--- (empty file)
+++ incubator/apollo/trunk/src/java/org/apache/ws/util/platform/axis/tool/WsddUpdater.java Fri Jan 7 09:59:34 2005
@@ -0,0 +1,215 @@
+/*=============================================================================*
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *=============================================================================*/
+package org.apache.ws.util.platform.axis.tool;
+
+import org.apache.axis.AxisEngine;
+import org.apache.axis.MessageContext;
+import org.apache.axis.configuration.FileProvider;
+import org.apache.axis.server.AxisServer;
+import org.apache.axis.utils.Admin;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.DirectoryScanner;
+import org.apache.tools.ant.taskdefs.MatchingTask;
+import org.apache.tools.ant.types.FileSet;
+import org.apache.ws.util.JaxpUtils;
+import org.w3c.dom.Element;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Utility class that allows for easy deployment of new entries (e.g. deploy.wsdd)
+ * to an Axis WSDD. This class can be executed in any of the following ways:
+ * <ul>
+ * <li>by calling {@link WsddUpdater#deploy(java.io.File)}</li>
+ * <li>from the command-line: java org.apache.ws.platform.axis.tool.WsddUpdater path_to_deploy.wsdd</li>
+ * <li>as an Ant task: <wsddupdater deployWsdd="path_to_deploy.wsdd"></li>
+ * </ul>
+ *
+ * @author Ian P. Springer
+ */
+public class WsddUpdater
+ extends MatchingTask
+{
+ /**
+ * Below default can be overridden by setting the below sysprop.
+ */
+ public static final String SYSPROP_WSDD = "wsdd";
+
+ /**
+ * Default to looking for server-config.wsdd in current dir or classpath.
+ */
+ private static final String DEFAULT_CONFIG_WSDD = "server-config.wsdd";
+
+ private String m_configWsdd;
+ private List m_wsddFiles = new ArrayList();
+ private Admin m_axisAdmin;
+ private MessageContext m_msgContext;
+
+ /**
+ * Creates a new {@link WsddUpdater} object.
+ */
+ public WsddUpdater()
+ {
+ this( (String) null );
+ }
+
+ /**
+ * Creates a new {@link WsddUpdater} object for updating the specified WSDD file.
+ *
+ * @param configWsdd DOCUMENT_ME
+ */
+ public WsddUpdater( File configWsdd )
+ {
+ this( configWsdd.getPath() );
+ }
+
+ /**
+ * Creates a new {@link WsddUpdater} object for updating the specified WSDD, which may be a a file path or a location in
+ * the classpath.
+ *
+ * @param configWsdd DOCUMENT_ME
+ */
+ public WsddUpdater( String configWsdd )
+ {
+ initContextClassLoader();
+ if ( configWsdd != null )
+ {
+ m_configWsdd = configWsdd;
+ }
+ else
+ {
+ m_configWsdd =
+ ( System.getProperty( SYSPROP_WSDD ) != null ) ? System.getProperty( SYSPROP_WSDD ) : DEFAULT_CONFIG_WSDD;
+ }
+ }
+
+ private void initContextClassLoader()
+ {
+ // this is done because for some reason, when run using Maven,
+ // the ContextClassloader is null, which causes an issue with Axis.
+ if ( Thread.currentThread().getContextClassLoader() == null )
+ {
+ Thread.currentThread().setContextClassLoader( MatchingTask.class.getClassLoader() );
+ }
+ }
+
+ /**
+ * Sets the WSDD to be updated.
+ *
+ * @param configWsdd the WSDD to be updated
+ */
+ public void setConfigWsdd( String configWsdd )
+ {
+ m_configWsdd = configWsdd;
+ }
+
+ /**
+ * Sets the WSDD (un)deployment fragment to be added to the WSDD.
+ *
+ * @param deployWsdd the WSDD (un)deployment fragment to be added to the WSDD
+ */
+ public void setDeployWsdd( File deployWsdd )
+ {
+ m_wsddFiles.add( deployWsdd );
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @param wsddPaths DOCUMENT_ME
+ */
+ public void addConfiguredWsddPaths( FileSet wsddPaths )
+ {
+ File baseDir = wsddPaths.getDir( getProject() );
+ DirectoryScanner dirScanner = wsddPaths.getDirectoryScanner( getProject() );
+ String[] includedFiles = dirScanner.getIncludedFiles();
+ for ( int i = 0; i < includedFiles.length; i++ )
+ {
+ m_wsddFiles.add( new File( baseDir, includedFiles[i] ) );
+ }
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @param deployWsdd DOCUMENT_ME
+ * @throws Exception DOCUMENT_ME
+ */
+ public void deploy( File deployWsdd )
+ throws Exception
+ {
+ setDeployWsdd( deployWsdd );
+ execute();
+ }
+
+ /**
+ * DOCUMENT_ME
+ *
+ * @throws org.apache.tools.ant.BuildException DOCUMENT_ME
+ */
+ public void execute()
+ throws BuildException
+ {
+ if ( m_wsddFiles.isEmpty() )
+ {
+ throw new BuildException( "No deploy WSDDs were specified!" );
+ }
+
+ try
+ {
+ AxisEngine axisEngine = new AxisServer( new FileProvider( m_configWsdd ) );
+ m_msgContext = new MessageContext( axisEngine );
+ m_axisAdmin = new Admin();
+ for ( int i = 0; i < m_wsddFiles.size(); i++ )
+ {
+ deployWsdd( (File) m_wsddFiles.get( i ) );
+ }
+ }
+ catch ( Exception e )
+ {
+ throw new BuildException( e );
+ }
+ }
+
+ /**
+ * Command-line invocation entry point.
+ *
+ * @param args command-line arguments
+ * @throws Exception on fatal error
+ */
+ public static void main( String[] args )
+ throws Exception
+ {
+ //System.setProperty( SYSPROP_WSDD, "C:/server-config.wsdd" );
+ if ( args.length != 1 )
+ {
+ System.err.println( "Usage: " + WsddUpdater.class.getName() + " deployWsddFile" );
+ System.exit( 1 );
+ }
+
+ new WsddUpdater().deploy( new File( args[0] ) );
+ }
+
+ private void deployWsdd( File deployWsdd ) throws Exception
+ {
+ log( "Deploying WSDD " + deployWsdd + " to configuration WSDD " + m_configWsdd + "..." );
+ Element deployWsddElem = JaxpUtils.loadDocument( new FileInputStream( deployWsdd ) ).getDocumentElement();
+ m_axisAdmin.process( m_msgContext, deployWsddElem );
+ }
+}
Modified: incubator/apollo/trunk/src/site/content/tutorial/build.xml
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/site/content/tutorial/build.xml?view=diff&rev=124553&p1=incubator/apollo/trunk/src/site/content/tutorial/build.xml&r1=124552&p2=incubator/apollo/trunk/src/site/content/tutorial/build.xml&r2=124553
==============================================================================
--- incubator/apollo/trunk/src/site/content/tutorial/build.xml (original)
+++ incubator/apollo/trunk/src/site/content/tutorial/build.xml Fri Jan 7 09:59:34 2005
@@ -10,6 +10,7 @@
<property name="ant.home" value="env.ANT_HOME"/>
<property name="out.dir" location="generated"/>
+ <property name="lib.dir" location="${out.dir}/.xmlbeans/lib"/>
<property name="filesystem.wsdl" location="FileSystem.wsdl" />
<property name="sysprop.wsdl" location="SysProps.wsdl" />
@@ -22,11 +23,11 @@
<fail unless="wsrf.webapp.dir" message="webapp dir ../../webapps/wsrf does not exist." />
<echo>Using webapp dir: ${wsrf.webapp.dir}</echo>
- <mkdir dir="${out.dir}/lib" />
+ <mkdir dir="${lib.dir}" />
<path id="apollo.classpath.id">
<pathelement location="${wsrf.webapp.dir}/WEB-INF/classes" />
<fileset dir="${wsrf.webapp.dir}/WEB-INF/lib" includes="*.jar" />
- <fileset dir="${out.dir}/lib" includes="*.jar" />
+ <fileset dir="${lib.dir}" includes="*.jar" />
<pathelement location="${activation.jar}" />
<pathelement location="${mail.jar}" />
</path>
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&rev=124553&p1=incubator/apollo/trunk/src/templates/build.properties.vm&r1=124552&p2=incubator/apollo/trunk/src/templates/build.properties.vm&r2=124553
==============================================================================
--- incubator/apollo/trunk/src/templates/build.properties.vm (original)
+++ incubator/apollo/trunk/src/templates/build.properties.vm Fri Jan 7 09:59:34 2005
@@ -5,7 +5,7 @@
# 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=
+#wsrf.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&rev=124553&p1=incubator/apollo/trunk/src/templates/build.xml.vm&r1=124552&p2=incubator/apollo/trunk/src/templates/build.xml.vm&r2=124553
==============================================================================
--- incubator/apollo/trunk/src/templates/build.xml.vm (original)
+++ incubator/apollo/trunk/src/templates/build.xml.vm Fri Jan 7 09:59:34 2005
@@ -3,6 +3,8 @@
#set( $jarDir = $generated.JarDir )
#set( $classesDir = $generated.ClassesDir )
#set( $srcDir = $generated.SrcDir )
+#set( $jarFile = $generated.JarFileName )
+#set( $serviceName = $generated.ServiceName )
<?xml version="1.0"?>
<project name="filesystem_example" default="usage" basedir=".">
@@ -17,12 +19,12 @@
<property name="classes.dir" location="${classesDir}"/>
<property name="jar.dir" location="${jarDir}"/>
<property name="src.dir" location="${srcDir}" />
- <property name="wsdl.file" location="$wsdlName" />
+ <property name="wsdl.file" location="${srcDir}/../wsdl/${wsdlName}" />
- <target name="init">
+ <target name="init" unless="wsrf.webapp.dir">
<echo>Using webapp dir: ${wsrf.webapp.dir}</echo>
- <fail unless="${wsrf.webapp.dir}" message="Please set the location of the wsrf.webapp.dir in build.properties"/>
+ <fail message="Please set the location of the wsrf.webapp.dir in build.properties"/>
<path id="apollo.classpath.id">
<pathelement location="${wsrf.webapp.dir}/WEB-INF/classes" />
<fileset dir="${wsrf.webapp.dir}/WEB-INF/lib" includes="*.jar" />
@@ -58,7 +60,20 @@
<fileset dir="${classes.dir}" />
</copy>
- <!-- TODO: update server-config.wsdd using WsddUpdater -->
+ <copy file="${jar.dir}/${jarFile}" todir="${wsrf.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 -->
+ <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 -->
+ <jndiUpdater jndiConfig="${jndi.config}">
+ <jndiConfigPaths dir="${src.dir}" includes="**/${serviceName}_jndi-config.xml" />
+ </jndiUpdater>
</target>
@@ -72,9 +87,7 @@
</target>
<target name="clean" description="delete the generated source and class files">
- <delete dir="${src.dir}/xmlbeans" />
<delete dir="${classes.dir}" />
- <delete dir="${jar.dir}" />
</target>
<target name="usage">
Modified: incubator/apollo/trunk/src/webapp/WEB-INF/server-config.wsdd
Url: http://svn.apache.org/viewcvs/incubator/apollo/trunk/src/webapp/WEB-INF/server-config.wsdd?view=diff&rev=124553&p1=incubator/apollo/trunk/src/webapp/WEB-INF/server-config.wsdd&r1=124552&p2=incubator/apollo/trunk/src/webapp/WEB-INF/server-config.wsdd&r2=124553
==============================================================================
--- incubator/apollo/trunk/src/webapp/WEB-INF/server-config.wsdd (original)
+++ incubator/apollo/trunk/src/webapp/WEB-INF/server-config.wsdd Fri Jan 7 09:59:34 2005
@@ -54,24 +54,5 @@
</responseFlow>
</transport>
- <!-- style="message" -->
- <service name="filesystem" provider="java:WSRF" style="document" use="literal">
- <wsdlFile>/wsdl/FileSystem.wsdl</wsdlFile>
- <requestFlow>
- <handler type="java:org.apache.axis.handlers.JAXRPCHandler">
- <parameter name="className" value="org.apache.axis.message.addressing.handler.AxisServerSideAddressingHandler"/>
- <parameter name="referencePropertyNames" value="*"/>
- </handler>
- </requestFlow>
- </service>
- <!-- style="message" -->
- <service name="sysprops" provider="java:WSRF" style="document" use="literal">
- <wsdlFile>/wsdl/SysProps.wsdl</wsdlFile>
- <requestFlow>
- <handler type="java:org.apache.axis.handlers.JAXRPCHandler">
- <parameter name="className" value="org.apache.axis.message.addressing.handler.AxisServerSideAddressingHandler"/>
- <parameter name="referencePropertyNames" value="*"/>
- </handler>
- </requestFlow>
- </service>
+
</deployment>
---------------------------------------------------------------------
To unsubscribe, e-mail: apollo-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: apollo-dev-help@ws.apache.org