Author: ruwan Date: Wed Nov 26 21:54:17 2008 New Revision: 25031 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=25031
Log: fixing the issues in the sample axis2 server Added: trunk/esb/java/modules/distribution/src/main/conf/identity.jks (contents, props changed) trunk/esb/java/modules/distribution/src/main/conf/trust.jks (contents, props changed) Modified: trunk/esb/java/modules/distribution/pom.xml trunk/esb/java/modules/distribution/src/main/assembly/bin.xml trunk/esb/java/modules/samples/src/main/conf/server/axis2.xml trunk/esb/java/modules/samples/src/main/scripts/axis2server.sh Modified: trunk/esb/java/modules/distribution/pom.xml URL: http://wso2.org/svn/browse/wso2/trunk/esb/java/modules/distribution/pom.xml?rev=25031&r1=25030&r2=25031&view=diff ============================================================================== --- trunk/esb/java/modules/distribution/pom.xml (original) +++ trunk/esb/java/modules/distribution/pom.xml Wed Nov 26 21:54:17 2008 @@ -56,7 +56,7 @@ <dependency> <groupId>org.apache.synapse</groupId> - <artifactId>synapse</artifactId> + <artifactId>synapse-module</artifactId> <version>${synapse.version}</version> </dependency> Modified: trunk/esb/java/modules/distribution/src/main/assembly/bin.xml URL: http://wso2.org/svn/browse/wso2/trunk/esb/java/modules/distribution/src/main/assembly/bin.xml?rev=25031&r1=25030&r2=25031&view=diff ============================================================================== --- trunk/esb/java/modules/distribution/src/main/assembly/bin.xml (original) +++ trunk/esb/java/modules/distribution/src/main/assembly/bin.xml Wed Nov 26 21:54:17 2008 @@ -78,7 +78,7 @@ <!-- Synapse bundles --> <include>org.apache.synapse:synapse-transports:jar</include> <include>org.apache.synapse:synapse-core:jar</include> - <include>org.apache.synapse:synapse:jar</include> + <include>org.apache.synapse:synapse-module:jar</include> <include>org.apache.synapse:synapse-utils:jar</include> <include>org.apache.synapse:synapse-tasks:jar</include> <!-- ESB bundles --> @@ -193,6 +193,16 @@ <destName>synapse.xml</destName> </file> <file> + <source>src/main/conf/identity.jks</source> + <outputDirectory>wso2-esb-${esb.version}/conf</outputDirectory> + <destName>identity.jks</destName> + </file> + <file> + <source>src/main/conf/trust.jks</source> + <outputDirectory>wso2-esb-${esb.version}/conf</outputDirectory> + <destName>trust.jks</destName> + </file> + <file> <source>src/main/conf/log4j.properties</source> <outputDirectory>wso2-esb-${pom.version}/conf</outputDirectory> <destName>log4j.properties</destName> Added: trunk/esb/java/modules/distribution/src/main/conf/identity.jks URL: http://wso2.org/svn/browse/wso2/trunk/esb/java/modules/distribution/src/main/conf/identity.jks?pathrev=25031 ============================================================================== Binary file. No diff available. Added: trunk/esb/java/modules/distribution/src/main/conf/trust.jks URL: http://wso2.org/svn/browse/wso2/trunk/esb/java/modules/distribution/src/main/conf/trust.jks?pathrev=25031 ============================================================================== Binary file. No diff available. Modified: trunk/esb/java/modules/samples/src/main/conf/server/axis2.xml URL: http://wso2.org/svn/browse/wso2/trunk/esb/java/modules/samples/src/main/conf/server/axis2.xml?rev=25031&r1=25030&r2=25031&view=diff ============================================================================== --- trunk/esb/java/modules/samples/src/main/conf/server/axis2.xml (original) +++ trunk/esb/java/modules/samples/src/main/conf/server/axis2.xml Wed Nov 26 21:54:17 2008 @@ -150,7 +150,7 @@ <parameter name="non-blocking" locked="false">true</parameter> <parameter name="keystore" locked="false"> <KeyStore> - <Location>../../lib/identity.jks</Location> + <Location>../../conf/identity.jks</Location> <Type>JKS</Type> <Password>password</Password> <KeyPassword>password</KeyPassword> @@ -158,7 +158,7 @@ </parameter> <parameter name="truststore" locked="false"> <TrustStore> - <Location>../../lib/trust.jks</Location> + <Location>../../conf/trust.jks</Location> <Type>JKS</Type> <Password>password</Password> </TrustStore> @@ -210,7 +210,7 @@ <parameter name="non-blocking" locked="false">true</parameter> <parameter name="keystore" locked="false"> <KeyStore> - <Location>../../lib/identity.jks</Location> + <Location>../../conf/identity.jks</Location> <Type>JKS</Type> <Password>password</Password> <KeyPassword>password</KeyPassword> @@ -218,7 +218,7 @@ </parameter> <parameter name="truststore" locked="false"> <TrustStore> - <Location>../../lib/trust.jks</Location> + <Location>../../conf/trust.jks</Location> <Type>JKS</Type> <Password>password</Password> </TrustStore> Modified: trunk/esb/java/modules/samples/src/main/scripts/axis2server.sh URL: http://wso2.org/svn/browse/wso2/trunk/esb/java/modules/samples/src/main/scripts/axis2server.sh?rev=25031&r1=25030&r2=25031&view=diff ============================================================================== --- trunk/esb/java/modules/samples/src/main/scripts/axis2server.sh (original) +++ trunk/esb/java/modules/samples/src/main/scripts/axis2server.sh Wed Nov 26 21:54:17 2008 @@ -83,7 +83,10 @@ AXIS2_CLASSPATH="$AXIS2_HOME/../../webapps/ROOT/WEB-INF/plugins" for f in "$AXIS2_HOME"/../../webapps/ROOT/WEB-INF/plugins/*.jar do - AXIS2_CLASSPATH="$AXIS2_CLASSPATH":$f + syn_mod=`ls $f | grep synapse-module` + if [ ! -e "$syn_mod" ]; then + AXIS2_CLASSPATH="$AXIS2_CLASSPATH":$f + fi done for f in "$AXIS2_HOME"/../../*.jar do _______________________________________________ Esb-java-dev mailing list [email protected] https://wso2.org/cgi-bin/mailman/listinfo/esb-java-dev
