This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch AXIS-2882
in repository https://gitbox.apache.org/repos/asf/axis-axis1-java.git
commit a629d1a6c9cb3e41ee2ce54edc28d77f27e33155
Merge: 985dac4 e0bde98
Author: Andreas Veithen <veit...@apache.org>
AuthorDate: Mon Dec 10 12:01:10 2012 +0000
Merged latest changes from trunk.
axis-model/model/wsdd.ecore | 62 +--
.../java/org/apache/axis/model/wsdd/Chain.java | 97 ++++
.../org/apache/axis/model/wsdd/DeployableItem.java | 12 +-
.../org/apache/axis/model/wsdd/Deployment.java | 2 +-
.../apache/axis/model/wsdd/MappingContainer.java | 77 +++
.../java/org/apache/axis/model/wsdd/Service.java | 53 +-
.../axis/model/wsdd/WSDDExtendedMetaData.java | 31 +-
.../org/apache/axis/model/wsdd/WSDDFactory.java | 27 +-
.../java/org/apache/axis/model/wsdd/WSDDUtil.java | 58 ++-
.../org/apache/axis/model/wsdd/impl/ChainImpl.java | 257 ++++++++++
.../axis/model/wsdd/impl/DeployableItemImpl.java | 30 +-
.../axis/model/wsdd/impl/DeploymentImpl.java | 7 +-
.../axis/model/wsdd/impl/MappingContainerImpl.java | 223 ++++++++
.../apache/axis/model/wsdd/impl/ServiceImpl.java | 171 ++++---
.../axis/model/wsdd/impl/WSDDFactoryImpl.java | 33 +-
.../axis/model/wsdd/impl/WSDDPackageImpl.java | 561 ++++++++++++++-------
.../apache/axis/model/wsdd/DeprecationTest.java | 30 +-
.../axis/model/wsdd/languageSpecificType.wsdd | 8 +
axis-model/src/test/wsdd/bidbuy.wsdd | 23 +
axis-model/src/test/wsdd/stock.wsdd | 31 ++
.../META-INF/axis/default-server-config.wsdd | 0
axis-rt-transport-http-javanet/pom.xml | 6 -
.../server/standalone/StandaloneAxisServer.java | 1 -
.../server/standalone/StandaloneAxisServlet.java | 4 -
.../pom.xml | 48 +-
.../axis/tools/daemon/ControlConnectionReader.java | 76 +++
.../axis/tools/daemon/DaemonContextImpl.java | 32 +-
.../org/apache/axis/tools/daemon/Launcher.java | 101 ++++
.../axis/tools/daemon/LauncherException.java | 11 +-
distribution/src/main/assembly/bin.xml | 12 +
integration/pom.xml | 11 -
maven/maven-axis-server-plugin/pom.xml | 22 +
.../maven/server/AbstractStartProcessMojo.java | 157 +++++-
...rtAction.java => AxisServerProcessControl.java} | 17 +-
.../tools/maven/server/DaemonProcessControl.java | 74 +++
.../tools/maven/server/DefaultProcessManager.java | 10 +-
.../axis/tools/maven/server/ManagedProcess.java | 10 +-
...{ProcessStopAction.java => ProcessControl.java} | 32 +-
.../axis/tools/maven/server/ProcessManager.java | 2 +-
...{StartProcessMojo.java => StartDaemonMojo.java} | 29 +-
.../axis/tools/maven/server/StartServerMojo.java | 120 +++--
.../axis/tools/maven/wsdd/GenerateWSDDMojo.java | 42 +-
.../maven/wsdl2java/AbstractWsdl2JavaMojo.java | 9 +-
pom.xml | 42 ++
samples/addr-sample/pom.xml | 6 -
samples/attachments-sample/pom.xml | 8 +-
samples/bidbuy-sample/pom.xml | 5 -
samples/encoding-sample/pom.xml | 7 +-
samples/faults-sample/pom.xml | 7 +-
samples/handler-sample/pom.xml | 5 -
samples/jaxrpc-sample/pom.xml | 9 +-
samples/jms-sample/pom.xml | 207 ++++++++
.../src/main/java}/samples/jms/JMSTest.java | 1 +
.../src/main/java}/samples/jms/dii/JMSURLTest.java | 29 +-
.../java}/samples/jms/stub/JMSURLStubTest.java | 21 +-
.../jms-sample/src/main/wsdd}/client-config.wsdd | 0
.../jms-sample/src/main/wsdd}/server-config.wsdd | 0
.../jms-sample/src/main/wsdl}/GetQuote.wsdl | 0
.../conf/activemq-connection-factory.properties | 3 +
.../src/test/java/samples/jms/ActiveMQDaemon.java | 32 +-
samples/message-sample/pom.xml | 7 +-
samples/misc-sample/pom.xml | 7 +-
samples/pom.xml | 1 +
samples/proxy-sample/pom.xml | 5 -
samples/stock-sample/pom.xml | 12 +-
samples/transport-sample/pom.xml | 9 +-
.../java/samples/transport/tcp/TCPListener.java | 6 +-
.../samples/transport/tcp/TCPListenerDaemon.java | 31 +-
68 files changed, 2311 insertions(+), 768 deletions(-)
