Author: veithen
Date: Sun Dec 9 21:23:06 2012
New Revision: 1419166
URL: http://svn.apache.org/viewvc?rev=1419166&view=rev
Log:
Let maven-axis-server-plugin prepare the server-config.wsdd file before
starting the server (instead of deploying the individual WSDD files using
AdminClient).
Added:
axis/axis1/java/trunk/axis-model/src/test/wsdd/stock.wsdd
Removed:
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AdminClientUtils.java
Modified:
axis/axis1/java/trunk/axis-model/model/wsdd.ecore
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/Chain.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ChainImpl.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeploymentImpl.java
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDPackageImpl.java
axis/axis1/java/trunk/maven/maven-axis-server-plugin/pom.xml
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartProcessMojo.java
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AxisServerProcessControl.java
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartDaemonMojo.java
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java
axis/axis1/java/trunk/maven/maven-wsdd-plugin/src/main/java/org/apache/axis/tools/maven/wsdd/GenerateWSDDMojo.java
axis/axis1/java/trunk/samples/attachments-sample/pom.xml
axis/axis1/java/trunk/samples/encoding-sample/pom.xml
axis/axis1/java/trunk/samples/faults-sample/pom.xml
axis/axis1/java/trunk/samples/jaxrpc-sample/pom.xml
axis/axis1/java/trunk/samples/message-sample/pom.xml
axis/axis1/java/trunk/samples/misc-sample/pom.xml
axis/axis1/java/trunk/samples/stock-sample/pom.xml
Modified: axis/axis1/java/trunk/axis-model/model/wsdd.ecore
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-model/model/wsdd.ecore?rev=1419166&r1=1419165&r2=1419166&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis-model/model/wsdd.ecore (original)
+++ axis/axis1/java/trunk/axis-model/model/wsdd.ecore Sun Dec 9 21:23:06 2012
@@ -112,6 +112,8 @@
<eStructuralFeatures xsi:type="ecore:EAttribute" name="type"
eType="ecore:EDataType xml.ecore#//QName"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Chain">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name"
eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="type"
eType="ecore:EDataType xml.ecore#//QName"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="handlers"
upperBound="-1"
eType="#//Handler" containment="true">
<eAnnotations
source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData";>
Modified:
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/Chain.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/Chain.java?rev=1419166&r1=1419165&r2=1419166&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/Chain.java
(original)
+++
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/Chain.java
Sun Dec 9 21:23:06 2012
@@ -7,6 +7,7 @@
package org.apache.axis.model.wsdd;
import java.util.List;
+import javax.xml.namespace.QName;
/**
@@ -17,6 +18,8 @@ import java.util.List;
* <p>
* The following features are supported:
* <ul>
+ * <li>{@link org.apache.axis.model.wsdd.Chain#getName <em>Name</em>}</li>
+ * <li>{@link org.apache.axis.model.wsdd.Chain#getType <em>Type</em>}</li>
* <li>{@link org.apache.axis.model.wsdd.Chain#getHandlers
<em>Handlers</em>}</li>
* </ul>
* </p>
@@ -27,6 +30,56 @@ import java.util.List;
public interface Chain {
/**
+ * Returns the value of the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Name</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Name</em>' attribute.
+ * @see #setName(String)
+ * @model
+ * @generated
+ */
+ String getName();
+
+ /**
+ * Sets the value of the '{@link org.apache.axis.model.wsdd.Chain#getName
<em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Name</em>' attribute.
+ * @see #getName()
+ * @generated
+ */
+ void setName(String value);
+
+ /**
+ * Returns the value of the '<em><b>Type</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Type</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Type</em>' attribute.
+ * @see #setType(QName)
+ * @model dataType="org.apache.axis.model.xml.QName"
+ * @generated
+ */
+ QName getType();
+
+ /**
+ * Sets the value of the '{@link org.apache.axis.model.wsdd.Chain#getType
<em>Type</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Type</em>' attribute.
+ * @see #getType()
+ * @generated
+ */
+ void setType(QName value);
+
+ /**
* Returns the value of the '<em><b>Handlers</b></em>' containment
reference list.
* The list contents are of type {@link
org.apache.axis.model.wsdd.Handler}.
* <!-- begin-user-doc -->
Modified:
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ChainImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ChainImpl.java?rev=1419166&r1=1419165&r2=1419166&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ChainImpl.java
(original)
+++
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/ChainImpl.java
Sun Dec 9 21:23:06 2012
@@ -8,6 +8,7 @@ package org.apache.axis.model.wsdd.impl;
import java.util.Collection;
import java.util.List;
+import javax.xml.namespace.QName;
import org.apache.axis.model.wsdd.Chain;
import org.apache.axis.model.wsdd.Handler;
@@ -27,6 +28,8 @@ import org.eclipse.emf.ecore.util.Intern
* <p>
* The following features are implemented:
* <ul>
+ * <li>{@link org.apache.axis.model.wsdd.impl.ChainImpl#getName
<em>Name</em>}</li>
+ * <li>{@link org.apache.axis.model.wsdd.impl.ChainImpl#getType
<em>Type</em>}</li>
* <li>{@link org.apache.axis.model.wsdd.impl.ChainImpl#getHandlers
<em>Handlers</em>}</li>
* </ul>
* </p>
@@ -35,6 +38,42 @@ import org.eclipse.emf.ecore.util.Intern
*/
public class ChainImpl extends EObjectImpl implements Chain {
/**
+ * The default value of the '{@link #getName() <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected static final String NAME_EDEFAULT = null;
+ /**
+ * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getName()
+ * @generated
+ * @ordered
+ */
+ protected String name = NAME_EDEFAULT;
+ /**
+ * The default value of the '{@link #getType() <em>Type</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getType()
+ * @generated
+ * @ordered
+ */
+ protected static final QName TYPE_EDEFAULT = null;
+ /**
+ * The cached value of the '{@link #getType() <em>Type</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getType()
+ * @generated
+ * @ordered
+ */
+ protected QName type = TYPE_EDEFAULT;
+ /**
* The cached value of the '{@link #getHandlers() <em>Handlers</em>}'
containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -67,6 +106,42 @@ public class ChainImpl extends EObjectIm
* <!-- end-user-doc -->
* @generated
*/
+ public String getName() {
+ return name;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setName(String newName) {
+ name = newName;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public QName getType() {
+ return type;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setType(QName newType) {
+ type = newType;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public List getHandlers() {
if (handlers == null) {
handlers = new BasicInternalEList(Handler.class);
@@ -94,6 +169,10 @@ public class ChainImpl extends EObjectIm
*/
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
+ case WSDDPackageImpl.CHAIN__NAME:
+ return getName();
+ case WSDDPackageImpl.CHAIN__TYPE:
+ return getType();
case WSDDPackageImpl.CHAIN__HANDLERS:
return getHandlers();
}
@@ -107,6 +186,12 @@ public class ChainImpl extends EObjectIm
*/
public void eSet(int featureID, Object newValue) {
switch (featureID) {
+ case WSDDPackageImpl.CHAIN__NAME:
+ setName((String)newValue);
+ return;
+ case WSDDPackageImpl.CHAIN__TYPE:
+ setType((QName)newValue);
+ return;
case WSDDPackageImpl.CHAIN__HANDLERS:
getHandlers().clear();
getHandlers().addAll((Collection)newValue);
@@ -122,6 +207,12 @@ public class ChainImpl extends EObjectIm
*/
public void eUnset(int featureID) {
switch (featureID) {
+ case WSDDPackageImpl.CHAIN__NAME:
+ setName(NAME_EDEFAULT);
+ return;
+ case WSDDPackageImpl.CHAIN__TYPE:
+ setType(TYPE_EDEFAULT);
+ return;
case WSDDPackageImpl.CHAIN__HANDLERS:
getHandlers().clear();
return;
@@ -136,10 +227,31 @@ public class ChainImpl extends EObjectIm
*/
public boolean eIsSet(int featureID) {
switch (featureID) {
+ case WSDDPackageImpl.CHAIN__NAME:
+ return NAME_EDEFAULT == null ? name != null :
!NAME_EDEFAULT.equals(name);
+ case WSDDPackageImpl.CHAIN__TYPE:
+ return TYPE_EDEFAULT == null ? type != null :
!TYPE_EDEFAULT.equals(type);
case WSDDPackageImpl.CHAIN__HANDLERS:
return handlers != null && !handlers.isEmpty();
}
return super.eIsSet(featureID);
}
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String toString() {
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (name: ");
+ result.append(name);
+ result.append(", type: ");
+ result.append(type);
+ result.append(')');
+ return result.toString();
+ }
+
} //FlowImpl
Modified:
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeploymentImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeploymentImpl.java?rev=1419166&r1=1419165&r2=1419166&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeploymentImpl.java
(original)
+++
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/DeploymentImpl.java
Sun Dec 9 21:23:06 2012
@@ -216,6 +216,9 @@ public class DeploymentImpl extends Mapp
getHandlers().addAll(other.getHandlers());
getTransports().addAll(other.getTransports());
getServices().addAll(other.getServices());
+ getTypeMappings().addAll(other.getTypeMappings());
+ getBeanMappings().addAll(other.getBeanMappings());
+ getArrayMappings().addAll(other.getArrayMappings());
}
/**
Modified:
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDPackageImpl.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDPackageImpl.java?rev=1419166&r1=1419165&r2=1419166&view=diff
==============================================================================
---
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDPackageImpl.java
(original)
+++
axis/axis1/java/trunk/axis-model/src/main/java/org/apache/axis/model/wsdd/impl/WSDDPackageImpl.java
Sun Dec 9 21:23:06 2012
@@ -713,13 +713,31 @@ public class WSDDPackageImpl extends EPa
public static final int CHAIN = 11;
/**
+ * The feature id for the '<em><b>Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int CHAIN__NAME = 0;
+
+ /**
+ * The feature id for the '<em><b>Type</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ public static final int CHAIN__TYPE = 1;
+
+ /**
* The feature id for the '<em><b>Handlers</b></em>' containment reference
list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- public static final int CHAIN__HANDLERS = 0;
+ public static final int CHAIN__HANDLERS = 2;
/**
* The number of structural features of the '<em>Chain</em>' class.
@@ -728,7 +746,7 @@ public class WSDDPackageImpl extends EPa
* @generated
* @ordered
*/
- public static final int CHAIN_FEATURE_COUNT = 1;
+ public static final int CHAIN_FEATURE_COUNT = 3;
/**
* The meta object id for the '{@link
org.apache.axis.model.wsdd.impl.DeployableItemImpl <em>Deployable Item</em>}'
class.
@@ -1922,6 +1940,32 @@ public class WSDDPackageImpl extends EPa
}
/**
+ * Returns the meta object for the attribute '{@link
org.apache.axis.model.wsdd.Chain#getName <em>Name</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Name</em>'.
+ * @see org.apache.axis.model.wsdd.Chain#getName()
+ * @see #getChain()
+ * @generated
+ */
+ public EAttribute getChain_Name() {
+ return (EAttribute)chainEClass.getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * Returns the meta object for the attribute '{@link
org.apache.axis.model.wsdd.Chain#getType <em>Type</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Type</em>'.
+ * @see org.apache.axis.model.wsdd.Chain#getType()
+ * @see #getChain()
+ * @generated
+ */
+ public EAttribute getChain_Type() {
+ return (EAttribute)chainEClass.getEStructuralFeatures().get(1);
+ }
+
+ /**
* Returns the meta object for the containment reference list '{@link
org.apache.axis.model.wsdd.Chain#getHandlers <em>Handlers</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -1931,7 +1975,7 @@ public class WSDDPackageImpl extends EPa
* @generated
*/
public EReference getChain_Handlers() {
- return (EReference)chainEClass.getEStructuralFeatures().get(0);
+ return (EReference)chainEClass.getEStructuralFeatures().get(2);
}
/**
@@ -2290,6 +2334,8 @@ public class WSDDPackageImpl extends EPa
createEAttribute(handlerEClass, HANDLER__TYPE);
chainEClass = createEClass(CHAIN);
+ createEAttribute(chainEClass, CHAIN__NAME);
+ createEAttribute(chainEClass, CHAIN__TYPE);
createEReference(chainEClass, CHAIN__HANDLERS);
deployableItemEClass = createEClass(DEPLOYABLE_ITEM);
@@ -2424,6 +2470,8 @@ public class WSDDPackageImpl extends EPa
initEAttribute(getHandler_Type(), theXmlPackage.getQName(), "type",
null, 0, 1, Handler.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(chainEClass, Chain.class, "Chain", !IS_ABSTRACT,
!IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getChain_Name(), ecorePackage.getEString(), "name",
null, 0, 1, Chain.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getChain_Type(), theXmlPackage.getQName(), "type",
null, 0, 1, Chain.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
!IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getChain_Handlers(), this.getHandler(), null,
"handlers", null, 0, -1, Chain.class, !IS_TRANSIENT, !IS_VOLATILE,
IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEClass(deployableItemEClass, DeployableItem.class,
"DeployableItem", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -3027,6 +3075,22 @@ public class WSDDPackageImpl extends EPa
public static final EClass CHAIN = eINSTANCE.getChain();
/**
+ * The meta object literal for the '<em><b>Name</b></em>' attribute
feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final EAttribute CHAIN__NAME = eINSTANCE.getChain_Name();
+
+ /**
+ * The meta object literal for the '<em><b>Type</b></em>' attribute
feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public static final EAttribute CHAIN__TYPE = eINSTANCE.getChain_Type();
+
+ /**
* The meta object literal for the '<em><b>Handlers</b></em>'
containment reference list feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
Added: axis/axis1/java/trunk/axis-model/src/test/wsdd/stock.wsdd
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-model/src/test/wsdd/stock.wsdd?rev=1419166&view=auto
==============================================================================
--- axis/axis1/java/trunk/axis-model/src/test/wsdd/stock.wsdd (added)
+++ axis/axis1/java/trunk/axis-model/src/test/wsdd/stock.wsdd Sun Dec 9
21:23:06 2012
@@ -0,0 +1,31 @@
+<!-- Use this file to deploy some handlers/chains and services -->
+<!-- Two ways to do this: -->
+<!-- java org.apache.axis.client.AdminClient deploy.wsdd -->
+<!-- after the axis server is running -->
+<!-- or -->
+<!-- java org.apache.axis.utils.Admin client|server deploy.wsdd -->
+<!-- from the same directory that the Axis engine runs -->
+
+<deployment name="test" xmlns="http://xml.apache.org/axis/wsdd/";
+ xmlns:java="http://xml.apache.org/axis/wsdd/providers/java";>
+
+ <service name="urn:xmltoday-delayed-quotes" provider="java:RPC">
+ <parameter name="className" value="samples.stock.StockQuoteService"/>
+ <parameter name="allowedMethods" value="getQuote test"/>
+ <parameter name="allowedRoles" value="user1,user2"/>
+ <parameter name="wsdlServicePort" value="GetQuote"/>
+
+ <requestFlow name="checks">
+ <handler
type="java:org.apache.axis.handlers.SimpleAuthenticationHandler"/>
+ <handler
type="java:org.apache.axis.handlers.SimpleAuthorizationHandler"/>
+ </requestFlow>
+ </service>
+
+ <service name="urn:cominfo" provider="java:RPC">
+ <parameter name="className" value="samples.stock.ComInfoService" />
+ <parameter name="allowedMethods" value="getInfo" />
+ <parameter name="allowedRoles" value="user3"/>
+ <requestFlow type="checks"/>
+ </service>
+
+</deployment>
Modified: axis/axis1/java/trunk/maven/maven-axis-server-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/maven/maven-axis-server-plugin/pom.xml?rev=1419166&r1=1419165&r2=1419166&view=diff
==============================================================================
--- axis/axis1/java/trunk/maven/maven-axis-server-plugin/pom.xml (original)
+++ axis/axis1/java/trunk/maven/maven-axis-server-plugin/pom.xml Sun Dec 9
21:23:06 2012
@@ -44,6 +44,11 @@
<artifactId>axis-rt-core</artifactId>
</dependency>
<dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis-model</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-plugin-api</artifactId>
</dependency>
@@ -69,13 +74,13 @@
<groupId>${project.groupId}</groupId>
<artifactId>daemon-launcher</artifactId>
<version>${project.version}</version>
- <type>pom</type>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>axis-standalone-server</artifactId>
<version>${project.version}</version>
- <type>pom</type>
+ <scope>test</scope>
</dependency>
</dependencies>
<reporting>
Modified:
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartProcessMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartProcessMojo.java?rev=1419166&r1=1419165&r2=1419166&view=diff
==============================================================================
---
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartProcessMojo.java
(original)
+++
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AbstractStartProcessMojo.java
Sun Dec 9 21:23:06 2012
@@ -96,7 +96,7 @@ public abstract class AbstractStartProce
/**
* @component
*/
- protected ArtifactFactory artifactFactory;
+ private ArtifactFactory artifactFactory;
/**
* @component
@@ -159,6 +159,16 @@ public abstract class AbstractStartProce
*/
private String argLine;
+ /**
+ * @parameter default-value="${plugin.version}"
+ * @required
+ * @readonly
+ */
+ private String axisVersion;
+
+ private final Set/*<Artifact>*/ additionalDependencies = new HashSet();
+ private List/*<File>*/ classpath;
+
private Logger logger;
public void enableLogging(Logger logger) {
@@ -169,61 +179,72 @@ public abstract class AbstractStartProce
return debug;
}
- private List/*<File>*/ buildClasspath(Set/*<Artifact>*/
additionalArtifacts) throws ProjectBuildingException,
InvalidDependencyVersionException, ArtifactResolutionException,
ArtifactNotFoundException {
- final Log log = getLog();
-
- // We need dependencies in scope test. Since this is the largest
scope, we don't need
- // to do any additional filtering based on dependency scope.
- Set projectDependencies = project.getArtifacts();
-
- final Set artifacts = new HashSet(projectDependencies);
-
- if (additionalArtifacts != null) {
- for (Iterator it = additionalArtifacts.iterator(); it.hasNext(); )
{
- Artifact a = (Artifact)it.next();
- if (log.isDebugEnabled()) {
- log.debug("Resolving artifact to be added to classpath: "
+ a);
- }
- ArtifactFilter filter = new ArtifactFilter() {
- public boolean include(Artifact artifact) {
- String id = artifact.getDependencyConflictId();
- for (Iterator it = artifacts.iterator(); it.hasNext();
) {
- if
(id.equals(((Artifact)it.next()).getDependencyConflictId())) {
- return false;
+ protected final void addDependency(String groupId, String artifactId,
String version) {
+ additionalDependencies.add(artifactFactory.createArtifact(groupId,
artifactId, version, Artifact.SCOPE_TEST, "jar"));
+ classpath = null;
+ }
+
+ protected final void addAxisDependency(String artifactId) {
+ addDependency("org.apache.axis", artifactId, axisVersion);
+ }
+
+ protected final List/*<File>*/ getClasspath() throws
ProjectBuildingException, InvalidDependencyVersionException,
ArtifactResolutionException, ArtifactNotFoundException {
+ if (classpath == null) {
+ final Log log = getLog();
+
+ // We need dependencies in scope test. Since this is the largest
scope, we don't need
+ // to do any additional filtering based on dependency scope.
+ Set projectDependencies = project.getArtifacts();
+
+ final Set artifacts = new HashSet(projectDependencies);
+
+ if (additionalDependencies != null) {
+ for (Iterator it = additionalDependencies.iterator();
it.hasNext(); ) {
+ Artifact a = (Artifact)it.next();
+ if (log.isDebugEnabled()) {
+ log.debug("Resolving artifact to be added to
classpath: " + a);
+ }
+ ArtifactFilter filter = new ArtifactFilter() {
+ public boolean include(Artifact artifact) {
+ String id = artifact.getDependencyConflictId();
+ for (Iterator it = artifacts.iterator();
it.hasNext(); ) {
+ if
(id.equals(((Artifact)it.next()).getDependencyConflictId())) {
+ return false;
+ }
}
+ return true;
}
- return true;
+ };
+ MavenProject p = projectBuilder.buildFromRepository(a,
remoteArtifactRepositories, localRepository);
+ if (filter.include(p.getArtifact())) {
+ Set s = p.createArtifacts(artifactFactory,
Artifact.SCOPE_RUNTIME, filter);
+ artifacts.addAll(artifactCollector.collect(s,
+ p.getArtifact(), p.getManagedVersionMap(),
+ localRepository, remoteArtifactRepositories,
artifactMetadataSource, filter,
+ Collections.singletonList(new
DebugResolutionListener(logger))).getArtifacts());
+ artifacts.add(p.getArtifact());
}
- };
- MavenProject p = projectBuilder.buildFromRepository(a,
remoteArtifactRepositories, localRepository);
- if (filter.include(p.getArtifact())) {
- Set s = p.createArtifacts(artifactFactory,
Artifact.SCOPE_RUNTIME, filter);
- artifacts.addAll(artifactCollector.collect(s,
- p.getArtifact(), p.getManagedVersionMap(),
- localRepository, remoteArtifactRepositories,
artifactMetadataSource, filter,
- Collections.singletonList(new
DebugResolutionListener(logger))).getArtifacts());
- artifacts.add(p.getArtifact());
}
}
- }
-
- List/*<File>*/ cp = new ArrayList();
- cp.add(project.getBuild().getTestOutputDirectory());
- cp.add(project.getBuild().getOutputDirectory());
- for (Iterator it = artifacts.iterator(); it.hasNext(); ) {
- Artifact a = (Artifact)it.next();
- if (a.getArtifactHandler().isAddedToClasspath()) {
- if (a.getFile() == null) {
- artifactResolver.resolve(a, remoteArtifactRepositories,
localRepository);
+
+ classpath = new ArrayList();
+ classpath.add(new
File(project.getBuild().getTestOutputDirectory()));
+ classpath.add(new File(project.getBuild().getOutputDirectory()));
+ for (Iterator it = artifacts.iterator(); it.hasNext(); ) {
+ Artifact a = (Artifact)it.next();
+ if (a.getArtifactHandler().isAddedToClasspath()) {
+ if (a.getFile() == null) {
+ artifactResolver.resolve(a,
remoteArtifactRepositories, localRepository);
+ }
+ classpath.add(a.getFile());
}
- cp.add(a.getFile());
}
}
- return cp;
+ return classpath;
}
- protected final void startJavaProcess(String description, String
mainClass, Set additionalDependencies, String[] args, File workDir,
ProcessControl processControl) throws MojoExecutionException,
MojoFailureException {
+ protected final void startJavaProcess(String description, String
mainClass, String[] args, File workDir, ProcessControl processControl) throws
MojoExecutionException, MojoFailureException {
Log log = getLog();
// Locate java executable to use
@@ -241,7 +262,7 @@ public abstract class AbstractStartProce
// Get class path
List classpath;
try {
- classpath = buildClasspath(additionalDependencies);
+ classpath = getClasspath();
} catch (Exception ex) {
throw new MojoExecutionException("Failed to build classpath", ex);
}
Modified:
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AxisServerProcessControl.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AxisServerProcessControl.java?rev=1419166&r1=1419165&r2=1419166&view=diff
==============================================================================
---
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AxisServerProcessControl.java
(original)
+++
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/AxisServerProcessControl.java
Sun Dec 9 21:23:06 2012
@@ -18,7 +18,6 @@
*/
package org.apache.axis.tools.maven.server;
-import java.io.File;
import java.net.URL;
import java.rmi.RemoteException;
@@ -31,15 +30,11 @@ import org.codehaus.plexus.logging.Logge
public class AxisServerProcessControl implements ProcessControl {
private final int port;
private final AdminClient adminClient;
- private final File[] deployments;
- private final File[] undeployments;
private final int timeout;
- public AxisServerProcessControl(int port, AdminClient adminClient, File[]
deployments, File[] undeployments, int timeout) {
+ public AxisServerProcessControl(int port, AdminClient adminClient, int
timeout) {
this.port = port;
this.adminClient = adminClient;
- this.deployments = deployments;
- this.undeployments = undeployments;
this.timeout = timeout;
}
@@ -68,13 +63,9 @@ public class AxisServerProcessControl im
}
Thread.sleep(200);
}
-
- // Deploy services
- AdminClientUtils.process(logger, adminClient, deployments);
}
public int shutdownProcess(Logger logger) throws Exception {
- AdminClientUtils.process(logger, adminClient, undeployments);
adminClient.quit();
return STOPPING;
}
Modified:
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartDaemonMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartDaemonMojo.java?rev=1419166&r1=1419165&r2=1419166&view=diff
==============================================================================
---
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartDaemonMojo.java
(original)
+++
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartDaemonMojo.java
Sun Dec 9 21:23:06 2012
@@ -21,10 +21,7 @@ package org.apache.axis.tools.maven.serv
import java.io.File;
import java.io.IOException;
import java.net.ServerSocket;
-import java.util.HashSet;
-import java.util.Set;
-import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
@@ -37,13 +34,6 @@ import org.apache.maven.plugin.MojoFailu
*/
public class StartDaemonMojo extends AbstractStartProcessMojo {
/**
- * @parameter default-value="${plugin.version}"
- * @required
- * @readonly
- */
- private String axisVersion;
-
- /**
* The daemon class.
*
* @parameter
@@ -82,8 +72,7 @@ public class StartDaemonMojo extends Abs
if (args != null) {
System.arraycopy(args, 0, vmArgs, 2, args.length);
}
- Set additionalDependencies = new HashSet();
-
additionalDependencies.add(artifactFactory.createArtifact("org.apache.axis",
"daemon-launcher", axisVersion, Artifact.SCOPE_TEST, "jar"));
- startJavaProcess(daemonClass, "org.apache.axis.tools.daemon.Launcher",
additionalDependencies, vmArgs, workDir, new DaemonProcessControl(controlPort));
+ addAxisDependency("daemon-launcher");
+ startJavaProcess(daemonClass, "org.apache.axis.tools.daemon.Launcher",
vmArgs, workDir, new DaemonProcessControl(controlPort));
}
}
Modified:
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java?rev=1419166&r1=1419165&r2=1419166&view=diff
==============================================================================
---
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java
(original)
+++
axis/axis1/java/trunk/maven/maven-axis-server-plugin/src/main/java/org/apache/axis/tools/maven/server/StartServerMojo.java
Sun Dec 9 21:23:06 2012
@@ -19,27 +19,24 @@
package org.apache.axis.tools.maven.server;
import java.io.File;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.net.MalformedURLException;
import java.net.URL;
+import java.net.URLClassLoader;
import java.util.ArrayList;
-import java.util.HashSet;
import java.util.List;
-import java.util.Set;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
import org.apache.axis.client.AdminClient;
-import org.apache.axis.deployment.wsdd.WSDDConstants;
-import org.apache.maven.artifact.Artifact;
+import org.apache.axis.model.wsdd.Deployment;
+import org.apache.axis.model.wsdd.WSDDUtil;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.logging.Log;
import org.codehaus.plexus.util.DirectoryScanner;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.StringUtils;
-import org.w3c.dom.Element;
+import org.xml.sax.InputSource;
/**
* Start a {@link org.apache.axis.server.standalone.StandaloneAxisServer}
instance in a separate
@@ -51,13 +48,6 @@ import org.w3c.dom.Element;
*/
public class StartServerMojo extends AbstractStartProcessMojo {
/**
- * @parameter default-value="${plugin.version}"
- * @required
- * @readonly
- */
- private String axisVersion;
-
- /**
* @parameter default-value="${project.build.directory}/axis-server"
* @required
* @readonly
@@ -80,9 +70,7 @@ public class StartServerMojo extends Abs
private int maxSessions;
/**
- * A set of WSDD files for services to deploy. The WSDD files may be
deployment or undeployment
- * requests. Undeployment requests will be processed when the server is
stopped. The primary use
- * case for this is to test undeployment.
+ * A set of WSDD files for services to deploy.
*
* @parameter
*/
@@ -129,21 +117,34 @@ public class StartServerMojo extends Abs
protected void doExecute() throws MojoExecutionException,
MojoFailureException {
Log log = getLog();
+ // Need to setup additional dependencies before building the default
configuration!
+ addAxisDependency("axis-standalone-server");
+
// Determine the port to be used
int actualPort = foreground && foregroundPort != -1 ? foregroundPort :
port;
- // Select WSDD files
- List deployments = new ArrayList();
- List undeployments = new ArrayList();
- if (wsdds != null && wsdds.length > 0) {
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
- DocumentBuilder documentBuilder;
+ // Prepare a work directory where we can place the server-config.wsdd
file
+ File workDir = new File(workDirBase, String.valueOf(actualPort));
+ if (workDir.exists()) {
try {
- documentBuilder = dbf.newDocumentBuilder();
- } catch (ParserConfigurationException ex) {
- throw new MojoFailureException("Unable to initialize DOM
parser", ex);
+ FileUtils.deleteDirectory(workDir);
+ } catch (IOException ex) {
+ throw new MojoFailureException("Failed to clean the work
directory", ex);
}
+ }
+ File webInfDir = new File(workDir, "WEB-INF");
+ webInfDir.mkdirs();
+
+ // Start with the default configuration (which depends on the JARs in
the classpath)
+ Deployment deployment;
+ try {
+ deployment =
WSDDUtil.buildDefaultConfiguration(buildClassLoader(), "server");
+ } catch (IOException ex) {
+ throw new MojoExecutionException("Failed to build default server
configuration", ex);
+ }
+
+ // Select WSDD files
+ if (wsdds != null) {
for (int i=0; i<wsdds.length; i++) {
FileSet wsdd = wsdds[i];
DirectoryScanner scanner = wsdd.createScanner();
@@ -151,47 +152,30 @@ public class StartServerMojo extends Abs
String[] includedFiles = scanner.getIncludedFiles();
for (int j=0; j<includedFiles.length; j++) {
File wsddFile = new File(wsdd.getDirectory(),
includedFiles[j]);
- Element wsddElement;
try {
- wsddElement =
documentBuilder.parse(wsddFile).getDocumentElement();
- } catch (Exception ex) {
- log.warn("Skipping " + wsddFile + ": not an XML file",
ex);
- continue;
- }
- if
(WSDDConstants.URI_WSDD.equals(wsddElement.getNamespaceURI())) {
- String type = wsddElement.getLocalName();
- if (type.equals(WSDDConstants.ELEM_WSDD_DEPLOY)) {
- deployments.add(wsddFile);
- } else if
(type.equals(WSDDConstants.ELEM_WSDD_UNDEPLOY)) {
- undeployments.add(wsddFile);
- } else {
- log.warn("Skipping " + wsddFile + ": unexpected
WSDD type");
- }
- } else {
- log.warn("Skipping " + wsddFile + ": not a WSDD file");
+ deployment.merge(WSDDUtil.load(new
InputSource(wsddFile.toURI().toString())));
+ } catch (IOException ex) {
+ throw new MojoExecutionException("Failed to load " +
wsddFile, ex);
}
+ getLog().info("Processed " + wsddFile);
}
}
- if (log.isDebugEnabled()) {
- log.debug("Deployments: " + deployments);
- log.debug("Undeployments: " + undeployments);
- }
}
- // Prepare a work directory where the server can create a
server-config.wsdd file
- File workDir = new File(workDirBase, String.valueOf(actualPort));
- if (workDir.exists()) {
+ // Write the server-config.wsdd file
+ File serverConfigWsdd = new File(webInfDir, "server-config.wsdd");
+ try {
+ FileOutputStream out = new FileOutputStream(serverConfigWsdd);
try {
- FileUtils.deleteDirectory(workDir);
- } catch (IOException ex) {
- throw new MojoFailureException("Failed to clean the work
directory", ex);
+ WSDDUtil.save(deployment, out);
+ } finally {
+ out.close();
}
+ } catch (IOException ex) {
+ throw new MojoExecutionException("Failed to write " +
serverConfigWsdd, ex);
}
- workDir.mkdirs();
if (configs != null && configs.length > 0) {
- File webInfDir = new File(workDir, "WEB-INF");
- webInfDir.mkdirs();
for (int i=0; i<configs.length; i++) {
FileSet config = configs[i];
DirectoryScanner scanner = config.createScanner();
@@ -224,17 +208,12 @@ public class StartServerMojo extends Abs
try {
AdminClient adminClient = new AdminClient(true);
adminClient.setTargetEndpointAddress(new URL("http://localhost:"; +
actualPort + "/axis/services/AdminService"));
- Set additionalDependencies = new HashSet();
-
additionalDependencies.add(artifactFactory.createArtifact("org.apache.axis",
"axis-standalone-server", axisVersion, Artifact.SCOPE_TEST, "jar"));
startJavaProcess(
"Server on port " + actualPort,
"org.apache.axis.server.standalone.StandaloneAxisServer",
- additionalDependencies,
(String[])args.toArray(new String[args.size()]),
workDir,
new AxisServerProcessControl(actualPort, adminClient,
- (File[])deployments.toArray(new
File[deployments.size()]),
- (File[])undeployments.toArray(new
File[undeployments.size()]),
isDebug() || foreground ? Integer.MAX_VALUE :
20000));
} catch (Exception ex) {
throw new MojoFailureException("Failed to start server", ex);
@@ -253,4 +232,22 @@ public class StartServerMojo extends Abs
}
}
}
+
+ private ClassLoader buildClassLoader() throws MojoExecutionException {
+ List classpath;
+ try {
+ classpath = getClasspath();
+ } catch (Exception ex) {
+ throw new MojoExecutionException("Failed to build classpath", ex);
+ }
+ URL[] urls = new URL[classpath.size()];
+ for (int i=0; i<classpath.size(); i++) {
+ try {
+ urls[i] = ((File)classpath.get(i)).toURI().toURL();
+ } catch (MalformedURLException ex) {
+ throw new MojoExecutionException("Unexpected exception", ex);
+ }
+ }
+ return new URLClassLoader(urls);
+ }
}
Modified:
axis/axis1/java/trunk/maven/maven-wsdd-plugin/src/main/java/org/apache/axis/tools/maven/wsdd/GenerateWSDDMojo.java
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/maven/maven-wsdd-plugin/src/main/java/org/apache/axis/tools/maven/wsdd/GenerateWSDDMojo.java?rev=1419166&r1=1419165&r2=1419166&view=diff
==============================================================================
---
axis/axis1/java/trunk/maven/maven-wsdd-plugin/src/main/java/org/apache/axis/tools/maven/wsdd/GenerateWSDDMojo.java
(original)
+++
axis/axis1/java/trunk/maven/maven-wsdd-plugin/src/main/java/org/apache/axis/tools/maven/wsdd/GenerateWSDDMojo.java
Sun Dec 9 21:23:06 2012
@@ -106,47 +106,11 @@ public class GenerateWSDDMojo extends Ab
Deployment deployment;
- // Note: To locate the different parts of the default configuration,
we use the same
- // algorithm as in DefaultConfiguration.
-
- // Load the base configuration
- String resourceName = "org/apache/axis/" + type + "/" + type +
"-config.wsdd";
- InputStream in = cl.getResourceAsStream(resourceName);
- if (in == null) {
- throw new MojoFailureException("Resource " + resourceName + " not
found");
- }
- getLog().info("Loading resource " + resourceName);
- try {
- try {
- deployment = WSDDUtil.load(new InputSource(in));
- } finally {
- in.close();
- }
- } catch (IOException ex) {
- throw new MojoFailureException("Failed to process resource " +
resourceName, ex);
- }
-
- // Discover and load additional default configuration fragments
- resourceName = "META-INF/axis/default-" + type + "-config.wsdd";
- Enumeration resources;
+ getLog().info("Loading default configuration");
try {
- resources = cl.getResources(resourceName);
+ deployment = WSDDUtil.buildDefaultConfiguration(cl, type);
} catch (IOException ex) {
- throw new MojoFailureException("Failed to discover resources with
name " + resourceName, ex);
- }
- while (resources.hasMoreElements()) {
- URL url = (URL)resources.nextElement();
- getLog().info("Loading " + url);
- try {
- in = url.openStream();
- try {
- deployment.merge(WSDDUtil.load(new InputSource(in)));
- } finally {
- in.close();
- }
- } catch (Exception ex) {
- throw new MojoFailureException("Failed to process " + url, ex);
- }
+ throw new MojoFailureException("Unable to build default
configuration", ex);
}
if (files != null) {
Modified: axis/axis1/java/trunk/samples/attachments-sample/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/attachments-sample/pom.xml?rev=1419166&r1=1419165&r2=1419166&view=diff
==============================================================================
--- axis/axis1/java/trunk/samples/attachments-sample/pom.xml (original)
+++ axis/axis1/java/trunk/samples/attachments-sample/pom.xml Sun Dec 9
21:23:06 2012
@@ -86,7 +86,8 @@
<wsdd>
<directory>src/main/wsdd</directory>
<includes>
- <include>**/*.wsdd</include>
+ <include>attachdeploy.wsdd</include>
+ <include>testref.wsdd</include>
</includes>
</wsdd>
</wsdds>
Modified: axis/axis1/java/trunk/samples/encoding-sample/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/encoding-sample/pom.xml?rev=1419166&r1=1419165&r2=1419166&view=diff
==============================================================================
--- axis/axis1/java/trunk/samples/encoding-sample/pom.xml (original)
+++ axis/axis1/java/trunk/samples/encoding-sample/pom.xml Sun Dec 9 21:23:06
2012
@@ -86,7 +86,7 @@
<wsdd>
<directory>src/main/wsdd</directory>
<includes>
- <include>**/*.wsdd</include>
+ <include>deploy.wsdd</include>
</includes>
</wsdd>
</wsdds>
Modified: axis/axis1/java/trunk/samples/faults-sample/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/faults-sample/pom.xml?rev=1419166&r1=1419165&r2=1419166&view=diff
==============================================================================
--- axis/axis1/java/trunk/samples/faults-sample/pom.xml (original)
+++ axis/axis1/java/trunk/samples/faults-sample/pom.xml Sun Dec 9 21:23:06 2012
@@ -86,7 +86,7 @@
<wsdd>
<directory>src/main/wsdd</directory>
<includes>
- <include>**/*.wsdd</include>
+ <include>deploy.wsdd</include>
</includes>
</wsdd>
</wsdds>
Modified: axis/axis1/java/trunk/samples/jaxrpc-sample/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/jaxrpc-sample/pom.xml?rev=1419166&r1=1419165&r2=1419166&view=diff
==============================================================================
--- axis/axis1/java/trunk/samples/jaxrpc-sample/pom.xml (original)
+++ axis/axis1/java/trunk/samples/jaxrpc-sample/pom.xml Sun Dec 9 21:23:06 2012
@@ -120,13 +120,13 @@
<wsdd>
<directory>src/main/wsdd</directory>
<includes>
- <include>**/*.wsdd</include>
+ <include>**/deploy.wsdd</include>
</includes>
</wsdd>
<wsdd>
<directory>../stock-sample/src/main/wsdd</directory>
<includes>
- <include>**/*.wsdd</include>
+ <include>deploy.wsdd</include>
</includes>
</wsdd>
<wsdd>
Modified: axis/axis1/java/trunk/samples/message-sample/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/message-sample/pom.xml?rev=1419166&r1=1419165&r2=1419166&view=diff
==============================================================================
--- axis/axis1/java/trunk/samples/message-sample/pom.xml (original)
+++ axis/axis1/java/trunk/samples/message-sample/pom.xml Sun Dec 9 21:23:06
2012
@@ -86,7 +86,7 @@
<wsdd>
<directory>src/main/wsdd</directory>
<includes>
- <include>**/*.wsdd</include>
+ <include>deploy.wsdd</include>
</includes>
</wsdd>
</wsdds>
Modified: axis/axis1/java/trunk/samples/misc-sample/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/misc-sample/pom.xml?rev=1419166&r1=1419165&r2=1419166&view=diff
==============================================================================
--- axis/axis1/java/trunk/samples/misc-sample/pom.xml (original)
+++ axis/axis1/java/trunk/samples/misc-sample/pom.xml Sun Dec 9 21:23:06 2012
@@ -86,7 +86,7 @@
<wsdd>
<directory>src/main/wsdd</directory>
<includes>
- <include>**/*.wsdd</include>
+ <include>deploy.wsdd</include>
</includes>
</wsdd>
</wsdds>
Modified: axis/axis1/java/trunk/samples/stock-sample/pom.xml
URL:
http://svn.apache.org/viewvc/axis/axis1/java/trunk/samples/stock-sample/pom.xml?rev=1419166&r1=1419165&r2=1419166&view=diff
==============================================================================
--- axis/axis1/java/trunk/samples/stock-sample/pom.xml (original)
+++ axis/axis1/java/trunk/samples/stock-sample/pom.xml Sun Dec 9 21:23:06 2012
@@ -99,7 +99,7 @@
<wsdd>
<directory>src/main/wsdd</directory>
<includes>
- <include>**/*.wsdd</include>
+ <include>deploy.wsdd</include>
</includes>
</wsdd>
</wsdds>
