You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ve...@apache.org on 2012/09/05 16:42:53 UTC
svn commit: r1381203 - in /synapse/trunk/java: ./ modules/distribution/
modules/distribution/src/main/assembly/
modules/samples/src/main/scripts/axis2Server/ repository/conf/
repository/conf/sample/resources/misc/server/
Author: veithen
Date: Wed Sep 5 14:42:53 2012
New Revision: 1381203
URL: http://svn.apache.org/viewvc?rev=1381203&view=rev
Log:
Changed the configuration of the Axis2 sample server packaged with the distribution such that one can readily deploy JAX-WS services on it.
Modified:
synapse/trunk/java/modules/distribution/pom.xml
synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml
synapse/trunk/java/modules/samples/src/main/scripts/axis2Server/axis2server.sh
synapse/trunk/java/pom.xml
synapse/trunk/java/repository/conf/sample-server-wrapper.conf
synapse/trunk/java/repository/conf/sample/resources/misc/server/axis2.xml
Modified: synapse/trunk/java/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/distribution/pom.xml?rev=1381203&r1=1381202&r2=1381203&view=diff
==============================================================================
--- synapse/trunk/java/modules/distribution/pom.xml (original)
+++ synapse/trunk/java/modules/distribution/pom.xml Wed Sep 5 14:42:53 2012
@@ -154,6 +154,12 @@
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</dependency-->
+
+ <!-- Libraries packaged with the sample Axis2 server (but that are not useful for Synapse itself) -->
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-jaxws</artifactId>
+ </dependency>
</dependencies>
<repositories>
Modified: synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml?rev=1381203&r1=1381202&r2=1381203&view=diff
==============================================================================
--- synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml (original)
+++ synapse/trunk/java/modules/distribution/src/main/assembly/bin.xml Wed Sep 5 14:42:53 2012
@@ -192,10 +192,32 @@
<exclude>quickfixj:quickfixj-all:jar</exclude>
<exclude>org.snmp4j:snmp4j</exclude>
<exclude>org.snmp4j:snmp4j-agent</exclude>
+
+ <!-- Dependencies that are only used by the Axis2 sample server -->
+ <exclude>org.apache.axis2:axis2-jaxws:jar</exclude>
+ <exclude>org.apache.axis2:axis2-metadata:jar</exclude>
+ <exclude>org.apache.geronimo.specs:geronimo-annotation_1.0_spec:jar</exclude>
+ <exclude>org.apache.geronimo.specs:geronimo-jaxws_2.2_spec:jar</exclude>
+ <exclude>javax.xml.bind:jaxb-api:jar</exclude>
+ <exclude>com.sun.xml.bind:jaxb-impl:jar</exclude>
+ <exclude>com.sun.xml.bind:jaxb-xjc:jar</exclude>
</excludes>
</dependencySet>
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>synapse-${synapse.version}/samples/axis2Server/lib</outputDirectory>
+ <includes>
+ <include>org.apache.axis2:axis2-jaxws:jar</include>
+ <include>org.apache.axis2:axis2-metadata:jar</include>
+ <include>org.apache.geronimo.specs:geronimo-annotation_1.0_spec:jar</include>
+ <include>org.apache.geronimo.specs:geronimo-jaxws_2.2_spec:jar</include>
+ <include>javax.xml.bind:jaxb-api:jar</include>
+ <include>com.sun.xml.bind:jaxb-impl:jar</include>
+ <include>com.sun.xml.bind:jaxb-xjc:jar</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
<outputDirectory>synapse-${synapse.version}</outputDirectory>
<unpack>true</unpack>
<includes>
Modified: synapse/trunk/java/modules/samples/src/main/scripts/axis2Server/axis2server.sh
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/samples/src/main/scripts/axis2Server/axis2server.sh?rev=1381203&r1=1381202&r2=1381203&view=diff
==============================================================================
--- synapse/trunk/java/modules/samples/src/main/scripts/axis2Server/axis2server.sh (original)
+++ synapse/trunk/java/modules/samples/src/main/scripts/axis2Server/axis2server.sh Wed Sep 5 14:42:53 2012
@@ -81,7 +81,7 @@ fi
# update classpath
AXIS2_CLASSPATH="$AXIS2_HOME/../../lib"
-for f in "$AXIS2_HOME"/../../lib/*.jar
+for f in "$AXIS2_HOME"/../../lib/*.jar "$AXIS2_HOME"/lib/*.jar
do
AXIS2_CLASSPATH="$AXIS2_CLASSPATH":$f
done
Modified: synapse/trunk/java/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/pom.xml?rev=1381203&r1=1381202&r2=1381203&view=diff
==============================================================================
--- synapse/trunk/java/pom.xml (original)
+++ synapse/trunk/java/pom.xml Wed Sep 5 14:42:53 2012
@@ -493,6 +493,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-jaxws</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
<!-- Apache Rampart -->
<dependency>
Modified: synapse/trunk/java/repository/conf/sample-server-wrapper.conf
URL: http://svn.apache.org/viewvc/synapse/trunk/java/repository/conf/sample-server-wrapper.conf?rev=1381203&r1=1381202&r2=1381203&view=diff
==============================================================================
--- synapse/trunk/java/repository/conf/sample-server-wrapper.conf (original)
+++ synapse/trunk/java/repository/conf/sample-server-wrapper.conf Wed Sep 5 14:42:53 2012
@@ -20,6 +20,7 @@ wrapper.java.classpath.2=../../lib/wrapp
wrapper.java.classpath.3=../../lib
wrapper.java.classpath.4=../../repository/conf
wrapper.java.classpath.5=../../lib/*.jar
+wrapper.java.classpath.6=lib/*.jar
# Java Library Path (location of Wrapper.DLL or libwrapper.so)
wrapper.java.library.path.1=../../lib
Modified: synapse/trunk/java/repository/conf/sample/resources/misc/server/axis2.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/repository/conf/sample/resources/misc/server/axis2.xml?rev=1381203&r1=1381202&r2=1381203&view=diff
==============================================================================
--- synapse/trunk/java/repository/conf/sample/resources/misc/server/axis2.xml (original)
+++ synapse/trunk/java/repository/conf/sample/resources/misc/server/axis2.xml Wed Sep 5 14:42:53 2012
@@ -80,6 +80,9 @@
<serviceBuilderExtension name ="jwsbuilderExt" class="org.apache.axis2.jaxws.framework.JAXWSServiceBuilderExtension"/>
<serviceBuilderExtension name ="wsdlbuilderExt" class="org.apache.axis2.deployment.WSDLServiceBuilderExtension"/>
</deployer>
+
+ <deployer extension=".jar" directory="servicejars"
+ class="org.apache.axis2.jaxws.framework.JAXWSDeployer"/>
<!-- Following parameter will set the host name for the epr-->
<!--<parameter name="hostname" locked="true">myhost.com</parameter>-->