Author: ruwan Date: Thu Oct 30 22:21:23 2008 New Revision: 23145 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=23145
Log: Fixing the issues on the ESB product 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/conf/axis2.xml Modified: trunk/esb/java/modules/distribution/pom.xml URL: http://wso2.org/svn/browse/wso2/trunk/esb/java/modules/distribution/pom.xml?rev=23145&r1=23144&r2=23145&view=diff ============================================================================== --- trunk/esb/java/modules/distribution/pom.xml (original) +++ trunk/esb/java/modules/distribution/pom.xml Thu Oct 30 22:21:23 2008 @@ -26,20 +26,26 @@ <dependency> <groupId>org.wso2.esb</groupId> - <artifactId>org.wso2.esb.core</artifactId> + <artifactId>org.wso2.esb.styles</artifactId> <version>${pom.version}</version> </dependency> <dependency> - <groupId>org.wso2.esb</groupId> - <artifactId>org.wso2.esb.styles</artifactId> - <version>${pom.version}</version> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-transport-base</artifactId> + <version>SNAPSHOT</version> </dependency> <dependency> - <groupId>org.wso2.esb</groupId> - <artifactId>org.wso2.esb.ui</artifactId> - <version>${pom.version}</version> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-transport-jms</artifactId> + <version>SNAPSHOT</version> + </dependency> + + <dependency> + <groupId>org.apache.axis2</groupId> + <artifactId>axis2-transport-mail</artifactId> + <version>SNAPSHOT</version> </dependency> <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=23145&r1=23144&r2=23145&view=diff ============================================================================== --- trunk/esb/java/modules/distribution/src/main/assembly/bin.xml (original) +++ trunk/esb/java/modules/distribution/src/main/assembly/bin.xml Thu Oct 30 22:21:23 2008 @@ -12,7 +12,6 @@ <exclude>**/*.sh</exclude> <exclude>**/repository/axis2.xml</exclude> <exclude>**/native/*</exclude> - <exclude>**/config.ini</exclude> <exclude>**/services/sample01.aar</exclude> <exclude>**/repository/services/version/**</exclude> </excludes> @@ -23,21 +22,10 @@ <includes> <include>**/*.sh</include> <include>**/native/*</include> + <include>**/config.ini</include> </includes> <fileMode>755</fileMode> </fileSet> - <!-- samples --> - <!--<fileSet>--> - <!--<directory>../samples</directory>--> - <!--<outputDirectory>wso2-dataservices-${ds.solution.version}/samples</outputDirectory>--> - <!--<excludes>--> - <!--<exclude>**/target/*</exclude>--> - <!--<exclude>**/*.class</exclude>--> - <!--<exclude>pom.xml</exclude>--> - <!--<exclude>basic-rdbms/pom.xml</exclude>--> - <!--<exclude>secured/pom.xml</exclude>--> - <!--</excludes>--> - <!--</fileSet>--> </fileSets> <dependencySets> <dependencySet> @@ -53,47 +41,18 @@ <include>org.wso2.caching:wso2caching-core:jar</include> <include>org.wso2.carbon:org.wso2.carbon.authenticator:jar</include> <!-- Synapse bundles --> + <include>org.apache.axis2:axis2-transport-base:jar</include> + <include>org.apache.axis2:axis2-transport-jms:jar</include> + <include>org.apache.axis2:axis2-transport-mail:jar</include> <include>org.apache.synapse:synapse-transports:jar</include> <include>org.apache.synapse:synapse-core:jar</include> <include>org.apache.synapse:synapse:jar</include> <!-- ESB bundles --> - <include>org.wso2.esb:org.wso2.esb.core:jar</include> <include>org.wso2.esb:org.wso2.esb.styles:jar</include> - <include>org.wso2.esb:org.wso2.esb.ui:jar</include> - <!-- other bundles--> + <!-- Component bundles--> <include>org.wso2.carbon:org.wso2.carbon.mediation.utils:jar</include> <include>org.wso2.carbon:org.wso2.carbon.mediation:jar</include> <include>org.wso2.carbon:org.wso2.carbon.mediation.ui:jar</include> - <!--<include>org.wso2.carbon:org.wso2.carbon.rm:jar</include>--> - <!--<include>org.wso2.carbon:org.wso2.carbon.rm.ui:jar</include>--> - <!--<include>org.wso2.carbon:org.wso2.carbon.security.mgt:jar</include>--> - <!--<include>org.wso2.carbon:org.wso2.carbon.security.mgt.ui:jar</include>--> - <!--<include>org.wso2.carbon:org.wso2.carbon.security.policy:jar</include>--> - <!--<include>org.wso2.carbon:org.wso2.carbon.security.rahas:jar</include>--> - <!--<include>org.wso2.carbon:org.wso2.carbon.security.rampart:jar</include>--> - <!--<include>org.wso2.carbon:org.wso2.carbon.logging.service:jar</include>--> - <!--<include>org.wso2.carbon:org.wso2.carbon.logging.admin.ui:jar</include>--> - <!--<include>org.wso2.carbon:org.wso2.carbon.logging.view.ui:jar</include>--> - <!--<include>org.wso2.carbon:org.wso2.carbon.logging.ext:jar</include>--> - <!--<include>org.wso2.carbon:org.wso2.carbon.throttle:jar</include>--> - <!--<include>org.wso2.carbon:org.wso2.carbon.throttle.ui:jar</include>--> - <!--<include>org.wso2.carbon:org.wso2.carbon.caching:jar</include>--> - <!--<include>org.wso2.carbon:org.wso2.carbon.caching.ui:jar</include>--> - <!--<include>org.wso2.carbon:org.wso2.carbon.tracer:jar</include>--> - <!--<include>org.wso2.carbon:org.wso2.carbon.tracer.ui:jar</include>--> - <!--<include>org.wso2.carbon:org.wso2.carbon.codegen:jar</include>--> - <!--<include>org.wso2.carbon:org.wso2.carbon.codegen.ui:jar</include>--> - <!--<include>org.wso2.carbon:org.wso2.carbon.service.mgt:jar</include>--> - <!--<include>org.wso2.carbon:org.wso2.carbon.service.mgt.ui:jar</include>--> - <!--<include>org.wso2.carbon:org.wso2.carbon.transport.mgt:jar</include>--> - <!--<include>org.wso2.carbon:org.wso2.carbon.transport.mgt.ui:jar</include>--> - <!--<include>org.wso2.carbon:org.wso2.carbon.server.admin:jar</include>--> - <!--<include>org.wso2.carbon:org.wso2.carbon.server.admin.ui:jar</include>--> - <!--<include>org.wso2.carbon:org.wso2.carbon.statistics:jar</include>--> - <!--<include>org.wso2.carbon:org.wso2.carbon.statistics.ui:jar</include>--> - <include>org.wso2.carbon:org.wso2.carbon.tryit:jar</include> - <!--<include>org.wso2.carbon:org.wso2.carbon.wsdlconverter:jar</include>--> - <include>org.wso2.carbon:org.wso2.carbon.xslt:jar</include> </includes> </dependencySet> </dependencySets> @@ -104,12 +63,6 @@ <destName>axis2.xml</destName> </file> <file> - <source>src/main/conf/config.properties</source> - <outputDirectory>wso2-esb-${esb.version}/webapps/ROOT/WEB-INF/eclipse/configuration</outputDirectory> - <destName>config.ini</destName> - <filtered>true</filtered> - </file> - <file> <source>../../NOTICE</source> <outputDirectory>wso2-esb-${esb.version}</outputDirectory> <filtered>true</filtered> Modified: trunk/esb/java/modules/distribution/src/main/conf/axis2.xml URL: http://wso2.org/svn/browse/wso2/trunk/esb/java/modules/distribution/src/main/conf/axis2.xml?rev=23145&r1=23144&r2=23145&view=diff ============================================================================== --- trunk/esb/java/modules/distribution/src/main/conf/axis2.xml (original) +++ trunk/esb/java/modules/distribution/src/main/conf/axis2.xml Thu Oct 30 22:21:23 2008 @@ -66,7 +66,7 @@ <!--Our HTTP endpoints can handle both REST and SOAP. Following parameters can be used to distingiush those endpoints--> <!--In case of a servlet, if you change this you have to manually change the settings of your servlet container to map this --> <!--context path to proper Axis2 servlets--> - <parameter name="servicePath" locked="false">soap</parameter> + <parameter name="servicePath" locked="false">services</parameter> <parameter name="restPath" locked="false">rest</parameter> <!-- Following parameter will completely disable REST handling in Axis2--> @@ -174,10 +174,10 @@ <transportReceiver name="vfs" class="org.apache.synapse.transport.vfs.VFSTransportListener"/> - <transportReceiver name="mailto" class="org.apache.synapse.transport.mail.MailTransportListener"> + <!--<transportReceiver name="mailto" class="org.apache.axis2.transport.mail.MailTransportListener">--> <!-- configure any optional POP3/IMAP properties check com.sun.mail.pop3 and com.sun.mail.imap package documentation for more details--> - </transportReceiver> + <!--</transportReceiver>--> <!--<transportReceiver name="admin/https" class="org.wso2.esb.transport.tomcat.HttpsTransportListener">--> <!--<parameter name="port" locked="false">9444</parameter>--> @@ -185,7 +185,7 @@ <!--</transportReceiver>--> <!--Uncomment this and configure as appropriate for JMS transport support, after setting up your JMS environment (e.g. ActiveMQ) - <transportReceiver name="jms" class="org.apache.synapse.transport.jms.JMSListener"> + <transportReceiver name="jms" class="org.apache.axis2.transport.jms.JMSListener"> <parameter name="myTopicConnectionFactory" locked="false"> <parameter name="java.naming.factory.initial" locked="false">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter> <parameter name="java.naming.provider.url" locked="false">tcp://localhost:61616</parameter> @@ -218,7 +218,7 @@ <!-- Transport Outs --> <!-- ================================================= --> - <transportSender name="jms" class="org.apache.synapse.transport.jms.JMSSender"> + <transportSender name="jms" class="org.apache.axis2.transport.jms.JMSSender"> <!-- uncomment this and configure to use connection pools for sending messages <parameter name="myTopicConnectionFactory"> <parameter name="java.naming.factory.initial">org.apache.activemq.jndi.ActiveMQInitialContextFactory</parameter> @@ -245,33 +245,33 @@ <transportSender name="vfs" class="org.apache.synapse.transport.vfs.VFSTransportSender"/> <!-- the non-blocking http transport based on HttpCore + NIO extensions --> - <!--<transportSender name="http" class="org.apache.synapse.transport.nhttp.HttpCoreNIOSender">--> - <!--<parameter name="non-blocking" locked="false">true</parameter>--> - <!--</transportSender>--> - <!--<transportSender name="https" class="org.apache.synapse.transport.nhttp.HttpCoreNIOSSLSender">--> - <!--<parameter name="non-blocking" locked="false">true</parameter>--> - <!--<parameter name="keystore" locked="false">--> - <!--<KeyStore>--> - <!--<Location>webapp/WEB-INF/classes/conf/identity.jks</Location>--> - <!--<Type>JKS</Type>--> - <!--<Password>password</Password>--> - <!--<KeyPassword>password</KeyPassword>--> - <!--</KeyStore>--> - <!--</parameter>--> - <!--<parameter name="truststore" locked="false">--> - <!--<TrustStore>--> - <!--<Location>webapp/WEB-INF/classes/conf/trust.jks</Location>--> - <!--<Type>JKS</Type>--> - <!--<Password>password</Password>--> - <!--</TrustStore>--> - <!--</parameter>--> - <!--<parameter name="HostnameVerifier">DefaultAndLocalhost</parameter> - supports Strict|AllowAll|DefaultAndLocalhost or the default if none specified --> - <!--</transportSender>--> + <transportSender name="http" class="org.apache.synapse.transport.nhttp.HttpCoreNIOSender"> + <parameter name="non-blocking" locked="false">true</parameter> + </transportSender> + <transportSender name="https" class="org.apache.synapse.transport.nhttp.HttpCoreNIOSSLSender"> + <parameter name="non-blocking" locked="false">true</parameter> + <parameter name="keystore" locked="false"> + <KeyStore> + <Location>webapp/WEB-INF/classes/conf/identity.jks</Location> + <Type>JKS</Type> + <Password>password</Password> + <KeyPassword>password</KeyPassword> + </KeyStore> + </parameter> + <parameter name="truststore" locked="false"> + <TrustStore> + <Location>webapp/WEB-INF/classes/conf/trust.jks</Location> + <Type>JKS</Type> + <Password>password</Password> + </TrustStore> + </parameter> + <!--<parameter name="HostnameVerifier">DefaultAndLocalhost</parameter>--> + <!--supports Strict|AllowAll|DefaultAndLocalhost or the default if none specified --> + </transportSender> <!-- Uncomment and configure the SMTP server information check com.sun.mail.smtp package documentation for descriptions of properties - <transportSender name="mailto" class="org.apache.synapse.transport.mail.MailTransportSender"> + <transportSender name="mailto" class="org.apache.axis2.transport.mail.MailTransportSender"> <parameter name="mail.smtp.host">smtp.gmail.com</parameter> <parameter name="mail.smtp.port">587</parameter> <parameter name="mail.smtp.starttls.enable">true</parameter> _______________________________________________ Esb-java-dev mailing list [email protected] http://mailman.wso2.org/cgi-bin/mailman/listinfo/esb-java-dev
