Author: ruwan Date: Mon Jun 1 05:58:38 2009 New Revision: 37369 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=37369
Log: Fixing the ESB issues in running samples Modified: trunk/esb/java/modules/distribution/pom.xml trunk/esb/java/modules/distribution/src/main/assembly/bin.xml trunk/esb/java/modules/distribution/src/main/assembly/dist.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=37369&r1=37368&r2=37369&view=diff ============================================================================== --- trunk/esb/java/modules/distribution/pom.xml (original) +++ trunk/esb/java/modules/distribution/pom.xml Mon Jun 1 05:58:38 2009 @@ -556,6 +556,11 @@ </dependency> <dependency> <groupId>org.wso2.carbon</groupId> + <artifactId>org.wso2.carbon.registry.common</artifactId> + <version>${carbon.version}</version> + </dependency> + <dependency> + <groupId>org.wso2.carbon</groupId> <artifactId>org.wso2.carbon.registry.mgt.ui.info</artifactId> <version>${carbon.version}</version> </dependency> @@ -1031,6 +1036,12 @@ <artifactId>wso2caching-core</artifactId> <version>3.1-SNAPSHOT</version> </dependency> + <!--Bouncycastle dependency for clients and servers--> + <dependency> + <groupId>bouncycastle</groupId> + <artifactId>bcprov-jdk15</artifactId> + <version>132</version> + </dependency> </dependencies> 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=37369&r1=37368&r2=37369&view=diff ============================================================================== --- trunk/esb/java/modules/distribution/src/main/assembly/bin.xml (original) +++ trunk/esb/java/modules/distribution/src/main/assembly/bin.xml Mon Jun 1 05:58:38 2009 @@ -10,6 +10,7 @@ <outputDirectory>wso2esb-${pom.version}</outputDirectory> <excludes> <exclude>**/*.sh</exclude> + <exclude>**/bin/build.xml</exclude> <exclude>**/conf/axis2.xml</exclude> <exclude>**/conf/synapse.xml</exclude> <exclude>**/conf/wrapper.conf</exclude> @@ -95,6 +96,13 @@ </includes> <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> </dependencySet> + <dependencySet> + <outputDirectory>wso2esb-${pom.version}/repository/lib</outputDirectory> + <includes> + <include>bouncycastle:bcprov-jdk15:jar</include> + </includes> + <outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping> + </dependencySet> </dependencySets> <files> <file> Modified: trunk/esb/java/modules/distribution/src/main/assembly/dist.xml URL: http://wso2.org/svn/browse/wso2/trunk/esb/java/modules/distribution/src/main/assembly/dist.xml?rev=37369&r1=37368&r2=37369&view=diff ============================================================================== --- trunk/esb/java/modules/distribution/src/main/assembly/dist.xml (original) +++ trunk/esb/java/modules/distribution/src/main/assembly/dist.xml Mon Jun 1 05:58:38 2009 @@ -210,6 +210,7 @@ <include>org.wso2.carbon:org.wso2.carbon.security.policy:jar</include> <include>org.wso2.carbon:org.wso2.carbon.security.rampart:jar</include> <include>org.wso2.carbon:org.wso2.carbon.registry.app:jar</include> + <include>org.wso2.carbon:org.wso2.carbon.registry.common:jar</include> <include>org.springframework.ws.wso2:spring.framework:jar</include> <include>org.apache.bsf.wso2:bsf-all:jar</include> <include>org.apache.axis.wso2:axis:jar</include> 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=37369&r1=37368&r2=37369&view=diff ============================================================================== --- trunk/esb/java/modules/samples/src/main/scripts/axis2server.sh (original) +++ trunk/esb/java/modules/samples/src/main/scripts/axis2server.sh Mon Jun 1 05:58:38 2009 @@ -105,17 +105,10 @@ done AXIS2_CLASSPATH="$JAVA_HOME/lib/tools.jar":"$AXIS2_CLASSPATH":"$CLASSPATH" -# use proper bouncy castle version for the JDK -jdk_15=`$JAVA_HOME/bin/java -version 2>&1 | grep 1.5` -jdk_14=`$JAVA_HOME/bin/java -version 2>&1 | grep 1.4` - -if [ "$jdk_15" ]; then - echo " Using Bouncy castle JAR for Java 1.5" - for f in $AXIS2_HOME/../../repository/lib/bcprov-jdk15-132.jar - do - AXIS2_CLASSPATH=$f:$AXIS2_CLASSPATH - done -fi +for f in $AXIS2_HOME/../../repository/lib/*.jar +do + AXIS2_CLASSPATH=$f:$AXIS2_CLASSPATH +done # For Cygwin, switch paths to Windows format before running java if $cygwin; then _______________________________________________ Esb-java-dev mailing list [email protected] https://wso2.org/cgi-bin/mailman/listinfo/esb-java-dev
